From aafc7a462952a28bf2339a85e0ff960b8c9817e8 Mon Sep 17 00:00:00 2001
From: Patryk Goworowski <patrykgoworowski@gmail.com>
Date: Fri, 6 Oct 2023 19:33:39 +0200
Subject: [PATCH 01/15] Add View attributes to control preview models

---
 sample/src/main/res/layout/chart_1.xml        |  1 +
 .../shape/shader/ComposeDynamicShader.kt      | 33 ++++++++--------
 .../component/shape/shader/DynamicShaders.kt  | 38 ++++++++++++++++++-
 .../vico/core/util/RandomEntriesGenerator.kt  | 20 ++++++----
 .../vico/views/chart/ChartView.kt             | 25 +++++++++++-
 .../vico/views/chart/ComposedChartView.kt     | 28 +++++++++++++-
 vico/views/src/main/res/values/attrs.xml      | 16 ++++++++
 7 files changed, 134 insertions(+), 27 deletions(-)

diff --git a/sample/src/main/res/layout/chart_1.xml b/sample/src/main/res/layout/chart_1.xml
index 64d4174ad..d725c7366 100644
--- a/sample/src/main/res/layout/chart_1.xml
+++ b/sample/src/main/res/layout/chart_1.xml
@@ -25,6 +25,7 @@
         android:layout_height="wrap_content"
         app:chart="line"
         app:lineChartStyle="@style/Chart1LineChartStyle"
+        app:previewSeriesCount="1"
         app:showBottomAxis="true"
         app:showStartAxis="true" />
 </FrameLayout>
diff --git a/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/component/shape/shader/ComposeDynamicShader.kt b/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/component/shape/shader/ComposeDynamicShader.kt
index 82d85f306..83d2fa93b 100644
--- a/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/component/shape/shader/ComposeDynamicShader.kt
+++ b/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/component/shape/shader/ComposeDynamicShader.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 by Patryk Goworowski and Patrick Michalik.
+ * Copyright 2023 by Patryk Goworowski and Patrick Michalik.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,34 +22,37 @@ import android.graphics.PorterDuff
 import android.os.Build
 import androidx.annotation.RequiresApi
 import com.patrykandpatrick.vico.core.component.shape.shader.DynamicShader
+import com.patrykandpatrick.vico.core.component.shape.shader.DynamicShaders
 
 /**
  * Creates a [ComposeShader] out of two [DynamicShader]s by using a [BlendMode].
  */
+@Deprecated(
+    message = "This function has been moved to the `core` module.",
+    replaceWith = ReplaceWith(
+        expression = "DynamicShaders.composeShader(first, second, mode)",
+        imports = ["com.patrykandpatrick.vico.core.component.shape.shader.DynamicShaders"],
+    ),
+)
 @RequiresApi(Build.VERSION_CODES.Q)
 public fun composeShader(
     first: DynamicShader,
     second: DynamicShader,
     mode: BlendMode,
-): DynamicShader = DynamicShader { context, left, top, right, bottom ->
-    ComposeShader(
-        first.provideShader(context, left, top, right, bottom),
-        second.provideShader(context, left, top, right, bottom),
-        mode,
-    )
-}
+): DynamicShader = DynamicShaders.composeShader(first, second, mode)
 
 /**
  * Creates a [ComposeShader] out of two [DynamicShader]s by using a [PorterDuff.Mode].
  */
+@Deprecated(
+    message = "This function has been moved to the `core` module.",
+    replaceWith = ReplaceWith(
+        expression = "DynamicShaders.composeShader(first, second, mode)",
+        imports = ["com.patrykandpatrick.vico.core.component.shape.shader.DynamicShaders"],
+    ),
+)
 public fun composeShader(
     first: DynamicShader,
     second: DynamicShader,
     mode: PorterDuff.Mode,
-): DynamicShader = DynamicShader { context, left, top, right, bottom ->
-    ComposeShader(
-        first.provideShader(context, left, top, right, bottom),
-        second.provideShader(context, left, top, right, bottom),
-        mode,
-    )
-}
+): DynamicShader = DynamicShaders.composeShader(first, second, mode)
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/component/shape/shader/DynamicShaders.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/component/shape/shader/DynamicShaders.kt
index 879b353f3..02ca3a066 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/component/shape/shader/DynamicShaders.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/component/shape/shader/DynamicShaders.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 by Patryk Goworowski and Patrick Michalik.
+ * Copyright 2023 by Patryk Goworowski and Patrick Michalik.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,7 +18,12 @@ package com.patrykandpatrick.vico.core.component.shape.shader
 
 import android.graphics.Bitmap
 import android.graphics.BitmapShader
+import android.graphics.BlendMode
+import android.graphics.ComposeShader
+import android.graphics.PorterDuff
 import android.graphics.Shader
+import android.os.Build
+import androidx.annotation.RequiresApi
 import com.patrykandpatrick.vico.core.context.DrawContext
 
 /**
@@ -42,4 +47,35 @@ public object DynamicShaders {
             bottom: Float,
         ): Shader = BitmapShader(bitmap, tileXMode, tileYMode)
     }
+
+    /**
+     * Creates a [ComposeShader] out of two [DynamicShader]s by using a [BlendMode].
+     */
+    @RequiresApi(Build.VERSION_CODES.Q)
+    public fun composeShader(
+        first: DynamicShader,
+        second: DynamicShader,
+        mode: BlendMode,
+    ): DynamicShader = DynamicShader { context, left, top, right, bottom ->
+        ComposeShader(
+            first.provideShader(context, left, top, right, bottom),
+            second.provideShader(context, left, top, right, bottom),
+            mode,
+        )
+    }
+
+    /**
+     * Creates a [ComposeShader] out of two [DynamicShader]s by using a [PorterDuff.Mode].
+     */
+    public fun composeShader(
+        first: DynamicShader,
+        second: DynamicShader,
+        mode: PorterDuff.Mode,
+    ): DynamicShader = DynamicShader { context, left, top, right, bottom ->
+        ComposeShader(
+            first.provideShader(context, left, top, right, bottom),
+            second.provideShader(context, left, top, right, bottom),
+            mode,
+        )
+    }
 }
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/util/RandomEntriesGenerator.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/util/RandomEntriesGenerator.kt
index 120c3a094..6d3dadf41 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/util/RandomEntriesGenerator.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/util/RandomEntriesGenerator.kt
@@ -16,6 +16,7 @@
 
 package com.patrykandpatrick.vico.core.util
 
+import androidx.annotation.RestrictTo
 import com.patrykandpatrick.vico.core.chart.composed.ComposedChartEntryModel
 import com.patrykandpatrick.vico.core.entry.ChartEntryModel
 import com.patrykandpatrick.vico.core.entry.ChartEntryModelProducer
@@ -29,10 +30,13 @@ import kotlin.random.Random
  * Generates randomized chart entries.
  * @param xRange the range of _x_ values.
  * @param yRange the range from which _y_ values are randomly selected.
+ * @param seriesCount the number of data series to generate.
  */
 public class RandomEntriesGenerator(
     private val xRange: IntProgression = 0..X_RANGE_TOP,
     private val yRange: IntProgression = 0..Y_RANGE_TOP,
+    private val seriesCount: Int = SERIES_COUNT,
+    private val modelCount: Int = MODEL_COUNT,
 ) {
     /**
      * Generates a [List] of [FloatEntry] instances with randomized _y_ values.
@@ -60,15 +64,17 @@ public class RandomEntriesGenerator(
      * [xRange].
      */
     public fun randomComposedEntryModel(): ComposedChartEntryModel<ChartEntryModel> = ComposedChartEntryModelProducer
-        .build { repeat(MODEL_SIZE) { add(List(MODEL_SIZE) { generateRandomEntries() }) } }
+        .build { repeat(modelCount) { add(List(seriesCount) { generateRandomEntries() }) } }
         .requireModel()
 
-    private companion object {
-        const val X_RANGE_TOP = 10
-        const val Y_RANGE_TOP = 20
-        const val MODEL_SIZE = 3
+    @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
+    public companion object {
+        public const val X_RANGE_TOP: Int = 10
+        public const val Y_RANGE_TOP: Int = 20
+        public const val SERIES_COUNT: Int = 3
+        public const val MODEL_COUNT: Int = 3
 
-        fun RandomEntriesGenerator.getChartEntryModelProducer(): ChartModelProducer<ChartEntryModel> =
-            ChartEntryModelProducer(List(MODEL_SIZE) { generateRandomEntries() })
+        private fun RandomEntriesGenerator.getChartEntryModelProducer(): ChartModelProducer<ChartEntryModel> =
+            ChartEntryModelProducer(List(seriesCount) { generateRandomEntries() })
     }
 }
diff --git a/vico/views/src/main/java/com/patrykandpatrick/vico/views/chart/ChartView.kt b/vico/views/src/main/java/com/patrykandpatrick/vico/views/chart/ChartView.kt
index ddb2c559c..9119caf65 100644
--- a/vico/views/src/main/java/com/patrykandpatrick/vico/views/chart/ChartView.kt
+++ b/vico/views/src/main/java/com/patrykandpatrick/vico/views/chart/ChartView.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 by Patryk Goworowski and Patrick Michalik.
+ * Copyright 2023 by Patryk Goworowski and Patrick Michalik.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,6 +20,10 @@ import android.content.Context
 import android.util.AttributeSet
 import com.patrykandpatrick.vico.core.entry.ChartEntryModel
 import com.patrykandpatrick.vico.core.util.RandomEntriesGenerator
+import com.patrykandpatrick.vico.core.util.RandomEntriesGenerator.Companion.SERIES_COUNT
+import com.patrykandpatrick.vico.core.util.RandomEntriesGenerator.Companion.X_RANGE_TOP
+import com.patrykandpatrick.vico.core.util.RandomEntriesGenerator.Companion.Y_RANGE_TOP
+import com.patrykandpatrick.vico.views.R
 import com.patrykandpatrick.vico.views.theme.ThemeHandler
 
 /**
@@ -37,6 +41,23 @@ public class ChartView @JvmOverloads constructor(
 ) {
     init {
         chart = themeHandler.chart
-        if (isInEditMode) setModel(model = RandomEntriesGenerator().randomEntryModel())
+        if (isInEditMode && attrs != null) setPreviewModel(attrs, defStyleAttr)
+    }
+
+    private fun setPreviewModel(attrs: AttributeSet, defStyleAttr: Int) {
+        context.obtainStyledAttributes(attrs, R.styleable.ChartView, defStyleAttr, 0).use { typedArray ->
+            val seriesCount = typedArray.getInt(R.styleable.ChartView_previewSeriesCount, SERIES_COUNT)
+            val minX = typedArray.getInt(R.styleable.ChartView_previewMinX, 0)
+            val maxX = typedArray.getInt(R.styleable.ChartView_previewMaxX, X_RANGE_TOP)
+            val minY = typedArray.getInt(R.styleable.ChartView_previewMinY, 0)
+            val maxY = typedArray.getInt(R.styleable.ChartView_previewMaxY, Y_RANGE_TOP)
+            setModel(
+                model = RandomEntriesGenerator(
+                    xRange = minX..maxX,
+                    yRange = minY..maxY,
+                    seriesCount = seriesCount,
+                ).randomEntryModel(),
+            )
+        }
     }
 }
diff --git a/vico/views/src/main/java/com/patrykandpatrick/vico/views/chart/ComposedChartView.kt b/vico/views/src/main/java/com/patrykandpatrick/vico/views/chart/ComposedChartView.kt
index 535e7b0c7..efe479189 100644
--- a/vico/views/src/main/java/com/patrykandpatrick/vico/views/chart/ComposedChartView.kt
+++ b/vico/views/src/main/java/com/patrykandpatrick/vico/views/chart/ComposedChartView.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 by Patryk Goworowski and Patrick Michalik.
+ * Copyright 2023 by Patryk Goworowski and Patrick Michalik.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,6 +21,11 @@ import android.util.AttributeSet
 import com.patrykandpatrick.vico.core.chart.composed.ComposedChartEntryModel
 import com.patrykandpatrick.vico.core.entry.ChartEntryModel
 import com.patrykandpatrick.vico.core.util.RandomEntriesGenerator
+import com.patrykandpatrick.vico.core.util.RandomEntriesGenerator.Companion.MODEL_COUNT
+import com.patrykandpatrick.vico.core.util.RandomEntriesGenerator.Companion.SERIES_COUNT
+import com.patrykandpatrick.vico.core.util.RandomEntriesGenerator.Companion.X_RANGE_TOP
+import com.patrykandpatrick.vico.core.util.RandomEntriesGenerator.Companion.Y_RANGE_TOP
+import com.patrykandpatrick.vico.views.R
 import com.patrykandpatrick.vico.views.theme.ThemeHandler
 
 /**
@@ -39,6 +44,25 @@ public class ComposedChartView @JvmOverloads constructor(
 
     init {
         chart = themeHandler.composedChart
-        if (isInEditMode) setModel(model = RandomEntriesGenerator().randomComposedEntryModel())
+        if (isInEditMode && attrs != null) setPreviewModel(attrs, defStyleAttr)
+    }
+
+    private fun setPreviewModel(attrs: AttributeSet, defStyleAttr: Int) {
+        context.obtainStyledAttributes(attrs, R.styleable.ComposedChartView, defStyleAttr, 0).use { typedArray ->
+            val modelCount = typedArray.getInt(R.styleable.ComposedChartView_previewModelCount, MODEL_COUNT)
+            val seriesCount = typedArray.getInt(R.styleable.ComposedChartView_previewSeriesCount, SERIES_COUNT)
+            val minX = typedArray.getInt(R.styleable.ComposedChartView_previewMinX, 0)
+            val maxX = typedArray.getInt(R.styleable.ComposedChartView_previewMaxX, X_RANGE_TOP)
+            val minY = typedArray.getInt(R.styleable.ComposedChartView_previewMinY, 0)
+            val maxY = typedArray.getInt(R.styleable.ComposedChartView_previewMaxY, Y_RANGE_TOP)
+            setModel(
+                model = RandomEntriesGenerator(
+                    xRange = minX..maxX,
+                    yRange = minY..maxY,
+                    seriesCount = seriesCount,
+                    modelCount = modelCount,
+                ).randomComposedEntryModel(),
+            )
+        }
     }
 }
diff --git a/vico/views/src/main/res/values/attrs.xml b/vico/views/src/main/res/values/attrs.xml
index ce777169a..a4805609a 100644
--- a/vico/views/src/main/res/values/attrs.xml
+++ b/vico/views/src/main/res/values/attrs.xml
@@ -22,6 +22,11 @@
     <attr name="dataLabelRotationDegrees" format="float" />
     <attr name="showDataLabels" format="boolean" />
     <attr name="dataLabelStyle" format="reference" />
+    <attr name="previewSeriesCount" format="integer" />
+    <attr name="previewMinX" format="integer" />
+    <attr name="previewMaxX" format="integer" />
+    <attr name="previewMinY" format="integer" />
+    <attr name="previewMaxY" format="integer" />
 
     <attr name="dataLabelVerticalPosition" format="enum">
         <enum name="top" value="0" />
@@ -35,6 +40,11 @@
             <enum name="stackedColumn" value="2" />
             <enum name="line" value="4" />
         </attr>
+        <attr name="previewSeriesCount" />
+        <attr name="previewMinX" />
+        <attr name="previewMaxX" />
+        <attr name="previewMinY" />
+        <attr name="previewMaxY" />
     </declare-styleable>
 
     <declare-styleable name="ComposedChartView">
@@ -43,6 +53,12 @@
             <flag name="stackedColumn" value="2" />
             <flag name="line" value="4" />
         </attr>
+        <attr name="previewModelCount" format="integer" />
+        <attr name="previewSeriesCount" />
+        <attr name="previewMinX" />
+        <attr name="previewMaxX" />
+        <attr name="previewMinY" />
+        <attr name="previewMaxY" />
     </declare-styleable>
 
     <declare-styleable name="BaseChartView">

From 2be6a7884cab61b12287980c4de71492bd86585f Mon Sep 17 00:00:00 2001
From: Patryk Goworowski <patrykgoworowski@gmail.com>
Date: Sun, 15 Oct 2023 19:04:17 +0200
Subject: [PATCH 02/15] Add and use `FillStyle` for the line and its background
 appearance in `LineChart`

---
 .../LineChartsWithNegativeValuesPreviews.kt   | 131 +++++++++++
 .../vico/sample/showcase/ShowcaseScreen.kt    |   2 +
 .../vico/sample/showcase/ShowcaseViewModel.kt |   9 +
 .../vico/sample/showcase/charts/Chart9.kt     | 168 ++++++++++++++
 sample/src/main/res/layout/chart_9.xml        |  39 ++++
 .../main/res/values-night/chart_9_styles.xml  |  20 ++
 sample/src/main/res/values-night/colors.xml   |  19 ++
 sample/src/main/res/values/chart_9_styles.xml |  77 +++++++
 sample/src/main/res/values/colors.xml         |  19 ++
 sample/src/main/res/values/themes.xml         |   6 +-
 versions.gradle                               |   2 +-
 .../vico/compose/chart/fill/FillStyles.kt     |  58 +++++
 .../vico/core/chart/LineSpecExtensions.kt     |  76 ++++++-
 .../vico/core/chart/fill/FillStyle.kt         | 211 ++++++++++++++++++
 .../vico/core/chart/line/LineChart.kt         | 161 ++++++++-----
 .../shape/shader/HorizontalSplitShader.kt     | 207 +++++++++++++++++
 .../views/theme/ComponentStyleExtensions.kt   |  58 +++--
 vico/views/src/main/res/values/attrs.xml      |   2 +
 .../src/main/res/values/line_chart_attrs.xml  |   6 +
 19 files changed, 1202 insertions(+), 69 deletions(-)
 create mode 100644 sample/src/main/java/com/patrykandpatrick/vico/sample/previews/LineChartsWithNegativeValuesPreviews.kt
 create mode 100644 sample/src/main/java/com/patrykandpatrick/vico/sample/showcase/charts/Chart9.kt
 create mode 100644 sample/src/main/res/layout/chart_9.xml
 create mode 100644 sample/src/main/res/values-night/chart_9_styles.xml
 create mode 100644 sample/src/main/res/values-night/colors.xml
 create mode 100644 sample/src/main/res/values/chart_9_styles.xml
 create mode 100644 sample/src/main/res/values/colors.xml
 create mode 100644 vico/compose/src/main/java/com/patrykandpatrick/vico/compose/chart/fill/FillStyles.kt
 create mode 100644 vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/fill/FillStyle.kt
 create mode 100644 vico/core/src/main/java/com/patrykandpatrick/vico/core/component/shape/shader/HorizontalSplitShader.kt

diff --git a/sample/src/main/java/com/patrykandpatrick/vico/sample/previews/LineChartsWithNegativeValuesPreviews.kt b/sample/src/main/java/com/patrykandpatrick/vico/sample/previews/LineChartsWithNegativeValuesPreviews.kt
new file mode 100644
index 000000000..aaff9e7c2
--- /dev/null
+++ b/sample/src/main/java/com/patrykandpatrick/vico/sample/previews/LineChartsWithNegativeValuesPreviews.kt
@@ -0,0 +1,131 @@
+/*
+ * Copyright 2023 by Patryk Goworowski and Patrick Michalik.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.patrykandpatrick.vico.sample.previews
+
+import androidx.compose.foundation.layout.height
+import androidx.compose.material.Surface
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import com.patrykandpatrick.vico.compose.axis.axisLineComponent
+import com.patrykandpatrick.vico.compose.axis.horizontal.rememberBottomAxis
+import com.patrykandpatrick.vico.compose.axis.vertical.rememberStartAxis
+import com.patrykandpatrick.vico.compose.chart.Chart
+import com.patrykandpatrick.vico.compose.chart.fill.split
+import com.patrykandpatrick.vico.compose.chart.layout.fullWidth
+import com.patrykandpatrick.vico.compose.chart.line.lineChart
+import com.patrykandpatrick.vico.compose.chart.line.lineSpec
+import com.patrykandpatrick.vico.compose.component.textComponent
+import com.patrykandpatrick.vico.core.axis.AxisItemPlacer
+import com.patrykandpatrick.vico.core.chart.fill.FillStyle
+import com.patrykandpatrick.vico.core.chart.layout.HorizontalLayout
+import com.patrykandpatrick.vico.core.chart.values.AxisValuesOverrider
+import com.patrykandpatrick.vico.core.entry.entryModelOf
+import com.patrykandpatrick.vico.sample.showcase.rememberMarker
+
+private val model = entryModelOf(-2f, -1f, 4f, -2f, 1f, 5f, -3f)
+
+@Preview
+@Composable
+public fun SingleLineChartWithNegativeValues() {
+    val marker = rememberMarker()
+    Surface {
+        Chart(
+            modifier = Modifier.height(250.dp),
+            chart = lineChart(
+                lines = listOf(
+                    lineSpec(
+                        lineFill = FillStyle.split(
+                            positiveColor = Color(0xFF25BE53),
+                            negativeColor = Color(0xFFE73B3B),
+                        ),
+                    ),
+                ),
+                persistentMarkers = mapOf(
+                    2f to marker,
+                    3f to marker,
+                ),
+            ),
+            model = model,
+            startAxis = rememberStartAxis(
+                itemPlacer = remember { AxisItemPlacer.Vertical.default(maxItemCount = 4) },
+                guideline = axisLineComponent(),
+            ),
+            bottomAxis = rememberBottomAxis(
+                guideline = axisLineComponent(),
+                itemPlacer = AxisItemPlacer.Horizontal.default(
+                    spacing = 2,
+                ),
+            ),
+            horizontalLayout = HorizontalLayout.fullWidth(),
+        )
+    }
+}
+
+@Preview
+@Composable
+public fun SingleLineChartWithNegativeValuesAndDataLabels() {
+    Surface {
+        Chart(
+            chart = lineChart(
+                lines = listOf(lineSpec(lineColor = Color.DarkGray, dataLabel = textComponent())),
+            ),
+            model = model,
+            startAxis = rememberStartAxis(),
+            bottomAxis = rememberBottomAxis(),
+        )
+    }
+}
+
+@Preview
+@Composable
+public fun SingleLineChartWithNegativeValuesAndAxisValuesOverridden() {
+    Surface {
+        Chart(
+            chart = lineChart(
+                axisValuesOverrider = AxisValuesOverrider.fixed(
+                    minY = 1f,
+                    maxY = 4f,
+                ),
+            ),
+            model = model,
+            startAxis = rememberStartAxis(itemPlacer = remember { AxisItemPlacer.Vertical.default(maxItemCount = 4) }),
+            bottomAxis = rememberBottomAxis(),
+        )
+    }
+}
+
+@Preview
+@Composable
+public fun SingleLineChartWithNegativeValuesAndAxisValuesOverridden2() {
+    Surface {
+        Chart(
+            chart = lineChart(
+                axisValuesOverrider = AxisValuesOverrider.fixed(
+                    minY = -2f,
+                    maxY = 0f,
+                ),
+            ),
+            model = model,
+            startAxis = rememberStartAxis(itemPlacer = remember { AxisItemPlacer.Vertical.default(maxItemCount = 3) }),
+            bottomAxis = rememberBottomAxis(),
+        )
+    }
+}
diff --git a/sample/src/main/java/com/patrykandpatrick/vico/sample/showcase/ShowcaseScreen.kt b/sample/src/main/java/com/patrykandpatrick/vico/sample/showcase/ShowcaseScreen.kt
index 69658eec8..db24809f5 100644
--- a/sample/src/main/java/com/patrykandpatrick/vico/sample/showcase/ShowcaseScreen.kt
+++ b/sample/src/main/java/com/patrykandpatrick/vico/sample/showcase/ShowcaseScreen.kt
@@ -47,6 +47,7 @@ import com.patrykandpatrick.vico.sample.showcase.charts.Chart5
 import com.patrykandpatrick.vico.sample.showcase.charts.Chart6
 import com.patrykandpatrick.vico.sample.showcase.charts.Chart7
 import com.patrykandpatrick.vico.sample.showcase.charts.Chart8
+import com.patrykandpatrick.vico.sample.showcase.charts.Chart9
 import com.patrykandpatrick.vico.sample.utils.plus
 
 @Composable
@@ -89,6 +90,7 @@ internal fun ShowcaseScreen(viewModel: ShowcaseViewModel = viewModel()) {
 }
 
 private fun LazyListScope.chartItems(uiSystem: UISystem, viewModel: ShowcaseViewModel) {
+    cardItem { Chart9(uiSystem, viewModel.positiveAndNegativeChartEntryModelProducer) }
     cardItem { Chart1(uiSystem, viewModel.customStepChartEntryModelProducer) }
     cardItem { Chart2(uiSystem, viewModel.chartEntryModelProducer) }
     cardItem { Chart3(uiSystem, viewModel.chartEntryModelProducer) }
diff --git a/sample/src/main/java/com/patrykandpatrick/vico/sample/showcase/ShowcaseViewModel.kt b/sample/src/main/java/com/patrykandpatrick/vico/sample/showcase/ShowcaseViewModel.kt
index 48844068b..21eae0e0f 100644
--- a/sample/src/main/java/com/patrykandpatrick/vico/sample/showcase/ShowcaseViewModel.kt
+++ b/sample/src/main/java/com/patrykandpatrick/vico/sample/showcase/ShowcaseViewModel.kt
@@ -41,8 +41,15 @@ internal class ShowcaseViewModel : ViewModel() {
         yRange = GENERATOR_Y_RANGE_BOTTOM..GENERATOR_Y_RANGE_TOP,
     )
 
+    private val positiveAndNegativeValuesGenerator = RandomEntriesGenerator(
+        xRange = 0..GENERATOR_X_RANGE_TOP,
+        yRange = -10..GENERATOR_Y_RANGE_TOP,
+    )
+
     internal val chartEntryModelProducer: ChartEntryModelProducer = ChartEntryModelProducer()
 
+    internal val positiveAndNegativeChartEntryModelProducer: ChartEntryModelProducer = ChartEntryModelProducer()
+
     internal val customStepChartEntryModelProducer: ChartEntryModelProducer = ChartEntryModelProducer()
 
     internal val multiDataSetChartEntryModelProducer: ChartEntryModelProducer = ChartEntryModelProducer()
@@ -58,6 +65,8 @@ internal class ShowcaseViewModel : ViewModel() {
                 val randomSeries = generator.generateRandomEntries()
                 val randomDataSet = List(MULTI_ENTRIES_COMBINED) { generator.generateRandomEntries() }
                 chartEntryModelProducer.setEntries(randomSeries)
+                positiveAndNegativeChartEntryModelProducer
+                    .setEntries(positiveAndNegativeValuesGenerator.generateRandomEntries())
                 multiDataSetChartEntryModelProducer.setEntries(randomDataSet)
                 customStepChartEntryModelProducer.setEntries(customStepGenerator.generateRandomEntries())
                 composedChartEntryModelProducer.runTransaction {
diff --git a/sample/src/main/java/com/patrykandpatrick/vico/sample/showcase/charts/Chart9.kt b/sample/src/main/java/com/patrykandpatrick/vico/sample/showcase/charts/Chart9.kt
new file mode 100644
index 000000000..ce58fe842
--- /dev/null
+++ b/sample/src/main/java/com/patrykandpatrick/vico/sample/showcase/charts/Chart9.kt
@@ -0,0 +1,168 @@
+/*
+ * Copyright 2023 by Patryk Goworowski and Patrick Michalik.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.patrykandpatrick.vico.sample.showcase.charts
+
+import android.graphics.PorterDuff
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.ReadOnlyComposable
+import androidx.compose.runtime.remember
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.res.colorResource
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.viewinterop.AndroidViewBinding
+import com.patrykandpatrick.vico.R
+import com.patrykandpatrick.vico.compose.axis.axisLabelComponent
+import com.patrykandpatrick.vico.compose.axis.horizontal.rememberBottomAxis
+import com.patrykandpatrick.vico.compose.axis.vertical.rememberStartAxis
+import com.patrykandpatrick.vico.compose.chart.Chart
+import com.patrykandpatrick.vico.compose.chart.fill.split
+import com.patrykandpatrick.vico.compose.chart.fill.splitShader
+import com.patrykandpatrick.vico.compose.chart.layout.fullWidth
+import com.patrykandpatrick.vico.compose.chart.line.lineChart
+import com.patrykandpatrick.vico.compose.chart.line.lineSpec
+import com.patrykandpatrick.vico.compose.component.lineComponent
+import com.patrykandpatrick.vico.compose.component.shape.dashedShape
+import com.patrykandpatrick.vico.compose.component.shape.shader.fromComponent
+import com.patrykandpatrick.vico.compose.component.shape.shader.verticalGradient
+import com.patrykandpatrick.vico.compose.component.shapeComponent
+import com.patrykandpatrick.vico.compose.dimensions.dimensionsOf
+import com.patrykandpatrick.vico.compose.style.ProvideChartStyle
+import com.patrykandpatrick.vico.core.axis.Axis
+import com.patrykandpatrick.vico.core.axis.AxisItemPlacer
+import com.patrykandpatrick.vico.core.chart.fill.FillStyle
+import com.patrykandpatrick.vico.core.chart.layout.HorizontalLayout
+import com.patrykandpatrick.vico.core.component.shape.Shapes
+import com.patrykandpatrick.vico.core.component.shape.shader.DynamicShaders
+import com.patrykandpatrick.vico.core.entry.ChartEntryModelProducer
+import com.patrykandpatrick.vico.databinding.Chart9Binding
+import com.patrykandpatrick.vico.sample.showcase.UISystem
+import com.patrykandpatrick.vico.sample.showcase.rememberChartStyle
+import com.patrykandpatrick.vico.sample.showcase.rememberMarker
+
+@Composable
+internal fun Chart9(uiSystem: UISystem, chartEntryModelProducer: ChartEntryModelProducer) {
+    when (uiSystem) {
+        UISystem.Compose -> ComposeChart9(chartEntryModelProducer)
+        UISystem.Views -> ViewChart9(chartEntryModelProducer)
+    }
+}
+
+@Composable
+private fun ComposeChart9(chartEntryModelProducer: ChartEntryModelProducer) {
+    val marker = rememberMarker()
+    ProvideChartStyle(rememberChartStyle(chartColors)) {
+        Chart(
+            chart = lineChart(
+                lines = listOf(
+                    lineSpec(
+                        lineFill = FillStyle.split(chartColors[0], chartColors[1]),
+//                        lineBackgroundFill = FillStyle.brush(
+//                        Brush.horizontalGradient(listOf(chartColors[0], chartColors[1]))
+//                        ),
+//                        lineBackgroundFill = FillStyle.split(chartColors[0], chartColors[1]),
+                        lineBackgroundFill = FillStyle.splitShader(
+                            DynamicShaders.composeShader(
+                                DynamicShaders.fromComponent(
+                                    componentSize = 6.dp,
+                                    component = shapeComponent(
+                                        shape = Shapes.pillShape,
+                                        color = chartColors[0],
+                                        margins = remember { dimensionsOf(1.dp) },
+                                    ),
+                                ),
+                                verticalGradient(arrayOf(Color.Black, Color.Transparent)),
+                                PorterDuff.Mode.DST_IN,
+                            ),
+                            DynamicShaders.composeShader(
+                                DynamicShaders.fromComponent(
+                                    componentSize = 5.dp,
+                                    component = shapeComponent(
+                                        shape = Shapes.rectShape,
+                                        color = chartColors[1],
+                                        margins = remember { dimensionsOf(horizontal = 2.dp) },
+                                    ),
+                                    checkeredArrangement = false,
+                                ),
+                                verticalGradient(arrayOf(Color.Transparent, Color.Black)),
+                                PorterDuff.Mode.DST_IN,
+                            ),
+                        ),
+                    ),
+                ),
+            ),
+            chartModelProducer = chartEntryModelProducer,
+            startAxis = rememberStartAxis(
+                label = axisLabelComponent(
+                    color = MaterialTheme.colorScheme.onBackground,
+                    background = shapeComponent(
+                        shape = Shapes.pillShape,
+                        color = MaterialTheme.colorScheme.background,
+                        strokeColor = MaterialTheme.colorScheme.outlineVariant,
+                        strokeWidth = 1.dp,
+                    ),
+                    padding = remember { dimensionsOf(horizontal = 6.dp, vertical = 2.dp) },
+                    margins = remember { dimensionsOf(end = 8.dp) },
+                ),
+                axis = null,
+                tick = null,
+                guideline = lineComponent(
+                    thickness = 1.dp,
+                    color = MaterialTheme.colorScheme.outlineVariant,
+                    shape = remember {
+                        Shapes.dashedShape(
+                            shape = Shapes.pillShape,
+                            dashLength = 4.dp,
+                            gapLength = 8.dp,
+                        )
+                    },
+                ),
+                itemPlacer = remember { AxisItemPlacer.Vertical.default(maxItemCount = 4) },
+            ),
+            bottomAxis = rememberBottomAxis(
+                guideline = null,
+                itemPlacer = AxisItemPlacer.Horizontal.default(
+                    spacing = 3,
+                ),
+            ),
+            marker = marker,
+            runInitialAnimation = false,
+            horizontalLayout = HorizontalLayout.fullWidth(),
+        )
+    }
+}
+
+@Composable
+private fun ViewChart9(chartEntryModelProducer: ChartEntryModelProducer) {
+    val marker = rememberMarker()
+    AndroidViewBinding(Chart9Binding::inflate) {
+        with(chartView) {
+            runInitialAnimation = false
+            entryProducer = chartEntryModelProducer
+            (bottomAxis as Axis).guideline = null
+            this.marker = marker
+        }
+    }
+}
+
+private val chartColors
+    @ReadOnlyComposable
+    @Composable
+    get() = listOf(
+        colorResource(id = R.color.chart_9_color_positive),
+        colorResource(id = R.color.chart_9_color_negative),
+    )
diff --git a/sample/src/main/res/layout/chart_9.xml b/sample/src/main/res/layout/chart_9.xml
new file mode 100644
index 000000000..81a618baa
--- /dev/null
+++ b/sample/src/main/res/layout/chart_9.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright 2023 by Patryk Goworowski and Patrick Michalik.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content">
+
+    <com.patrykandpatrick.vico.views.chart.ChartView
+        android:id="@+id/chart_view"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:theme="@style/Chart9ThemeOverlay"
+        app:bottomAxisStyle="@style/Chart9BottomAxisStyle"
+        app:chart="line"
+        app:horizontalLayout="fullWidth"
+        app:line1Spec="@style/Chart9Line1Style"
+        app:lineChartStyle="@style/Chart9LineChartStyle"
+        app:previewMaxX="8"
+        app:previewMaxY="10"
+        app:previewMinY="-7"
+        app:previewSeriesCount="1"
+        app:showBottomAxis="true"
+        app:showStartAxis="true"
+        app:startAxisStyle="@style/Chart9StartAxisStyle" />
+</FrameLayout>
diff --git a/sample/src/main/res/values-night/chart_9_styles.xml b/sample/src/main/res/values-night/chart_9_styles.xml
new file mode 100644
index 000000000..5097869de
--- /dev/null
+++ b/sample/src/main/res/values-night/chart_9_styles.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright 2023 by Patryk Goworowski and Patrick Michalik.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<resources>
+    <color name="chart_9_color_positive">#C7FF6C</color>
+    <color name="chart_9_color_negative">#A46CFF</color>
+</resources>
diff --git a/sample/src/main/res/values-night/colors.xml b/sample/src/main/res/values-night/colors.xml
new file mode 100644
index 000000000..e0ae485e3
--- /dev/null
+++ b/sample/src/main/res/values-night/colors.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright 2023 by Patryk Goworowski and Patrick Michalik.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<resources>
+    <color name="background">#000</color>
+</resources>
diff --git a/sample/src/main/res/values/chart_9_styles.xml b/sample/src/main/res/values/chart_9_styles.xml
new file mode 100644
index 000000000..378a4ae60
--- /dev/null
+++ b/sample/src/main/res/values/chart_9_styles.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright 2023 by Patryk Goworowski and Patrick Michalik.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<resources>
+    <color name="chart_9_color_positive">#FF3716FF</color>
+    <color name="chart_9_color_negative">#FFFF166A</color>
+
+    <style name="Chart9Line1Style">
+        <item name="positiveColor">?colorPrimary</item>
+        <item name="negativeColor">?colorSecondary</item>
+    </style>
+
+    <style name="Chart9LineChartStyle">
+        <item name="line1Spec">@style/Chart9Line1Style</item>
+    </style>
+
+    <style name="Chart9BottomAxisStyle">
+        <item name="horizontalAxisLabelSpacing">3</item>
+        <item name="showGuideline">false</item>
+    </style>
+
+    <style name="Chart9StartAxisStyle">
+        <item name="maxVerticalAxisItemCount">4</item>
+        <item name="axisLabelStyle">@style/Chart9StartAxisLabelStyle</item>
+        <item name="showTick">false</item>
+        <item name="showAxisLine">false</item>
+        <item name="axisGuidelineStyle">@style/Chart9AxisGuidelineStyle</item>
+    </style>
+
+    <style name="Chart9StartAxisLabelStyle">
+        <item name="backgroundStyle">@style/Chart9StartAxisLabelBackgroundStyle</item>
+        <item name="marginEnd">8dp</item>
+        <item name="android:paddingStart">6dp</item>
+        <item name="android:paddingEnd">6dp</item>
+        <item name="android:paddingTop">2dp</item>
+        <item name="android:paddingBottom">2dp</item>
+    </style>
+
+    <style name="Chart9StartAxisLabelBackgroundStyle">
+        <item name="color">?android:backgroundTint</item>
+        <item name="shapeStyle">@style/Chart9StartAxisLabelBackgroundShapeStyle</item>
+        <item name="strokeWidth">1dp</item>
+        <item name="strokeColor">?colorOutlineVariant</item>
+    </style>
+
+    <style name="Chart9StartAxisLabelBackgroundShapeStyle">
+        <item name="cornerSize">50%</item>
+    </style>
+
+    <style name="Chart9AxisGuidelineStyle">
+        <item name="shapeStyle">@style/Chart9AxisGuidelineShapeStyle</item>
+        <item name="color">?colorOutlineVariant</item>
+    </style>
+
+    <style name="Chart9AxisGuidelineShapeStyle">
+        <item name="dashLength">4dp</item>
+        <item name="dashGapLength">8dp</item>
+    </style>
+
+    <style name="Chart9ThemeOverlay" parent="Theme.Vico">
+        <item name="colorPrimary">@color/chart_9_color_positive</item>
+        <item name="colorSecondary">@color/chart_9_color_negative</item>
+    </style>
+</resources>
diff --git a/sample/src/main/res/values/colors.xml b/sample/src/main/res/values/colors.xml
new file mode 100644
index 000000000..daa68970b
--- /dev/null
+++ b/sample/src/main/res/values/colors.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright 2023 by Patryk Goworowski and Patrick Michalik.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<resources>
+    <color name="background">#FFF5F5F7</color>
+</resources>
diff --git a/sample/src/main/res/values/themes.xml b/sample/src/main/res/values/themes.xml
index 3059aed03..95eb13609 100644
--- a/sample/src/main/res/values/themes.xml
+++ b/sample/src/main/res/values/themes.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  ~ Copyright 2022 by Patryk Goworowski and Patrick Michalik.
+  ~ Copyright 2023 by Patryk Goworowski and Patrick Michalik.
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -18,5 +18,7 @@
 
 <resources>
 
-    <style name="Theme.Vico" parent="Theme.Material3.DayNight.NoActionBar" />
+    <style name="Theme.Vico" parent="Theme.Material3.DayNight.NoActionBar">
+        <item name="android:backgroundTint">@color/background</item>
+    </style>
 </resources>
diff --git a/versions.gradle b/versions.gradle
index ff543d727..eed7f35f0 100644
--- a/versions.gradle
+++ b/versions.gradle
@@ -21,7 +21,7 @@ ext {
             version_name   : "1.13.0",
             version_code   : 1,
             target_sdk     : 34,
-            min_sdk        : 16,
+            min_sdk        : 19,
             compose_min_sdk: 21,
     ]
 }
diff --git a/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/chart/fill/FillStyles.kt b/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/chart/fill/FillStyles.kt
new file mode 100644
index 000000000..2b7de1849
--- /dev/null
+++ b/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/chart/fill/FillStyles.kt
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2023 by Patryk Goworowski and Patrick Michalik.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.patrykandpatrick.vico.compose.chart.fill
+
+import androidx.compose.ui.graphics.Brush
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.toArgb
+import com.patrykandpatrick.vico.compose.component.shape.shader.toDynamicShader
+import com.patrykandpatrick.vico.core.chart.fill.FillStyle
+import com.patrykandpatrick.vico.core.component.shape.shader.DynamicShader
+
+/**
+ * Creates a [FillStyle] that fills the area with a solid color.
+ */
+public fun FillStyle.Companion.solid(color: Color): FillStyle.Solid = FillStyle.Solid(color.toArgb())
+
+/**
+ * Creates a [FillStyle] with split colors. The positive color is used for values above the zero line, and the negative
+ * color is used for values below the zero line.
+ */
+public fun FillStyle.Companion.split(positiveColor: Color, negativeColor: Color): FillStyle.Split =
+    FillStyle.Split(positiveColor.toArgb(), negativeColor.toArgb())
+
+/**
+ * Creates a [FillStyle] with a [DynamicShader].
+ */
+public fun FillStyle.Companion.shader(shader: DynamicShader): FillStyle.Shader<DynamicShader> =
+    FillStyle.Shader(shader)
+
+/**
+ * Creates a [FillStyle] with a [DynamicShader] that is split into two shaders. The positive shader is used for values
+ * above the zero line, and the negative shader is used for values below the zero line.
+ */
+public fun FillStyle.Companion.splitShader(
+    positiveShader: DynamicShader,
+    negativeShader: DynamicShader,
+): FillStyle.SplitShader =
+    FillStyle.SplitShader(positiveShader, negativeShader)
+
+/**
+ * Creates a [FillStyle] with a [Brush].
+ */
+public fun FillStyle.Companion.brush(brush: Brush): FillStyle.Shader<DynamicShader> =
+    FillStyle.Shader(brush.toDynamicShader())
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/LineSpecExtensions.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/LineSpecExtensions.kt
index b4c67a3c0..e0542375b 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/LineSpecExtensions.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/LineSpecExtensions.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 by Patryk Goworowski and Patrick Michalik.
+ * Copyright 2023 by Patryk Goworowski and Patrick Michalik.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,6 +17,7 @@
 package com.patrykandpatrick.vico.core.chart
 
 import android.graphics.Paint
+import com.patrykandpatrick.vico.core.chart.fill.FillStyle
 import com.patrykandpatrick.vico.core.chart.line.LineChart
 import com.patrykandpatrick.vico.core.component.Component
 import com.patrykandpatrick.vico.core.component.shape.shader.DynamicShader
@@ -27,8 +28,15 @@ import com.patrykandpatrick.vico.core.formatter.ValueFormatter
 /**
  * Creates a new [LineChart.LineSpec] based on this one, updating select properties.
  */
+@Deprecated(
+    message = "`lineColor` and `lineBackgroundShader` are deprecated. Use `lineFill` and `lineBackgroundFill`",
+    replaceWith = ReplaceWith(
+        "copy(lineFill = lineFill, lineBackgroundFill = lineBackgroundFill)",
+        "com.patrykandpatrick.vico.core.chart.fill.FillStyle",
+    ),
+)
 public fun LineChart.LineSpec.copy(
-    lineColor: Int = this.lineColor,
+    lineColor: Int,
     lineThicknessDp: Float = this.lineThicknessDp,
     lineBackgroundShader: DynamicShader? = this.lineBackgroundShader,
     lineCap: Paint.Cap = this.lineCap,
@@ -52,3 +60,67 @@ public fun LineChart.LineSpec.copy(
     dataLabelRotationDegrees = dataLabelRotationDegrees,
     pointConnector = pointConnector,
 )
+
+/**
+ * Creates a new [LineChart.LineSpec] based on this one, updating select properties.
+ */
+@Deprecated(
+    message = "`lineColor` and `lineBackgroundShader` are deprecated. Use `lineFill` and `lineBackgroundFill`",
+    replaceWith = ReplaceWith(
+        "copy(lineFill = lineFill, lineBackgroundFill = lineBackgroundFill)",
+        "com.patrykandpatrick.vico.core.chart.fill.FillStyle",
+    ),
+)
+public fun LineChart.LineSpec.copy(
+    lineThicknessDp: Float = this.lineThicknessDp,
+    lineBackgroundShader: DynamicShader?,
+    lineCap: Paint.Cap = this.lineCap,
+    point: Component? = this.point,
+    pointSizeDp: Float = this.pointSizeDp,
+    dataLabel: TextComponent? = this.dataLabel,
+    dataLabelVerticalPosition: VerticalPosition = this.dataLabelVerticalPosition,
+    dataLabelValueFormatter: ValueFormatter = this.dataLabelValueFormatter,
+    dataLabelRotationDegrees: Float = this.dataLabelRotationDegrees,
+    pointConnector: LineChart.LineSpec.PointConnector = this.pointConnector,
+): LineChart.LineSpec = LineChart.LineSpec(
+    lineColor = lineColor,
+    lineThicknessDp = lineThicknessDp,
+    lineBackgroundShader = lineBackgroundShader,
+    lineCap = lineCap,
+    point = point,
+    pointSizeDp = pointSizeDp,
+    dataLabel = dataLabel,
+    dataLabelVerticalPosition = dataLabelVerticalPosition,
+    dataLabelValueFormatter = dataLabelValueFormatter,
+    dataLabelRotationDegrees = dataLabelRotationDegrees,
+    pointConnector = pointConnector,
+)
+
+/**
+ * Creates a new [LineChart.LineSpec] based on this one, updating select properties.
+ */
+public fun LineChart.LineSpec.copy(
+    lineFill: FillStyle = this.lineFill,
+    lineThicknessDp: Float = this.lineThicknessDp,
+    lineBackgroundFill: FillStyle? = this.lineBackgroundFill,
+    lineCap: Paint.Cap = this.lineCap,
+    point: Component? = this.point,
+    pointSizeDp: Float = this.pointSizeDp,
+    dataLabel: TextComponent? = this.dataLabel,
+    dataLabelVerticalPosition: VerticalPosition = this.dataLabelVerticalPosition,
+    dataLabelValueFormatter: ValueFormatter = this.dataLabelValueFormatter,
+    dataLabelRotationDegrees: Float = this.dataLabelRotationDegrees,
+    pointConnector: LineChart.LineSpec.PointConnector = this.pointConnector,
+): LineChart.LineSpec = LineChart.LineSpec(
+    lineFill = lineFill,
+    lineThicknessDp = lineThicknessDp,
+    lineBackgroundFill = lineBackgroundFill,
+    lineCap = lineCap,
+    point = point,
+    pointSizeDp = pointSizeDp,
+    dataLabel = dataLabel,
+    dataLabelVerticalPosition = dataLabelVerticalPosition,
+    dataLabelValueFormatter = dataLabelValueFormatter,
+    dataLabelRotationDegrees = dataLabelRotationDegrees,
+    pointConnector = pointConnector,
+)
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/fill/FillStyle.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/fill/FillStyle.kt
new file mode 100644
index 000000000..427c314ac
--- /dev/null
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/fill/FillStyle.kt
@@ -0,0 +1,211 @@
+/*
+ * Copyright 2023 by Patryk Goworowski and Patrick Michalik.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.patrykandpatrick.vico.core.chart.fill
+
+import android.graphics.Bitmap
+import android.graphics.Canvas
+import android.graphics.Paint
+import android.graphics.RectF
+import com.patrykandpatrick.vico.core.component.shape.shader.DynamicShader
+import com.patrykandpatrick.vico.core.component.shape.shader.HorizontalSplitShader
+import com.patrykandpatrick.vico.core.context.DrawContext
+import com.patrykandpatrick.vico.core.context.getOrPutExtra
+import com.patrykandpatrick.vico.core.model.Point
+import kotlin.math.roundToInt
+
+/**
+ * Defines an appearance of a component. It modifies the [Paint] object and applies either a color integer, or a
+ * [android.graphics.Shader] to it.
+ */
+public interface FillStyle {
+
+    /**
+     * Applies the style to the [Paint] object.
+     *
+     * @param paint the [Paint] object to apply the style to.
+     * @param drawContext the [DrawContext] for the current draw operation.
+     * @param rectF the [RectF] holding coordinates of the area to apply the style to.
+     * @param zeroLineYFraction the fraction of the height of the area to apply the style to, that the zero line is at.
+     */
+    public fun applyTo(paint: Paint, drawContext: DrawContext, rectF: RectF, zeroLineYFraction: Float) {
+        applyTo(paint, drawContext, rectF.left, rectF.top, rectF.right, rectF.bottom, zeroLineYFraction)
+    }
+
+    /**
+     * Applies the style to the [Paint] object.
+     *
+     * @param paint the [Paint] object to apply the style to.
+     * @param drawContext the [DrawContext] for the current draw operation.
+     * @param left the left coordinate of the area to apply the style to.
+     * @param top the top coordinate of the area to apply the style to.
+     * @param right the right coordinate of the area to apply the style to.
+     * @param bottom the bottom coordinate of the area to apply the style to.
+     * @param zeroLineYFraction the fraction of the height of the area to apply the style to, that the zero line is at.
+     */
+    public fun applyTo(
+        paint: Paint,
+        drawContext: DrawContext,
+        left: Float,
+        top: Float,
+        right: Float,
+        bottom: Float,
+        zeroLineYFraction: Float,
+    )
+
+    /**
+     * Gets the color of the style at the given point.
+     *
+     * @param point the [Point] to get the color at.
+     * @param drawContext the [DrawContext] for the current draw operation.
+     * @param rectF the [RectF] holding coordinates of the area to apply the style to.
+     * @param zeroLineYFraction the fraction of the height of the area to apply the style to, that the zero line is at.
+     */
+    public fun getColorAt(point: Point, drawContext: DrawContext, rectF: RectF, zeroLineYFraction: Float): Int
+
+    /**
+     * A solid color fill style.
+     *
+     * @param color the color of the fill.
+     */
+    public class Solid(public val color: Int) : FillStyle {
+
+        override fun applyTo(
+            paint: Paint,
+            drawContext: DrawContext,
+            left: Float,
+            top: Float,
+            right: Float,
+            bottom: Float,
+            zeroLineYFraction: Float,
+        ) {
+            paint.color = color
+            paint.shader = null
+        }
+
+        override fun getColorAt(point: Point, drawContext: DrawContext, rectF: RectF, zeroLineYFraction: Float): Int =
+            color
+    }
+
+    /**
+     * A shader fill style. It wraps a [DynamicShader] and uses it as the fill.
+     *
+     * @param dynamicShader the [DynamicShader] to use as the fill.
+     */
+    public open class Shader<Shader : DynamicShader>(public var dynamicShader: Shader) : FillStyle {
+
+        private val bitmapKey: Any = Any()
+
+        protected val paint: Paint = Paint(Paint.ANTI_ALIAS_FLAG)
+        override fun applyTo(
+            paint: Paint,
+            drawContext: DrawContext,
+            left: Float,
+            top: Float,
+            right: Float,
+            bottom: Float,
+            zeroLineYFraction: Float,
+        ) {
+            paint.shader = dynamicShader.provideShader(drawContext, left, top, right, bottom)
+        }
+
+        override fun getColorAt(point: Point, drawContext: DrawContext, rectF: RectF, zeroLineYFraction: Float): Int {
+            val bitmap = drawContext.getOrPutExtra(bitmapKey) { dynamicShader.getBitmap(drawContext, paint, rectF) }
+            return bitmap.getPixel(
+                (point.x - rectF.left).toInt().coerceIn(0, rectF.width().toInt() - 1),
+                (point.y - rectF.top).toInt().coerceIn(0, rectF.height().toInt() - 1),
+            )
+        }
+    }
+
+    /**
+     * A split fill style. It uses two colors to fill the area, with the zero line being the divider.
+     *
+     * @param positiveColor the color to use for the positive area.
+     * @param negativeColor the color to use for the negative area.
+     */
+    public class Split(
+        positiveColor: Int,
+        negativeColor: Int,
+    ) : Shader<HorizontalSplitShader.Solid>(HorizontalSplitShader.Solid(positiveColor, negativeColor)) {
+
+        public var positiveColor: Int by dynamicShader::colorTop
+
+        public var negativeColor: Int by dynamicShader::colorBottom
+
+        override fun applyTo(
+            paint: Paint,
+            drawContext: DrawContext,
+            left: Float,
+            top: Float,
+            right: Float,
+            bottom: Float,
+            zeroLineYFraction: Float,
+        ) {
+            dynamicShader.dividerYFraction = zeroLineYFraction
+            super.applyTo(paint, drawContext, left, top, right, bottom, zeroLineYFraction)
+        }
+
+        override fun getColorAt(point: Point, drawContext: DrawContext, rectF: RectF, zeroLineYFraction: Float): Int {
+            dynamicShader.dividerYFraction = zeroLineYFraction
+            return super.getColorAt(point, drawContext, rectF, zeroLineYFraction)
+        }
+    }
+
+    /**
+     * A split shader fill style. It wraps a [DynamicShader] and uses it as the fill. It uses two shaders to fill the
+     * area, with the zero line being the divider.
+     *
+     * @param positiveShader the [DynamicShader] to use for the positive area.
+     * @param negativeShader the [DynamicShader] to use for the negative area.
+     */
+    public class SplitShader(
+        positiveShader: DynamicShader,
+        negativeShader: DynamicShader,
+    ) : Shader<HorizontalSplitShader.Double>(HorizontalSplitShader.Double(positiveShader, negativeShader)) {
+
+        override fun applyTo(
+            paint: Paint,
+            drawContext: DrawContext,
+            left: Float,
+            top: Float,
+            right: Float,
+            bottom: Float,
+            zeroLineYFraction: Float,
+        ) {
+            dynamicShader.dividerYFraction = zeroLineYFraction
+            super.applyTo(paint, drawContext, left, top, right, bottom, zeroLineYFraction)
+        }
+
+        override fun getColorAt(point: Point, drawContext: DrawContext, rectF: RectF, zeroLineYFraction: Float): Int {
+            dynamicShader.dividerYFraction = zeroLineYFraction
+            return super.getColorAt(point, drawContext, rectF, zeroLineYFraction)
+        }
+    }
+
+    public companion object {
+
+        private fun DynamicShader.getBitmap(drawContext: DrawContext, paint: Paint, rectF: RectF): Bitmap {
+            val width = rectF.width().roundToInt()
+            val height = rectF.height().roundToInt()
+            paint.shader = provideShader(drawContext, 0f, 0f, width.toFloat(), height.toFloat())
+            val bitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888)
+            val canvas = Canvas(bitmap)
+            canvas.drawRect(0f, 0f, width.toFloat(), height.toFloat(), paint)
+            return bitmap
+        }
+    }
+}
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/line/LineChart.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/line/LineChart.kt
index 9c873ba35..15c59b8bc 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/line/LineChart.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/line/LineChart.kt
@@ -30,6 +30,7 @@ import com.patrykandpatrick.vico.core.chart.composed.ComposedChart
 import com.patrykandpatrick.vico.core.chart.dimensions.HorizontalDimensions
 import com.patrykandpatrick.vico.core.chart.dimensions.MutableHorizontalDimensions
 import com.patrykandpatrick.vico.core.chart.draw.ChartDrawContext
+import com.patrykandpatrick.vico.core.chart.fill.FillStyle
 import com.patrykandpatrick.vico.core.chart.forEachInAbsolutelyIndexed
 import com.patrykandpatrick.vico.core.chart.insets.Insets
 import com.patrykandpatrick.vico.core.chart.layout.HorizontalLayout
@@ -61,6 +62,8 @@ import com.patrykandpatrick.vico.core.extension.withOpacity
 import com.patrykandpatrick.vico.core.formatter.DecimalFormatValueFormatter
 import com.patrykandpatrick.vico.core.formatter.ValueFormatter
 import com.patrykandpatrick.vico.core.marker.Marker
+import com.patrykandpatrick.vico.core.model.Point
+import kotlin.math.abs
 import kotlin.math.max
 import kotlin.math.min
 
@@ -100,9 +103,9 @@ public open class LineChart(
     /**
      * Defines the appearance of a line in a line chart.
      *
-     * @param lineColor the color of the line.
+     * @param lineFill the [FillStyle] for the line.
      * @param lineThicknessDp the thickness of the line (in dp).
-     * @param lineBackgroundShader an optional [DynamicShader] to use for the area below the line.
+     * @param lineBackgroundFill an optional [FillStyle] to use for the area below and above the line.
      * @param lineCap the stroke cap for the line.
      * @param point an optional [Component] that can be drawn at a given point on the line.
      * @param pointSizeDp the size of the [point] (in dp).
@@ -113,9 +116,9 @@ public open class LineChart(
      * @param pointConnector the [PointConnector] for the line.
      */
     public open class LineSpec(
-        lineColor: Int = Color.LTGRAY,
+        public var lineFill: FillStyle,
         public var lineThicknessDp: Float = DefaultDimens.LINE_THICKNESS,
-        public var lineBackgroundShader: DynamicShader? = null,
+        public var lineBackgroundFill: FillStyle? = null,
         public var lineCap: Paint.Cap = Paint.Cap.ROUND,
         public var point: Component? = null,
         public var pointSizeDp: Float = DefaultDimens.POINT_SIZE,
@@ -127,58 +130,34 @@ public open class LineChart(
     ) {
 
         /**
-         * Defines the appearance of a line in a line chart.
-         *
          * @param lineColor the color of the line.
          * @param lineThicknessDp the thickness of the line (in dp).
          * @param lineBackgroundShader an optional [DynamicShader] to use for the area below the line.
          * @param lineCap the stroke cap for the line.
-         * @param cubicStrength the strength of the cubic bezier curve between each point on the line.
          * @param point an optional [Component] that can be drawn at a given point on the line.
          * @param pointSizeDp the size of the [point] (in dp).
          * @param dataLabel an optional [TextComponent] to use for data labels.
          * @param dataLabelVerticalPosition the vertical position of data labels relative to the line.
          * @param dataLabelValueFormatter the [ValueFormatter] to use for data labels.
-         * @param dataLabelRotationDegrees the rotation of data labels in degrees.
+         * @param dataLabelRotationDegrees the rotation of data labels (in degrees).
+         * @param pointConnector the [PointConnector] for the line.
          */
-        @Deprecated(
-            message = """Rather than using this constructor and its `cubicStrength` parameter, use the primary
-                constructor and provide a `DefaultPointConnector` instance with a custom `cubicStrength` via the
-                `pointConnector` parameter.""",
-            replaceWith = ReplaceWith(
-                expression = """LineSpec(
-                        lineColor = lineColor,
-                        lineThicknessDp = lineThicknessDp,
-                        lineBackgroundShader = lineBackgroundShader,
-                        lineCap = lineCap,
-                        point = point,
-                        pointSizeDp = pointSizeDp,
-                        dataLabel = dataLabel,
-                        dataLabelVerticalPosition = dataLabelVerticalPosition,
-                        dataLabelValueFormatter = dataLabelValueFormatter,
-                        dataLabelRotationDegrees = dataLabelRotationDegrees,
-                        pointConnector = DefaultPointConnector(cubicStrength = cubicStrength),
-                    )""",
-                imports = arrayOf("com.patrykandpatrick.vico.core.chart.DefaultPointConnector"),
-            ),
-            level = DeprecationLevel.ERROR,
-        )
         public constructor(
             lineColor: Int = Color.LTGRAY,
             lineThicknessDp: Float = DefaultDimens.LINE_THICKNESS,
             lineBackgroundShader: DynamicShader? = null,
             lineCap: Paint.Cap = Paint.Cap.ROUND,
-            cubicStrength: Float,
             point: Component? = null,
             pointSizeDp: Float = DefaultDimens.POINT_SIZE,
             dataLabel: TextComponent? = null,
             dataLabelVerticalPosition: VerticalPosition = VerticalPosition.Top,
             dataLabelValueFormatter: ValueFormatter = DecimalFormatValueFormatter(),
             dataLabelRotationDegrees: Float = 0f,
+            pointConnector: PointConnector = DefaultPointConnector(),
         ) : this(
-            lineColor = lineColor,
+            lineFill = FillStyle.Solid(lineColor),
             lineThicknessDp = lineThicknessDp,
-            lineBackgroundShader = lineBackgroundShader,
+            lineBackgroundFill = lineBackgroundShader?.let(FillStyle::Shader),
             lineCap = lineCap,
             point = point,
             pointSizeDp = pointSizeDp,
@@ -186,27 +165,61 @@ public open class LineChart(
             dataLabelVerticalPosition = dataLabelVerticalPosition,
             dataLabelValueFormatter = dataLabelValueFormatter,
             dataLabelRotationDegrees = dataLabelRotationDegrees,
-            pointConnector = DefaultPointConnector(cubicStrength = cubicStrength),
+            pointConnector = pointConnector,
+        )
+
+        /**
+         * An optional [DynamicShader] to use for the area below and above the line.
+         */
+        @Deprecated(
+            message = "There are two line background shaders now, one for positive values and one for negative " +
+                "values. Use `positiveLineBackgroundShader` instead.",
+            replaceWith = ReplaceWith("positiveLineBackgroundShader"),
         )
+        public val lineBackgroundShader: DynamicShader?
+            get() = (lineBackgroundFill as? FillStyle.Shader<*>)?.dynamicShader
 
         /**
          * Returns `true` if the [lineBackgroundShader] is not null, and `false` otherwise.
          */
+        @Deprecated(
+            message = "`lineBackgroundShader` is deprecated. Use `hasLineBackgroundFill` instead.",
+            replaceWith = ReplaceWith("hasLineBackgroundFill"),
+        )
         public val hasLineBackgroundShader: Boolean
             get() = lineBackgroundShader != null
 
+        /**
+         * Returns `true` if the [lineBackgroundFill] is not null, and `false` otherwise.
+         */
+        public val hasLineBackgroundFill: Boolean
+            get() = lineBackgroundFill != null
+
         protected val linePaint: Paint = Paint(Paint.ANTI_ALIAS_FLAG).apply {
             style = Paint.Style.STROKE
-            color = lineColor
             strokeCap = lineCap
         }
 
         protected val lineBackgroundPaint: Paint = Paint(Paint.ANTI_ALIAS_FLAG)
 
+        protected val lineBackgroundPath: Path = Path()
+
+        protected val clipPath: Path = Path()
+
+        protected val pathBounds: RectF = RectF()
+
         /**
          * The color of the line.
          */
-        public var lineColor: Int by linePaint::color
+        @Deprecated(
+            message = "The line color, or shader is now defined by `lineFill",
+            replaceWith = ReplaceWith("lineFill"),
+        )
+        public var lineColor: Int
+            get() = (lineFill as? FillStyle.Solid)?.color ?: Color.TRANSPARENT
+            set(value) {
+                lineFill = FillStyle.Solid(value)
+            }
 
         /**
          * The stroke cap for the line.
@@ -229,9 +242,16 @@ public open class LineChart(
         /**
          * Draws the line.
          */
-        public fun drawLine(context: DrawContext, path: Path, opacity: Float = 1f) {
+        public fun drawLine(
+            context: DrawContext,
+            bounds: RectF,
+            zeroLineYFraction: Float,
+            path: Path,
+            opacity: Float = 1f,
+        ) {
             with(context) {
                 linePaint.strokeWidth = lineThicknessDp.pixels
+                lineFill.applyTo(linePaint, context, bounds, zeroLineYFraction)
                 linePaint.withOpacity(opacity) { canvas.drawPath(path, it) }
             }
         }
@@ -239,11 +259,42 @@ public open class LineChart(
         /**
          * Draws the line background.
          */
-        public fun drawBackgroundLine(context: DrawContext, bounds: RectF, path: Path, opacity: Float = 1f) {
+        public fun drawBackgroundLine(
+            context: DrawContext,
+            bounds: RectF,
+            zeroLineYFraction: Float,
+            path: Path,
+            opacity: Float = 1f,
+        ) {
+            val fill = lineBackgroundFill ?: return
             with(lineBackgroundPaint) {
-                shader =
-                    lineBackgroundShader?.provideShader(context, bounds.left, bounds.top, bounds.right, bounds.bottom)
-                withOpacity(opacity) { context.canvas.drawPath(path, it) }
+                if (zeroLineYFraction > 0) {
+                    val zeroLineY = bounds.top + (zeroLineYFraction * bounds.height())
+                    fill.applyTo(this, context, bounds.left, bounds.top, bounds.right, zeroLineY, 1f)
+                    lineBackgroundPath.set(path)
+                    lineBackgroundPath.computeBounds(pathBounds, false)
+                    lineBackgroundPath.lineTo(pathBounds.right, bounds.bottom)
+                    lineBackgroundPath.lineTo(pathBounds.left, bounds.bottom)
+                    lineBackgroundPath.close()
+                    clipPath.rewind()
+                    clipPath.addRect(bounds.left, bounds.top, bounds.right, zeroLineY, Path.Direction.CW)
+                    lineBackgroundPath.op(clipPath, Path.Op.INTERSECT)
+                    withOpacity(opacity) { context.canvas.drawPath(lineBackgroundPath, it) }
+                }
+
+                if (zeroLineYFraction < 1f) {
+                    val zeroLineY = bounds.top + (zeroLineYFraction * bounds.height())
+                    fill.applyTo(this, context, bounds.left, zeroLineY, bounds.right, bounds.bottom, 0f)
+                    lineBackgroundPath.set(path)
+                    lineBackgroundPath.computeBounds(pathBounds, false)
+                    lineBackgroundPath.lineTo(pathBounds.right, bounds.top)
+                    lineBackgroundPath.lineTo(pathBounds.left, bounds.top)
+                    lineBackgroundPath.close()
+                    clipPath.rewind()
+                    clipPath.addRect(bounds.left, zeroLineY, bounds.right, bounds.bottom, Path.Direction.CW)
+                    lineBackgroundPath.op(clipPath, Path.Op.INTERSECT)
+                    withOpacity(opacity) { context.canvas.drawPath(lineBackgroundPath, it) }
+                }
             }
         }
 
@@ -290,6 +341,8 @@ public open class LineChart(
         resetTempData()
 
         val drawingModel = model.extraStore.getOrNull(drawingModelKey)
+        val chartValues = chartValuesProvider.getChartValues(targetVerticalAxisPosition)
+        val zeroLineYFraction = 1f - (drawingModel?.zeroY ?: abs(chartValues.minY / chartValues.lengthY))
 
         model.entries.forEachIndexed { entryListIndex, entries ->
 
@@ -313,9 +366,8 @@ public open class LineChart(
             ) { entryIndex, entry, x, y, _, _ ->
                 if (linePath.isEmpty) {
                     linePath.moveTo(x, y)
-                    if (component.hasLineBackgroundShader) {
-                        lineBackgroundPath.moveTo(x, bounds.bottom)
-                        lineBackgroundPath.lineTo(x, y)
+                    if (component.hasLineBackgroundFill) {
+                        lineBackgroundPath.moveTo(x, y)
                     }
                 } else {
                     component.pointConnector.connect(
@@ -327,7 +379,7 @@ public open class LineChart(
                         horizontalDimensions = horizontalDimensions,
                         bounds = bounds,
                     )
-                    if (component.hasLineBackgroundShader) {
+                    if (component.hasLineBackgroundFill) {
                         component.pointConnector.connect(
                             path = lineBackgroundPath,
                             prevX = prevX,
@@ -343,22 +395,29 @@ public open class LineChart(
                 prevY = y
 
                 if (x > bounds.left - 1 && x < bounds.right + 1) {
+                    val coercedY = y.coerceIn(bounds.top, bounds.bottom)
                     entryLocationMap.put(
                         x = x,
-                        y = y.coerceIn(bounds.top, bounds.bottom),
+                        y = coercedY,
                         entry = entry,
-                        color = component.lineColor,
+                        color = component.lineFill.getColorAt(Point(x, coercedY), context, bounds, zeroLineYFraction),
                         index = entryIndex,
                     )
                 }
             }
 
-            if (component.hasLineBackgroundShader) {
+            if (component.hasLineBackgroundFill) {
                 lineBackgroundPath.lineTo(prevX, bounds.bottom)
-                lineBackgroundPath.close()
-                component.drawBackgroundLine(context, bounds, lineBackgroundPath, drawingModel?.opacity ?: 1f)
+                component.drawBackgroundLine(
+                    context,
+                    bounds,
+                    zeroLineYFraction,
+                    lineBackgroundPath,
+                    drawingModel?.opacity ?: 1f,
+                )
             }
-            component.drawLine(context, linePath, drawingModel?.opacity ?: 1f)
+
+            component.drawLine(context, bounds, zeroLineYFraction, linePath, drawingModel?.opacity ?: 1f)
 
             drawPointsAndDataLabels(
                 lineSpec = component,
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/component/shape/shader/HorizontalSplitShader.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/component/shape/shader/HorizontalSplitShader.kt
new file mode 100644
index 000000000..c27413c8f
--- /dev/null
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/component/shape/shader/HorizontalSplitShader.kt
@@ -0,0 +1,207 @@
+/*
+ * Copyright 2023 by Patryk Goworowski and Patrick Michalik.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.patrykandpatrick.vico.core.component.shape.shader
+
+import android.graphics.Bitmap
+import android.graphics.BitmapShader
+import android.graphics.Canvas
+import android.graphics.Matrix
+import android.graphics.Paint
+import android.graphics.Shader
+import com.patrykandpatrick.vico.core.context.DrawContext
+
+/**
+ * A [DynamicShader] that can apply two different [DynamicShader]s to the top and bottom part of the area.
+ *
+ * @property dividerYFraction the fraction of the height of the area to apply the style to, that the divider is at.
+ */
+public abstract class HorizontalSplitShader(
+    public var dividerYFraction: Float = 0f,
+) : CacheableDynamicShader() {
+
+    private val paint = Paint()
+
+    override fun createShader(context: DrawContext, left: Float, top: Float, right: Float, bottom: Float): Shader {
+        val height = (bottom - top).toInt()
+        val width = (right - left).toInt()
+        val bitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888)
+        val canvas = Canvas(bitmap)
+        if (dividerYFraction > 0f) {
+            applyTopTo(paint, context, left, 0f, right, height * dividerYFraction)
+            canvas.drawRect(0f, 0f, width.toFloat(), height * dividerYFraction, paint)
+        }
+        if (dividerYFraction < 1f) {
+            applyBottomTo(paint, context, left, height * dividerYFraction, right, height.toFloat())
+            canvas.drawRect(0f, height * dividerYFraction, width.toFloat(), height.toFloat(), paint)
+        }
+        val matrix = Matrix().apply { postTranslate(left, top) }
+        return BitmapShader(bitmap, Shader.TileMode.CLAMP, Shader.TileMode.CLAMP).apply {
+            setLocalMatrix(matrix)
+        }
+    }
+
+    /**
+     * Applies the top style to the [Paint] object for the top part of the area.
+     *
+     * @param paint the [Paint] object to apply the style to.
+     * @param drawContext the [DrawContext] for the current draw operation.
+     * @param left the left coordinate of the area to apply the style to.
+     * @param top the top coordinate of the area to apply the style to.
+     * @param right the right coordinate of the area to apply the style to.
+     * @param bottom the bottom coordinate of the area to apply the style to.
+     */
+    public abstract fun applyTopTo(
+        paint: Paint,
+        drawContext: DrawContext,
+        left: Float,
+        top: Float,
+        right: Float,
+        bottom: Float,
+    )
+
+    /**
+     * Applies the bottom style to the [Paint] object for the bottom part of the area.
+     *
+     * @param paint the [Paint] object to apply the style to.
+     * @param drawContext the [DrawContext] for the current draw operation.
+     * @param left the left coordinate of the area to apply the style to.
+     * @param top the top coordinate of the area to apply the style to.
+     * @param right the right coordinate of the area to apply the style to.
+     * @param bottom the bottom coordinate of the area to apply the style to.
+     */
+    public abstract fun applyBottomTo(
+        paint: Paint,
+        drawContext: DrawContext,
+        left: Float,
+        top: Float,
+        right: Float,
+        bottom: Float,
+    )
+
+    override fun createKey(left: Float, top: Float, right: Float, bottom: Float): String =
+        super.createKey(left, top, right, bottom) + ",$dividerYFraction"
+
+    /**
+     * A [HorizontalSplitShader] with a solid color for the top and bottom part of the area.
+     *
+     * @param colorTop the color for the top part of the area.
+     * @param colorBottom the color for the bottom part of the area.
+     * @param dividerYFraction the fraction of the height of the area to apply the style to, that the divider is at.
+     */
+    public class Solid(
+        public var colorTop: Int,
+        public var colorBottom: Int,
+        dividerYFraction: Float = 0f,
+    ) : HorizontalSplitShader(dividerYFraction) {
+
+        override fun applyTopTo(
+            paint: Paint,
+            drawContext: DrawContext,
+            left: Float,
+            top: Float,
+            right: Float,
+            bottom: Float,
+        ) {
+            paint.color = colorTop
+            paint.shader = null
+        }
+
+        override fun applyBottomTo(
+            paint: Paint,
+            drawContext: DrawContext,
+            left: Float,
+            top: Float,
+            right: Float,
+            bottom: Float,
+        ) {
+            paint.color = colorBottom
+            paint.shader = null
+        }
+
+        override fun createKey(left: Float, top: Float, right: Float, bottom: Float): String =
+            super.createKey(left, top, right, bottom) + ",$colorTop,$colorBottom"
+
+        override fun equals(other: Any?): Boolean =
+            when {
+                this === other -> true
+                other !is Solid -> false
+                else ->
+                    colorTop == other.colorTop &&
+                        colorBottom == other.colorBottom &&
+                        dividerYFraction == other.dividerYFraction
+            }
+
+        override fun hashCode(): Int {
+            var result = colorTop
+            result = 31 * result + colorBottom
+            result = 31 * result + dividerYFraction.hashCode()
+            return result
+        }
+    }
+
+    /**
+     * A [HorizontalSplitShader] with a [DynamicShader] for the top and bottom part of the area.
+     *
+     * @param topShader the [DynamicShader] for the top part of the area.
+     * @param bottomShader the [DynamicShader] for the bottom part of the area.
+     * @param dividerYFraction the fraction of the height of the area to apply the style to, that the divider is at.
+     */
+    public class Double(
+        public var topShader: DynamicShader,
+        public var bottomShader: DynamicShader,
+        dividerYFraction: Float = 0f,
+    ) : HorizontalSplitShader(dividerYFraction) {
+
+        override fun applyTopTo(
+            paint: Paint,
+            drawContext: DrawContext,
+            left: Float,
+            top: Float,
+            right: Float,
+            bottom: Float,
+        ) {
+            paint.shader = topShader.provideShader(drawContext, left, top, right, bottom)
+        }
+
+        override fun applyBottomTo(
+            paint: Paint,
+            drawContext: DrawContext,
+            left: Float,
+            top: Float,
+            right: Float,
+            bottom: Float,
+        ) {
+            paint.shader = bottomShader.provideShader(drawContext, left, top, right, bottom)
+        }
+
+        override fun createKey(left: Float, top: Float, right: Float, bottom: Float): String =
+            super.createKey(left, top, right, bottom) + ",${topShader.hashCode()},${bottomShader.hashCode()}"
+
+        override fun equals(other: Any?): Boolean =
+            when {
+                this === other -> true
+                other !is Double -> false
+                else ->
+                    topShader == other.topShader &&
+                        bottomShader == other.bottomShader &&
+                        dividerYFraction == other.dividerYFraction
+            }
+
+        override fun hashCode(): Int =
+            31 * topShader.hashCode() + bottomShader.hashCode()
+    }
+}
diff --git a/vico/views/src/main/java/com/patrykandpatrick/vico/views/theme/ComponentStyleExtensions.kt b/vico/views/src/main/java/com/patrykandpatrick/vico/views/theme/ComponentStyleExtensions.kt
index e8c625e5c..5fb20c658 100644
--- a/vico/views/src/main/java/com/patrykandpatrick/vico/views/theme/ComponentStyleExtensions.kt
+++ b/vico/views/src/main/java/com/patrykandpatrick/vico/views/theme/ComponentStyleExtensions.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 by Patryk Goworowski and Patrick Michalik.
+ * Copyright 2023 by Patryk Goworowski and Patrick Michalik.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,6 +22,7 @@ import android.graphics.Color
 import com.patrykandpatrick.vico.core.DefaultAlpha
 import com.patrykandpatrick.vico.core.DefaultDimens
 import com.patrykandpatrick.vico.core.chart.DefaultPointConnector
+import com.patrykandpatrick.vico.core.chart.fill.FillStyle
 import com.patrykandpatrick.vico.core.chart.line.LineChart
 import com.patrykandpatrick.vico.core.component.Component
 import com.patrykandpatrick.vico.core.component.OverlayingComponent
@@ -130,28 +131,59 @@ internal fun TypedArray.getLineSpec(
     context: Context,
     defaultColor: Int = context.defaultColors.entity1Color.toInt(),
 ): LineChart.LineSpec {
-    val lineColor = getColorExtended(
-        index = R.styleable.LineSpec_color,
-        defaultColor = defaultColor,
+    val positiveLineColor = getColor(
+        R.styleable.LineSpec_positiveColor,
+        getColor(R.styleable.LineSpec_color, defaultColor),
     )
 
-    val shader = if (
+    val negativeLineColor = getColorExtended(R.styleable.LineSpec_negativeColor)
+
+    val lineFill = if (hasValue(R.styleable.LineSpec_negativeColor)) {
+        FillStyle.Split(positiveLineColor, negativeLineColor)
+    } else {
+        FillStyle.Solid(positiveLineColor)
+    }
+
+    val positiveShader = if (
         hasValue(R.styleable.LineSpec_gradientTopColor) ||
-        hasValue(R.styleable.LineSpec_gradientBottomColor)
+        hasValue(R.styleable.LineSpec_gradientBottomColor) ||
+        hasValue(R.styleable.LineSpec_positiveGradientTopColor) ||
+        hasValue(R.styleable.LineSpec_positiveGradientBottomColor)
+    ) {
+        val gradientTopColor = getColorExtended(
+            index = R.styleable.LineSpec_positiveGradientTopColor,
+            defaultColor = getColorExtended(R.styleable.LineSpec_gradientTopColor),
+        )
+        val gradientBottomColor = getColorExtended(
+            index = R.styleable.LineSpec_positiveGradientBottomColor,
+            defaultColor = getColorExtended(R.styleable.LineSpec_gradientBottomColor),
+        )
+
+        DynamicShaders.verticalGradient(gradientTopColor, gradientBottomColor)
+    } else {
+        DynamicShaders.verticalGradient(
+            positiveLineColor.copyColor(alpha = DefaultAlpha.LINE_BACKGROUND_SHADER_START),
+            positiveLineColor.copyColor(alpha = DefaultAlpha.LINE_BACKGROUND_SHADER_END),
+        )
+    }
+
+    val negativeShader = if (
+        hasValue(R.styleable.LineSpec_negativeGradientTopColor) ||
+        hasValue(R.styleable.LineSpec_negativeGradientBottomColor)
     ) {
-        val gradientTopColor = getColorExtended(R.styleable.LineSpec_gradientTopColor)
-        val gradientBottomColor = getColorExtended(R.styleable.LineSpec_gradientBottomColor)
+        val gradientTopColor = getColorExtended(R.styleable.LineSpec_negativeGradientTopColor)
+        val gradientBottomColor = getColorExtended(R.styleable.LineSpec_negativeGradientBottomColor)
 
         DynamicShaders.verticalGradient(gradientTopColor, gradientBottomColor)
     } else {
         DynamicShaders.verticalGradient(
-            lineColor.copyColor(alpha = DefaultAlpha.LINE_BACKGROUND_SHADER_START),
-            lineColor.copyColor(alpha = DefaultAlpha.LINE_BACKGROUND_SHADER_END),
+            negativeLineColor.copyColor(alpha = DefaultAlpha.LINE_BACKGROUND_SHADER_END),
+            negativeLineColor.copyColor(alpha = DefaultAlpha.LINE_BACKGROUND_SHADER_START),
         )
     }
 
     return LineChart.LineSpec(
-        lineColor = lineColor,
+        lineFill = lineFill,
         point = getNestedTypedArray(
             context = context,
             resourceId = R.styleable.LineSpec_pointStyle,
@@ -167,7 +199,7 @@ internal fun TypedArray.getLineSpec(
             index = R.styleable.LineSpec_lineThickness,
             defaultValue = DefaultDimens.LINE_THICKNESS,
         ),
-        lineBackgroundShader = shader,
+        lineBackgroundFill = FillStyle.SplitShader(positiveShader, negativeShader),
         dataLabel = if (getBoolean(R.styleable.LineSpec_showDataLabels, false)) {
             getNestedTypedArray(
                 context = context,
@@ -178,7 +210,7 @@ internal fun TypedArray.getLineSpec(
             null
         },
         dataLabelVerticalPosition = getInteger(R.styleable.LineSpec_dataLabelVerticalPosition, 0).let { value ->
-            val values = VerticalPosition.values()
+            val values = VerticalPosition.entries
             values[value % values.size]
         },
         dataLabelRotationDegrees = getFloat(
diff --git a/vico/views/src/main/res/values/attrs.xml b/vico/views/src/main/res/values/attrs.xml
index a4805609a..5ff0012da 100644
--- a/vico/views/src/main/res/values/attrs.xml
+++ b/vico/views/src/main/res/values/attrs.xml
@@ -16,6 +16,8 @@
 
 <resources>
     <attr name="color" format="color" />
+    <attr name="positiveColor" format="color" />
+    <attr name="negativeColor" format="color" />
     <attr name="shapeStyle" format="reference" />
     <attr name="strokeColor" format="color" />
     <attr name="strokeWidth" format="dimension" />
diff --git a/vico/views/src/main/res/values/line_chart_attrs.xml b/vico/views/src/main/res/values/line_chart_attrs.xml
index 3e3db842a..0ea50e6c4 100644
--- a/vico/views/src/main/res/values/line_chart_attrs.xml
+++ b/vico/views/src/main/res/values/line_chart_attrs.xml
@@ -29,8 +29,14 @@
 
     <declare-styleable name="LineSpec">
         <attr name="color" />
+        <attr name="positiveColor" />
+        <attr name="negativeColor" />
         <attr name="gradientTopColor" format="color" />
         <attr name="gradientBottomColor" format="color" />
+        <attr name="positiveGradientTopColor" format="color" />
+        <attr name="positiveGradientBottomColor" format="color" />
+        <attr name="negativeGradientTopColor" format="color" />
+        <attr name="negativeGradientBottomColor" format="color" />
         <attr name="pointSize" format="dimension" />
         <attr name="lineThickness" format="dimension" />
         <attr name="pointStyle" format="reference" />

From b3dd6155c8a20dd5e07fe23b5e826eebc5704a43 Mon Sep 17 00:00:00 2001
From: Patryk Goworowski <patrykgoworowski@gmail.com>
Date: Sun, 15 Oct 2023 19:20:01 +0200
Subject: [PATCH 03/15] Add `LineChartDrawingModel#zeroY`. Use the new `lerp`
 function for linear interpolation

Co-authored-by: Patrick Michalik <120058021+patrickmichalik@users.noreply.github.com>
---
 .../core/chart/column/ColumnChartDrawingModel.kt  |  5 +++--
 .../vico/core/chart/line/LineChart.kt             |  4 +++-
 .../vico/core/chart/line/LineChartDrawingModel.kt | 15 +++++++++++----
 .../vico/core/extension/NumberExtensions.kt       |  4 +++-
 4 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/column/ColumnChartDrawingModel.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/column/ColumnChartDrawingModel.kt
index 3c6c26b66..a0619ab25 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/column/ColumnChartDrawingModel.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/column/ColumnChartDrawingModel.kt
@@ -17,6 +17,7 @@
 package com.patrykandpatrick.vico.core.chart.column
 
 import com.patrykandpatrick.vico.core.entry.diff.DrawingModel
+import com.patrykandpatrick.vico.core.extension.lerp
 import com.patrykandpatrick.vico.core.extension.orZero
 
 /**
@@ -31,7 +32,7 @@ public class ColumnChartDrawingModel(entries: List<Map<Float, ColumnInfo>>, publ
         fraction: Float,
     ): DrawingModel<ColumnInfo> {
         val oldOpacity = (from as ColumnChartDrawingModel?)?.opacity.orZero
-        return ColumnChartDrawingModel(drawingInfo, oldOpacity + (opacity - oldOpacity) * fraction)
+        return ColumnChartDrawingModel(drawingInfo, oldOpacity.lerp(opacity, fraction))
     }
 
     /**
@@ -41,7 +42,7 @@ public class ColumnChartDrawingModel(entries: List<Map<Float, ColumnInfo>>, publ
     public class ColumnInfo(public val height: Float) : DrawingInfo {
         override fun transform(from: DrawingInfo?, fraction: Float): DrawingInfo {
             val oldHeight = (from as? ColumnInfo)?.height.orZero
-            return ColumnInfo(oldHeight + (height - oldHeight) * fraction)
+            return ColumnInfo(oldHeight.lerp(height, fraction))
         }
     }
 }
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/line/LineChart.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/line/LineChart.kt
index 15c59b8bc..8e6c08326 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/line/LineChart.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/line/LineChart.kt
@@ -693,6 +693,8 @@ public open class LineChart(
                     entry.x to LineChartDrawingModel.PointInfo((entry.y - chartValues.minY) / chartValues.lengthY)
                 }
             }
-            .let(::LineChartDrawingModel)
+            .let { pointInfo ->
+                LineChartDrawingModel(pointInfo, abs(chartValues.minY / chartValues.lengthY))
+            }
     }
 }
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/line/LineChartDrawingModel.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/line/LineChartDrawingModel.kt
index 12a514be4..bfcbf2572 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/line/LineChartDrawingModel.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/line/LineChartDrawingModel.kt
@@ -17,12 +17,18 @@
 package com.patrykandpatrick.vico.core.chart.line
 
 import com.patrykandpatrick.vico.core.entry.diff.DrawingModel
+import com.patrykandpatrick.vico.core.extension.lerp
 import com.patrykandpatrick.vico.core.extension.orZero
 
 /**
- * Houses drawing information for a [LineChart]. [opacity] is the lines’ opacity.
+ * Houses drawing information for a [LineChart]. [zeroY] is the y-axis position of the zero value.
+ * [opacity] is the lines’ opacity.
  */
-public class LineChartDrawingModel(pointInfo: List<Map<Float, PointInfo>>, public val opacity: Float = 1f) :
+public class LineChartDrawingModel(
+    pointInfo: List<Map<Float, PointInfo>>,
+    public val zeroY: Float,
+    public val opacity: Float = 1f,
+) :
     DrawingModel<LineChartDrawingModel.PointInfo>(pointInfo) {
 
     override fun transform(
@@ -31,7 +37,8 @@ public class LineChartDrawingModel(pointInfo: List<Map<Float, PointInfo>>, publi
         fraction: Float,
     ): DrawingModel<PointInfo> {
         val oldOpacity = (from as LineChartDrawingModel?)?.opacity.orZero
-        return LineChartDrawingModel(drawingInfo, oldOpacity + (opacity - oldOpacity) * fraction)
+        val oldZeroY = from?.zeroY ?: zeroY
+        return LineChartDrawingModel(drawingInfo, oldZeroY.lerp(zeroY, fraction), oldOpacity.lerp(opacity, fraction))
     }
 
     /**
@@ -41,7 +48,7 @@ public class LineChartDrawingModel(pointInfo: List<Map<Float, PointInfo>>, publi
     public class PointInfo(public val y: Float) : DrawingInfo {
         override fun transform(from: DrawingInfo?, fraction: Float): DrawingInfo {
             val oldY = (from as? PointInfo)?.y.orZero
-            return PointInfo(oldY + (y - oldY) * fraction)
+            return PointInfo(oldY.lerp(y, fraction))
         }
     }
 }
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/extension/NumberExtensions.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/extension/NumberExtensions.kt
index 4a209b08b..0869b477b 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/extension/NumberExtensions.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/extension/NumberExtensions.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 by Patryk Goworowski and Patrick Michalik.
+ * Copyright 2023 by Patryk Goworowski and Patrick Michalik.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -143,3 +143,5 @@ public fun firstNonNegativeOf(vararg floats: Float): Float? = floats.firstOrNull
  */
 public fun Float.rangeWith(other: Float): ClosedFloatingPointRange<Float> =
     if (other > this) this..other else other..this
+
+internal fun Float.lerp(to: Float, fraction: Float): Float = this + (to - this) * fraction

From 66a612384d235b31a35a10bf5c02869897b94159 Mon Sep 17 00:00:00 2001
From: Patryk Goworowski <patrykgoworowski@gmail.com>
Date: Sun, 15 Oct 2023 19:48:07 +0200
Subject: [PATCH 04/15] Add `lineSpec` Composable function overloads that
 accept the new `FillStyle` for the line and its background appearance

---
 .../vico/compose/chart/line/LineChart.kt      | 92 +++++++++++--------
 1 file changed, 54 insertions(+), 38 deletions(-)

diff --git a/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/chart/line/LineChart.kt b/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/chart/line/LineChart.kt
index 85ee10d43..f23e4d968 100644
--- a/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/chart/line/LineChart.kt
+++ b/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/chart/line/LineChart.kt
@@ -26,6 +26,7 @@ import androidx.compose.ui.graphics.toArgb
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import com.patrykandpatrick.vico.compose.chart.Chart
+import com.patrykandpatrick.vico.compose.chart.fill.shader
 import com.patrykandpatrick.vico.compose.component.shape.shader.fromBrush
 import com.patrykandpatrick.vico.compose.style.currentChartStyle
 import com.patrykandpatrick.vico.core.DefaultAlpha
@@ -36,6 +37,7 @@ import com.patrykandpatrick.vico.core.chart.DefaultPointConnector
 import com.patrykandpatrick.vico.core.chart.column.ColumnChart
 import com.patrykandpatrick.vico.core.chart.composed.ComposedChart
 import com.patrykandpatrick.vico.core.chart.decoration.Decoration
+import com.patrykandpatrick.vico.core.chart.fill.FillStyle
 import com.patrykandpatrick.vico.core.chart.line.LineChart
 import com.patrykandpatrick.vico.core.chart.line.LineChart.LineSpec
 import com.patrykandpatrick.vico.core.chart.line.LineChartDrawingModel
@@ -127,9 +129,9 @@ public fun lineSpec(
     dataLabelRotationDegrees: Float = 0f,
     pointConnector: LineSpec.PointConnector = DefaultPointConnector(),
 ): LineSpec = LineSpec(
-    lineColor = lineColor.toArgb(),
+    lineFill = FillStyle.Solid(lineColor.toArgb()),
     lineThicknessDp = lineThickness.value,
-    lineBackgroundShader = lineBackgroundShader,
+    lineBackgroundFill = lineBackgroundShader?.let(FillStyle::shader),
     lineCap = lineCap.paintCap,
     point = point,
     pointSizeDp = pointSize.value,
@@ -147,62 +149,33 @@ public fun lineSpec(
  * @param lineThickness the thickness of the line.
  * @param lineBackgroundShader an optional [DynamicShader] to use for the area below the line.
  * @param lineCap the stroke cap for the line.
- * @param cubicStrength the strength of the cubic bezier curve between each key point on the line.
  * @param point an optional [Component] that can be drawn at a given point on the line.
  * @param pointSize the size of the [point].
  * @param dataLabel an optional [TextComponent] to use for data labels.
  * @param dataLabelVerticalPosition the vertical position of data labels relative to the line.
  * @param dataLabelValueFormatter the [ValueFormatter] to use for data labels.
  * @param dataLabelRotationDegrees the rotation of data labels in degrees.
+ * @param pointConnector the [LineSpec.PointConnector] for the line.
  *
  * @see LineChart
  * @see LineChart.LineSpec
  */
-@Deprecated(
-    message = """Rather than using this `lineSpec` function and its `cubicStrength` parameter, use the `lineSpec`
-        function with the `pointConnector` parameter and provide a `DefaultPointConnector` instance with a custom
-        `cubicStrength` via the `pointConnector` parameter.""",
-    replaceWith = ReplaceWith(
-        expression = """lineSpec(
-                lineColor = lineColor,
-                lineThickness = lineThickness,
-                lineBackgroundShader = lineBackgroundShader,
-                lineCap = lineCap,
-                point = point,
-                pointSize = pointSize,
-                dataLabel = dataLabel,
-                dataLabelVerticalPosition = dataLabelVerticalPosition,
-                dataLabelValueFormatter = dataLabelValueFormatter,
-                dataLabelRotationDegrees = dataLabelRotationDegrees,
-                pointConnector = DefaultPointConnector(cubicStrength = cubicStrength),
-            )""",
-        imports = arrayOf("com.patrykandpatrick.vico.core.chart.DefaultPointConnector"),
-    ),
-    level = DeprecationLevel.ERROR,
-)
 public fun lineSpec(
-    lineColor: Color,
+    lineFill: FillStyle,
     lineThickness: Dp = DefaultDimens.LINE_THICKNESS.dp,
-    lineBackgroundShader: DynamicShader? = DynamicShaders.fromBrush(
-        brush = Brush.verticalGradient(
-            listOf(
-                lineColor.copy(alpha = DefaultAlpha.LINE_BACKGROUND_SHADER_START),
-                lineColor.copy(alpha = DefaultAlpha.LINE_BACKGROUND_SHADER_END),
-            ),
-        ),
-    ),
+    lineBackgroundFill: FillStyle? = lineFill.getBackwardCompatibleBackgroundFill(),
     lineCap: StrokeCap = StrokeCap.Round,
-    cubicStrength: Float,
     point: Component? = null,
     pointSize: Dp = DefaultDimens.POINT_SIZE.dp,
     dataLabel: TextComponent? = null,
     dataLabelVerticalPosition: VerticalPosition = VerticalPosition.Top,
     dataLabelValueFormatter: ValueFormatter = DecimalFormatValueFormatter(),
     dataLabelRotationDegrees: Float = 0f,
+    pointConnector: LineSpec.PointConnector = DefaultPointConnector(),
 ): LineSpec = LineSpec(
-    lineColor = lineColor.toArgb(),
+    lineFill = lineFill,
     lineThicknessDp = lineThickness.value,
-    lineBackgroundShader = lineBackgroundShader,
+    lineBackgroundFill = lineBackgroundFill,
     lineCap = lineCap.paintCap,
     point = point,
     pointSizeDp = pointSize.value,
@@ -210,9 +183,52 @@ public fun lineSpec(
     dataLabelVerticalPosition = dataLabelVerticalPosition,
     dataLabelValueFormatter = dataLabelValueFormatter,
     dataLabelRotationDegrees = dataLabelRotationDegrees,
-    pointConnector = DefaultPointConnector(cubicStrength = cubicStrength),
+    pointConnector = pointConnector,
 )
 
+private fun FillStyle.getBackwardCompatibleBackgroundFill(): FillStyle? =
+    when (this) {
+        is FillStyle.Solid -> FillStyle.SplitShader(
+            positiveShader = DynamicShaders.fromBrush(
+                brush = Brush.verticalGradient(
+                    listOf(
+                        Color(color).copy(alpha = DefaultAlpha.LINE_BACKGROUND_SHADER_START),
+                        Color(color).copy(alpha = DefaultAlpha.LINE_BACKGROUND_SHADER_END),
+                    ),
+                ),
+            ),
+            negativeShader = DynamicShaders.fromBrush(
+                brush = Brush.verticalGradient(
+                    listOf(
+                        Color(color).copy(alpha = DefaultAlpha.LINE_BACKGROUND_SHADER_END),
+                        Color(color).copy(alpha = DefaultAlpha.LINE_BACKGROUND_SHADER_START),
+                    ),
+                ),
+            ),
+        )
+
+        is FillStyle.Split -> FillStyle.SplitShader(
+            positiveShader = DynamicShaders.fromBrush(
+                brush = Brush.verticalGradient(
+                    listOf(
+                        Color(positiveColor).copy(alpha = DefaultAlpha.LINE_BACKGROUND_SHADER_START),
+                        Color(positiveColor).copy(alpha = DefaultAlpha.LINE_BACKGROUND_SHADER_END),
+                    ),
+                ),
+            ),
+            negativeShader = DynamicShaders.fromBrush(
+                brush = Brush.verticalGradient(
+                    listOf(
+                        Color(negativeColor).copy(alpha = DefaultAlpha.LINE_BACKGROUND_SHADER_END),
+                        Color(negativeColor).copy(alpha = DefaultAlpha.LINE_BACKGROUND_SHADER_START),
+                    ),
+                ),
+            ),
+        )
+
+        else -> null
+    }
+
 private val StrokeCap.paintCap: Paint.Cap
     get() = when (this) {
         StrokeCap.Butt -> Paint.Cap.BUTT

From 63ef2d57eb956109a7be825550e8149879701a8b Mon Sep 17 00:00:00 2001
From: Patryk Goworowski <patrykgoworowski@gmail.com>
Date: Sat, 21 Oct 2023 12:13:45 +0200
Subject: [PATCH 05/15] [`LineChart`] Simplify a creation of
 `lineBackgroundPath`

---
 .../vico/core/chart/line/LineChart.kt             | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/line/LineChart.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/line/LineChart.kt
index 8e6c08326..a2a3622e7 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/line/LineChart.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/line/LineChart.kt
@@ -366,9 +366,6 @@ public open class LineChart(
             ) { entryIndex, entry, x, y, _, _ ->
                 if (linePath.isEmpty) {
                     linePath.moveTo(x, y)
-                    if (component.hasLineBackgroundFill) {
-                        lineBackgroundPath.moveTo(x, y)
-                    }
                 } else {
                     component.pointConnector.connect(
                         path = linePath,
@@ -379,17 +376,6 @@ public open class LineChart(
                         horizontalDimensions = horizontalDimensions,
                         bounds = bounds,
                     )
-                    if (component.hasLineBackgroundFill) {
-                        component.pointConnector.connect(
-                            path = lineBackgroundPath,
-                            prevX = prevX,
-                            prevY = prevY,
-                            x = x,
-                            y = y,
-                            horizontalDimensions = horizontalDimensions,
-                            bounds = bounds,
-                        )
-                    }
                 }
                 prevX = x
                 prevY = y
@@ -407,6 +393,7 @@ public open class LineChart(
             }
 
             if (component.hasLineBackgroundFill) {
+                lineBackgroundPath.addPath(linePath)
                 lineBackgroundPath.lineTo(prevX, bounds.bottom)
                 component.drawBackgroundLine(
                     context,

From a28e8fa80dd48090fdbdd2d9a406c2726a9c565e Mon Sep 17 00:00:00 2001
From: Patryk Goworowski <patrykgoworowski@gmail.com>
Date: Sat, 21 Oct 2023 13:21:53 +0200
Subject: [PATCH 06/15] Use `lineFill` param when creating the default
 `LineSpec` style

---
 .../vico/compose/style/ChartStyle.kt          | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

diff --git a/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/style/ChartStyle.kt b/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/style/ChartStyle.kt
index f26e6ce9f..1a6a4542b 100644
--- a/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/style/ChartStyle.kt
+++ b/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/style/ChartStyle.kt
@@ -26,28 +26,27 @@ import androidx.compose.runtime.ProvidableCompositionLocal
 import androidx.compose.runtime.ProvidedValue
 import androidx.compose.runtime.compositionLocalOf
 import androidx.compose.runtime.remember
-import androidx.compose.ui.graphics.Brush
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.toArgb
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.TextUnit
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
+import com.patrykandpatrick.vico.compose.chart.fill.solid
+import com.patrykandpatrick.vico.compose.chart.line.lineSpec
 import com.patrykandpatrick.vico.compose.component.shape.dashedShape
-import com.patrykandpatrick.vico.compose.component.shape.shader.fromBrush
-import com.patrykandpatrick.vico.core.DefaultAlpha
 import com.patrykandpatrick.vico.core.DefaultColors
 import com.patrykandpatrick.vico.core.DefaultDimens
 import com.patrykandpatrick.vico.core.axis.AxisPosition
 import com.patrykandpatrick.vico.core.axis.formatter.AxisValueFormatter
 import com.patrykandpatrick.vico.core.axis.formatter.DecimalFormatAxisValueFormatter
 import com.patrykandpatrick.vico.core.chart.column.ColumnChart.MergeMode
+import com.patrykandpatrick.vico.core.chart.fill.FillStyle
 import com.patrykandpatrick.vico.core.chart.line.LineChart.LineSpec
 import com.patrykandpatrick.vico.core.component.shape.LineComponent
 import com.patrykandpatrick.vico.core.component.shape.Shape
 import com.patrykandpatrick.vico.core.component.shape.ShapeComponent
 import com.patrykandpatrick.vico.core.component.shape.Shapes
-import com.patrykandpatrick.vico.core.component.shape.shader.DynamicShaders
 import com.patrykandpatrick.vico.core.component.text.TextComponent
 import com.patrykandpatrick.vico.core.component.text.VerticalPosition
 import com.patrykandpatrick.vico.core.formatter.DecimalFormatValueFormatter
@@ -209,16 +208,8 @@ public data class ChartStyle(
             ),
             lineChart = LineChart(
                 lines = entityColors.map { entityColor ->
-                    LineSpec(
-                        lineColor = entityColor.toArgb(),
-                        lineBackgroundShader = DynamicShaders.fromBrush(
-                            brush = Brush.verticalGradient(
-                                colors = listOf(
-                                    entityColor.copy(alpha = DefaultAlpha.LINE_BACKGROUND_SHADER_START),
-                                    entityColor.copy(alpha = DefaultAlpha.LINE_BACKGROUND_SHADER_END),
-                                ),
-                            ),
-                        ),
+                    lineSpec(
+                        lineFill = FillStyle.solid(entityColor),
                     )
                 },
             ),

From 12873a4c2b8070694d9d1481654dff82aac036e9 Mon Sep 17 00:00:00 2001
From: Patryk Goworowski <patrykgoworowski@gmail.com>
Date: Sat, 21 Oct 2023 13:22:29 +0200
Subject: [PATCH 07/15] Update the documentation in `LineChart.kt` in the
 `compose` module

---
 .../com/patrykandpatrick/vico/compose/chart/line/LineChart.kt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/chart/line/LineChart.kt b/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/chart/line/LineChart.kt
index f23e4d968..f88c5cf2a 100644
--- a/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/chart/line/LineChart.kt
+++ b/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/chart/line/LineChart.kt
@@ -145,9 +145,9 @@ public fun lineSpec(
 /**
  * Creates a [LineChart.LineSpec] for use in [LineChart]s.
  *
- * @param lineColor the color of the line.
+ * @param lineFill the [FillStyle] for the line.
  * @param lineThickness the thickness of the line.
- * @param lineBackgroundShader an optional [DynamicShader] to use for the area below the line.
+ * @param lineBackgroundFill an optional [FillStyle] to use for the area below and above the line.
  * @param lineCap the stroke cap for the line.
  * @param point an optional [Component] that can be drawn at a given point on the line.
  * @param pointSize the size of the [point].

From 698af48a69d632df1b577122475c0fae3b03b568 Mon Sep 17 00:00:00 2001
From: Patryk Goworowski <patrykgoworowski@gmail.com>
Date: Sat, 21 Oct 2023 13:22:54 +0200
Subject: [PATCH 08/15] Update charts in
 `LineChartsWithNegativeValuesPreviews.kt`

---
 .../sample/previews/LineChartsWithNegativeValuesPreviews.kt    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sample/src/main/java/com/patrykandpatrick/vico/sample/previews/LineChartsWithNegativeValuesPreviews.kt b/sample/src/main/java/com/patrykandpatrick/vico/sample/previews/LineChartsWithNegativeValuesPreviews.kt
index aaff9e7c2..06b7786eb 100644
--- a/sample/src/main/java/com/patrykandpatrick/vico/sample/previews/LineChartsWithNegativeValuesPreviews.kt
+++ b/sample/src/main/java/com/patrykandpatrick/vico/sample/previews/LineChartsWithNegativeValuesPreviews.kt
@@ -28,6 +28,7 @@ import com.patrykandpatrick.vico.compose.axis.axisLineComponent
 import com.patrykandpatrick.vico.compose.axis.horizontal.rememberBottomAxis
 import com.patrykandpatrick.vico.compose.axis.vertical.rememberStartAxis
 import com.patrykandpatrick.vico.compose.chart.Chart
+import com.patrykandpatrick.vico.compose.chart.fill.solid
 import com.patrykandpatrick.vico.compose.chart.fill.split
 import com.patrykandpatrick.vico.compose.chart.layout.fullWidth
 import com.patrykandpatrick.vico.compose.chart.line.lineChart
@@ -85,7 +86,7 @@ public fun SingleLineChartWithNegativeValuesAndDataLabels() {
     Surface {
         Chart(
             chart = lineChart(
-                lines = listOf(lineSpec(lineColor = Color.DarkGray, dataLabel = textComponent())),
+                lines = listOf(lineSpec(lineFill = FillStyle.solid(Color.DarkGray), dataLabel = textComponent())),
             ),
             model = model,
             startAxis = rememberStartAxis(),

From 5c53d38afc32b7a2d4202023e749fe6a4c1d6887 Mon Sep 17 00:00:00 2001
From: Patryk Goworowski <patrykgoworowski@gmail.com>
Date: Sat, 21 Oct 2023 14:07:22 +0200
Subject: [PATCH 09/15] Add `axisLabelComponent` function overload that accepts
 `padding` & `margins` parameters

---
 .../vico/compose/axis/AxisComponents.kt       | 45 ++++++++++++++++++-
 1 file changed, 44 insertions(+), 1 deletion(-)

diff --git a/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/axis/AxisComponents.kt b/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/axis/AxisComponents.kt
index 2448f1873..0c3a4aebd 100644
--- a/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/axis/AxisComponents.kt
+++ b/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/axis/AxisComponents.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 by Patryk Goworowski and Patrick Michalik.
+ * Copyright 2023 by Patryk Goworowski and Patrick Michalik.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -39,6 +39,7 @@ import com.patrykandpatrick.vico.core.component.shape.ShapeComponent
 import com.patrykandpatrick.vico.core.component.shape.shader.DynamicShader
 import com.patrykandpatrick.vico.core.component.text.TextComponent
 import com.patrykandpatrick.vico.core.dimensions.Dimensions
+import com.patrykandpatrick.vico.core.dimensions.MutableDimensions
 import com.patrykandpatrick.vico.core.dimensions.emptyDimensions
 
 public typealias ChartShape = com.patrykandpatrick.vico.core.component.shape.Shape
@@ -83,6 +84,48 @@ public fun axisLabelComponent(
     textAlignment,
 )
 
+/**
+ * Creates a [TextComponent] to be used for axis labels.
+ *
+ * @param color the text color.
+ * @param textSize the text size.
+ * @param background an optional [ShapeComponent] to be displayed behind the text.
+ * @param ellipsize the text truncation behavior.
+ * @param lineCount the line count.
+ * @param padding the padding between the text and the background.
+ * @param margins the margins around the background.
+ * @param typeface the [Typeface] for the text.
+ * @param textAlignment the text alignment.
+ */
+@Composable
+public fun axisLabelComponent(
+    color: Color = currentChartStyle.axis.axisLabelColor,
+    textSize: TextUnit = currentChartStyle.axis.axisLabelTextSize,
+    background: ShapeComponent? = currentChartStyle.axis.axisLabelBackground,
+    ellipsize: TextUtils.TruncateAt = TextUtils.TruncateAt.END,
+    lineCount: Int = currentChartStyle.axis.axisLabelLineCount,
+    padding: MutableDimensions = dimensionsOf(
+        horizontal = currentChartStyle.axis.axisLabelHorizontalPadding,
+        vertical = currentChartStyle.axis.axisLabelVerticalPadding,
+    ),
+    margins: MutableDimensions = dimensionsOf(
+        horizontal = currentChartStyle.axis.axisLabelHorizontalMargin,
+        vertical = currentChartStyle.axis.axisLabelVerticalMargin,
+    ),
+    typeface: Typeface = currentChartStyle.axis.axisLabelTypeface,
+    textAlignment: Layout.Alignment = currentChartStyle.axis.axisLabelTextAlignment,
+): TextComponent = textComponent(
+    color,
+    textSize,
+    background,
+    ellipsize,
+    lineCount,
+    padding,
+    margins,
+    typeface,
+    textAlignment,
+)
+
 /**
  * Creates a [TextComponent] to be used for axis labels.
  *

From aa0edbb62a19292eac8f8d00222f0dce2017840f Mon Sep 17 00:00:00 2001
From: Patryk Goworowski <patrykgoworowski@gmail.com>
Date: Sat, 21 Oct 2023 19:15:06 +0200
Subject: [PATCH 10/15] Update the view-based `Chart9` to match the
 composable-based one

---
 .../vico/sample/showcase/charts/Chart9.kt     | 45 +++++++++++++++++--
 1 file changed, 41 insertions(+), 4 deletions(-)

diff --git a/sample/src/main/java/com/patrykandpatrick/vico/sample/showcase/charts/Chart9.kt b/sample/src/main/java/com/patrykandpatrick/vico/sample/showcase/charts/Chart9.kt
index ce58fe842..3342d32c9 100644
--- a/sample/src/main/java/com/patrykandpatrick/vico/sample/showcase/charts/Chart9.kt
+++ b/sample/src/main/java/com/patrykandpatrick/vico/sample/showcase/charts/Chart9.kt
@@ -22,6 +22,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.ReadOnlyComposable
 import androidx.compose.runtime.remember
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.toArgb
 import androidx.compose.ui.res.colorResource
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.viewinterop.AndroidViewBinding
@@ -46,6 +47,8 @@ import com.patrykandpatrick.vico.core.axis.Axis
 import com.patrykandpatrick.vico.core.axis.AxisItemPlacer
 import com.patrykandpatrick.vico.core.chart.fill.FillStyle
 import com.patrykandpatrick.vico.core.chart.layout.HorizontalLayout
+import com.patrykandpatrick.vico.core.chart.line.LineChart
+import com.patrykandpatrick.vico.core.component.shape.ShapeComponent
 import com.patrykandpatrick.vico.core.component.shape.Shapes
 import com.patrykandpatrick.vico.core.component.shape.shader.DynamicShaders
 import com.patrykandpatrick.vico.core.entry.ChartEntryModelProducer
@@ -71,10 +74,6 @@ private fun ComposeChart9(chartEntryModelProducer: ChartEntryModelProducer) {
                 lines = listOf(
                     lineSpec(
                         lineFill = FillStyle.split(chartColors[0], chartColors[1]),
-//                        lineBackgroundFill = FillStyle.brush(
-//                        Brush.horizontalGradient(listOf(chartColors[0], chartColors[1]))
-//                        ),
-//                        lineBackgroundFill = FillStyle.split(chartColors[0], chartColors[1]),
                         lineBackgroundFill = FillStyle.splitShader(
                             DynamicShaders.composeShader(
                                 DynamicShaders.fromComponent(
@@ -149,12 +148,50 @@ private fun ComposeChart9(chartEntryModelProducer: ChartEntryModelProducer) {
 @Composable
 private fun ViewChart9(chartEntryModelProducer: ChartEntryModelProducer) {
     val marker = rememberMarker()
+    val colors = chartColors
     AndroidViewBinding(Chart9Binding::inflate) {
         with(chartView) {
             runInitialAnimation = false
             entryProducer = chartEntryModelProducer
             (bottomAxis as Axis).guideline = null
             this.marker = marker
+            with(chart as LineChart) {
+                lines = listOf(
+                    LineChart.LineSpec(
+                        lineFill = FillStyle.Split(
+                            positiveColor = colors[0].toArgb(),
+                            negativeColor = colors[1].toArgb(),
+                        ),
+                        lineBackgroundFill = FillStyle.SplitShader(
+                            DynamicShaders.composeShader(
+                                DynamicShaders.fromComponent(
+                                    componentSize = 6.dp,
+                                    component = ShapeComponent(
+                                        shape = Shapes.pillShape,
+                                        color = colors[0].toArgb(),
+                                        margins = dimensionsOf(1.dp),
+                                    ),
+                                ),
+                                verticalGradient(arrayOf(Color.Black, Color.Transparent)),
+                                PorterDuff.Mode.DST_IN,
+                            ),
+                            DynamicShaders.composeShader(
+                                DynamicShaders.fromComponent(
+                                    componentSize = 5.dp,
+                                    component = ShapeComponent(
+                                        shape = Shapes.rectShape,
+                                        color = colors[1].toArgb(),
+                                        margins = dimensionsOf(horizontal = 2.dp),
+                                    ),
+                                    checkeredArrangement = false,
+                                ),
+                                verticalGradient(arrayOf(Color.Transparent, Color.Black)),
+                                PorterDuff.Mode.DST_IN,
+                            ),
+                        ),
+                    ),
+                )
+            }
         }
     }
 }

From 4b216fa077617564dc033ec51d60e6afae387c62 Mon Sep 17 00:00:00 2001
From: Patryk Goworowski <patrykgoworowski@gmail.com>
Date: Mon, 6 Nov 2023 19:32:53 +0100
Subject: [PATCH 11/15] Fix issues with applying XML attributes

---
 .../java/com/patrykandpatrick/vico/views/chart/ChartView.kt | 6 +++---
 .../patrykandpatrick/vico/views/chart/ComposedChartView.kt  | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/vico/views/src/main/java/com/patrykandpatrick/vico/views/chart/ChartView.kt b/vico/views/src/main/java/com/patrykandpatrick/vico/views/chart/ChartView.kt
index 9119caf65..c5963b018 100644
--- a/vico/views/src/main/java/com/patrykandpatrick/vico/views/chart/ChartView.kt
+++ b/vico/views/src/main/java/com/patrykandpatrick/vico/views/chart/ChartView.kt
@@ -41,11 +41,11 @@ public class ChartView @JvmOverloads constructor(
 ) {
     init {
         chart = themeHandler.chart
-        if (isInEditMode && attrs != null) setPreviewModel(attrs, defStyleAttr)
+        if (isInEditMode && attrs != null) setPreviewModel(attrs)
     }
 
-    private fun setPreviewModel(attrs: AttributeSet, defStyleAttr: Int) {
-        context.obtainStyledAttributes(attrs, R.styleable.ChartView, defStyleAttr, 0).use { typedArray ->
+    private fun setPreviewModel(attrs: AttributeSet) {
+        context.obtainStyledAttributes(attrs, R.styleable.ChartView).use { typedArray ->
             val seriesCount = typedArray.getInt(R.styleable.ChartView_previewSeriesCount, SERIES_COUNT)
             val minX = typedArray.getInt(R.styleable.ChartView_previewMinX, 0)
             val maxX = typedArray.getInt(R.styleable.ChartView_previewMaxX, X_RANGE_TOP)
diff --git a/vico/views/src/main/java/com/patrykandpatrick/vico/views/chart/ComposedChartView.kt b/vico/views/src/main/java/com/patrykandpatrick/vico/views/chart/ComposedChartView.kt
index efe479189..6e577098e 100644
--- a/vico/views/src/main/java/com/patrykandpatrick/vico/views/chart/ComposedChartView.kt
+++ b/vico/views/src/main/java/com/patrykandpatrick/vico/views/chart/ComposedChartView.kt
@@ -44,11 +44,11 @@ public class ComposedChartView @JvmOverloads constructor(
 
     init {
         chart = themeHandler.composedChart
-        if (isInEditMode && attrs != null) setPreviewModel(attrs, defStyleAttr)
+        if (isInEditMode && attrs != null) setPreviewModel(attrs)
     }
 
-    private fun setPreviewModel(attrs: AttributeSet, defStyleAttr: Int) {
-        context.obtainStyledAttributes(attrs, R.styleable.ComposedChartView, defStyleAttr, 0).use { typedArray ->
+    private fun setPreviewModel(attrs: AttributeSet) {
+        context.obtainStyledAttributes(attrs, R.styleable.ComposedChartView).use { typedArray ->
             val modelCount = typedArray.getInt(R.styleable.ComposedChartView_previewModelCount, MODEL_COUNT)
             val seriesCount = typedArray.getInt(R.styleable.ComposedChartView_previewSeriesCount, SERIES_COUNT)
             val minX = typedArray.getInt(R.styleable.ComposedChartView_previewMinX, 0)

From 09ac906d11f1513920a0bd49236858eda311d9c8 Mon Sep 17 00:00:00 2001
From: Patryk Goworowski <patrykgoworowski@gmail.com>
Date: Wed, 22 Nov 2023 18:48:46 +0100
Subject: [PATCH 12/15] Replace `FillStyle` usages with `DynamicShader`

---
 .../LineChartsWithNegativeValuesPreviews.kt   |  12 +-
 .../vico/sample/showcase/charts/Chart9.kt     |  16 +-
 .../vico/compose/chart/fill/FillStyles.kt     |  58 -----
 .../vico/compose/chart/line/LineChart.kt      |  42 ++--
 .../component/shape/shader/DynamicShaders.kt  |  19 +-
 .../vico/compose/style/ChartStyle.kt          |   6 +-
 .../vico/core/chart/LineSpecExtensions.kt     |  13 +-
 .../vico/core/chart/fill/FillStyle.kt         | 211 ------------------
 .../vico/core/chart/line/LineChart.kt         |  51 ++---
 .../component/shape/shader/DynamicShader.kt   |  78 ++++++-
 .../component/shape/shader/DynamicShaders.kt  |   9 +
 .../shape/shader/HorizontalSplitShader.kt     |  20 ++
 .../component/shape/shader/SolidShader.kt     |  79 +++++++
 .../component/shape/shader/DynamicShaders.kt  |  19 +-
 .../views/theme/ComponentStyleExtensions.kt   |  13 +-
 15 files changed, 286 insertions(+), 360 deletions(-)
 delete mode 100644 vico/compose/src/main/java/com/patrykandpatrick/vico/compose/chart/fill/FillStyles.kt
 delete mode 100644 vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/fill/FillStyle.kt
 create mode 100644 vico/core/src/main/java/com/patrykandpatrick/vico/core/component/shape/shader/SolidShader.kt

diff --git a/sample/src/main/java/com/patrykandpatrick/vico/sample/previews/LineChartsWithNegativeValuesPreviews.kt b/sample/src/main/java/com/patrykandpatrick/vico/sample/previews/LineChartsWithNegativeValuesPreviews.kt
index 06b7786eb..96e7e17ef 100644
--- a/sample/src/main/java/com/patrykandpatrick/vico/sample/previews/LineChartsWithNegativeValuesPreviews.kt
+++ b/sample/src/main/java/com/patrykandpatrick/vico/sample/previews/LineChartsWithNegativeValuesPreviews.kt
@@ -28,16 +28,16 @@ import com.patrykandpatrick.vico.compose.axis.axisLineComponent
 import com.patrykandpatrick.vico.compose.axis.horizontal.rememberBottomAxis
 import com.patrykandpatrick.vico.compose.axis.vertical.rememberStartAxis
 import com.patrykandpatrick.vico.compose.chart.Chart
-import com.patrykandpatrick.vico.compose.chart.fill.solid
-import com.patrykandpatrick.vico.compose.chart.fill.split
 import com.patrykandpatrick.vico.compose.chart.layout.fullWidth
 import com.patrykandpatrick.vico.compose.chart.line.lineChart
 import com.patrykandpatrick.vico.compose.chart.line.lineSpec
+import com.patrykandpatrick.vico.compose.component.shape.shader.solid
+import com.patrykandpatrick.vico.compose.component.shape.shader.split
 import com.patrykandpatrick.vico.compose.component.textComponent
 import com.patrykandpatrick.vico.core.axis.AxisItemPlacer
-import com.patrykandpatrick.vico.core.chart.fill.FillStyle
 import com.patrykandpatrick.vico.core.chart.layout.HorizontalLayout
 import com.patrykandpatrick.vico.core.chart.values.AxisValuesOverrider
+import com.patrykandpatrick.vico.core.component.shape.shader.DynamicShaders
 import com.patrykandpatrick.vico.core.entry.entryModelOf
 import com.patrykandpatrick.vico.sample.showcase.rememberMarker
 
@@ -53,7 +53,7 @@ public fun SingleLineChartWithNegativeValues() {
             chart = lineChart(
                 lines = listOf(
                     lineSpec(
-                        lineFill = FillStyle.split(
+                        lineShader = DynamicShaders.split(
                             positiveColor = Color(0xFF25BE53),
                             negativeColor = Color(0xFFE73B3B),
                         ),
@@ -86,7 +86,9 @@ public fun SingleLineChartWithNegativeValuesAndDataLabels() {
     Surface {
         Chart(
             chart = lineChart(
-                lines = listOf(lineSpec(lineFill = FillStyle.solid(Color.DarkGray), dataLabel = textComponent())),
+                lines = listOf(
+                    lineSpec(lineShader = DynamicShaders.solid(Color.DarkGray), dataLabel = textComponent()),
+                ),
             ),
             model = model,
             startAxis = rememberStartAxis(),
diff --git a/sample/src/main/java/com/patrykandpatrick/vico/sample/showcase/charts/Chart9.kt b/sample/src/main/java/com/patrykandpatrick/vico/sample/showcase/charts/Chart9.kt
index 3342d32c9..e61e652b9 100644
--- a/sample/src/main/java/com/patrykandpatrick/vico/sample/showcase/charts/Chart9.kt
+++ b/sample/src/main/java/com/patrykandpatrick/vico/sample/showcase/charts/Chart9.kt
@@ -31,26 +31,25 @@ import com.patrykandpatrick.vico.compose.axis.axisLabelComponent
 import com.patrykandpatrick.vico.compose.axis.horizontal.rememberBottomAxis
 import com.patrykandpatrick.vico.compose.axis.vertical.rememberStartAxis
 import com.patrykandpatrick.vico.compose.chart.Chart
-import com.patrykandpatrick.vico.compose.chart.fill.split
-import com.patrykandpatrick.vico.compose.chart.fill.splitShader
 import com.patrykandpatrick.vico.compose.chart.layout.fullWidth
 import com.patrykandpatrick.vico.compose.chart.line.lineChart
 import com.patrykandpatrick.vico.compose.chart.line.lineSpec
 import com.patrykandpatrick.vico.compose.component.lineComponent
 import com.patrykandpatrick.vico.compose.component.shape.dashedShape
 import com.patrykandpatrick.vico.compose.component.shape.shader.fromComponent
+import com.patrykandpatrick.vico.compose.component.shape.shader.split
 import com.patrykandpatrick.vico.compose.component.shape.shader.verticalGradient
 import com.patrykandpatrick.vico.compose.component.shapeComponent
 import com.patrykandpatrick.vico.compose.dimensions.dimensionsOf
 import com.patrykandpatrick.vico.compose.style.ProvideChartStyle
 import com.patrykandpatrick.vico.core.axis.Axis
 import com.patrykandpatrick.vico.core.axis.AxisItemPlacer
-import com.patrykandpatrick.vico.core.chart.fill.FillStyle
 import com.patrykandpatrick.vico.core.chart.layout.HorizontalLayout
 import com.patrykandpatrick.vico.core.chart.line.LineChart
 import com.patrykandpatrick.vico.core.component.shape.ShapeComponent
 import com.patrykandpatrick.vico.core.component.shape.Shapes
 import com.patrykandpatrick.vico.core.component.shape.shader.DynamicShaders
+import com.patrykandpatrick.vico.core.component.shape.shader.splitShader
 import com.patrykandpatrick.vico.core.entry.ChartEntryModelProducer
 import com.patrykandpatrick.vico.databinding.Chart9Binding
 import com.patrykandpatrick.vico.sample.showcase.UISystem
@@ -73,8 +72,8 @@ private fun ComposeChart9(chartEntryModelProducer: ChartEntryModelProducer) {
             chart = lineChart(
                 lines = listOf(
                     lineSpec(
-                        lineFill = FillStyle.split(chartColors[0], chartColors[1]),
-                        lineBackgroundFill = FillStyle.splitShader(
+                        lineShader = DynamicShaders.split(chartColors[0], chartColors[1]),
+                        lineBackgroundShader = DynamicShaders.splitShader(
                             DynamicShaders.composeShader(
                                 DynamicShaders.fromComponent(
                                     componentSize = 6.dp,
@@ -158,11 +157,8 @@ private fun ViewChart9(chartEntryModelProducer: ChartEntryModelProducer) {
             with(chart as LineChart) {
                 lines = listOf(
                     LineChart.LineSpec(
-                        lineFill = FillStyle.Split(
-                            positiveColor = colors[0].toArgb(),
-                            negativeColor = colors[1].toArgb(),
-                        ),
-                        lineBackgroundFill = FillStyle.SplitShader(
+                        lineShader = DynamicShaders.split(colors[0], colors[1]),
+                        lineBackgroundShader = DynamicShaders.splitShader(
                             DynamicShaders.composeShader(
                                 DynamicShaders.fromComponent(
                                     componentSize = 6.dp,
diff --git a/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/chart/fill/FillStyles.kt b/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/chart/fill/FillStyles.kt
deleted file mode 100644
index 2b7de1849..000000000
--- a/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/chart/fill/FillStyles.kt
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright 2023 by Patryk Goworowski and Patrick Michalik.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.patrykandpatrick.vico.compose.chart.fill
-
-import androidx.compose.ui.graphics.Brush
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.toArgb
-import com.patrykandpatrick.vico.compose.component.shape.shader.toDynamicShader
-import com.patrykandpatrick.vico.core.chart.fill.FillStyle
-import com.patrykandpatrick.vico.core.component.shape.shader.DynamicShader
-
-/**
- * Creates a [FillStyle] that fills the area with a solid color.
- */
-public fun FillStyle.Companion.solid(color: Color): FillStyle.Solid = FillStyle.Solid(color.toArgb())
-
-/**
- * Creates a [FillStyle] with split colors. The positive color is used for values above the zero line, and the negative
- * color is used for values below the zero line.
- */
-public fun FillStyle.Companion.split(positiveColor: Color, negativeColor: Color): FillStyle.Split =
-    FillStyle.Split(positiveColor.toArgb(), negativeColor.toArgb())
-
-/**
- * Creates a [FillStyle] with a [DynamicShader].
- */
-public fun FillStyle.Companion.shader(shader: DynamicShader): FillStyle.Shader<DynamicShader> =
-    FillStyle.Shader(shader)
-
-/**
- * Creates a [FillStyle] with a [DynamicShader] that is split into two shaders. The positive shader is used for values
- * above the zero line, and the negative shader is used for values below the zero line.
- */
-public fun FillStyle.Companion.splitShader(
-    positiveShader: DynamicShader,
-    negativeShader: DynamicShader,
-): FillStyle.SplitShader =
-    FillStyle.SplitShader(positiveShader, negativeShader)
-
-/**
- * Creates a [FillStyle] with a [Brush].
- */
-public fun FillStyle.Companion.brush(brush: Brush): FillStyle.Shader<DynamicShader> =
-    FillStyle.Shader(brush.toDynamicShader())
diff --git a/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/chart/line/LineChart.kt b/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/chart/line/LineChart.kt
index f88c5cf2a..4932508a9 100644
--- a/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/chart/line/LineChart.kt
+++ b/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/chart/line/LineChart.kt
@@ -26,7 +26,6 @@ import androidx.compose.ui.graphics.toArgb
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import com.patrykandpatrick.vico.compose.chart.Chart
-import com.patrykandpatrick.vico.compose.chart.fill.shader
 import com.patrykandpatrick.vico.compose.component.shape.shader.fromBrush
 import com.patrykandpatrick.vico.compose.style.currentChartStyle
 import com.patrykandpatrick.vico.core.DefaultAlpha
@@ -37,7 +36,6 @@ import com.patrykandpatrick.vico.core.chart.DefaultPointConnector
 import com.patrykandpatrick.vico.core.chart.column.ColumnChart
 import com.patrykandpatrick.vico.core.chart.composed.ComposedChart
 import com.patrykandpatrick.vico.core.chart.decoration.Decoration
-import com.patrykandpatrick.vico.core.chart.fill.FillStyle
 import com.patrykandpatrick.vico.core.chart.line.LineChart
 import com.patrykandpatrick.vico.core.chart.line.LineChart.LineSpec
 import com.patrykandpatrick.vico.core.chart.line.LineChartDrawingModel
@@ -46,6 +44,8 @@ import com.patrykandpatrick.vico.core.chart.values.ChartValues
 import com.patrykandpatrick.vico.core.component.Component
 import com.patrykandpatrick.vico.core.component.shape.shader.DynamicShader
 import com.patrykandpatrick.vico.core.component.shape.shader.DynamicShaders
+import com.patrykandpatrick.vico.core.component.shape.shader.HorizontalSplitShader
+import com.patrykandpatrick.vico.core.component.shape.shader.SolidShader
 import com.patrykandpatrick.vico.core.component.text.TextComponent
 import com.patrykandpatrick.vico.core.component.text.VerticalPosition
 import com.patrykandpatrick.vico.core.entry.ChartEntryModel
@@ -129,9 +129,9 @@ public fun lineSpec(
     dataLabelRotationDegrees: Float = 0f,
     pointConnector: LineSpec.PointConnector = DefaultPointConnector(),
 ): LineSpec = LineSpec(
-    lineFill = FillStyle.Solid(lineColor.toArgb()),
+    lineShader = SolidShader(lineColor.toArgb()),
     lineThicknessDp = lineThickness.value,
-    lineBackgroundFill = lineBackgroundShader?.let(FillStyle::shader),
+    lineBackgroundShader = lineBackgroundShader,
     lineCap = lineCap.paintCap,
     point = point,
     pointSizeDp = pointSize.value,
@@ -145,9 +145,9 @@ public fun lineSpec(
 /**
  * Creates a [LineChart.LineSpec] for use in [LineChart]s.
  *
- * @param lineFill the [FillStyle] for the line.
+ * @param lineShader the [DynamicShader] for the line.
  * @param lineThickness the thickness of the line.
- * @param lineBackgroundFill an optional [FillStyle] to use for the area below and above the line.
+ * @param lineBackgroundShader an optional [DynamicShader] to use for the area below and above the line.
  * @param lineCap the stroke cap for the line.
  * @param point an optional [Component] that can be drawn at a given point on the line.
  * @param pointSize the size of the [point].
@@ -161,9 +161,9 @@ public fun lineSpec(
  * @see LineChart.LineSpec
  */
 public fun lineSpec(
-    lineFill: FillStyle,
+    lineShader: DynamicShader,
     lineThickness: Dp = DefaultDimens.LINE_THICKNESS.dp,
-    lineBackgroundFill: FillStyle? = lineFill.getBackwardCompatibleBackgroundFill(),
+    lineBackgroundShader: DynamicShader? = lineShader.getBackwardCompatibleBackgroundShader(),
     lineCap: StrokeCap = StrokeCap.Round,
     point: Component? = null,
     pointSize: Dp = DefaultDimens.POINT_SIZE.dp,
@@ -173,9 +173,9 @@ public fun lineSpec(
     dataLabelRotationDegrees: Float = 0f,
     pointConnector: LineSpec.PointConnector = DefaultPointConnector(),
 ): LineSpec = LineSpec(
-    lineFill = lineFill,
+    lineShader = lineShader,
     lineThicknessDp = lineThickness.value,
-    lineBackgroundFill = lineBackgroundFill,
+    lineBackgroundShader = lineBackgroundShader,
     lineCap = lineCap.paintCap,
     point = point,
     pointSizeDp = pointSize.value,
@@ -186,10 +186,10 @@ public fun lineSpec(
     pointConnector = pointConnector,
 )
 
-private fun FillStyle.getBackwardCompatibleBackgroundFill(): FillStyle? =
+private fun DynamicShader.getBackwardCompatibleBackgroundShader(): DynamicShader? =
     when (this) {
-        is FillStyle.Solid -> FillStyle.SplitShader(
-            positiveShader = DynamicShaders.fromBrush(
+        is SolidShader -> HorizontalSplitShader.Double(
+            topShader = DynamicShaders.fromBrush(
                 brush = Brush.verticalGradient(
                     listOf(
                         Color(color).copy(alpha = DefaultAlpha.LINE_BACKGROUND_SHADER_START),
@@ -197,7 +197,7 @@ private fun FillStyle.getBackwardCompatibleBackgroundFill(): FillStyle? =
                     ),
                 ),
             ),
-            negativeShader = DynamicShaders.fromBrush(
+            bottomShader = DynamicShaders.fromBrush(
                 brush = Brush.verticalGradient(
                     listOf(
                         Color(color).copy(alpha = DefaultAlpha.LINE_BACKGROUND_SHADER_END),
@@ -207,20 +207,20 @@ private fun FillStyle.getBackwardCompatibleBackgroundFill(): FillStyle? =
             ),
         )
 
-        is FillStyle.Split -> FillStyle.SplitShader(
-            positiveShader = DynamicShaders.fromBrush(
+        is HorizontalSplitShader.Solid -> HorizontalSplitShader.Double(
+            topShader = DynamicShaders.fromBrush(
                 brush = Brush.verticalGradient(
                     listOf(
-                        Color(positiveColor).copy(alpha = DefaultAlpha.LINE_BACKGROUND_SHADER_START),
-                        Color(positiveColor).copy(alpha = DefaultAlpha.LINE_BACKGROUND_SHADER_END),
+                        Color(colorTop).copy(alpha = DefaultAlpha.LINE_BACKGROUND_SHADER_START),
+                        Color(colorTop).copy(alpha = DefaultAlpha.LINE_BACKGROUND_SHADER_END),
                     ),
                 ),
             ),
-            negativeShader = DynamicShaders.fromBrush(
+            bottomShader = DynamicShaders.fromBrush(
                 brush = Brush.verticalGradient(
                     listOf(
-                        Color(negativeColor).copy(alpha = DefaultAlpha.LINE_BACKGROUND_SHADER_END),
-                        Color(negativeColor).copy(alpha = DefaultAlpha.LINE_BACKGROUND_SHADER_START),
+                        Color(colorBottom).copy(alpha = DefaultAlpha.LINE_BACKGROUND_SHADER_END),
+                        Color(colorBottom).copy(alpha = DefaultAlpha.LINE_BACKGROUND_SHADER_START),
                     ),
                 ),
             ),
diff --git a/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/component/shape/shader/DynamicShaders.kt b/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/component/shape/shader/DynamicShaders.kt
index 371042e6a..cebf286f7 100644
--- a/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/component/shape/shader/DynamicShaders.kt
+++ b/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/component/shape/shader/DynamicShaders.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 by Patryk Goworowski and Patrick Michalik.
+ * Copyright 2023 by Patryk Goworowski and Patrick Michalik.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,10 +18,15 @@ package com.patrykandpatrick.vico.compose.component.shape.shader
 
 import android.graphics.Shader
 import androidx.compose.ui.graphics.Brush
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.toArgb
 import androidx.compose.ui.unit.Dp
 import com.patrykandpatrick.vico.core.component.Component
 import com.patrykandpatrick.vico.core.component.shape.shader.ComponentShader
+import com.patrykandpatrick.vico.core.component.shape.shader.DynamicShader
 import com.patrykandpatrick.vico.core.component.shape.shader.DynamicShaders
+import com.patrykandpatrick.vico.core.component.shape.shader.HorizontalSplitShader
+import com.patrykandpatrick.vico.core.component.shape.shader.SolidShader
 
 /**
  * Creates a [ComponentShader] out of the provided [component].
@@ -52,3 +57,15 @@ public fun DynamicShaders.fromComponent(
  * @see BrushShader
  */
 public fun DynamicShaders.fromBrush(brush: Brush): BrushShader = BrushShader(brush)
+
+/**
+ * Creates a [DynamicShader] that fills the area with a solid color.
+ */
+public fun DynamicShaders.solid(color: Color): SolidShader = SolidShader(color.toArgb())
+
+/**
+ * Creates a [DynamicShader] with split colors. The positive color is used for values above the zero line,
+ * and the negative color is used for values below the zero line.
+ */
+public fun DynamicShaders.split(positiveColor: Color, negativeColor: Color): HorizontalSplitShader.Solid =
+    HorizontalSplitShader.Solid(positiveColor.toArgb(), negativeColor.toArgb())
diff --git a/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/style/ChartStyle.kt b/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/style/ChartStyle.kt
index 1a6a4542b..203602521 100644
--- a/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/style/ChartStyle.kt
+++ b/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/style/ChartStyle.kt
@@ -32,21 +32,21 @@ import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.TextUnit
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import com.patrykandpatrick.vico.compose.chart.fill.solid
 import com.patrykandpatrick.vico.compose.chart.line.lineSpec
 import com.patrykandpatrick.vico.compose.component.shape.dashedShape
+import com.patrykandpatrick.vico.compose.component.shape.shader.solid
 import com.patrykandpatrick.vico.core.DefaultColors
 import com.patrykandpatrick.vico.core.DefaultDimens
 import com.patrykandpatrick.vico.core.axis.AxisPosition
 import com.patrykandpatrick.vico.core.axis.formatter.AxisValueFormatter
 import com.patrykandpatrick.vico.core.axis.formatter.DecimalFormatAxisValueFormatter
 import com.patrykandpatrick.vico.core.chart.column.ColumnChart.MergeMode
-import com.patrykandpatrick.vico.core.chart.fill.FillStyle
 import com.patrykandpatrick.vico.core.chart.line.LineChart.LineSpec
 import com.patrykandpatrick.vico.core.component.shape.LineComponent
 import com.patrykandpatrick.vico.core.component.shape.Shape
 import com.patrykandpatrick.vico.core.component.shape.ShapeComponent
 import com.patrykandpatrick.vico.core.component.shape.Shapes
+import com.patrykandpatrick.vico.core.component.shape.shader.DynamicShaders
 import com.patrykandpatrick.vico.core.component.text.TextComponent
 import com.patrykandpatrick.vico.core.component.text.VerticalPosition
 import com.patrykandpatrick.vico.core.formatter.DecimalFormatValueFormatter
@@ -209,7 +209,7 @@ public data class ChartStyle(
             lineChart = LineChart(
                 lines = entityColors.map { entityColor ->
                     lineSpec(
-                        lineFill = FillStyle.solid(entityColor),
+                        lineShader = DynamicShaders.solid(entityColor),
                     )
                 },
             ),
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/LineSpecExtensions.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/LineSpecExtensions.kt
index e0542375b..642e1479a 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/LineSpecExtensions.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/LineSpecExtensions.kt
@@ -17,7 +17,6 @@
 package com.patrykandpatrick.vico.core.chart
 
 import android.graphics.Paint
-import com.patrykandpatrick.vico.core.chart.fill.FillStyle
 import com.patrykandpatrick.vico.core.chart.line.LineChart
 import com.patrykandpatrick.vico.core.component.Component
 import com.patrykandpatrick.vico.core.component.shape.shader.DynamicShader
@@ -65,9 +64,9 @@ public fun LineChart.LineSpec.copy(
  * Creates a new [LineChart.LineSpec] based on this one, updating select properties.
  */
 @Deprecated(
-    message = "`lineColor` and `lineBackgroundShader` are deprecated. Use `lineFill` and `lineBackgroundFill`",
+    message = "`lineColor` is deprecated. Use `lineShader`",
     replaceWith = ReplaceWith(
-        "copy(lineFill = lineFill, lineBackgroundFill = lineBackgroundFill)",
+        "copy(lineShader = lineShader)",
         "com.patrykandpatrick.vico.core.chart.fill.FillStyle",
     ),
 )
@@ -100,9 +99,9 @@ public fun LineChart.LineSpec.copy(
  * Creates a new [LineChart.LineSpec] based on this one, updating select properties.
  */
 public fun LineChart.LineSpec.copy(
-    lineFill: FillStyle = this.lineFill,
+    lineFill: DynamicShader = this.lineShader,
     lineThicknessDp: Float = this.lineThicknessDp,
-    lineBackgroundFill: FillStyle? = this.lineBackgroundFill,
+    lineBackgroundFill: DynamicShader? = this.lineBackgroundShader,
     lineCap: Paint.Cap = this.lineCap,
     point: Component? = this.point,
     pointSizeDp: Float = this.pointSizeDp,
@@ -112,9 +111,9 @@ public fun LineChart.LineSpec.copy(
     dataLabelRotationDegrees: Float = this.dataLabelRotationDegrees,
     pointConnector: LineChart.LineSpec.PointConnector = this.pointConnector,
 ): LineChart.LineSpec = LineChart.LineSpec(
-    lineFill = lineFill,
+    lineShader = lineFill,
     lineThicknessDp = lineThicknessDp,
-    lineBackgroundFill = lineBackgroundFill,
+    lineBackgroundShader = lineBackgroundFill,
     lineCap = lineCap,
     point = point,
     pointSizeDp = pointSizeDp,
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/fill/FillStyle.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/fill/FillStyle.kt
deleted file mode 100644
index 427c314ac..000000000
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/fill/FillStyle.kt
+++ /dev/null
@@ -1,211 +0,0 @@
-/*
- * Copyright 2023 by Patryk Goworowski and Patrick Michalik.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.patrykandpatrick.vico.core.chart.fill
-
-import android.graphics.Bitmap
-import android.graphics.Canvas
-import android.graphics.Paint
-import android.graphics.RectF
-import com.patrykandpatrick.vico.core.component.shape.shader.DynamicShader
-import com.patrykandpatrick.vico.core.component.shape.shader.HorizontalSplitShader
-import com.patrykandpatrick.vico.core.context.DrawContext
-import com.patrykandpatrick.vico.core.context.getOrPutExtra
-import com.patrykandpatrick.vico.core.model.Point
-import kotlin.math.roundToInt
-
-/**
- * Defines an appearance of a component. It modifies the [Paint] object and applies either a color integer, or a
- * [android.graphics.Shader] to it.
- */
-public interface FillStyle {
-
-    /**
-     * Applies the style to the [Paint] object.
-     *
-     * @param paint the [Paint] object to apply the style to.
-     * @param drawContext the [DrawContext] for the current draw operation.
-     * @param rectF the [RectF] holding coordinates of the area to apply the style to.
-     * @param zeroLineYFraction the fraction of the height of the area to apply the style to, that the zero line is at.
-     */
-    public fun applyTo(paint: Paint, drawContext: DrawContext, rectF: RectF, zeroLineYFraction: Float) {
-        applyTo(paint, drawContext, rectF.left, rectF.top, rectF.right, rectF.bottom, zeroLineYFraction)
-    }
-
-    /**
-     * Applies the style to the [Paint] object.
-     *
-     * @param paint the [Paint] object to apply the style to.
-     * @param drawContext the [DrawContext] for the current draw operation.
-     * @param left the left coordinate of the area to apply the style to.
-     * @param top the top coordinate of the area to apply the style to.
-     * @param right the right coordinate of the area to apply the style to.
-     * @param bottom the bottom coordinate of the area to apply the style to.
-     * @param zeroLineYFraction the fraction of the height of the area to apply the style to, that the zero line is at.
-     */
-    public fun applyTo(
-        paint: Paint,
-        drawContext: DrawContext,
-        left: Float,
-        top: Float,
-        right: Float,
-        bottom: Float,
-        zeroLineYFraction: Float,
-    )
-
-    /**
-     * Gets the color of the style at the given point.
-     *
-     * @param point the [Point] to get the color at.
-     * @param drawContext the [DrawContext] for the current draw operation.
-     * @param rectF the [RectF] holding coordinates of the area to apply the style to.
-     * @param zeroLineYFraction the fraction of the height of the area to apply the style to, that the zero line is at.
-     */
-    public fun getColorAt(point: Point, drawContext: DrawContext, rectF: RectF, zeroLineYFraction: Float): Int
-
-    /**
-     * A solid color fill style.
-     *
-     * @param color the color of the fill.
-     */
-    public class Solid(public val color: Int) : FillStyle {
-
-        override fun applyTo(
-            paint: Paint,
-            drawContext: DrawContext,
-            left: Float,
-            top: Float,
-            right: Float,
-            bottom: Float,
-            zeroLineYFraction: Float,
-        ) {
-            paint.color = color
-            paint.shader = null
-        }
-
-        override fun getColorAt(point: Point, drawContext: DrawContext, rectF: RectF, zeroLineYFraction: Float): Int =
-            color
-    }
-
-    /**
-     * A shader fill style. It wraps a [DynamicShader] and uses it as the fill.
-     *
-     * @param dynamicShader the [DynamicShader] to use as the fill.
-     */
-    public open class Shader<Shader : DynamicShader>(public var dynamicShader: Shader) : FillStyle {
-
-        private val bitmapKey: Any = Any()
-
-        protected val paint: Paint = Paint(Paint.ANTI_ALIAS_FLAG)
-        override fun applyTo(
-            paint: Paint,
-            drawContext: DrawContext,
-            left: Float,
-            top: Float,
-            right: Float,
-            bottom: Float,
-            zeroLineYFraction: Float,
-        ) {
-            paint.shader = dynamicShader.provideShader(drawContext, left, top, right, bottom)
-        }
-
-        override fun getColorAt(point: Point, drawContext: DrawContext, rectF: RectF, zeroLineYFraction: Float): Int {
-            val bitmap = drawContext.getOrPutExtra(bitmapKey) { dynamicShader.getBitmap(drawContext, paint, rectF) }
-            return bitmap.getPixel(
-                (point.x - rectF.left).toInt().coerceIn(0, rectF.width().toInt() - 1),
-                (point.y - rectF.top).toInt().coerceIn(0, rectF.height().toInt() - 1),
-            )
-        }
-    }
-
-    /**
-     * A split fill style. It uses two colors to fill the area, with the zero line being the divider.
-     *
-     * @param positiveColor the color to use for the positive area.
-     * @param negativeColor the color to use for the negative area.
-     */
-    public class Split(
-        positiveColor: Int,
-        negativeColor: Int,
-    ) : Shader<HorizontalSplitShader.Solid>(HorizontalSplitShader.Solid(positiveColor, negativeColor)) {
-
-        public var positiveColor: Int by dynamicShader::colorTop
-
-        public var negativeColor: Int by dynamicShader::colorBottom
-
-        override fun applyTo(
-            paint: Paint,
-            drawContext: DrawContext,
-            left: Float,
-            top: Float,
-            right: Float,
-            bottom: Float,
-            zeroLineYFraction: Float,
-        ) {
-            dynamicShader.dividerYFraction = zeroLineYFraction
-            super.applyTo(paint, drawContext, left, top, right, bottom, zeroLineYFraction)
-        }
-
-        override fun getColorAt(point: Point, drawContext: DrawContext, rectF: RectF, zeroLineYFraction: Float): Int {
-            dynamicShader.dividerYFraction = zeroLineYFraction
-            return super.getColorAt(point, drawContext, rectF, zeroLineYFraction)
-        }
-    }
-
-    /**
-     * A split shader fill style. It wraps a [DynamicShader] and uses it as the fill. It uses two shaders to fill the
-     * area, with the zero line being the divider.
-     *
-     * @param positiveShader the [DynamicShader] to use for the positive area.
-     * @param negativeShader the [DynamicShader] to use for the negative area.
-     */
-    public class SplitShader(
-        positiveShader: DynamicShader,
-        negativeShader: DynamicShader,
-    ) : Shader<HorizontalSplitShader.Double>(HorizontalSplitShader.Double(positiveShader, negativeShader)) {
-
-        override fun applyTo(
-            paint: Paint,
-            drawContext: DrawContext,
-            left: Float,
-            top: Float,
-            right: Float,
-            bottom: Float,
-            zeroLineYFraction: Float,
-        ) {
-            dynamicShader.dividerYFraction = zeroLineYFraction
-            super.applyTo(paint, drawContext, left, top, right, bottom, zeroLineYFraction)
-        }
-
-        override fun getColorAt(point: Point, drawContext: DrawContext, rectF: RectF, zeroLineYFraction: Float): Int {
-            dynamicShader.dividerYFraction = zeroLineYFraction
-            return super.getColorAt(point, drawContext, rectF, zeroLineYFraction)
-        }
-    }
-
-    public companion object {
-
-        private fun DynamicShader.getBitmap(drawContext: DrawContext, paint: Paint, rectF: RectF): Bitmap {
-            val width = rectF.width().roundToInt()
-            val height = rectF.height().roundToInt()
-            paint.shader = provideShader(drawContext, 0f, 0f, width.toFloat(), height.toFloat())
-            val bitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888)
-            val canvas = Canvas(bitmap)
-            canvas.drawRect(0f, 0f, width.toFloat(), height.toFloat(), paint)
-            return bitmap
-        }
-    }
-}
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/line/LineChart.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/line/LineChart.kt
index a2a3622e7..779703720 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/line/LineChart.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/line/LineChart.kt
@@ -30,7 +30,6 @@ import com.patrykandpatrick.vico.core.chart.composed.ComposedChart
 import com.patrykandpatrick.vico.core.chart.dimensions.HorizontalDimensions
 import com.patrykandpatrick.vico.core.chart.dimensions.MutableHorizontalDimensions
 import com.patrykandpatrick.vico.core.chart.draw.ChartDrawContext
-import com.patrykandpatrick.vico.core.chart.fill.FillStyle
 import com.patrykandpatrick.vico.core.chart.forEachInAbsolutelyIndexed
 import com.patrykandpatrick.vico.core.chart.insets.Insets
 import com.patrykandpatrick.vico.core.chart.layout.HorizontalLayout
@@ -42,6 +41,7 @@ import com.patrykandpatrick.vico.core.chart.values.ChartValuesManager
 import com.patrykandpatrick.vico.core.chart.values.ChartValuesProvider
 import com.patrykandpatrick.vico.core.component.Component
 import com.patrykandpatrick.vico.core.component.shape.shader.DynamicShader
+import com.patrykandpatrick.vico.core.component.shape.shader.SolidShader
 import com.patrykandpatrick.vico.core.component.text.TextComponent
 import com.patrykandpatrick.vico.core.component.text.VerticalPosition
 import com.patrykandpatrick.vico.core.component.text.inBounds
@@ -103,9 +103,9 @@ public open class LineChart(
     /**
      * Defines the appearance of a line in a line chart.
      *
-     * @param lineFill the [FillStyle] for the line.
+     * @param lineShader the [DynamicShader] for the line.
      * @param lineThicknessDp the thickness of the line (in dp).
-     * @param lineBackgroundFill an optional [FillStyle] to use for the area below and above the line.
+     * @param lineBackgroundShader an optional [DynamicShader] to use for the area below and above the line.
      * @param lineCap the stroke cap for the line.
      * @param point an optional [Component] that can be drawn at a given point on the line.
      * @param pointSizeDp the size of the [point] (in dp).
@@ -116,9 +116,9 @@ public open class LineChart(
      * @param pointConnector the [PointConnector] for the line.
      */
     public open class LineSpec(
-        public var lineFill: FillStyle,
+        public var lineShader: DynamicShader,
         public var lineThicknessDp: Float = DefaultDimens.LINE_THICKNESS,
-        public var lineBackgroundFill: FillStyle? = null,
+        public var lineBackgroundShader: DynamicShader? = null,
         public var lineCap: Paint.Cap = Paint.Cap.ROUND,
         public var point: Component? = null,
         public var pointSizeDp: Float = DefaultDimens.POINT_SIZE,
@@ -155,9 +155,9 @@ public open class LineChart(
             dataLabelRotationDegrees: Float = 0f,
             pointConnector: PointConnector = DefaultPointConnector(),
         ) : this(
-            lineFill = FillStyle.Solid(lineColor),
+            lineShader = SolidShader(lineColor),
             lineThicknessDp = lineThicknessDp,
-            lineBackgroundFill = lineBackgroundShader?.let(FillStyle::Shader),
+            lineBackgroundShader = lineBackgroundShader,
             lineCap = lineCap,
             point = point,
             pointSizeDp = pointSizeDp,
@@ -168,33 +168,12 @@ public open class LineChart(
             pointConnector = pointConnector,
         )
 
-        /**
-         * An optional [DynamicShader] to use for the area below and above the line.
-         */
-        @Deprecated(
-            message = "There are two line background shaders now, one for positive values and one for negative " +
-                "values. Use `positiveLineBackgroundShader` instead.",
-            replaceWith = ReplaceWith("positiveLineBackgroundShader"),
-        )
-        public val lineBackgroundShader: DynamicShader?
-            get() = (lineBackgroundFill as? FillStyle.Shader<*>)?.dynamicShader
-
         /**
          * Returns `true` if the [lineBackgroundShader] is not null, and `false` otherwise.
          */
-        @Deprecated(
-            message = "`lineBackgroundShader` is deprecated. Use `hasLineBackgroundFill` instead.",
-            replaceWith = ReplaceWith("hasLineBackgroundFill"),
-        )
         public val hasLineBackgroundShader: Boolean
             get() = lineBackgroundShader != null
 
-        /**
-         * Returns `true` if the [lineBackgroundFill] is not null, and `false` otherwise.
-         */
-        public val hasLineBackgroundFill: Boolean
-            get() = lineBackgroundFill != null
-
         protected val linePaint: Paint = Paint(Paint.ANTI_ALIAS_FLAG).apply {
             style = Paint.Style.STROKE
             strokeCap = lineCap
@@ -212,13 +191,13 @@ public open class LineChart(
          * The color of the line.
          */
         @Deprecated(
-            message = "The line color, or shader is now defined by `lineFill",
-            replaceWith = ReplaceWith("lineFill"),
+            message = "The line color, or shader is now defined by `lineShader",
+            replaceWith = ReplaceWith("lineShader"),
         )
         public var lineColor: Int
-            get() = (lineFill as? FillStyle.Solid)?.color ?: Color.TRANSPARENT
+            get() = (lineShader as? SolidShader)?.color ?: Color.TRANSPARENT
             set(value) {
-                lineFill = FillStyle.Solid(value)
+                lineShader = SolidShader(value)
             }
 
         /**
@@ -251,7 +230,7 @@ public open class LineChart(
         ) {
             with(context) {
                 linePaint.strokeWidth = lineThicknessDp.pixels
-                lineFill.applyTo(linePaint, context, bounds, zeroLineYFraction)
+                lineShader.applyTo(linePaint, context, bounds, zeroLineYFraction)
                 linePaint.withOpacity(opacity) { canvas.drawPath(path, it) }
             }
         }
@@ -266,7 +245,7 @@ public open class LineChart(
             path: Path,
             opacity: Float = 1f,
         ) {
-            val fill = lineBackgroundFill ?: return
+            val fill = lineBackgroundShader ?: return
             with(lineBackgroundPaint) {
                 if (zeroLineYFraction > 0) {
                     val zeroLineY = bounds.top + (zeroLineYFraction * bounds.height())
@@ -386,13 +365,13 @@ public open class LineChart(
                         x = x,
                         y = coercedY,
                         entry = entry,
-                        color = component.lineFill.getColorAt(Point(x, coercedY), context, bounds, zeroLineYFraction),
+                        color = component.lineShader.getColorAt(Point(x, coercedY), context, bounds, zeroLineYFraction),
                         index = entryIndex,
                     )
                 }
             }
 
-            if (component.hasLineBackgroundFill) {
+            if (component.hasLineBackgroundShader) {
                 lineBackgroundPath.addPath(linePath)
                 lineBackgroundPath.lineTo(prevX, bounds.bottom)
                 component.drawBackgroundLine(
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/component/shape/shader/DynamicShader.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/component/shape/shader/DynamicShader.kt
index 1c01e6414..068814357 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/component/shape/shader/DynamicShader.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/component/shape/shader/DynamicShader.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 by Patryk Goworowski and Patrick Michalik.
+ * Copyright 2023 by Patryk Goworowski and Patrick Michalik.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,9 +16,15 @@
 
 package com.patrykandpatrick.vico.core.component.shape.shader
 
+import android.graphics.Bitmap
+import android.graphics.Canvas
+import android.graphics.Paint
 import android.graphics.RectF
 import android.graphics.Shader
 import com.patrykandpatrick.vico.core.context.DrawContext
+import com.patrykandpatrick.vico.core.context.getOrPutExtra
+import com.patrykandpatrick.vico.core.model.Point
+import kotlin.math.roundToInt
 
 /**
  * [DynamicShader] creates [Shader] instances on demand.
@@ -27,6 +33,9 @@ import com.patrykandpatrick.vico.core.context.DrawContext
  */
 public fun interface DynamicShader {
 
+    private val bitmapPixelExtractionKey: Any
+        get() = "bitmapPixelExtractionKey${hashCode()}"
+
     /**
      * Creates a [Shader] by using the provided [bounds].
      */
@@ -51,4 +60,71 @@ public fun interface DynamicShader {
         right: Float,
         bottom: Float,
     ): Shader
+
+    /**
+     * Applies the [Shader] to the [Paint] object.
+     *
+     * @param paint the [Paint] object to apply the style to.
+     * @param drawContext the [DrawContext] for the current draw operation.
+     * @param rectF the [RectF] holding coordinates of the area to apply the style to.
+     * @param zeroLineYFraction the fraction of the height of the area to apply the style to, that the zero line is at.
+     */
+    public fun applyTo(paint: Paint, drawContext: DrawContext, rectF: RectF, zeroLineYFraction: Float) {
+        applyTo(paint, drawContext, rectF.left, rectF.top, rectF.right, rectF.bottom, zeroLineYFraction)
+    }
+
+    /**
+     * Applies the [Shader] to the [Paint] object.
+     *
+     * @param paint the [Paint] object to apply the style to.
+     * @param drawContext the [DrawContext] for the current draw operation.
+     * @param left the left coordinate of the area to apply the style to.
+     * @param top the top coordinate of the area to apply the style to.
+     * @param right the right coordinate of the area to apply the style to.
+     * @param bottom the bottom coordinate of the area to apply the style to.
+     * @param zeroLineYFraction the fraction of the height of the area to apply the style to, that the zero line is at.
+     */
+    public fun applyTo(
+        paint: Paint,
+        drawContext: DrawContext,
+        left: Float,
+        top: Float,
+        right: Float,
+        bottom: Float,
+        zeroLineYFraction: Float,
+    ) {
+        paint.shader = provideShader(drawContext, left, top, right, bottom)
+    }
+
+    /**
+     * Gets the pixel color of the [Shader] at the given [point].
+     *
+     * @param point the [Point] to get the color at.
+     * @param drawContext the [DrawContext] for the current draw operation.
+     * @param rectF the [RectF] holding coordinates of the area to apply the style to.
+     * @param zeroLineYFraction the fraction of the height of the area to apply the style to, that the zero line is at.
+     */
+    public fun getColorAt(point: Point, drawContext: DrawContext, rectF: RectF, zeroLineYFraction: Float): Int {
+        val bitmap = drawContext.getOrPutExtra(bitmapPixelExtractionKey) {
+            val paint = Paint(Paint.ANTI_ALIAS_FLAG)
+            getBitmap(drawContext, paint, rectF)
+        }
+        return bitmap.getPixel(
+            (point.x - rectF.left).toInt().coerceIn(0, rectF.width().toInt() - 1),
+            (point.y - rectF.top).toInt().coerceIn(0, rectF.height().toInt() - 1),
+        )
+    }
+
+    public companion object {
+
+        private fun DynamicShader.getBitmap(drawContext: DrawContext, paint: Paint, rectF: RectF): Bitmap {
+            val width = rectF.width().roundToInt()
+            val height = rectF.height().roundToInt()
+            paint.shader = provideShader(drawContext, 0f, 0f, width.toFloat(), height.toFloat())
+            val bitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888)
+            val canvas = Canvas(bitmap)
+            canvas.drawRect(0f, 0f, width.toFloat(), height.toFloat(), paint)
+            return bitmap
+        }
+    }
 }
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/component/shape/shader/DynamicShaders.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/component/shape/shader/DynamicShaders.kt
index 02ca3a066..6ba8e93eb 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/component/shape/shader/DynamicShaders.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/component/shape/shader/DynamicShaders.kt
@@ -79,3 +79,12 @@ public object DynamicShaders {
         )
     }
 }
+
+/**
+ * Creates a [DynamicShader] that is split into two shaders. The positive shader is used for values
+ * above the zero line, and the negative shader is used for values below the zero line.
+ */
+public fun DynamicShaders.splitShader(
+    positiveShader: DynamicShader,
+    negativeShader: DynamicShader,
+): HorizontalSplitShader.Double = HorizontalSplitShader.Double(positiveShader, negativeShader)
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/component/shape/shader/HorizontalSplitShader.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/component/shape/shader/HorizontalSplitShader.kt
index c27413c8f..985098e11 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/component/shape/shader/HorizontalSplitShader.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/component/shape/shader/HorizontalSplitShader.kt
@@ -21,8 +21,10 @@ import android.graphics.BitmapShader
 import android.graphics.Canvas
 import android.graphics.Matrix
 import android.graphics.Paint
+import android.graphics.RectF
 import android.graphics.Shader
 import com.patrykandpatrick.vico.core.context.DrawContext
+import com.patrykandpatrick.vico.core.model.Point
 
 /**
  * A [DynamicShader] that can apply two different [DynamicShader]s to the top and bottom part of the area.
@@ -95,6 +97,24 @@ public abstract class HorizontalSplitShader(
     override fun createKey(left: Float, top: Float, right: Float, bottom: Float): String =
         super.createKey(left, top, right, bottom) + ",$dividerYFraction"
 
+    override fun applyTo(
+        paint: Paint,
+        drawContext: DrawContext,
+        left: Float,
+        top: Float,
+        right: Float,
+        bottom: Float,
+        zeroLineYFraction: Float,
+    ) {
+        dividerYFraction = zeroLineYFraction
+        super.applyTo(paint, drawContext, left, top, right, bottom, zeroLineYFraction)
+    }
+
+    override fun getColorAt(point: Point, drawContext: DrawContext, rectF: RectF, zeroLineYFraction: Float): Int {
+        dividerYFraction = zeroLineYFraction
+        return super.getColorAt(point, drawContext, rectF, zeroLineYFraction)
+    }
+
     /**
      * A [HorizontalSplitShader] with a solid color for the top and bottom part of the area.
      *
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/component/shape/shader/SolidShader.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/component/shape/shader/SolidShader.kt
new file mode 100644
index 000000000..1da7b4cda
--- /dev/null
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/component/shape/shader/SolidShader.kt
@@ -0,0 +1,79 @@
+/*
+ * Copyright 2023 by Patryk Goworowski and Patrick Michalik.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.patrykandpatrick.vico.core.component.shape.shader
+
+import android.graphics.Bitmap
+import android.graphics.BitmapShader
+import android.graphics.Paint
+import android.graphics.RectF
+import android.graphics.RuntimeShader
+import android.graphics.Shader
+import android.os.Build
+import com.patrykandpatrick.vico.core.context.DrawContext
+import com.patrykandpatrick.vico.core.model.Point
+
+/**
+ * A [DynamicShader] that fills the area with the solid [color].
+ */
+public class SolidShader(public val color: Int) : DynamicShader {
+
+    private val shader: Shader = getShaderImplementation()
+
+    private fun getShaderImplementation(): Shader {
+        return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+            RuntimeShader(SHADER_CODE).apply {
+                setColorUniform(INPUT_COLOR, color)
+            }
+        } else {
+            val bitmap = Bitmap.createBitmap(1, 1, Bitmap.Config.ARGB_8888).apply {
+                setPixel(0, 0, color)
+            }
+            BitmapShader(bitmap, Shader.TileMode.CLAMP, Shader.TileMode.CLAMP)
+        }
+    }
+
+    override fun provideShader(context: DrawContext, left: Float, top: Float, right: Float, bottom: Float): Shader =
+        shader
+
+    override fun applyTo(
+        paint: Paint,
+        drawContext: DrawContext,
+        left: Float,
+        top: Float,
+        right: Float,
+        bottom: Float,
+        zeroLineYFraction: Float,
+    ) {
+        paint.shader = shader
+    }
+
+    override fun getColorAt(point: Point, drawContext: DrawContext, rectF: RectF, zeroLineYFraction: Float): Int =
+        color
+
+    private companion object {
+
+        private const val INPUT_COLOR = "inputColor"
+
+        private val SHADER_CODE =
+            """
+            layout(color) uniform vec4 $INPUT_COLOR;
+            vec4 main(vec2 canvas_coordinates) {
+                return $INPUT_COLOR;
+            }
+            """.trimIndent()
+    }
+}
diff --git a/vico/views/src/main/java/com/patrykandpatrick/vico/views/component/shape/shader/DynamicShaders.kt b/vico/views/src/main/java/com/patrykandpatrick/vico/views/component/shape/shader/DynamicShaders.kt
index 30ba97168..56db49014 100644
--- a/vico/views/src/main/java/com/patrykandpatrick/vico/views/component/shape/shader/DynamicShaders.kt
+++ b/vico/views/src/main/java/com/patrykandpatrick/vico/views/component/shape/shader/DynamicShaders.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 by Patryk Goworowski and Patrick Michalik.
+ * Copyright 2023 by Patryk Goworowski and Patrick Michalik.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,11 +20,14 @@ package com.patrykandpatrick.vico.views.component.shape.shader
 
 import android.graphics.LinearGradient
 import android.graphics.Shader
+import androidx.annotation.ColorInt
 import com.patrykandpatrick.vico.core.component.Component
 import com.patrykandpatrick.vico.core.component.shape.shader.CacheableDynamicShader
 import com.patrykandpatrick.vico.core.component.shape.shader.ComponentShader
 import com.patrykandpatrick.vico.core.component.shape.shader.DynamicShader
 import com.patrykandpatrick.vico.core.component.shape.shader.DynamicShaders
+import com.patrykandpatrick.vico.core.component.shape.shader.HorizontalSplitShader
+import com.patrykandpatrick.vico.core.component.shape.shader.SolidShader
 import com.patrykandpatrick.vico.core.context.DrawContext
 
 /**
@@ -137,3 +140,17 @@ public fun DynamicShaders.verticalGradient(
     override fun createKey(left: Float, top: Float, right: Float, bottom: Float): String =
         "%s,%s".format(top, bottom)
 }
+
+/**
+ * Creates a [DynamicShader] that fills the area with a solid color.
+ */
+public fun DynamicShaders.solid(@ColorInt color: Int): SolidShader = SolidShader(color)
+
+/**
+ * Creates a [DynamicShader] with split colors. The positive color is used for values above the zero line,
+ * and the negative color is used for values below the zero line.
+ */
+public fun DynamicShaders.split(
+    @ColorInt positiveColor: Int,
+    @ColorInt negativeColor: Int,
+): HorizontalSplitShader.Solid = HorizontalSplitShader.Solid(positiveColor, negativeColor)
diff --git a/vico/views/src/main/java/com/patrykandpatrick/vico/views/theme/ComponentStyleExtensions.kt b/vico/views/src/main/java/com/patrykandpatrick/vico/views/theme/ComponentStyleExtensions.kt
index 5fb20c658..74d2dc363 100644
--- a/vico/views/src/main/java/com/patrykandpatrick/vico/views/theme/ComponentStyleExtensions.kt
+++ b/vico/views/src/main/java/com/patrykandpatrick/vico/views/theme/ComponentStyleExtensions.kt
@@ -22,7 +22,6 @@ import android.graphics.Color
 import com.patrykandpatrick.vico.core.DefaultAlpha
 import com.patrykandpatrick.vico.core.DefaultDimens
 import com.patrykandpatrick.vico.core.chart.DefaultPointConnector
-import com.patrykandpatrick.vico.core.chart.fill.FillStyle
 import com.patrykandpatrick.vico.core.chart.line.LineChart
 import com.patrykandpatrick.vico.core.component.Component
 import com.patrykandpatrick.vico.core.component.OverlayingComponent
@@ -31,6 +30,8 @@ import com.patrykandpatrick.vico.core.component.shape.Shape
 import com.patrykandpatrick.vico.core.component.shape.ShapeComponent
 import com.patrykandpatrick.vico.core.component.shape.Shapes
 import com.patrykandpatrick.vico.core.component.shape.shader.DynamicShaders
+import com.patrykandpatrick.vico.core.component.shape.shader.HorizontalSplitShader
+import com.patrykandpatrick.vico.core.component.shape.shader.SolidShader
 import com.patrykandpatrick.vico.core.component.text.VerticalPosition
 import com.patrykandpatrick.vico.core.extension.copyColor
 import com.patrykandpatrick.vico.views.R
@@ -138,10 +139,10 @@ internal fun TypedArray.getLineSpec(
 
     val negativeLineColor = getColorExtended(R.styleable.LineSpec_negativeColor)
 
-    val lineFill = if (hasValue(R.styleable.LineSpec_negativeColor)) {
-        FillStyle.Split(positiveLineColor, negativeLineColor)
+    val lineShader = if (hasValue(R.styleable.LineSpec_negativeColor)) {
+        HorizontalSplitShader.Solid(positiveLineColor, negativeLineColor)
     } else {
-        FillStyle.Solid(positiveLineColor)
+        SolidShader(positiveLineColor)
     }
 
     val positiveShader = if (
@@ -183,7 +184,7 @@ internal fun TypedArray.getLineSpec(
     }
 
     return LineChart.LineSpec(
-        lineFill = lineFill,
+        lineShader = lineShader,
         point = getNestedTypedArray(
             context = context,
             resourceId = R.styleable.LineSpec_pointStyle,
@@ -199,7 +200,7 @@ internal fun TypedArray.getLineSpec(
             index = R.styleable.LineSpec_lineThickness,
             defaultValue = DefaultDimens.LINE_THICKNESS,
         ),
-        lineBackgroundFill = FillStyle.SplitShader(positiveShader, negativeShader),
+        lineBackgroundShader = HorizontalSplitShader.Double(positiveShader, negativeShader),
         dataLabel = if (getBoolean(R.styleable.LineSpec_showDataLabels, false)) {
             getNestedTypedArray(
                 context = context,

From 1aa65e2775ad72463512a03859da8a6d9ed7f1fa Mon Sep 17 00:00:00 2001
From: Patrick Michalik <120058021+patrickmichalik@users.noreply.github.com>
Date: Fri, 1 Dec 2023 18:21:47 +0100
Subject: [PATCH 13/15] Remove deprecated APIs

---
 .../vico/sample/showcase/charts/Chart7.kt     |   2 +-
 sample/src/main/res/layout/chart_2.xml        |   4 +-
 .../vico/compose/axis/AxisComponents.kt       |  44 ---
 .../compose/axis/horizontal/HorizontalAxis.kt | 277 ------------------
 .../compose/axis/vertical/VerticalAxis.kt     | 113 -------
 .../vico/compose/component/Components.kt      |  41 ---
 .../compose/component/shape/LineComponent.kt  |  96 ------
 .../compose/component/shape/TextComponent.kt  |  73 -----
 .../shape/shader/ComposeDynamicShader.kt      |  58 ----
 .../vico/compose/legend/Legends.kt            |  23 +-
 .../vico/compose/style/ChartStyle.kt          |   4 -
 .../patrykandpatrick/vico/core/Defaults.kt    |   6 -
 .../patrykandpatrick/vico/core/axis/Axis.kt   |   3 -
 .../vico/core/axis/AxisItemPlacer.kt          |  12 -
 .../core/axis/horizontal/HorizontalAxis.kt    |  76 +----
 .../vico/core/axis/vertical/VerticalAxis.kt   |  57 +---
 .../vico/core/chart/BaseChart.kt              |  12 -
 .../patrykandpatrick/vico/core/chart/Chart.kt |  39 ---
 .../vico/core/chart/LineSpecExtensions.kt     |  71 -----
 .../vico/core/chart/column/ColumnChart.kt     |   9 +-
 .../vico/core/chart/composed/ComposedChart.kt |  33 ---
 .../chart/dimensions/HorizontalDimensions.kt  |  20 --
 .../dimensions/MutableHorizontalDimensions.kt |  16 -
 .../core/chart/layout/HorizontalLayout.kt     |  11 +-
 .../vico/core/chart/line/LineChart.kt         |  22 +-
 .../vico/core/chart/values/ChartValues.kt     |   7 -
 .../vico/core/component/text/TextComponent.kt |  30 --
 .../vico/core/context/MeasureContext.kt       |  12 -
 .../vico/core/legend/VerticalLegend.kt        |  24 +-
 .../vico/core/marker/Marker.kt                |  21 +-
 .../marker/MarkerVisibilityChangeListener.kt  |  22 +-
 .../vico/core/scroll/ScrollHandler.kt         |  40 ---
 .../vico/views/chart/BaseChartView.kt         |  13 -
 .../theme/TextComponentStyleExtensions.kt     |   8 +-
 .../vico/views/theme/ThemeHandler.kt          |  12 +-
 vico/views/src/main/res/values/attrs.xml      |  10 -
 36 files changed, 25 insertions(+), 1296 deletions(-)
 delete mode 100644 vico/compose/src/main/java/com/patrykandpatrick/vico/compose/component/shape/LineComponent.kt
 delete mode 100644 vico/compose/src/main/java/com/patrykandpatrick/vico/compose/component/shape/TextComponent.kt
 delete mode 100644 vico/compose/src/main/java/com/patrykandpatrick/vico/compose/component/shape/shader/ComposeDynamicShader.kt

diff --git a/sample/src/main/java/com/patrykandpatrick/vico/sample/showcase/charts/Chart7.kt b/sample/src/main/java/com/patrykandpatrick/vico/sample/showcase/charts/Chart7.kt
index 824021971..5f4035d2f 100644
--- a/sample/src/main/java/com/patrykandpatrick/vico/sample/showcase/charts/Chart7.kt
+++ b/sample/src/main/java/com/patrykandpatrick/vico/sample/showcase/charts/Chart7.kt
@@ -62,7 +62,7 @@ private fun ComposeChart7(chartEntryModelProducer: ChartEntryModelProducer) {
         Chart(
             chart = lineChart(
                 remember(defaultLines) {
-                    defaultLines.map { defaultLine -> defaultLine.copy(lineBackgroundShader = null) }
+                    defaultLines.map { defaultLine -> defaultLine.copy(lineBackgroundFill = null) }
                 },
             ),
             chartModelProducer = chartEntryModelProducer,
diff --git a/sample/src/main/res/layout/chart_2.xml b/sample/src/main/res/layout/chart_2.xml
index 43affb7ac..27dab5533 100644
--- a/sample/src/main/res/layout/chart_2.xml
+++ b/sample/src/main/res/layout/chart_2.xml
@@ -26,8 +26,8 @@
         app:chart="column"
         app:columnChartStyle="@style/Chart2ColumnChartStyle"
         app:horizontalLayout="fullWidth"
-        app:endContentPadding="16dp"
-        app:startContentPadding="16dp"
+        app:scalableEndContentPadding="16dp"
+        app:scalableStartContentPadding="16dp"
         app:showBottomAxis="true"
         app:showStartAxis="true" />
 </FrameLayout>
diff --git a/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/axis/AxisComponents.kt b/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/axis/AxisComponents.kt
index 0c3a4aebd..20a044640 100644
--- a/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/axis/AxisComponents.kt
+++ b/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/axis/AxisComponents.kt
@@ -16,7 +16,6 @@
 
 package com.patrykandpatrick.vico.compose.axis
 
-import android.graphics.Paint
 import android.graphics.Typeface
 import android.text.Layout
 import android.text.TextUtils
@@ -126,49 +125,6 @@ public fun axisLabelComponent(
     textAlignment,
 )
 
-/**
- * Creates a [TextComponent] to be used for axis labels.
- *
- * @param color the text color.
- * @param textSize the text size.
- * @param background an optional [ShapeComponent] to be displayed behind the text.
- * @param ellipsize the text truncation behavior.
- * @param lineCount the line count.
- * @param verticalPadding the amount of top and bottom padding between the text and the background.
- * @param horizontalPadding the amount of start and end padding between the text and the background.
- * @param verticalMargin the size of the top and bottom margins around the background.
- * @param horizontalMargin the size of the start and end margins around the background.
- * @param typeface the [Typeface] for the text.
- * @param textAlign the text alignment.
- */
-@Composable
-@Deprecated("Instead of `textAlign`, use `textAlignment`.")
-public fun axisLabelComponent(
-    color: Color = currentChartStyle.axis.axisLabelColor,
-    textSize: TextUnit = currentChartStyle.axis.axisLabelTextSize,
-    background: ShapeComponent? = currentChartStyle.axis.axisLabelBackground,
-    ellipsize: TextUtils.TruncateAt = TextUtils.TruncateAt.END,
-    lineCount: Int = currentChartStyle.axis.axisLabelLineCount,
-    verticalPadding: Dp = currentChartStyle.axis.axisLabelVerticalPadding,
-    horizontalPadding: Dp = currentChartStyle.axis.axisLabelHorizontalPadding,
-    verticalMargin: Dp = currentChartStyle.axis.axisLabelVerticalMargin,
-    horizontalMargin: Dp = currentChartStyle.axis.axisLabelHorizontalMargin,
-    typeface: Typeface = currentChartStyle.axis.axisLabelTypeface,
-    textAlign: Paint.Align,
-): TextComponent =
-    @Suppress("DEPRECATION")
-    textComponent(
-        color,
-        textSize,
-        background,
-        ellipsize,
-        lineCount,
-        dimensionsOf(horizontalPadding, verticalPadding),
-        dimensionsOf(horizontalMargin, verticalMargin),
-        typeface,
-        textAlign,
-    )
-
 /**
  * Creates a [LineComponent] styled as an axis line.
  *
diff --git a/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/axis/horizontal/HorizontalAxis.kt b/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/axis/horizontal/HorizontalAxis.kt
index d114a5691..d26545955 100644
--- a/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/axis/horizontal/HorizontalAxis.kt
+++ b/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/axis/horizontal/HorizontalAxis.kt
@@ -31,7 +31,6 @@ import com.patrykandpatrick.vico.core.axis.formatter.AxisValueFormatter
 import com.patrykandpatrick.vico.core.axis.formatter.DecimalFormatAxisValueFormatter
 import com.patrykandpatrick.vico.core.axis.horizontal.HorizontalAxis
 import com.patrykandpatrick.vico.core.axis.horizontal.createHorizontalAxis
-import com.patrykandpatrick.vico.core.chart.layout.HorizontalLayout
 import com.patrykandpatrick.vico.core.component.shape.LineComponent
 import com.patrykandpatrick.vico.core.component.text.TextComponent
 
@@ -120,279 +119,3 @@ public fun rememberBottomAxis(
         this.title = title
         this.itemPlacer = itemPlacer
     }
-
-/**
- * Creates and remembers a top axis (i.e., a [HorizontalAxis] with [AxisPosition.Horizontal.Top]).
- *
- * @param label the [TextComponent] to use for the labels.
- * @param axis the [LineComponent] to use for the axis line.
- * @param tick the [LineComponent] to use for the ticks.
- * @param tickLength the length of the ticks.
- * @param guideline the [LineComponent] to use for the guidelines.
- * @param valueFormatter formats the labels.
- * @param sizeConstraint defines how the [HorizontalAxis] is to size itself.
- * @param labelRotationDegrees the rotation of the axis labels (in degrees).
- * @param titleComponent an optional [TextComponent] to use as the axis title.
- * @param title the axis title.
- * @param itemPlacer determines for what _x_ values the [HorizontalAxis] is to display labels, ticks, and guidelines.
- */
-@Composable
-@Deprecated(
-    "Use `rememberTopAxis` instead.",
-    ReplaceWith(
-        """
-            rememberTopAxis(
-                label = label,
-                axis = axis,
-                tick = tick,
-                tickLength = tickLength,
-                guideline = guideline,
-                valueFormatter = valueFormatter,
-                sizeConstraint = sizeConstraint,
-                labelRotationDegrees = labelRotationDegrees,
-                titleComponent = titleComponent,
-                title = title,
-                itemPlacer = itemPlacer,
-            )
-        """,
-        "com.patrykandpatrick.vico.compose.axis.horizontal.rememberTopAxis",
-    ),
-)
-public fun topAxis(
-    label: TextComponent? = axisLabelComponent(),
-    axis: LineComponent? = axisLineComponent(),
-    tick: LineComponent? = axisTickComponent(),
-    tickLength: Dp = currentChartStyle.axis.axisTickLength,
-    guideline: LineComponent? = axisGuidelineComponent(),
-    valueFormatter: AxisValueFormatter<AxisPosition.Horizontal.Top> = DecimalFormatAxisValueFormatter(),
-    sizeConstraint: Axis.SizeConstraint = Axis.SizeConstraint.Auto(),
-    labelRotationDegrees: Float = currentChartStyle.axis.axisLabelRotationDegrees,
-    titleComponent: TextComponent? = null,
-    title: CharSequence? = null,
-    itemPlacer: AxisItemPlacer.Horizontal = remember { AxisItemPlacer.Horizontal.default() },
-): HorizontalAxis<AxisPosition.Horizontal.Top> = rememberTopAxis(
-    label,
-    axis,
-    tick,
-    tickLength,
-    guideline,
-    valueFormatter,
-    sizeConstraint,
-    labelRotationDegrees,
-    titleComponent,
-    title,
-    itemPlacer,
-)
-
-/**
- * Creates and remembers a bottom axis (i.e., a [HorizontalAxis] with [AxisPosition.Horizontal.Bottom]).
- *
- * @param label the [TextComponent] to use for the labels.
- * @param axis the [LineComponent] to use for the axis line.
- * @param tick the [LineComponent] to use for the ticks.
- * @param tickLength the length of the ticks.
- * @param guideline the [LineComponent] to use for the guidelines.
- * @param valueFormatter formats the labels.
- * @param sizeConstraint defines how the [HorizontalAxis] is to size itself.
- * @param titleComponent an optional [TextComponent] to use as the axis title.
- * @param title the axis title.
- * @param labelRotationDegrees the rotation of the axis labels (in degrees).
- * @param itemPlacer determines for what _x_ values the [HorizontalAxis] is to display labels, ticks, and guidelines.
- */
-@Composable
-@Deprecated(
-    "Use `rememberBottomAxis` instead.",
-    ReplaceWith(
-        """
-            rememberBottomAxis(
-                label = label,
-                axis = axis,
-                tick = tick,
-                tickLength = tickLength,
-                guideline = guideline,
-                valueFormatter = valueFormatter,
-                sizeConstraint = sizeConstraint,
-                titleComponent = titleComponent,
-                title = title,
-                labelRotationDegrees = labelRotationDegrees,
-                itemPlacer = itemPlacer,
-            )
-        """,
-        "com.patrykandpatrick.vico.compose.axis.horizontal.rememberBottomAxis",
-    ),
-)
-public fun bottomAxis(
-    label: TextComponent? = axisLabelComponent(),
-    axis: LineComponent? = axisLineComponent(),
-    tick: LineComponent? = axisTickComponent(),
-    tickLength: Dp = currentChartStyle.axis.axisTickLength,
-    guideline: LineComponent? = axisGuidelineComponent(),
-    valueFormatter: AxisValueFormatter<AxisPosition.Horizontal.Bottom> = DecimalFormatAxisValueFormatter(),
-    sizeConstraint: Axis.SizeConstraint = Axis.SizeConstraint.Auto(),
-    titleComponent: TextComponent? = null,
-    title: CharSequence? = null,
-    labelRotationDegrees: Float = currentChartStyle.axis.axisLabelRotationDegrees,
-    itemPlacer: AxisItemPlacer.Horizontal = remember { AxisItemPlacer.Horizontal.default() },
-): HorizontalAxis<AxisPosition.Horizontal.Bottom> = rememberBottomAxis(
-    label,
-    axis,
-    tick,
-    tickLength,
-    guideline,
-    valueFormatter,
-    sizeConstraint,
-    titleComponent,
-    title,
-    labelRotationDegrees,
-    itemPlacer,
-)
-
-/**
- * Creates and remembers a top axis (i.e., a [HorizontalAxis] with [AxisPosition.Horizontal.Top]).
- *
- * @param label the [TextComponent] to use for the labels.
- * @param axis the [LineComponent] to use for the axis line.
- * @param tick the [LineComponent] to use for the ticks.
- * @param tickLength the length of the ticks.
- * @param guideline the [LineComponent] to use for the guidelines.
- * @param valueFormatter formats the labels.
- * @param sizeConstraint defines how the [HorizontalAxis] is to size itself.
- * @param labelRotationDegrees the rotation of the axis labels (in degrees).
- * @param titleComponent an optional [TextComponent] to use as the axis title.
- * @param title the axis title.
- * @param labelSpacing how often labels (and their corresponding ticks and guidelines) should be drawn.
- * @param labelOffset the number of labels (and, for [HorizontalLayout.FullWidth], their corresponding ticks and
- * guidelines) to skip from the start.
- */
-@Composable
-@Deprecated(
-    """
-        `topAxis` is being replaced by `rememberTopAxis`. Also, `labelSpacing` and `labelOffset` are being replaced by
-        `AxisItemPlacer.Horizontal`. Create a base `AxisItemPlacer.Horizontal` implementation with the desired spacing
-        and offset via `AxisItemPlacer.Horizontal.default`, and use the `itemPlacer` parameter of `rememberTopAxis` to
-        apply it to the `HorizontalAxis` being created.
-    """,
-    ReplaceWith(
-        """
-            rememberTopAxis(
-                label = label,
-                axis = axis,
-                tick = tick,
-                tickLength = tickLength,
-                guideline = guideline,
-                valueFormatter = valueFormatter,
-                sizeConstraint = sizeConstraint,
-                labelRotationDegrees = labelRotationDegrees,
-                titleComponent = titleComponent,
-                title = title,
-                itemPlacer = remember {
-                    AxisItemPlacer.Horizontal.default(spacing = labelSpacing, offset = labelOffset)
-                },
-            )
-        """,
-        "androidx.compose.runtime.remember",
-        "com.patrykandpatrick.vico.compose.axis.horizontal.rememberTopAxis",
-        "com.patrykandpatrick.vico.core.axis.AxisItemPlacer",
-    ),
-)
-public fun topAxis(
-    label: TextComponent? = axisLabelComponent(),
-    axis: LineComponent? = axisLineComponent(),
-    tick: LineComponent? = axisTickComponent(),
-    tickLength: Dp = currentChartStyle.axis.axisTickLength,
-    guideline: LineComponent? = axisGuidelineComponent(),
-    valueFormatter: AxisValueFormatter<AxisPosition.Horizontal.Top> = DecimalFormatAxisValueFormatter(),
-    sizeConstraint: Axis.SizeConstraint = Axis.SizeConstraint.Auto(),
-    labelRotationDegrees: Float = currentChartStyle.axis.axisLabelRotationDegrees,
-    titleComponent: TextComponent? = null,
-    title: CharSequence? = null,
-    labelSpacing: Int = 1,
-    labelOffset: Int = 0,
-): HorizontalAxis<AxisPosition.Horizontal.Top> = rememberTopAxis(
-    label,
-    axis,
-    tick,
-    tickLength,
-    guideline,
-    valueFormatter,
-    sizeConstraint,
-    labelRotationDegrees,
-    titleComponent,
-    title,
-    remember { AxisItemPlacer.Horizontal.default(labelSpacing, labelOffset) },
-)
-
-/**
- * Creates and remembers a bottom axis (i.e., a [HorizontalAxis] with [AxisPosition.Horizontal.Bottom]).
- *
- * @param label the [TextComponent] to use for the labels.
- * @param axis the [LineComponent] to use for the axis line.
- * @param tick the [LineComponent] to use for the ticks.
- * @param tickLength the length of the ticks.
- * @param guideline the [LineComponent] to use for the guidelines.
- * @param valueFormatter formats the labels.
- * @param sizeConstraint defines how the [HorizontalAxis] is to size itself.
- * @param titleComponent an optional [TextComponent] to use as the axis title.
- * @param title the axis title.
- * @param labelRotationDegrees the rotation of the axis labels (in degrees).
- * @param labelSpacing how often labels (and their corresponding ticks and guidelines) should be drawn.
- * @param labelOffset the number of labels (and, for [HorizontalLayout.FullWidth], their corresponding ticks and
- * guidelines) to skip from the start.
- */
-@Composable
-@Deprecated(
-    """
-        `bottomAxis` is being replaced by `rememberBottomAxis`. Also, `labelSpacing` and `labelOffset` are being
-        replaced by `AxisItemPlacer.Horizontal`. Create a base `AxisItemPlacer.Horizontal` implementation with the
-        desired spacing and offset via `AxisItemPlacer.Horizontal.default`, and use the `itemPlacer` parameter of
-        `rememberBottomAxis` to apply it to the `HorizontalAxis` being created.
-    """,
-    ReplaceWith(
-        """
-            rememberBottomAxis(
-                label = label,
-                axis = axis,
-                tick = tick,
-                tickLength = tickLength,
-                guideline = guideline,
-                valueFormatter = valueFormatter,
-                sizeConstraint = sizeConstraint,
-                titleComponent = titleComponent,
-                title = title,
-                labelRotationDegrees = labelRotationDegrees,
-                itemPlacer = remember {
-                    AxisItemPlacer.Horizontal.default(spacing = labelSpacing, offset = labelOffset)
-                },
-            )
-        """,
-        "androidx.compose.runtime.remember",
-        "com.patrykandpatrick.vico.compose.axis.horizontal.rememberBottomAxis",
-        "com.patrykandpatrick.vico.core.axis.AxisItemPlacer",
-    ),
-)
-public fun bottomAxis(
-    label: TextComponent? = axisLabelComponent(),
-    axis: LineComponent? = axisLineComponent(),
-    tick: LineComponent? = axisTickComponent(),
-    tickLength: Dp = currentChartStyle.axis.axisTickLength,
-    guideline: LineComponent? = axisGuidelineComponent(),
-    valueFormatter: AxisValueFormatter<AxisPosition.Horizontal.Bottom> = DecimalFormatAxisValueFormatter(),
-    sizeConstraint: Axis.SizeConstraint = Axis.SizeConstraint.Auto(),
-    titleComponent: TextComponent? = null,
-    title: CharSequence? = null,
-    labelRotationDegrees: Float = currentChartStyle.axis.axisLabelRotationDegrees,
-    labelSpacing: Int = 1,
-    labelOffset: Int = 0,
-): HorizontalAxis<AxisPosition.Horizontal.Bottom> = rememberBottomAxis(
-    label,
-    axis,
-    tick,
-    tickLength,
-    guideline,
-    valueFormatter,
-    sizeConstraint,
-    titleComponent,
-    title,
-    labelRotationDegrees,
-    remember { AxisItemPlacer.Horizontal.default(labelSpacing, labelOffset) },
-)
diff --git a/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/axis/vertical/VerticalAxis.kt b/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/axis/vertical/VerticalAxis.kt
index 3b13c9261..aa9215176 100644
--- a/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/axis/vertical/VerticalAxis.kt
+++ b/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/axis/vertical/VerticalAxis.kt
@@ -24,7 +24,6 @@ import com.patrykandpatrick.vico.compose.axis.axisLabelComponent
 import com.patrykandpatrick.vico.compose.axis.axisLineComponent
 import com.patrykandpatrick.vico.compose.axis.axisTickComponent
 import com.patrykandpatrick.vico.compose.style.currentChartStyle
-import com.patrykandpatrick.vico.core.DEF_LABEL_COUNT
 import com.patrykandpatrick.vico.core.axis.Axis
 import com.patrykandpatrick.vico.core.axis.AxisItemPlacer
 import com.patrykandpatrick.vico.core.axis.AxisPosition
@@ -130,115 +129,3 @@ public fun rememberEndAxis(
     this.titleComponent = titleComponent
     this.title = title
 }
-
-/**
- * Creates and remembers a start axis (i.e., a [VerticalAxis] with [AxisPosition.Vertical.Start]).
- *
- * @param label the [TextComponent] to use for the labels.
- * @param axis the [LineComponent] to use for the axis line.
- * @param tick the [LineComponent] to use for the ticks.
- * @param tickLength the length of the ticks.
- * @param guideline the [LineComponent] to use for the guidelines.
- * @param valueFormatter formats the labels.
- * @param sizeConstraint defines how the [VerticalAxis] is to size itself.
- * @param horizontalLabelPosition the horizontal position of the labels.
- * @param verticalLabelPosition the vertical position of the labels.
- * @param maxLabelCount the maximum label count.
- * @param labelRotationDegrees the rotation of the axis labels (in degrees).
- * @param titleComponent an optional [TextComponent] to use as the axis title.
- * @param title the axis title.
- */
-@Composable
-@Deprecated(
-    """
-        `startAxis` is being replaced by `rememberStartAxis`. Also, `maxLabelCount` is being replaced by
-        `AxisItemPlacer.Vertical`. If using `maxLabelCount`, create a base `AxisItemPlacer.Vertical` implementation with
-        the desired maximum item count via `AxisItemPlacer.Vertical.default`, and use the `itemPlacer` parameter of
-        `rememberStartAxis` to apply it to the `VerticalAxis` being created.
-    """,
-)
-public fun startAxis(
-    label: TextComponent? = axisLabelComponent(),
-    axis: LineComponent? = axisLineComponent(),
-    tick: LineComponent? = axisTickComponent(),
-    tickLength: Dp = currentChartStyle.axis.axisTickLength,
-    guideline: LineComponent? = axisGuidelineComponent(),
-    valueFormatter: AxisValueFormatter<AxisPosition.Vertical.Start> = DecimalFormatAxisValueFormatter(),
-    sizeConstraint: Axis.SizeConstraint = Axis.SizeConstraint.Auto(),
-    horizontalLabelPosition: VerticalAxis.HorizontalLabelPosition = VerticalAxis.HorizontalLabelPosition.Outside,
-    verticalLabelPosition: VerticalAxis.VerticalLabelPosition = VerticalAxis.VerticalLabelPosition.Center,
-    maxLabelCount: Int = DEF_LABEL_COUNT,
-    labelRotationDegrees: Float = currentChartStyle.axis.axisLabelRotationDegrees,
-    titleComponent: TextComponent? = null,
-    title: CharSequence? = null,
-): VerticalAxis<AxisPosition.Vertical.Start> = rememberStartAxis(
-    label,
-    axis,
-    tick,
-    tickLength,
-    guideline,
-    valueFormatter,
-    sizeConstraint,
-    horizontalLabelPosition,
-    verticalLabelPosition,
-    remember { AxisItemPlacer.Vertical.default(maxLabelCount) },
-    labelRotationDegrees,
-    titleComponent,
-    title,
-)
-
-/**
- * Creates and remembers an end axis (i.e., a [VerticalAxis] with [AxisPosition.Vertical.End]).
- *
- * @param label the [TextComponent] to use for the labels.
- * @param axis the [LineComponent] to use for the axis line.
- * @param tick the [LineComponent] to use for the ticks.
- * @param tickLength the length of the ticks.
- * @param guideline the [LineComponent] to use for the guidelines.
- * @param valueFormatter formats the labels.
- * @param sizeConstraint defines how the [VerticalAxis] is to size itself.
- * @param horizontalLabelPosition the horizontal position of the labels.
- * @param verticalLabelPosition the vertical position of the labels.
- * @param maxLabelCount the maximum label count.
- * @param labelRotationDegrees the rotation of the axis labels (in degrees).
- * @param titleComponent an optional [TextComponent] to use as the axis title.
- * @param title the axis title.
- */
-@Composable
-@Deprecated(
-    """
-        `endAxis` is being replaced by `rememberEndAxis`. Also, `maxLabelCount` is being replaced by
-        `AxisItemPlacer.Vertical`. If using `maxLabelCount`, create a base `AxisItemPlacer.Vertical` implementation with
-        the desired maximum item count via `AxisItemPlacer.Vertical.default`, and use the `itemPlacer` parameter of
-        `rememberEndAxis` to apply it to the `VerticalAxis` being created.
-    """,
-)
-public fun endAxis(
-    label: TextComponent? = axisLabelComponent(),
-    axis: LineComponent? = axisLineComponent(),
-    tick: LineComponent? = axisTickComponent(),
-    tickLength: Dp = currentChartStyle.axis.axisTickLength,
-    guideline: LineComponent? = axisGuidelineComponent(),
-    valueFormatter: AxisValueFormatter<AxisPosition.Vertical.End> = DecimalFormatAxisValueFormatter(),
-    sizeConstraint: Axis.SizeConstraint = Axis.SizeConstraint.Auto(),
-    horizontalLabelPosition: VerticalAxis.HorizontalLabelPosition = VerticalAxis.HorizontalLabelPosition.Outside,
-    verticalLabelPosition: VerticalAxis.VerticalLabelPosition = VerticalAxis.VerticalLabelPosition.Center,
-    maxLabelCount: Int = DEF_LABEL_COUNT,
-    labelRotationDegrees: Float = currentChartStyle.axis.axisLabelRotationDegrees,
-    titleComponent: TextComponent? = null,
-    title: CharSequence? = null,
-): VerticalAxis<AxisPosition.Vertical.End> = rememberEndAxis(
-    label,
-    axis,
-    tick,
-    tickLength,
-    guideline,
-    valueFormatter,
-    sizeConstraint,
-    horizontalLabelPosition,
-    verticalLabelPosition,
-    remember { AxisItemPlacer.Vertical.default(maxLabelCount) },
-    labelRotationDegrees,
-    titleComponent,
-    title,
-)
diff --git a/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/component/Components.kt b/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/component/Components.kt
index 79aaa6d2a..298b4b84f 100644
--- a/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/component/Components.kt
+++ b/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/component/Components.kt
@@ -16,7 +16,6 @@
 
 package com.patrykandpatrick.vico.compose.component
 
-import android.graphics.Paint
 import android.graphics.Typeface
 import android.text.Layout
 import android.text.TextUtils
@@ -268,43 +267,3 @@ public fun textComponent(
             this.textAlignment = textAlignment
         }
     }
-
-/**
- * Creates a [TextComponent].
- *
- * @param color the text color.
- * @param textSize the text size.
- * @param background an optional [ShapeComponent] to be displayed behind the text.
- * @param ellipsize the text truncation behavior.
- * @param lineCount the line count.
- * @param padding the padding between the text and the background.
- * @param margins the margins around the background.
- * @param typeface the [Typeface] for the text.
- * @param textAlign the text alignment.
- */
-@Composable
-@Deprecated("Instead of `textAlign`, use `textAlignment`.")
-public fun textComponent(
-    color: Color = Color.Black,
-    textSize: TextUnit = DefaultDimens.TEXT_COMPONENT_TEXT_SIZE.sp,
-    background: ShapeComponent? = null,
-    ellipsize: TextUtils.TruncateAt = TextUtils.TruncateAt.END,
-    lineCount: Int = DEF_LABEL_LINE_COUNT,
-    padding: MutableDimensions = emptyDimensions(),
-    margins: MutableDimensions = emptyDimensions(),
-    typeface: Typeface? = null,
-    textAlign: Paint.Align,
-): TextComponent = remember(color, textSize, background, ellipsize, lineCount, padding, margins, typeface, textAlign) {
-    textComponent {
-        this.color = color.toArgb()
-        textSizeSp = textSize.pixelSize()
-        this.ellipsize = ellipsize
-        this.lineCount = lineCount
-        this.background = background
-        this.padding = padding
-        this.margins = margins
-        this.typeface = typeface
-        @Suppress("DEPRECATION")
-        this.textAlign = textAlign
-    }
-}
diff --git a/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/component/shape/LineComponent.kt b/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/component/shape/LineComponent.kt
deleted file mode 100644
index 428029c19..000000000
--- a/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/component/shape/LineComponent.kt
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Copyright 2022 by Patryk Goworowski and Patrick Michalik.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.patrykandpatrick.vico.compose.component.shape
-
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.unit.Dp
-import androidx.compose.ui.unit.dp
-import com.patrykandpatrick.vico.core.component.shape.LineComponent
-import com.patrykandpatrick.vico.core.component.shape.Shape
-import com.patrykandpatrick.vico.core.component.shape.Shapes
-import com.patrykandpatrick.vico.core.component.shape.shader.DynamicShader
-import com.patrykandpatrick.vico.core.dimensions.Dimensions
-import com.patrykandpatrick.vico.core.dimensions.emptyDimensions
-
-/**
- * Creates a [LineComponent].
- *
- * @param color the background color.
- * @param thickness the thickness of the line.
- * @param shape the [Shape] to use for the line.
- * @param strokeWidth the stroke width.
- * @param strokeColor the stroke color.
- * @param dynamicShader an optional [DynamicShader] to apply to the line.
- * @param margins the margins of the line.
- */
-@Composable
-@Deprecated(
-    message = "Use `com.patrykandpatrick.vico.compose.component.lineComponent` instead.",
-    level = DeprecationLevel.ERROR,
-)
-public fun lineComponent(
-    color: Color,
-    thickness: Dp,
-    shape: Shape = Shapes.rectShape,
-    strokeWidth: Dp = 0.dp,
-    strokeColor: Color = Color.Transparent,
-    dynamicShader: DynamicShader? = null,
-    margins: Dimensions = emptyDimensions(),
-): LineComponent = com.patrykandpatrick.vico.compose.component.lineComponent(
-    color = color,
-    thickness = thickness,
-    shape = shape,
-    dynamicShader = dynamicShader,
-    margins = margins,
-    strokeWidth = strokeWidth,
-    strokeColor = strokeColor,
-)
-
-/**
- * Creates a [LineComponent].
- *
- * @param color the background color.
- * @param thickness the thickness of the line.
- * @param shape the [Shape] to use for the line.
- * @param strokeWidth the stroke width.
- * @param strokeColor the stroke color.
- * @param dynamicShader an optional [DynamicShader] to apply to the line.
- * @param margins the margins of the line.
- */
-@Composable
-@Deprecated(
-    message = "Use `com.patrykandpatrick.vico.compose.component.lineComponent` instead.",
-    level = DeprecationLevel.ERROR,
-)
-public fun lineComponent(
-    color: Color,
-    thickness: Dp,
-    shape: androidx.compose.ui.graphics.Shape,
-    strokeWidth: Dp = 0.dp,
-    strokeColor: Color = Color.Transparent,
-    dynamicShader: DynamicShader? = null,
-    margins: Dimensions = emptyDimensions(),
-): LineComponent = com.patrykandpatrick.vico.compose.component.lineComponent(
-    color = color,
-    thickness = thickness,
-    shape = shape,
-    dynamicShader = dynamicShader,
-    margins = margins,
-    strokeWidth = strokeWidth,
-    strokeColor = strokeColor,
-)
diff --git a/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/component/shape/TextComponent.kt b/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/component/shape/TextComponent.kt
deleted file mode 100644
index 0caba5d0e..000000000
--- a/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/component/shape/TextComponent.kt
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright 2023 by Patryk Goworowski and Patrick Michalik.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.patrykandpatrick.vico.compose.component.shape
-
-import android.graphics.Paint
-import android.graphics.Typeface
-import android.text.TextUtils
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.unit.TextUnit
-import androidx.compose.ui.unit.sp
-import com.patrykandpatrick.vico.core.DEF_LABEL_LINE_COUNT
-import com.patrykandpatrick.vico.core.DefaultDimens
-import com.patrykandpatrick.vico.core.component.shape.ShapeComponent
-import com.patrykandpatrick.vico.core.component.text.TextComponent
-import com.patrykandpatrick.vico.core.dimensions.MutableDimensions
-import com.patrykandpatrick.vico.core.dimensions.emptyDimensions
-
-/**
- * Creates a [TextComponent].
- *
- * @param color the text color.
- * @param textSize the text size.
- * @param background an optional [ShapeComponent] to be displayed behind the text.
- * @param ellipsize the text truncation behavior.
- * @param lineCount the line count.
- * @param padding the padding between the text and the background.
- * @param margins the margins around the background.
- * @param typeface the [Typeface] for the text.
- * @param textAlign the text alignment.
- */
-@Composable
-@Deprecated(
-    message = "Use `com.patrykandpatrick.vico.compose.component.textComponent` instead.",
-    level = DeprecationLevel.ERROR,
-)
-public fun textComponent(
-    color: Color = Color.Black,
-    textSize: TextUnit = DefaultDimens.TEXT_COMPONENT_TEXT_SIZE.sp,
-    background: ShapeComponent? = null,
-    ellipsize: TextUtils.TruncateAt = TextUtils.TruncateAt.END,
-    lineCount: Int = DEF_LABEL_LINE_COUNT,
-    padding: MutableDimensions = emptyDimensions(),
-    margins: MutableDimensions = emptyDimensions(),
-    typeface: Typeface? = null,
-    textAlign: Paint.Align = Paint.Align.LEFT,
-): TextComponent =
-    @Suppress("DEPRECATION")
-    com.patrykandpatrick.vico.compose.component.textComponent(
-        color = color,
-        textSize = textSize,
-        background = background,
-        ellipsize = ellipsize,
-        lineCount = lineCount,
-        padding = padding,
-        margins = margins,
-        typeface = typeface,
-        textAlign = textAlign,
-    )
diff --git a/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/component/shape/shader/ComposeDynamicShader.kt b/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/component/shape/shader/ComposeDynamicShader.kt
deleted file mode 100644
index 83d2fa93b..000000000
--- a/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/component/shape/shader/ComposeDynamicShader.kt
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright 2023 by Patryk Goworowski and Patrick Michalik.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.patrykandpatrick.vico.compose.component.shape.shader
-
-import android.graphics.BlendMode
-import android.graphics.ComposeShader
-import android.graphics.PorterDuff
-import android.os.Build
-import androidx.annotation.RequiresApi
-import com.patrykandpatrick.vico.core.component.shape.shader.DynamicShader
-import com.patrykandpatrick.vico.core.component.shape.shader.DynamicShaders
-
-/**
- * Creates a [ComposeShader] out of two [DynamicShader]s by using a [BlendMode].
- */
-@Deprecated(
-    message = "This function has been moved to the `core` module.",
-    replaceWith = ReplaceWith(
-        expression = "DynamicShaders.composeShader(first, second, mode)",
-        imports = ["com.patrykandpatrick.vico.core.component.shape.shader.DynamicShaders"],
-    ),
-)
-@RequiresApi(Build.VERSION_CODES.Q)
-public fun composeShader(
-    first: DynamicShader,
-    second: DynamicShader,
-    mode: BlendMode,
-): DynamicShader = DynamicShaders.composeShader(first, second, mode)
-
-/**
- * Creates a [ComposeShader] out of two [DynamicShader]s by using a [PorterDuff.Mode].
- */
-@Deprecated(
-    message = "This function has been moved to the `core` module.",
-    replaceWith = ReplaceWith(
-        expression = "DynamicShaders.composeShader(first, second, mode)",
-        imports = ["com.patrykandpatrick.vico.core.component.shape.shader.DynamicShaders"],
-    ),
-)
-public fun composeShader(
-    first: DynamicShader,
-    second: DynamicShader,
-    mode: PorterDuff.Mode,
-): DynamicShader = DynamicShaders.composeShader(first, second, mode)
diff --git a/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/legend/Legends.kt b/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/legend/Legends.kt
index 0348646c6..856c81e44 100644
--- a/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/legend/Legends.kt
+++ b/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/legend/Legends.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 by Patryk Goworowski and Patrick Michalik.
+ * Copyright 2023 by Patryk Goworowski and Patrick Michalik.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -75,27 +75,6 @@ public fun legendItem(
     )
 }
 
-/**
- * Defines the appearance of an item of a [VerticalLegend].
- *
- * @param icon the [Component] used as the item’s icon.
- * @param label the [TextComponent] used for the label.
- * @param labelText the text content of the label.
- */
-@Composable
-@Deprecated("Use `legendItem` instead.", ReplaceWith("legendItem(icon, label, labelText)"))
-public fun verticalLegendItem(
-    icon: Component,
-    label: TextComponent,
-    labelText: CharSequence,
-): LegendItem = remember(icon, label, labelText) {
-    LegendItem(
-        icon = icon,
-        label = label,
-        labelText = labelText,
-    )
-}
-
 /**
  * Creates a [HorizontalLegend].
  *
diff --git a/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/style/ChartStyle.kt b/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/style/ChartStyle.kt
index 203602521..fcf8cace1 100644
--- a/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/style/ChartStyle.kt
+++ b/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/style/ChartStyle.kt
@@ -16,7 +16,6 @@
 
 package com.patrykandpatrick.vico.compose.style
 
-import android.graphics.Paint
 import android.graphics.Typeface
 import android.text.Layout
 import androidx.compose.foundation.isSystemInDarkTheme
@@ -83,7 +82,6 @@ public data class ChartStyle(
      * @property axisLabelHorizontalMargin the horizontal margin around the backgrounds of axis labels.
      * @property axisLabelRotationDegrees the number of degrees by which axis labels are rotated.
      * @property axisLabelTypeface the typeface used for axis labels.
-     * @property axisLabelTextAlign the text alignment for axis labels.
      * @property axisLabelTextAlignment the text alignment for axis labels.
      * @property axisGuidelineColor the color of axis guidelines.
      * @property axisGuidelineWidth the width of axis guidelines.
@@ -108,8 +106,6 @@ public data class ChartStyle(
         val axisLabelHorizontalMargin: Dp = DefaultDimens.AXIS_LABEL_HORIZONTAL_MARGIN.dp,
         val axisLabelRotationDegrees: Float = DefaultDimens.AXIS_LABEL_ROTATION_DEGREES,
         val axisLabelTypeface: Typeface = Typeface.MONOSPACE,
-        @Deprecated("Use `axisLabelTextAlignment` instead.")
-        val axisLabelTextAlign: Paint.Align = Paint.Align.LEFT,
         val axisLabelTextAlignment: Layout.Alignment = Layout.Alignment.ALIGN_NORMAL,
         val axisGuidelineColor: Color,
         val axisGuidelineWidth: Dp = DefaultDimens.AXIS_GUIDELINE_WIDTH.dp,
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/Defaults.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/Defaults.kt
index 0dfbd2eab..6f55fc4a2 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/Defaults.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/Defaults.kt
@@ -29,12 +29,6 @@ public const val DEF_LABEL_LINE_COUNT: Int = 1
  */
 public const val DEF_LABEL_COUNT: Int = 100
 
-/**
- * The default label spacing for vertical axes (in dp).
- */
-@Deprecated("This is unused. It’s a leftover constant from before the first release of Vico.")
-public const val DEF_LABEL_SPACING: Float = 16f
-
 /**
  * The default tick size for markers (in dp).
  */
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/axis/Axis.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/axis/Axis.kt
index 0a3b7cdcf..1451ac395 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/axis/Axis.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/axis/Axis.kt
@@ -40,9 +40,6 @@ public abstract class Axis<Position : AxisPosition> : AxisRenderer<Position> {
 
     private val restrictedBounds: MutableList<RectF> = mutableListOf()
 
-    @Deprecated("This is no longer used.")
-    protected val labels: ArrayList<CharSequence> = ArrayList()
-
     override val bounds: RectF = RectF()
 
     protected val MeasureContext.axisThickness: Float
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/axis/AxisItemPlacer.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/axis/AxisItemPlacer.kt
index b636ec48e..8a6813e13 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/axis/AxisItemPlacer.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/axis/AxisItemPlacer.kt
@@ -79,18 +79,6 @@ public interface AxisItemPlacer {
             fullXRange: ClosedFloatingPointRange<Float>,
         ): List<Float>
 
-        /**
-         * Returns the smallest expected distance between a label measured during the measuring phase and the next
-         * label or the previous label, whichever is closer to the measured label. This distance is expressed as the
-         * difference between the two labels’ _x_ values divided by [ChartValues.xStep].
-         */
-        @Deprecated("This is no longer used.")
-        public fun getMeasuredLabelClearance(
-            context: MeasureContext,
-            horizontalDimensions: HorizontalDimensions,
-            fullXRange: ClosedFloatingPointRange<Float>,
-        ): Float = 0f
-
         /**
          * Returns, as a list, the _x_ values for which ticks and guidelines are to be displayed, restricted to
          * [visibleXRange] and with an extra value on either side (if applicable). If `null` is returned, the values
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/axis/horizontal/HorizontalAxis.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/axis/horizontal/HorizontalAxis.kt
index 80d298364..172a5a35d 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/axis/horizontal/HorizontalAxis.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/axis/horizontal/HorizontalAxis.kt
@@ -25,7 +25,6 @@ import com.patrykandpatrick.vico.core.chart.dimensions.HorizontalDimensions
 import com.patrykandpatrick.vico.core.chart.dimensions.MutableHorizontalDimensions
 import com.patrykandpatrick.vico.core.chart.draw.ChartDrawContext
 import com.patrykandpatrick.vico.core.chart.insets.Insets
-import com.patrykandpatrick.vico.core.chart.layout.HorizontalLayout
 import com.patrykandpatrick.vico.core.component.text.VerticalPosition
 import com.patrykandpatrick.vico.core.context.MeasureContext
 import com.patrykandpatrick.vico.core.extension.ceil
@@ -50,42 +49,10 @@ public class HorizontalAxis<Position : AxisPosition.Horizontal>(
     private val AxisPosition.Horizontal.textVerticalPosition: VerticalPosition
         get() = if (isBottom) VerticalPosition.Bottom else VerticalPosition.Top
 
-    /**
-     * How often labels (and their corresponding ticks and guidelines) should be drawn.
-     */
-    @Deprecated(
-        """`labelSpacing` is being replaced by `AxisItemPlacer.Horizontal`. Create a base implementation with the
-            desired spacing via `AxisItemPlacer.Horizontal.default`, and use the `itemPlacer` field to apply it to this
-            `HorizontalAxis`.""",
-    )
-    public var labelSpacing: Int = 1
-        set(value) {
-            field = value
-            @Suppress("DEPRECATION")
-            itemPlacer = AxisItemPlacer.Horizontal.default(spacing = value, offset = labelOffset)
-        }
-
-    /**
-     * The number of labels (and, for [HorizontalLayout.FullWidth], their corresponding ticks and guidelines) to skip
-     * from the start.
-     */
-    @Deprecated(
-        """`labelOffset` is being replaced by `AxisItemPlacer.Horizontal`. Create a base implementation with the desired
-            offset via `AxisItemPlacer.Horizontal.default`, and use the `itemPlacer` field to apply it to this
-            `HorizontalAxis`.""",
-    )
-    public var labelOffset: Int = 0
-        set(value) {
-            field = value
-            @Suppress("DEPRECATION")
-            itemPlacer = AxisItemPlacer.Horizontal.default(spacing = labelSpacing, offset = value)
-        }
-
     /**
      * Determines for what _x_ values this [HorizontalAxis] is to display labels, ticks, and guidelines.
      */
-    @Suppress("DEPRECATION")
-    public var itemPlacer: AxisItemPlacer.Horizontal = AxisItemPlacer.Horizontal.default(labelSpacing, labelOffset)
+    public var itemPlacer: AxisItemPlacer.Horizontal = AxisItemPlacer.Horizontal.default()
 
     override fun drawBehindChart(context: ChartDrawContext): Unit = with(context) {
         val clipRestoreCount = canvas.save()
@@ -324,42 +291,10 @@ public class HorizontalAxis<Position : AxisPosition.Horizontal>(
         builder: Axis.Builder<Position>? = null,
     ) : Axis.Builder<Position>(builder) {
 
-        /**
-         * How often labels (and their corresponding ticks and guidelines) should be drawn.
-         */
-        @Deprecated(
-            """`labelSpacing` is being replaced by `AxisItemPlacer.Horizontal`. Create a base implementation with the
-                desired spacing via `AxisItemPlacer.Horizontal.default`, and use the `itemPlacer` field to apply it to
-                this `HorizontalAxis.Builder`.""",
-        )
-        public var labelSpacing: Int = 1
-            set(value) {
-                field = value
-                @Suppress("DEPRECATION")
-                itemPlacer = AxisItemPlacer.Horizontal.default(spacing = value, offset = labelOffset)
-            }
-
-        /**
-         * The number of labels (and, for [HorizontalLayout.FullWidth], their corresponding ticks and guidelines) to
-         * skip from the start.
-         */
-        @Deprecated(
-            """`labelOffset` is being replaced by `AxisItemPlacer.Horizontal`. Create a base implementation with the
-                desired offset via `AxisItemPlacer.Horizontal.default`, and use the `itemPlacer` field to apply it to
-                this `HorizontalAxis.Builder`.""",
-        )
-        public var labelOffset: Int = 0
-            set(value) {
-                field = value
-                @Suppress("DEPRECATION")
-                itemPlacer = AxisItemPlacer.Horizontal.default(spacing = labelSpacing, offset = value)
-            }
-
         /**
          * Determines for what _x_ values the [HorizontalAxis] is to display labels, ticks, and guidelines.
          */
-        @Suppress("DEPRECATION")
-        public var itemPlacer: AxisItemPlacer.Horizontal = AxisItemPlacer.Horizontal.default(labelSpacing, labelOffset)
+        public var itemPlacer: AxisItemPlacer.Horizontal = AxisItemPlacer.Horizontal.default()
 
         /**
          * Creates a [HorizontalAxis] instance with the properties from this [Builder].
@@ -371,12 +306,7 @@ public class HorizontalAxis<Position : AxisPosition.Horizontal>(
                 AxisPosition.Horizontal.Bottom::class.java -> AxisPosition.Horizontal.Bottom
                 else -> throw UnknownAxisPositionException(T::class.java)
             } as Position
-            @Suppress("DEPRECATION")
-            return setTo(HorizontalAxis(position = position)).also { axis ->
-                axis.labelSpacing = labelSpacing
-                axis.labelOffset = labelOffset
-                axis.itemPlacer = itemPlacer
-            } as HorizontalAxis<T>
+            return setTo(HorizontalAxis(position = position)).also { it.itemPlacer = itemPlacer } as HorizontalAxis<T>
         }
     }
 
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/axis/vertical/VerticalAxis.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/axis/vertical/VerticalAxis.kt
index 30337bcf9..9bbc9b544 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/axis/vertical/VerticalAxis.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/axis/vertical/VerticalAxis.kt
@@ -16,8 +16,6 @@
 
 package com.patrykandpatrick.vico.core.axis.vertical
 
-import com.patrykandpatrick.vico.core.DEF_LABEL_COUNT
-import com.patrykandpatrick.vico.core.DEF_LABEL_SPACING
 import com.patrykandpatrick.vico.core.axis.Axis
 import com.patrykandpatrick.vico.core.axis.AxisItemPlacer
 import com.patrykandpatrick.vico.core.axis.AxisPosition
@@ -61,34 +59,10 @@ public class VerticalAxis<Position : AxisPosition.Vertical>(
     private val textHorizontalPosition: HorizontalPosition
         get() = if (areLabelsOutsideAtStartOrInsideAtEnd) HorizontalPosition.Start else HorizontalPosition.End
 
-    /**
-     * The maximum label count.
-     */
-    @Deprecated(
-        """
-            `maxLabelCount` is being replaced by `AxisItemPlacer.Vertical. Create a base implementation with the desired
-            maximum item count via `AxisItemPlacer.Vertical.default`, and use the `itemPlacer` field to apply it to this
-            `VerticalAxis`.
-        """,
-    )
-    public var maxLabelCount: Int = DEF_LABEL_COUNT
-        set(value) {
-            field = value
-            itemPlacer = AxisItemPlacer.Vertical.default(value)
-        }
-
     /**
      * Determines for what _y_ values this [VerticalAxis] is to display labels, ticks, and guidelines.
      */
-    @Suppress("DEPRECATION")
-    public var itemPlacer: AxisItemPlacer.Vertical = AxisItemPlacer.Vertical.default(maxLabelCount)
-
-    /**
-     * The label spacing (in dp).
-     */
-    @Deprecated("This is unused. It’s a leftover field from before the first release of Vico.")
-    @Suppress("DEPRECATION")
-    public var labelSpacing: Float = DEF_LABEL_SPACING
+    public var itemPlacer: AxisItemPlacer.Vertical = AxisItemPlacer.Vertical.default()
 
     /**
      * Defines the horizontal position of each axis label relative to the axis line.
@@ -339,34 +313,10 @@ public class VerticalAxis<Position : AxisPosition.Vertical>(
     public class Builder<Position : AxisPosition.Vertical>(
         builder: Axis.Builder<Position>? = null,
     ) : Axis.Builder<Position>(builder) {
-        /**
-         * The maximum label count.
-         */
-        @Deprecated(
-            """
-                `maxLabelCount` is being replaced by `AxisItemPlacer.Vertical`. Create a base implementation with the
-                desired maximum item count via `AxisItemPlacer.Vertical.default`, and use the `itemPlacer` field to
-                apply it to this `VerticalAxis.Builder`.
-            """,
-        )
-        public var maxLabelCount: Int = DEF_LABEL_COUNT
-            set(value) {
-                field = value
-                itemPlacer = AxisItemPlacer.Vertical.default(value)
-            }
-
         /**
          * Determines for what _y_ values this [VerticalAxis] is to display labels, ticks, and guidelines.
          */
-        @Suppress("DEPRECATION")
-        public var itemPlacer: AxisItemPlacer.Vertical = AxisItemPlacer.Vertical.default(maxLabelCount)
-
-        /**
-         * The label spacing (in dp).
-         */
-        @Deprecated("This is unused. It’s a leftover field from before the first release of Vico.")
-        @Suppress("DEPRECATION")
-        public var labelSpacing: Float = DEF_LABEL_SPACING
+        public var itemPlacer: AxisItemPlacer.Vertical = AxisItemPlacer.Vertical.default()
 
         /**
          * Defines the horizontal position of each axis label relative to the axis line.
@@ -388,11 +338,8 @@ public class VerticalAxis<Position : AxisPosition.Vertical>(
                 AxisPosition.Vertical.End::class.java -> AxisPosition.Vertical.End
                 else -> throw UnknownAxisPositionException(T::class.java)
             } as Position
-            @Suppress("DEPRECATION")
             return setTo(VerticalAxis(position)).also { axis ->
-                axis.maxLabelCount = maxLabelCount
                 axis.itemPlacer = itemPlacer
-                axis.labelSpacing = labelSpacing
                 axis.horizontalLabelPosition = horizontalLabelPosition
                 axis.verticalLabelPosition = verticalLabelPosition
             } as VerticalAxis<T>
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/BaseChart.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/BaseChart.kt
index a115306c2..15390a491 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/BaseChart.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/BaseChart.kt
@@ -51,18 +51,6 @@ public abstract class BaseChart<in Model : ChartEntryModel> : Chart<Model>, Boun
 
     override var axisValuesOverrider: AxisValuesOverrider<@UnsafeVariance Model>? = null
 
-    @Deprecated(message = AXIS_VALUES_DEPRECATION_MESSAGE, level = DeprecationLevel.ERROR)
-    override var minY: Float? = null
-
-    @Deprecated(message = AXIS_VALUES_DEPRECATION_MESSAGE, level = DeprecationLevel.ERROR)
-    override var maxY: Float? = null
-
-    @Deprecated(message = AXIS_VALUES_DEPRECATION_MESSAGE, level = DeprecationLevel.ERROR)
-    override var minX: Float? = null
-
-    @Deprecated(message = AXIS_VALUES_DEPRECATION_MESSAGE, level = DeprecationLevel.ERROR)
-    override var maxX: Float? = null
-
     override fun addDecoration(decoration: Decoration): Boolean = decorations.add(decoration)
 
     override fun setDecorations(decorations: List<Decoration>) {
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/Chart.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/Chart.kt
index c41514734..69c58d38d 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/Chart.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/Chart.kt
@@ -35,9 +35,6 @@ import com.patrykandpatrick.vico.core.entry.diff.ExtraStore
 import com.patrykandpatrick.vico.core.entry.diff.MutableExtraStore
 import com.patrykandpatrick.vico.core.marker.Marker
 
-internal const val AXIS_VALUES_DEPRECATION_MESSAGE: String = "Axis values should be overridden via " +
-    "`Chart#axisValuesOverrider`."
-
 /**
  * Defines the minimal set of properties and functions required by other parts of the library to draw a chart.
  */
@@ -63,42 +60,6 @@ public interface Chart<in Model> : BoundsAware, ChartInsetter {
      */
     public var axisValuesOverrider: AxisValuesOverrider<@UnsafeVariance Model>?
 
-    /**
-     * The minimum value shown on the y-axis. If [Model] implements [ChartEntryModel], and [minY] is not null, this
-     * overrides [ChartEntryModel.minY].
-     *
-     * @see ChartEntryModel.minY
-     */
-    @Deprecated(message = AXIS_VALUES_DEPRECATION_MESSAGE, level = DeprecationLevel.ERROR)
-    public var minY: Float?
-
-    /**
-     * The maximum value shown on the y-axis. If [Model] implements [ChartEntryModel], and [maxY] is not null, this
-     * overrides [ChartEntryModel.maxY].
-     *
-     * @see ChartEntryModel.maxY
-     */
-    @Deprecated(message = AXIS_VALUES_DEPRECATION_MESSAGE, level = DeprecationLevel.ERROR)
-    public var maxY: Float?
-
-    /**
-     * The minimum value shown on the x-axis. If [Model] implements [ChartEntryModel], and [minX] is not null, this
-     * overrides [ChartEntryModel.minX].
-     *
-     * @see ChartEntryModel.minX
-     */
-    @Deprecated(message = AXIS_VALUES_DEPRECATION_MESSAGE, level = DeprecationLevel.ERROR)
-    public var minX: Float?
-
-    /**
-     * The maximum value shown on the x-axis. If [Model] implements [ChartEntryModel], and [maxX] is not null, this
-     * overrides [ChartEntryModel.maxX].
-     *
-     * @see ChartEntryModel.maxX
-     */
-    @Deprecated(message = AXIS_VALUES_DEPRECATION_MESSAGE, level = DeprecationLevel.ERROR)
-    public var maxX: Float?
-
     /**
      * Responsible for drawing the chart itself and any decorations behind it.
      *
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/LineSpecExtensions.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/LineSpecExtensions.kt
index 642e1479a..8bfc2830e 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/LineSpecExtensions.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/LineSpecExtensions.kt
@@ -24,77 +24,6 @@ import com.patrykandpatrick.vico.core.component.text.TextComponent
 import com.patrykandpatrick.vico.core.component.text.VerticalPosition
 import com.patrykandpatrick.vico.core.formatter.ValueFormatter
 
-/**
- * Creates a new [LineChart.LineSpec] based on this one, updating select properties.
- */
-@Deprecated(
-    message = "`lineColor` and `lineBackgroundShader` are deprecated. Use `lineFill` and `lineBackgroundFill`",
-    replaceWith = ReplaceWith(
-        "copy(lineFill = lineFill, lineBackgroundFill = lineBackgroundFill)",
-        "com.patrykandpatrick.vico.core.chart.fill.FillStyle",
-    ),
-)
-public fun LineChart.LineSpec.copy(
-    lineColor: Int,
-    lineThicknessDp: Float = this.lineThicknessDp,
-    lineBackgroundShader: DynamicShader? = this.lineBackgroundShader,
-    lineCap: Paint.Cap = this.lineCap,
-    point: Component? = this.point,
-    pointSizeDp: Float = this.pointSizeDp,
-    dataLabel: TextComponent? = this.dataLabel,
-    dataLabelVerticalPosition: VerticalPosition = this.dataLabelVerticalPosition,
-    dataLabelValueFormatter: ValueFormatter = this.dataLabelValueFormatter,
-    dataLabelRotationDegrees: Float = this.dataLabelRotationDegrees,
-    pointConnector: LineChart.LineSpec.PointConnector = this.pointConnector,
-): LineChart.LineSpec = LineChart.LineSpec(
-    lineColor = lineColor,
-    lineThicknessDp = lineThicknessDp,
-    lineBackgroundShader = lineBackgroundShader,
-    lineCap = lineCap,
-    point = point,
-    pointSizeDp = pointSizeDp,
-    dataLabel = dataLabel,
-    dataLabelVerticalPosition = dataLabelVerticalPosition,
-    dataLabelValueFormatter = dataLabelValueFormatter,
-    dataLabelRotationDegrees = dataLabelRotationDegrees,
-    pointConnector = pointConnector,
-)
-
-/**
- * Creates a new [LineChart.LineSpec] based on this one, updating select properties.
- */
-@Deprecated(
-    message = "`lineColor` is deprecated. Use `lineShader`",
-    replaceWith = ReplaceWith(
-        "copy(lineShader = lineShader)",
-        "com.patrykandpatrick.vico.core.chart.fill.FillStyle",
-    ),
-)
-public fun LineChart.LineSpec.copy(
-    lineThicknessDp: Float = this.lineThicknessDp,
-    lineBackgroundShader: DynamicShader?,
-    lineCap: Paint.Cap = this.lineCap,
-    point: Component? = this.point,
-    pointSizeDp: Float = this.pointSizeDp,
-    dataLabel: TextComponent? = this.dataLabel,
-    dataLabelVerticalPosition: VerticalPosition = this.dataLabelVerticalPosition,
-    dataLabelValueFormatter: ValueFormatter = this.dataLabelValueFormatter,
-    dataLabelRotationDegrees: Float = this.dataLabelRotationDegrees,
-    pointConnector: LineChart.LineSpec.PointConnector = this.pointConnector,
-): LineChart.LineSpec = LineChart.LineSpec(
-    lineColor = lineColor,
-    lineThicknessDp = lineThicknessDp,
-    lineBackgroundShader = lineBackgroundShader,
-    lineCap = lineCap,
-    point = point,
-    pointSizeDp = pointSizeDp,
-    dataLabel = dataLabel,
-    dataLabelVerticalPosition = dataLabelVerticalPosition,
-    dataLabelValueFormatter = dataLabelValueFormatter,
-    dataLabelRotationDegrees = dataLabelRotationDegrees,
-    pointConnector = pointConnector,
-)
-
 /**
  * Creates a new [LineChart.LineSpec] based on this one, updating select properties.
  */
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/column/ColumnChart.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/column/ColumnChart.kt
index 65ab4ba2c..8ff083013 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/column/ColumnChart.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/column/ColumnChart.kt
@@ -335,12 +335,11 @@ public open class ColumnChart(
     }
 
     override fun updateChartValues(chartValuesManager: ChartValuesManager, model: ChartEntryModel, xStep: Float?) {
-        @Suppress("DEPRECATION_ERROR")
         chartValuesManager.tryUpdate(
-            minX = axisValuesOverrider?.getMinX(model) ?: minX ?: model.minX,
-            maxX = axisValuesOverrider?.getMaxX(model) ?: maxX ?: model.maxX,
-            minY = axisValuesOverrider?.getMinY(model) ?: minY ?: mergeMode.getMinY(model),
-            maxY = axisValuesOverrider?.getMaxY(model) ?: maxY ?: mergeMode.getMaxY(model),
+            minX = axisValuesOverrider?.getMinX(model) ?: model.minX,
+            maxX = axisValuesOverrider?.getMaxX(model) ?: model.maxX,
+            minY = axisValuesOverrider?.getMinY(model) ?: mergeMode.getMinY(model),
+            maxY = axisValuesOverrider?.getMaxY(model) ?: mergeMode.getMaxY(model),
             xStep = xStep ?: model.xGcd,
             chartEntryModel = model,
             axisPosition = targetVerticalAxisPosition,
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/composed/ComposedChart.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/composed/ComposedChart.kt
index 2c35bc98f..e203a43fe 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/composed/ComposedChart.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/composed/ComposedChart.kt
@@ -16,7 +16,6 @@
 
 package com.patrykandpatrick.vico.core.chart.composed
 
-import com.patrykandpatrick.vico.core.chart.AXIS_VALUES_DEPRECATION_MESSAGE
 import com.patrykandpatrick.vico.core.chart.BaseChart
 import com.patrykandpatrick.vico.core.chart.Chart
 import com.patrykandpatrick.vico.core.chart.Chart.ModelTransformerProvider
@@ -36,8 +35,6 @@ import com.patrykandpatrick.vico.core.extension.set
 import com.patrykandpatrick.vico.core.extension.updateAll
 import com.patrykandpatrick.vico.core.marker.Marker
 import java.util.TreeMap
-import kotlin.properties.ReadWriteProperty
-import kotlin.reflect.KProperty
 
 /**
  * Combines multiple [Chart]s and draws them on top of one another.
@@ -60,22 +57,6 @@ public class ComposedChart<Model : ChartEntryModel>(
     override val chartInsetters: Collection<ChartInsetter>
         get() = charts.map { it.chartInsetters }.flatten() + persistentMarkers.values
 
-    @Deprecated(message = AXIS_VALUES_DEPRECATION_MESSAGE, level = DeprecationLevel.ERROR)
-    @Suppress("DEPRECATION_ERROR")
-    override var minY: Float? by childChartsValue { minY = it }
-
-    @Deprecated(message = AXIS_VALUES_DEPRECATION_MESSAGE, level = DeprecationLevel.ERROR)
-    @Suppress("DEPRECATION_ERROR")
-    override var maxY: Float? by childChartsValue { maxY = it }
-
-    @Deprecated(message = AXIS_VALUES_DEPRECATION_MESSAGE, level = DeprecationLevel.ERROR)
-    @Suppress("DEPRECATION_ERROR")
-    override var minX: Float? by childChartsValue { minX = it }
-
-    @Deprecated(message = AXIS_VALUES_DEPRECATION_MESSAGE, level = DeprecationLevel.ERROR)
-    @Suppress("DEPRECATION_ERROR")
-    override var maxX: Float? by childChartsValue { maxX = it }
-
     override fun setBounds(left: Number, top: Number, right: Number, bottom: Number) {
         this.bounds.set(left, top, right, bottom)
         charts.forEach { chart -> chart.setBounds(left, top, right, bottom) }
@@ -186,17 +167,3 @@ public class ComposedChart<Model : ChartEntryModel>(
         }
     }
 }
-
-private fun childChartsValue(
-    setValue: Chart<*>.(newValue: Float?) -> Unit,
-): ReadWriteProperty<ComposedChart<*>, Float?> = object : ReadWriteProperty<ComposedChart<*>, Float?> {
-
-    private var backingValue: Float? = null
-
-    override fun getValue(thisRef: ComposedChart<*>, property: KProperty<*>): Float? = backingValue
-
-    override fun setValue(thisRef: ComposedChart<*>, property: KProperty<*>, value: Float?) {
-        thisRef.charts.forEach { chart -> chart.setValue(value) }
-        backingValue = value
-    }
-}
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/dimensions/HorizontalDimensions.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/dimensions/HorizontalDimensions.kt
index 9b672ee11..b9d731307 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/dimensions/HorizontalDimensions.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/dimensions/HorizontalDimensions.kt
@@ -113,23 +113,3 @@ public fun HorizontalDimensions(
     override val unscalableStartPadding: Float = unscalableStartPadding
     override val unscalableEndPadding: Float = unscalableEndPadding
 }
-
-/**
- * Creates a [HorizontalDimensions] instance.
- */
-@Deprecated(
-    """`startPadding` and `endPadding` have been replaced by `scalableStartPadding`, `scalableEndPadding`,
-        `unscalableStartPadding`, and `unscalableEndPadding`. Use the overload with these parameters instead.""",
-    ReplaceWith("HorizontalDimensions(xSpacing, startPadding, endPadding, 0f, 0f)"),
-)
-public fun HorizontalDimensions(
-    xSpacing: Float,
-    startPadding: Float,
-    endPadding: Float,
-): HorizontalDimensions = HorizontalDimensions(
-    xSpacing = xSpacing,
-    scalableStartPadding = startPadding,
-    unscalableEndPadding = endPadding,
-    scalableEndPadding = 0f,
-    unscalableStartPadding = 0f,
-)
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/dimensions/MutableHorizontalDimensions.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/dimensions/MutableHorizontalDimensions.kt
index 422c862c4..2dedaca95 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/dimensions/MutableHorizontalDimensions.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/dimensions/MutableHorizontalDimensions.kt
@@ -43,22 +43,6 @@ public data class MutableHorizontalDimensions(
         this.unscalableEndPadding = unscalableEndPadding
     }
 
-    /**
-     * Updates the stored values.
-     */
-    @Deprecated(
-        """`startPadding` and `endPadding` have been replaced by `scalableStartPadding`, `scalableEndPadding`,
-            `unscalableStartPadding`, and `unscalableEndPadding`. Use the overload with these parameters instead.""",
-        ReplaceWith("set(xSpacing, startPadding, endPadding, 0f, 0f)"),
-    )
-    public fun set(xSpacing: Float, startPadding: Float, endPadding: Float): MutableHorizontalDimensions = set(
-        xSpacing = xSpacing,
-        scalableStartPadding = startPadding,
-        scalableEndPadding = endPadding,
-        unscalableStartPadding = 0f,
-        unscalableEndPadding = 0f,
-    )
-
     /**
      * Ensures that the stored values are no smaller than the provided ones.
      */
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/layout/HorizontalLayout.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/layout/HorizontalLayout.kt
index dde91350b..4a73944fd 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/layout/HorizontalLayout.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/layout/HorizontalLayout.kt
@@ -29,16 +29,7 @@ public sealed interface HorizontalLayout {
      * at the start and end of the [Chart]. [HorizontalAxis] instances display ticks and guidelines at the edges of the
      * segments.
      */
-    public object Segmented : HorizontalLayout {
-        /**
-         * Returns an instance of [HorizontalLayout.Segmented].
-         */
-        @Deprecated(
-            """`HorizontalLayout.Segmented` is now an object. Replace `HorizontalLayout.Segmented()` with
-                `HorizontalLayout.Segmented`.""",
-        )
-        public operator fun invoke(): Segmented = this
-    }
+    public object Segmented : HorizontalLayout
 
     /**
      * When this is applied, the [Chart]’s content takes up the [Chart]’s entire width (unless padding is added).
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/line/LineChart.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/line/LineChart.kt
index 779703720..f50922a81 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/line/LineChart.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/line/LineChart.kt
@@ -187,19 +187,6 @@ public open class LineChart(
 
         protected val pathBounds: RectF = RectF()
 
-        /**
-         * The color of the line.
-         */
-        @Deprecated(
-            message = "The line color, or shader is now defined by `lineShader",
-            replaceWith = ReplaceWith("lineShader"),
-        )
-        public var lineColor: Int
-            get() = (lineShader as? SolidShader)?.color ?: Color.TRANSPARENT
-            set(value) {
-                lineShader = SolidShader(value)
-            }
-
         /**
          * The stroke cap for the line.
          */
@@ -594,12 +581,11 @@ public open class LineChart(
     }
 
     override fun updateChartValues(chartValuesManager: ChartValuesManager, model: ChartEntryModel, xStep: Float?) {
-        @Suppress("DEPRECATION_ERROR")
         chartValuesManager.tryUpdate(
-            minX = axisValuesOverrider?.getMinX(model) ?: minX ?: model.minX,
-            maxX = axisValuesOverrider?.getMaxX(model) ?: maxX ?: model.maxX,
-            minY = axisValuesOverrider?.getMinY(model) ?: minY ?: min(model.minY, 0f),
-            maxY = axisValuesOverrider?.getMaxY(model) ?: maxY ?: model.maxY,
+            minX = axisValuesOverrider?.getMinX(model) ?: model.minX,
+            maxX = axisValuesOverrider?.getMaxX(model) ?: model.maxX,
+            minY = axisValuesOverrider?.getMinY(model) ?: min(model.minY, 0f),
+            maxY = axisValuesOverrider?.getMaxY(model) ?: model.maxY,
             xStep = xStep ?: model.xGcd,
             chartEntryModel = model,
             axisPosition = targetVerticalAxisPosition,
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/values/ChartValues.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/values/ChartValues.kt
index f2c5ac789..4480f9c19 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/values/ChartValues.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/values/ChartValues.kt
@@ -49,13 +49,6 @@ public interface ChartValues {
      */
     public val xStep: Float
 
-    /**
-     * The difference between the _x_ values of neighboring major entries.
-     */
-    @Deprecated("Use `xStep` instead.", ReplaceWith("xStep"))
-    public val stepX: Float
-        get() = xStep
-
     /**
      * The minimum value displayed on the y-axis. By default, this is equal to [ChartEntryModel.minY] (the
      * [ChartEntryModel] instance being [chartEntryModel]), but you can use [AxisValuesOverrider] to override this
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/component/text/TextComponent.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/component/text/TextComponent.kt
index 551b96fea..fd015ea41 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/component/text/TextComponent.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/component/text/TextComponent.kt
@@ -105,14 +105,6 @@ public open class TextComponent protected constructor() : Padding, Margins {
      */
     public var background: Component? = null
 
-    /**
-     * The text alignment.
-     */
-    @Deprecated("Use `textAlignment` instead.")
-    public var textAlign: Paint.Align
-        get() = textAlignment.equivLtrPaintAlign
-        set(value) { textAlignment = value.equivLtrLayoutAlignment }
-
     /**
      * The text alignment.
      */
@@ -427,14 +419,6 @@ public open class TextComponent protected constructor() : Padding, Margins {
          */
         public var background: Component? = null
 
-        /**
-         * @see [TextComponent.textAlign]
-         */
-        @Deprecated("Use `textAlignment` instead.")
-        public var textAlign: Paint.Align
-            get() = textAlignment.equivLtrPaintAlign
-            set(value) { textAlignment = value.equivLtrLayoutAlignment }
-
         /**
          * @see TextComponent.textAlignment
          */
@@ -481,17 +465,3 @@ public open class TextComponent protected constructor() : Padding, Margins {
  */
 public inline fun textComponent(block: TextComponent.Builder.() -> Unit = {}): TextComponent =
     TextComponent.Builder().apply(block).build()
-
-private val Paint.Align.equivLtrLayoutAlignment
-    get() = when (this) {
-        Paint.Align.LEFT -> Layout.Alignment.ALIGN_NORMAL
-        Paint.Align.CENTER -> Layout.Alignment.ALIGN_CENTER
-        Paint.Align.RIGHT -> Layout.Alignment.ALIGN_OPPOSITE
-    }
-
-private val Layout.Alignment.equivLtrPaintAlign
-    get() = when (this) {
-        Layout.Alignment.ALIGN_NORMAL -> Paint.Align.LEFT
-        Layout.Alignment.ALIGN_OPPOSITE -> Paint.Align.RIGHT
-        Layout.Alignment.ALIGN_CENTER -> Paint.Align.CENTER
-    }
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/context/MeasureContext.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/context/MeasureContext.kt
index e25d9438a..67d526536 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/context/MeasureContext.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/context/MeasureContext.kt
@@ -83,23 +83,11 @@ public interface MeasureContext : Extras {
      */
     public fun dpToPx(dp: Float): Float = dp * density
 
-    /**
-     * Converts the provided dimension from dp to px.
-     */
-    @Deprecated("Use `dpToPx` instead.", ReplaceWith("dpToPx(dp)"))
-    public fun toPixels(dp: Float): Float = dpToPx(dp)
-
     /**
      * Converts the provided dimension from sp to px.
      */
     public fun spToPx(sp: Float): Float
 
-    /**
-     * Converts the provided dimension from sp to px.
-     */
-    @Deprecated("Use `spToPx` instead.", ReplaceWith("spToPx(sp)"))
-    public fun toFontSize(sp: Float): Float = spToPx(sp)
-
     /**
      * Removes all stored extras.
      *
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/legend/VerticalLegend.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/legend/VerticalLegend.kt
index 86b74cdf8..6f670480e 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/legend/VerticalLegend.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/legend/VerticalLegend.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 by Patryk Goworowski and Patrick Michalik.
+ * Copyright 2023 by Patryk Goworowski and Patrick Michalik.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,10 +18,8 @@ package com.patrykandpatrick.vico.core.legend
 
 import android.graphics.RectF
 import com.patrykandpatrick.vico.core.chart.draw.ChartDrawContext
-import com.patrykandpatrick.vico.core.component.Component
 import com.patrykandpatrick.vico.core.component.dimension.Padding
 import com.patrykandpatrick.vico.core.component.text.HorizontalPosition
-import com.patrykandpatrick.vico.core.component.text.TextComponent
 import com.patrykandpatrick.vico.core.context.MeasureContext
 import com.patrykandpatrick.vico.core.dimensions.MutableDimensions
 import com.patrykandpatrick.vico.core.dimensions.emptyDimensions
@@ -99,24 +97,4 @@ public open class VerticalLegend(
             currentTop += height + spacingDp.pixels
         }
     }
-
-    @Deprecated("Use `LegendItem#getLabelHeight` instead.")
-    @Suppress("DEPRECATION")
-    protected open fun Item.getHeight(context: MeasureContext, availableWidth: Float): Float = with(context) {
-        label.getHeight(this, labelText, (availableWidth - iconSizeDp.pixels - iconPaddingDp.pixels).toInt())
-    }
-
-    /**
-     * Defines the appearance of an item of a [VerticalLegend].
-     *
-     * @param icon the [Component] used as the item’s icon.
-     * @param label the [TextComponent] used for the label.
-     * @param labelText the text content of the label.
-     */
-    @Deprecated("Use `LegendItem` instead.")
-    public class Item(
-        public override val icon: Component,
-        public override val label: TextComponent,
-        public override val labelText: CharSequence,
-    ) : LegendItem(icon, label, labelText)
 }
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/marker/Marker.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/marker/Marker.kt
index 55c4c8ed0..c4a35a535 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/marker/Marker.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/marker/Marker.kt
@@ -29,22 +29,6 @@ import com.patrykandpatrick.vico.core.model.Point
  */
 public interface Marker : ChartInsetter {
 
-    /**
-     * Draws the marker.
-     * @param context the [DrawContext] used to draw the marker.
-     * @param bounds the bounds in which the marker is drawn.
-     * @param markedEntries a list of [EntryModel]s representing the entries to which the marker refers.
-     */
-    @Deprecated(
-        message = "Use the version of `draw` that takes a `ChartValuesProvider` as an argument.",
-        replaceWith = ReplaceWith("draw(context, bounds, markedEntries, chartValuesProvider)"),
-    )
-    public fun draw(
-        context: DrawContext,
-        bounds: RectF,
-        markedEntries: List<EntryModel>,
-    ): Unit = Unit
-
     /**
      * Draws the marker.
      * @param context the [DrawContext] used to draw the marker.
@@ -52,15 +36,12 @@ public interface Marker : ChartInsetter {
      * @param markedEntries a list of [EntryModel]s representing the entries to which the marker refers.
      * @param chartValuesProvider the [Chart]’s [ChartValuesProvider].
      */
-    @Suppress("DEPRECATION")
     public fun draw(
         context: DrawContext,
         bounds: RectF,
         markedEntries: List<EntryModel>,
         chartValuesProvider: ChartValuesProvider,
-    ) {
-        draw(context, bounds, markedEntries)
-    }
+    )
 
     /**
      * Contains information on a single chart entry to which a chart marker refers.
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/marker/MarkerVisibilityChangeListener.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/marker/MarkerVisibilityChangeListener.kt
index e94db4e20..472a87999 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/marker/MarkerVisibilityChangeListener.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/marker/MarkerVisibilityChangeListener.kt
@@ -31,10 +31,7 @@ public interface MarkerVisibilityChangeListener {
     public fun onMarkerShown(
         marker: Marker,
         markerEntryModels: List<Marker.EntryModel>,
-    ) {
-        @Suppress("DEPRECATION_ERROR")
-        onMarkerVisibilityChanged(isVisible = true, marker = marker)
-    }
+    )
 
     /**
      * Called when the linked [Marker] moves (that is, when there’s a change in which chart entries it highlights).
@@ -53,20 +50,5 @@ public interface MarkerVisibilityChangeListener {
      *
      * @param marker the linked [Marker], which has been hidden.
      */
-    public fun onMarkerHidden(marker: Marker) {
-        @Suppress("DEPRECATION_ERROR")
-        onMarkerVisibilityChanged(isVisible = false, marker = marker)
-    }
-
-    /**
-     * Called when the linked [Marker]ʼs visibility changes.
-     *
-     * @param isVisible whether the linked [Marker] is visible.
-     * @param marker the linked [Marker], whose visibility has changed.
-     */
-    @Deprecated(message = "Use `onMarkerShown` and `onMarkerHidden` instead.", level = DeprecationLevel.ERROR)
-    public fun onMarkerVisibilityChanged(
-        isVisible: Boolean,
-        marker: Marker,
-    ): Unit = Unit
+    public fun onMarkerHidden(marker: Marker)
 }
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/scroll/ScrollHandler.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/scroll/ScrollHandler.kt
index 0b9f1f4f2..0861f1c4d 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/scroll/ScrollHandler.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/scroll/ScrollHandler.kt
@@ -26,30 +26,6 @@ import kotlin.properties.Delegates
  */
 public class ScrollHandler(initialMaxValue: Float = 0f) : ScrollListenerHost {
 
-    /**
-     * Handles scroll events.
-     *
-     * @param setScrollAmount called when the scroll amount changes.
-     * @param maxScrollDistance the initial maximum scroll amount.
-     */
-    @Deprecated(
-        message = """Use the primary constructor. `initialMaxValue` replaces `maxScrollDistance`, and you can register a
-            `ScrollListener` instead of using `setScrollAmount`.""",
-        level = DeprecationLevel.ERROR,
-    )
-    public constructor(
-        setScrollAmount: (Float) -> Unit = {},
-        maxScrollDistance: Float = 0f,
-    ) : this(maxScrollDistance) {
-        registerScrollListener(
-            object : ScrollListener {
-                override fun onValueChanged(oldValue: Float, newValue: Float) {
-                    setScrollAmount(newValue)
-                }
-            },
-        )
-    }
-
     private var initialScrollHandled: Boolean = false
     private val scrollListeners: MutableSet<ScrollListener> = mutableSetOf()
 
@@ -67,22 +43,6 @@ public class ScrollHandler(initialMaxValue: Float = 0f) : ScrollListenerHost {
         scrollListeners.forEach { scrollListener -> scrollListener.onMaxValueChanged(oldMaxValue, newMaxValue) }
     }
 
-    /**
-     * The current scroll amount (in pixels).
-     */
-    @Deprecated(message = "Use the `value` field instead.", level = DeprecationLevel.ERROR)
-    public var currentScroll: Float
-        get() = value
-        set(newCurrentScroll) { value = newCurrentScroll }
-
-    /**
-     * The maximum scroll amount (in pixels).
-     */
-    @Deprecated(message = "Use the `maxValue` field instead.", level = DeprecationLevel.ERROR)
-    public var maxScrollDistance: Float
-        get() = maxValue
-        set(newMaxScrollDistance) { maxValue = newMaxScrollDistance }
-
     private fun getClampedScroll(scroll: Float): Float = scroll.coerceIn(0f.rangeWith(maxValue))
 
     /**
diff --git a/vico/views/src/main/java/com/patrykandpatrick/vico/views/chart/BaseChartView.kt b/vico/views/src/main/java/com/patrykandpatrick/vico/views/chart/BaseChartView.kt
index 1da1228dc..da3ef6519 100644
--- a/vico/views/src/main/java/com/patrykandpatrick/vico/views/chart/BaseChartView.kt
+++ b/vico/views/src/main/java/com/patrykandpatrick/vico/views/chart/BaseChartView.kt
@@ -223,19 +223,6 @@ public abstract class BaseChartView<Model : ChartEntryModel> internal constructo
      */
     public var getXStep: ((Model) -> Float)? by invalidatingObservable(null)
 
-    /**
-     * Whether the chart can be scrolled horizontally.
-     */
-    @Deprecated(
-        message = "`isHorizontalScrollEnabled` is deprecated. Use `chartScrollSpec` instead.",
-        level = DeprecationLevel.ERROR,
-    )
-    public var isHorizontalScrollEnabled: Boolean
-        get() = chartScrollSpec.isScrollEnabled
-        set(value) {
-            chartScrollSpec = chartScrollSpec.copy(isScrollEnabled = value)
-        }
-
     /**
      * Whether the pinch-to-zoom gesture is enabled.
      */
diff --git a/vico/views/src/main/java/com/patrykandpatrick/vico/views/theme/TextComponentStyleExtensions.kt b/vico/views/src/main/java/com/patrykandpatrick/vico/views/theme/TextComponentStyleExtensions.kt
index 201c3b64f..e3b300c17 100644
--- a/vico/views/src/main/java/com/patrykandpatrick/vico/views/theme/TextComponentStyleExtensions.kt
+++ b/vico/views/src/main/java/com/patrykandpatrick/vico/views/theme/TextComponentStyleExtensions.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 by Patryk Goworowski and Patrick Michalik.
+ * Copyright 2023 by Patryk Goworowski and Patrick Michalik.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,7 +18,6 @@ package com.patrykandpatrick.vico.views.theme
 
 import android.content.Context
 import android.content.res.TypedArray
-import android.graphics.Paint
 import android.graphics.Typeface
 import android.os.Build
 import android.text.Layout
@@ -62,8 +61,6 @@ internal fun TypedArray.getTextComponent(
         this.lineCount = getInteger(R.styleable.TextComponentStyle_android_maxLines, DEF_LABEL_LINE_COUNT)
         this.ellipsize = getTruncateAt()
         getTypeface(context)?.let { this.typeface = it }
-        @Suppress("DEPRECATION")
-        getTextAlign()?.let { this.textAlign = it }
         this.textAlignment = getTextAlignment()
     }
 }
@@ -153,9 +150,6 @@ private fun TypedArray.getMargins(context: Context): MutableDimensions {
     )
 }
 
-private fun TypedArray.getTextAlign(): Paint.Align? =
-    Paint.Align.values().getOrNull(getInt(R.styleable.TextComponentStyle_textAlign, -1))
-
 private fun TypedArray.getTextAlignment(): Layout.Alignment =
     Layout.Alignment
         .values()
diff --git a/vico/views/src/main/java/com/patrykandpatrick/vico/views/theme/ThemeHandler.kt b/vico/views/src/main/java/com/patrykandpatrick/vico/views/theme/ThemeHandler.kt
index b6a764e25..0480a1dd5 100644
--- a/vico/views/src/main/java/com/patrykandpatrick/vico/views/theme/ThemeHandler.kt
+++ b/vico/views/src/main/java/com/patrykandpatrick/vico/views/theme/ThemeHandler.kt
@@ -246,16 +246,8 @@ internal class ThemeHandler(
         when (getInt(R.styleable.BaseChartView_horizontalLayout, 0)) {
             0 -> HorizontalLayout.Segmented
             else -> HorizontalLayout.FullWidth(
-                getRawDimension(
-                    context,
-                    R.styleable.BaseChartView_scalableStartContentPadding,
-                    getRawDimension(context, R.styleable.BaseChartView_startContentPadding, 0f),
-                ),
-                getRawDimension(
-                    context,
-                    R.styleable.BaseChartView_scalableEndContentPadding,
-                    getRawDimension(context, R.styleable.BaseChartView_endContentPadding, 0f),
-                ),
+                getRawDimension(context, R.styleable.BaseChartView_scalableStartContentPadding, 0f),
+                getRawDimension(context, R.styleable.BaseChartView_scalableEndContentPadding, 0f),
                 getRawDimension(context, R.styleable.BaseChartView_unscalableStartContentPadding, 0f),
                 getRawDimension(context, R.styleable.BaseChartView_unscalableEndContentPadding, 0f),
             )
diff --git a/vico/views/src/main/res/values/attrs.xml b/vico/views/src/main/res/values/attrs.xml
index 5ff0012da..322829211 100644
--- a/vico/views/src/main/res/values/attrs.xml
+++ b/vico/views/src/main/res/values/attrs.xml
@@ -90,10 +90,6 @@
         <attr name="scalableEndContentPadding" format="dimension" />
         <attr name="unscalableStartContentPadding" format="dimension" />
         <attr name="unscalableEndContentPadding" format="dimension" />
-        <!-- Deprecated. Use `scalableStartContentPadding` instead. -->
-        <attr name="startContentPadding" format="dimension" />
-        <!-- Deprecated. Use `scalableEndContentPadding` instead. -->
-        <attr name="endContentPadding" format="dimension" />
     </declare-styleable>
 
     <!-- Defines the appearance of chart axes. -->
@@ -167,12 +163,6 @@
         <attr name="marginBottom" format="dimension" />
         <attr name="marginVertical" format="dimension" />
         <attr name="marginHorizontal" format="dimension" />
-        <!-- Deprecated. Use `textAlignment` instead. -->
-        <attr name="textAlign" format="enum">
-            <enum name="left" value="0" />
-            <enum name="center" value="1" />
-            <enum name="right" value="2" />
-        </attr>
         <attr name="textAlignment" format="enum">
             <enum name="normal" value="0" />
             <enum name="opposite" value="1" />

From 6de3863a9bdd6ae3aac18d7a165e2151e92d583e Mon Sep 17 00:00:00 2001
From: Patrick Michalik <120058021+patrickmichalik@users.noreply.github.com>
Date: Fri, 1 Dec 2023 18:22:47 +0100
Subject: [PATCH 14/15] Remove Detekt in favor of Ktlint

---
 .editorconfig                                 |   2 +
 .../{run-detekt.yml => run-ktlint.yml}        |  13 +-
 .idea/detekt-config.yml                       |  71 ---
 .idea/detekt.xml                              |  10 -
 .idea/jsonSchemas.xml                         |  25 -
 build.gradle.kts                              |  21 +-
 gradle/libs.versions.toml                     |   3 -
 .../vico/sample/MainActivity.kt               |   1 -
 .../patrykandpatrick/vico/sample/VicoApp.kt   |   7 +-
 .../vico/sample/previews/AxisLinePreviews.kt  | 170 +++---
 .../ColumnChartsWithNegativeValuesPreviews.kt |  43 +-
 .../sample/previews/ContainedChartsPreview.kt |  72 +--
 .../vico/sample/previews/LineChartPreviews.kt | 111 ++--
 .../LineChartsWithNegativeValuesPreviews.kt   |  83 +--
 .../vico/sample/previews/Previews.kt          | 203 +++----
 .../vico/sample/previews/ShapePreviews.kt     |  69 +--
 ...dColumnChartsWithNegativeValuesPreviews.kt |  81 +--
 .../sample/previews/ThresholdLinePreviews.kt  | 269 +++++----
 .../composables/column/ColumnCharts.kt        |  11 +-
 .../vico/sample/showcase/ChartStyle.kt        |  18 +-
 .../vico/sample/showcase/Marker.kt            |  57 +-
 .../vico/sample/showcase/ShowcaseScreen.kt    |  14 +-
 .../vico/sample/showcase/ShowcaseViewModel.kt |  28 +-
 .../vico/sample/showcase/UISystem.kt          |   5 +-
 .../vico/sample/showcase/charts/Chart1.kt     |   5 +-
 .../vico/sample/showcase/charts/Chart2.kt     |  47 +-
 .../vico/sample/showcase/charts/Chart3.kt     |  49 +-
 .../vico/sample/showcase/charts/Chart4.kt     |  39 +-
 .../vico/sample/showcase/charts/Chart5.kt     |  57 +-
 .../vico/sample/showcase/charts/Chart6.kt     |  48 +-
 .../vico/sample/showcase/charts/Chart7.kt     |  79 +--
 .../vico/sample/showcase/charts/Chart8.kt     |  14 +-
 .../vico/sample/showcase/charts/Chart9.kt     | 208 +++----
 .../vico/sample/utils/PaddingValues.kt        |  17 +-
 .../vico/sample/utils/VicoTheme.kt            |  18 +-
 .../vico/sample/PaparazziTest.kt              |  22 +-
 .../vico/compose/m2/style/M2ChartStyle.kt     |  42 +-
 .../vico/compose/m3/style/M3ChartStyle.kt     |  44 +-
 .../vico/compose/axis/AxisComponents.kt       | 155 +++---
 .../compose/axis/vertical/VerticalAxis.kt     |  62 ++-
 .../vico/compose/chart/Charts.kt              | 134 ++---
 .../vico/compose/chart/column/ColumnChart.kt  |  31 +-
 .../chart/edges/FadingEdgesExtensions.kt      |  42 +-
 .../chart/entry/ChartEntryModelExtensions.kt  |  50 +-
 .../compose/chart/layout/HorizontalLayout.kt  |  13 +-
 .../vico/compose/chart/line/LineChart.kt      | 176 +++---
 .../compose/chart/scroll/ChartScrollSpec.kt   |  39 +-
 .../compose/chart/scroll/ChartScrollState.kt  |  34 +-
 .../vico/compose/component/Components.kt      | 179 +++---
 .../compose/component/dimension/Padding.kt    |  55 +-
 .../component/marker/MarkerComponent.kt       |  13 +-
 .../vico/compose/component/shape/Shapes.kt    | 247 +++++----
 .../component/shape/shader/BrushShader.kt     |  12 +-
 .../component/shape/shader/DynamicShaders.kt  |  21 +-
 .../shape/shader/LinearGradientShader.kt      |  78 +--
 .../compose/dimensions/DimensionExtensions.kt |  41 +-
 .../compose/extension/ComponentExtensions.kt  |  21 +-
 .../vico/compose/gesture/Zoomable.kt          |  33 +-
 .../layout/MeasureContextExtensions.kt        |  33 +-
 .../vico/compose/legend/Legends.kt            |  55 +-
 .../compose/state/ChartEntryModelWrapper.kt   |   5 +-
 .../vico/compose/style/ChartStyle.kt          |  96 ++--
 .../patrykandpatrick/vico/core/Defaults.kt    |   4 -
 .../patrykandpatrick/vico/core/axis/Axis.kt   |   9 +-
 .../vico/core/axis/AxisItemPlacer.kt          |  11 +-
 .../vico/core/axis/AxisManager.kt             |   3 +-
 .../vico/core/axis/AxisPosition.kt            |  11 +-
 .../vico/core/axis/AxisRenderer.kt            |   6 +-
 .../DecimalFormatAxisValueFormatter.kt        |   3 +-
 .../PercentageFormatAxisValueFormatter.kt     |   3 +-
 .../DefaultHorizontalAxisItemPlacer.kt        |   3 -
 .../core/axis/horizontal/HorizontalAxis.kt    | 327 +++++------
 .../vertical/DefaultVerticalAxisItemPlacer.kt |  28 +-
 .../vico/core/axis/vertical/VerticalAxis.kt   | 307 ++++++-----
 .../vico/core/chart/BaseChart.kt              |  77 +--
 .../patrykandpatrick/vico/core/chart/Chart.kt |  20 +-
 .../vico/core/chart/DefaultPointConnector.kt  |   7 +-
 .../vico/core/chart/EntryModelExtensions.kt   |   5 +-
 .../vico/core/chart/LineSpecExtensions.kt     |  27 +-
 .../vico/core/chart/column/ColumnChart.kt     | 172 +++---
 .../chart/column/ColumnChartDrawingModel.kt   |   6 +-
 .../vico/core/chart/composed/ComposedChart.kt |  36 +-
 .../chart/composed/ComposedChartEntryModel.kt |   3 +-
 .../chart/composed/ComposedChartExtensions.kt |  13 +-
 .../vico/core/chart/decoration/Decoration.kt  |  13 +-
 .../core/chart/decoration/ThresholdLine.kt    | 107 ++--
 .../chart/dimensions/HorizontalDimensions.kt  |  30 +-
 .../dimensions/MutableHorizontalDimensions.kt |  30 +-
 .../vico/core/chart/draw/ChartDrawContext.kt  |   8 +-
 .../chart/draw/ChartDrawContextExtensions.kt  |  37 +-
 .../vico/core/chart/edges/FadingEdges.kt      |  79 +--
 .../vico/core/chart/insets/ChartInsetter.kt   |   1 -
 .../core/chart/insets/HorizontalInsets.kt     |  13 +-
 .../vico/core/chart/insets/Insets.kt          |  46 +-
 .../vico/core/chart/line/LineChart.kt         | 299 +++++-----
 .../core/chart/line/LineChartDrawingModel.kt  |   6 +-
 .../vico/core/chart/scale/AutoScaleUp.kt      |   1 -
 .../core/chart/values/AxisValuesOverrider.kt  |  42 +-
 .../vico/core/chart/values/ChartValues.kt     |   4 +-
 .../core/chart/values/ChartValuesManager.kt   |  19 +-
 .../core/chart/values/ChartValuesProvider.kt  |   1 -
 .../core/chart/values/MutableChartValues.kt   |  57 +-
 .../vico/core/collections/ArrayDelegates.kt   |  13 +-
 .../vico/core/component/Component.kt          |   1 -
 .../core/component/OverlayingComponent.kt     |  32 +-
 .../vico/core/component/dimension/Margins.kt  |   7 +-
 .../vico/core/component/dimension/Padding.kt  |   7 +-
 .../core/component/marker/MarkerComponent.kt  |  88 +--
 .../vico/core/component/shape/DashedShape.kt  |  96 ++--
 .../core/component/shape/LineComponent.kt     |  94 ++--
 .../vico/core/component/shape/Shape.kt        |   1 -
 .../core/component/shape/ShapeComponent.kt    |  96 ++--
 .../vico/core/component/shape/Shapes.kt       | 188 +++----
 .../core/component/shape/cornered/Corner.kt   |  22 +-
 .../shape/cornered/CornerTreatment.kt         |   1 -
 .../shape/cornered/CornerTreatments.kt        |  32 +-
 .../component/shape/cornered/CorneredShape.kt |   7 +-
 .../shape/cornered/MarkerCorneredShape.kt     |  64 +--
 .../shape/shader/CacheableDynamicShader.kt    |   3 +-
 .../component/shape/shader/ComponentShader.kt |  38 +-
 .../component/shape/shader/DynamicShader.kt   |  46 +-
 .../component/shape/shader/DynamicShaders.kt  |  50 +-
 .../shape/shader/HorizontalSplitShader.kt     |  45 +-
 .../component/shape/shader/SolidShader.kt     |  26 +-
 .../component/shape/shader/StaticShader.kt    |   3 +-
 .../component/shape/shadow/ComponentShadow.kt |  23 +-
 .../vico/core/component/text/TextComponent.kt | 297 +++++-----
 .../core/component/text/VerticalPosition.kt   |  13 +-
 .../text/VerticalPositionExtensions.kt        |  13 +-
 .../vico/core/context/DefaultExtras.kt        |  15 +-
 .../vico/core/context/DrawContext.kt          |  15 +-
 .../vico/core/context/Extras.kt               |  13 +-
 .../vico/core/context/MeasureContext.kt       |   1 -
 .../core/context/MutableMeasureContext.kt     |   1 -
 .../vico/core/debug/DebugHelper.kt            |  22 +-
 .../vico/core/dimensions/BoundsAware.kt       |   3 +-
 .../vico/core/dimensions/Dimensions.kt        |   3 +-
 .../vico/core/dimensions/MutableDimensions.kt |  38 +-
 .../vico/core/draw/DrawContextExtensions.kt   |  44 +-
 .../vico/core/entry/ChartEntry.kt             |   3 +-
 .../vico/core/entry/ChartEntryExtensions.kt   |  29 +-
 .../vico/core/entry/ChartEntryModel.kt        |   1 -
 .../core/entry/ChartEntryModelProducer.kt     |  31 +-
 .../vico/core/entry/ChartModelProducer.kt     |   6 +-
 .../vico/core/entry/FloatEntry.kt             |  12 +-
 .../ComposedChartEntryModelProducer.kt        | 511 +++++++++---------
 .../diff/DefaultDrawingModelInterpolator.kt   |  57 +-
 .../vico/core/entry/diff/DrawingModel.kt      |   6 +-
 .../entry/diff/DrawingModelInterpolator.kt    |   5 +-
 .../vico/core/entry/diff/ExtraStore.kt        |  18 +-
 .../core/extension/CollectionExtensions.kt    |  14 +-
 .../vico/core/extension/ColorExtensions.kt    |  27 +-
 .../core/extension/ColorOverlayExtensions.kt  |  33 +-
 .../vico/core/extension/ColorUtils.kt         |  18 +-
 .../vico/core/extension/CommonExtensions.kt   |  13 +-
 .../vico/core/extension/DrawableExtensions.kt |   9 +-
 .../vico/core/extension/MapExtensions.kt      |  13 +-
 .../vico/core/extension/NumberExtensions.kt   |  30 +-
 .../vico/core/extension/PaintExtensions.kt    |   8 +-
 .../vico/core/extension/RectExtensions.kt     |  18 +-
 .../core/extension/ReflectionExtensions.kt    |   7 +-
 .../formatter/DecimalFormatValueFormatter.kt  |  11 +-
 .../PercentageFormatValueFormatter.kt         |   4 +-
 .../vico/core/formatter/ValueFormatter.kt     |   3 +-
 .../vico/core/layout/VirtualLayout.kt         |  99 ++--
 .../vico/core/legend/HorizontalLegend.kt      | 164 +++---
 .../vico/core/legend/Legend.kt                |   8 +-
 .../vico/core/legend/LegendItem.kt            |  47 +-
 .../vico/core/legend/VerticalLegend.kt        |  97 ++--
 .../marker/DefaultMarkerLabelFormatter.kt     |  30 +-
 .../vico/core/marker/Marker.kt                |   1 -
 .../vico/core/marker/MarkerLabelFormatter.kt  |   1 -
 .../marker/MarkerVisibilityChangeListener.kt  |   1 -
 .../patrykandpatrick/vico/core/model/Point.kt |  11 +-
 .../vico/core/scroll/AutoScrollCondition.kt   |  34 +-
 .../vico/core/scroll/ScrollHandler.kt         |  10 +-
 .../vico/core/scroll/ScrollListener.kt        |  11 +-
 .../vico/core/scroll/ScrollListenerHost.kt    |   3 +-
 .../vico/core/text/StaticLayoutExtensions.kt  |   9 +-
 .../vico/core/util/InlineClassHelper.kt       |  15 +-
 .../vico/core/util/RandomEntriesGenerator.kt  |  10 +-
 .../vico/core/util/ValueWrapper.kt            |  11 +-
 .../vico/core/ChartEntryModelProducerTest.kt  |   1 -
 .../vico/core/CollectionExtensionsTest.kt     |  57 +-
 .../core/extension/RectFExtensionsTest.kt     |   3 +-
 .../vico/views/chart/BaseChartView.kt         | 148 +++--
 .../vico/views/chart/ChartView.kt             |  61 ++-
 .../vico/views/chart/ComposedChartView.kt     |  66 +--
 .../chart/column/ColumnChartExtensions.kt     |  41 +-
 .../views/chart/line/LineChartExtensions.kt   |  24 +-
 .../views/component/shape/ShapeDrawable.kt    |  19 +-
 .../vico/views/component/shape/Shapes.kt      |  34 +-
 .../component/shape/shader/DynamicShaders.kt  | 127 +++--
 .../views/dimensions/DimensionsExtensions.kt  |  41 +-
 .../vico/views/extension/ContextExtensions.kt |  11 +-
 .../vico/views/extension/ViewExtensions.kt    |   5 +-
 .../gestures/ChartScaleGestureListener.kt     |   3 +-
 .../vico/views/gestures/MotionEventHandler.kt |   5 +-
 .../vico/views/scroll/ChartScrollSpec.kt      |  45 +-
 .../vico/views/theme/ChartStyleExtensions.kt  | 210 +++----
 .../views/theme/ComponentStyleExtensions.kt   | 347 ++++++------
 .../vico/views/theme/ShapeStyleExtensions.kt  | 140 ++---
 .../theme/TextComponentStyleExtensions.kt     | 121 +++--
 .../vico/views/theme/ThemeHandler.kt          | 258 +++++----
 .../vico/views/theme/TypedArrayExtensions.kt  |  42 +-
 205 files changed, 5497 insertions(+), 4797 deletions(-)
 rename .github/workflows/{run-detekt.yml => run-ktlint.yml} (52%)
 delete mode 100644 .idea/detekt-config.yml
 delete mode 100644 .idea/detekt.xml
 delete mode 100644 .idea/jsonSchemas.xml

diff --git a/.editorconfig b/.editorconfig
index 0f2a4eb72..13aee403c 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -11,3 +11,5 @@ indent_size = 2
 [*.{kts,kt}]
 ij_kotlin_allow_trailing_comma = true
 ij_kotlin_allow_trailing_comma_on_call_site = true
+ktlint_function_naming_ignore_when_annotated_with = Composable
+max_line_length = 120
diff --git a/.github/workflows/run-detekt.yml b/.github/workflows/run-ktlint.yml
similarity index 52%
rename from .github/workflows/run-detekt.yml
rename to .github/workflows/run-ktlint.yml
index cecfbcdaa..bd04d3fea 100644
--- a/.github/workflows/run-detekt.yml
+++ b/.github/workflows/run-ktlint.yml
@@ -1,16 +1,19 @@
-name: Run Detekt
+name: Run Ktlint
 on:
   push:
   pull_request:
 jobs:
-  run-detekt:
+  run-ktlint:
     runs-on: ubuntu-latest
     continue-on-error: true
     steps:
-      - uses: actions/checkout@v3
       - uses: actions/setup-java@v3
         with:
           java-version: 17
           distribution: zulu
-      - uses: gradle/gradle-build-action@v2
-      - run: ./gradlew detekt
+      - run: |
+          curl -sSLO https://github.com/pinterest/ktlint/releases/download/1.0.1/ktlint
+          chmod +x ktlint
+          sudo mv ktlint /usr/local/bin
+      - uses: actions/checkout@v3
+      - run: ktlint
diff --git a/.idea/detekt-config.yml b/.idea/detekt-config.yml
deleted file mode 100644
index 25b3e15ba..000000000
--- a/.idea/detekt-config.yml
+++ /dev/null
@@ -1,71 +0,0 @@
-comments:
-  active: true
-  UndocumentedPublicClass:
-    active: true
-    excludes:
-      - "**/test/**"
-      - "**/androidTest/**"
-      - "**/commonTest/**"
-      - "**/jvmTest/**"
-      - "**/jsTest/**"
-      - "**/iosTest/**"
-      - "**/com/patrykandpatrick/vico/sample/**"
-    ignoreAnnotated:
-      - "RestrictTo"
-  UndocumentedPublicFunction:
-    active: true
-    excludes:
-      - "**/test/**"
-      - "**/androidTest/**"
-      - "**/commonTest/**"
-      - "**/jvmTest/**"
-      - "**/jsTest/**"
-      - "**/iosTest/**"
-      - "**/com/patrykandpatrick/vico/sample/**"
-    ignoreAnnotated:
-      - "RestrictTo"
-  UndocumentedPublicProperty:
-    active: true
-    excludes:
-      - "**/test/**"
-      - "**/androidTest/**"
-      - "**/commonTest/**"
-      - "**/jvmTest/**"
-      - "**/jsTest/**"
-      - "**/iosTest/**"
-      - "**/com/patrykandpatrick/vico/sample/**"
-    ignoreAnnotated:
-      - "RestrictTo"
-complexity:
-  active: false
-style:
-  MagicNumber:
-    excludes:
-      - "**/test/**"
-      - "**/androidTest/**"
-      - "**/commonTest/**"
-      - "**/jvmTest/**"
-      - "**/jsTest/**"
-      - "**/iosTest/**"
-      - "**/previews/**"
-      - "**/Preview.kt"
-      - "**/Previews.kt"
-    ignoreNumbers:
-      - "-1"
-      - "0"
-      - "1"
-      - "2"
-      - "100"
-  UnnecessaryParentheses:
-    active: true
-    allowForUnclearPrecedence: true
-naming:
-  FunctionNaming:
-    ignoreAnnotated:
-      - "Composable"
-formatting:
-  active: true
-  TrailingCommaOnCallSite:
-    active: true
-  TrailingCommaOnDeclarationSite:
-    active: true
diff --git a/.idea/detekt.xml b/.idea/detekt.xml
deleted file mode 100644
index e23219b8e..000000000
--- a/.idea/detekt.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="DetektProjectConfiguration">
-    <enableDetekt>true</enableDetekt>
-    <enableFormatting>true</enableFormatting>
-    <buildUponDefaultConfig>true</buildUponDefaultConfig>
-    <treatAsError>true</treatAsError>
-    <configPaths>$PROJECT_DIR$/.idea/detekt-config.yml</configPaths>
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/jsonSchemas.xml b/.idea/jsonSchemas.xml
deleted file mode 100644
index 1a3417a83..000000000
--- a/.idea/jsonSchemas.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-    <component name="JsonSchemaMappingsProjectConfiguration">
-        <state>
-            <map>
-                <entry key="detekt">
-                    <value>
-                        <SchemaInfo>
-                            <option name="name" value="detekt" />
-                            <option name="relativePathToSchema"
-                                value="https://json.schemastore.org/detekt" />
-                            <option name="patterns">
-                                <list>
-                                    <Item>
-                                        <option name="path" value=".idea/detekt-config.yml" />
-                                    </Item>
-                                </list>
-                            </option>
-                        </SchemaInfo>
-                    </value>
-                </entry>
-            </map>
-        </state>
-    </component>
-</project>
diff --git a/build.gradle.kts b/build.gradle.kts
index eeb60f332..4711f5504 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -14,8 +14,6 @@
  * limitations under the License.
  */
 
-import io.gitlab.arturbosch.detekt.Detekt
-
 buildscript {
     dependencies {
         classpath(libs.buildTools)
@@ -24,25 +22,8 @@ buildscript {
     }
 }
 
-plugins {
-    alias(libs.plugins.detekt)
-    alias(libs.plugins.dokka) apply false
-}
+plugins { alias(libs.plugins.dokka) apply false }
 
 apply("versions.gradle")
 
-dependencies { detektPlugins(libs.detektFormatting) }
-
 tasks.register<Delete>("clean") { delete(rootProject.layout.buildDirectory) }
-
-tasks.register<Detekt>("detektFix") { autoCorrect = true }
-
-tasks.withType<Detekt>().configureEach {
-    source = fileTree(projectDir)
-    config = files(".idea/detekt-config.yml")
-    buildUponDefaultConfig = true
-    reports.html {
-        required = true
-        outputLocation = file("build/reports/detekt/detekt.html")
-    }
-}
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 94bf0bfc5..204ecdb72 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -8,7 +8,6 @@ appcompat = "1.6.1"
 composeBom = "2023.10.01"
 composeCompiler = "1.5.4"
 coroutines = "1.7.3"
-detekt = "1.23.3"
 dokka = "1.9.10"
 jUnit = "4.13.2"
 jUnitExt = "1.1.5"
@@ -33,7 +32,6 @@ composeUI = { group = "androidx.compose.ui", name = "ui" }
 composeUITooling = { group = "androidx.compose.ui", name = "ui-tooling" }
 composeViewBinding = { group = "androidx.compose.ui", name = "ui-viewbinding" }
 coroutinesCore = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version.ref = "coroutines" }
-detektFormatting = { group = "io.gitlab.arturbosch.detekt", name = "detekt-formatting", version.ref = "detekt" }
 jUnit = { group = "junit", name = "junit", version.ref = "jUnit" }
 jUnitExt = { group = "androidx.test.ext", name = "junit", version.ref = "jUnitExt" }
 kotlinGradlePlugin = { group = "org.jetbrains.kotlin", name = "kotlin-gradle-plugin", version.ref = "kotlin" }
@@ -48,5 +46,4 @@ testCore = { group = "androidx.test", name = "core-ktx", version.ref = "testCore
 viewModelCompose = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-compose", version.ref = "lifecycle" }
 
 [plugins]
-detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detekt" }
 dokka = { id = "org.jetbrains.dokka", version.ref = "dokka" }
diff --git a/sample/src/main/java/com/patrykandpatrick/vico/sample/MainActivity.kt b/sample/src/main/java/com/patrykandpatrick/vico/sample/MainActivity.kt
index 072635080..e8e0ca4ed 100644
--- a/sample/src/main/java/com/patrykandpatrick/vico/sample/MainActivity.kt
+++ b/sample/src/main/java/com/patrykandpatrick/vico/sample/MainActivity.kt
@@ -22,7 +22,6 @@ import androidx.activity.compose.setContent
 import androidx.core.view.WindowCompat
 
 internal class MainActivity : ComponentActivity() {
-
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         WindowCompat.setDecorFitsSystemWindows(window, false)
diff --git a/sample/src/main/java/com/patrykandpatrick/vico/sample/VicoApp.kt b/sample/src/main/java/com/patrykandpatrick/vico/sample/VicoApp.kt
index a0b1c1071..bf030c524 100644
--- a/sample/src/main/java/com/patrykandpatrick/vico/sample/VicoApp.kt
+++ b/sample/src/main/java/com/patrykandpatrick/vico/sample/VicoApp.kt
@@ -42,9 +42,10 @@ internal fun VicoApp() {
     }
     VicoTheme {
         Box(
-            modifier = Modifier
-                .fillMaxSize()
-                .background(color = MaterialTheme.colorScheme.background),
+            modifier =
+                Modifier
+                    .fillMaxSize()
+                    .background(color = MaterialTheme.colorScheme.background),
         ) { ShowcaseScreen() }
     }
 }
diff --git a/sample/src/main/java/com/patrykandpatrick/vico/sample/previews/AxisLinePreviews.kt b/sample/src/main/java/com/patrykandpatrick/vico/sample/previews/AxisLinePreviews.kt
index 2751f9203..e3b3c2568 100644
--- a/sample/src/main/java/com/patrykandpatrick/vico/sample/previews/AxisLinePreviews.kt
+++ b/sample/src/main/java/com/patrykandpatrick/vico/sample/previews/AxisLinePreviews.kt
@@ -42,24 +42,28 @@ private val model = entryModelOf(1, 2, 3, 4)
 
 @Composable
 private fun ProvidePreviewChartStyle(content: @Composable () -> Unit) {
-    val chartStyle = LocalChartStyle.current.copy(
-        axis = LocalChartStyle.current.axis.copy(
-            axisLabelColor = Color.Black,
-            axisLineColor = Color.Black.copy(alpha = 0.5f),
-            axisGuidelineColor = Color.Black.copy(alpha = 0.2f),
-        ),
-        columnChart = LocalChartStyle.current.columnChart.copy(
-            columns = LocalChartStyle.current.columnChart.columns.map {
-                lineComponent(
-                    color = Color.Gray,
-                    thickness = it.thicknessDp.dp,
-                    shape = it.shape,
-                    dynamicShader = it.dynamicShader,
-                    margins = it.margins,
-                )
-            },
-        ),
-    )
+    val chartStyle =
+        LocalChartStyle.current.copy(
+            axis =
+                LocalChartStyle.current.axis.copy(
+                    axisLabelColor = Color.Black,
+                    axisLineColor = Color.Black.copy(alpha = 0.5f),
+                    axisGuidelineColor = Color.Black.copy(alpha = 0.2f),
+                ),
+            columnChart =
+                LocalChartStyle.current.columnChart.copy(
+                    columns =
+                        LocalChartStyle.current.columnChart.columns.map {
+                            lineComponent(
+                                color = Color.Gray,
+                                thickness = it.thicknessDp.dp,
+                                shape = it.shape,
+                                dynamicShader = it.dynamicShader,
+                                margins = it.margins,
+                            )
+                        },
+                ),
+        )
     CompositionLocalProvider(LocalChartStyle provides chartStyle, content = content)
 }
 
@@ -67,39 +71,46 @@ private fun ProvidePreviewChartStyle(content: @Composable () -> Unit) {
 @Preview(showBackground = true, widthDp = 250)
 public fun HorizontalAxisTextInside() {
     ProvidePreviewChartStyle {
-        val label = axisLabelComponent(
-            background = shapeComponent(
-                shape = CorneredShape(
-                    topLeft = Corner.Relative(
-                        percentage = 50,
-                        cornerTreatment = CutCornerTreatment,
-                    ),
-                    bottomRight = Corner.Relative(
-                        percentage = 50,
-                        cornerTreatment = RoundedCornerTreatment,
+        val label =
+            axisLabelComponent(
+                background =
+                    shapeComponent(
+                        shape =
+                            CorneredShape(
+                                topLeft =
+                                    Corner.Relative(
+                                        percentage = 50,
+                                        cornerTreatment = CutCornerTreatment,
+                                    ),
+                                bottomRight =
+                                    Corner.Relative(
+                                        percentage = 50,
+                                        cornerTreatment = RoundedCornerTreatment,
+                                    ),
+                            ),
+                        color = Color.LightGray,
+                        strokeColor = Color.Gray,
+                        strokeWidth = 1.dp,
                     ),
-                ),
-                color = Color.LightGray,
-                strokeColor = Color.Gray,
-                strokeWidth = 1.dp,
-            ),
-            verticalPadding = 2.dp,
-            horizontalPadding = 8.dp,
-            verticalMargin = 4.dp,
-            horizontalMargin = 4.dp,
-        )
+                verticalPadding = 2.dp,
+                horizontalPadding = 8.dp,
+                verticalMargin = 4.dp,
+                horizontalMargin = 4.dp,
+            )
         Chart(
             chart = columnChart(),
             model = model,
-            startAxis = rememberStartAxis(
-                horizontalLabelPosition = VerticalAxis.HorizontalLabelPosition.Inside,
-                label = label,
-            ),
-            endAxis = rememberEndAxis(
-                horizontalLabelPosition = VerticalAxis.HorizontalLabelPosition.Inside,
-                guideline = null,
-                label = label,
-            ),
+            startAxis =
+                rememberStartAxis(
+                    horizontalLabelPosition = VerticalAxis.HorizontalLabelPosition.Inside,
+                    label = label,
+                ),
+            endAxis =
+                rememberEndAxis(
+                    horizontalLabelPosition = VerticalAxis.HorizontalLabelPosition.Inside,
+                    guideline = null,
+                    label = label,
+                ),
         )
     }
 }
@@ -108,28 +119,32 @@ public fun HorizontalAxisTextInside() {
 @Preview(showBackground = true, widthDp = 250)
 public fun HorizontalAxisTextInsideAndBottomAxis() {
     ProvidePreviewChartStyle {
-        val label = axisLabelComponent(
-            background = shapeComponent(
-                shape = Shapes.pillShape,
-                color = Color.LightGray,
-            ),
-            verticalPadding = 2.dp,
-            horizontalPadding = 8.dp,
-            verticalMargin = 4.dp,
-            horizontalMargin = 4.dp,
-        )
+        val label =
+            axisLabelComponent(
+                background =
+                    shapeComponent(
+                        shape = Shapes.pillShape,
+                        color = Color.LightGray,
+                    ),
+                verticalPadding = 2.dp,
+                horizontalPadding = 8.dp,
+                verticalMargin = 4.dp,
+                horizontalMargin = 4.dp,
+            )
         Chart(
             chart = columnChart(),
             model = model,
-            startAxis = rememberStartAxis(
-                horizontalLabelPosition = VerticalAxis.HorizontalLabelPosition.Inside,
-                label = label,
-            ),
-            endAxis = rememberEndAxis(
-                horizontalLabelPosition = VerticalAxis.HorizontalLabelPosition.Inside,
-                guideline = null,
-                label = label,
-            ),
+            startAxis =
+                rememberStartAxis(
+                    horizontalLabelPosition = VerticalAxis.HorizontalLabelPosition.Inside,
+                    label = label,
+                ),
+            endAxis =
+                rememberEndAxis(
+                    horizontalLabelPosition = VerticalAxis.HorizontalLabelPosition.Inside,
+                    guideline = null,
+                    label = label,
+                ),
             bottomAxis = rememberBottomAxis(),
         )
     }
@@ -142,13 +157,15 @@ public fun HorizontalAxisTextOutside() {
         Chart(
             chart = columnChart(),
             model = model,
-            startAxis = rememberStartAxis(
-                horizontalLabelPosition = VerticalAxis.HorizontalLabelPosition.Outside,
-            ),
-            endAxis = rememberEndAxis(
-                horizontalLabelPosition = VerticalAxis.HorizontalLabelPosition.Outside,
-                guideline = null,
-            ),
+            startAxis =
+                rememberStartAxis(
+                    horizontalLabelPosition = VerticalAxis.HorizontalLabelPosition.Outside,
+                ),
+            endAxis =
+                rememberEndAxis(
+                    horizontalLabelPosition = VerticalAxis.HorizontalLabelPosition.Outside,
+                    guideline = null,
+                ),
         )
     }
 }
@@ -160,9 +177,10 @@ public fun HorizontalAxisGuidelineDoesNotOverlayBottomAxisLine() {
         Chart(
             chart = columnChart(),
             model = model,
-            startAxis = rememberStartAxis(
-                horizontalLabelPosition = VerticalAxis.HorizontalLabelPosition.Outside,
-            ),
+            startAxis =
+                rememberStartAxis(
+                    horizontalLabelPosition = VerticalAxis.HorizontalLabelPosition.Outside,
+                ),
             bottomAxis = rememberBottomAxis(),
         )
     }
diff --git a/sample/src/main/java/com/patrykandpatrick/vico/sample/previews/ColumnChartsWithNegativeValuesPreviews.kt b/sample/src/main/java/com/patrykandpatrick/vico/sample/previews/ColumnChartsWithNegativeValuesPreviews.kt
index 6c92f521d..fb60f2a0a 100644
--- a/sample/src/main/java/com/patrykandpatrick/vico/sample/previews/ColumnChartsWithNegativeValuesPreviews.kt
+++ b/sample/src/main/java/com/patrykandpatrick/vico/sample/previews/ColumnChartsWithNegativeValuesPreviews.kt
@@ -42,12 +42,14 @@ public fun SingleColumnChartWithNegativeValues() {
     Surface {
         Chart(
             modifier = Modifier.height(250.dp),
-            chart = columnChart(
-                persistentMarkers = mapOf(
-                    2f to marker,
-                    3f to marker,
+            chart =
+                columnChart(
+                    persistentMarkers =
+                        mapOf(
+                            2f to marker,
+                            3f to marker,
+                        ),
                 ),
-            ),
             model = model,
             startAxis = rememberStartAxis(itemPlacer = remember { AxisItemPlacer.Vertical.default(maxItemCount = 9) }),
             bottomAxis = rememberBottomAxis(),
@@ -60,9 +62,10 @@ public fun SingleColumnChartWithNegativeValues() {
 public fun SingleColumnChartWithNegativeValuesAndDataLabels() {
     Surface {
         Chart(
-            chart = columnChart(
-                dataLabel = textComponent(),
-            ),
+            chart =
+                columnChart(
+                    dataLabel = textComponent(),
+                ),
             model = model,
             startAxis = rememberStartAxis(),
             bottomAxis = rememberBottomAxis(),
@@ -75,12 +78,14 @@ public fun SingleColumnChartWithNegativeValuesAndDataLabels() {
 public fun SingleColumnChartWithNegativeValuesAndAxisValuesOverridden() {
     Surface {
         Chart(
-            chart = columnChart(
-                axisValuesOverrider = AxisValuesOverrider.fixed(
-                    minY = 1f,
-                    maxY = 4f,
+            chart =
+                columnChart(
+                    axisValuesOverrider =
+                        AxisValuesOverrider.fixed(
+                            minY = 1f,
+                            maxY = 4f,
+                        ),
                 ),
-            ),
             model = model,
             startAxis = rememberStartAxis(itemPlacer = remember { AxisItemPlacer.Vertical.default(maxItemCount = 4) }),
             bottomAxis = rememberBottomAxis(),
@@ -93,12 +98,14 @@ public fun SingleColumnChartWithNegativeValuesAndAxisValuesOverridden() {
 public fun SingleColumnChartWithNegativeValuesAndAxisValuesOverridden2() {
     Surface {
         Chart(
-            chart = columnChart(
-                axisValuesOverrider = AxisValuesOverrider.fixed(
-                    minY = -2f,
-                    maxY = 0f,
+            chart =
+                columnChart(
+                    axisValuesOverrider =
+                        AxisValuesOverrider.fixed(
+                            minY = -2f,
+                            maxY = 0f,
+                        ),
                 ),
-            ),
             model = model,
             startAxis = rememberStartAxis(itemPlacer = remember { AxisItemPlacer.Vertical.default(maxItemCount = 3) }),
             bottomAxis = rememberBottomAxis(),
diff --git a/sample/src/main/java/com/patrykandpatrick/vico/sample/previews/ContainedChartsPreview.kt b/sample/src/main/java/com/patrykandpatrick/vico/sample/previews/ContainedChartsPreview.kt
index 7f603b641..986550528 100644
--- a/sample/src/main/java/com/patrykandpatrick/vico/sample/previews/ContainedChartsPreview.kt
+++ b/sample/src/main/java/com/patrykandpatrick/vico/sample/previews/ContainedChartsPreview.kt
@@ -56,52 +56,60 @@ private val markerMap: Map<Float, Marker>
 private fun getColumnChart(
     markerMap: Map<Float, Marker> = emptyMap(),
     targetVerticalAxisPosition: Vertical? = null,
-): ColumnChart = columnChart(
-    columns = listOf(
-        lineComponent(
-            color = Color.Black,
-            thickness = 8.dp,
-            shape = Shapes.pillShape,
-        ),
-    ),
-    persistentMarkers = markerMap,
-    targetVerticalAxisPosition = targetVerticalAxisPosition,
-)
+): ColumnChart =
+    columnChart(
+        columns =
+            listOf(
+                lineComponent(
+                    color = Color.Black,
+                    thickness = 8.dp,
+                    shape = Shapes.pillShape,
+                ),
+            ),
+        persistentMarkers = markerMap,
+        targetVerticalAxisPosition = targetVerticalAxisPosition,
+    )
 
 @Composable
 private fun getLineChart(
     markerMap: Map<Float, Marker> = emptyMap(),
     targetVerticalAxisPosition: Vertical? = null,
-): LineChart = lineChart(
-    lines = listOf(
-        lineSpec(
-            lineColor = Color.DarkGray,
-            lineBackgroundShader = verticalGradient(
-                arrayOf(Color.DarkGray, Color.DarkGray.copy(alpha = 0f)),
+): LineChart =
+    lineChart(
+        lines =
+            listOf(
+                lineSpec(
+                    lineColor = Color.DarkGray,
+                    lineBackgroundShader =
+                        verticalGradient(
+                            arrayOf(Color.DarkGray, Color.DarkGray.copy(alpha = 0f)),
+                        ),
+                ),
             ),
-        ),
-    ),
-    persistentMarkers = markerMap,
-    targetVerticalAxisPosition = targetVerticalAxisPosition,
-)
+        persistentMarkers = markerMap,
+        targetVerticalAxisPosition = targetVerticalAxisPosition,
+    )
 
 private val startAxis: Axis<Start>
-    @Composable get() = rememberStartAxis(
-        label = textComponent(color = Color.Black),
-        itemPlacer = remember { AxisItemPlacer.Vertical.default(maxItemCount = 5) },
-    )
+    @Composable get() =
+        rememberStartAxis(
+            label = textComponent(color = Color.Black),
+            itemPlacer = remember { AxisItemPlacer.Vertical.default(maxItemCount = 5) },
+        )
 
 private val endAxis: Axis<End>
-    @Composable get() = rememberEndAxis(
-        label = textComponent(color = Color.DarkGray),
-        itemPlacer = remember { AxisItemPlacer.Vertical.default(maxItemCount = 7) },
-    )
+    @Composable get() =
+        rememberEndAxis(
+            label = textComponent(color = Color.DarkGray),
+            itemPlacer = remember { AxisItemPlacer.Vertical.default(maxItemCount = 7) },
+        )
 
 @Composable
 @Preview("Chart with independent axes", widthDp = 350)
 public fun ChartWithIndependentAxes(modifier: Modifier = Modifier) {
-    val composedChart = getColumnChart(targetVerticalAxisPosition = Start) +
-        getLineChart(targetVerticalAxisPosition = End)
+    val composedChart =
+        getColumnChart(targetVerticalAxisPosition = Start) +
+            getLineChart(targetVerticalAxisPosition = End)
 
     composedChart.setPersistentMarkers(markerMap)
 
diff --git a/sample/src/main/java/com/patrykandpatrick/vico/sample/previews/LineChartPreviews.kt b/sample/src/main/java/com/patrykandpatrick/vico/sample/previews/LineChartPreviews.kt
index 4dc2d74b7..f98dce63d 100644
--- a/sample/src/main/java/com/patrykandpatrick/vico/sample/previews/LineChartPreviews.kt
+++ b/sample/src/main/java/com/patrykandpatrick/vico/sample/previews/LineChartPreviews.kt
@@ -51,23 +51,27 @@ public fun LineChartDark() {
 
         Chart(
             modifier = Modifier.padding(8.dp),
-            chart = lineChart(
-                lines = listOf(
-                    lineSpec(
-                        lineColor = yellow,
-                        lineBackgroundShader = verticalGradient(
-                            arrayOf(yellow.copy(0.5f), yellow.copy(alpha = 0f)),
+            chart =
+                lineChart(
+                    lines =
+                        listOf(
+                            lineSpec(
+                                lineColor = yellow,
+                                lineBackgroundShader =
+                                    verticalGradient(
+                                        arrayOf(yellow.copy(0.5f), yellow.copy(alpha = 0f)),
+                                    ),
+                            ),
+                            lineSpec(
+                                lineColor = pink,
+                                lineBackgroundShader =
+                                    verticalGradient(
+                                        arrayOf(pink.copy(0.5f), pink.copy(alpha = 0f)),
+                                    ),
+                            ),
                         ),
-                    ),
-                    lineSpec(
-                        lineColor = pink,
-                        lineBackgroundShader = verticalGradient(
-                            arrayOf(pink.copy(0.5f), pink.copy(alpha = 0f)),
-                        ),
-                    ),
+                    axisValuesOverrider = AxisValuesOverrider.fixed(maxY = 4f),
                 ),
-                axisValuesOverrider = AxisValuesOverrider.fixed(maxY = 4f),
-            ),
             model = model3,
         )
     }
@@ -87,12 +91,14 @@ public fun RegularLineChart() {
 @Composable
 public fun RegularLineChartExpanded() {
     Chart(
-        chart = lineChart(
-            axisValuesOverrider = AxisValuesOverrider.fixed(
-                minY = -1f,
-                maxY = 5f,
+        chart =
+            lineChart(
+                axisValuesOverrider =
+                    AxisValuesOverrider.fixed(
+                        minY = -1f,
+                        maxY = 5f,
+                    ),
             ),
-        ),
         model = model1,
         startAxis = rememberStartAxis(),
     )
@@ -102,12 +108,14 @@ public fun RegularLineChartExpanded() {
 @Composable
 public fun RegularLineChartCollapsed() {
     Chart(
-        chart = lineChart(
-            axisValuesOverrider = AxisValuesOverrider.fixed(
-                minY = 1f,
-                maxY = 3f,
+        chart =
+            lineChart(
+                axisValuesOverrider =
+                    AxisValuesOverrider.fixed(
+                        minY = 1f,
+                        maxY = 3f,
+                    ),
             ),
-        ),
         model = model1,
         startAxis = rememberStartAxis(),
     )
@@ -117,19 +125,24 @@ public fun RegularLineChartCollapsed() {
 @Composable
 public fun ComposedLineChart() {
     Chart(
-        chart = lineChart() + lineChart(
-            lines = listOf(
-                lineSpec(
-                    lineColor = Color.Blue,
-                    lineBackgroundShader = verticalGradient(
-                        colors = arrayOf(
-                            Color.Blue.copy(alpha = 0.4f),
-                            Color.Blue.copy(alpha = 0f),
+        chart =
+            lineChart() +
+                lineChart(
+                    lines =
+                        listOf(
+                            lineSpec(
+                                lineColor = Color.Blue,
+                                lineBackgroundShader =
+                                    verticalGradient(
+                                        colors =
+                                            arrayOf(
+                                                Color.Blue.copy(alpha = 0.4f),
+                                                Color.Blue.copy(alpha = 0f),
+                                            ),
+                                    ),
+                            ),
                         ),
-                    ),
                 ),
-            ),
-        ),
         model = model1 + model2,
         startAxis = rememberStartAxis(),
     )
@@ -139,17 +152,21 @@ public fun ComposedLineChart() {
 @Composable
 public fun ComposedLineChartCollapsed() {
     Chart(
-        chart = lineChart(
-            axisValuesOverrider = AxisValuesOverrider.fixed(
-                minY = 1f,
-                maxY = 3f,
-            ),
-        ) + lineChart(
-            axisValuesOverrider = AxisValuesOverrider.fixed(
-                minY = 1f,
-                maxY = 3f,
-            ),
-        ),
+        chart =
+            lineChart(
+                axisValuesOverrider =
+                    AxisValuesOverrider.fixed(
+                        minY = 1f,
+                        maxY = 3f,
+                    ),
+            ) +
+                lineChart(
+                    axisValuesOverrider =
+                        AxisValuesOverrider.fixed(
+                            minY = 1f,
+                            maxY = 3f,
+                        ),
+                ),
         model = model1 + model2,
         startAxis = rememberStartAxis(),
     )
diff --git a/sample/src/main/java/com/patrykandpatrick/vico/sample/previews/LineChartsWithNegativeValuesPreviews.kt b/sample/src/main/java/com/patrykandpatrick/vico/sample/previews/LineChartsWithNegativeValuesPreviews.kt
index 96e7e17ef..94460afcd 100644
--- a/sample/src/main/java/com/patrykandpatrick/vico/sample/previews/LineChartsWithNegativeValuesPreviews.kt
+++ b/sample/src/main/java/com/patrykandpatrick/vico/sample/previews/LineChartsWithNegativeValuesPreviews.kt
@@ -50,31 +50,38 @@ public fun SingleLineChartWithNegativeValues() {
     Surface {
         Chart(
             modifier = Modifier.height(250.dp),
-            chart = lineChart(
-                lines = listOf(
-                    lineSpec(
-                        lineShader = DynamicShaders.split(
-                            positiveColor = Color(0xFF25BE53),
-                            negativeColor = Color(0xFFE73B3B),
+            chart =
+                lineChart(
+                    lines =
+                        listOf(
+                            lineSpec(
+                                lineShader =
+                                    DynamicShaders.split(
+                                        positiveColor = Color(0xFF25BE53),
+                                        negativeColor = Color(0xFFE73B3B),
+                                    ),
+                            ),
+                        ),
+                    persistentMarkers =
+                        mapOf(
+                            2f to marker,
+                            3f to marker,
                         ),
-                    ),
-                ),
-                persistentMarkers = mapOf(
-                    2f to marker,
-                    3f to marker,
                 ),
-            ),
             model = model,
-            startAxis = rememberStartAxis(
-                itemPlacer = remember { AxisItemPlacer.Vertical.default(maxItemCount = 4) },
-                guideline = axisLineComponent(),
-            ),
-            bottomAxis = rememberBottomAxis(
-                guideline = axisLineComponent(),
-                itemPlacer = AxisItemPlacer.Horizontal.default(
-                    spacing = 2,
+            startAxis =
+                rememberStartAxis(
+                    itemPlacer = remember { AxisItemPlacer.Vertical.default(maxItemCount = 4) },
+                    guideline = axisLineComponent(),
+                ),
+            bottomAxis =
+                rememberBottomAxis(
+                    guideline = axisLineComponent(),
+                    itemPlacer =
+                        AxisItemPlacer.Horizontal.default(
+                            spacing = 2,
+                        ),
                 ),
-            ),
             horizontalLayout = HorizontalLayout.fullWidth(),
         )
     }
@@ -85,11 +92,13 @@ public fun SingleLineChartWithNegativeValues() {
 public fun SingleLineChartWithNegativeValuesAndDataLabels() {
     Surface {
         Chart(
-            chart = lineChart(
-                lines = listOf(
-                    lineSpec(lineShader = DynamicShaders.solid(Color.DarkGray), dataLabel = textComponent()),
+            chart =
+                lineChart(
+                    lines =
+                        listOf(
+                            lineSpec(lineShader = DynamicShaders.solid(Color.DarkGray), dataLabel = textComponent()),
+                        ),
                 ),
-            ),
             model = model,
             startAxis = rememberStartAxis(),
             bottomAxis = rememberBottomAxis(),
@@ -102,12 +111,14 @@ public fun SingleLineChartWithNegativeValuesAndDataLabels() {
 public fun SingleLineChartWithNegativeValuesAndAxisValuesOverridden() {
     Surface {
         Chart(
-            chart = lineChart(
-                axisValuesOverrider = AxisValuesOverrider.fixed(
-                    minY = 1f,
-                    maxY = 4f,
+            chart =
+                lineChart(
+                    axisValuesOverrider =
+                        AxisValuesOverrider.fixed(
+                            minY = 1f,
+                            maxY = 4f,
+                        ),
                 ),
-            ),
             model = model,
             startAxis = rememberStartAxis(itemPlacer = remember { AxisItemPlacer.Vertical.default(maxItemCount = 4) }),
             bottomAxis = rememberBottomAxis(),
@@ -120,12 +131,14 @@ public fun SingleLineChartWithNegativeValuesAndAxisValuesOverridden() {
 public fun SingleLineChartWithNegativeValuesAndAxisValuesOverridden2() {
     Surface {
         Chart(
-            chart = lineChart(
-                axisValuesOverrider = AxisValuesOverrider.fixed(
-                    minY = -2f,
-                    maxY = 0f,
+            chart =
+                lineChart(
+                    axisValuesOverrider =
+                        AxisValuesOverrider.fixed(
+                            minY = -2f,
+                            maxY = 0f,
+                        ),
                 ),
-            ),
             model = model,
             startAxis = rememberStartAxis(itemPlacer = remember { AxisItemPlacer.Vertical.default(maxItemCount = 3) }),
             bottomAxis = rememberBottomAxis(),
diff --git a/sample/src/main/java/com/patrykandpatrick/vico/sample/previews/Previews.kt b/sample/src/main/java/com/patrykandpatrick/vico/sample/previews/Previews.kt
index 68ee890e0..fb920ab43 100644
--- a/sample/src/main/java/com/patrykandpatrick/vico/sample/previews/Previews.kt
+++ b/sample/src/main/java/com/patrykandpatrick/vico/sample/previews/Previews.kt
@@ -60,110 +60,127 @@ private val chartModifier = Modifier.height(100.dp)
 
 @Preview("Sample Card With Column Chart", widthDp = 200)
 @Composable
-public fun ColumnChartCard(): Unit = VicoTheme {
-    val colors = MaterialTheme.colors
+public fun ColumnChartCard(): Unit =
+    VicoTheme {
+        val colors = MaterialTheme.colors
 
-    SampleCard {
-        Chart(
-            modifier = chartModifier,
-            chart = columnChart(
-                columns = listOf(
-                    lineComponent(
-                        colors.primary,
-                        thickness = 8.dp,
-                        shape = RoundedCornerShape(4.dp),
-                        dynamicShader = verticalGradient(arrayOf(colors.primary, colors.secondary)),
+        SampleCard {
+            Chart(
+                modifier = chartModifier,
+                chart =
+                    columnChart(
+                        columns =
+                            listOf(
+                                lineComponent(
+                                    colors.primary,
+                                    thickness = 8.dp,
+                                    shape = RoundedCornerShape(4.dp),
+                                    dynamicShader = verticalGradient(arrayOf(colors.primary, colors.secondary)),
+                                ),
+                            ),
                     ),
-                ),
-            ),
-            startAxis = createVerticalAxis {
-                label = textComponent(
-                    color = colors.primary,
-                    textSize = 10.sp,
-                    background = shapeComponent(
-                        shape = CutCornerShape(
-                            CornerSize(percent = 25),
-                            CornerSize(percent = 50),
-                            CornerSize(percent = 50),
-                            CornerSize(percent = 25),
-                        ),
-                        color = colors.primary.copy(alpha = 0.1f),
-                    ),
-                    padding = dimensionsOf(end = 8.dp, start = 4.dp),
-                )
-                axis = null
-                tick = null
-                guideline = LineComponent(
-                    colors.primary.copy(alpha = 0.1f).toArgb(),
-                    1.dp.value,
-                )
-            },
-            model = @Suppress("MagicNumber") (entryModelOf(1, 2, 3, 2)),
-        )
+                startAxis =
+                    createVerticalAxis {
+                        label =
+                            textComponent(
+                                color = colors.primary,
+                                textSize = 10.sp,
+                                background =
+                                    shapeComponent(
+                                        shape =
+                                            CutCornerShape(
+                                                CornerSize(percent = 25),
+                                                CornerSize(percent = 50),
+                                                CornerSize(percent = 50),
+                                                CornerSize(percent = 25),
+                                            ),
+                                        color = colors.primary.copy(alpha = 0.1f),
+                                    ),
+                                padding = dimensionsOf(end = 8.dp, start = 4.dp),
+                            )
+                        axis = null
+                        tick = null
+                        guideline =
+                            LineComponent(
+                                colors.primary.copy(alpha = 0.1f).toArgb(),
+                                1.dp.value,
+                            )
+                    },
+                model = entryModelOf(1, 2, 3, 2),
+            )
+        }
     }
-}
 
 @Preview("Sample Card With Line Chart", widthDp = 200)
 @Composable
-public fun LineChartCard(): Unit = VicoTheme {
-    val colors = MaterialTheme.colors
+public fun LineChartCard(): Unit =
+    VicoTheme {
+        val colors = MaterialTheme.colors
 
-    SampleCard {
-        Chart(
-            modifier = Modifier.height(100.dp),
-            chart = lineChart(
-                lines = listOf(
-                    lineSpec(
-                        point = null,
-                        lineColor = colors.primary,
-                        lineBackgroundShader = DynamicShaders.fromComponent(
-                            componentSize = 4.dp,
-                            component = shapeComponent(shape = pillShape, color = colors.primary).apply {
-                                setMargins(0.5.dp.value)
-                            },
-                        ),
+        SampleCard {
+            Chart(
+                modifier = Modifier.height(100.dp),
+                chart =
+                    lineChart(
+                        lines =
+                            listOf(
+                                lineSpec(
+                                    point = null,
+                                    lineColor = colors.primary,
+                                    lineBackgroundShader =
+                                        DynamicShaders.fromComponent(
+                                            componentSize = 4.dp,
+                                            component =
+                                                shapeComponent(shape = pillShape, color = colors.primary).apply {
+                                                    setMargins(0.5.dp.value)
+                                                },
+                                        ),
+                                ),
+                            ),
+                        axisValuesOverrider =
+                            AxisValuesOverrider.fixed(
+                                minX = 0f,
+                                maxY = 3f,
+                            ),
                     ),
-                ),
-                axisValuesOverrider = AxisValuesOverrider.fixed(
-                    minX = 0f,
-                    maxY = 3f,
-                ),
-            ),
-            model = entryModelOf(-1 to 0, 0 to 0, 1 to 1, 2 to 2, 3 to 0, 4 to 2, 5 to 1),
-            startAxis = createVerticalAxis {
-                label = textComponent(
-                    color = colors.onSurface,
-                    textSize = 10.sp,
-                    background = shapeComponent(shape = rectShape, color = Color.LightGray),
-                    padding = dimensionsOf(horizontal = 4.dp, vertical = 2.dp),
-                )
-                axis = null
-                tick = null
-                guideline = LineComponent(
-                    color = Color.LightGray.toArgb(),
-                    thicknessDp = 1.dp.value,
-                    shape = DashedShape(
-                        shape = pillShape,
-                        dashLengthDp = 2.dp.value,
-                        gapLengthDp = 4.dp.value,
-                    ),
-                )
-                horizontalLabelPosition = VerticalAxis.HorizontalLabelPosition.Inside
-            },
-            bottomAxis = createHorizontalAxis {
-                label = null
-                tick = null
-                guideline = null
-                axis = lineComponent(color = Color.LightGray, thickness = 1.dp)
-            },
-        )
+                model = entryModelOf(-1 to 0, 0 to 0, 1 to 1, 2 to 2, 3 to 0, 4 to 2, 5 to 1),
+                startAxis =
+                    createVerticalAxis {
+                        label =
+                            textComponent(
+                                color = colors.onSurface,
+                                textSize = 10.sp,
+                                background = shapeComponent(shape = rectShape, color = Color.LightGray),
+                                padding = dimensionsOf(horizontal = 4.dp, vertical = 2.dp),
+                            )
+                        axis = null
+                        tick = null
+                        guideline =
+                            LineComponent(
+                                color = Color.LightGray.toArgb(),
+                                thicknessDp = 1.dp.value,
+                                shape =
+                                    DashedShape(
+                                        shape = pillShape,
+                                        dashLengthDp = 2.dp.value,
+                                        gapLengthDp = 4.dp.value,
+                                    ),
+                            )
+                        horizontalLabelPosition = VerticalAxis.HorizontalLabelPosition.Inside
+                    },
+                bottomAxis =
+                    createHorizontalAxis {
+                        label = null
+                        tick = null
+                        guideline = null
+                        axis = lineComponent(color = Color.LightGray, thickness = 1.dp)
+                    },
+            )
+        }
     }
-}
 
 @Composable
-private fun SampleCard(
-    chart: @Composable ColumnScope.() -> Unit,
-) {
+private fun SampleCard(chart: @Composable ColumnScope.() -> Unit) {
     Card(
         modifier = Modifier.padding(8.dp),
         shape = RoundedCornerShape(8.dp),
diff --git a/sample/src/main/java/com/patrykandpatrick/vico/sample/previews/ShapePreviews.kt b/sample/src/main/java/com/patrykandpatrick/vico/sample/previews/ShapePreviews.kt
index e9aa97a97..be7f8ddcc 100644
--- a/sample/src/main/java/com/patrykandpatrick/vico/sample/previews/ShapePreviews.kt
+++ b/sample/src/main/java/com/patrykandpatrick/vico/sample/previews/ShapePreviews.kt
@@ -56,18 +56,20 @@ private fun PreviewShape(shape: Shape) {
     val path = remember { Path() }
 
     Column(
-        modifier = Modifier
-            .width(100.dp)
-            .background(color = Color.White, shape = RoundedCornerShape(size = 4.dp))
-            .padding(8.dp),
+        modifier =
+            Modifier
+                .width(100.dp)
+                .background(color = Color.White, shape = RoundedCornerShape(size = 4.dp))
+                .padding(8.dp),
         verticalArrangement = Arrangement.spacedBy(8.dp),
     ) {
         Text(text = "Canvas")
 
         Canvas(
-            modifier = Modifier
-                .fillMaxWidth()
-                .height(50.dp),
+            modifier =
+                Modifier
+                    .fillMaxWidth()
+                    .height(50.dp),
         ) {
             shape.drawShape(
                 context = drawContext(drawContext.canvas.nativeCanvas),
@@ -86,13 +88,14 @@ private fun PreviewShape(shape: Shape) {
             Text(text = "Compose Shape")
 
             Box(
-                modifier = Modifier
-                    .height(50.dp)
-                    .fillMaxWidth()
-                    .background(
-                        color = Color(black),
-                        shape = shape.composeShape(),
-                    ),
+                modifier =
+                    Modifier
+                        .height(50.dp)
+                        .fillMaxWidth()
+                        .background(
+                            color = Color(black),
+                            shape = shape.composeShape(),
+                        ),
             )
         }
     }
@@ -138,11 +141,12 @@ public fun CutCornerCustom1Shape() {
 @Preview
 public fun DrawableShape() {
     PreviewShape(
-        shape = Shapes.drawableShape(
-            drawable = getDrawable(id = R.drawable.ic_baseline_android_24),
-            keepAspectRatio = true,
-            otherShape = Shapes.pillShape,
-        ),
+        shape =
+            Shapes.drawableShape(
+                drawable = getDrawable(id = R.drawable.ic_baseline_android_24),
+                keepAspectRatio = true,
+                otherShape = Shapes.pillShape,
+            ),
     )
 }
 
@@ -150,11 +154,12 @@ public fun DrawableShape() {
 @Preview
 public fun DrawableShape2() {
     PreviewShape(
-        shape = Shapes.drawableShape(
-            drawable = getDrawable(id = R.drawable.ic_baseline_android_24),
-            keepAspectRatio = true,
-            otherShape = Shapes.pillShape,
-        ),
+        shape =
+            Shapes.drawableShape(
+                drawable = getDrawable(id = R.drawable.ic_baseline_android_24),
+                keepAspectRatio = true,
+                otherShape = Shapes.pillShape,
+            ),
     )
 }
 
@@ -168,14 +173,16 @@ public fun DrawableShapeStretched() {
 @Preview
 public fun DashedCutCornerCustomShape() {
     PreviewShape(
-        shape = Shapes.dashedShape(
-            shape = Shapes.cutCornerShape(topRightPercent = 50, bottomLeftPercent = 50),
-            dashLength = 24.dp,
-            gapLength = 8.dp,
-        ),
+        shape =
+            Shapes.dashedShape(
+                shape = Shapes.cutCornerShape(topRightPercent = 50, bottomLeftPercent = 50),
+                dashLength = 24.dp,
+                gapLength = 8.dp,
+            ),
     )
 }
 
 @Composable
-private fun getDrawable(@DrawableRes id: Int): Drawable =
-    ResourcesCompat.getDrawable(LocalContext.current.resources, id, null)!!
+private fun getDrawable(
+    @DrawableRes id: Int,
+): Drawable = ResourcesCompat.getDrawable(LocalContext.current.resources, id, null)!!
diff --git a/sample/src/main/java/com/patrykandpatrick/vico/sample/previews/StackedColumnChartsWithNegativeValuesPreviews.kt b/sample/src/main/java/com/patrykandpatrick/vico/sample/previews/StackedColumnChartsWithNegativeValuesPreviews.kt
index e893f7acd..a2fddb4d6 100644
--- a/sample/src/main/java/com/patrykandpatrick/vico/sample/previews/StackedColumnChartsWithNegativeValuesPreviews.kt
+++ b/sample/src/main/java/com/patrykandpatrick/vico/sample/previews/StackedColumnChartsWithNegativeValuesPreviews.kt
@@ -38,19 +38,21 @@ import com.patrykandpatrick.vico.core.entry.entriesOf
 import com.patrykandpatrick.vico.core.entry.entryModelOf
 import com.patrykandpatrick.vico.sample.showcase.rememberMarker
 
-private val model = entryModelOf(
-    entriesOf(2f, -1f, -4f, 2f, 1f, -5f, -2f, -3f),
-    entriesOf(3f, -2f, 2f, -1f, 2f, -3f, -4f, -1f),
-    entriesOf(1f, -2f, 2f, 1f, -1f, 4f, 4f, -2f),
-)
+private val model =
+    entryModelOf(
+        entriesOf(2f, -1f, -4f, 2f, 1f, -5f, -2f, -3f),
+        entriesOf(3f, -2f, 2f, -1f, 2f, -3f, -4f, -1f),
+        entriesOf(1f, -2f, 2f, 1f, -1f, 4f, 4f, -2f),
+    )
 
 private val columns: List<LineComponent>
     @Composable
-    get() = listOf(
-        lineComponent(color = Color(0xFF494949), thickness = 8.dp),
-        lineComponent(color = Color(0xFF7C7A7A), thickness = 8.dp),
-        lineComponent(color = Color(0xFFFF5D73), thickness = 8.dp),
-    )
+    get() =
+        listOf(
+            lineComponent(color = Color(0xFF494949), thickness = 8.dp),
+            lineComponent(color = Color(0xFF7C7A7A), thickness = 8.dp),
+            lineComponent(color = Color(0xFFFF5D73), thickness = 8.dp),
+        )
 
 @Preview
 @Composable
@@ -59,14 +61,16 @@ public fun StackedColumnChartWithNegativeValues() {
     Surface {
         Chart(
             modifier = Modifier.height(250.dp),
-            chart = columnChart(
-                columns = columns,
-                persistentMarkers = mapOf(
-                    2f to marker,
-                    3f to marker,
+            chart =
+                columnChart(
+                    columns = columns,
+                    persistentMarkers =
+                        mapOf(
+                            2f to marker,
+                            3f to marker,
+                        ),
+                    mergeMode = Stack,
                 ),
-                mergeMode = Stack,
-            ),
             model = model,
             startAxis = rememberStartAxis(itemPlacer = remember { AxisItemPlacer.Vertical.default(maxItemCount = 8) }),
             bottomAxis = rememberBottomAxis(),
@@ -79,11 +83,12 @@ public fun StackedColumnChartWithNegativeValues() {
 public fun StackedColumnChartWithNegativeValuesAndDataLabels() {
     Surface {
         Chart(
-            chart = columnChart(
-                columns = columns,
-                dataLabel = textComponent(),
-                mergeMode = Stack,
-            ),
+            chart =
+                columnChart(
+                    columns = columns,
+                    dataLabel = textComponent(),
+                    mergeMode = Stack,
+                ),
             model = model,
             startAxis = rememberStartAxis(itemPlacer = remember { AxisItemPlacer.Vertical.default(maxItemCount = 8) }),
             bottomAxis = rememberBottomAxis(),
@@ -96,14 +101,16 @@ public fun StackedColumnChartWithNegativeValuesAndDataLabels() {
 public fun StackedColumnChartWithNegativeValuesAndAxisValuesOverridden() {
     Surface {
         Chart(
-            chart = columnChart(
-                columns = columns,
-                axisValuesOverrider = AxisValuesOverrider.fixed(
-                    minY = 1f,
-                    maxY = 4f,
+            chart =
+                columnChart(
+                    columns = columns,
+                    axisValuesOverrider =
+                        AxisValuesOverrider.fixed(
+                            minY = 1f,
+                            maxY = 4f,
+                        ),
+                    mergeMode = Stack,
                 ),
-                mergeMode = Stack,
-            ),
             model = model,
             startAxis = rememberStartAxis(itemPlacer = remember { AxisItemPlacer.Vertical.default(maxItemCount = 4) }),
             bottomAxis = rememberBottomAxis(),
@@ -116,14 +123,16 @@ public fun StackedColumnChartWithNegativeValuesAndAxisValuesOverridden() {
 public fun StackedColumnChartWithNegativeValuesAndAxisValuesOverridden2() {
     Surface {
         Chart(
-            chart = columnChart(
-                columns = columns,
-                axisValuesOverrider = AxisValuesOverrider.fixed(
-                    minY = -2f,
-                    maxY = 0f,
+            chart =
+                columnChart(
+                    columns = columns,
+                    axisValuesOverrider =
+                        AxisValuesOverrider.fixed(
+                            minY = -2f,
+                            maxY = 0f,
+                        ),
+                    mergeMode = Stack,
                 ),
-                mergeMode = Stack,
-            ),
             model = model,
             startAxis = rememberStartAxis(itemPlacer = remember { AxisItemPlacer.Vertical.default(maxItemCount = 3) }),
             bottomAxis = rememberBottomAxis(),
diff --git a/sample/src/main/java/com/patrykandpatrick/vico/sample/previews/ThresholdLinePreviews.kt b/sample/src/main/java/com/patrykandpatrick/vico/sample/previews/ThresholdLinePreviews.kt
index f4c25ac82..a1c6f3940 100644
--- a/sample/src/main/java/com/patrykandpatrick/vico/sample/previews/ThresholdLinePreviews.kt
+++ b/sample/src/main/java/com/patrykandpatrick/vico/sample/previews/ThresholdLinePreviews.kt
@@ -50,30 +50,35 @@ public val Color.Companion.DimmedGray: Color
 
 @Composable
 private fun ProvidePreviewChartStyle(content: @Composable () -> Unit) {
-    val chartStyle = LocalChartStyle.current.copy(
-        axis = LocalChartStyle.current.axis.copy(
-            axisLabelColor = Color.DimmedGray,
-            axisLineColor = Color.DimmedGray,
-            axisTickColor = Color.DimmedGray,
-            axisGuidelineColor = Color.DimmedGray,
-        ),
-        columnChart = LocalChartStyle.current.columnChart.copy(
-            columns = LocalChartStyle.current.columnChart.columns.map {
-                lineComponent(
-                    color = Color.DimmedGray,
-                    thickness = it.thicknessDp.dp,
-                    shape = it.shape,
-                    dynamicShader = it.dynamicShader,
-                    margins = it.margins,
-                )
-            },
-        ),
-    )
+    val chartStyle =
+        LocalChartStyle.current.copy(
+            axis =
+                LocalChartStyle.current.axis.copy(
+                    axisLabelColor = Color.DimmedGray,
+                    axisLineColor = Color.DimmedGray,
+                    axisTickColor = Color.DimmedGray,
+                    axisGuidelineColor = Color.DimmedGray,
+                ),
+            columnChart =
+                LocalChartStyle.current.columnChart.copy(
+                    columns =
+                        LocalChartStyle.current.columnChart.columns.map {
+                            lineComponent(
+                                color = Color.DimmedGray,
+                                thickness = it.thicknessDp.dp,
+                                shape = it.shape,
+                                dynamicShader = it.dynamicShader,
+                                margins = it.margins,
+                            )
+                        },
+                ),
+        )
     Surface(
         color = Color.Transparent,
-        modifier = Modifier
-            .background(color = Color.LightGray, shape = RoundedCornerShape(size = 4.dp))
-            .padding(8.dp),
+        modifier =
+            Modifier
+                .background(color = Color.LightGray, shape = RoundedCornerShape(size = 4.dp))
+                .padding(8.dp),
     ) {
         CompositionLocalProvider(LocalChartStyle provides chartStyle, content = content)
     }
@@ -85,15 +90,16 @@ public fun ThresholdLine() {
     ProvidePreviewChartStyle {
         Chart(
             modifier = Modifier,
-            chart = columnChart().apply {
-                addDecoration(
-                    ThresholdLine(
-                        thresholdValue = 2f,
-                        lineComponent = shapeComponent(color = Color.Black),
-                        labelComponent = textComponent(Color.Black, padding = dimensionsOf(horizontal = 8.dp)),
-                    ),
-                )
-            },
+            chart =
+                columnChart().apply {
+                    addDecoration(
+                        ThresholdLine(
+                            thresholdValue = 2f,
+                            lineComponent = shapeComponent(color = Color.Black),
+                            labelComponent = textComponent(Color.Black, padding = dimensionsOf(horizontal = 8.dp)),
+                        ),
+                    )
+                },
             model = model,
             startAxis = rememberStartAxis(),
             bottomAxis = rememberBottomAxis(),
@@ -108,53 +114,64 @@ public fun ThresholdLineWithCustomText() {
     ProvidePreviewChartStyle {
         Chart(
             modifier = Modifier,
-            chart = columnChart().apply {
-                addDecoration(
-                    ThresholdLine(
-                        thresholdValue = 2f,
-                        thresholdLabel = "Threshold line 1 📐",
-                        lineComponent = shapeComponent(color = Color.Black),
-                        labelComponent = textComponent(
-                            color = Color.White,
-                            lineCount = 3,
-                            background = shapeComponent(
-                                shape = Shapes.roundedCornerShape(bottomLeftPercent = 25, bottomRightPercent = 25),
-                                color = Color.Black,
-                            ),
-                            padding = dimensionsOf(
-                                start = 8.dp,
-                                top = 2.dp,
-                                end = 8.dp,
-                                bottom = 4.dp,
-                            ),
-                            margins = dimensionsOf(horizontal = 4.dp),
+            chart =
+                columnChart().apply {
+                    addDecoration(
+                        ThresholdLine(
+                            thresholdValue = 2f,
+                            thresholdLabel = "Threshold line 1 📐",
+                            lineComponent = shapeComponent(color = Color.Black),
+                            labelComponent =
+                                textComponent(
+                                    color = Color.White,
+                                    lineCount = 3,
+                                    background =
+                                        shapeComponent(
+                                            shape =
+                                                Shapes.roundedCornerShape(
+                                                    bottomLeftPercent = 25,
+                                                    bottomRightPercent = 25,
+                                                ),
+                                            color = Color.Black,
+                                        ),
+                                    padding =
+                                        dimensionsOf(
+                                            start = 8.dp,
+                                            top = 2.dp,
+                                            end = 8.dp,
+                                            bottom = 4.dp,
+                                        ),
+                                    margins = dimensionsOf(horizontal = 4.dp),
+                                ),
+                            labelVerticalPosition = ThresholdLine.LabelVerticalPosition.Bottom,
                         ),
-                        labelVerticalPosition = ThresholdLine.LabelVerticalPosition.Bottom,
-                    ),
-                )
-                addDecoration(
-                    ThresholdLine(
-                        thresholdValue = 3f,
-                        thresholdLabel = "Threshold line 2 📐",
-                        lineComponent = shapeComponent(color = Color.DarkGray),
-                        labelComponent = textComponent(
-                            color = Color.White,
-                            lineCount = 3,
-                            background = shapeComponent(
-                                shape = Shapes.cutCornerShape(topLeftPercent = 25, topRightPercent = 25),
-                                color = Color.DarkGray,
-                            ),
-                            padding = dimensionsOf(
-                                start = 8.dp,
-                                top = 4.dp,
-                                end = 8.dp,
-                                bottom = 2.dp,
-                            ),
-                            margins = dimensionsOf(horizontal = 4.dp),
+                    )
+                    addDecoration(
+                        ThresholdLine(
+                            thresholdValue = 3f,
+                            thresholdLabel = "Threshold line 2 📐",
+                            lineComponent = shapeComponent(color = Color.DarkGray),
+                            labelComponent =
+                                textComponent(
+                                    color = Color.White,
+                                    lineCount = 3,
+                                    background =
+                                        shapeComponent(
+                                            shape = Shapes.cutCornerShape(topLeftPercent = 25, topRightPercent = 25),
+                                            color = Color.DarkGray,
+                                        ),
+                                    padding =
+                                        dimensionsOf(
+                                            start = 8.dp,
+                                            top = 4.dp,
+                                            end = 8.dp,
+                                            bottom = 2.dp,
+                                        ),
+                                    margins = dimensionsOf(horizontal = 4.dp),
+                                ),
                         ),
-                    ),
-                )
-            },
+                    )
+                },
             model = model,
             startAxis = rememberStartAxis(),
             bottomAxis = rememberBottomAxis(),
@@ -169,15 +186,20 @@ public fun RangedThresholdLine() {
     ProvidePreviewChartStyle {
         Chart(
             modifier = Modifier,
-            chart = columnChart().apply {
-                addDecoration(
-                    ThresholdLine(
-                        thresholdRange = 2f..3f,
-                        lineComponent = shapeComponent(color = Color.Black.copy(alpha = 0.5f)),
-                        labelComponent = textComponent(color = Color.Black, padding = dimensionsOf(horizontal = 8.dp)),
-                    ),
-                )
-            },
+            chart =
+                columnChart().apply {
+                    addDecoration(
+                        ThresholdLine(
+                            thresholdRange = 2f..3f,
+                            lineComponent = shapeComponent(color = Color.Black.copy(alpha = 0.5f)),
+                            labelComponent =
+                                textComponent(
+                                    color = Color.Black,
+                                    padding = dimensionsOf(horizontal = 8.dp),
+                                ),
+                        ),
+                    )
+                },
             model = model,
             startAxis = rememberStartAxis(),
             bottomAxis = rememberBottomAxis(),
@@ -192,23 +214,31 @@ public fun RangedThresholdLineWithBrushShader() {
     ProvidePreviewChartStyle {
         Chart(
             modifier = Modifier,
-            chart = columnChart().apply {
-                addDecoration(
-                    ThresholdLine(
-                        thresholdRange = 2f..3f,
-                        lineComponent = shapeComponent(
-                            color = Color.Black,
-                            dynamicShader = Brush.verticalGradient(
-                                colors = listOf(
-                                    Color.Black.copy(0.75f),
-                                    Color.Black.copy(0.25f),
+            chart =
+                columnChart().apply {
+                    addDecoration(
+                        ThresholdLine(
+                            thresholdRange = 2f..3f,
+                            lineComponent =
+                                shapeComponent(
+                                    color = Color.Black,
+                                    dynamicShader =
+                                        Brush.verticalGradient(
+                                            colors =
+                                                listOf(
+                                                    Color.Black.copy(0.75f),
+                                                    Color.Black.copy(0.25f),
+                                                ),
+                                        ).toDynamicShader(),
+                                ),
+                            labelComponent =
+                                textComponent(
+                                    color = Color.Black,
+                                    padding = dimensionsOf(horizontal = 8.dp),
                                 ),
-                            ).toDynamicShader(),
                         ),
-                        labelComponent = textComponent(color = Color.Black, padding = dimensionsOf(horizontal = 8.dp)),
-                    ),
-                )
-            },
+                    )
+                },
             model = model,
             startAxis = rememberStartAxis(),
             bottomAxis = rememberBottomAxis(),
@@ -223,23 +253,30 @@ public fun RangedThresholdLineWithComponentShader() {
     ProvidePreviewChartStyle {
         Chart(
             modifier = Modifier,
-            chart = columnChart().apply {
-                addDecoration(
-                    ThresholdLine(
-                        thresholdRange = 2f..3f,
-                        lineComponent = shapeComponent(
-                            color = Color.Black,
-                            dynamicShader = ComponentShader(
-                                shapeComponent(shape = Shapes.pillShape, color = Color.Black),
-                                componentSizeDp = 4f,
-                            ),
-                            strokeWidth = 2.dp,
-                            strokeColor = Color.Black,
+            chart =
+                columnChart().apply {
+                    addDecoration(
+                        ThresholdLine(
+                            thresholdRange = 2f..3f,
+                            lineComponent =
+                                shapeComponent(
+                                    color = Color.Black,
+                                    dynamicShader =
+                                        ComponentShader(
+                                            shapeComponent(shape = Shapes.pillShape, color = Color.Black),
+                                            componentSizeDp = 4f,
+                                        ),
+                                    strokeWidth = 2.dp,
+                                    strokeColor = Color.Black,
+                                ),
+                            labelComponent =
+                                textComponent(
+                                    color = Color.Black,
+                                    padding = dimensionsOf(horizontal = 8.dp),
+                                ),
                         ),
-                        labelComponent = textComponent(color = Color.Black, padding = dimensionsOf(horizontal = 8.dp)),
-                    ),
-                )
-            },
+                    )
+                },
             model = model,
             startAxis = rememberStartAxis(),
             bottomAxis = rememberBottomAxis(),
diff --git a/sample/src/main/java/com/patrykandpatrick/vico/sample/previews/composables/column/ColumnCharts.kt b/sample/src/main/java/com/patrykandpatrick/vico/sample/previews/composables/column/ColumnCharts.kt
index 6e3015af3..c2f22f1b7 100644
--- a/sample/src/main/java/com/patrykandpatrick/vico/sample/previews/composables/column/ColumnCharts.kt
+++ b/sample/src/main/java/com/patrykandpatrick/vico/sample/previews/composables/column/ColumnCharts.kt
@@ -46,11 +46,12 @@ public fun DefaultColumnChart(
             oldModel = oldModel,
             startAxis = rememberStartAxis(),
             bottomAxis = rememberBottomAxis(),
-            chartScrollSpec = rememberChartScrollSpec(
-                isScrollEnabled = scrollable,
-                initialScroll = initialScroll,
-                autoScrollCondition = autoScrollCondition,
-            ),
+            chartScrollSpec =
+                rememberChartScrollSpec(
+                    isScrollEnabled = scrollable,
+                    initialScroll = initialScroll,
+                    autoScrollCondition = autoScrollCondition,
+                ),
         )
     }
 }
diff --git a/sample/src/main/java/com/patrykandpatrick/vico/sample/showcase/ChartStyle.kt b/sample/src/main/java/com/patrykandpatrick/vico/sample/showcase/ChartStyle.kt
index ef22255b3..6f84e962b 100644
--- a/sample/src/main/java/com/patrykandpatrick/vico/sample/showcase/ChartStyle.kt
+++ b/sample/src/main/java/com/patrykandpatrick/vico/sample/showcase/ChartStyle.kt
@@ -33,7 +33,10 @@ import com.patrykandpatrick.vico.core.component.shape.Shapes
 import com.patrykandpatrick.vico.core.component.shape.shader.DynamicShaders
 
 @Composable
-internal fun rememberChartStyle(columnChartColors: List<Color>, lineChartColors: List<Color>): ChartStyle {
+internal fun rememberChartStyle(
+    columnChartColors: List<Color>,
+    lineChartColors: List<Color>,
+): ChartStyle {
     val isSystemInDarkTheme = isSystemInDarkTheme()
     return remember(columnChartColors, lineChartColors, isSystemInDarkTheme) {
         val defaultColors = if (isSystemInDarkTheme) DefaultColors.Dark else DefaultColors.Light
@@ -56,14 +59,15 @@ internal fun rememberChartStyle(columnChartColors: List<Color>, lineChartColors:
                 lineChartColors.map { lineChartColor ->
                     LineChart.LineSpec(
                         lineColor = lineChartColor.toArgb(),
-                        lineBackgroundShader = DynamicShaders.fromBrush(
-                            Brush.verticalGradient(
-                                listOf(
-                                    lineChartColor.copy(DefaultAlpha.LINE_BACKGROUND_SHADER_START),
-                                    lineChartColor.copy(DefaultAlpha.LINE_BACKGROUND_SHADER_END),
+                        lineBackgroundShader =
+                            DynamicShaders.fromBrush(
+                                Brush.verticalGradient(
+                                    listOf(
+                                        lineChartColor.copy(DefaultAlpha.LINE_BACKGROUND_SHADER_START),
+                                        lineChartColor.copy(DefaultAlpha.LINE_BACKGROUND_SHADER_END),
+                                    ),
                                 ),
                             ),
-                        ),
                     )
                 },
             ),
diff --git a/sample/src/main/java/com/patrykandpatrick/vico/sample/showcase/Marker.kt b/sample/src/main/java/com/patrykandpatrick/vico/sample/showcase/Marker.kt
index 508261a5d..bec0ac776 100644
--- a/sample/src/main/java/com/patrykandpatrick/vico/sample/showcase/Marker.kt
+++ b/sample/src/main/java/com/patrykandpatrick/vico/sample/showcase/Marker.kt
@@ -43,36 +43,41 @@ import com.patrykandpatrick.vico.core.marker.Marker
 @Composable
 internal fun rememberMarker(): Marker {
     val labelBackgroundColor = MaterialTheme.colorScheme.surface
-    val labelBackground = remember(labelBackgroundColor) {
-        ShapeComponent(labelBackgroundShape, labelBackgroundColor.toArgb()).setShadow(
-            radius = LABEL_BACKGROUND_SHADOW_RADIUS,
-            dy = LABEL_BACKGROUND_SHADOW_DY,
-            applyElevationOverlay = true,
+    val labelBackground =
+        remember(labelBackgroundColor) {
+            ShapeComponent(labelBackgroundShape, labelBackgroundColor.toArgb()).setShadow(
+                radius = LABEL_BACKGROUND_SHADOW_RADIUS,
+                dy = LABEL_BACKGROUND_SHADOW_DY,
+                applyElevationOverlay = true,
+            )
+        }
+    val label =
+        textComponent(
+            background = labelBackground,
+            lineCount = LABEL_LINE_COUNT,
+            padding = labelPadding,
+            typeface = Typeface.MONOSPACE,
         )
-    }
-    val label = textComponent(
-        background = labelBackground,
-        lineCount = LABEL_LINE_COUNT,
-        padding = labelPadding,
-        typeface = Typeface.MONOSPACE,
-    )
     val indicatorInnerComponent = shapeComponent(Shapes.pillShape, MaterialTheme.colorScheme.surface)
     val indicatorCenterComponent = shapeComponent(Shapes.pillShape, Color.White)
     val indicatorOuterComponent = shapeComponent(Shapes.pillShape, Color.White)
-    val indicator = overlayingComponent(
-        outer = indicatorOuterComponent,
-        inner = overlayingComponent(
-            outer = indicatorCenterComponent,
-            inner = indicatorInnerComponent,
-            innerPaddingAll = indicatorInnerAndCenterComponentPaddingValue,
-        ),
-        innerPaddingAll = indicatorCenterAndOuterComponentPaddingValue,
-    )
-    val guideline = lineComponent(
-        MaterialTheme.colorScheme.onSurface.copy(GUIDELINE_ALPHA),
-        guidelineThickness,
-        guidelineShape,
-    )
+    val indicator =
+        overlayingComponent(
+            outer = indicatorOuterComponent,
+            inner =
+                overlayingComponent(
+                    outer = indicatorCenterComponent,
+                    inner = indicatorInnerComponent,
+                    innerPaddingAll = indicatorInnerAndCenterComponentPaddingValue,
+                ),
+            innerPaddingAll = indicatorCenterAndOuterComponentPaddingValue,
+        )
+    val guideline =
+        lineComponent(
+            MaterialTheme.colorScheme.onSurface.copy(GUIDELINE_ALPHA),
+            guidelineThickness,
+            guidelineShape,
+        )
     return remember(label, indicator, guideline) {
         object : MarkerComponent(label, indicator, guideline) {
             init {
diff --git a/sample/src/main/java/com/patrykandpatrick/vico/sample/showcase/ShowcaseScreen.kt b/sample/src/main/java/com/patrykandpatrick/vico/sample/showcase/ShowcaseScreen.kt
index db24809f5..77dc9fb3e 100644
--- a/sample/src/main/java/com/patrykandpatrick/vico/sample/showcase/ShowcaseScreen.kt
+++ b/sample/src/main/java/com/patrykandpatrick/vico/sample/showcase/ShowcaseScreen.kt
@@ -76,10 +76,11 @@ internal fun ShowcaseScreen(viewModel: ShowcaseViewModel = viewModel()) {
     ) { paddingValues ->
         Crossfade(viewModel.uiSystem) { uiSystem ->
             LazyColumn(
-                state = when (uiSystem) {
-                    UISystem.Compose -> composeShowcaseState
-                    UISystem.Views -> viewShowcaseState
-                },
+                state =
+                    when (uiSystem) {
+                        UISystem.Compose -> composeShowcaseState
+                        UISystem.Views -> viewShowcaseState
+                    },
                 contentPadding = paddingValues + PaddingValues(padding),
                 verticalArrangement = Arrangement.spacedBy(padding),
             ) {
@@ -89,7 +90,10 @@ internal fun ShowcaseScreen(viewModel: ShowcaseViewModel = viewModel()) {
     }
 }
 
-private fun LazyListScope.chartItems(uiSystem: UISystem, viewModel: ShowcaseViewModel) {
+private fun LazyListScope.chartItems(
+    uiSystem: UISystem,
+    viewModel: ShowcaseViewModel,
+) {
     cardItem { Chart9(uiSystem, viewModel.positiveAndNegativeChartEntryModelProducer) }
     cardItem { Chart1(uiSystem, viewModel.customStepChartEntryModelProducer) }
     cardItem { Chart2(uiSystem, viewModel.chartEntryModelProducer) }
diff --git a/sample/src/main/java/com/patrykandpatrick/vico/sample/showcase/ShowcaseViewModel.kt b/sample/src/main/java/com/patrykandpatrick/vico/sample/showcase/ShowcaseViewModel.kt
index 21eae0e0f..00077bdae 100644
--- a/sample/src/main/java/com/patrykandpatrick/vico/sample/showcase/ShowcaseViewModel.kt
+++ b/sample/src/main/java/com/patrykandpatrick/vico/sample/showcase/ShowcaseViewModel.kt
@@ -30,21 +30,23 @@ import kotlinx.coroutines.isActive
 import kotlinx.coroutines.launch
 
 internal class ShowcaseViewModel : ViewModel() {
+    private val generator =
+        RandomEntriesGenerator(
+            xRange = 0..GENERATOR_X_RANGE_TOP,
+            yRange = GENERATOR_Y_RANGE_BOTTOM..GENERATOR_Y_RANGE_TOP,
+        )
 
-    private val generator = RandomEntriesGenerator(
-        xRange = 0..GENERATOR_X_RANGE_TOP,
-        yRange = GENERATOR_Y_RANGE_BOTTOM..GENERATOR_Y_RANGE_TOP,
-    )
+    private val customStepGenerator =
+        RandomEntriesGenerator(
+            xRange = IntProgression.fromClosedRange(rangeStart = 0, rangeEnd = GENERATOR_X_RANGE_TOP, step = 2),
+            yRange = GENERATOR_Y_RANGE_BOTTOM..GENERATOR_Y_RANGE_TOP,
+        )
 
-    private val customStepGenerator = RandomEntriesGenerator(
-        xRange = IntProgression.fromClosedRange(rangeStart = 0, rangeEnd = GENERATOR_X_RANGE_TOP, step = 2),
-        yRange = GENERATOR_Y_RANGE_BOTTOM..GENERATOR_Y_RANGE_TOP,
-    )
-
-    private val positiveAndNegativeValuesGenerator = RandomEntriesGenerator(
-        xRange = 0..GENERATOR_X_RANGE_TOP,
-        yRange = -10..GENERATOR_Y_RANGE_TOP,
-    )
+    private val positiveAndNegativeValuesGenerator =
+        RandomEntriesGenerator(
+            xRange = 0..GENERATOR_X_RANGE_TOP,
+            yRange = -10..GENERATOR_Y_RANGE_TOP,
+        )
 
     internal val chartEntryModelProducer: ChartEntryModelProducer = ChartEntryModelProducer()
 
diff --git a/sample/src/main/java/com/patrykandpatrick/vico/sample/showcase/UISystem.kt b/sample/src/main/java/com/patrykandpatrick/vico/sample/showcase/UISystem.kt
index 1722c1a08..83e23f210 100644
--- a/sample/src/main/java/com/patrykandpatrick/vico/sample/showcase/UISystem.kt
+++ b/sample/src/main/java/com/patrykandpatrick/vico/sample/showcase/UISystem.kt
@@ -20,7 +20,10 @@ import androidx.annotation.DrawableRes
 import androidx.annotation.StringRes
 import com.patrykandpatrick.vico.R
 
-internal enum class UISystem(@StringRes val labelResourceID: Int, @DrawableRes val iconResourceID: Int) {
+internal enum class UISystem(
+    @StringRes val labelResourceID: Int,
+    @DrawableRes val iconResourceID: Int,
+) {
     Compose(R.string.compose, R.drawable.ic_compose),
     Views(R.string.views, R.drawable.ic_views),
 }
diff --git a/sample/src/main/java/com/patrykandpatrick/vico/sample/showcase/charts/Chart1.kt b/sample/src/main/java/com/patrykandpatrick/vico/sample/showcase/charts/Chart1.kt
index 34e2d997b..15999688d 100644
--- a/sample/src/main/java/com/patrykandpatrick/vico/sample/showcase/charts/Chart1.kt
+++ b/sample/src/main/java/com/patrykandpatrick/vico/sample/showcase/charts/Chart1.kt
@@ -33,7 +33,10 @@ import com.patrykandpatrick.vico.sample.showcase.rememberChartStyle
 import com.patrykandpatrick.vico.sample.showcase.rememberMarker
 
 @Composable
-internal fun Chart1(uiSystem: UISystem, chartEntryModelProducer: ChartEntryModelProducer) {
+internal fun Chart1(
+    uiSystem: UISystem,
+    chartEntryModelProducer: ChartEntryModelProducer,
+) {
     when (uiSystem) {
         UISystem.Compose -> ComposeChart1(chartEntryModelProducer)
         UISystem.Views -> ViewChart1(chartEntryModelProducer)
diff --git a/sample/src/main/java/com/patrykandpatrick/vico/sample/showcase/charts/Chart2.kt b/sample/src/main/java/com/patrykandpatrick/vico/sample/showcase/charts/Chart2.kt
index 77f63b773..e1bc87a44 100644
--- a/sample/src/main/java/com/patrykandpatrick/vico/sample/showcase/charts/Chart2.kt
+++ b/sample/src/main/java/com/patrykandpatrick/vico/sample/showcase/charts/Chart2.kt
@@ -49,7 +49,10 @@ import com.patrykandpatrick.vico.sample.showcase.rememberChartStyle
 import com.patrykandpatrick.vico.sample.showcase.rememberMarker
 
 @Composable
-internal fun Chart2(uiSystem: UISystem, chartEntryModelProducer: ChartEntryModelProducer) {
+internal fun Chart2(
+    uiSystem: UISystem,
+    chartEntryModelProducer: ChartEntryModelProducer,
+) {
     when (uiSystem) {
         UISystem.Compose -> ComposeChart2(chartEntryModelProducer)
         UISystem.Views -> ViewChart2(chartEntryModelProducer)
@@ -62,14 +65,16 @@ private fun ComposeChart2(chartEntryModelProducer: ChartEntryModelProducer) {
     ProvideChartStyle(rememberChartStyle(chartColors)) {
         val defaultColumns = currentChartStyle.columnChart.columns
         Chart(
-            chart = columnChart(
-                columns = remember(defaultColumns) {
-                    defaultColumns.map { defaultColumn ->
-                        LineComponent(defaultColumn.color, COLUMN_WIDTH_DP, defaultColumn.shape)
-                    }
-                },
-                decorations = remember(thresholdLine) { listOf(thresholdLine) },
-            ),
+            chart =
+                columnChart(
+                    columns =
+                        remember(defaultColumns) {
+                            defaultColumns.map { defaultColumn ->
+                                LineComponent(defaultColumn.color, COLUMN_WIDTH_DP, defaultColumn.shape)
+                            }
+                        },
+                    decorations = remember(thresholdLine) { listOf(thresholdLine) },
+                ),
             chartModelProducer = chartEntryModelProducer,
             startAxis = rememberStartAxis(valueFormatter = startAxisValueFormatter, itemPlacer = startAxisItemPlacer),
             bottomAxis = rememberBottomAxis(itemPlacer = bottomAxisItemPlacer),
@@ -102,13 +107,14 @@ private fun ViewChart2(chartEntryModelProducer: ChartEntryModelProducer) {
 @Composable
 private fun rememberThresholdLine(): ThresholdLine {
     val line = shapeComponent(color = color2)
-    val label = textComponent(
-        color = Color.Black,
-        background = shapeComponent(Shapes.pillShape, color2),
-        padding = thresholdLineLabelPadding,
-        margins = thresholdLineLabelMargins,
-        typeface = Typeface.MONOSPACE,
-    )
+    val label =
+        textComponent(
+            color = Color.Black,
+            background = shapeComponent(Shapes.pillShape, color2),
+            padding = thresholdLineLabelPadding,
+            margins = thresholdLineLabelMargins,
+            typeface = Typeface.MONOSPACE,
+        )
     return remember(line, label) {
         ThresholdLine(thresholdValue = THRESHOLD_LINE_VALUE, lineComponent = line, labelComponent = label)
     }
@@ -132,9 +138,10 @@ private val thresholdLineLabelPadding =
     dimensionsOf(thresholdLineLabelHorizontalPaddingValue, thresholdLineLabelVerticalPaddingValue)
 private val thresholdLineLabelMargins = dimensionsOf(thresholdLineLabelMarginValue)
 private val startAxisValueFormatter = PercentageFormatAxisValueFormatter<AxisPosition.Vertical.Start>()
-private val horizontalLayout = HorizontalLayout.FullWidth(
-    scalableStartPaddingDp = DefaultDimens.COLUMN_OUTSIDE_SPACING.half,
-    scalableEndPaddingDp = DefaultDimens.COLUMN_OUTSIDE_SPACING.half,
-)
+private val horizontalLayout =
+    HorizontalLayout.FullWidth(
+        scalableStartPaddingDp = DefaultDimens.COLUMN_OUTSIDE_SPACING.half,
+        scalableEndPaddingDp = DefaultDimens.COLUMN_OUTSIDE_SPACING.half,
+    )
 private val startAxisItemPlacer = AxisItemPlacer.Vertical.default(MAX_START_AXIS_ITEM_COUNT)
 private val bottomAxisItemPlacer = AxisItemPlacer.Horizontal.default(BOTTOM_AXIS_ITEM_SPACING, BOTTOM_AXIS_ITEM_OFFSET)
diff --git a/sample/src/main/java/com/patrykandpatrick/vico/sample/showcase/charts/Chart3.kt b/sample/src/main/java/com/patrykandpatrick/vico/sample/showcase/charts/Chart3.kt
index 9f7b22257..bcbf83e1b 100644
--- a/sample/src/main/java/com/patrykandpatrick/vico/sample/showcase/charts/Chart3.kt
+++ b/sample/src/main/java/com/patrykandpatrick/vico/sample/showcase/charts/Chart3.kt
@@ -45,7 +45,10 @@ import com.patrykandpatrick.vico.sample.showcase.rememberChartStyle
 import com.patrykandpatrick.vico.sample.showcase.rememberMarker
 
 @Composable
-internal fun Chart3(uiSystem: UISystem, chartEntryModelProducer: ChartEntryModelProducer) {
+internal fun Chart3(
+    uiSystem: UISystem,
+    chartEntryModelProducer: ChartEntryModelProducer,
+) {
     when (uiSystem) {
         UISystem.Compose -> ComposeChart3(chartEntryModelProducer)
         UISystem.Views -> ViewChart3(chartEntryModelProducer)
@@ -58,28 +61,32 @@ private fun ComposeChart3(chartEntryModelProducer: ChartEntryModelProducer) {
         Chart(
             chart = lineChart(axisValuesOverrider = axisValueOverrider),
             chartModelProducer = chartEntryModelProducer,
-            startAxis = rememberStartAxis(
-                guideline = null,
-                horizontalLabelPosition = VerticalAxis.HorizontalLabelPosition.Inside,
-                titleComponent = textComponent(
-                    color = Color.Black,
-                    background = shapeComponent(Shapes.pillShape, color1),
-                    padding = axisTitlePadding,
-                    margins = startAxisTitleMargins,
-                    typeface = Typeface.MONOSPACE,
+            startAxis =
+                rememberStartAxis(
+                    guideline = null,
+                    horizontalLabelPosition = VerticalAxis.HorizontalLabelPosition.Inside,
+                    titleComponent =
+                        textComponent(
+                            color = Color.Black,
+                            background = shapeComponent(Shapes.pillShape, color1),
+                            padding = axisTitlePadding,
+                            margins = startAxisTitleMargins,
+                            typeface = Typeface.MONOSPACE,
+                        ),
+                    title = stringResource(R.string.y_axis),
                 ),
-                title = stringResource(R.string.y_axis),
-            ),
-            bottomAxis = rememberBottomAxis(
-                titleComponent = textComponent(
-                    background = shapeComponent(Shapes.pillShape, color2),
-                    color = Color.White,
-                    padding = axisTitlePadding,
-                    margins = bottomAxisTitleMargins,
-                    typeface = Typeface.MONOSPACE,
+            bottomAxis =
+                rememberBottomAxis(
+                    titleComponent =
+                        textComponent(
+                            background = shapeComponent(Shapes.pillShape, color2),
+                            color = Color.White,
+                            padding = axisTitlePadding,
+                            margins = bottomAxisTitleMargins,
+                            typeface = Typeface.MONOSPACE,
+                        ),
+                    title = stringResource(R.string.x_axis),
                 ),
-                title = stringResource(R.string.x_axis),
-            ),
             marker = rememberMarker(),
             runInitialAnimation = false,
             fadingEdges = rememberFadingEdges(),
diff --git a/sample/src/main/java/com/patrykandpatrick/vico/sample/showcase/charts/Chart4.kt b/sample/src/main/java/com/patrykandpatrick/vico/sample/showcase/charts/Chart4.kt
index 0265dc2d8..a3ec02270 100644
--- a/sample/src/main/java/com/patrykandpatrick/vico/sample/showcase/charts/Chart4.kt
+++ b/sample/src/main/java/com/patrykandpatrick/vico/sample/showcase/charts/Chart4.kt
@@ -41,7 +41,10 @@ import com.patrykandpatrick.vico.sample.showcase.rememberChartStyle
 import com.patrykandpatrick.vico.sample.showcase.rememberMarker
 
 @Composable
-internal fun Chart4(uiSystem: UISystem, chartEntryModelProducer: ComposedChartEntryModelProducer) {
+internal fun Chart4(
+    uiSystem: UISystem,
+    chartEntryModelProducer: ComposedChartEntryModelProducer,
+) {
     when (uiSystem) {
         UISystem.Compose -> ComposeChart4(chartEntryModelProducer)
         UISystem.Views -> ViewChart4(chartEntryModelProducer)
@@ -53,22 +56,24 @@ private fun ComposeChart4(chartEntryModelProducer: ComposedChartEntryModelProduc
     ProvideChartStyle(rememberChartStyle(columnChartColors, lineChartColors)) {
         val defaultColumns = currentChartStyle.columnChart.columns
         val defaultLines = currentChartStyle.lineChart.lines
-        val columnChart = columnChart(
-            remember(defaultColumns) {
-                defaultColumns.map { defaultColumn ->
-                    LineComponent(
-                        defaultColumn.color,
-                        defaultColumn.thicknessDp,
-                        Shapes.roundedCornerShape(columnCornerRadius),
-                    )
-                }
-            },
-        )
-        val lineChart = lineChart(
-            remember(defaultLines) {
-                defaultLines.map { defaultLine -> defaultLine.copy(pointConnector = pointConnector) }
-            },
-        )
+        val columnChart =
+            columnChart(
+                remember(defaultColumns) {
+                    defaultColumns.map { defaultColumn ->
+                        LineComponent(
+                            defaultColumn.color,
+                            defaultColumn.thicknessDp,
+                            Shapes.roundedCornerShape(columnCornerRadius),
+                        )
+                    }
+                },
+            )
+        val lineChart =
+            lineChart(
+                remember(defaultLines) {
+                    defaultLines.map { defaultLine -> defaultLine.copy(pointConnector = pointConnector) }
+                },
+            )
         Chart(
             chart = remember(columnChart, lineChart) { columnChart + lineChart },
             chartModelProducer = chartEntryModelProducer,
diff --git a/sample/src/main/java/com/patrykandpatrick/vico/sample/showcase/charts/Chart5.kt b/sample/src/main/java/com/patrykandpatrick/vico/sample/showcase/charts/Chart5.kt
index 26d0e04f4..75602d707 100644
--- a/sample/src/main/java/com/patrykandpatrick/vico/sample/showcase/charts/Chart5.kt
+++ b/sample/src/main/java/com/patrykandpatrick/vico/sample/showcase/charts/Chart5.kt
@@ -39,7 +39,10 @@ import com.patrykandpatrick.vico.sample.showcase.rememberChartStyle
 import com.patrykandpatrick.vico.sample.showcase.rememberMarker
 
 @Composable
-internal fun Chart5(uiSystem: UISystem, chartEntryModelProducer: ChartEntryModelProducer) {
+internal fun Chart5(
+    uiSystem: UISystem,
+    chartEntryModelProducer: ChartEntryModelProducer,
+) {
     when (uiSystem) {
         UISystem.Compose -> ComposeChart5(chartEntryModelProducer)
         UISystem.Views -> ViewChart5(chartEntryModelProducer)
@@ -51,31 +54,35 @@ private fun ComposeChart5(chartEntryModelProducer: ChartEntryModelProducer) {
     ProvideChartStyle(rememberChartStyle(chartColors)) {
         val defaultColumns = currentChartStyle.columnChart.columns
         Chart(
-            chart = columnChart(
-                columns = remember(defaultColumns) {
-                    defaultColumns.mapIndexed { index, defaultColumn ->
-                        val topCornerRadiusPercent =
-                            if (index == defaultColumns.lastIndex) DefaultDimens.COLUMN_ROUNDNESS_PERCENT else 0
-                        val bottomCornerRadiusPercent = if (index == 0) DefaultDimens.COLUMN_ROUNDNESS_PERCENT else 0
-                        LineComponent(
-                            defaultColumn.color,
-                            defaultColumn.thicknessDp,
-                            Shapes.roundedCornerShape(
-                                topCornerRadiusPercent,
-                                topCornerRadiusPercent,
-                                bottomCornerRadiusPercent,
-                                bottomCornerRadiusPercent,
-                            ),
-                        )
-                    }
-                },
-                mergeMode = ColumnChart.MergeMode.Stack,
-            ),
+            chart =
+                columnChart(
+                    columns =
+                        remember(defaultColumns) {
+                            defaultColumns.mapIndexed { index, defaultColumn ->
+                                val topCornerRadiusPercent =
+                                    if (index == defaultColumns.lastIndex) DefaultDimens.COLUMN_ROUNDNESS_PERCENT else 0
+                                val bottomCornerRadiusPercent =
+                                    if (index == 0) DefaultDimens.COLUMN_ROUNDNESS_PERCENT else 0
+                                LineComponent(
+                                    defaultColumn.color,
+                                    defaultColumn.thicknessDp,
+                                    Shapes.roundedCornerShape(
+                                        topCornerRadiusPercent,
+                                        topCornerRadiusPercent,
+                                        bottomCornerRadiusPercent,
+                                        bottomCornerRadiusPercent,
+                                    ),
+                                )
+                            }
+                        },
+                    mergeMode = ColumnChart.MergeMode.Stack,
+                ),
             chartModelProducer = chartEntryModelProducer,
-            startAxis = rememberStartAxis(
-                itemPlacer = startAxisItemPlacer,
-                labelRotationDegrees = AXIS_LABEL_ROTATION_DEGREES,
-            ),
+            startAxis =
+                rememberStartAxis(
+                    itemPlacer = startAxisItemPlacer,
+                    labelRotationDegrees = AXIS_LABEL_ROTATION_DEGREES,
+                ),
             bottomAxis = rememberBottomAxis(labelRotationDegrees = AXIS_LABEL_ROTATION_DEGREES),
             marker = rememberMarker(),
             runInitialAnimation = false,
diff --git a/sample/src/main/java/com/patrykandpatrick/vico/sample/showcase/charts/Chart6.kt b/sample/src/main/java/com/patrykandpatrick/vico/sample/showcase/charts/Chart6.kt
index 4d8add880..abc53e17c 100644
--- a/sample/src/main/java/com/patrykandpatrick/vico/sample/showcase/charts/Chart6.kt
+++ b/sample/src/main/java/com/patrykandpatrick/vico/sample/showcase/charts/Chart6.kt
@@ -45,7 +45,10 @@ import com.patrykandpatrick.vico.sample.showcase.rememberChartStyle
 import com.patrykandpatrick.vico.sample.showcase.rememberMarker
 
 @Composable
-internal fun Chart6(uiSystem: UISystem, chartEntryModelProducer: ChartEntryModelProducer) {
+internal fun Chart6(
+    uiSystem: UISystem,
+    chartEntryModelProducer: ChartEntryModelProducer,
+) {
     when (uiSystem) {
         UISystem.Compose -> ComposeChart6(chartEntryModelProducer)
         UISystem.Views -> ViewChart6(chartEntryModelProducer)
@@ -58,19 +61,21 @@ private fun ComposeChart6(chartEntryModelProducer: ChartEntryModelProducer) {
     ProvideChartStyle(rememberChartStyle(chartColors)) {
         val defaultColumns = currentChartStyle.columnChart.columns
         Chart(
-            chart = columnChart(
-                columns = remember(defaultColumns) {
-                    defaultColumns.map { defaultColumn ->
-                        LineComponent(
-                            defaultColumn.color,
-                            defaultColumn.thicknessDp,
-                            Shapes.cutCornerShape(topLeftPercent = COLUMN_CORNER_CUT_SIZE_PERCENT),
-                        )
-                    }
-                },
-                mergeMode = ColumnChart.MergeMode.Grouped,
-                decorations = remember(thresholdLine) { listOf(thresholdLine) },
-            ),
+            chart =
+                columnChart(
+                    columns =
+                        remember(defaultColumns) {
+                            defaultColumns.map { defaultColumn ->
+                                LineComponent(
+                                    defaultColumn.color,
+                                    defaultColumn.thicknessDp,
+                                    Shapes.cutCornerShape(topLeftPercent = COLUMN_CORNER_CUT_SIZE_PERCENT),
+                                )
+                            }
+                        },
+                    mergeMode = ColumnChart.MergeMode.Grouped,
+                    decorations = remember(thresholdLine) { listOf(thresholdLine) },
+                ),
             chartModelProducer = chartEntryModelProducer,
             startAxis = rememberStartAxis(),
             bottomAxis = rememberBottomAxis(valueFormatter = bottomAxisValueFormatter),
@@ -98,13 +103,14 @@ private fun ViewChart6(chartEntryModelProducer: ChartEntryModelProducer) {
 
 @Composable
 private fun rememberThresholdLine(): ThresholdLine {
-    val label = textComponent(
-        color = Color.Black,
-        background = shapeComponent(Shapes.rectShape, color4),
-        padding = thresholdLineLabelPadding,
-        margins = thresholdLineLabelMargins,
-        typeface = Typeface.MONOSPACE,
-    )
+    val label =
+        textComponent(
+            color = Color.Black,
+            background = shapeComponent(Shapes.rectShape, color4),
+            padding = thresholdLineLabelPadding,
+            margins = thresholdLineLabelMargins,
+            typeface = Typeface.MONOSPACE,
+        )
     val line = shapeComponent(color = thresholdLineColor)
     return remember(label, line) {
         ThresholdLine(thresholdRange = thresholdLineValueRange, labelComponent = label, lineComponent = line)
diff --git a/sample/src/main/java/com/patrykandpatrick/vico/sample/showcase/charts/Chart7.kt b/sample/src/main/java/com/patrykandpatrick/vico/sample/showcase/charts/Chart7.kt
index 5f4035d2f..3054f75d1 100644
--- a/sample/src/main/java/com/patrykandpatrick/vico/sample/showcase/charts/Chart7.kt
+++ b/sample/src/main/java/com/patrykandpatrick/vico/sample/showcase/charts/Chart7.kt
@@ -48,7 +48,10 @@ import com.patrykandpatrick.vico.sample.showcase.rememberChartStyle
 import com.patrykandpatrick.vico.sample.showcase.rememberMarker
 
 @Composable
-internal fun Chart7(uiSystem: UISystem, chartEntryModelProducer: ChartEntryModelProducer) {
+internal fun Chart7(
+    uiSystem: UISystem,
+    chartEntryModelProducer: ChartEntryModelProducer,
+) {
     when (uiSystem) {
         UISystem.Compose -> ComposeChart7(chartEntryModelProducer)
         UISystem.Views -> ViewChart7(chartEntryModelProducer)
@@ -60,16 +63,18 @@ private fun ComposeChart7(chartEntryModelProducer: ChartEntryModelProducer) {
     ProvideChartStyle(rememberChartStyle(chartColors)) {
         val defaultLines = currentChartStyle.lineChart.lines
         Chart(
-            chart = lineChart(
-                remember(defaultLines) {
-                    defaultLines.map { defaultLine -> defaultLine.copy(lineBackgroundFill = null) }
-                },
-            ),
+            chart =
+                lineChart(
+                    remember(defaultLines) {
+                        defaultLines.map { defaultLine -> defaultLine.copy(lineBackgroundFill = null) }
+                    },
+                ),
             chartModelProducer = chartEntryModelProducer,
-            startAxis = rememberStartAxis(
-                label = rememberStartAxisLabel(),
-                horizontalLabelPosition = VerticalAxis.HorizontalLabelPosition.Inside,
-            ),
+            startAxis =
+                rememberStartAxis(
+                    label = rememberStartAxisLabel(),
+                    horizontalLabelPosition = VerticalAxis.HorizontalLabelPosition.Inside,
+                ),
             bottomAxis = rememberBottomAxis(),
             marker = rememberMarker(),
             legend = rememberLegend(),
@@ -96,33 +101,37 @@ private fun ViewChart7(chartEntryModelProducer: ChartEntryModelProducer) {
 }
 
 @Composable
-private fun rememberStartAxisLabel() = axisLabelComponent(
-    color = Color.Black,
-    verticalPadding = startAxisLabelVerticalPaddingValue,
-    horizontalPadding = startAxisLabelHorizontalPaddingValue,
-    verticalMargin = startAxisLabelMarginValue,
-    horizontalMargin = startAxisLabelMarginValue,
-    background = shapeComponent(Shapes.roundedCornerShape(startAxisLabelBackgroundCornerRadius), color4),
-)
+private fun rememberStartAxisLabel() =
+    axisLabelComponent(
+        color = Color.Black,
+        verticalPadding = startAxisLabelVerticalPaddingValue,
+        horizontalPadding = startAxisLabelHorizontalPaddingValue,
+        verticalMargin = startAxisLabelMarginValue,
+        horizontalMargin = startAxisLabelMarginValue,
+        background = shapeComponent(Shapes.roundedCornerShape(startAxisLabelBackgroundCornerRadius), color4),
+    )
 
 @Composable
-private fun rememberLegend() = verticalLegend(
-    items = chartColors.mapIndexed { index, chartColor ->
-        legendItem(
-            icon = shapeComponent(Shapes.pillShape, chartColor),
-            label = textComponent(
-                color = currentChartStyle.axis.axisLabelColor,
-                textSize = legendItemLabelTextSize,
-                typeface = Typeface.MONOSPACE,
-            ),
-            labelText = stringResource(R.string.data_set_x, index + 1),
-        )
-    },
-    iconSize = legendItemIconSize,
-    iconPadding = legendItemIconPaddingValue,
-    spacing = legendItemSpacing,
-    padding = legendPadding,
-)
+private fun rememberLegend() =
+    verticalLegend(
+        items =
+            chartColors.mapIndexed { index, chartColor ->
+                legendItem(
+                    icon = shapeComponent(Shapes.pillShape, chartColor),
+                    label =
+                        textComponent(
+                            color = currentChartStyle.axis.axisLabelColor,
+                            textSize = legendItemLabelTextSize,
+                            typeface = Typeface.MONOSPACE,
+                        ),
+                    labelText = stringResource(R.string.data_set_x, index + 1),
+                )
+            },
+        iconSize = legendItemIconSize,
+        iconPadding = legendItemIconPaddingValue,
+        spacing = legendItemSpacing,
+        padding = legendPadding,
+    )
 
 private const val COLOR_1_CODE = 0xffb983ff
 private const val COLOR_2_CODE = 0xff91b1fd
diff --git a/sample/src/main/java/com/patrykandpatrick/vico/sample/showcase/charts/Chart8.kt b/sample/src/main/java/com/patrykandpatrick/vico/sample/showcase/charts/Chart8.kt
index 062e631dc..a72d6dccd 100644
--- a/sample/src/main/java/com/patrykandpatrick/vico/sample/showcase/charts/Chart8.kt
+++ b/sample/src/main/java/com/patrykandpatrick/vico/sample/showcase/charts/Chart8.kt
@@ -39,7 +39,10 @@ import com.patrykandpatrick.vico.sample.showcase.rememberChartStyle
 import com.patrykandpatrick.vico.sample.showcase.rememberMarker
 
 @Composable
-internal fun Chart8(uiSystem: UISystem, chartEntryModelProducer: ComposedChartEntryModelProducer) {
+internal fun Chart8(
+    uiSystem: UISystem,
+    chartEntryModelProducer: ComposedChartEntryModelProducer,
+) {
     when (uiSystem) {
         UISystem.Compose -> ComposeChart8(chartEntryModelProducer)
         UISystem.Views -> ViewChart8(chartEntryModelProducer)
@@ -49,10 +52,11 @@ internal fun Chart8(uiSystem: UISystem, chartEntryModelProducer: ComposedChartEn
 @Composable
 private fun ComposeChart8(chartEntryModelProducer: ComposedChartEntryModelProducer) {
     ProvideChartStyle(rememberChartStyle(columnChartColors, lineChartColors)) {
-        val columnChart = columnChart(
-            mergeMode = ColumnChart.MergeMode.Stack,
-            targetVerticalAxisPosition = AxisPosition.Vertical.Start,
-        )
+        val columnChart =
+            columnChart(
+                mergeMode = ColumnChart.MergeMode.Stack,
+                targetVerticalAxisPosition = AxisPosition.Vertical.Start,
+            )
         val lineChart = lineChart(targetVerticalAxisPosition = AxisPosition.Vertical.End)
         Chart(
             chart = remember(columnChart, lineChart) { columnChart + lineChart },
diff --git a/sample/src/main/java/com/patrykandpatrick/vico/sample/showcase/charts/Chart9.kt b/sample/src/main/java/com/patrykandpatrick/vico/sample/showcase/charts/Chart9.kt
index e61e652b9..c78dee52b 100644
--- a/sample/src/main/java/com/patrykandpatrick/vico/sample/showcase/charts/Chart9.kt
+++ b/sample/src/main/java/com/patrykandpatrick/vico/sample/showcase/charts/Chart9.kt
@@ -57,7 +57,10 @@ import com.patrykandpatrick.vico.sample.showcase.rememberChartStyle
 import com.patrykandpatrick.vico.sample.showcase.rememberMarker
 
 @Composable
-internal fun Chart9(uiSystem: UISystem, chartEntryModelProducer: ChartEntryModelProducer) {
+internal fun Chart9(
+    uiSystem: UISystem,
+    chartEntryModelProducer: ChartEntryModelProducer,
+) {
     when (uiSystem) {
         UISystem.Compose -> ComposeChart9(chartEntryModelProducer)
         UISystem.Views -> ViewChart9(chartEntryModelProducer)
@@ -69,74 +72,86 @@ private fun ComposeChart9(chartEntryModelProducer: ChartEntryModelProducer) {
     val marker = rememberMarker()
     ProvideChartStyle(rememberChartStyle(chartColors)) {
         Chart(
-            chart = lineChart(
-                lines = listOf(
-                    lineSpec(
-                        lineShader = DynamicShaders.split(chartColors[0], chartColors[1]),
-                        lineBackgroundShader = DynamicShaders.splitShader(
-                            DynamicShaders.composeShader(
-                                DynamicShaders.fromComponent(
-                                    componentSize = 6.dp,
-                                    component = shapeComponent(
-                                        shape = Shapes.pillShape,
-                                        color = chartColors[0],
-                                        margins = remember { dimensionsOf(1.dp) },
-                                    ),
-                                ),
-                                verticalGradient(arrayOf(Color.Black, Color.Transparent)),
-                                PorterDuff.Mode.DST_IN,
-                            ),
-                            DynamicShaders.composeShader(
-                                DynamicShaders.fromComponent(
-                                    componentSize = 5.dp,
-                                    component = shapeComponent(
-                                        shape = Shapes.rectShape,
-                                        color = chartColors[1],
-                                        margins = remember { dimensionsOf(horizontal = 2.dp) },
+            chart =
+                lineChart(
+                    lines =
+                        listOf(
+                            lineSpec(
+                                lineShader = DynamicShaders.split(chartColors[0], chartColors[1]),
+                                lineBackgroundShader =
+                                    DynamicShaders.splitShader(
+                                        DynamicShaders.composeShader(
+                                            DynamicShaders.fromComponent(
+                                                componentSize = 6.dp,
+                                                component =
+                                                    shapeComponent(
+                                                        shape = Shapes.pillShape,
+                                                        color = chartColors[0],
+                                                        margins = remember { dimensionsOf(1.dp) },
+                                                    ),
+                                            ),
+                                            verticalGradient(arrayOf(Color.Black, Color.Transparent)),
+                                            PorterDuff.Mode.DST_IN,
+                                        ),
+                                        DynamicShaders.composeShader(
+                                            DynamicShaders.fromComponent(
+                                                componentSize = 5.dp,
+                                                component =
+                                                    shapeComponent(
+                                                        shape = Shapes.rectShape,
+                                                        color = chartColors[1],
+                                                        margins = remember { dimensionsOf(horizontal = 2.dp) },
+                                                    ),
+                                                checkeredArrangement = false,
+                                            ),
+                                            verticalGradient(arrayOf(Color.Transparent, Color.Black)),
+                                            PorterDuff.Mode.DST_IN,
+                                        ),
                                     ),
-                                    checkeredArrangement = false,
-                                ),
-                                verticalGradient(arrayOf(Color.Transparent, Color.Black)),
-                                PorterDuff.Mode.DST_IN,
                             ),
                         ),
-                    ),
                 ),
-            ),
             chartModelProducer = chartEntryModelProducer,
-            startAxis = rememberStartAxis(
-                label = axisLabelComponent(
-                    color = MaterialTheme.colorScheme.onBackground,
-                    background = shapeComponent(
-                        shape = Shapes.pillShape,
-                        color = MaterialTheme.colorScheme.background,
-                        strokeColor = MaterialTheme.colorScheme.outlineVariant,
-                        strokeWidth = 1.dp,
-                    ),
-                    padding = remember { dimensionsOf(horizontal = 6.dp, vertical = 2.dp) },
-                    margins = remember { dimensionsOf(end = 8.dp) },
-                ),
-                axis = null,
-                tick = null,
-                guideline = lineComponent(
-                    thickness = 1.dp,
-                    color = MaterialTheme.colorScheme.outlineVariant,
-                    shape = remember {
-                        Shapes.dashedShape(
-                            shape = Shapes.pillShape,
-                            dashLength = 4.dp,
-                            gapLength = 8.dp,
-                        )
-                    },
+            startAxis =
+                rememberStartAxis(
+                    label =
+                        axisLabelComponent(
+                            color = MaterialTheme.colorScheme.onBackground,
+                            background =
+                                shapeComponent(
+                                    shape = Shapes.pillShape,
+                                    color = MaterialTheme.colorScheme.background,
+                                    strokeColor = MaterialTheme.colorScheme.outlineVariant,
+                                    strokeWidth = 1.dp,
+                                ),
+                            padding = remember { dimensionsOf(horizontal = 6.dp, vertical = 2.dp) },
+                            margins = remember { dimensionsOf(end = 8.dp) },
+                        ),
+                    axis = null,
+                    tick = null,
+                    guideline =
+                        lineComponent(
+                            thickness = 1.dp,
+                            color = MaterialTheme.colorScheme.outlineVariant,
+                            shape =
+                                remember {
+                                    Shapes.dashedShape(
+                                        shape = Shapes.pillShape,
+                                        dashLength = 4.dp,
+                                        gapLength = 8.dp,
+                                    )
+                                },
+                        ),
+                    itemPlacer = remember { AxisItemPlacer.Vertical.default(maxItemCount = 4) },
                 ),
-                itemPlacer = remember { AxisItemPlacer.Vertical.default(maxItemCount = 4) },
-            ),
-            bottomAxis = rememberBottomAxis(
-                guideline = null,
-                itemPlacer = AxisItemPlacer.Horizontal.default(
-                    spacing = 3,
+            bottomAxis =
+                rememberBottomAxis(
+                    guideline = null,
+                    itemPlacer =
+                        AxisItemPlacer.Horizontal.default(
+                            spacing = 3,
+                        ),
                 ),
-            ),
             marker = marker,
             runInitialAnimation = false,
             horizontalLayout = HorizontalLayout.fullWidth(),
@@ -155,38 +170,42 @@ private fun ViewChart9(chartEntryModelProducer: ChartEntryModelProducer) {
             (bottomAxis as Axis).guideline = null
             this.marker = marker
             with(chart as LineChart) {
-                lines = listOf(
-                    LineChart.LineSpec(
-                        lineShader = DynamicShaders.split(colors[0], colors[1]),
-                        lineBackgroundShader = DynamicShaders.splitShader(
-                            DynamicShaders.composeShader(
-                                DynamicShaders.fromComponent(
-                                    componentSize = 6.dp,
-                                    component = ShapeComponent(
-                                        shape = Shapes.pillShape,
-                                        color = colors[0].toArgb(),
-                                        margins = dimensionsOf(1.dp),
+                lines =
+                    listOf(
+                        LineChart.LineSpec(
+                            lineShader = DynamicShaders.split(colors[0], colors[1]),
+                            lineBackgroundShader =
+                                DynamicShaders.splitShader(
+                                    DynamicShaders.composeShader(
+                                        DynamicShaders.fromComponent(
+                                            componentSize = 6.dp,
+                                            component =
+                                                ShapeComponent(
+                                                    shape = Shapes.pillShape,
+                                                    color = colors[0].toArgb(),
+                                                    margins = dimensionsOf(1.dp),
+                                                ),
+                                        ),
+                                        verticalGradient(arrayOf(Color.Black, Color.Transparent)),
+                                        PorterDuff.Mode.DST_IN,
                                     ),
-                                ),
-                                verticalGradient(arrayOf(Color.Black, Color.Transparent)),
-                                PorterDuff.Mode.DST_IN,
-                            ),
-                            DynamicShaders.composeShader(
-                                DynamicShaders.fromComponent(
-                                    componentSize = 5.dp,
-                                    component = ShapeComponent(
-                                        shape = Shapes.rectShape,
-                                        color = colors[1].toArgb(),
-                                        margins = dimensionsOf(horizontal = 2.dp),
+                                    DynamicShaders.composeShader(
+                                        DynamicShaders.fromComponent(
+                                            componentSize = 5.dp,
+                                            component =
+                                                ShapeComponent(
+                                                    shape = Shapes.rectShape,
+                                                    color = colors[1].toArgb(),
+                                                    margins = dimensionsOf(horizontal = 2.dp),
+                                                ),
+                                            checkeredArrangement = false,
+                                        ),
+                                        verticalGradient(arrayOf(Color.Transparent, Color.Black)),
+                                        PorterDuff.Mode.DST_IN,
                                     ),
-                                    checkeredArrangement = false,
                                 ),
-                                verticalGradient(arrayOf(Color.Transparent, Color.Black)),
-                                PorterDuff.Mode.DST_IN,
-                            ),
                         ),
-                    ),
-                )
+                    )
             }
         }
     }
@@ -195,7 +214,8 @@ private fun ViewChart9(chartEntryModelProducer: ChartEntryModelProducer) {
 private val chartColors
     @ReadOnlyComposable
     @Composable
-    get() = listOf(
-        colorResource(id = R.color.chart_9_color_positive),
-        colorResource(id = R.color.chart_9_color_negative),
-    )
+    get() =
+        listOf(
+            colorResource(id = R.color.chart_9_color_positive),
+            colorResource(id = R.color.chart_9_color_negative),
+        )
diff --git a/sample/src/main/java/com/patrykandpatrick/vico/sample/utils/PaddingValues.kt b/sample/src/main/java/com/patrykandpatrick/vico/sample/utils/PaddingValues.kt
index d275a9929..14ace0f81 100644
--- a/sample/src/main/java/com/patrykandpatrick/vico/sample/utils/PaddingValues.kt
+++ b/sample/src/main/java/com/patrykandpatrick/vico/sample/utils/PaddingValues.kt
@@ -19,14 +19,15 @@ package com.patrykandpatrick.vico.sample.utils
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.ui.unit.LayoutDirection
 
-internal operator fun PaddingValues.plus(other: PaddingValues) = object : PaddingValues {
-    override fun calculateLeftPadding(layoutDirection: LayoutDirection) =
-        this@plus.calculateLeftPadding(layoutDirection) + other.calculateLeftPadding(layoutDirection)
+internal operator fun PaddingValues.plus(other: PaddingValues) =
+    object : PaddingValues {
+        override fun calculateLeftPadding(layoutDirection: LayoutDirection) =
+            this@plus.calculateLeftPadding(layoutDirection) + other.calculateLeftPadding(layoutDirection)
 
-    override fun calculateTopPadding() = this@plus.calculateTopPadding() + other.calculateTopPadding()
+        override fun calculateTopPadding() = this@plus.calculateTopPadding() + other.calculateTopPadding()
 
-    override fun calculateRightPadding(layoutDirection: LayoutDirection) =
-        this@plus.calculateRightPadding(layoutDirection) + other.calculateRightPadding(layoutDirection)
+        override fun calculateRightPadding(layoutDirection: LayoutDirection) =
+            this@plus.calculateRightPadding(layoutDirection) + other.calculateRightPadding(layoutDirection)
 
-    override fun calculateBottomPadding() = this@plus.calculateBottomPadding() + other.calculateBottomPadding()
-}
+        override fun calculateBottomPadding() = this@plus.calculateBottomPadding() + other.calculateBottomPadding()
+    }
diff --git a/sample/src/main/java/com/patrykandpatrick/vico/sample/utils/VicoTheme.kt b/sample/src/main/java/com/patrykandpatrick/vico/sample/utils/VicoTheme.kt
index df72fb89a..7d72a5a1c 100644
--- a/sample/src/main/java/com/patrykandpatrick/vico/sample/utils/VicoTheme.kt
+++ b/sample/src/main/java/com/patrykandpatrick/vico/sample/utils/VicoTheme.kt
@@ -26,14 +26,16 @@ import androidx.compose.ui.graphics.Color
 
 @Composable
 fun VicoTheme(content: @Composable () -> Unit) {
-    val darkColorScheme = darkColorScheme(
-        surface = Color(color = DARK_SURFACE),
-        background = Color.Black,
-    )
-    val lightColorScheme = lightColorScheme(
-        surface = Color.White,
-        background = Color(color = LIGHT_BACKGROUND),
-    )
+    val darkColorScheme =
+        darkColorScheme(
+            surface = Color(color = DARK_SURFACE),
+            background = Color.Black,
+        )
+    val lightColorScheme =
+        lightColorScheme(
+            surface = Color.White,
+            background = Color(color = LIGHT_BACKGROUND),
+        )
     MaterialTheme(
         colorScheme = if (isSystemInDarkTheme()) darkColorScheme else lightColorScheme,
         typography = Typography(),
diff --git a/sample/src/test/kotlin/com/patrykandpatrick/vico/sample/PaparazziTest.kt b/sample/src/test/kotlin/com/patrykandpatrick/vico/sample/PaparazziTest.kt
index 1c05aa2ed..97aa4d70f 100644
--- a/sample/src/test/kotlin/com/patrykandpatrick/vico/sample/PaparazziTest.kt
+++ b/sample/src/test/kotlin/com/patrykandpatrick/vico/sample/PaparazziTest.kt
@@ -32,17 +32,17 @@ import org.junit.Rule
 import org.junit.Test
 
 public class PaparazziTest {
-
-    private val defaultCharts = listOf<Pair<String, @Composable () -> Unit>>(
-        "LineChart" to { DefaultLineChart() },
-        "LineChart Long Scrollable" to { DefaultLineChartLongScrollable() },
-        "LineChart Long Scrollable with initial scroll end" to { DefaultLineChartLongScrollableEnd() },
-        "LineChart Long Not Scrollable" to { DefaultLineChartLongNonScrollable() },
-        "ColumnChart" to { DefaultColumnChart() },
-        "ColumnChart Long Scrollable" to { DefaultColumnChartLongScrollable() },
-        "ColumnChart Long Scrollable with initial scroll end" to { DefaultColumnChartLongScrollableEnd() },
-        "ColumnChart Long Not Scrollable" to { DefaultColumnChartLongNonScrollable() },
-    )
+    private val defaultCharts =
+        listOf<Pair<String, @Composable () -> Unit>>(
+            "LineChart" to { DefaultLineChart() },
+            "LineChart Long Scrollable" to { DefaultLineChartLongScrollable() },
+            "LineChart Long Scrollable with initial scroll end" to { DefaultLineChartLongScrollableEnd() },
+            "LineChart Long Not Scrollable" to { DefaultLineChartLongNonScrollable() },
+            "ColumnChart" to { DefaultColumnChart() },
+            "ColumnChart Long Scrollable" to { DefaultColumnChartLongScrollable() },
+            "ColumnChart Long Scrollable with initial scroll end" to { DefaultColumnChartLongScrollableEnd() },
+            "ColumnChart Long Not Scrollable" to { DefaultColumnChartLongNonScrollable() },
+        )
 
     @get:Rule
     public val paparazzi: Paparazzi = Paparazzi(deviceConfig = lightConfig)
diff --git a/vico/compose-m2/src/main/java/com/patrykandpatrick/vico/compose/m2/style/M2ChartStyle.kt b/vico/compose-m2/src/main/java/com/patrykandpatrick/vico/compose/m2/style/M2ChartStyle.kt
index 5dfaec5db..5ca177716 100644
--- a/vico/compose-m2/src/main/java/com/patrykandpatrick/vico/compose/m2/style/M2ChartStyle.kt
+++ b/vico/compose-m2/src/main/java/com/patrykandpatrick/vico/compose/m2/style/M2ChartStyle.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 by Patryk Goworowski and Patrick Michalik.
+ * Copyright 2023 by Patryk Goworowski and Patrick Michalik.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -32,25 +32,27 @@ public fun m2ChartStyle(
     axisLabelColor: Color = MaterialTheme.colors.onBackground,
     axisGuidelineColor: Color = MaterialTheme.colors.onBackground.copy(alpha = LINE_ALPHA),
     axisLineColor: Color = MaterialTheme.colors.onBackground.copy(alpha = LINE_ALPHA),
-    entityColors: List<Color> = listOf(
-        MaterialTheme.colors.primary,
-        MaterialTheme.colors.secondary,
-    ),
+    entityColors: List<Color> =
+        listOf(
+            MaterialTheme.colors.primary,
+            MaterialTheme.colors.secondary,
+        ),
     elevationOverlayColor: Color = if (isSystemInDarkTheme()) MaterialTheme.colors.onBackground else Color.Transparent,
-): ChartStyle = remember(
-    axisLabelColor,
-    axisGuidelineColor,
-    axisLineColor,
-    entityColors,
-    elevationOverlayColor,
-) {
-    ChartStyle.fromColors(
-        axisLabelColor = axisLabelColor,
-        axisGuidelineColor = axisGuidelineColor,
-        axisLineColor = axisLineColor,
-        entityColors = entityColors,
-        elevationOverlayColor = elevationOverlayColor,
-    )
-}
+): ChartStyle =
+    remember(
+        axisLabelColor,
+        axisGuidelineColor,
+        axisLineColor,
+        entityColors,
+        elevationOverlayColor,
+    ) {
+        ChartStyle.fromColors(
+            axisLabelColor = axisLabelColor,
+            axisGuidelineColor = axisGuidelineColor,
+            axisLineColor = axisLineColor,
+            entityColors = entityColors,
+            elevationOverlayColor = elevationOverlayColor,
+        )
+    }
 
 private const val LINE_ALPHA = 0.2f
diff --git a/vico/compose-m3/src/main/java/com/patrykandpatrick/vico/compose/m3/style/M3ChartStyle.kt b/vico/compose-m3/src/main/java/com/patrykandpatrick/vico/compose/m3/style/M3ChartStyle.kt
index 42be13689..d62aec59a 100644
--- a/vico/compose-m3/src/main/java/com/patrykandpatrick/vico/compose/m3/style/M3ChartStyle.kt
+++ b/vico/compose-m3/src/main/java/com/patrykandpatrick/vico/compose/m3/style/M3ChartStyle.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 by Patryk Goworowski and Patrick Michalik.
+ * Copyright 2023 by Patryk Goworowski and Patrick Michalik.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -31,24 +31,26 @@ public fun m3ChartStyle(
     axisLabelColor: Color = MaterialTheme.colorScheme.onBackground,
     axisGuidelineColor: Color = MaterialTheme.colorScheme.outline,
     axisLineColor: Color = MaterialTheme.colorScheme.outline,
-    entityColors: List<Color> = listOf(
-        MaterialTheme.colorScheme.primary,
-        MaterialTheme.colorScheme.secondary,
-        MaterialTheme.colorScheme.tertiary,
-    ),
+    entityColors: List<Color> =
+        listOf(
+            MaterialTheme.colorScheme.primary,
+            MaterialTheme.colorScheme.secondary,
+            MaterialTheme.colorScheme.tertiary,
+        ),
     elevationOverlayColor: Color = MaterialTheme.colorScheme.primary,
-): ChartStyle = remember(
-    axisLabelColor,
-    axisGuidelineColor,
-    axisLineColor,
-    entityColors,
-    elevationOverlayColor,
-) {
-    ChartStyle.fromColors(
-        axisLabelColor = axisLabelColor,
-        axisGuidelineColor = axisGuidelineColor,
-        axisLineColor = axisLineColor,
-        entityColors = entityColors,
-        elevationOverlayColor = elevationOverlayColor,
-    )
-}
+): ChartStyle =
+    remember(
+        axisLabelColor,
+        axisGuidelineColor,
+        axisLineColor,
+        entityColors,
+        elevationOverlayColor,
+    ) {
+        ChartStyle.fromColors(
+            axisLabelColor = axisLabelColor,
+            axisGuidelineColor = axisGuidelineColor,
+            axisLineColor = axisLineColor,
+            entityColors = entityColors,
+            elevationOverlayColor = elevationOverlayColor,
+        )
+    }
diff --git a/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/axis/AxisComponents.kt b/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/axis/AxisComponents.kt
index 20a044640..bedc0b797 100644
--- a/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/axis/AxisComponents.kt
+++ b/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/axis/AxisComponents.kt
@@ -71,17 +71,18 @@ public fun axisLabelComponent(
     horizontalMargin: Dp = currentChartStyle.axis.axisLabelHorizontalMargin,
     typeface: Typeface = currentChartStyle.axis.axisLabelTypeface,
     textAlignment: Layout.Alignment = currentChartStyle.axis.axisLabelTextAlignment,
-): TextComponent = textComponent(
-    color,
-    textSize,
-    background,
-    ellipsize,
-    lineCount,
-    dimensionsOf(horizontalPadding, verticalPadding),
-    dimensionsOf(horizontalMargin, verticalMargin),
-    typeface,
-    textAlignment,
-)
+): TextComponent =
+    textComponent(
+        color,
+        textSize,
+        background,
+        ellipsize,
+        lineCount,
+        dimensionsOf(horizontalPadding, verticalPadding),
+        dimensionsOf(horizontalMargin, verticalMargin),
+        typeface,
+        textAlignment,
+    )
 
 /**
  * Creates a [TextComponent] to be used for axis labels.
@@ -103,27 +104,30 @@ public fun axisLabelComponent(
     background: ShapeComponent? = currentChartStyle.axis.axisLabelBackground,
     ellipsize: TextUtils.TruncateAt = TextUtils.TruncateAt.END,
     lineCount: Int = currentChartStyle.axis.axisLabelLineCount,
-    padding: MutableDimensions = dimensionsOf(
-        horizontal = currentChartStyle.axis.axisLabelHorizontalPadding,
-        vertical = currentChartStyle.axis.axisLabelVerticalPadding,
-    ),
-    margins: MutableDimensions = dimensionsOf(
-        horizontal = currentChartStyle.axis.axisLabelHorizontalMargin,
-        vertical = currentChartStyle.axis.axisLabelVerticalMargin,
-    ),
+    padding: MutableDimensions =
+        dimensionsOf(
+            horizontal = currentChartStyle.axis.axisLabelHorizontalPadding,
+            vertical = currentChartStyle.axis.axisLabelVerticalPadding,
+        ),
+    margins: MutableDimensions =
+        dimensionsOf(
+            horizontal = currentChartStyle.axis.axisLabelHorizontalMargin,
+            vertical = currentChartStyle.axis.axisLabelVerticalMargin,
+        ),
     typeface: Typeface = currentChartStyle.axis.axisLabelTypeface,
     textAlignment: Layout.Alignment = currentChartStyle.axis.axisLabelTextAlignment,
-): TextComponent = textComponent(
-    color,
-    textSize,
-    background,
-    ellipsize,
-    lineCount,
-    padding,
-    margins,
-    typeface,
-    textAlignment,
-)
+): TextComponent =
+    textComponent(
+        color,
+        textSize,
+        background,
+        ellipsize,
+        lineCount,
+        padding,
+        margins,
+        typeface,
+        textAlignment,
+    )
 
 /**
  * Creates a [LineComponent] styled as an axis line.
@@ -145,15 +149,16 @@ public fun axisLineComponent(
     strokeColor: Color = Color.Transparent,
     dynamicShader: DynamicShader? = null,
     margins: Dimensions = emptyDimensions(),
-): LineComponent = lineComponent(
-    color = color,
-    thickness = thickness,
-    dynamicShader = dynamicShader,
-    shape = shape,
-    margins = margins,
-    strokeWidth = strokeWidth,
-    strokeColor = strokeColor,
-)
+): LineComponent =
+    lineComponent(
+        color = color,
+        thickness = thickness,
+        dynamicShader = dynamicShader,
+        shape = shape,
+        margins = margins,
+        strokeWidth = strokeWidth,
+        strokeColor = strokeColor,
+    )
 
 /**
  * Creates a [LineComponent] styled as an axis line.
@@ -175,15 +180,16 @@ public fun axisLineComponent(
     strokeColor: Color = Color.Transparent,
     brush: Brush? = null,
     margins: Dimensions = emptyDimensions(),
-): LineComponent = lineComponent(
-    color = color,
-    thickness = thickness,
-    dynamicShader = brush?.let(::BrushShader),
-    shape = shape,
-    margins = margins,
-    strokeWidth = strokeWidth,
-    strokeColor = strokeColor,
-)
+): LineComponent =
+    lineComponent(
+        color = color,
+        thickness = thickness,
+        dynamicShader = brush?.let(::BrushShader),
+        shape = shape,
+        margins = margins,
+        strokeWidth = strokeWidth,
+        strokeColor = strokeColor,
+    )
 
 /**
  * Creates a [LineComponent] styled as a tick line.
@@ -203,14 +209,15 @@ public fun axisTickComponent(
     strokeWidth: Dp = 0.dp,
     strokeColor: Color = Color.Transparent,
     dynamicShader: DynamicShader? = null,
-): LineComponent = lineComponent(
-    color = color,
-    thickness = thickness,
-    dynamicShader = dynamicShader,
-    shape = shape,
-    strokeWidth = strokeWidth,
-    strokeColor = strokeColor,
-)
+): LineComponent =
+    lineComponent(
+        color = color,
+        thickness = thickness,
+        dynamicShader = dynamicShader,
+        shape = shape,
+        strokeWidth = strokeWidth,
+        strokeColor = strokeColor,
+    )
 
 /**
  * Creates a [LineComponent] styled as a tick line.
@@ -230,14 +237,15 @@ public fun axisTickComponent(
     strokeWidth: Dp = 0.dp,
     strokeColor: Color = Color.Transparent,
     brush: Brush? = null,
-): LineComponent = lineComponent(
-    color = color,
-    thickness = thickness,
-    dynamicShader = brush?.let(::BrushShader),
-    shape = shape.chartShape(),
-    strokeWidth = strokeWidth,
-    strokeColor = strokeColor,
-)
+): LineComponent =
+    lineComponent(
+        color = color,
+        thickness = thickness,
+        dynamicShader = brush?.let(::BrushShader),
+        shape = shape.chartShape(),
+        strokeWidth = strokeWidth,
+        strokeColor = strokeColor,
+    )
 
 /**
  * Creates an axis guideline.
@@ -259,12 +267,13 @@ public fun axisGuidelineComponent(
     strokeColor: Color = Color.Transparent,
     dynamicShader: DynamicShader? = null,
     margins: Dimensions = emptyDimensions(),
-): LineComponent = lineComponent(
-    color = color,
-    thickness = thickness,
-    dynamicShader = dynamicShader,
-    shape = shape,
-    margins = margins,
-    strokeWidth = strokeWidth,
-    strokeColor = strokeColor,
-)
+): LineComponent =
+    lineComponent(
+        color = color,
+        thickness = thickness,
+        dynamicShader = dynamicShader,
+        shape = shape,
+        margins = margins,
+        strokeWidth = strokeWidth,
+        strokeColor = strokeColor,
+    )
diff --git a/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/axis/vertical/VerticalAxis.kt b/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/axis/vertical/VerticalAxis.kt
index aa9215176..77948388a 100644
--- a/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/axis/vertical/VerticalAxis.kt
+++ b/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/axis/vertical/VerticalAxis.kt
@@ -66,21 +66,22 @@ public fun rememberStartAxis(
     labelRotationDegrees: Float = currentChartStyle.axis.axisLabelRotationDegrees,
     titleComponent: TextComponent? = null,
     title: CharSequence? = null,
-): VerticalAxis<AxisPosition.Vertical.Start> = remember { createVerticalAxis<AxisPosition.Vertical.Start>() }.apply {
-    this.label = label
-    axisLine = axis
-    this.tick = tick
-    this.guideline = guideline
-    this.valueFormatter = valueFormatter
-    tickLengthDp = tickLength.value
-    this.sizeConstraint = sizeConstraint
-    this.horizontalLabelPosition = horizontalLabelPosition
-    this.verticalLabelPosition = verticalLabelPosition
-    this.itemPlacer = itemPlacer
-    this.labelRotationDegrees = labelRotationDegrees
-    this.titleComponent = titleComponent
-    this.title = title
-}
+): VerticalAxis<AxisPosition.Vertical.Start> =
+    remember { createVerticalAxis<AxisPosition.Vertical.Start>() }.apply {
+        this.label = label
+        axisLine = axis
+        this.tick = tick
+        this.guideline = guideline
+        this.valueFormatter = valueFormatter
+        tickLengthDp = tickLength.value
+        this.sizeConstraint = sizeConstraint
+        this.horizontalLabelPosition = horizontalLabelPosition
+        this.verticalLabelPosition = verticalLabelPosition
+        this.itemPlacer = itemPlacer
+        this.labelRotationDegrees = labelRotationDegrees
+        this.titleComponent = titleComponent
+        this.title = title
+    }
 
 /**
  * Creates and remembers an end axis (i.e., a [VerticalAxis] with [AxisPosition.Vertical.End]).
@@ -114,18 +115,19 @@ public fun rememberEndAxis(
     labelRotationDegrees: Float = currentChartStyle.axis.axisLabelRotationDegrees,
     titleComponent: TextComponent? = null,
     title: CharSequence? = null,
-): VerticalAxis<AxisPosition.Vertical.End> = remember { createVerticalAxis<AxisPosition.Vertical.End>() }.apply {
-    this.label = label
-    axisLine = axis
-    this.tick = tick
-    this.guideline = guideline
-    this.valueFormatter = valueFormatter
-    tickLengthDp = tickLength.value
-    this.sizeConstraint = sizeConstraint
-    this.horizontalLabelPosition = horizontalLabelPosition
-    this.verticalLabelPosition = verticalLabelPosition
-    this.itemPlacer = itemPlacer
-    this.labelRotationDegrees = labelRotationDegrees
-    this.titleComponent = titleComponent
-    this.title = title
-}
+): VerticalAxis<AxisPosition.Vertical.End> =
+    remember { createVerticalAxis<AxisPosition.Vertical.End>() }.apply {
+        this.label = label
+        axisLine = axis
+        this.tick = tick
+        this.guideline = guideline
+        this.valueFormatter = valueFormatter
+        tickLengthDp = tickLength.value
+        this.sizeConstraint = sizeConstraint
+        this.horizontalLabelPosition = horizontalLabelPosition
+        this.verticalLabelPosition = verticalLabelPosition
+        this.itemPlacer = itemPlacer
+        this.labelRotationDegrees = labelRotationDegrees
+        this.titleComponent = titleComponent
+        this.title = title
+    }
diff --git a/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/chart/Charts.kt b/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/chart/Charts.kt
index 1e5b796a5..cdef84178 100644
--- a/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/chart/Charts.kt
+++ b/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/chart/Charts.kt
@@ -250,7 +250,6 @@ public fun <Model : ChartEntryModel> Chart(
     }
 }
 
-@Suppress("LongMethod")
 @Composable
 internal fun <Model : ChartEntryModel> ChartImpl(
     chart: Chart<Model>,
@@ -276,13 +275,14 @@ internal fun <Model : ChartEntryModel> ChartImpl(
     val markerTouchPoint = remember { mutableStateOf<Point?>(null) }
     val zoom = remember { mutableFloatStateOf(0f) }
     val wasZoomOverridden = remember { mutableStateOf(false) }
-    val measureContext = getMeasureContext(
-        chartScrollSpec.isScrollEnabled,
-        bounds,
-        horizontalLayout,
-        with(LocalContext.current) { ::spToPx },
-        chartValuesProvider,
-    )
+    val measureContext =
+        getMeasureContext(
+            chartScrollSpec.isScrollEnabled,
+            bounds,
+            horizontalLayout,
+            with(LocalContext.current) { ::spToPx },
+            chartValuesProvider,
+        )
     val scrollListener = rememberScrollListener(markerTouchPoint)
     val lastMarkerEntryModels = remember { mutableStateOf(emptyList<Marker.EntryModel>()) }
 
@@ -296,27 +296,30 @@ internal fun <Model : ChartEntryModel> ChartImpl(
     var previousModelID by remember { ValueWrapper(model.id) }
     val horizontalDimensions = remember { MutableHorizontalDimensions() }
 
-    val onZoom = rememberZoomState(
-        zoom = zoom,
-        wasZoomOverridden = wasZoomOverridden,
-        getScroll = { chartScrollState.value },
-        scrollBy = { value -> coroutineScope.launch { chartScrollState.scrollBy(value) } },
-        chartBounds = chart.bounds,
-    )
+    val onZoom =
+        rememberZoomState(
+            zoom = zoom,
+            wasZoomOverridden = wasZoomOverridden,
+            getScroll = { chartScrollState.value },
+            scrollBy = { value -> coroutineScope.launch { chartScrollState.scrollBy(value) } },
+            chartBounds = chart.bounds,
+        )
 
     Canvas(
-        modifier = Modifier
-            .fillMaxSize()
-            .chartTouchEvent(
-                setTouchPoint = remember(marker == null) {
-                    markerTouchPoint
-                        .component2()
-                        .takeIf { marker != null }
-                },
-                isScrollEnabled = chartScrollSpec.isScrollEnabled,
-                scrollableState = chartScrollState,
-                onZoom = onZoom.takeIf { isZoomEnabled },
-            ),
+        modifier =
+            Modifier
+                .fillMaxSize()
+                .chartTouchEvent(
+                    setTouchPoint =
+                        remember(marker == null) {
+                            markerTouchPoint
+                                .component2()
+                                .takeIf { marker != null }
+                        },
+                    isScrollEnabled = chartScrollSpec.isScrollEnabled,
+                    scrollableState = chartScrollState,
+                    onZoom = onZoom.takeIf { isZoomEnabled },
+                ),
     ) {
         bounds.set(left = 0, top = 0, right = size.width, bottom = size.height)
 
@@ -350,11 +353,12 @@ internal fun <Model : ChartEntryModel> ChartImpl(
             if (chartScrollSpec.isScrollEnabled) zoom.floatValue = finalZoom
         }
 
-        chartScrollState.maxValue = measureContext.getMaxScrollDistance(
-            chartWidth = chart.bounds.width(),
-            horizontalDimensions = horizontalDimensions,
-            zoom = finalZoom,
-        )
+        chartScrollState.maxValue =
+            measureContext.getMaxScrollDistance(
+                chartWidth = chart.bounds.width(),
+                horizontalDimensions = horizontalDimensions,
+                zoom = finalZoom,
+            )
 
         if (model.id != previousModelID) {
             coroutineScope.launch { chartScrollSpec.performAutoScroll(model, oldModel, chartScrollState) }
@@ -363,16 +367,17 @@ internal fun <Model : ChartEntryModel> ChartImpl(
 
         chartScrollState.handleInitialScroll(initialScroll = chartScrollSpec.initialScroll)
 
-        val chartDrawContext = chartDrawContext(
-            canvas = drawContext.canvas.nativeCanvas,
-            elevationOverlayColor = elevationOverlayColor,
-            measureContext = measureContext,
-            markerTouchPoint = markerTouchPoint.value,
-            horizontalDimensions = horizontalDimensions,
-            chartBounds = chart.bounds,
-            horizontalScroll = chartScrollState.value,
-            zoom = finalZoom,
-        )
+        val chartDrawContext =
+            chartDrawContext(
+                canvas = drawContext.canvas.nativeCanvas,
+                elevationOverlayColor = elevationOverlayColor,
+                measureContext = measureContext,
+                markerTouchPoint = markerTouchPoint.value,
+                horizontalDimensions = horizontalDimensions,
+                chartBounds = chart.bounds,
+                horizontalScroll = chartScrollState.value,
+                zoom = finalZoom,
+            )
 
         val count = if (fadingEdges != null) chartDrawContext.saveLayer() else -1
 
@@ -417,21 +422,25 @@ internal fun ChartBox(
 }
 
 @Composable
-internal fun rememberScrollListener(touchPoint: MutableState<Point?>): ScrollListener = remember {
-    object : ScrollListener {
-        override fun onValueChanged(oldValue: Float, newValue: Float) {
-            touchPoint.value?.let { point ->
-                touchPoint.value = point.copy(x = point.x + oldValue - newValue)
+internal fun rememberScrollListener(touchPoint: MutableState<Point?>): ScrollListener =
+    remember {
+        object : ScrollListener {
+            override fun onValueChanged(
+                oldValue: Float,
+                newValue: Float,
+            ) {
+                touchPoint.value?.let { point ->
+                    touchPoint.value = point.copy(x = point.x + oldValue - newValue)
+                }
             }
-        }
 
-        override fun onScrollNotConsumed(delta: Float) {
-            touchPoint.value?.let { point ->
-                touchPoint.value = point.copy(x = point.x - delta)
+            override fun onScrollNotConsumed(delta: Float) {
+                touchPoint.value?.let { point ->
+                    touchPoint.value = point.copy(x = point.x - delta)
+                }
             }
         }
     }
-}
 
 @Composable
 internal fun rememberZoomState(
@@ -440,14 +449,15 @@ internal fun rememberZoomState(
     getScroll: () -> Float,
     scrollBy: (value: Float) -> Unit,
     chartBounds: RectF,
-): OnZoom = remember {
-    onZoom@{ centroid, zoomChange ->
-        val newZoom = zoom.floatValue * zoomChange
-        if (newZoom !in DEF_MIN_ZOOM..DEF_MAX_ZOOM) return@onZoom
-        val transformationAxisX = getScroll() + centroid.x - chartBounds.left
-        val zoomedTransformationAxisX = transformationAxisX * zoomChange
-        zoom.floatValue = newZoom
-        scrollBy(zoomedTransformationAxisX - transformationAxisX)
-        wasZoomOverridden.value = true
+): OnZoom =
+    remember {
+        onZoom@{ centroid, zoomChange ->
+            val newZoom = zoom.floatValue * zoomChange
+            if (newZoom !in DEF_MIN_ZOOM..DEF_MAX_ZOOM) return@onZoom
+            val transformationAxisX = getScroll() + centroid.x - chartBounds.left
+            val zoomedTransformationAxisX = transformationAxisX * zoomChange
+            zoom.floatValue = newZoom
+            scrollBy(zoomedTransformationAxisX - transformationAxisX)
+            wasZoomOverridden.value = true
+        }
     }
-}
diff --git a/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/chart/column/ColumnChart.kt b/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/chart/column/ColumnChart.kt
index b55bec4b4..55b268901 100644
--- a/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/chart/column/ColumnChart.kt
+++ b/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/chart/column/ColumnChart.kt
@@ -78,18 +78,19 @@ public fun columnChart(
     axisValuesOverrider: AxisValuesOverrider<ChartEntryModel>? = null,
     drawingModelInterpolator: DrawingModelInterpolator<ColumnChartDrawingModel.ColumnInfo, ColumnChartDrawingModel> =
         remember { DefaultDrawingModelInterpolator() },
-): ColumnChart = remember { ColumnChart() }.apply {
-    this.columns = columns
-    this.spacingDp = spacing.value
-    this.innerSpacingDp = innerSpacing.value
-    this.mergeMode = mergeMode
-    this.dataLabel = dataLabel
-    this.dataLabelVerticalPosition = dataLabelVerticalPosition
-    this.dataLabelValueFormatter = dataLabelValueFormatter
-    this.dataLabelRotationDegrees = dataLabelRotationDegrees
-    this.axisValuesOverrider = axisValuesOverrider
-    this.targetVerticalAxisPosition = targetVerticalAxisPosition
-    this.drawingModelInterpolator = drawingModelInterpolator
-    decorations?.also(::setDecorations)
-    persistentMarkers?.also(::setPersistentMarkers)
-}
+): ColumnChart =
+    remember { ColumnChart() }.apply {
+        this.columns = columns
+        this.spacingDp = spacing.value
+        this.innerSpacingDp = innerSpacing.value
+        this.mergeMode = mergeMode
+        this.dataLabel = dataLabel
+        this.dataLabelVerticalPosition = dataLabelVerticalPosition
+        this.dataLabelValueFormatter = dataLabelValueFormatter
+        this.dataLabelRotationDegrees = dataLabelRotationDegrees
+        this.axisValuesOverrider = axisValuesOverrider
+        this.targetVerticalAxisPosition = targetVerticalAxisPosition
+        this.drawingModelInterpolator = drawingModelInterpolator
+        decorations?.also(::setDecorations)
+        persistentMarkers?.also(::setPersistentMarkers)
+    }
diff --git a/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/chart/edges/FadingEdgesExtensions.kt b/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/chart/edges/FadingEdgesExtensions.kt
index 25b07fa88..20a6d481a 100644
--- a/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/chart/edges/FadingEdgesExtensions.kt
+++ b/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/chart/edges/FadingEdgesExtensions.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 by Patryk Goworowski and Patrick Michalik.
+ * Copyright 2023 by Patryk Goworowski and Patrick Michalik.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -42,11 +42,12 @@ public fun FadingEdges(
     endEdgeWidth: Dp = startEdgeWidth,
     visibilityThreshold: Dp = FadingEdgesDefaults.visibilityThreshold,
     visibilityEasing: Easing = FadingEdgesDefaults.visibilityEasing,
-): FadingEdges = FadingEdges(
-    startEdgeWidthDp = startEdgeWidth.value,
-    endEdgeWidthDp = endEdgeWidth.value,
-    visibilityThresholdDp = visibilityThreshold.value,
-) { input -> visibilityEasing.transform(input) }
+): FadingEdges =
+    FadingEdges(
+        startEdgeWidthDp = startEdgeWidth.value,
+        endEdgeWidthDp = endEdgeWidth.value,
+        visibilityThresholdDp = visibilityThreshold.value,
+    ) { input -> visibilityEasing.transform(input) }
 
 /**
  * Creates and remembers a [FadingEdges] instance.
@@ -65,13 +66,14 @@ public fun rememberFadingEdges(
     endEdgeWidth: Dp = startEdgeWidth,
     visibilityThreshold: Dp = FadingEdgesDefaults.visibilityThreshold,
     visibilityEasing: Easing = FadingEdgesDefaults.visibilityEasing,
-): FadingEdges = remember { FadingEdges() }
-    .apply {
-        startEdgeWidthDp = startEdgeWidth.value
-        endEdgeWidthDp = endEdgeWidth.value
-        visibilityThresholdDp = visibilityThreshold.value
-        this.visibilityInterpolator = remember(visibilityEasing) { TimeInterpolator(visibilityEasing::transform) }
-    }
+): FadingEdges =
+    remember { FadingEdges() }
+        .apply {
+            startEdgeWidthDp = startEdgeWidth.value
+            endEdgeWidthDp = endEdgeWidth.value
+            visibilityThresholdDp = visibilityThreshold.value
+            this.visibilityInterpolator = remember(visibilityEasing) { TimeInterpolator(visibilityEasing::transform) }
+        }
 
 /**
  * Creates and remembers a [FadingEdges] instance.
@@ -88,18 +90,18 @@ public fun rememberFadingEdges(
     edgeWidth: Dp = FadingEdgesDefaults.edgeWidth,
     visibilityThreshold: Dp = FadingEdgesDefaults.visibilityThreshold,
     visibilityEasing: Easing = FadingEdgesDefaults.visibilityEasing,
-): FadingEdges = rememberFadingEdges(
-    startEdgeWidth = edgeWidth,
-    endEdgeWidth = edgeWidth,
-    visibilityThreshold = visibilityThreshold,
-    visibilityEasing = visibilityEasing,
-)
+): FadingEdges =
+    rememberFadingEdges(
+        startEdgeWidth = edgeWidth,
+        endEdgeWidth = edgeWidth,
+        visibilityThreshold = visibilityThreshold,
+        visibilityEasing = visibilityEasing,
+    )
 
 /**
  * The default values for [FadingEdges].
  */
 public object FadingEdgesDefaults {
-
     /**
      * The width of the fade overlays (in dp).
      */
diff --git a/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/chart/entry/ChartEntryModelExtensions.kt b/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/chart/entry/ChartEntryModelExtensions.kt
index 0c0b2f859..d95014194 100644
--- a/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/chart/entry/ChartEntryModelExtensions.kt
+++ b/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/chart/entry/ChartEntryModelExtensions.kt
@@ -81,35 +81,39 @@ public fun <Model : ChartEntryModel> ChartModelProducer<Model>.collectAsState(
                 (chartEntryModelWrapperState.value.chartEntryModel != null || runInitialAnimation)
             ) {
                 isAnimationRunning = true
-                mainAnimationJob = scope.launch(dispatcher) {
-                    animate(
-                        initialValue = Animation.range.start,
-                        targetValue = Animation.range.endInclusive,
-                        animationSpec = animationSpec,
-                    ) { fraction, _ ->
-                        when {
-                            !isAnimationRunning -> return@animate
-                            !isAnimationFrameGenerationRunning -> {
-                                isAnimationFrameGenerationRunning = true
-                                animationFrameJob = scope.launch(dispatcher) {
-                                    transformModel(chart, fraction)
-                                    isAnimationFrameGenerationRunning = false
+                mainAnimationJob =
+                    scope.launch(dispatcher) {
+                        animate(
+                            initialValue = Animation.range.start,
+                            targetValue = Animation.range.endInclusive,
+                            animationSpec = animationSpec,
+                        ) { fraction, _ ->
+                            when {
+                                !isAnimationRunning -> return@animate
+                                !isAnimationFrameGenerationRunning -> {
+                                    isAnimationFrameGenerationRunning = true
+                                    animationFrameJob =
+                                        scope.launch(dispatcher) {
+                                            transformModel(chart, fraction)
+                                            isAnimationFrameGenerationRunning = false
+                                        }
                                 }
-                            }
-                            fraction == 1f -> {
-                                finalAnimationFrameJob = scope.launch(dispatcher) {
-                                    animationFrameJob?.cancelAndJoin()
-                                    transformModel(chart, fraction)
-                                    isAnimationFrameGenerationRunning = false
+                                fraction == 1f -> {
+                                    finalAnimationFrameJob =
+                                        scope.launch(dispatcher) {
+                                            animationFrameJob?.cancelAndJoin()
+                                            transformModel(chart, fraction)
+                                            isAnimationFrameGenerationRunning = false
+                                        }
                                 }
                             }
                         }
                     }
-                }
             } else {
-                finalAnimationFrameJob = scope.launch(dispatcher) {
-                    transformModel(chart, Animation.range.endInclusive)
-                }
+                finalAnimationFrameJob =
+                    scope.launch(dispatcher) {
+                        transformModel(chart, Animation.range.endInclusive)
+                    }
             }
         }
         scope.launch(dispatcher) {
diff --git a/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/chart/layout/HorizontalLayout.kt b/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/chart/layout/HorizontalLayout.kt
index f18a0b464..f30d33176 100644
--- a/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/chart/layout/HorizontalLayout.kt
+++ b/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/chart/layout/HorizontalLayout.kt
@@ -33,9 +33,10 @@ public fun HorizontalLayout.Companion.fullWidth(
     scalableEndPadding: Dp = 0.dp,
     unscalableStartPadding: Dp = 0.dp,
     unscalableEndPadding: Dp = 0.dp,
-): HorizontalLayout.FullWidth = HorizontalLayout.FullWidth(
-    scalableStartPadding.value,
-    scalableEndPadding.value,
-    unscalableStartPadding.value,
-    unscalableEndPadding.value,
-)
+): HorizontalLayout.FullWidth =
+    HorizontalLayout.FullWidth(
+        scalableStartPadding.value,
+        scalableEndPadding.value,
+        unscalableStartPadding.value,
+        unscalableEndPadding.value,
+    )
diff --git a/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/chart/line/LineChart.kt b/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/chart/line/LineChart.kt
index 4932508a9..660226609 100644
--- a/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/chart/line/LineChart.kt
+++ b/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/chart/line/LineChart.kt
@@ -81,15 +81,16 @@ public fun lineChart(
     targetVerticalAxisPosition: AxisPosition.Vertical? = null,
     drawingModelInterpolator: DrawingModelInterpolator<LineChartDrawingModel.PointInfo, LineChartDrawingModel> =
         remember { DefaultDrawingModelInterpolator() },
-): LineChart = remember { LineChart() }.apply {
-    this.lines = lines
-    this.spacingDp = spacing.value
-    this.axisValuesOverrider = axisValuesOverrider
-    this.targetVerticalAxisPosition = targetVerticalAxisPosition
-    this.drawingModelInterpolator = drawingModelInterpolator
-    decorations?.also(::setDecorations)
-    persistentMarkers?.also(::setPersistentMarkers)
-}
+): LineChart =
+    remember { LineChart() }.apply {
+        this.lines = lines
+        this.spacingDp = spacing.value
+        this.axisValuesOverrider = axisValuesOverrider
+        this.targetVerticalAxisPosition = targetVerticalAxisPosition
+        this.drawingModelInterpolator = drawingModelInterpolator
+        decorations?.also(::setDecorations)
+        persistentMarkers?.also(::setPersistentMarkers)
+    }
 
 /**
  * Creates a [LineChart.LineSpec] for use in [LineChart]s.
@@ -112,14 +113,16 @@ public fun lineChart(
 public fun lineSpec(
     lineColor: Color,
     lineThickness: Dp = DefaultDimens.LINE_THICKNESS.dp,
-    lineBackgroundShader: DynamicShader? = DynamicShaders.fromBrush(
-        brush = Brush.verticalGradient(
-            listOf(
-                lineColor.copy(alpha = DefaultAlpha.LINE_BACKGROUND_SHADER_START),
-                lineColor.copy(alpha = DefaultAlpha.LINE_BACKGROUND_SHADER_END),
-            ),
+    lineBackgroundShader: DynamicShader? =
+        DynamicShaders.fromBrush(
+            brush =
+                Brush.verticalGradient(
+                    listOf(
+                        lineColor.copy(alpha = DefaultAlpha.LINE_BACKGROUND_SHADER_START),
+                        lineColor.copy(alpha = DefaultAlpha.LINE_BACKGROUND_SHADER_END),
+                    ),
+                ),
         ),
-    ),
     lineCap: StrokeCap = StrokeCap.Round,
     point: Component? = null,
     pointSize: Dp = DefaultDimens.POINT_SIZE.dp,
@@ -128,19 +131,20 @@ public fun lineSpec(
     dataLabelValueFormatter: ValueFormatter = DecimalFormatValueFormatter(),
     dataLabelRotationDegrees: Float = 0f,
     pointConnector: LineSpec.PointConnector = DefaultPointConnector(),
-): LineSpec = LineSpec(
-    lineShader = SolidShader(lineColor.toArgb()),
-    lineThicknessDp = lineThickness.value,
-    lineBackgroundShader = lineBackgroundShader,
-    lineCap = lineCap.paintCap,
-    point = point,
-    pointSizeDp = pointSize.value,
-    dataLabel = dataLabel,
-    dataLabelVerticalPosition = dataLabelVerticalPosition,
-    dataLabelValueFormatter = dataLabelValueFormatter,
-    dataLabelRotationDegrees = dataLabelRotationDegrees,
-    pointConnector = pointConnector,
-)
+): LineSpec =
+    LineSpec(
+        lineShader = SolidShader(lineColor.toArgb()),
+        lineThicknessDp = lineThickness.value,
+        lineBackgroundShader = lineBackgroundShader,
+        lineCap = lineCap.paintCap,
+        point = point,
+        pointSizeDp = pointSize.value,
+        dataLabel = dataLabel,
+        dataLabelVerticalPosition = dataLabelVerticalPosition,
+        dataLabelValueFormatter = dataLabelValueFormatter,
+        dataLabelRotationDegrees = dataLabelRotationDegrees,
+        pointConnector = pointConnector,
+    )
 
 /**
  * Creates a [LineChart.LineSpec] for use in [LineChart]s.
@@ -172,67 +176,79 @@ public fun lineSpec(
     dataLabelValueFormatter: ValueFormatter = DecimalFormatValueFormatter(),
     dataLabelRotationDegrees: Float = 0f,
     pointConnector: LineSpec.PointConnector = DefaultPointConnector(),
-): LineSpec = LineSpec(
-    lineShader = lineShader,
-    lineThicknessDp = lineThickness.value,
-    lineBackgroundShader = lineBackgroundShader,
-    lineCap = lineCap.paintCap,
-    point = point,
-    pointSizeDp = pointSize.value,
-    dataLabel = dataLabel,
-    dataLabelVerticalPosition = dataLabelVerticalPosition,
-    dataLabelValueFormatter = dataLabelValueFormatter,
-    dataLabelRotationDegrees = dataLabelRotationDegrees,
-    pointConnector = pointConnector,
-)
+): LineSpec =
+    LineSpec(
+        lineShader = lineShader,
+        lineThicknessDp = lineThickness.value,
+        lineBackgroundShader = lineBackgroundShader,
+        lineCap = lineCap.paintCap,
+        point = point,
+        pointSizeDp = pointSize.value,
+        dataLabel = dataLabel,
+        dataLabelVerticalPosition = dataLabelVerticalPosition,
+        dataLabelValueFormatter = dataLabelValueFormatter,
+        dataLabelRotationDegrees = dataLabelRotationDegrees,
+        pointConnector = pointConnector,
+    )
 
 private fun DynamicShader.getBackwardCompatibleBackgroundShader(): DynamicShader? =
     when (this) {
-        is SolidShader -> HorizontalSplitShader.Double(
-            topShader = DynamicShaders.fromBrush(
-                brush = Brush.verticalGradient(
-                    listOf(
-                        Color(color).copy(alpha = DefaultAlpha.LINE_BACKGROUND_SHADER_START),
-                        Color(color).copy(alpha = DefaultAlpha.LINE_BACKGROUND_SHADER_END),
+        is SolidShader ->
+            HorizontalSplitShader.Double(
+                topShader =
+                    DynamicShaders.fromBrush(
+                        brush =
+                            Brush.verticalGradient(
+                                listOf(
+                                    Color(color).copy(alpha = DefaultAlpha.LINE_BACKGROUND_SHADER_START),
+                                    Color(color).copy(alpha = DefaultAlpha.LINE_BACKGROUND_SHADER_END),
+                                ),
+                            ),
                     ),
-                ),
-            ),
-            bottomShader = DynamicShaders.fromBrush(
-                brush = Brush.verticalGradient(
-                    listOf(
-                        Color(color).copy(alpha = DefaultAlpha.LINE_BACKGROUND_SHADER_END),
-                        Color(color).copy(alpha = DefaultAlpha.LINE_BACKGROUND_SHADER_START),
+                bottomShader =
+                    DynamicShaders.fromBrush(
+                        brush =
+                            Brush.verticalGradient(
+                                listOf(
+                                    Color(color).copy(alpha = DefaultAlpha.LINE_BACKGROUND_SHADER_END),
+                                    Color(color).copy(alpha = DefaultAlpha.LINE_BACKGROUND_SHADER_START),
+                                ),
+                            ),
                     ),
-                ),
-            ),
-        )
+            )
 
-        is HorizontalSplitShader.Solid -> HorizontalSplitShader.Double(
-            topShader = DynamicShaders.fromBrush(
-                brush = Brush.verticalGradient(
-                    listOf(
-                        Color(colorTop).copy(alpha = DefaultAlpha.LINE_BACKGROUND_SHADER_START),
-                        Color(colorTop).copy(alpha = DefaultAlpha.LINE_BACKGROUND_SHADER_END),
+        is HorizontalSplitShader.Solid ->
+            HorizontalSplitShader.Double(
+                topShader =
+                    DynamicShaders.fromBrush(
+                        brush =
+                            Brush.verticalGradient(
+                                listOf(
+                                    Color(colorTop).copy(alpha = DefaultAlpha.LINE_BACKGROUND_SHADER_START),
+                                    Color(colorTop).copy(alpha = DefaultAlpha.LINE_BACKGROUND_SHADER_END),
+                                ),
+                            ),
                     ),
-                ),
-            ),
-            bottomShader = DynamicShaders.fromBrush(
-                brush = Brush.verticalGradient(
-                    listOf(
-                        Color(colorBottom).copy(alpha = DefaultAlpha.LINE_BACKGROUND_SHADER_END),
-                        Color(colorBottom).copy(alpha = DefaultAlpha.LINE_BACKGROUND_SHADER_START),
+                bottomShader =
+                    DynamicShaders.fromBrush(
+                        brush =
+                            Brush.verticalGradient(
+                                listOf(
+                                    Color(colorBottom).copy(alpha = DefaultAlpha.LINE_BACKGROUND_SHADER_END),
+                                    Color(colorBottom).copy(alpha = DefaultAlpha.LINE_BACKGROUND_SHADER_START),
+                                ),
+                            ),
                     ),
-                ),
-            ),
-        )
+            )
 
         else -> null
     }
 
 private val StrokeCap.paintCap: Paint.Cap
-    get() = when (this) {
-        StrokeCap.Butt -> Paint.Cap.BUTT
-        StrokeCap.Round -> Paint.Cap.ROUND
-        StrokeCap.Square -> Paint.Cap.SQUARE
-        else -> throw IllegalArgumentException("Not `StrokeCap.Butt`, `StrokeCap.Round`, or `StrokeCap.Square`.")
-    }
+    get() =
+        when (this) {
+            StrokeCap.Butt -> Paint.Cap.BUTT
+            StrokeCap.Round -> Paint.Cap.ROUND
+            StrokeCap.Square -> Paint.Cap.SQUARE
+            else -> throw IllegalArgumentException("Not `StrokeCap.Butt`, `StrokeCap.Round`, or `StrokeCap.Square`.")
+        }
diff --git a/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/chart/scroll/ChartScrollSpec.kt b/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/chart/scroll/ChartScrollSpec.kt
index 1cc6d6d29..1d6f751e4 100644
--- a/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/chart/scroll/ChartScrollSpec.kt
+++ b/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/chart/scroll/ChartScrollSpec.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 by Patryk Goworowski and Patrick Michalik.
+ * Copyright 2023 by Patryk Goworowski and Patrick Michalik.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -43,7 +43,6 @@ public class ChartScrollSpec<in Model : ChartEntryModel>(
     public val autoScrollCondition: AutoScrollCondition<Model>,
     public val autoScrollAnimationSpec: AnimationSpec<Float>,
 ) {
-
     /**
      * Performs an automatic scroll.
      */
@@ -58,10 +57,11 @@ public class ChartScrollSpec<in Model : ChartEntryModel>(
             }
 
             chartScrollState.animateScrollBy(
-                value = when (initialScroll) {
-                    InitialScroll.Start -> -chartScrollState.value
-                    InitialScroll.End -> -chartScrollState.value + chartScrollState.maxValue
-                },
+                value =
+                    when (initialScroll) {
+                        InitialScroll.Start -> -chartScrollState.value
+                        InitialScroll.End -> -chartScrollState.value + chartScrollState.maxValue
+                    },
                 animationSpec = autoScrollAnimationSpec,
             )
         }
@@ -77,16 +77,17 @@ public fun <Model : ChartEntryModel> rememberChartScrollSpec(
     initialScroll: InitialScroll = InitialScroll.Start,
     autoScrollCondition: AutoScrollCondition<Model> = AutoScrollCondition.Never,
     autoScrollAnimationSpec: AnimationSpec<Float> = spring(),
-): ChartScrollSpec<Model> = remember(
-    isScrollEnabled,
-    initialScroll,
-    autoScrollCondition,
-    autoScrollAnimationSpec,
-) {
-    ChartScrollSpec(
-        isScrollEnabled = isScrollEnabled,
-        initialScroll = initialScroll,
-        autoScrollCondition = autoScrollCondition,
-        autoScrollAnimationSpec = autoScrollAnimationSpec,
-    )
-}
+): ChartScrollSpec<Model> =
+    remember(
+        isScrollEnabled,
+        initialScroll,
+        autoScrollCondition,
+        autoScrollAnimationSpec,
+    ) {
+        ChartScrollSpec(
+            isScrollEnabled = isScrollEnabled,
+            initialScroll = initialScroll,
+            autoScrollCondition = autoScrollCondition,
+            autoScrollAnimationSpec = autoScrollAnimationSpec,
+        )
+    }
diff --git a/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/chart/scroll/ChartScrollState.kt b/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/chart/scroll/ChartScrollState.kt
index 1f74a6009..d96fe554f 100644
--- a/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/chart/scroll/ChartScrollState.kt
+++ b/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/chart/scroll/ChartScrollState.kt
@@ -33,7 +33,6 @@ import kotlin.math.abs
  * Houses information on a [Chart]’s scroll state. Allows for programmatic scrolling.
  */
 public class ChartScrollState : ScrollableState, ScrollListenerHost {
-
     private val _value = mutableFloatStateOf(0f)
     private val _maxValue = mutableFloatStateOf(0f)
     private val scrollListeners: MutableSet<ScrollListener> = mutableSetOf()
@@ -62,22 +61,26 @@ public class ChartScrollState : ScrollableState, ScrollListenerHost {
             scrollListeners.forEach { scrollListener -> scrollListener.onMaxValueChanged(oldMaxValue, newMaxValue) }
         }
 
-    private val scrollableState = ScrollableState { delta ->
-        val unlimitedValue = value + delta
-        val limitedValue = unlimitedValue.coerceIn(0f.rangeWith(maxValue))
-        val consumedValue = limitedValue - value
-        value += consumedValue
+    private val scrollableState =
+        ScrollableState { delta ->
+            val unlimitedValue = value + delta
+            val limitedValue = unlimitedValue.coerceIn(0f.rangeWith(maxValue))
+            val consumedValue = limitedValue - value
+            value += consumedValue
 
-        val unconsumedScroll = delta - consumedValue
-        if (unconsumedScroll != 0f) notifyUnconsumedScroll(unconsumedScroll)
+            val unconsumedScroll = delta - consumedValue
+            if (unconsumedScroll != 0f) notifyUnconsumedScroll(unconsumedScroll)
 
-        if (unlimitedValue != limitedValue) consumedValue else delta
-    }
+            if (unlimitedValue != limitedValue) consumedValue else delta
+        }
 
     override val isScrollInProgress: Boolean
         get() = scrollableState.isScrollInProgress
 
-    override suspend fun scroll(scrollPriority: MutatePriority, block: suspend ScrollScope.() -> Unit) {
+    override suspend fun scroll(
+        scrollPriority: MutatePriority,
+        block: suspend ScrollScope.() -> Unit,
+    ) {
         scrollableState.scroll(scrollPriority, block)
     }
 
@@ -97,10 +100,11 @@ public class ChartScrollState : ScrollableState, ScrollListenerHost {
 
     internal fun handleInitialScroll(initialScroll: InitialScroll) {
         if (initialScrollHandled) return
-        value = when (initialScroll) {
-            InitialScroll.Start -> 0f
-            InitialScroll.End -> maxValue
-        }
+        value =
+            when (initialScroll) {
+                InitialScroll.Start -> 0f
+                InitialScroll.End -> maxValue
+            }
         initialScrollHandled = true
     }
 
diff --git a/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/component/Components.kt b/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/component/Components.kt
index 298b4b84f..b497df2f1 100644
--- a/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/component/Components.kt
+++ b/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/component/Components.kt
@@ -61,25 +61,26 @@ public fun lineComponent(
     margins: Dimensions = emptyDimensions(),
     strokeWidth: Dp = 0.dp,
     strokeColor: Color = Color.Transparent,
-): LineComponent = remember(
-    color,
-    thickness,
-    shape,
-    dynamicShader,
-    margins,
-    strokeWidth,
-    strokeColor,
-) {
-    LineComponent(
-        color = color.toArgb(),
-        thicknessDp = thickness.value,
-        shape = shape,
-        dynamicShader = dynamicShader,
-        margins = margins,
-        strokeWidthDp = strokeWidth.value,
-        strokeColor = strokeColor.toArgb(),
-    )
-}
+): LineComponent =
+    remember(
+        color,
+        thickness,
+        shape,
+        dynamicShader,
+        margins,
+        strokeWidth,
+        strokeColor,
+    ) {
+        LineComponent(
+            color = color.toArgb(),
+            thicknessDp = thickness.value,
+            shape = shape,
+            dynamicShader = dynamicShader,
+            margins = margins,
+            strokeWidthDp = strokeWidth.value,
+            strokeColor = strokeColor.toArgb(),
+        )
+    }
 
 /**
  * Creates a [LineComponent] with the specified properties.
@@ -93,15 +94,16 @@ public fun lineComponent(
     margins: Dimensions = emptyDimensions(),
     strokeWidth: Dp = 0.dp,
     strokeColor: Color = Color.Transparent,
-): LineComponent = lineComponent(
-    color = color,
-    thickness = thickness,
-    shape = shape.chartShape(),
-    dynamicShader = dynamicShader,
-    margins = margins,
-    strokeWidth = strokeWidth,
-    strokeColor = strokeColor,
-)
+): LineComponent =
+    lineComponent(
+        color = color,
+        thickness = thickness,
+        shape = shape.chartShape(),
+        dynamicShader = dynamicShader,
+        margins = margins,
+        strokeWidth = strokeWidth,
+        strokeColor = strokeColor,
+    )
 
 /**
  * Creates a [ShapeComponent] with the specified properties.
@@ -114,23 +116,24 @@ public fun shapeComponent(
     margins: Dimensions = emptyDimensions(),
     strokeWidth: Dp = 0.dp,
     strokeColor: Color = Color.Transparent,
-): ShapeComponent = remember(
-    shape,
-    color,
-    dynamicShader,
-    margins,
-    strokeWidth,
-    strokeColor,
-) {
-    ShapeComponent(
-        shape = shape,
-        color = color.toArgb(),
-        dynamicShader = dynamicShader,
-        margins = margins,
-        strokeWidthDp = strokeWidth.value,
-        strokeColor = strokeColor.toArgb(),
-    )
-}
+): ShapeComponent =
+    remember(
+        shape,
+        color,
+        dynamicShader,
+        margins,
+        strokeWidth,
+        strokeColor,
+    ) {
+        ShapeComponent(
+            shape = shape,
+            color = color.toArgb(),
+            dynamicShader = dynamicShader,
+            margins = margins,
+            strokeWidthDp = strokeWidth.value,
+            strokeColor = strokeColor.toArgb(),
+        )
+    }
 
 /**
  * Creates a [ShapeComponent] with the specified properties.
@@ -143,14 +146,15 @@ public fun shapeComponent(
     margins: Dimensions = emptyDimensions(),
     strokeWidth: Dp = 0.dp,
     strokeColor: Color = Color.Transparent,
-): ShapeComponent = shapeComponent(
-    shape = shape.chartShape(),
-    color = color,
-    dynamicShader = dynamicShader,
-    margins = margins,
-    strokeWidth = strokeWidth,
-    strokeColor = strokeColor,
-)
+): ShapeComponent =
+    shapeComponent(
+        shape = shape.chartShape(),
+        color = color,
+        dynamicShader = dynamicShader,
+        margins = margins,
+        strokeWidth = strokeWidth,
+        strokeColor = strokeColor,
+    )
 
 /**
  * Creates a [ShapeComponent] with the specified properties.
@@ -163,14 +167,15 @@ public fun shapeComponent(
     margins: Dimensions = emptyDimensions(),
     strokeWidth: Dp = 0.dp,
     strokeColor: Color = Color.Transparent,
-): ShapeComponent = shapeComponent(
-    shape = shape,
-    color = color,
-    dynamicShader = brush.toDynamicShader(),
-    margins = margins,
-    strokeWidth = strokeWidth,
-    strokeColor = strokeColor,
-)
+): ShapeComponent =
+    shapeComponent(
+        shape = shape,
+        color = color,
+        dynamicShader = brush.toDynamicShader(),
+        margins = margins,
+        strokeWidth = strokeWidth,
+        strokeColor = strokeColor,
+    )
 
 /**
  * Creates an [OverlayingComponent].
@@ -190,23 +195,24 @@ public fun overlayingComponent(
     innerPaddingTop: Dp = 0.dp,
     innerPaddingBottom: Dp = 0.dp,
     innerPaddingEnd: Dp = 0.dp,
-): OverlayingComponent = remember(
-    outer,
-    inner,
-    innerPaddingStart,
-    innerPaddingTop,
-    innerPaddingBottom,
-    innerPaddingEnd,
-) {
-    OverlayingComponent(
-        outer = outer,
-        inner = inner,
-        innerPaddingStartDp = innerPaddingStart.value,
-        innerPaddingTopDp = innerPaddingTop.value,
-        innerPaddingBottomDp = innerPaddingBottom.value,
-        innerPaddingEndDp = innerPaddingEnd.value,
-    )
-}
+): OverlayingComponent =
+    remember(
+        outer,
+        inner,
+        innerPaddingStart,
+        innerPaddingTop,
+        innerPaddingBottom,
+        innerPaddingEnd,
+    ) {
+        OverlayingComponent(
+            outer = outer,
+            inner = inner,
+            innerPaddingStartDp = innerPaddingStart.value,
+            innerPaddingTopDp = innerPaddingTop.value,
+            innerPaddingBottomDp = innerPaddingBottom.value,
+            innerPaddingEndDp = innerPaddingEnd.value,
+        )
+    }
 
 /**
  * Creates an [OverlayingComponent].
@@ -220,14 +226,15 @@ public fun overlayingComponent(
     outer: Component,
     inner: Component,
     innerPaddingAll: Dp,
-): OverlayingComponent = overlayingComponent(
-    outer = outer,
-    inner = inner,
-    innerPaddingStart = innerPaddingAll,
-    innerPaddingTop = innerPaddingAll,
-    innerPaddingBottom = innerPaddingAll,
-    innerPaddingEnd = innerPaddingAll,
-)
+): OverlayingComponent =
+    overlayingComponent(
+        outer = outer,
+        inner = inner,
+        innerPaddingStart = innerPaddingAll,
+        innerPaddingTop = innerPaddingAll,
+        innerPaddingBottom = innerPaddingAll,
+        innerPaddingEnd = innerPaddingAll,
+    )
 
 /**
  * Creates a [TextComponent].
diff --git a/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/component/dimension/Padding.kt b/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/component/dimension/Padding.kt
index 4abac3155..e08c5d4ee 100644
--- a/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/component/dimension/Padding.kt
+++ b/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/component/dimension/Padding.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 by Patryk Goworowski and Patrick Michalik.
+ * Copyright 2023 by Patryk Goworowski and Patrick Michalik.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -32,14 +32,15 @@ public fun <P : Padding> P.setPadding(
     top: Dp = 0.dp,
     end: Dp = 0.dp,
     bottom: Dp = 0.dp,
-): P = apply {
-    padding.set(
-        startDp = start.value,
-        topDp = top.value,
-        endDp = end.value,
-        bottomDp = bottom.value,
-    )
-}
+): P =
+    apply {
+        padding.set(
+            startDp = start.value,
+            topDp = top.value,
+            endDp = end.value,
+            bottomDp = bottom.value,
+        )
+    }
 
 /**
  * Sets the horizontal and vertical padding for the rectangle.
@@ -48,26 +49,26 @@ public fun <P : Padding> P.setPadding(
 public fun <P : Padding> P.setPadding(
     horizontal: Dp = 0.dp,
     vertical: Dp = 0.dp,
-): P = apply {
-    padding.set(
-        startDp = horizontal.value,
-        topDp = vertical.value,
-        endDp = horizontal.value,
-        bottomDp = vertical.value,
-    )
-}
+): P =
+    apply {
+        padding.set(
+            startDp = horizontal.value,
+            topDp = vertical.value,
+            endDp = horizontal.value,
+            bottomDp = vertical.value,
+        )
+    }
 
 /**
  * Sets a common padding value for each edge of the rectangle.
  */
 @Composable
-public fun <P : Padding> P.setPadding(
-    all: Dp = 0.dp,
-): P = apply {
-    padding.set(
-        startDp = all.value,
-        topDp = all.value,
-        endDp = all.value,
-        bottomDp = all.value,
-    )
-}
+public fun <P : Padding> P.setPadding(all: Dp = 0.dp): P =
+    apply {
+        padding.set(
+            startDp = all.value,
+            topDp = all.value,
+            endDp = all.value,
+            bottomDp = all.value,
+        )
+    }
diff --git a/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/component/marker/MarkerComponent.kt b/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/component/marker/MarkerComponent.kt
index 785b4c39b..7c41f8f36 100644
--- a/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/component/marker/MarkerComponent.kt
+++ b/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/component/marker/MarkerComponent.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 by Patryk Goworowski and Patrick Michalik.
+ * Copyright 2023 by Patryk Goworowski and Patrick Michalik.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -34,8 +34,9 @@ public fun markerComponent(
     label: TextComponent,
     indicator: Component,
     guideline: LineComponent,
-): MarkerComponent = MarkerComponent(
-    label = label,
-    indicator = indicator,
-    guideline = guideline,
-)
+): MarkerComponent =
+    MarkerComponent(
+        label = label,
+        indicator = indicator,
+        guideline = guideline,
+    )
diff --git a/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/component/shape/Shapes.kt b/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/component/shape/Shapes.kt
index 5688d1881..dcd2d53d4 100644
--- a/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/component/shape/Shapes.kt
+++ b/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/component/shape/Shapes.kt
@@ -50,73 +50,82 @@ private const val RADII_ARRAY_SIZE = 8
  * Converts this [androidx.compose.ui.graphics.Shape] to an instance of
  * [com.patrykandpatrick.vico.core.component.shape.Shape].
  */
-public fun ComposeShape.chartShape(): Shape = object : Shape {
-    private val radii by lazy { FloatArray(RADII_ARRAY_SIZE) }
-    private val matrix: Matrix by lazy { Matrix() }
+public fun ComposeShape.chartShape(): Shape =
+    object : Shape {
+        private val radii by lazy { FloatArray(RADII_ARRAY_SIZE) }
+        private val matrix: Matrix by lazy { Matrix() }
 
-    override fun drawShape(
-        context: DrawContext,
-        paint: Paint,
-        path: Path,
-        left: Float,
-        top: Float,
-        right: Float,
-        bottom: Float,
-    ) {
-        val outline = createOutline(
-            size = Size(
-                width = right - left,
-                height = bottom - top,
-            ),
-            layoutDirection = if (context.isLtr) LayoutDirection.Ltr else LayoutDirection.Rtl,
-            density = Density(context.density, 1f),
-        )
-        when (outline) {
-            is Outline.Rectangle -> path.addRect(
-                left,
-                top,
-                right,
-                bottom,
-                Path.Direction.CCW,
-            )
+        override fun drawShape(
+            context: DrawContext,
+            paint: Paint,
+            path: Path,
+            left: Float,
+            top: Float,
+            right: Float,
+            bottom: Float,
+        ) {
+            val outline =
+                createOutline(
+                    size =
+                        Size(
+                            width = right - left,
+                            height = bottom - top,
+                        ),
+                    layoutDirection = if (context.isLtr) LayoutDirection.Ltr else LayoutDirection.Rtl,
+                    density = Density(context.density, 1f),
+                )
+            when (outline) {
+                is Outline.Rectangle ->
+                    path.addRect(
+                        left,
+                        top,
+                        right,
+                        bottom,
+                        Path.Direction.CCW,
+                    )
 
-            is Outline.Rounded -> path.addRoundRect(
-                left = left,
-                top = top,
-                right = right,
-                bottom = bottom,
-                rect = outline.roundRect,
-                radii = radii,
-            )
+                is Outline.Rounded ->
+                    path.addRoundRect(
+                        left = left,
+                        top = top,
+                        right = right,
+                        bottom = bottom,
+                        rect = outline.roundRect,
+                        radii = radii,
+                    )
 
-            is Outline.Generic -> {
-                matrix.setTranslate(left, top)
-                path.addPath(outline.path.asAndroidPath(), matrix)
+                is Outline.Generic -> {
+                    matrix.setTranslate(left, top)
+                    path.addPath(outline.path.asAndroidPath(), matrix)
+                }
             }
+            context.canvas.drawPath(path, paint)
         }
-        context.canvas.drawPath(path, paint)
     }
-}
 
 /**
  * Converts this [CorneredShape] to an instance of [androidx.compose.ui.graphics.Shape].
  */
-public fun CorneredShape.composeShape(): ComposeShape = object : ComposeShape {
+public fun CorneredShape.composeShape(): ComposeShape =
+    object : ComposeShape {
+        override fun createOutline(
+            size: Size,
+            layoutDirection: LayoutDirection,
+            density: Density,
+        ): Outline {
+            val path = ComposePath()
 
-    override fun createOutline(size: Size, layoutDirection: LayoutDirection, density: Density): Outline {
-        val path = ComposePath()
-
-        createPath(
-            density = density.density,
-            path = path.asAndroidPath(),
-            left = 0f,
-            top = 0f,
-            right = size.width,
-            bottom = size.height,
-        )
-        return Outline.Generic(path)
+            createPath(
+                density = density.density,
+                path = path.asAndroidPath(),
+                left = 0f,
+                top = 0f,
+                right = size.width,
+                bottom = size.height,
+            )
+            return Outline.Generic(path)
+        }
     }
-}
 
 /**
  * Adds a rounded rectangle to the receiver [Path].
@@ -128,7 +137,6 @@ public fun CorneredShape.composeShape(): ComposeShape = object : ComposeShape {
  * @param rect the rounded rectangle to be drawn.
  * @param radii used to store the corner radii. This array must be mutable.
  */
-@Suppress("MagicNumber")
 public fun Path.addRoundRect(
     left: Float,
     top: Float,
@@ -151,14 +159,13 @@ public fun Path.addRoundRect(
 /**
  * Creates a [CorneredShape] with rounded corners of the provided size.
  */
-public fun Shapes.roundedCornerShape(
-    all: Dp = 0.dp,
-): CorneredShape = CorneredShape(
-    Corner.Absolute(all.value, RoundedCornerTreatment),
-    Corner.Absolute(all.value, RoundedCornerTreatment),
-    Corner.Absolute(all.value, RoundedCornerTreatment),
-    Corner.Absolute(all.value, RoundedCornerTreatment),
-)
+public fun Shapes.roundedCornerShape(all: Dp = 0.dp): CorneredShape =
+    CorneredShape(
+        Corner.Absolute(all.value, RoundedCornerTreatment),
+        Corner.Absolute(all.value, RoundedCornerTreatment),
+        Corner.Absolute(all.value, RoundedCornerTreatment),
+        Corner.Absolute(all.value, RoundedCornerTreatment),
+    )
 
 /**
  * Creates a [CorneredShape] with rounded corners of the provided sizes.
@@ -168,24 +175,24 @@ public fun Shapes.roundedCornerShape(
     topRight: Dp = 0.dp,
     bottomRight: Dp = 0.dp,
     bottomLeft: Dp = 0.dp,
-): CorneredShape = CorneredShape(
-    Corner.Absolute(topLeft.value, RoundedCornerTreatment),
-    Corner.Absolute(topRight.value, RoundedCornerTreatment),
-    Corner.Absolute(bottomRight.value, RoundedCornerTreatment),
-    Corner.Absolute(bottomLeft.value, RoundedCornerTreatment),
-)
+): CorneredShape =
+    CorneredShape(
+        Corner.Absolute(topLeft.value, RoundedCornerTreatment),
+        Corner.Absolute(topRight.value, RoundedCornerTreatment),
+        Corner.Absolute(bottomRight.value, RoundedCornerTreatment),
+        Corner.Absolute(bottomLeft.value, RoundedCornerTreatment),
+    )
 
 /**
  * Creates a [CorneredShape] with cut corners of the provided size.
  */
-public fun Shapes.cutCornerShape(
-    all: Dp = 0.dp,
-): CorneredShape = CorneredShape(
-    Corner.Absolute(all.value, CutCornerTreatment),
-    Corner.Absolute(all.value, CutCornerTreatment),
-    Corner.Absolute(all.value, CutCornerTreatment),
-    Corner.Absolute(all.value, CutCornerTreatment),
-)
+public fun Shapes.cutCornerShape(all: Dp = 0.dp): CorneredShape =
+    CorneredShape(
+        Corner.Absolute(all.value, CutCornerTreatment),
+        Corner.Absolute(all.value, CutCornerTreatment),
+        Corner.Absolute(all.value, CutCornerTreatment),
+        Corner.Absolute(all.value, CutCornerTreatment),
+    )
 
 /**
  * Creates a [CorneredShape] with cut corners of the provided sizes.
@@ -195,12 +202,13 @@ public fun Shapes.cutCornerShape(
     topRight: Dp = 0.dp,
     bottomRight: Dp = 0.dp,
     bottomLeft: Dp = 0.dp,
-): CorneredShape = CorneredShape(
-    Corner.Absolute(topLeft.value, CutCornerTreatment),
-    Corner.Absolute(topRight.value, CutCornerTreatment),
-    Corner.Absolute(bottomRight.value, CutCornerTreatment),
-    Corner.Absolute(bottomLeft.value, CutCornerTreatment),
-)
+): CorneredShape =
+    CorneredShape(
+        Corner.Absolute(topLeft.value, CutCornerTreatment),
+        Corner.Absolute(topRight.value, CutCornerTreatment),
+        Corner.Absolute(bottomRight.value, CutCornerTreatment),
+        Corner.Absolute(bottomLeft.value, CutCornerTreatment),
+    )
 
 /**
  * Creates a [MarkerCorneredShape].
@@ -217,13 +225,14 @@ public fun Shapes.markerCorneredShape(
     bottomRight: Corner,
     bottomLeft: Corner,
     tickSizeDp: Dp = DEF_MARKER_TICK_SIZE.dp,
-): MarkerCorneredShape = MarkerCorneredShape(
-    topLeft = topLeft,
-    topRight = topRight,
-    bottomRight = bottomRight,
-    bottomLeft = bottomLeft,
-    tickSizeDp = tickSizeDp.value,
-)
+): MarkerCorneredShape =
+    MarkerCorneredShape(
+        topLeft = topLeft,
+        topRight = topRight,
+        bottomRight = bottomRight,
+        bottomLeft = bottomLeft,
+        tickSizeDp = tickSizeDp.value,
+    )
 
 /**
  * Creates a [MarkerCorneredShape].
@@ -234,13 +243,14 @@ public fun Shapes.markerCorneredShape(
 public fun Shapes.markerCorneredShape(
     all: Corner,
     tickSizeDp: Dp = DEF_MARKER_TICK_SIZE.dp,
-): MarkerCorneredShape = MarkerCorneredShape(
-    topLeft = all,
-    topRight = all,
-    bottomRight = all,
-    bottomLeft = all,
-    tickSizeDp = tickSizeDp.value,
-)
+): MarkerCorneredShape =
+    MarkerCorneredShape(
+        topLeft = all,
+        topRight = all,
+        bottomRight = all,
+        bottomLeft = all,
+        tickSizeDp = tickSizeDp.value,
+    )
 
 /**
  * Creates a [MarkerCorneredShape] out of a regular [CorneredShape].
@@ -251,13 +261,14 @@ public fun Shapes.markerCorneredShape(
 public fun Shapes.markerCorneredShape(
     corneredShape: CorneredShape,
     tickSizeDp: Dp = DEF_MARKER_TICK_SIZE.dp,
-): MarkerCorneredShape = MarkerCorneredShape(
-    topLeft = corneredShape.topLeft,
-    topRight = corneredShape.topRight,
-    bottomRight = corneredShape.bottomRight,
-    bottomLeft = corneredShape.bottomLeft,
-    tickSizeDp = tickSizeDp.value,
-)
+): MarkerCorneredShape =
+    MarkerCorneredShape(
+        topLeft = corneredShape.topLeft,
+        topRight = corneredShape.topRight,
+        bottomRight = corneredShape.bottomRight,
+        bottomLeft = corneredShape.bottomLeft,
+        tickSizeDp = tickSizeDp.value,
+    )
 
 /**
  * Creates a [DashedShape].
@@ -272,12 +283,13 @@ public fun Shapes.dashedShape(
     dashLength: Dp,
     gapLength: Dp,
     fitStrategy: DashedShape.FitStrategy = DashedShape.FitStrategy.Resize,
-): DashedShape = DashedShape(
-    shape = shape.chartShape(),
-    dashLengthDp = dashLength.value,
-    gapLengthDp = gapLength.value,
-    fitStrategy = fitStrategy,
-)
+): DashedShape =
+    DashedShape(
+        shape = shape.chartShape(),
+        dashLengthDp = dashLength.value,
+        gapLengthDp = gapLength.value,
+        fitStrategy = fitStrategy,
+    )
 
 /**
  * Creates a [DashedShape].
@@ -292,9 +304,10 @@ public fun Shapes.dashedShape(
     dashLength: Dp,
     gapLength: Dp,
     fitStrategy: DashedShape.FitStrategy = DashedShape.FitStrategy.Resize,
-): DashedShape = DashedShape(
-    shape = shape,
-    dashLengthDp = dashLength.value,
-    gapLengthDp = gapLength.value,
-    fitStrategy = fitStrategy,
-)
+): DashedShape =
+    DashedShape(
+        shape = shape,
+        dashLengthDp = dashLength.value,
+        gapLengthDp = gapLength.value,
+        fitStrategy = fitStrategy,
+    )
diff --git a/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/component/shape/shader/BrushShader.kt b/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/component/shape/shader/BrushShader.kt
index 3e7b5048e..c134b28fd 100644
--- a/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/component/shape/shader/BrushShader.kt
+++ b/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/component/shape/shader/BrushShader.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 by Patryk Goworowski and Patrick Michalik.
+ * Copyright 2023 by Patryk Goworowski and Patrick Michalik.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -32,7 +32,6 @@ import kotlin.math.abs
  * @property brush the [Brush] to be converted to a [Shader].
  */
 public class BrushShader(private val brush: Brush) : CacheableDynamicShader() {
-
     private val matrix = Matrix()
 
     override fun createShader(
@@ -44,10 +43,11 @@ public class BrushShader(private val brush: Brush) : CacheableDynamicShader() {
     ): Shader {
         val tempPaint = Paint()
         brush.applyTo(
-            size = Size(
-                abs(left - right),
-                abs(top - bottom),
-            ),
+            size =
+                Size(
+                    abs(left - right),
+                    abs(top - bottom),
+                ),
             p = tempPaint,
             alpha = 1f,
         )
diff --git a/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/component/shape/shader/DynamicShaders.kt b/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/component/shape/shader/DynamicShaders.kt
index cebf286f7..96dd7db6c 100644
--- a/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/component/shape/shader/DynamicShaders.kt
+++ b/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/component/shape/shader/DynamicShaders.kt
@@ -43,13 +43,14 @@ public fun DynamicShaders.fromComponent(
     checkeredArrangement: Boolean = true,
     tileXMode: Shader.TileMode = Shader.TileMode.REPEAT,
     tileYMode: Shader.TileMode = tileXMode,
-): ComponentShader = ComponentShader(
-    component = component,
-    componentSizeDp = componentSize.value,
-    checkeredArrangement = checkeredArrangement,
-    tileXMode = tileXMode,
-    tileYMode = tileYMode,
-)
+): ComponentShader =
+    ComponentShader(
+        component = component,
+        componentSizeDp = componentSize.value,
+        checkeredArrangement = checkeredArrangement,
+        tileXMode = tileXMode,
+        tileYMode = tileYMode,
+    )
 
 /**
  * Creates a [BrushShader] using the given [Brush].
@@ -67,5 +68,7 @@ public fun DynamicShaders.solid(color: Color): SolidShader = SolidShader(color.t
  * Creates a [DynamicShader] with split colors. The positive color is used for values above the zero line,
  * and the negative color is used for values below the zero line.
  */
-public fun DynamicShaders.split(positiveColor: Color, negativeColor: Color): HorizontalSplitShader.Solid =
-    HorizontalSplitShader.Solid(positiveColor.toArgb(), negativeColor.toArgb())
+public fun DynamicShaders.split(
+    positiveColor: Color,
+    negativeColor: Color,
+): HorizontalSplitShader.Solid = HorizontalSplitShader.Solid(positiveColor.toArgb(), negativeColor.toArgb())
diff --git a/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/component/shape/shader/LinearGradientShader.kt b/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/component/shape/shader/LinearGradientShader.kt
index 89bad5564..81d19c491 100644
--- a/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/component/shape/shader/LinearGradientShader.kt
+++ b/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/component/shape/shader/LinearGradientShader.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 by Patryk Goworowski and Patrick Michalik.
+ * Copyright 2023 by Patryk Goworowski and Patrick Michalik.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -36,25 +36,25 @@ import com.patrykandpatrick.vico.core.context.DrawContext
 public fun horizontalGradient(
     colors: Array<Color>,
     positions: FloatArray? = null,
-): DynamicShader = object : CacheableDynamicShader() {
-
-    override fun createShader(
-        context: DrawContext,
-        left: Float,
-        top: Float,
-        right: Float,
-        bottom: Float,
-    ): Shader =
-        LinearGradient(
-            left,
-            top,
-            right,
-            top,
-            IntArray(colors.size) { index -> colors[index].toArgb() },
-            positions,
-            Shader.TileMode.CLAMP,
-        )
-}
+): DynamicShader =
+    object : CacheableDynamicShader() {
+        override fun createShader(
+            context: DrawContext,
+            left: Float,
+            top: Float,
+            right: Float,
+            bottom: Float,
+        ): Shader =
+            LinearGradient(
+                left,
+                top,
+                right,
+                top,
+                IntArray(colors.size) { index -> colors[index].toArgb() },
+                positions,
+                Shader.TileMode.CLAMP,
+            )
+    }
 
 /**
  * Creates a [DynamicShader] in the form of a vertical gradient.
@@ -68,22 +68,22 @@ public fun horizontalGradient(
 public fun verticalGradient(
     colors: Array<Color>,
     positions: FloatArray? = null,
-): DynamicShader = object : CacheableDynamicShader() {
-
-    override fun createShader(
-        context: DrawContext,
-        left: Float,
-        top: Float,
-        right: Float,
-        bottom: Float,
-    ): Shader =
-        LinearGradient(
-            left,
-            top,
-            left,
-            bottom,
-            IntArray(colors.size) { index -> colors[index].toArgb() },
-            positions,
-            Shader.TileMode.CLAMP,
-        )
-}
+): DynamicShader =
+    object : CacheableDynamicShader() {
+        override fun createShader(
+            context: DrawContext,
+            left: Float,
+            top: Float,
+            right: Float,
+            bottom: Float,
+        ): Shader =
+            LinearGradient(
+                left,
+                top,
+                left,
+                bottom,
+                IntArray(colors.size) { index -> colors[index].toArgb() },
+                positions,
+                Shader.TileMode.CLAMP,
+            )
+    }
diff --git a/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/dimensions/DimensionExtensions.kt b/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/dimensions/DimensionExtensions.kt
index 44d64d130..b5e8eb211 100644
--- a/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/dimensions/DimensionExtensions.kt
+++ b/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/dimensions/DimensionExtensions.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 by Patryk Goworowski and Patrick Michalik.
+ * Copyright 2023 by Patryk Goworowski and Patrick Michalik.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,12 +23,13 @@ import com.patrykandpatrick.vico.core.dimensions.MutableDimensions
 /**
  * Creates a [MutableDimensions] instance with a common value for each coordinate.
  */
-public fun dimensionsOf(all: Dp): MutableDimensions = dimensionsOf(
-    start = all,
-    top = all,
-    end = all,
-    bottom = all,
-)
+public fun dimensionsOf(all: Dp): MutableDimensions =
+    dimensionsOf(
+        start = all,
+        top = all,
+        end = all,
+        bottom = all,
+    )
 
 /**
  * Creates a [MutableDimensions] instance using the provided measurements.
@@ -36,12 +37,13 @@ public fun dimensionsOf(all: Dp): MutableDimensions = dimensionsOf(
 public fun dimensionsOf(
     horizontal: Dp = 0.dp,
     vertical: Dp = 0.dp,
-): MutableDimensions = MutableDimensions(
-    startDp = horizontal.value,
-    topDp = vertical.value,
-    endDp = horizontal.value,
-    bottomDp = vertical.value,
-)
+): MutableDimensions =
+    MutableDimensions(
+        startDp = horizontal.value,
+        topDp = vertical.value,
+        endDp = horizontal.value,
+        bottomDp = vertical.value,
+    )
 
 /**
  * Creates a [MutableDimensions] instance using the provided measurements.
@@ -51,9 +53,10 @@ public fun dimensionsOf(
     top: Dp = 0.dp,
     end: Dp = 0.dp,
     bottom: Dp = 0.dp,
-): MutableDimensions = MutableDimensions(
-    startDp = start.value,
-    topDp = top.value,
-    endDp = end.value,
-    bottomDp = bottom.value,
-)
+): MutableDimensions =
+    MutableDimensions(
+        startDp = start.value,
+        topDp = top.value,
+        endDp = end.value,
+        bottomDp = bottom.value,
+    )
diff --git a/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/extension/ComponentExtensions.kt b/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/extension/ComponentExtensions.kt
index 842968e33..d03569d83 100644
--- a/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/extension/ComponentExtensions.kt
+++ b/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/extension/ComponentExtensions.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 by Patryk Goworowski and Patrick Michalik.
+ * Copyright 2023 by Patryk Goworowski and Patrick Michalik.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -31,7 +31,9 @@ import com.patrykandpatrick.vico.core.component.shape.ShapeComponent
  */
 public var MarkerComponent.indicatorSize: Dp
     get() = indicatorSizeDp.dp
-    set(value) { indicatorSizeDp = value.value }
+    set(value) {
+        indicatorSizeDp = value.value
+    }
 
 /**
  * Applies a drop shadow to this [ShapeComponent].
@@ -49,10 +51,11 @@ public fun <T : ShapeComponent> T.setShadow(
     dy: Dp = 0.dp,
     color: Color = Color(DEF_SHADOW_COLOR),
     applyElevationOverlay: Boolean = false,
-): T = setShadow(
-    radius = radius.value,
-    dx = dx.value,
-    dy = dy.value,
-    color = color.toArgb(),
-    applyElevationOverlay = applyElevationOverlay,
-) as T
+): T =
+    setShadow(
+        radius = radius.value,
+        dx = dx.value,
+        dy = dy.value,
+        color = color.toArgb(),
+        applyElevationOverlay = applyElevationOverlay,
+    ) as T
diff --git a/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/gesture/Zoomable.kt b/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/gesture/Zoomable.kt
index 10f3b7375..0b11b7d4c 100644
--- a/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/gesture/Zoomable.kt
+++ b/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/gesture/Zoomable.kt
@@ -41,19 +41,22 @@ public typealias OnZoom = (centroid: Offset, zoomChange: Float) -> Unit
 public fun Modifier.zoomable(
     onZoom: OnZoom,
     enabled: Boolean = true,
-): Modifier = composed(
-    factory = {
-        val block: suspend PointerInputScope.() -> Unit = remember {
-            {
-                detectZoomGestures { centroid, zoom ->
-                    onZoom(centroid, zoom)
+): Modifier =
+    composed(
+        factory = {
+            val block: suspend PointerInputScope.() -> Unit =
+                remember {
+                    {
+                        detectZoomGestures { centroid, zoom ->
+                            onZoom(centroid, zoom)
+                        }
+                    }
                 }
-            }
-        }
-        if (enabled) Modifier.pointerInput(Unit, block) else Modifier
-    },
-    inspectorInfo = debugInspectorInfo {
-        name = "zoomable"
-        properties["enabled"] = enabled
-    },
-)
+            if (enabled) Modifier.pointerInput(Unit, block) else Modifier
+        },
+        inspectorInfo =
+            debugInspectorInfo {
+                name = "zoomable"
+                properties["enabled"] = enabled
+            },
+    )
diff --git a/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/layout/MeasureContextExtensions.kt b/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/layout/MeasureContextExtensions.kt
index b20687319..fd30a8f1b 100644
--- a/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/layout/MeasureContextExtensions.kt
+++ b/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/layout/MeasureContextExtensions.kt
@@ -44,19 +44,20 @@ public fun getMeasureContext(
     horizontalLayout: HorizontalLayout,
     spToPx: (Float) -> Float,
     chartValuesProvider: ChartValuesProvider,
-): MutableMeasureContext = remember {
-    MutableMeasureContext(
-        canvasBounds = canvasBounds,
-        density = 0f,
-        isLtr = true,
-        spToPx = spToPx,
-        chartValuesProvider = chartValuesProvider,
-    )
-}.apply {
-    this.density = LocalDensity.current.density
-    this.isLtr = LocalLayoutDirection.current == LayoutDirection.Ltr
-    this.isHorizontalScrollEnabled = isHorizontalScrollEnabled
-    this.horizontalLayout = horizontalLayout
-    this.spToPx = spToPx
-    this.chartValuesProvider = chartValuesProvider
-}
+): MutableMeasureContext =
+    remember {
+        MutableMeasureContext(
+            canvasBounds = canvasBounds,
+            density = 0f,
+            isLtr = true,
+            spToPx = spToPx,
+            chartValuesProvider = chartValuesProvider,
+        )
+    }.apply {
+        this.density = LocalDensity.current.density
+        this.isLtr = LocalLayoutDirection.current == LayoutDirection.Ltr
+        this.isHorizontalScrollEnabled = isHorizontalScrollEnabled
+        this.horizontalLayout = horizontalLayout
+        this.spToPx = spToPx
+        this.chartValuesProvider = chartValuesProvider
+    }
diff --git a/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/legend/Legends.kt b/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/legend/Legends.kt
index 856c81e44..29d999fdc 100644
--- a/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/legend/Legends.kt
+++ b/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/legend/Legends.kt
@@ -45,15 +45,16 @@ public fun verticalLegend(
     iconPadding: Dp,
     spacing: Dp = 0.dp,
     padding: MutableDimensions = emptyDimensions(),
-): VerticalLegend = remember(items, iconSize, iconPadding, spacing, padding) {
-    VerticalLegend(
-        items = items,
-        iconSizeDp = iconSize.value,
-        iconPaddingDp = iconPadding.value,
-        spacingDp = spacing.value,
-        padding = padding,
-    )
-}
+): VerticalLegend =
+    remember(items, iconSize, iconPadding, spacing, padding) {
+        VerticalLegend(
+            items = items,
+            iconSizeDp = iconSize.value,
+            iconPaddingDp = iconPadding.value,
+            spacingDp = spacing.value,
+            padding = padding,
+        )
+    }
 
 /**
  * Defines the appearance of an item of a [Legend].
@@ -67,13 +68,14 @@ public fun legendItem(
     icon: Component,
     label: TextComponent,
     labelText: CharSequence,
-): LegendItem = remember(icon, label, labelText) {
-    LegendItem(
-        icon = icon,
-        label = label,
-        labelText = labelText,
-    )
-}
+): LegendItem =
+    remember(icon, label, labelText) {
+        LegendItem(
+            icon = icon,
+            label = label,
+            labelText = labelText,
+        )
+    }
 
 /**
  * Creates a [HorizontalLegend].
@@ -93,13 +95,14 @@ public fun horizontalLegend(
     lineSpacing: Dp = 0.dp,
     spacing: Dp = 0.dp,
     padding: MutableDimensions = emptyDimensions(),
-): HorizontalLegend = remember(items, iconSize, iconPadding, spacing, padding) {
-    HorizontalLegend(
-        items = items,
-        iconSizeDp = iconSize.value,
-        iconPaddingDp = iconPadding.value,
-        lineSpacingDp = lineSpacing.value,
-        spacingDp = spacing.value,
-        padding = padding,
-    )
-}
+): HorizontalLegend =
+    remember(items, iconSize, iconPadding, spacing, padding) {
+        HorizontalLegend(
+            items = items,
+            iconSizeDp = iconSize.value,
+            iconPaddingDp = iconPadding.value,
+            lineSpacingDp = lineSpacing.value,
+            spacingDp = spacing.value,
+            padding = padding,
+        )
+    }
diff --git a/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/state/ChartEntryModelWrapper.kt b/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/state/ChartEntryModelWrapper.kt
index dc5580210..ea5578c15 100644
--- a/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/state/ChartEntryModelWrapper.kt
+++ b/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/state/ChartEntryModelWrapper.kt
@@ -57,7 +57,10 @@ internal class ChartEntryModelWrapperState<T : ChartEntryModel> : State<ChartEnt
     override var value by mutableStateOf<ChartEntryModelWrapper<T>>(ChartEntryModelWrapper())
         private set
 
-    fun set(chartEntryModel: T?, chartValuesProvider: ChartValuesProvider) {
+    fun set(
+        chartEntryModel: T?,
+        chartValuesProvider: ChartValuesProvider,
+    ) {
         val currentChartEntryModel = value.chartEntryModel
         if (chartEntryModel?.id != currentChartEntryModel?.id) previousChartEntryModel = currentChartEntryModel
         value = ChartEntryModelWrapper(chartEntryModel, previousChartEntryModel, chartValuesProvider)
diff --git a/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/style/ChartStyle.kt b/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/style/ChartStyle.kt
index fcf8cace1..eeebfa77f 100644
--- a/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/style/ChartStyle.kt
+++ b/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/style/ChartStyle.kt
@@ -109,11 +109,12 @@ public data class ChartStyle(
         val axisLabelTextAlignment: Layout.Alignment = Layout.Alignment.ALIGN_NORMAL,
         val axisGuidelineColor: Color,
         val axisGuidelineWidth: Dp = DefaultDimens.AXIS_GUIDELINE_WIDTH.dp,
-        val axisGuidelineShape: Shape = Shapes.dashedShape(
-            shape = Shapes.rectShape,
-            dashLength = DefaultDimens.DASH_LENGTH.dp,
-            gapLength = DefaultDimens.DASH_GAP.dp,
-        ),
+        val axisGuidelineShape: Shape =
+            Shapes.dashedShape(
+                shape = Shapes.rectShape,
+                dashLength = DefaultDimens.DASH_LENGTH.dp,
+                gapLength = DefaultDimens.DASH_GAP.dp,
+            ),
         val axisLineColor: Color,
         val axisLineWidth: Dp = DefaultDimens.AXIS_LINE_WIDTH.dp,
         val axisLineShape: Shape = Shapes.rectShape,
@@ -177,7 +178,6 @@ public data class ChartStyle(
     )
 
     public companion object {
-
         /**
          * Creates a base implementation of [ChartStyle] using the provided colors.
          */
@@ -187,43 +187,54 @@ public data class ChartStyle(
             axisLineColor: Color,
             entityColors: List<Color>,
             elevationOverlayColor: Color,
-        ): ChartStyle = ChartStyle(
-            axis = Axis(
-                axisLabelColor = axisLabelColor,
-                axisGuidelineColor = axisGuidelineColor,
-                axisLineColor = axisLineColor,
-            ),
-            columnChart = ColumnChart(
-                columns = entityColors.map { entityColor ->
-                    LineComponent(
-                        color = entityColor.toArgb(),
-                        thicknessDp = DefaultDimens.COLUMN_WIDTH,
-                        shape = Shapes.roundedCornerShape(allPercent = DefaultDimens.COLUMN_ROUNDNESS_PERCENT),
-                    )
-                },
-            ),
-            lineChart = LineChart(
-                lines = entityColors.map { entityColor ->
-                    lineSpec(
-                        lineShader = DynamicShaders.solid(entityColor),
-                    )
-                },
-            ),
-            marker = Marker(),
-            elevationOverlayColor = elevationOverlayColor,
-        )
+        ): ChartStyle =
+            ChartStyle(
+                axis =
+                    Axis(
+                        axisLabelColor = axisLabelColor,
+                        axisGuidelineColor = axisGuidelineColor,
+                        axisLineColor = axisLineColor,
+                    ),
+                columnChart =
+                    ColumnChart(
+                        columns =
+                            entityColors.map { entityColor ->
+                                LineComponent(
+                                    color = entityColor.toArgb(),
+                                    thicknessDp = DefaultDimens.COLUMN_WIDTH,
+                                    shape =
+                                        Shapes.roundedCornerShape(
+                                            allPercent = DefaultDimens.COLUMN_ROUNDNESS_PERCENT,
+                                        ),
+                                )
+                            },
+                    ),
+                lineChart =
+                    LineChart(
+                        lines =
+                            entityColors.map { entityColor ->
+                                lineSpec(
+                                    lineShader = DynamicShaders.solid(entityColor),
+                                )
+                            },
+                    ),
+                marker = Marker(),
+                elevationOverlayColor = elevationOverlayColor,
+            )
 
-        internal fun fromDefaultColors(defaultColors: DefaultColors) = fromColors(
-            axisLabelColor = Color(defaultColors.axisLabelColor),
-            axisGuidelineColor = Color(defaultColors.axisGuidelineColor),
-            axisLineColor = Color(defaultColors.axisLineColor),
-            entityColors = listOf(
-                defaultColors.entity1Color,
-                defaultColors.entity2Color,
-                defaultColors.entity3Color,
-            ).map(::Color),
-            elevationOverlayColor = Color(defaultColors.elevationOverlayColor),
-        )
+        internal fun fromDefaultColors(defaultColors: DefaultColors) =
+            fromColors(
+                axisLabelColor = Color(defaultColors.axisLabelColor),
+                axisGuidelineColor = Color(defaultColors.axisGuidelineColor),
+                axisLineColor = Color(defaultColors.axisLineColor),
+                entityColors =
+                    listOf(
+                        defaultColors.entity1Color,
+                        defaultColors.entity2Color,
+                        defaultColors.entity3Color,
+                    ).map(::Color),
+                elevationOverlayColor = Color(defaultColors.elevationOverlayColor),
+            )
     }
 }
 
@@ -231,7 +242,6 @@ public data class ChartStyle(
  * Provides a [ChartStyle] instance.
  */
 public object LocalChartStyle {
-
     internal val default: ChartStyle
         @Composable
         get() {
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/Defaults.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/Defaults.kt
index 6f55fc4a2..e187e5f80 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/Defaults.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/Defaults.kt
@@ -223,9 +223,7 @@ public object DefaultDimens {
 /**
  * The default chart colors.
  */
-@Suppress("MagicNumber")
 public interface DefaultColors {
-
     /**
      * The default color for elevation overlays. Its opacity is modified depending on the elevation.
      */
@@ -273,7 +271,6 @@ public interface DefaultColors {
      * The default chart colors for light mode.
      */
     public object Light : DefaultColors {
-
         override val elevationOverlayColor: Long = 0x00000000
 
         override val axisLabelColor: Long = 0xDE000000
@@ -291,7 +288,6 @@ public interface DefaultColors {
      * The default chart colors for dark mode.
      */
     public object Dark : DefaultColors {
-
         override val elevationOverlayColor: Long = 0xFFFFFFFF
 
         override val axisLabelColor: Long = 0xFFFFFFFF
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/axis/Axis.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/axis/Axis.kt
index 1451ac395..94301af45 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/axis/Axis.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/axis/Axis.kt
@@ -37,7 +37,6 @@ import com.patrykandpatrick.vico.core.extension.setAll
  * @see VerticalAxis
  */
 public abstract class Axis<Position : AxisPosition> : AxisRenderer<Position> {
-
     private val restrictedBounds: MutableList<RectF> = mutableListOf()
 
     override val bounds: RectF = RectF()
@@ -113,9 +112,10 @@ public abstract class Axis<Position : AxisPosition> : AxisRenderer<Position> {
         top: Float,
         right: Float,
         bottom: Float,
-    ): Boolean = restrictedBounds.none {
-        it.contains(left, top, right, bottom) || it.intersects(left, top, right, bottom)
-    }
+    ): Boolean =
+        restrictedBounds.none {
+            it.contains(left, top, right, bottom) || it.intersects(left, top, right, bottom)
+        }
 
     /**
      * Used to construct [Axis] instances.
@@ -182,7 +182,6 @@ public abstract class Axis<Position : AxisPosition> : AxisRenderer<Position> {
      * @see [HorizontalAxis]
      */
     public sealed class SizeConstraint {
-
         /**
          * The axis will measure itself and use as much space as it needs, but no less than [minSizeDp], and no more
          * than [maxSizeDp].
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/axis/AxisItemPlacer.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/axis/AxisItemPlacer.kt
index 8a6813e13..5fa26d39c 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/axis/AxisItemPlacer.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/axis/AxisItemPlacer.kt
@@ -36,14 +36,11 @@ public interface AxisItemPlacer {
      * An [AxisItemPlacer] subinterface for [HorizontalAxis] instances.
      */
     public interface Horizontal : AxisItemPlacer {
-
         /**
          * Whether ticks whose _x_ values are bounds of the _x_-axis value range should be shifted to the edges of the
          * axis bounds, to be aligned with the vertical axes.
          */
-        public fun getShiftExtremeTicks(
-            context: ChartDrawContext,
-        ): Boolean = true
+        public fun getShiftExtremeTicks(context: ChartDrawContext): Boolean = true
 
         /**
          * Returns a boolean indicating whether the [HorizontalAxis] should reserve room for a label for
@@ -206,8 +203,10 @@ public interface AxisItemPlacer {
              * they’re immediately above the [Chart]’s bounds. If the chart has a top axis, the shifted tick will then
              * be aligned with this axis, and the shifted guideline will be hidden.
              */
-            public fun default(maxItemCount: Int = DEF_LABEL_COUNT, shiftTopLines: Boolean = true): Vertical =
-                DefaultVerticalAxisItemPlacer(maxItemCount, shiftTopLines)
+            public fun default(
+                maxItemCount: Int = DEF_LABEL_COUNT,
+                shiftTopLines: Boolean = true,
+            ): Vertical = DefaultVerticalAxisItemPlacer(maxItemCount, shiftTopLines)
         }
     }
 }
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/axis/AxisManager.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/axis/AxisManager.kt
index 9e0c690db..05973bdc6 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/axis/AxisManager.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/axis/AxisManager.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 by Patryk Goworowski and Patrick Michalik.
+ * Copyright 2023 by Patryk Goworowski and Patrick Michalik.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -30,7 +30,6 @@ import com.patrykandpatrick.vico.core.context.MeasureContext
  * @see AxisRenderer
  */
 public open class AxisManager {
-
     internal val axisCache = ArrayList<AxisRenderer<*>>(MAX_AXIS_COUNT)
 
     /**
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/axis/AxisPosition.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/axis/AxisPosition.kt
index c4c57191e..2e8826b22 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/axis/AxisPosition.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/axis/AxisPosition.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 by Patryk Goworowski and Patrick Michalik.
+ * Copyright 2023 by Patryk Goworowski and Patrick Michalik.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,7 +22,6 @@ import com.patrykandpatrick.vico.core.chart.Chart
  * Defines the position of an axis relative to its [Chart].
  */
 public sealed class AxisPosition {
-
     /**
      * Whether the axis is at the top of its [Chart].
      */
@@ -50,20 +49,17 @@ public sealed class AxisPosition {
     /**
      * Whether the axis is on the left of its [Chart]. The layout direction is considered here.
      */
-    public fun isLeft(isLtr: Boolean): Boolean =
-        this is Vertical.Start && isLtr || this is Vertical.End && isLtr.not()
+    public fun isLeft(isLtr: Boolean): Boolean = this is Vertical.Start && isLtr || this is Vertical.End && isLtr.not()
 
     /**
      * Whether the axis is on the right of its [Chart]. The layout direction is considered here.
      */
-    public fun isRight(isLtr: Boolean): Boolean =
-        this is Vertical.End && isLtr || this is Vertical.Start && isLtr.not()
+    public fun isRight(isLtr: Boolean): Boolean = this is Vertical.End && isLtr || this is Vertical.Start && isLtr.not()
 
     /**
      * Defines the position of a horizontal axis relative to its [Chart].
      */
     public sealed class Horizontal : AxisPosition() {
-
         /**
          * The horizontal axis will be placed at the top of its [Chart].
          */
@@ -79,7 +75,6 @@ public sealed class AxisPosition {
      * Defines the position of a vertical axis relative to its [Chart].
      */
     public sealed class Vertical : AxisPosition() {
-
         /**
          * The vertical axis will be placed at the start of its [Chart].
          */
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/axis/AxisRenderer.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/axis/AxisRenderer.kt
index 5a5d19e10..f9c267cc6 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/axis/AxisRenderer.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/axis/AxisRenderer.kt
@@ -28,7 +28,6 @@ import com.patrykandpatrick.vico.core.dimensions.BoundsAware
  * Defines the minimal set of properties and functions required by other parts of the library to draw an axis.
  */
 public interface AxisRenderer<Position : AxisPosition> : BoundsAware, ChartInsetter {
-
     /**
      * Defines the position of the axis relative to the [Chart].
      */
@@ -59,5 +58,8 @@ public interface AxisRenderer<Position : AxisPosition> : BoundsAware, ChartInset
     /**
      * Updates the chart’s [MutableHorizontalDimensions] instance.
      */
-    public fun updateHorizontalDimensions(context: MeasureContext, horizontalDimensions: MutableHorizontalDimensions)
+    public fun updateHorizontalDimensions(
+        context: MeasureContext,
+        horizontalDimensions: MutableHorizontalDimensions,
+    )
 }
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/axis/formatter/DecimalFormatAxisValueFormatter.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/axis/formatter/DecimalFormatAxisValueFormatter.kt
index 205c88b2f..865879e2d 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/axis/formatter/DecimalFormatAxisValueFormatter.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/axis/formatter/DecimalFormatAxisValueFormatter.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 by Patryk Goworowski and Patrick Michalik.
+ * Copyright 2023 by Patryk Goworowski and Patrick Michalik.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,7 +26,6 @@ import java.text.DecimalFormat
  */
 public class DecimalFormatAxisValueFormatter<Position : AxisPosition>(decimalFormat: DecimalFormat) :
     AxisValueFormatter<Position>, DecimalFormatValueFormatter(decimalFormat = decimalFormat) {
-
     /**
      * Creates a [DecimalFormatAxisValueFormatter] using the default pattern.
      */
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/axis/formatter/PercentageFormatAxisValueFormatter.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/axis/formatter/PercentageFormatAxisValueFormatter.kt
index dae75ebe5..466fc5e6c 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/axis/formatter/PercentageFormatAxisValueFormatter.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/axis/formatter/PercentageFormatAxisValueFormatter.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 by Patryk Goworowski and Patrick Michalik.
+ * Copyright 2023 by Patryk Goworowski and Patrick Michalik.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,7 +28,6 @@ import java.text.DecimalFormat
  */
 public class PercentageFormatAxisValueFormatter<Position : AxisPosition.Vertical>(pattern: String) :
     AxisValueFormatter<Position>, PercentageFormatValueFormatter(pattern = pattern) {
-
     /**
      * Creates a [PercentageFormatAxisValueFormatter] using the default percentage pattern.
      */
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/axis/horizontal/DefaultHorizontalAxisItemPlacer.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/axis/horizontal/DefaultHorizontalAxisItemPlacer.kt
index 842e4b631..ab0a54784 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/axis/horizontal/DefaultHorizontalAxisItemPlacer.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/axis/horizontal/DefaultHorizontalAxisItemPlacer.kt
@@ -30,7 +30,6 @@ internal class DefaultHorizontalAxisItemPlacer(
     private val shiftExtremeTicks: Boolean,
     private val addExtremeLabelPadding: Boolean,
 ) : AxisItemPlacer.Horizontal {
-
     override fun getShiftExtremeTicks(context: ChartDrawContext): Boolean = shiftExtremeTicks
 
     override fun getAddFirstLabelPadding(context: MeasureContext) =
@@ -42,7 +41,6 @@ internal class DefaultHorizontalAxisItemPlacer(
             (chartValues.maxX - chartValues.minX - chartValues.xStep * offset) % (chartValues.xStep * spacing) == 0f
     }
 
-    @Suppress("LoopWithTooManyJumpStatements")
     override fun getLabelValues(
         context: ChartDrawContext,
         visibleXRange: ClosedFloatingPointRange<Float>,
@@ -75,7 +73,6 @@ internal class DefaultHorizontalAxisItemPlacer(
         return listOf(chartValues.minX, (chartValues.minX + chartValues.maxX).half, chartValues.maxX)
     }
 
-    @Suppress("LoopWithTooManyJumpStatements")
     override fun getLineValues(
         context: ChartDrawContext,
         visibleXRange: ClosedFloatingPointRange<Float>,
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/axis/horizontal/HorizontalAxis.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/axis/horizontal/HorizontalAxis.kt
index 172a5a35d..34fb6eeeb 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/axis/horizontal/HorizontalAxis.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/axis/horizontal/HorizontalAxis.kt
@@ -45,7 +45,6 @@ import kotlin.math.min
 public class HorizontalAxis<Position : AxisPosition.Horizontal>(
     override val position: Position,
 ) : Axis<Position>() {
-
     private val AxisPosition.Horizontal.textVerticalPosition: VerticalPosition
         get() = if (isBottom) VerticalPosition.Bottom else VerticalPosition.Top
 
@@ -54,97 +53,104 @@ public class HorizontalAxis<Position : AxisPosition.Horizontal>(
      */
     public var itemPlacer: AxisItemPlacer.Horizontal = AxisItemPlacer.Horizontal.default()
 
-    override fun drawBehindChart(context: ChartDrawContext): Unit = with(context) {
-        val clipRestoreCount = canvas.save()
-        val tickMarkTop = if (position.isBottom) bounds.top else bounds.bottom - axisThickness - tickLength
-        val tickMarkBottom = tickMarkTop + axisThickness + tickLength
-        val chartValues = chartValuesProvider.getChartValues()
+    override fun drawBehindChart(context: ChartDrawContext): Unit =
+        with(context) {
+            val clipRestoreCount = canvas.save()
+            val tickMarkTop = if (position.isBottom) bounds.top else bounds.bottom - axisThickness - tickLength
+            val tickMarkBottom = tickMarkTop + axisThickness + tickLength
+            val chartValues = chartValuesProvider.getChartValues()
+
+            canvas.clipRect(
+                bounds.left - itemPlacer.getStartHorizontalAxisInset(this, horizontalDimensions, tickThickness),
+                minOf(bounds.top, chartBounds.top),
+                bounds.right + itemPlacer.getEndHorizontalAxisInset(this, horizontalDimensions, tickThickness),
+                maxOf(bounds.bottom, chartBounds.bottom),
+            )
 
-        canvas.clipRect(
-            bounds.left - itemPlacer.getStartHorizontalAxisInset(this, horizontalDimensions, tickThickness),
-            minOf(bounds.top, chartBounds.top),
-            bounds.right + itemPlacer.getEndHorizontalAxisInset(this, horizontalDimensions, tickThickness),
-            maxOf(bounds.bottom, chartBounds.bottom),
-        )
+            val textY = if (position.isBottom) tickMarkBottom else tickMarkTop
+            val fullXRange = getFullXRange(horizontalDimensions)
+            val baseCanvasX =
+                bounds.getStart(isLtr) - horizontalScroll + horizontalDimensions.startPadding *
+                    layoutDirectionMultiplier
+            val firstVisibleX =
+                fullXRange.start + horizontalScroll / horizontalDimensions.xSpacing * chartValues.xStep *
+                    layoutDirectionMultiplier
+            val lastVisibleX = firstVisibleX + bounds.width() / horizontalDimensions.xSpacing * chartValues.xStep
+            val visibleXRange = firstVisibleX..lastVisibleX
+            val labelValues = itemPlacer.getLabelValues(this, visibleXRange, fullXRange)
+            val lineValues = itemPlacer.getLineValues(this, visibleXRange, fullXRange)
+
+            labelValues.forEachIndexed { index, x ->
+                val canvasX =
+                    baseCanvasX + (x - chartValues.minX) / chartValues.xStep * horizontalDimensions.xSpacing *
+                        layoutDirectionMultiplier
+                val previousX = labelValues.getOrNull(index - 1) ?: (fullXRange.start.doubled - x)
+                val nextX = labelValues.getOrNull(index + 1) ?: (fullXRange.endInclusive.doubled - x)
+                val maxWidth =
+                    (min(x - previousX, nextX - x) / chartValues.xStep * horizontalDimensions.xSpacing).ceil.toInt()
+
+                label?.drawText(
+                    context = context,
+                    text = valueFormatter.formatValue(x, chartValues),
+                    textX = canvasX,
+                    textY = textY,
+                    verticalPosition = position.textVerticalPosition,
+                    maxTextWidth = maxWidth,
+                    maxTextHeight = (bounds.height() - tickLength - axisThickness.half).toInt(),
+                    rotationDegrees = labelRotationDegrees,
+                )
 
-        val textY = if (position.isBottom) tickMarkBottom else tickMarkTop
-        val fullXRange = getFullXRange(horizontalDimensions)
-        val baseCanvasX = bounds.getStart(isLtr) - horizontalScroll + horizontalDimensions.startPadding *
-            layoutDirectionMultiplier
-        val firstVisibleX = fullXRange.start + horizontalScroll / horizontalDimensions.xSpacing * chartValues.xStep *
-            layoutDirectionMultiplier
-        val lastVisibleX = firstVisibleX + bounds.width() / horizontalDimensions.xSpacing * chartValues.xStep
-        val visibleXRange = firstVisibleX..lastVisibleX
-        val labelValues = itemPlacer.getLabelValues(this, visibleXRange, fullXRange)
-        val lineValues = itemPlacer.getLineValues(this, visibleXRange, fullXRange)
-
-        labelValues.forEachIndexed { index, x ->
-            val canvasX = baseCanvasX + (x - chartValues.minX) / chartValues.xStep * horizontalDimensions.xSpacing *
-                layoutDirectionMultiplier
-            val previousX = labelValues.getOrNull(index - 1) ?: (fullXRange.start.doubled - x)
-            val nextX = labelValues.getOrNull(index + 1) ?: (fullXRange.endInclusive.doubled - x)
-            val maxWidth =
-                (min(x - previousX, nextX - x) / chartValues.xStep * horizontalDimensions.xSpacing).ceil.toInt()
-
-            label?.drawText(
-                context = context,
-                text = valueFormatter.formatValue(x, chartValues),
-                textX = canvasX,
-                textY = textY,
-                verticalPosition = position.textVerticalPosition,
-                maxTextWidth = maxWidth,
-                maxTextHeight = (bounds.height() - tickLength - axisThickness.half).toInt(),
-                rotationDegrees = labelRotationDegrees,
-            )
+                if (lineValues == null) {
+                    tick?.drawVertical(
+                        context = this,
+                        top = tickMarkTop,
+                        bottom = tickMarkBottom,
+                        centerX = canvasX + getLinesCorrectionX(x, fullXRange),
+                    )
+                }
+            }
 
-            if (lineValues == null) {
+            lineValues?.forEach { x ->
                 tick?.drawVertical(
                     context = this,
                     top = tickMarkTop,
                     bottom = tickMarkBottom,
-                    centerX = canvasX + getLinesCorrectionX(x, fullXRange),
+                    centerX =
+                        baseCanvasX + (x - chartValues.minX) / chartValues.xStep * horizontalDimensions.xSpacing *
+                            layoutDirectionMultiplier + getLinesCorrectionX(x, fullXRange),
                 )
             }
-        }
-
-        lineValues?.forEach { x ->
-            tick?.drawVertical(
-                context = this,
-                top = tickMarkTop,
-                bottom = tickMarkBottom,
-                centerX = baseCanvasX + (x - chartValues.minX) / chartValues.xStep * horizontalDimensions.xSpacing *
-                    layoutDirectionMultiplier + getLinesCorrectionX(x, fullXRange),
-            )
-        }
-
-        val axisLineExtend = if (itemPlacer.getShiftExtremeTicks(context)) {
-            tickThickness
-        } else {
-            tickThickness.half
-        }
 
-        axisLine?.drawHorizontal(
-            context = context,
-            left = chartBounds.left - axisLineExtend,
-            right = chartBounds.right + axisLineExtend,
-            centerY = if (position.isBottom) bounds.top + axisThickness.half else bounds.bottom - axisThickness.half,
-        )
+            val axisLineExtend =
+                if (itemPlacer.getShiftExtremeTicks(context)) {
+                    tickThickness
+                } else {
+                    tickThickness.half
+                }
 
-        title?.let { title ->
-            titleComponent?.drawText(
+            axisLine?.drawHorizontal(
                 context = context,
-                textX = bounds.centerX(),
-                textY = if (position.isTop) bounds.top else bounds.bottom,
-                verticalPosition = if (position.isTop) VerticalPosition.Bottom else VerticalPosition.Top,
-                maxTextWidth = bounds.width().toInt(),
-                text = title,
+                left = chartBounds.left - axisLineExtend,
+                right = chartBounds.right + axisLineExtend,
+                centerY =
+                    if (position.isBottom) bounds.top + axisThickness.half else bounds.bottom - axisThickness.half,
             )
-        }
 
-        if (clipRestoreCount >= 0) canvas.restoreToCount(clipRestoreCount)
+            title?.let { title ->
+                titleComponent?.drawText(
+                    context = context,
+                    textX = bounds.centerX(),
+                    textY = if (position.isTop) bounds.top else bounds.bottom,
+                    verticalPosition = if (position.isTop) VerticalPosition.Bottom else VerticalPosition.Top,
+                    maxTextWidth = bounds.width().toInt(),
+                    text = title,
+                )
+            }
 
-        drawGuidelines(baseCanvasX, fullXRange, labelValues, lineValues)
-    }
+            if (clipRestoreCount >= 0) canvas.restoreToCount(clipRestoreCount)
+
+            drawGuidelines(baseCanvasX, fullXRange, labelValues, lineValues)
+        }
 
     private fun ChartDrawContext.drawGuidelines(
         baseCanvasX: Float,
@@ -160,8 +166,9 @@ public class HorizontalAxis<Position : AxisPosition.Horizontal>(
 
         if (lineValues == null) {
             labelValues.forEach { x ->
-                val canvasX = baseCanvasX + (x - chartValues.minX) / chartValues.xStep * horizontalDimensions.xSpacing *
-                    layoutDirectionMultiplier
+                val canvasX =
+                    baseCanvasX + (x - chartValues.minX) / chartValues.xStep * horizontalDimensions.xSpacing *
+                        layoutDirectionMultiplier
 
                 guideline
                     .takeUnless { x.isBoundOf(fullXRange) }
@@ -169,8 +176,9 @@ public class HorizontalAxis<Position : AxisPosition.Horizontal>(
             }
         } else {
             lineValues.forEach { x ->
-                val canvasX = baseCanvasX + (x - chartValues.minX) / chartValues.xStep * horizontalDimensions.xSpacing *
-                    layoutDirectionMultiplier + getLinesCorrectionX(x, fullXRange)
+                val canvasX =
+                    baseCanvasX + (x - chartValues.minX) / chartValues.xStep * horizontalDimensions.xSpacing *
+                        layoutDirectionMultiplier + getLinesCorrectionX(x, fullXRange)
 
                 guideline
                     .takeUnless { x.isBoundOf(fullXRange) }
@@ -200,24 +208,26 @@ public class HorizontalAxis<Position : AxisPosition.Horizontal>(
     ) {
         val chartValues = context.chartValuesProvider.getChartValues()
         horizontalDimensions.ensureValuesAtLeast(
-            unscalableStartPadding = label
-                .takeIf { itemPlacer.getAddFirstLabelPadding(context) }
-                ?.getWidth(
-                    context = context,
-                    text = valueFormatter.formatValue(chartValues.minX, chartValues),
-                    pad = true,
-                )
-                ?.half
-                .orZero,
-            unscalableEndPadding = label
-                .takeIf { itemPlacer.getAddLastLabelPadding(context) }
-                ?.getWidth(
-                    context = context,
-                    text = valueFormatter.formatValue(chartValues.maxX, chartValues),
-                    pad = true,
-                )
-                ?.half
-                .orZero,
+            unscalableStartPadding =
+                label
+                    .takeIf { itemPlacer.getAddFirstLabelPadding(context) }
+                    ?.getWidth(
+                        context = context,
+                        text = valueFormatter.formatValue(chartValues.minX, chartValues),
+                        pad = true,
+                    )
+                    ?.half
+                    .orZero,
+            unscalableEndPadding =
+                label
+                    .takeIf { itemPlacer.getAddLastLabelPadding(context) }
+                    ?.getWidth(
+                        context = context,
+                        text = valueFormatter.formatValue(chartValues.maxX, chartValues),
+                        pad = true,
+                    )
+                    ?.half
+                    .orZero,
         )
     }
 
@@ -225,64 +235,73 @@ public class HorizontalAxis<Position : AxisPosition.Horizontal>(
         context: MeasureContext,
         outInsets: Insets,
         horizontalDimensions: HorizontalDimensions,
-    ): Unit = with(outInsets) {
-        start = itemPlacer.getStartHorizontalAxisInset(context, horizontalDimensions, context.tickThickness)
-        end = itemPlacer.getEndHorizontalAxisInset(context, horizontalDimensions, context.tickThickness)
-        top = if (position.isTop) getDesiredHeight(context, horizontalDimensions) else 0f
-        bottom = if (position.isBottom) getDesiredHeight(context, horizontalDimensions) else 0f
-    }
+    ): Unit =
+        with(outInsets) {
+            start = itemPlacer.getStartHorizontalAxisInset(context, horizontalDimensions, context.tickThickness)
+            end = itemPlacer.getEndHorizontalAxisInset(context, horizontalDimensions, context.tickThickness)
+            top = if (position.isTop) getDesiredHeight(context, horizontalDimensions) else 0f
+            bottom = if (position.isBottom) getDesiredHeight(context, horizontalDimensions) else 0f
+        }
 
     private fun MeasureContext.getFullXRange(
         horizontalDimensions: HorizontalDimensions,
-    ): ClosedFloatingPointRange<Float> = with(horizontalDimensions) {
-        val chartValues = chartValuesProvider.getChartValues()
-        val start = chartValues.minX - startPadding / xSpacing * chartValues.xStep
-        val end = chartValues.maxX + endPadding / xSpacing * chartValues.xStep
-        start..end
-    }
+    ): ClosedFloatingPointRange<Float> =
+        with(horizontalDimensions) {
+            val chartValues = chartValuesProvider.getChartValues()
+            val start = chartValues.minX - startPadding / xSpacing * chartValues.xStep
+            val end = chartValues.maxX + endPadding / xSpacing * chartValues.xStep
+            start..end
+        }
 
     private fun getDesiredHeight(
         context: MeasureContext,
         horizontalDimensions: HorizontalDimensions,
-    ): Float = with(context) {
-        val chartValues = chartValuesProvider.getChartValues()
-        val fullXRange = getFullXRange(horizontalDimensions)
-
-        when (val constraint = sizeConstraint) {
-            is SizeConstraint.Auto -> {
-                val labelHeight = label?.let { label ->
-                    itemPlacer
-                        .getMeasuredLabelValues(this, horizontalDimensions, fullXRange)
-                        .map { valueFormatter.formatValue(it, chartValues) }
-                        .maxOf { labelText ->
-                            label.getHeight(
-                                context = this,
-                                text = labelText,
-                                rotationDegrees = labelRotationDegrees,
-                                pad = true,
-                            ).orZero
-                        }
-                }.orZero
-                val titleComponentHeight = title?.let { title ->
-                    titleComponent?.getHeight(
-                        context = context,
-                        width = bounds.width().toInt(),
-                        text = title,
-                    )
-                }.orZero
-                (labelHeight + titleComponentHeight + (if (position.isBottom) axisThickness else 0f) + tickLength)
-                    .coerceAtMost(maximumValue = canvasBounds.height() / MAX_HEIGHT_DIVISOR)
-                    .coerceIn(minimumValue = constraint.minSizeDp.pixels, maximumValue = constraint.maxSizeDp.pixels)
+    ): Float =
+        with(context) {
+            val chartValues = chartValuesProvider.getChartValues()
+            val fullXRange = getFullXRange(horizontalDimensions)
+
+            when (val constraint = sizeConstraint) {
+                is SizeConstraint.Auto -> {
+                    val labelHeight =
+                        label?.let { label ->
+                            itemPlacer
+                                .getMeasuredLabelValues(this, horizontalDimensions, fullXRange)
+                                .map { valueFormatter.formatValue(it, chartValues) }
+                                .maxOf { labelText ->
+                                    label.getHeight(
+                                        context = this,
+                                        text = labelText,
+                                        rotationDegrees = labelRotationDegrees,
+                                        pad = true,
+                                    ).orZero
+                                }
+                        }.orZero
+                    val titleComponentHeight =
+                        title?.let { title ->
+                            titleComponent?.getHeight(
+                                context = context,
+                                width = bounds.width().toInt(),
+                                text = title,
+                            )
+                        }.orZero
+                    (labelHeight + titleComponentHeight + (if (position.isBottom) axisThickness else 0f) + tickLength)
+                        .coerceAtMost(maximumValue = canvasBounds.height() / MAX_HEIGHT_DIVISOR)
+                        .coerceIn(
+                            minimumValue = constraint.minSizeDp.pixels,
+                            maximumValue = constraint.maxSizeDp.pixels,
+                        )
+                }
+                is SizeConstraint.Exact -> constraint.sizeDp.pixels
+                is SizeConstraint.Fraction -> canvasBounds.height() * constraint.fraction
+                is SizeConstraint.TextWidth ->
+                    label?.getHeight(
+                        context = this,
+                        text = constraint.text,
+                        rotationDegrees = labelRotationDegrees,
+                    ).orZero
             }
-            is SizeConstraint.Exact -> constraint.sizeDp.pixels
-            is SizeConstraint.Fraction -> canvasBounds.height() * constraint.fraction
-            is SizeConstraint.TextWidth -> label?.getHeight(
-                context = this,
-                text = constraint.text,
-                rotationDegrees = labelRotationDegrees,
-            ).orZero
         }
-    }
 
     /**
      * A subclass of [Axis.Builder] used to build [HorizontalAxis] instances.
@@ -290,7 +309,6 @@ public class HorizontalAxis<Position : AxisPosition.Horizontal>(
     public class Builder<Position : AxisPosition.Horizontal>(
         builder: Axis.Builder<Position>? = null,
     ) : Axis.Builder<Position>(builder) {
-
         /**
          * Determines for what _x_ values the [HorizontalAxis] is to display labels, ticks, and guidelines.
          */
@@ -301,11 +319,12 @@ public class HorizontalAxis<Position : AxisPosition.Horizontal>(
          */
         @Suppress("UNCHECKED_CAST")
         public inline fun <reified T : Position> build(): HorizontalAxis<T> {
-            val position = when (T::class.java) {
-                AxisPosition.Horizontal.Top::class.java -> AxisPosition.Horizontal.Top
-                AxisPosition.Horizontal.Bottom::class.java -> AxisPosition.Horizontal.Bottom
-                else -> throw UnknownAxisPositionException(T::class.java)
-            } as Position
+            val position =
+                when (T::class.java) {
+                    AxisPosition.Horizontal.Top::class.java -> AxisPosition.Horizontal.Top
+                    AxisPosition.Horizontal.Bottom::class.java -> AxisPosition.Horizontal.Bottom
+                    else -> throw UnknownAxisPositionException(T::class.java)
+                } as Position
             return setTo(HorizontalAxis(position = position)).also { it.itemPlacer = itemPlacer } as HorizontalAxis<T>
         }
     }
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/axis/vertical/DefaultVerticalAxisItemPlacer.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/axis/vertical/DefaultVerticalAxisItemPlacer.kt
index 06d723685..56e723c36 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/axis/vertical/DefaultVerticalAxisItemPlacer.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/axis/vertical/DefaultVerticalAxisItemPlacer.kt
@@ -28,7 +28,6 @@ internal class DefaultVerticalAxisItemPlacer(
     private val maxItemCount: Int,
     private val shiftTopLines: Boolean,
 ) : AxisItemPlacer.Vertical {
-
     init {
         require(maxItemCount >= 0) { "`maxItemCount` must be nonnegative." }
     }
@@ -85,17 +84,22 @@ internal class DefaultVerticalAxisItemPlacer(
         verticalLabelPosition: VerticalAxis.VerticalLabelPosition,
         maxLabelHeight: Float,
         maxLineThickness: Float,
-    ): Float = when {
-        maxItemCount == 0 -> 0f
-        verticalLabelPosition == VerticalAxis.VerticalLabelPosition.Top -> maxLineThickness
+    ): Float =
+        when {
+            maxItemCount == 0 -> 0f
+            verticalLabelPosition == VerticalAxis.VerticalLabelPosition.Top -> maxLineThickness
 
-        verticalLabelPosition == VerticalAxis.VerticalLabelPosition.Center ->
-            (maxOf(maxLabelHeight, maxLineThickness) + maxLineThickness).half
+            verticalLabelPosition == VerticalAxis.VerticalLabelPosition.Center ->
+                (maxOf(maxLabelHeight, maxLineThickness) + maxLineThickness).half
 
-        else -> maxLabelHeight + maxLineThickness.half
-    }
+            else -> maxLabelHeight + maxLineThickness.half
+        }
 
-    private fun getSimpleLabelValues(axisHeight: Float, maxLabelHeight: Float, chartValues: ChartValues): List<Float> {
+    private fun getSimpleLabelValues(
+        axisHeight: Float,
+        maxLabelHeight: Float,
+        chartValues: ChartValues,
+    ): List<Float> {
         val values = mutableListOf(chartValues.minY)
         if (maxItemCount == 1) return values
         val extraItemCount = (axisHeight / maxLabelHeight).toInt().coerceAtMost(maxItemCount - 1)
@@ -104,7 +108,11 @@ internal class DefaultVerticalAxisItemPlacer(
         return values
     }
 
-    private fun getMixedLabelValues(axisHeight: Float, maxLabelHeight: Float, chartValues: ChartValues): List<Float> {
+    private fun getMixedLabelValues(
+        axisHeight: Float,
+        maxLabelHeight: Float,
+        chartValues: ChartValues,
+    ): List<Float> {
         val values = mutableListOf(0f)
         if (maxItemCount == 1) return values
         val topHeight = chartValues.maxY / chartValues.lengthY * axisHeight
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/axis/vertical/VerticalAxis.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/axis/vertical/VerticalAxis.kt
index 9bbc9b544..c4a04aa7d 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/axis/vertical/VerticalAxis.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/axis/vertical/VerticalAxis.kt
@@ -51,10 +51,10 @@ private const val TITLE_ABS_ROTATION_DEGREES = 90f
 public class VerticalAxis<Position : AxisPosition.Vertical>(
     override val position: Position,
 ) : Axis<Position>() {
-
     private val areLabelsOutsideAtStartOrInsideAtEnd
-        get() = horizontalLabelPosition == Outside && position is AxisPosition.Vertical.Start ||
-            horizontalLabelPosition == Inside && position is AxisPosition.Vertical.End
+        get() =
+            horizontalLabelPosition == Outside && position is AxisPosition.Vertical.Start ||
+                horizontalLabelPosition == Inside && position is AxisPosition.Vertical.End
 
     private val textHorizontalPosition: HorizontalPosition
         get() = if (areLabelsOutsideAtStartOrInsideAtEnd) HorizontalPosition.Start else HorizontalPosition.End
@@ -74,88 +74,90 @@ public class VerticalAxis<Position : AxisPosition.Vertical>(
      */
     public var verticalLabelPosition: VerticalLabelPosition = Center
 
-    override fun drawBehindChart(
-        context: ChartDrawContext,
-    ): Unit = with(context) {
-        var centerY: Float
-        val chartValues = chartValuesProvider.getChartValues(position)
-        val maxLabelHeight = getMaxLabelHeight()
-        val lineValues = itemPlacer.getLineValues(this, bounds.height(), maxLabelHeight, position)
-            ?: itemPlacer.getLabelValues(this, bounds.height(), maxLabelHeight, position)
-
-        lineValues.forEach { lineValue ->
-            centerY = bounds.bottom - bounds.height() * (lineValue - chartValues.minY) / chartValues.lengthY +
-                getLineCanvasYCorrection(guidelineThickness, lineValue)
-
-            guideline?.takeIf {
-                isNotInRestrictedBounds(
+    override fun drawBehindChart(context: ChartDrawContext): Unit =
+        with(context) {
+            var centerY: Float
+            val chartValues = chartValuesProvider.getChartValues(position)
+            val maxLabelHeight = getMaxLabelHeight()
+            val lineValues =
+                itemPlacer.getLineValues(this, bounds.height(), maxLabelHeight, position)
+                    ?: itemPlacer.getLabelValues(this, bounds.height(), maxLabelHeight, position)
+
+            lineValues.forEach { lineValue ->
+                centerY = bounds.bottom - bounds.height() * (lineValue - chartValues.minY) / chartValues.lengthY +
+                    getLineCanvasYCorrection(guidelineThickness, lineValue)
+
+                guideline?.takeIf {
+                    isNotInRestrictedBounds(
+                        left = chartBounds.left,
+                        top = centerY - guidelineThickness.half,
+                        right = chartBounds.right,
+                        bottom = centerY + guidelineThickness.half,
+                    )
+                }?.drawHorizontal(
+                    context = context,
                     left = chartBounds.left,
-                    top = centerY - guidelineThickness.half,
                     right = chartBounds.right,
-                    bottom = centerY + guidelineThickness.half,
+                    centerY = centerY,
                 )
-            }?.drawHorizontal(
+            }
+            val axisLineExtensionLength = if (itemPlacer.getShiftTopLines(this)) tickThickness else 0f
+            axisLine?.drawVertical(
                 context = context,
-                left = chartBounds.left,
-                right = chartBounds.right,
-                centerY = centerY,
+                top = bounds.top - axisLineExtensionLength,
+                bottom = bounds.bottom + axisLineExtensionLength,
+                centerX =
+                    if (position.isLeft(isLtr = isLtr)) {
+                        bounds.right - axisThickness.half
+                    } else {
+                        bounds.left + axisThickness.half
+                    },
             )
         }
-        val axisLineExtensionLength = if (itemPlacer.getShiftTopLines(this)) tickThickness else 0f
-        axisLine?.drawVertical(
-            context = context,
-            top = bounds.top - axisLineExtensionLength,
-            bottom = bounds.bottom + axisLineExtensionLength,
-            centerX = if (position.isLeft(isLtr = isLtr)) {
-                bounds.right - axisThickness.half
-            } else {
-                bounds.left + axisThickness.half
-            },
-        )
-    }
 
-    override fun drawAboveChart(context: ChartDrawContext): Unit = with(context) {
-        val label = label
-        val labelValues = itemPlacer.getLabelValues(this, bounds.height(), getMaxLabelHeight(), position)
-        val tickLeftX = getTickLeftX()
-        val tickRightX = tickLeftX + axisThickness + tickLength
-        val labelX = if (areLabelsOutsideAtStartOrInsideAtEnd == isLtr) tickLeftX else tickRightX
-        var tickCenterY: Float
-        val chartValues = chartValuesProvider.getChartValues(position)
-
-        labelValues.forEach { labelValue ->
-            tickCenterY = bounds.bottom - bounds.height() * (labelValue - chartValues.minY) / chartValues.lengthY +
-                getLineCanvasYCorrection(tickThickness, labelValue)
-
-            tick?.drawHorizontal(
-                context = context,
-                left = tickLeftX,
-                right = tickRightX,
-                centerY = tickCenterY,
-            )
+    override fun drawAboveChart(context: ChartDrawContext): Unit =
+        with(context) {
+            val label = label
+            val labelValues = itemPlacer.getLabelValues(this, bounds.height(), getMaxLabelHeight(), position)
+            val tickLeftX = getTickLeftX()
+            val tickRightX = tickLeftX + axisThickness + tickLength
+            val labelX = if (areLabelsOutsideAtStartOrInsideAtEnd == isLtr) tickLeftX else tickRightX
+            var tickCenterY: Float
+            val chartValues = chartValuesProvider.getChartValues(position)
+
+            labelValues.forEach { labelValue ->
+                tickCenterY = bounds.bottom - bounds.height() * (labelValue - chartValues.minY) / chartValues.lengthY +
+                    getLineCanvasYCorrection(tickThickness, labelValue)
+
+                tick?.drawHorizontal(
+                    context = context,
+                    left = tickLeftX,
+                    right = tickRightX,
+                    centerY = tickCenterY,
+                )
 
-            label ?: return@forEach
-            drawLabel(
-                label = label,
-                labelText = valueFormatter.formatValue(labelValue, chartValues),
-                labelX = labelX,
-                tickCenterY = tickCenterY,
-            )
-        }
+                label ?: return@forEach
+                drawLabel(
+                    label = label,
+                    labelText = valueFormatter.formatValue(labelValue, chartValues),
+                    labelX = labelX,
+                    tickCenterY = tickCenterY,
+                )
+            }
 
-        title?.let { title ->
-            titleComponent?.drawText(
-                context = this,
-                text = title,
-                textX = if (position.isStart) bounds.getStart(isLtr = isLtr) else bounds.getEnd(isLtr = isLtr),
-                textY = bounds.centerY(),
-                horizontalPosition = if (position.isStart) HorizontalPosition.End else HorizontalPosition.Start,
-                verticalPosition = VerticalPosition.Center,
-                rotationDegrees = TITLE_ABS_ROTATION_DEGREES * if (position.isStart) -1f else 1f,
-                maxTextHeight = bounds.height().toInt(),
-            )
+            title?.let { title ->
+                titleComponent?.drawText(
+                    context = this,
+                    text = title,
+                    textX = if (position.isStart) bounds.getStart(isLtr = isLtr) else bounds.getEnd(isLtr = isLtr),
+                    textY = bounds.centerY(),
+                    horizontalPosition = if (position.isStart) HorizontalPosition.End else HorizontalPosition.Start,
+                    verticalPosition = VerticalPosition.Center,
+                    rotationDegrees = TITLE_ABS_ROTATION_DEGREES * if (position.isStart) -1f else 1f,
+                    maxTextHeight = bounds.height().toInt(),
+                )
+            }
         }
-    }
 
     override fun updateHorizontalDimensions(
         context: MeasureContext,
@@ -168,12 +170,13 @@ public class VerticalAxis<Position : AxisPosition.Vertical>(
         labelX: Float,
         tickCenterY: Float,
     ) {
-        val textBounds = label.getTextBounds(this, labelText, rotationDegrees = labelRotationDegrees).apply {
-            translate(
-                x = labelX,
-                y = tickCenterY - centerY(),
-            )
-        }
+        val textBounds =
+            label.getTextBounds(this, labelText, rotationDegrees = labelRotationDegrees).apply {
+                translate(
+                    x = labelX,
+                    y = tickCenterY - centerY(),
+                )
+            }
 
         if (
             horizontalLabelPosition == Outside ||
@@ -192,11 +195,12 @@ public class VerticalAxis<Position : AxisPosition.Vertical>(
                 horizontalPosition = textHorizontalPosition,
                 verticalPosition = verticalLabelPosition.textPosition,
                 rotationDegrees = labelRotationDegrees,
-                maxTextWidth = when (sizeConstraint) {
-                    // Let the `TextComponent` use as much width as it needs, based on the measuring phase.
-                    is SizeConstraint.Auto -> Int.MAX_VALUE
-                    else -> (bounds.width() - tickLength - axisThickness).toInt()
-                },
+                maxTextWidth =
+                    when (sizeConstraint) {
+                        // Let the `TextComponent` use as much width as it needs, based on the measuring phase.
+                        is SizeConstraint.Auto -> Int.MAX_VALUE
+                        else -> (bounds.width() - tickLength - axisThickness).toInt()
+                    },
             )
         }
     }
@@ -217,72 +221,83 @@ public class VerticalAxis<Position : AxisPosition.Vertical>(
         context: MeasureContext,
         availableHeight: Float,
         outInsets: HorizontalInsets,
-    ): Unit = with(context) {
-        val desiredWidth = getDesiredWidth(availableHeight)
+    ): Unit =
+        with(context) {
+            val desiredWidth = getDesiredWidth(availableHeight)
 
-        outInsets.set(
-            start = if (position.isStart) desiredWidth else 0f,
-            end = if (position.isEnd) desiredWidth else 0f,
-        )
-    }
+            outInsets.set(
+                start = if (position.isStart) desiredWidth else 0f,
+                end = if (position.isEnd) desiredWidth else 0f,
+            )
+        }
 
     override fun getInsets(
         context: MeasureContext,
         outInsets: Insets,
         horizontalDimensions: HorizontalDimensions,
-    ): Unit = with(context) {
-        val maxLabelHeight = getMaxLabelHeight()
-        val maxLineThickness = maxOf(axisThickness, tickThickness)
-        outInsets.set(
-            top = itemPlacer.getTopVerticalAxisInset(verticalLabelPosition, maxLabelHeight, maxLineThickness),
-            bottom = itemPlacer.getBottomVerticalAxisInset(verticalLabelPosition, maxLabelHeight, maxLineThickness),
-        )
-    }
+    ): Unit =
+        with(context) {
+            val maxLabelHeight = getMaxLabelHeight()
+            val maxLineThickness = maxOf(axisThickness, tickThickness)
+            outInsets.set(
+                top = itemPlacer.getTopVerticalAxisInset(verticalLabelPosition, maxLabelHeight, maxLineThickness),
+                bottom = itemPlacer.getBottomVerticalAxisInset(verticalLabelPosition, maxLabelHeight, maxLineThickness),
+            )
+        }
 
     /**
      * Calculates the optimal width for this [VerticalAxis], accounting for the value of [sizeConstraint].
      */
-    private fun MeasureContext.getDesiredWidth(height: Float) = when (val constraint = sizeConstraint) {
-        is SizeConstraint.Auto -> {
-            val titleComponentWidth = title?.let { title ->
-                titleComponent?.getWidth(
-                    context = this,
-                    text = title,
-                    rotationDegrees = TITLE_ABS_ROTATION_DEGREES,
-                    height = bounds.height().toInt(),
-                )
-            }.orZero
-            val labelSpace = when (horizontalLabelPosition) {
-                Outside -> getMaxLabelWidth(height)
-                Inside -> 0f
+    private fun MeasureContext.getDesiredWidth(height: Float) =
+        when (val constraint = sizeConstraint) {
+            is SizeConstraint.Auto -> {
+                val titleComponentWidth =
+                    title?.let { title ->
+                        titleComponent?.getWidth(
+                            context = this,
+                            text = title,
+                            rotationDegrees = TITLE_ABS_ROTATION_DEGREES,
+                            height = bounds.height().toInt(),
+                        )
+                    }.orZero
+                val labelSpace =
+                    when (horizontalLabelPosition) {
+                        Outside -> getMaxLabelWidth(height)
+                        Inside -> 0f
+                    }
+                (labelSpace + titleComponentWidth + axisThickness + tickLength)
+                    .coerceIn(minimumValue = constraint.minSizeDp.pixels, maximumValue = constraint.maxSizeDp.pixels)
             }
-            (labelSpace + titleComponentWidth + axisThickness + tickLength)
-                .coerceIn(minimumValue = constraint.minSizeDp.pixels, maximumValue = constraint.maxSizeDp.pixels)
+            is SizeConstraint.Exact -> constraint.sizeDp.pixels
+            is SizeConstraint.Fraction -> canvasBounds.width() * constraint.fraction
+            is SizeConstraint.TextWidth ->
+                label?.getWidth(
+                    context = this,
+                    text = constraint.text,
+                    rotationDegrees = labelRotationDegrees,
+                ).orZero + tickLength + axisThickness.half
         }
-        is SizeConstraint.Exact -> constraint.sizeDp.pixels
-        is SizeConstraint.Fraction -> canvasBounds.width() * constraint.fraction
-        is SizeConstraint.TextWidth -> label?.getWidth(
-            context = this,
-            text = constraint.text,
-            rotationDegrees = labelRotationDegrees,
-        ).orZero + tickLength + axisThickness.half
-    }
-
-    private fun MeasureContext.getMaxLabelHeight() = label?.let { label ->
-        val chartValues = chartValuesProvider.getChartValues(position)
-        itemPlacer
-            .getHeightMeasurementLabelValues(this, position)
-            .maxOfOrNull { value -> label.getHeight(this, valueFormatter.formatValue(value, chartValues)) }
-    }.orZero
-
-    private fun MeasureContext.getMaxLabelWidth(axisHeight: Float) = label?.let { label ->
-        val chartValues = chartValuesProvider.getChartValues(position)
-        itemPlacer
-            .getWidthMeasurementLabelValues(this, axisHeight, getMaxLabelHeight(), position)
-            .maxOfOrNull { value -> label.getWidth(this, valueFormatter.formatValue(value, chartValues)) }
-    }.orZero
 
-    private fun ChartDrawContext.getLineCanvasYCorrection(thickness: Float, y: Float): Float {
+    private fun MeasureContext.getMaxLabelHeight() =
+        label?.let { label ->
+            val chartValues = chartValuesProvider.getChartValues(position)
+            itemPlacer
+                .getHeightMeasurementLabelValues(this, position)
+                .maxOfOrNull { value -> label.getHeight(this, valueFormatter.formatValue(value, chartValues)) }
+        }.orZero
+
+    private fun MeasureContext.getMaxLabelWidth(axisHeight: Float) =
+        label?.let { label ->
+            val chartValues = chartValuesProvider.getChartValues(position)
+            itemPlacer
+                .getWidthMeasurementLabelValues(this, axisHeight, getMaxLabelHeight(), position)
+                .maxOfOrNull { value -> label.getWidth(this, valueFormatter.formatValue(value, chartValues)) }
+        }.orZero
+
+    private fun ChartDrawContext.getLineCanvasYCorrection(
+        thickness: Float,
+        y: Float,
+    ): Float {
         val chartValues = chartValuesProvider.getChartValues(position)
         return if (y == chartValues.maxY && itemPlacer.getShiftTopLines(this)) -thickness.half else thickness.half
     }
@@ -291,7 +306,8 @@ public class VerticalAxis<Position : AxisPosition.Vertical>(
      * Defines the horizontal position of each of a vertical axis’s labels relative to the axis line.
      */
     public enum class HorizontalLabelPosition {
-        Outside, Inside
+        Outside,
+        Inside,
     }
 
     /**
@@ -333,11 +349,12 @@ public class VerticalAxis<Position : AxisPosition.Vertical>(
          */
         @Suppress("UNCHECKED_CAST")
         public inline fun <reified T : Position> build(): VerticalAxis<T> {
-            val position = when (T::class.java) {
-                AxisPosition.Vertical.Start::class.java -> AxisPosition.Vertical.Start
-                AxisPosition.Vertical.End::class.java -> AxisPosition.Vertical.End
-                else -> throw UnknownAxisPositionException(T::class.java)
-            } as Position
+            val position =
+                when (T::class.java) {
+                    AxisPosition.Vertical.Start::class.java -> AxisPosition.Vertical.Start
+                    AxisPosition.Vertical.End::class.java -> AxisPosition.Vertical.End
+                    else -> throw UnknownAxisPositionException(T::class.java)
+                } as Position
             return setTo(VerticalAxis(position)).also { axis ->
                 axis.itemPlacer = itemPlacer
                 axis.horizontalLabelPosition = horizontalLabelPosition
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/BaseChart.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/BaseChart.kt
index 15390a491..7ba2f07f9 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/BaseChart.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/BaseChart.kt
@@ -35,7 +35,6 @@ import com.patrykandpatrick.vico.core.marker.Marker
  * @see Chart
  */
 public abstract class BaseChart<in Model : ChartEntryModel> : Chart<Model>, BoundsAware {
-
     private val decorations = ArrayList<Decoration>()
 
     private val insets: Insets = Insets()
@@ -59,7 +58,10 @@ public abstract class BaseChart<in Model : ChartEntryModel> : Chart<Model>, Boun
 
     override fun removeDecoration(decoration: Decoration): Boolean = decorations.remove(decoration)
 
-    override fun addPersistentMarker(x: Float, marker: Marker) {
+    override fun addPersistentMarker(
+        x: Float,
+        marker: Marker,
+    ) {
         persistentMarkers[x] = marker
     }
 
@@ -74,35 +76,37 @@ public abstract class BaseChart<in Model : ChartEntryModel> : Chart<Model>, Boun
     override fun drawScrollableContent(
         context: ChartDrawContext,
         model: Model,
-    ): Unit = with(context) {
-        insets.clear()
-        getInsets(this, insets, horizontalDimensions)
-        drawChartInternal(context, model)
-    }
+    ): Unit =
+        with(context) {
+            insets.clear()
+            getInsets(this, insets, horizontalDimensions)
+            drawChartInternal(context, model)
+        }
 
     override fun drawNonScrollableContent(
         context: ChartDrawContext,
         model: Model,
-    ): Unit = with(context) {
-        canvas.inClip(
-            left = bounds.left,
-            top = 0f,
-            right = bounds.right,
-            bottom = context.canvas.height.toFloat(),
-        ) {
-            drawDecorationAboveChart(context)
-        }
-        persistentMarkers.forEach { (x, marker) ->
-            entryLocationMap.getEntryModel(x)?.also { markerModel ->
-                marker.draw(
-                    context = context,
-                    bounds = bounds,
-                    markedEntries = markerModel,
-                    chartValuesProvider = chartValuesProvider,
-                )
+    ): Unit =
+        with(context) {
+            canvas.inClip(
+                left = bounds.left,
+                top = 0f,
+                right = bounds.right,
+                bottom = context.canvas.height.toFloat(),
+            ) {
+                drawDecorationAboveChart(context)
+            }
+            persistentMarkers.forEach { (x, marker) ->
+                entryLocationMap.getEntryModel(x)?.also { markerModel ->
+                    marker.draw(
+                        context = context,
+                        bounds = bounds,
+                        markedEntries = markerModel,
+                        chartValuesProvider = chartValuesProvider,
+                    )
+                }
             }
         }
-    }
 
     /**
      * An internal function that draws both [Decoration]s behind the chart and the chart itself in the clip bounds.
@@ -110,19 +114,20 @@ public abstract class BaseChart<in Model : ChartEntryModel> : Chart<Model>, Boun
     protected open fun drawChartInternal(
         context: ChartDrawContext,
         model: Model,
-    ): Unit = with(context) {
-        canvas.inClip(
-            left = bounds.left - insets.getLeft(isLtr),
-            top = bounds.top - insets.top,
-            right = bounds.right + insets.getRight(isLtr),
-            bottom = bounds.bottom + insets.bottom,
-        ) {
-            drawDecorationBehindChart(context)
-            if (model.entries.isNotEmpty()) {
-                drawChart(context, model)
+    ): Unit =
+        with(context) {
+            canvas.inClip(
+                left = bounds.left - insets.getLeft(isLtr),
+                top = bounds.top - insets.top,
+                right = bounds.right + insets.getRight(isLtr),
+                bottom = bounds.bottom + insets.bottom,
+            ) {
+                drawDecorationBehindChart(context)
+                if (model.entries.isNotEmpty()) {
+                    drawChart(context, model)
+                }
             }
         }
-    }
 
     protected abstract fun drawChart(
         context: ChartDrawContext,
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/Chart.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/Chart.kt
index 69c58d38d..6d0f9fdd2 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/Chart.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/Chart.kt
@@ -39,7 +39,6 @@ import com.patrykandpatrick.vico.core.marker.Marker
  * Defines the minimal set of properties and functions required by other parts of the library to draw a chart.
  */
 public interface Chart<in Model> : BoundsAware, ChartInsetter {
-
     /**
      * Links x-axis values to [Marker.EntryModel]s. A [Marker.EntryModel] holds the data needed to draw a [Marker].
      */
@@ -117,15 +116,17 @@ public interface Chart<in Model> : BoundsAware, ChartInsetter {
      * @see removeDecoration
      * @see Decoration
      */
-    public fun removeDecorations(decorations: List<Decoration>): Boolean =
-        decorations.all(::removeDecoration)
+    public fun removeDecorations(decorations: List<Decoration>): Boolean = decorations.all(::removeDecoration)
 
     /**
      * Adds a persistent [Marker] to this [Chart]. The [Marker] will be anchored to the given [x] value on the x-axis.
      *
      * @see Marker
      */
-    public fun addPersistentMarker(x: Float, marker: Marker)
+    public fun addPersistentMarker(
+        x: Float,
+        marker: Marker,
+    )
 
     /**
      * Replaces the current map of markers with the provided [markers].
@@ -158,7 +159,11 @@ public interface Chart<in Model> : BoundsAware, ChartInsetter {
      * @param model holds data about the [Chart]’s entries.
      * @param xStep the overridden _x_ step (or `null` if no override has occurred).
      */
-    public fun updateChartValues(chartValuesManager: ChartValuesManager, model: Model, xStep: Float?)
+    public fun updateChartValues(
+        chartValuesManager: ChartValuesManager,
+        model: Model,
+        xStep: Float?,
+    )
 
     /**
      * Provides the [Chart]’s [ModelTransformer].
@@ -197,7 +202,10 @@ public interface Chart<in Model> : BoundsAware, ChartInsetter {
         /**
          * Carries out the pending difference animation. [fraction] is the animation progress.
          */
-        public abstract suspend fun transform(extraStore: MutableExtraStore, fraction: Float)
+        public abstract suspend fun transform(
+            extraStore: MutableExtraStore,
+            fraction: Float,
+        )
     }
 }
 
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/DefaultPointConnector.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/DefaultPointConnector.kt
index d7dab7aaf..d861cd1c6 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/DefaultPointConnector.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/DefaultPointConnector.kt
@@ -35,7 +35,6 @@ import kotlin.math.abs
 public class DefaultPointConnector(
     private val cubicStrength: Float = DefaultDimens.CUBIC_STRENGTH,
 ) : LineChart.LineSpec.PointConnector {
-
     public override fun connect(
         path: Path,
         prevX: Float,
@@ -50,13 +49,13 @@ public class DefaultPointConnector(
             prevY = prevY,
             x = x,
             y = y,
-            curvature = abs(x - prevX).half * cubicStrength *
-                (abs(x = y - prevY) / bounds.bottom * CUBIC_Y_MULTIPLIER).coerceAtMost(maximumValue = 1f),
+            curvature =
+                abs(x - prevX).half * cubicStrength *
+                    (abs(x = y - prevY) / bounds.bottom * CUBIC_Y_MULTIPLIER).coerceAtMost(maximumValue = 1f),
         )
     }
 
     private companion object {
-
         const val CUBIC_Y_MULTIPLIER = 4
     }
 }
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/EntryModelExtensions.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/EntryModelExtensions.kt
index dbfffde04..b54fa27af 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/EntryModelExtensions.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/EntryModelExtensions.kt
@@ -22,7 +22,10 @@ import com.patrykandpatrick.vico.core.entry.ChartEntry
  * For each [ChartEntry] in the list such that [ChartEntry.x] belongs to the provided range, calls the [action] function
  * block with the [ChartEntry] as the block’s argument.
  */
-public inline fun List<ChartEntry>.forEachIn(range: ClosedFloatingPointRange<Float>, action: (ChartEntry) -> Unit) {
+public inline fun List<ChartEntry>.forEachIn(
+    range: ClosedFloatingPointRange<Float>,
+    action: (ChartEntry) -> Unit,
+) {
     forEach { if (it.x in range) action(it) }
 }
 
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/LineSpecExtensions.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/LineSpecExtensions.kt
index 8bfc2830e..e1004f388 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/LineSpecExtensions.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/LineSpecExtensions.kt
@@ -39,16 +39,17 @@ public fun LineChart.LineSpec.copy(
     dataLabelValueFormatter: ValueFormatter = this.dataLabelValueFormatter,
     dataLabelRotationDegrees: Float = this.dataLabelRotationDegrees,
     pointConnector: LineChart.LineSpec.PointConnector = this.pointConnector,
-): LineChart.LineSpec = LineChart.LineSpec(
-    lineShader = lineFill,
-    lineThicknessDp = lineThicknessDp,
-    lineBackgroundShader = lineBackgroundFill,
-    lineCap = lineCap,
-    point = point,
-    pointSizeDp = pointSizeDp,
-    dataLabel = dataLabel,
-    dataLabelVerticalPosition = dataLabelVerticalPosition,
-    dataLabelValueFormatter = dataLabelValueFormatter,
-    dataLabelRotationDegrees = dataLabelRotationDegrees,
-    pointConnector = pointConnector,
-)
+): LineChart.LineSpec =
+    LineChart.LineSpec(
+        lineShader = lineFill,
+        lineThicknessDp = lineThicknessDp,
+        lineBackgroundShader = lineBackgroundFill,
+        lineCap = lineCap,
+        point = point,
+        pointSizeDp = pointSizeDp,
+        dataLabel = dataLabel,
+        dataLabelVerticalPosition = dataLabelVerticalPosition,
+        dataLabelValueFormatter = dataLabelValueFormatter,
+        dataLabelRotationDegrees = dataLabelRotationDegrees,
+        pointConnector = pointConnector,
+    )
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/column/ColumnChart.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/column/ColumnChart.kt
index 8ff083013..b0cb328c7 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/column/ColumnChart.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/column/ColumnChart.kt
@@ -82,7 +82,6 @@ public open class ColumnChart(
         ColumnChartDrawingModel,
         > = DefaultDrawingModelInterpolator(),
 ) : BaseChart<ChartEntryModel>() {
-
     /**
      * Creates a [ColumnChart] with a common style for all columns.
      *
@@ -122,15 +121,16 @@ public open class ColumnChart(
     override fun drawChart(
         context: ChartDrawContext,
         model: ChartEntryModel,
-    ): Unit = with(context) {
-        entryLocationMap.clear()
-        drawChartInternal(
-            chartValues = chartValuesProvider.getChartValues(axisPosition = targetVerticalAxisPosition),
-            model = model,
-            drawingModel = model.extraStore.getOrNull(drawingModelKey),
-        )
-        heightMap.clear()
-    }
+    ): Unit =
+        with(context) {
+            entryLocationMap.clear()
+            drawChartInternal(
+                chartValues = chartValuesProvider.getChartValues(axisPosition = targetVerticalAxisPosition),
+                model = model,
+                drawingModel = model.extraStore.getOrNull(drawingModelKey),
+            )
+            heightMap.clear()
+        }
 
     protected open fun ChartDrawContext.drawChartInternal(
         chartValues: ChartValues,
@@ -266,44 +266,49 @@ public open class ColumnChart(
             val canUseXSpacing =
                 mergeMode == MergeMode.Stack ||
                     mergeMode == MergeMode.Grouped && modelEntriesSize == 1
-            var maxWidth = when {
-                canUseXSpacing -> horizontalDimensions.xSpacing
-                mergeMode == MergeMode.Grouped ->
-                    (columnThicknessDp + minOf(spacingDp, innerSpacingDp).half).pixels * zoom
+            var maxWidth =
+                when {
+                    canUseXSpacing -> horizontalDimensions.xSpacing
+                    mergeMode == MergeMode.Grouped ->
+                        (columnThicknessDp + minOf(spacingDp, innerSpacingDp).half).pixels * zoom
 
-                else -> error(message = "Encountered an unexpected `MergeMode`.")
-            }
+                    else -> error(message = "Encountered an unexpected `MergeMode`.")
+                }
             if (isFirst && horizontalLayout is HorizontalLayout.FullWidth) {
                 maxWidth = maxWidth.coerceAtMost(horizontalDimensions.startPadding.doubled)
             }
             if (isLast && horizontalLayout is HorizontalLayout.FullWidth) {
                 maxWidth = maxWidth.coerceAtMost(horizontalDimensions.endPadding.doubled)
             }
-            val text = dataLabelValueFormatter.formatValue(
-                value = dataLabelValue,
-                chartValues = chartValuesProvider.getChartValues(axisPosition = targetVerticalAxisPosition),
-            )
-            val dataLabelWidth = textComponent.getWidth(
-                context = this,
-                text = text,
-                rotationDegrees = dataLabelRotationDegrees,
-            ).coerceAtMost(maximumValue = maxWidth)
+            val text =
+                dataLabelValueFormatter.formatValue(
+                    value = dataLabelValue,
+                    chartValues = chartValuesProvider.getChartValues(axisPosition = targetVerticalAxisPosition),
+                )
+            val dataLabelWidth =
+                textComponent.getWidth(
+                    context = this,
+                    text = text,
+                    rotationDegrees = dataLabelRotationDegrees,
+                ).coerceAtMost(maximumValue = maxWidth)
 
             if (x - dataLabelWidth.half > bounds.right || x + dataLabelWidth.half < bounds.left) return
 
             val labelVerticalPosition =
                 if (dataLabelValue < 0f) dataLabelVerticalPosition.negative() else dataLabelVerticalPosition
 
-            val verticalPosition = labelVerticalPosition.inBounds(
-                y = y,
-                bounds = bounds,
-                componentHeight = textComponent.getHeight(
-                    context = this,
-                    text = text,
-                    width = maxWidth.toInt(),
-                    rotationDegrees = dataLabelRotationDegrees,
-                ),
-            )
+            val verticalPosition =
+                labelVerticalPosition.inBounds(
+                    y = y,
+                    bounds = bounds,
+                    componentHeight =
+                        textComponent.getHeight(
+                            context = this,
+                            text = text,
+                            width = maxWidth.toInt(),
+                            rotationDegrees = dataLabelRotationDegrees,
+                        ),
+                )
             textComponent.drawText(
                 context = this,
                 text = text,
@@ -334,7 +339,11 @@ public open class ColumnChart(
         }
     }
 
-    override fun updateChartValues(chartValuesManager: ChartValuesManager, model: ChartEntryModel, xStep: Float?) {
+    override fun updateChartValues(
+        chartValuesManager: ChartValuesManager,
+        model: ChartEntryModel,
+        xStep: Float?,
+    ) {
         chartValuesManager.tryUpdate(
             minX = axisValuesOverrider?.getMinX(model) ?: model.minX,
             maxX = axisValuesOverrider?.getMaxX(model) ?: model.maxX,
@@ -366,8 +375,9 @@ public open class ColumnChart(
                 is HorizontalLayout.FullWidth -> {
                     horizontalDimensions.ensureValuesAtLeast(
                         xSpacing = xSpacing,
-                        scalableStartPadding = columnCollectionWidth.half +
-                            horizontalLayout.scalableStartPaddingDp.pixels,
+                        scalableStartPadding =
+                            columnCollectionWidth.half +
+                                horizontalLayout.scalableStartPaddingDp.pixels,
                         scalableEndPadding = columnCollectionWidth.half + horizontalLayout.scalableEndPaddingDp.pixels,
                         unscalableStartPadding = horizontalLayout.unscalableStartPaddingDp.pixels,
                         unscalableEndPadding = horizontalLayout.unscalableEndPaddingDp.pixels,
@@ -377,34 +387,42 @@ public open class ColumnChart(
         }
     }
 
-    override val modelTransformerProvider: Chart.ModelTransformerProvider = object : Chart.ModelTransformerProvider {
-        private val modelTransformer =
-            ColumnChartModelTransformer(drawingModelKey, { targetVerticalAxisPosition }, { drawingModelInterpolator })
+    override val modelTransformerProvider: Chart.ModelTransformerProvider =
+        object : Chart.ModelTransformerProvider {
+            private val modelTransformer =
+                ColumnChartModelTransformer(
+                    drawingModelKey,
+                    { targetVerticalAxisPosition },
+                    { drawingModelInterpolator },
+                )
 
-        override fun <T : ChartEntryModel> getModelTransformer(): Chart.ModelTransformer<T> = modelTransformer
-    }
-
-    protected open fun MeasureContext.getColumnCollectionWidth(
-        entryCollectionSize: Int,
-    ): Float = when (mergeMode) {
-        MergeMode.Stack ->
-            columns.take(entryCollectionSize).maxOf { it.thicknessDp.pixels }
+            override fun <T : ChartEntryModel> getModelTransformer(): Chart.ModelTransformer<T> = modelTransformer
+        }
 
-        MergeMode.Grouped ->
-            getCumulatedThickness(entryCollectionSize) + innerSpacingDp.pixels * (entryCollectionSize - 1)
-    }
+    protected open fun MeasureContext.getColumnCollectionWidth(entryCollectionSize: Int): Float =
+        when (mergeMode) {
+            MergeMode.Stack ->
+                columns.take(entryCollectionSize).maxOf { it.thicknessDp.pixels }
 
-    protected open fun ChartDrawContext.getDrawingStart(entryCollectionIndex: Int, entryCollectionCount: Int): Float {
-        val mergeModeComponent = when (mergeMode) {
             MergeMode.Grouped ->
-                getCumulatedThickness(entryCollectionIndex) + innerSpacingDp.pixels * entryCollectionIndex
-
-            MergeMode.Stack -> 0f
+                getCumulatedThickness(entryCollectionSize) + innerSpacingDp.pixels * (entryCollectionSize - 1)
         }
+
+    protected open fun ChartDrawContext.getDrawingStart(
+        entryCollectionIndex: Int,
+        entryCollectionCount: Int,
+    ): Float {
+        val mergeModeComponent =
+            when (mergeMode) {
+                MergeMode.Grouped ->
+                    getCumulatedThickness(entryCollectionIndex) + innerSpacingDp.pixels * entryCollectionIndex
+
+                MergeMode.Stack -> 0f
+            }
         return bounds.getStart(isLtr) + (
             horizontalDimensions.startPadding +
                 (mergeModeComponent - getColumnCollectionWidth(entryCollectionCount).half) * zoom
-            ) * layoutDirectionMultiplier
+        ) * layoutDirectionMultiplier
     }
 
     protected open fun MeasureContext.getCumulatedThickness(count: Int): Float {
@@ -419,7 +437,6 @@ public open class ColumnChart(
      * Defines how a [ColumnChart] should draw columns in column collections.
      */
     public enum class MergeMode {
-
         /**
          * Columns with the same x-axis values will be placed next to each other in groups.
          */
@@ -435,18 +452,20 @@ public open class ColumnChart(
         /**
          * Returns the minimum y-axis value, taking into account the current [MergeMode].
          */
-        public fun getMinY(model: ChartEntryModel): Float = when (this) {
-            Grouped -> model.minY.coerceAtMost(0f)
-            Stack -> model.stackedNegativeY.coerceAtMost(0f)
-        }
+        public fun getMinY(model: ChartEntryModel): Float =
+            when (this) {
+                Grouped -> model.minY.coerceAtMost(0f)
+                Stack -> model.stackedNegativeY.coerceAtMost(0f)
+            }
 
         /**
          * Returns the maximum y-axis value, taking into account the current [MergeMode].
          */
-        public fun getMaxY(model: ChartEntryModel): Float = when (this) {
-            Grouped -> model.maxY
-            Stack -> model.stackedPositiveY
-        }
+        public fun getMaxY(model: ChartEntryModel): Float =
+            when (this) {
+                Grouped -> model.maxY
+                Stack -> model.stackedPositiveY
+            }
     }
 
     protected class ColumnChartModelTransformer(
@@ -457,7 +476,6 @@ public open class ColumnChart(
             ColumnChartDrawingModel,
             >,
     ) : Chart.ModelTransformer<ChartEntryModel>() {
-
         override fun prepareForTransformation(
             oldModel: ChartEntryModel?,
             newModel: ChartEntryModel?,
@@ -470,19 +488,23 @@ public open class ColumnChart(
             )
         }
 
-        override suspend fun transform(extraStore: MutableExtraStore, fraction: Float) {
+        override suspend fun transform(
+            extraStore: MutableExtraStore,
+            fraction: Float,
+        ) {
             getDrawingModelInterpolator()
                 .transform(fraction)
                 ?.let { extraStore[key] = it }
                 ?: extraStore.remove(key)
         }
 
-        private fun ChartEntryModel.toDrawingModel(chartValues: ChartValues): ColumnChartDrawingModel = entries
-            .map { series ->
-                series.associate { entry ->
-                    entry.x to ColumnChartDrawingModel.ColumnInfo(abs(entry.y) / chartValues.lengthY)
+        private fun ChartEntryModel.toDrawingModel(chartValues: ChartValues): ColumnChartDrawingModel =
+            entries
+                .map { series ->
+                    series.associate { entry ->
+                        entry.x to ColumnChartDrawingModel.ColumnInfo(abs(entry.y) / chartValues.lengthY)
+                    }
                 }
-            }
-            .let(::ColumnChartDrawingModel)
+                .let(::ColumnChartDrawingModel)
     }
 }
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/column/ColumnChartDrawingModel.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/column/ColumnChartDrawingModel.kt
index a0619ab25..38bd68fbb 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/column/ColumnChartDrawingModel.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/column/ColumnChartDrawingModel.kt
@@ -25,7 +25,6 @@ import com.patrykandpatrick.vico.core.extension.orZero
  */
 public class ColumnChartDrawingModel(entries: List<Map<Float, ColumnInfo>>, public val opacity: Float = 1f) :
     DrawingModel<ColumnChartDrawingModel.ColumnInfo>(entries) {
-
     override fun transform(
         drawingInfo: List<Map<Float, ColumnInfo>>,
         from: DrawingModel<ColumnInfo>?,
@@ -40,7 +39,10 @@ public class ColumnChartDrawingModel(entries: List<Map<Float, ColumnInfo>>, publ
      * of the [ColumnChart]’s height.
      */
     public class ColumnInfo(public val height: Float) : DrawingInfo {
-        override fun transform(from: DrawingInfo?, fraction: Float): DrawingInfo {
+        override fun transform(
+            from: DrawingInfo?,
+            fraction: Float,
+        ): DrawingInfo {
             val oldHeight = (from as? ColumnInfo)?.height.orZero
             return ColumnInfo(oldHeight.lerp(height, fraction))
         }
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/composed/ComposedChart.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/composed/ComposedChart.kt
index e203a43fe..66cbb5ff4 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/composed/ComposedChart.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/composed/ComposedChart.kt
@@ -42,7 +42,6 @@ import java.util.TreeMap
 public class ComposedChart<Model : ChartEntryModel>(
     charts: List<Chart<Model>>,
 ) : BaseChart<ComposedChartEntryModel<Model>>() {
-
     public constructor(vararg charts: Chart<Model>) : this(charts.toList())
 
     /**
@@ -57,7 +56,12 @@ public class ComposedChart<Model : ChartEntryModel>(
     override val chartInsetters: Collection<ChartInsetter>
         get() = charts.map { it.chartInsetters }.flatten() + persistentMarkers.values
 
-    override fun setBounds(left: Number, top: Number, right: Number, bottom: Number) {
+    override fun setBounds(
+        left: Number,
+        top: Number,
+        right: Number,
+        bottom: Number,
+    ) {
         this.bounds.set(left, top, right, bottom)
         charts.forEach { chart -> chart.setBounds(left, top, right, bottom) }
     }
@@ -73,7 +77,10 @@ public class ComposedChart<Model : ChartEntryModel>(
         }
     }
 
-    override fun drawChartInternal(context: ChartDrawContext, model: ComposedChartEntryModel<Model>) {
+    override fun drawChartInternal(
+        context: ChartDrawContext,
+        model: ComposedChartEntryModel<Model>,
+    ) {
         drawDecorationBehindChart(context)
         if (model.entries.isNotEmpty()) {
             drawChart(context, model)
@@ -111,7 +118,11 @@ public class ComposedChart<Model : ChartEntryModel>(
         }
     }
 
-    override fun getHorizontalInsets(context: MeasureContext, availableHeight: Float, outInsets: HorizontalInsets) {
+    override fun getHorizontalInsets(
+        context: MeasureContext,
+        availableHeight: Float,
+        outInsets: HorizontalInsets,
+    ) {
         charts.forEach { chart ->
             chart.getHorizontalInsets(context, availableHeight, tempInsets)
             outInsets.setValuesIfGreater(start = tempInsets.start, end = tempInsets.end)
@@ -130,17 +141,17 @@ public class ComposedChart<Model : ChartEntryModel>(
         }
     }
 
-    override val modelTransformerProvider: ModelTransformerProvider = object : ModelTransformerProvider {
-        private val modelTransformer =
-            ComposedModelTransformer { charts.map { it.modelTransformerProvider.getModelTransformer() } }
+    override val modelTransformerProvider: ModelTransformerProvider =
+        object : ModelTransformerProvider {
+            private val modelTransformer =
+                ComposedModelTransformer { charts.map { it.modelTransformerProvider.getModelTransformer() } }
 
-        override fun <T : ChartEntryModel> getModelTransformer(): Chart.ModelTransformer<T> = modelTransformer
-    }
+            override fun <T : ChartEntryModel> getModelTransformer(): Chart.ModelTransformer<T> = modelTransformer
+        }
 
     private class ComposedModelTransformer<T : ChartEntryModel>(
         private val getModelTransformers: () -> List<Chart.ModelTransformer<T>>,
     ) : Chart.ModelTransformer<T>() {
-
         override val key: ExtraStore.Key<Nothing> = ExtraStore.Key()
 
         override fun prepareForTransformation(
@@ -160,7 +171,10 @@ public class ComposedChart<Model : ChartEntryModel>(
             }
         }
 
-        override suspend fun transform(extraStore: MutableExtraStore, fraction: Float) {
+        override suspend fun transform(
+            extraStore: MutableExtraStore,
+            fraction: Float,
+        ) {
             getModelTransformers().forEach { transformer ->
                 transformer.transform(extraStore, fraction)
             }
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/composed/ComposedChartEntryModel.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/composed/ComposedChartEntryModel.kt
index 3085a359e..8db92a86f 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/composed/ComposedChartEntryModel.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/composed/ComposedChartEntryModel.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 by Patryk Goworowski and Patrick Michalik.
+ * Copyright 2023 by Patryk Goworowski and Patrick Michalik.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,7 +22,6 @@ import com.patrykandpatrick.vico.core.entry.ChartEntryModel
  * An extended [ChartEntryModel] that can compose multiple [ChartEntryModel]s. It is used by [ComposedChart].
  */
 public interface ComposedChartEntryModel<Model : ChartEntryModel> : ChartEntryModel {
-
     /**
      * A list of the [ChartEntryModel]s that make up this model.
      */
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/composed/ComposedChartExtensions.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/composed/ComposedChartExtensions.kt
index 3784a7db1..cfcca4826 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/composed/ComposedChartExtensions.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/composed/ComposedChartExtensions.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 by Patryk Goworowski and Patrick Michalik.
+ * Copyright 2023 by Patryk Goworowski and Patrick Michalik.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,17 +22,13 @@ import com.patrykandpatrick.vico.core.entry.ChartEntryModel
 /**
  * Combines this [Chart] with another one to create a [ComposedChart].
  */
-public operator fun <Model : ChartEntryModel> Chart<Model>.plus(
-    other: Chart<Model>,
-): ComposedChart<Model> =
+public operator fun <Model : ChartEntryModel> Chart<Model>.plus(other: Chart<Model>): ComposedChart<Model> =
     ComposedChart(listOf(this, other))
 
 /**
  * Combines this [ComposedChart] with a [Chart] to create a [ComposedChart].
  */
-public operator fun <Model : ChartEntryModel> ComposedChart<Model>.plus(
-    other: Chart<Model>,
-): ComposedChart<Model> =
+public operator fun <Model : ChartEntryModel> ComposedChart<Model>.plus(other: Chart<Model>): ComposedChart<Model> =
     ComposedChart(charts + other)
 
 /**
@@ -40,5 +36,4 @@ public operator fun <Model : ChartEntryModel> ComposedChart<Model>.plus(
  */
 public operator fun <Model : ChartEntryModel> ComposedChart<Model>.plus(
     other: ComposedChart<Model>,
-): ComposedChart<Model> =
-    ComposedChart(charts + other.charts)
+): ComposedChart<Model> = ComposedChart(charts + other.charts)
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/decoration/Decoration.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/decoration/Decoration.kt
index 30258f415..ac99316ed 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/decoration/Decoration.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/decoration/Decoration.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 by Patryk Goworowski and Patrick Michalik.
+ * Copyright 2023 by Patryk Goworowski and Patrick Michalik.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,14 +28,16 @@ import com.patrykandpatrick.vico.core.chart.draw.ChartDrawContext
  * @see [ThresholdLine]
  */
 public interface Decoration {
-
     /**
      * Called before the [Chart] starts drawing itself.
      *
      * @param [context] holds the information needed to draw the [Chart].
      * @param [bounds] the bounding box of the [Chart].
      */
-    public fun onDrawBehindChart(context: ChartDrawContext, bounds: RectF): Unit = Unit
+    public fun onDrawBehindChart(
+        context: ChartDrawContext,
+        bounds: RectF,
+    ): Unit = Unit
 
     /**
      * Called immediately after the [Chart] finishes drawing itself.
@@ -43,5 +45,8 @@ public interface Decoration {
      * @param [context] holds the information needed to draw the [Chart].
      * @param [bounds] the bounding box of the [Chart].
      */
-    public fun onDrawAboveChart(context: ChartDrawContext, bounds: RectF): Unit = Unit
+    public fun onDrawAboveChart(
+        context: ChartDrawContext,
+        bounds: RectF,
+    ): Unit = Unit
 }
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/decoration/ThresholdLine.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/decoration/ThresholdLine.kt
index 67cbd88ce..39cb34326 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/decoration/ThresholdLine.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/decoration/ThresholdLine.kt
@@ -50,10 +50,11 @@ import java.text.DecimalFormat
  */
 public data class ThresholdLine(
     val thresholdRange: ClosedFloatingPointRange<Float>,
-    val thresholdLabel: CharSequence = RANGE_FORMAT.format(
-        decimalFormat.format(thresholdRange.start),
-        decimalFormat.format(thresholdRange.endInclusive),
-    ),
+    val thresholdLabel: CharSequence =
+        RANGE_FORMAT.format(
+            decimalFormat.format(thresholdRange.start),
+            decimalFormat.format(thresholdRange.endInclusive),
+        ),
     val lineComponent: ShapeComponent = ShapeComponent(),
     val minimumLineThicknessDp: Float = DefaultDimens.THRESHOLD_LINE_THICKNESS,
     val labelComponent: TextComponent = textComponent(),
@@ -61,7 +62,6 @@ public data class ThresholdLine(
     val labelVerticalPosition: LabelVerticalPosition = LabelVerticalPosition.Top,
     val labelRotationDegrees: Float = 0f,
 ) : Decoration {
-
     /**
      * An alternative constructor that accepts a single y-axis value as opposed to a range.
      *
@@ -98,55 +98,62 @@ public data class ThresholdLine(
     override fun onDrawAboveChart(
         context: ChartDrawContext,
         bounds: RectF,
-    ): Unit = with(context) {
-        val chartValues = chartValuesProvider.getChartValues()
+    ): Unit =
+        with(context) {
+            val chartValues = chartValuesProvider.getChartValues()
 
-        val valueRange = chartValues.maxY - chartValues.minY
+            val valueRange = chartValues.maxY - chartValues.minY
 
-        val centerY = bounds.bottom - (thresholdRange.median - chartValues.minY) / valueRange * bounds.height()
+            val centerY = bounds.bottom - (thresholdRange.median - chartValues.minY) / valueRange * bounds.height()
 
-        val topY = minOf(
-            bounds.bottom - (thresholdRange.endInclusive - chartValues.minY) / valueRange * bounds.height(),
-            centerY - minimumLineThicknessDp.pixels.half,
-        ).ceil
-        val bottomY = maxOf(
-            bounds.bottom - (thresholdRange.start - chartValues.minY) / valueRange * bounds.height(),
-            centerY + minimumLineThicknessDp.pixels.half,
-        ).floor
-        val textY = when (labelVerticalPosition) {
-            LabelVerticalPosition.Top -> topY
-            LabelVerticalPosition.Bottom -> bottomY
-        }
+            val topY =
+                minOf(
+                    bounds.bottom - (thresholdRange.endInclusive - chartValues.minY) / valueRange * bounds.height(),
+                    centerY - minimumLineThicknessDp.pixels.half,
+                ).ceil
+            val bottomY =
+                maxOf(
+                    bounds.bottom - (thresholdRange.start - chartValues.minY) / valueRange * bounds.height(),
+                    centerY + minimumLineThicknessDp.pixels.half,
+                ).floor
+            val textY =
+                when (labelVerticalPosition) {
+                    LabelVerticalPosition.Top -> topY
+                    LabelVerticalPosition.Bottom -> bottomY
+                }
 
-        lineComponent.draw(
-            context = context,
-            left = bounds.left,
-            right = bounds.right,
-            top = topY,
-            bottom = bottomY,
-        )
-        labelComponent.drawText(
-            context = context,
-            text = thresholdLabel,
-            maxTextWidth = bounds.width().toInt(),
-            textX = when (labelHorizontalPosition) {
-                LabelHorizontalPosition.Start -> bounds.getStart(isLtr = isLtr)
-                LabelHorizontalPosition.End -> bounds.getEnd(isLtr = isLtr)
-            },
-            textY = textY,
-            horizontalPosition = labelHorizontalPosition.position,
-            verticalPosition = labelVerticalPosition.position.inBounds(
-                bounds = bounds,
-                componentHeight = labelComponent.getHeight(
-                    context = context,
-                    text = thresholdLabel,
-                    rotationDegrees = labelRotationDegrees,
-                ),
-                y = textY,
-            ),
-            rotationDegrees = labelRotationDegrees,
-        )
-    }
+            lineComponent.draw(
+                context = context,
+                left = bounds.left,
+                right = bounds.right,
+                top = topY,
+                bottom = bottomY,
+            )
+            labelComponent.drawText(
+                context = context,
+                text = thresholdLabel,
+                maxTextWidth = bounds.width().toInt(),
+                textX =
+                    when (labelHorizontalPosition) {
+                        LabelHorizontalPosition.Start -> bounds.getStart(isLtr = isLtr)
+                        LabelHorizontalPosition.End -> bounds.getEnd(isLtr = isLtr)
+                    },
+                textY = textY,
+                horizontalPosition = labelHorizontalPosition.position,
+                verticalPosition =
+                    labelVerticalPosition.position.inBounds(
+                        bounds = bounds,
+                        componentHeight =
+                            labelComponent.getHeight(
+                                context = context,
+                                text = thresholdLabel,
+                                rotationDegrees = labelRotationDegrees,
+                            ),
+                        y = textY,
+                    ),
+                rotationDegrees = labelRotationDegrees,
+            )
+        }
 
     /**
      * Defines the horizontal position of a [ThresholdLine]’s label.
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/dimensions/HorizontalDimensions.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/dimensions/HorizontalDimensions.kt
index b9d731307..0665d4d4c 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/dimensions/HorizontalDimensions.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/dimensions/HorizontalDimensions.kt
@@ -88,13 +88,14 @@ public interface HorizontalDimensions {
     /**
      * Creates a new [HorizontalDimensions] instance by multiplying this one’s scalable values by the given factor.
      */
-    public fun scaled(scale: Float): HorizontalDimensions = HorizontalDimensions(
-        xSpacing * scale,
-        scalableStartPadding * scale,
-        scalableEndPadding * scale,
-        unscalableStartPadding,
-        unscalableEndPadding,
-    )
+    public fun scaled(scale: Float): HorizontalDimensions =
+        HorizontalDimensions(
+            xSpacing * scale,
+            scalableStartPadding * scale,
+            scalableEndPadding * scale,
+            unscalableStartPadding,
+            unscalableEndPadding,
+        )
 }
 
 /**
@@ -106,10 +107,11 @@ public fun HorizontalDimensions(
     scalableEndPadding: Float,
     unscalableStartPadding: Float,
     unscalableEndPadding: Float,
-): HorizontalDimensions = object : HorizontalDimensions {
-    override val xSpacing: Float = xSpacing
-    override val scalableStartPadding: Float = scalableStartPadding
-    override val scalableEndPadding: Float = scalableEndPadding
-    override val unscalableStartPadding: Float = unscalableStartPadding
-    override val unscalableEndPadding: Float = unscalableEndPadding
-}
+): HorizontalDimensions =
+    object : HorizontalDimensions {
+        override val xSpacing: Float = xSpacing
+        override val scalableStartPadding: Float = scalableStartPadding
+        override val scalableEndPadding: Float = scalableEndPadding
+        override val unscalableStartPadding: Float = unscalableStartPadding
+        override val unscalableEndPadding: Float = unscalableEndPadding
+    }
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/dimensions/MutableHorizontalDimensions.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/dimensions/MutableHorizontalDimensions.kt
index 2dedaca95..7293b34b8 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/dimensions/MutableHorizontalDimensions.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/dimensions/MutableHorizontalDimensions.kt
@@ -35,13 +35,14 @@ public data class MutableHorizontalDimensions(
         scalableEndPadding: Float,
         unscalableStartPadding: Float,
         unscalableEndPadding: Float,
-    ): MutableHorizontalDimensions = apply {
-        this.xSpacing = xSpacing
-        this.scalableStartPadding = scalableStartPadding
-        this.scalableEndPadding = scalableEndPadding
-        this.unscalableStartPadding = unscalableStartPadding
-        this.unscalableEndPadding = unscalableEndPadding
-    }
+    ): MutableHorizontalDimensions =
+        apply {
+            this.xSpacing = xSpacing
+            this.scalableStartPadding = scalableStartPadding
+            this.scalableEndPadding = scalableEndPadding
+            this.unscalableStartPadding = unscalableStartPadding
+            this.unscalableEndPadding = unscalableEndPadding
+        }
 
     /**
      * Ensures that the stored values are no smaller than the provided ones.
@@ -52,13 +53,14 @@ public data class MutableHorizontalDimensions(
         scalableEndPadding: Float = 0f,
         unscalableStartPadding: Float = 0f,
         unscalableEndPadding: Float = 0f,
-    ): MutableHorizontalDimensions = set(
-        this.xSpacing.coerceAtLeast(xSpacing),
-        this.scalableStartPadding.coerceAtLeast(scalableStartPadding),
-        this.scalableEndPadding.coerceAtLeast(scalableEndPadding),
-        this.unscalableStartPadding.coerceAtLeast(unscalableStartPadding),
-        this.unscalableEndPadding.coerceAtLeast(unscalableEndPadding),
-    )
+    ): MutableHorizontalDimensions =
+        set(
+            this.xSpacing.coerceAtLeast(xSpacing),
+            this.scalableStartPadding.coerceAtLeast(scalableStartPadding),
+            this.scalableEndPadding.coerceAtLeast(scalableEndPadding),
+            this.unscalableStartPadding.coerceAtLeast(unscalableStartPadding),
+            this.unscalableEndPadding.coerceAtLeast(unscalableEndPadding),
+        )
 
     /**
      * Clears the stored values.
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/draw/ChartDrawContext.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/draw/ChartDrawContext.kt
index d0da5bef0..36627c3f3 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/draw/ChartDrawContext.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/draw/ChartDrawContext.kt
@@ -29,7 +29,6 @@ import com.patrykandpatrick.vico.core.model.Point
  * An extension of [DrawContext] that holds additional data required to render a [Chart].
  */
 public interface ChartDrawContext : DrawContext {
-
     /**
      * The bounds in which the [Chart] will be drawn.
      */
@@ -64,9 +63,10 @@ public fun MeasureContext.getMaxScrollDistance(
     horizontalDimensions: HorizontalDimensions,
     zoom: Float? = null,
 ): Float {
-    val contentWidth = horizontalDimensions
-        .run { if (zoom != null) scaled(zoom) else this }
-        .getContentWidth(chartValuesProvider.getChartValues().getMaxMajorEntryCount())
+    val contentWidth =
+        horizontalDimensions
+            .run { if (zoom != null) scaled(zoom) else this }
+            .getContentWidth(chartValuesProvider.getChartValues().getMaxMajorEntryCount())
 
     return (layoutDirectionMultiplier * (contentWidth - chartWidth)).run {
         if (isLtr) coerceAtLeast(minimumValue = 0f) else coerceAtMost(maximumValue = 0f)
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/draw/ChartDrawContextExtensions.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/draw/ChartDrawContextExtensions.kt
index 8d2e9cd2a..45d40cce9 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/draw/ChartDrawContextExtensions.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/draw/ChartDrawContextExtensions.kt
@@ -52,29 +52,32 @@ public fun chartDrawContext(
     chartBounds: RectF,
     horizontalScroll: Float,
     zoom: Float,
-): ChartDrawContext = object : ChartDrawContext, MeasureContext by measureContext {
+): ChartDrawContext =
+    object : ChartDrawContext, MeasureContext by measureContext {
+        override val chartBounds: RectF = chartBounds
 
-    override val chartBounds: RectF = chartBounds
+        override var canvas: Canvas = canvas
 
-    override var canvas: Canvas = canvas
+        override val elevationOverlayColor: Long = elevationOverlayColor.toLong()
 
-    override val elevationOverlayColor: Long = elevationOverlayColor.toLong()
+        override val markerTouchPoint: Point? = markerTouchPoint
 
-    override val markerTouchPoint: Point? = markerTouchPoint
+        override val zoom: Float = zoom
 
-    override val zoom: Float = zoom
+        override val horizontalDimensions: HorizontalDimensions = horizontalDimensions.scaled(zoom)
 
-    override val horizontalDimensions: HorizontalDimensions = horizontalDimensions.scaled(zoom)
+        override val horizontalScroll: Float = horizontalScroll
 
-    override val horizontalScroll: Float = horizontalScroll
-
-    override fun withOtherCanvas(canvas: Canvas, block: (DrawContext) -> Unit) {
-        val originalCanvas = this.canvas
-        this.canvas = canvas
-        block(this)
-        this.canvas = originalCanvas
+        override fun withOtherCanvas(
+            canvas: Canvas,
+            block: (DrawContext) -> Unit,
+        ) {
+            val originalCanvas = this.canvas
+            this.canvas = canvas
+            block(this)
+            this.canvas = originalCanvas
+        }
     }
-}
 
 /**
  * Draws the provided [marker] on top of the chart at the given [markerTouchPoint] and notifies the
@@ -125,5 +128,5 @@ public fun <Model : ChartEntryModel> ChartDrawContext.drawMarker(
 }
 
 private fun List<Marker.EntryModel>.xPosition(): Float? = firstOrNull()?.entry?.x
-private fun List<Marker.EntryModel>.hasMoved(other: List<Marker.EntryModel>): Boolean =
-    xPosition() != other.xPosition()
+
+private fun List<Marker.EntryModel>.hasMoved(other: List<Marker.EntryModel>): Boolean = xPosition() != other.xPosition()
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/edges/FadingEdges.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/edges/FadingEdges.kt
index 4427ce9bf..520cd6106 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/edges/FadingEdges.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/edges/FadingEdges.kt
@@ -50,7 +50,6 @@ public open class FadingEdges(
     public var visibilityThresholdDp: Float = FADING_EDGE_VISIBILITY_THRESHOLD_DP,
     public var visibilityInterpolator: TimeInterpolator = AccelerateDecelerateInterpolator(),
 ) {
-
     private val paint: Paint = Paint()
 
     private val rect: RectF = RectF()
@@ -90,36 +89,37 @@ public open class FadingEdges(
     public fun applyFadingEdges(
         context: ChartDrawContext,
         bounds: RectF,
-    ): Unit = with(context) {
-        val maxScroll = getMaxScrollDistance()
-        var fadeAlphaFraction: Float
-
-        if (isHorizontalScrollEnabled && startEdgeWidthDp > 0f && horizontalScroll > 0f) {
-            fadeAlphaFraction = (horizontalScroll / visibilityThresholdDp.pixels).coerceAtMost(1f)
-
-            drawFadingEdge(
-                left = bounds.left,
-                top = bounds.top,
-                right = bounds.left + startEdgeWidthDp.pixels,
-                bottom = bounds.bottom,
-                direction = -1,
-                alpha = (visibilityInterpolator.getInterpolation(fadeAlphaFraction) * FULL_ALPHA).toInt(),
-            )
-        }
-
-        if (isHorizontalScrollEnabled && endEdgeWidthDp > 0f && horizontalScroll < maxScroll) {
-            fadeAlphaFraction = ((maxScroll - horizontalScroll) / visibilityThresholdDp.pixels).coerceAtMost(1f)
-
-            drawFadingEdge(
-                left = bounds.right - endEdgeWidthDp.pixels,
-                top = bounds.top,
-                right = bounds.right,
-                bottom = bounds.bottom,
-                direction = 1,
-                alpha = (visibilityInterpolator.getInterpolation(fadeAlphaFraction) * FULL_ALPHA).toInt(),
-            )
+    ): Unit =
+        with(context) {
+            val maxScroll = getMaxScrollDistance()
+            var fadeAlphaFraction: Float
+
+            if (isHorizontalScrollEnabled && startEdgeWidthDp > 0f && horizontalScroll > 0f) {
+                fadeAlphaFraction = (horizontalScroll / visibilityThresholdDp.pixels).coerceAtMost(1f)
+
+                drawFadingEdge(
+                    left = bounds.left,
+                    top = bounds.top,
+                    right = bounds.left + startEdgeWidthDp.pixels,
+                    bottom = bounds.bottom,
+                    direction = -1,
+                    alpha = (visibilityInterpolator.getInterpolation(fadeAlphaFraction) * FULL_ALPHA).toInt(),
+                )
+            }
+
+            if (isHorizontalScrollEnabled && endEdgeWidthDp > 0f && horizontalScroll < maxScroll) {
+                fadeAlphaFraction = ((maxScroll - horizontalScroll) / visibilityThresholdDp.pixels).coerceAtMost(1f)
+
+                drawFadingEdge(
+                    left = bounds.right - endEdgeWidthDp.pixels,
+                    top = bounds.top,
+                    right = bounds.right,
+                    bottom = bounds.bottom,
+                    direction = 1,
+                    alpha = (visibilityInterpolator.getInterpolation(fadeAlphaFraction) * FULL_ALPHA).toInt(),
+                )
+            }
         }
-    }
 
     private fun ChartDrawContext.drawFadingEdge(
         left: Float,
@@ -133,15 +133,16 @@ public open class FadingEdges(
 
         val faded = FULL_FADE.copyColor(alpha = alpha)
 
-        paint.shader = LinearGradient(
-            rect.left,
-            0f,
-            rect.right,
-            0f,
-            if (direction < 0) faded else NO_FADE,
-            if (direction < 0) NO_FADE else faded,
-            Shader.TileMode.CLAMP,
-        )
+        paint.shader =
+            LinearGradient(
+                rect.left,
+                0f,
+                rect.right,
+                0f,
+                if (direction < 0) faded else NO_FADE,
+                if (direction < 0) NO_FADE else faded,
+                Shader.TileMode.CLAMP,
+            )
         canvas.drawRect(rect, paint)
     }
 }
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/insets/ChartInsetter.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/insets/ChartInsetter.kt
index 07fc5fc37..aa1257077 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/insets/ChartInsetter.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/insets/ChartInsetter.kt
@@ -27,7 +27,6 @@ import com.patrykandpatrick.vico.core.marker.Marker
  * like.
  */
 public interface ChartInsetter {
-
     /**
      * Called during the measurement phase, before [getHorizontalInsets]. Both horizontal and vertical insets can be
      * requested from this function. The final inset for a given edge of the associated [Chart] is the largest of the
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/insets/HorizontalInsets.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/insets/HorizontalInsets.kt
index da1c25434..b1c0da128 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/insets/HorizontalInsets.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/insets/HorizontalInsets.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 by Patryk Goworowski and Patrick Michalik.
+ * Copyright 2023 by Patryk Goworowski and Patrick Michalik.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,15 +25,20 @@ import com.patrykandpatrick.vico.core.chart.Chart
  * @see Insets
  */
 public interface HorizontalInsets {
-
     /**
      * Sets the start and end insets.
      */
-    public fun set(start: Float, end: Float)
+    public fun set(
+        start: Float,
+        end: Float,
+    )
 
     /**
      * For the start and end insets, updates the value of the inset to the corresponding
      * provided value if the provided value is greater than the current value.
      */
-    public fun setValuesIfGreater(start: Float, end: Float)
+    public fun setValuesIfGreater(
+        start: Float,
+        end: Float,
+    )
 }
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/insets/Insets.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/insets/Insets.kt
index 3a6a1941e..161e28c65 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/insets/Insets.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/insets/Insets.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 by Patryk Goworowski and Patrick Michalik.
+ * Copyright 2023 by Patryk Goworowski and Patrick Michalik.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -35,7 +35,6 @@ public class Insets(
     public var end: Float = 0f,
     public var bottom: Float = 0f,
 ) : HorizontalInsets {
-
     /**
      * The sum of the sizes of the start inset and the end inset.
      */
@@ -67,17 +66,21 @@ public class Insets(
         top: Float = 0f,
         end: Float = 0f,
         bottom: Float = 0f,
-    ): Insets = apply {
-        this.start = start
-        this.top = top
-        this.end = end
-        this.bottom = bottom
-    }
+    ): Insets =
+        apply {
+            this.start = start
+            this.top = top
+            this.end = end
+            this.bottom = bottom
+        }
 
     /**
      * Updates the sizes of the start inset and the end inset.
      */
-    override fun set(start: Float, end: Float) {
+    override fun set(
+        start: Float,
+        end: Float,
+    ) {
         this.start = start
         this.end = end
     }
@@ -100,21 +103,26 @@ public class Insets(
      * Sets the sizes of the start inset and the end inset. [value] represents the sum of the two insets’ sizes, meaning
      * the size of either inset will be half of [value].
      */
-    public fun setHorizontal(value: Float): Insets = apply {
-        start = value.half
-        end = value.half
-    }
+    public fun setHorizontal(value: Float): Insets =
+        apply {
+            start = value.half
+            end = value.half
+        }
 
     /**
      * Sets the sizes of the top inset and the bottom inset. [value] represents the sum of the two insets’ sizes,
      * meaning the size of either inset will be half of [value].
      */
-    public fun setVertical(value: Float): Insets = apply {
-        top = value.half
-        bottom = value.half
-    }
-
-    override fun setValuesIfGreater(start: Float, end: Float) {
+    public fun setVertical(value: Float): Insets =
+        apply {
+            top = value.half
+            bottom = value.half
+        }
+
+    override fun setValuesIfGreater(
+        start: Float,
+        end: Float,
+    ) {
         this.start = max(start, this.start)
         this.end = max(end, this.end)
     }
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/line/LineChart.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/line/LineChart.kt
index f50922a81..7caa4613a 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/line/LineChart.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/line/LineChart.kt
@@ -85,7 +85,6 @@ public open class LineChart(
         LineChartDrawingModel,
         > = DefaultDrawingModelInterpolator(),
 ) : BaseChart<ChartEntryModel>() {
-
     /**
      * Creates a [LineChart] with a common style for all lines.
      *
@@ -128,7 +127,6 @@ public open class LineChart(
         public var dataLabelRotationDegrees: Float = 0f,
         public var pointConnector: PointConnector = DefaultPointConnector(),
     ) {
-
         /**
          * @param lineColor the color of the line.
          * @param lineThicknessDp the thickness of the line (in dp).
@@ -174,10 +172,11 @@ public open class LineChart(
         public val hasLineBackgroundShader: Boolean
             get() = lineBackgroundShader != null
 
-        protected val linePaint: Paint = Paint(Paint.ANTI_ALIAS_FLAG).apply {
-            style = Paint.Style.STROKE
-            strokeCap = lineCap
-        }
+        protected val linePaint: Paint =
+            Paint(Paint.ANTI_ALIAS_FLAG).apply {
+                style = Paint.Style.STROKE
+                strokeCap = lineCap
+            }
 
         protected val lineBackgroundPaint: Paint = Paint(Paint.ANTI_ALIAS_FLAG)
 
@@ -201,9 +200,10 @@ public open class LineChart(
             context: DrawContext,
             x: Float,
             y: Float,
-        ): Unit = with(context) {
-            point?.drawPoint(context, x, y, pointSizeDp.pixels.half)
-        }
+        ): Unit =
+            with(context) {
+                point?.drawPoint(context, x, y, pointSizeDp.pixels.half)
+            }
 
         /**
          * Draws the line.
@@ -270,7 +270,6 @@ public open class LineChart(
          * @see DefaultPointConnector
          */
         public interface PointConnector {
-
             /**
              * Draws a line between two points.
              */
@@ -303,83 +302,90 @@ public open class LineChart(
     override fun drawChart(
         context: ChartDrawContext,
         model: ChartEntryModel,
-    ): Unit = with(context) {
-        resetTempData()
-
-        val drawingModel = model.extraStore.getOrNull(drawingModelKey)
-        val chartValues = chartValuesProvider.getChartValues(targetVerticalAxisPosition)
-        val zeroLineYFraction = 1f - (drawingModel?.zeroY ?: abs(chartValues.minY / chartValues.lengthY))
-
-        model.entries.forEachIndexed { entryListIndex, entries ->
-
-            val pointInfoMap = drawingModel?.getOrNull(entryListIndex)
-
-            linePath.rewind()
-            lineBackgroundPath.rewind()
-            val component = lines.getRepeating(entryListIndex)
-
-            var prevX = bounds.getStart(isLtr = isLtr)
-            var prevY = bounds.bottom
-
-            val drawingStartAlignmentCorrection = layoutDirectionMultiplier * horizontalDimensions.startPadding
-
-            val drawingStart = bounds.getStart(isLtr = isLtr) + drawingStartAlignmentCorrection - horizontalScroll
-
-            forEachPointWithinBoundsIndexed(
-                entries = entries,
-                drawingStart = drawingStart,
-                pointInfoMap = pointInfoMap,
-            ) { entryIndex, entry, x, y, _, _ ->
-                if (linePath.isEmpty) {
-                    linePath.moveTo(x, y)
-                } else {
-                    component.pointConnector.connect(
-                        path = linePath,
-                        prevX = prevX,
-                        prevY = prevY,
-                        x = x,
-                        y = y,
-                        horizontalDimensions = horizontalDimensions,
-                        bounds = bounds,
-                    )
+    ): Unit =
+        with(context) {
+            resetTempData()
+
+            val drawingModel = model.extraStore.getOrNull(drawingModelKey)
+            val chartValues = chartValuesProvider.getChartValues(targetVerticalAxisPosition)
+            val zeroLineYFraction = 1f - (drawingModel?.zeroY ?: abs(chartValues.minY / chartValues.lengthY))
+
+            model.entries.forEachIndexed { entryListIndex, entries ->
+
+                val pointInfoMap = drawingModel?.getOrNull(entryListIndex)
+
+                linePath.rewind()
+                lineBackgroundPath.rewind()
+                val component = lines.getRepeating(entryListIndex)
+
+                var prevX = bounds.getStart(isLtr = isLtr)
+                var prevY = bounds.bottom
+
+                val drawingStartAlignmentCorrection = layoutDirectionMultiplier * horizontalDimensions.startPadding
+
+                val drawingStart = bounds.getStart(isLtr = isLtr) + drawingStartAlignmentCorrection - horizontalScroll
+
+                forEachPointWithinBoundsIndexed(
+                    entries = entries,
+                    drawingStart = drawingStart,
+                    pointInfoMap = pointInfoMap,
+                ) { entryIndex, entry, x, y, _, _ ->
+                    if (linePath.isEmpty) {
+                        linePath.moveTo(x, y)
+                    } else {
+                        component.pointConnector.connect(
+                            path = linePath,
+                            prevX = prevX,
+                            prevY = prevY,
+                            x = x,
+                            y = y,
+                            horizontalDimensions = horizontalDimensions,
+                            bounds = bounds,
+                        )
+                    }
+                    prevX = x
+                    prevY = y
+
+                    if (x > bounds.left - 1 && x < bounds.right + 1) {
+                        val coercedY = y.coerceIn(bounds.top, bounds.bottom)
+                        entryLocationMap.put(
+                            x = x,
+                            y = coercedY,
+                            entry = entry,
+                            color =
+                                component.lineShader.getColorAt(
+                                    Point(x, coercedY),
+                                    context,
+                                    bounds,
+                                    zeroLineYFraction,
+                                ),
+                            index = entryIndex,
+                        )
+                    }
                 }
-                prevX = x
-                prevY = y
-
-                if (x > bounds.left - 1 && x < bounds.right + 1) {
-                    val coercedY = y.coerceIn(bounds.top, bounds.bottom)
-                    entryLocationMap.put(
-                        x = x,
-                        y = coercedY,
-                        entry = entry,
-                        color = component.lineShader.getColorAt(Point(x, coercedY), context, bounds, zeroLineYFraction),
-                        index = entryIndex,
+
+                if (component.hasLineBackgroundShader) {
+                    lineBackgroundPath.addPath(linePath)
+                    lineBackgroundPath.lineTo(prevX, bounds.bottom)
+                    component.drawBackgroundLine(
+                        context,
+                        bounds,
+                        zeroLineYFraction,
+                        lineBackgroundPath,
+                        drawingModel?.opacity ?: 1f,
                     )
                 }
-            }
 
-            if (component.hasLineBackgroundShader) {
-                lineBackgroundPath.addPath(linePath)
-                lineBackgroundPath.lineTo(prevX, bounds.bottom)
-                component.drawBackgroundLine(
-                    context,
-                    bounds,
-                    zeroLineYFraction,
-                    lineBackgroundPath,
-                    drawingModel?.opacity ?: 1f,
+                component.drawLine(context, bounds, zeroLineYFraction, linePath, drawingModel?.opacity ?: 1f)
+
+                drawPointsAndDataLabels(
+                    lineSpec = component,
+                    entries = entries,
+                    drawingStart = drawingStart,
+                    pointInfoMap = pointInfoMap,
                 )
             }
-
-            component.drawLine(context, bounds, zeroLineYFraction, linePath, drawingModel?.opacity ?: 1f)
-
-            drawPointsAndDataLabels(
-                lineSpec = component,
-                entries = entries,
-                drawingStart = drawingStart,
-                pointInfoMap = pointInfoMap,
-            )
         }
-    }
 
     /**
      * Draws a line’s points ([LineSpec.point]) and their corresponding data labels ([LineSpec.dataLabel]).
@@ -408,32 +414,38 @@ public open class LineChart(
                     chartEntry.x == chartValues.maxX && horizontalDimensions.endPadding > 0
             }?.let { textComponent ->
 
-                val distanceFromLine = maxOf(
-                    a = lineSpec.lineThicknessDp,
-                    b = lineSpec.pointSizeDpOrZero,
-                ).half.pixels
+                val distanceFromLine =
+                    maxOf(
+                        a = lineSpec.lineThicknessDp,
+                        b = lineSpec.pointSizeDpOrZero,
+                    ).half.pixels
 
-                val text = lineSpec.dataLabelValueFormatter.formatValue(
-                    value = chartEntry.y,
-                    chartValues = chartValues,
-                )
+                val text =
+                    lineSpec.dataLabelValueFormatter.formatValue(
+                        value = chartEntry.y,
+                        chartValues = chartValues,
+                    )
                 val maxWidth = getMaxDataLabelWidth(chartEntry, x, previousX, nextX)
-                val verticalPosition = lineSpec.dataLabelVerticalPosition.inBounds(
-                    bounds = bounds,
-                    distanceFromPoint = distanceFromLine,
-                    componentHeight = textComponent.getHeight(
-                        context = this,
-                        text = text,
-                        width = maxWidth,
-                        rotationDegrees = lineSpec.dataLabelRotationDegrees,
-                    ),
-                    y = y,
-                )
-                val dataLabelY = y + when (verticalPosition) {
-                    VerticalPosition.Top -> -distanceFromLine
-                    VerticalPosition.Center -> 0f
-                    VerticalPosition.Bottom -> distanceFromLine
-                }
+                val verticalPosition =
+                    lineSpec.dataLabelVerticalPosition.inBounds(
+                        bounds = bounds,
+                        distanceFromPoint = distanceFromLine,
+                        componentHeight =
+                            textComponent.getHeight(
+                                context = this,
+                                text = text,
+                                width = maxWidth,
+                                rotationDegrees = lineSpec.dataLabelRotationDegrees,
+                            ),
+                        y = y,
+                    )
+                val dataLabelY =
+                    y +
+                        when (verticalPosition) {
+                            VerticalPosition.Top -> -distanceFromLine
+                            VerticalPosition.Center -> 0f
+                            VerticalPosition.Bottom -> distanceFromLine
+                        }
                 textComponent.drawText(
                     context = this,
                     textX = x,
@@ -461,20 +473,22 @@ public open class LineChart(
                 min(horizontalDimensions.startPadding, horizontalDimensions.endPadding).doubled
 
             nextX != null -> {
-                val extraSpace = when (horizontalLayout) {
-                    is HorizontalLayout.Segmented -> horizontalDimensions.xSpacing.half
-                    is HorizontalLayout.FullWidth -> horizontalDimensions.startPadding
-                }
+                val extraSpace =
+                    when (horizontalLayout) {
+                        is HorizontalLayout.Segmented -> horizontalDimensions.xSpacing.half
+                        is HorizontalLayout.FullWidth -> horizontalDimensions.startPadding
+                    }
                 ((entry.x - chartValues.minX) / chartValues.xStep * horizontalDimensions.xSpacing + extraSpace)
                     .doubled
                     .coerceAtMost(nextX - x)
             }
 
             else -> {
-                val extraSpace = when (horizontalLayout) {
-                    is HorizontalLayout.Segmented -> horizontalDimensions.xSpacing.half
-                    is HorizontalLayout.FullWidth -> horizontalDimensions.endPadding
-                }
+                val extraSpace =
+                    when (horizontalLayout) {
+                        is HorizontalLayout.Segmented -> horizontalDimensions.xSpacing.half
+                        is HorizontalLayout.FullWidth -> horizontalDimensions.endPadding
+                    }
                 ((chartValues.maxX - entry.x) / chartValues.xStep * horizontalDimensions.xSpacing + extraSpace)
                     .doubled
                     .coerceAtMost(x - previousX!!)
@@ -516,8 +530,9 @@ public open class LineChart(
         val boundsStart = bounds.getStart(isLtr = isLtr)
         val boundsEnd = boundsStart + layoutDirectionMultiplier * bounds.width()
 
-        fun getDrawX(entry: ChartEntry): Float = drawingStart + layoutDirectionMultiplier *
-            horizontalDimensions.xSpacing * (entry.x - minX) / xStep
+        fun getDrawX(entry: ChartEntry): Float =
+            drawingStart + layoutDirectionMultiplier *
+                horizontalDimensions.xSpacing * (entry.x - minX) / xStep
 
         fun getDrawY(entry: ChartEntry): Float =
             bounds.bottom - (pointInfoMap?.get(entry.x)?.y ?: ((entry.y - chartValues.minY) / chartValues.lengthY)) *
@@ -580,7 +595,11 @@ public open class LineChart(
         }
     }
 
-    override fun updateChartValues(chartValuesManager: ChartValuesManager, model: ChartEntryModel, xStep: Float?) {
+    override fun updateChartValues(
+        chartValuesManager: ChartValuesManager,
+        model: ChartEntryModel,
+        xStep: Float?,
+    ) {
         chartValuesManager.tryUpdate(
             minX = axisValuesOverrider?.getMinX(model) ?: model.minX,
             maxX = axisValuesOverrider?.getMaxX(model) ?: model.maxX,
@@ -596,20 +615,23 @@ public open class LineChart(
         context: MeasureContext,
         outInsets: Insets,
         horizontalDimensions: HorizontalDimensions,
-    ): Unit = with(context) {
-        outInsets.setVertical(
-            value = lines.maxOf {
-                if (it.point != null) max(a = it.lineThicknessDp, b = it.pointSizeDp) else it.lineThicknessDp
-            }.pixels,
-        )
-    }
+    ): Unit =
+        with(context) {
+            outInsets.setVertical(
+                value =
+                    lines.maxOf {
+                        if (it.point != null) max(a = it.lineThicknessDp, b = it.pointSizeDp) else it.lineThicknessDp
+                    }.pixels,
+            )
+        }
 
-    override val modelTransformerProvider: Chart.ModelTransformerProvider = object : Chart.ModelTransformerProvider {
-        private val modelTransformer =
-            LineChartModelTransformer(drawingModelKey, { targetVerticalAxisPosition }, { drawingModelInterpolator })
+    override val modelTransformerProvider: Chart.ModelTransformerProvider =
+        object : Chart.ModelTransformerProvider {
+            private val modelTransformer =
+                LineChartModelTransformer(drawingModelKey, { targetVerticalAxisPosition }, { drawingModelInterpolator })
 
-        override fun <T : ChartEntryModel> getModelTransformer(): Chart.ModelTransformer<T> = modelTransformer
-    }
+            override fun <T : ChartEntryModel> getModelTransformer(): Chart.ModelTransformer<T> = modelTransformer
+        }
 
     protected class LineChartModelTransformer(
         override val key: ExtraStore.Key<LineChartDrawingModel>,
@@ -619,7 +641,6 @@ public open class LineChart(
             LineChartDrawingModel,
             >,
     ) : Chart.ModelTransformer<ChartEntryModel>() {
-
         override fun prepareForTransformation(
             oldModel: ChartEntryModel?,
             newModel: ChartEntryModel?,
@@ -632,21 +653,25 @@ public open class LineChart(
             )
         }
 
-        override suspend fun transform(extraStore: MutableExtraStore, fraction: Float) {
+        override suspend fun transform(
+            extraStore: MutableExtraStore,
+            fraction: Float,
+        ) {
             getDrawingModelInterpolator()
                 .transform(fraction)
                 ?.let { extraStore[key] = it }
                 ?: extraStore.remove(key)
         }
 
-        private fun ChartEntryModel.toDrawingModel(chartValues: ChartValues): LineChartDrawingModel = entries
-            .map { series ->
-                series.associate { entry ->
-                    entry.x to LineChartDrawingModel.PointInfo((entry.y - chartValues.minY) / chartValues.lengthY)
+        private fun ChartEntryModel.toDrawingModel(chartValues: ChartValues): LineChartDrawingModel =
+            entries
+                .map { series ->
+                    series.associate { entry ->
+                        entry.x to LineChartDrawingModel.PointInfo((entry.y - chartValues.minY) / chartValues.lengthY)
+                    }
+                }
+                .let { pointInfo ->
+                    LineChartDrawingModel(pointInfo, abs(chartValues.minY / chartValues.lengthY))
                 }
-            }
-            .let { pointInfo ->
-                LineChartDrawingModel(pointInfo, abs(chartValues.minY / chartValues.lengthY))
-            }
     }
 }
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/line/LineChartDrawingModel.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/line/LineChartDrawingModel.kt
index bfcbf2572..906784cd0 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/line/LineChartDrawingModel.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/line/LineChartDrawingModel.kt
@@ -30,7 +30,6 @@ public class LineChartDrawingModel(
     public val opacity: Float = 1f,
 ) :
     DrawingModel<LineChartDrawingModel.PointInfo>(pointInfo) {
-
     override fun transform(
         drawingInfo: List<Map<Float, PointInfo>>,
         from: DrawingModel<PointInfo>?,
@@ -46,7 +45,10 @@ public class LineChartDrawingModel(
      * of the [LineChart] as a fraction of the [LineChart]’s height.
      */
     public class PointInfo(public val y: Float) : DrawingInfo {
-        override fun transform(from: DrawingInfo?, fraction: Float): DrawingInfo {
+        override fun transform(
+            from: DrawingInfo?,
+            fraction: Float,
+        ): DrawingInfo {
             val oldY = (from as? PointInfo)?.y.orZero
             return PointInfo(oldY.lerp(y, fraction))
         }
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/scale/AutoScaleUp.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/scale/AutoScaleUp.kt
index ee4c8c670..b9364085e 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/scale/AutoScaleUp.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/scale/AutoScaleUp.kt
@@ -21,7 +21,6 @@ package com.patrykandpatrick.vico.core.chart.scale
  * an empty space would be visible near the end edge of the chart.
  */
 public enum class AutoScaleUp {
-
     /**
      * Scales up the chart to prevent any empty space from being visible.
      */
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/values/AxisValuesOverrider.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/values/AxisValuesOverrider.kt
index 2f78911ef..fc7cd8b7c 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/values/AxisValuesOverrider.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/values/AxisValuesOverrider.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 by Patryk Goworowski and Patrick Michalik.
+ * Copyright 2023 by Patryk Goworowski and Patrick Michalik.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,7 +26,6 @@ import kotlin.math.abs
  * [com.patrykandpatrick.vico.compose.chart.Chart] composable.
  */
 public interface AxisValuesOverrider<Model> {
-
     /**
      * The minimum value shown on the x-axis. If `null` is returned, the chart will fall back to the default value.
      *
@@ -56,7 +55,6 @@ public interface AxisValuesOverrider<Model> {
     public fun getMaxY(model: Model): Float? = null
 
     public companion object {
-
         /**
          * Creates an [AxisValuesOverrider] with fixed values for [minX], [maxX], [minY], and [maxY]. If one of the
          * values is `null`, the chart will fall back to the default value.
@@ -66,16 +64,16 @@ public interface AxisValuesOverrider<Model> {
             maxX: Float? = null,
             minY: Float? = null,
             maxY: Float? = null,
-        ): AxisValuesOverrider<ChartEntryModel> = object : AxisValuesOverrider<ChartEntryModel> {
+        ): AxisValuesOverrider<ChartEntryModel> =
+            object : AxisValuesOverrider<ChartEntryModel> {
+                override fun getMinX(model: ChartEntryModel): Float? = minX
 
-            override fun getMinX(model: ChartEntryModel): Float? = minX
+                override fun getMaxX(model: ChartEntryModel): Float? = maxX
 
-            override fun getMaxX(model: ChartEntryModel): Float? = maxX
+                override fun getMinY(model: ChartEntryModel): Float? = minY
 
-            override fun getMinY(model: ChartEntryModel): Float? = minY
-
-            override fun getMaxY(model: ChartEntryModel): Float? = maxY
-        }
+                override fun getMaxY(model: ChartEntryModel): Float? = maxY
+            }
 
         /**
          * Creates an [AxisValuesOverrider] with adaptive minimum and maximum y-axis values. The overridden maximum
@@ -85,20 +83,20 @@ public interface AxisValuesOverrider<Model> {
         public fun adaptiveYValues(
             yFraction: Float,
             round: Boolean = false,
-        ): AxisValuesOverrider<ChartEntryModel> = object : AxisValuesOverrider<ChartEntryModel> {
+        ): AxisValuesOverrider<ChartEntryModel> =
+            object : AxisValuesOverrider<ChartEntryModel> {
+                init {
+                    require(yFraction > 0f)
+                }
 
-            init {
-                require(yFraction > 0f)
-            }
-
-            override fun getMinY(model: ChartEntryModel): Float {
-                val difference = abs(getMaxY(model) - model.maxY)
-                return (model.minY - difference).maybeRound().coerceAtLeast(0f)
-            }
+                override fun getMinY(model: ChartEntryModel): Float {
+                    val difference = abs(getMaxY(model) - model.maxY)
+                    return (model.minY - difference).maybeRound().coerceAtLeast(0f)
+                }
 
-            override fun getMaxY(model: ChartEntryModel): Float = (model.maxY * yFraction).maybeRound()
+                override fun getMaxY(model: ChartEntryModel): Float = (model.maxY * yFraction).maybeRound()
 
-            private fun Float.maybeRound() = if (round) this.round else this
-        }
+                private fun Float.maybeRound() = if (round) this.round else this
+            }
     }
 }
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/values/ChartValues.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/values/ChartValues.kt
index 4480f9c19..28ee96f87 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/values/ChartValues.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/values/ChartValues.kt
@@ -29,7 +29,6 @@ import kotlin.math.ceil
  * but you can use [AxisValuesOverrider] to override these values.
  */
 public interface ChartValues {
-
     /**
      * The minimum value displayed on the x-axis. By default, this is equal to [ChartEntryModel.minX] (the
      * [ChartEntryModel] instance being [chartEntryModel]), but you can use [AxisValuesOverrider] to override this
@@ -84,6 +83,5 @@ public interface ChartValues {
     /**
      * Returns the maximum number of major entries that can be present, based on [minX], [maxX], and [xStep].
      */
-    public fun getMaxMajorEntryCount(): Int =
-        ceil(abs(maxX - minX) / xStep + 1).toInt()
+    public fun getMaxMajorEntryCount(): Int = ceil(abs(maxX - minX) / xStep + 1).toInt()
 }
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/values/ChartValuesManager.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/values/ChartValuesManager.kt
index 044e5df3a..3f1907f38 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/values/ChartValuesManager.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/values/ChartValuesManager.kt
@@ -37,7 +37,6 @@ import com.patrykandpatrick.vico.core.entry.ChartEntryModel
  * @see LineChart.targetVerticalAxisPosition
  */
 public class ChartValuesManager : ChartValuesProvider {
-
     internal val chartValues: MutableMap<AxisPosition.Vertical?, MutableChartValues> = mutableMapOf()
 
     override fun getChartValues(axisPosition: AxisPosition.Vertical?): ChartValues =
@@ -96,12 +95,14 @@ public class ChartValuesManager : ChartValuesProvider {
  * Creates and returns a [ChartValuesProvider] implementation with this [ChartValuesManager]’s [ChartValues]
  * instances.
  */
-public fun ChartValuesManager.toChartValuesProvider(): ChartValuesProvider = object : ChartValuesProvider {
-    val chartValues = this@toChartValuesProvider
-        .chartValues
-        .map { (axisPosition, chartValues) -> axisPosition to chartValues.toImmutable() }
-        .toMap()
+public fun ChartValuesManager.toChartValuesProvider(): ChartValuesProvider =
+    object : ChartValuesProvider {
+        val chartValues =
+            this@toChartValuesProvider
+                .chartValues
+                .map { (axisPosition, chartValues) -> axisPosition to chartValues.toImmutable() }
+                .toMap()
 
-    override fun getChartValues(axisPosition: AxisPosition.Vertical?): ChartValues =
-        chartValues[axisPosition] ?: chartValues.getValue(null)
-}
+        override fun getChartValues(axisPosition: AxisPosition.Vertical?): ChartValues =
+            chartValues[axisPosition] ?: chartValues.getValue(null)
+    }
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/values/ChartValuesProvider.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/values/ChartValuesProvider.kt
index 9f5204e29..85f4a34c4 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/values/ChartValuesProvider.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/values/ChartValuesProvider.kt
@@ -22,7 +22,6 @@ import com.patrykandpatrick.vico.core.axis.AxisPosition
  * Provides a chart’s [ChartValues] instances.
  */
 public interface ChartValuesProvider {
-
     /**
      * Returns the [ChartValues] instance associated with the specified [AxisPosition.Vertical] subclass. If
      * [axisPosition] is `null`, the chart’s main [ChartValues] instance is returned.
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/values/MutableChartValues.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/values/MutableChartValues.kt
index 9245d2470..916d78147 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/values/MutableChartValues.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/values/MutableChartValues.kt
@@ -24,7 +24,6 @@ import com.patrykandpatrick.vico.core.extension.orZero
  * An implementation of [ChartValues] whose every property is mutable.
  */
 public class MutableChartValues : ChartValues {
-
     private var _minX: Float? = null
 
     private var _maxX: Float? = null
@@ -71,14 +70,15 @@ public class MutableChartValues : ChartValues {
         maxY: Float? = null,
         xStep: Float? = null,
         chartEntryModel: ChartEntryModel = this.chartEntryModel,
-    ): MutableChartValues = apply {
-        if (minX != null) _minX = if (_minX != null) minOf(this.minX, minX) else minX
-        if (maxX != null) _maxX = if (_maxX != null) maxOf(this.maxX, maxX) else maxX
-        if (minY != null) _minY = if (_minY != null) minOf(this.minY, minY) else minY
-        if (maxY != null) _maxY = if (_maxY != null) maxOf(this.maxY, maxY) else maxY
-        if (xStep != null) _xStep = xStep
-        this.chartEntryModel = chartEntryModel
-    }
+    ): MutableChartValues =
+        apply {
+            if (minX != null) _minX = if (_minX != null) minOf(this.minX, minX) else minX
+            if (maxX != null) _maxX = if (_maxX != null) maxOf(this.maxX, maxX) else maxX
+            if (minY != null) _minY = if (_minY != null) minOf(this.minY, minY) else minY
+            if (maxY != null) _maxY = if (_maxY != null) maxOf(this.maxY, maxY) else maxY
+            if (xStep != null) _xStep = xStep
+            this.chartEntryModel = chartEntryModel
+        }
 
     /**
      * Sets [minX], [maxX], [minY], and [maxY] to 0.
@@ -93,28 +93,29 @@ public class MutableChartValues : ChartValues {
     }
 
     private companion object {
-
-        fun emptyChartEntryModel(): ChartEntryModel = object : ChartEntryModel {
-            override val entries: List<List<ChartEntry>> = emptyList()
-            override val minX: Float = 0f
-            override val maxX: Float = 0f
-            override val minY: Float = 0f
-            override val maxY: Float = 0f
-            override val stackedPositiveY: Float = 0f
-            override val stackedNegativeY: Float = 0f
-            override val xGcd: Float = 1f
-        }
+        fun emptyChartEntryModel(): ChartEntryModel =
+            object : ChartEntryModel {
+                override val entries: List<List<ChartEntry>> = emptyList()
+                override val minX: Float = 0f
+                override val maxX: Float = 0f
+                override val minY: Float = 0f
+                override val maxY: Float = 0f
+                override val stackedPositiveY: Float = 0f
+                override val stackedNegativeY: Float = 0f
+                override val xGcd: Float = 1f
+            }
     }
 }
 
 /**
  * Creates and returns an immutable copy of this [MutableChartValues] instance.
  */
-public fun MutableChartValues.toImmutable(): ChartValues = object : ChartValues {
-    override val minX: Float = this@toImmutable.minX
-    override val maxX: Float = this@toImmutable.maxX
-    override val xStep: Float = this@toImmutable.xStep
-    override val minY: Float = this@toImmutable.minY
-    override val maxY: Float = this@toImmutable.maxY
-    override val chartEntryModel: ChartEntryModel = this@toImmutable.chartEntryModel.toImmutable()
-}
+public fun MutableChartValues.toImmutable(): ChartValues =
+    object : ChartValues {
+        override val minX: Float = this@toImmutable.minX
+        override val maxX: Float = this@toImmutable.maxX
+        override val xStep: Float = this@toImmutable.xStep
+        override val minY: Float = this@toImmutable.minY
+        override val maxY: Float = this@toImmutable.maxY
+        override val chartEntryModel: ChartEntryModel = this@toImmutable.chartEntryModel.toImmutable()
+    }
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/collections/ArrayDelegates.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/collections/ArrayDelegates.kt
index 1cfc3470b..aed675ea7 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/collections/ArrayDelegates.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/collections/ArrayDelegates.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 by Patryk Goworowski and Patrick Michalik.
+ * Copyright 2023 by Patryk Goworowski and Patrick Michalik.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,9 +25,16 @@ internal fun <S, T : AxisRenderer<S>?> cacheInList(): ReadWriteProperty<AxisMana
     object : ReadWriteProperty<AxisManager, T?> {
         var field: T? = null
 
-        override fun getValue(thisRef: AxisManager, property: KProperty<*>): T? = field
+        override fun getValue(
+            thisRef: AxisManager,
+            property: KProperty<*>,
+        ): T? = field
 
-        override fun setValue(thisRef: AxisManager, property: KProperty<*>, value: T?) {
+        override fun setValue(
+            thisRef: AxisManager,
+            property: KProperty<*>,
+            value: T?,
+        ) {
             if (field == value) return
             field?.let(thisRef.axisCache::remove)
             field = value
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/component/Component.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/component/Component.kt
index 68b73ea55..217bbc573 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/component/Component.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/component/Component.kt
@@ -25,7 +25,6 @@ import com.patrykandpatrick.vico.core.context.DrawContext
  * Its subclasses are used throughout the library.
  */
 public abstract class Component : Margins by DefaultMargins() {
-
     /**
      * Instructs the [Component] to draw itself at the given coordinates.
      */
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/component/OverlayingComponent.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/component/OverlayingComponent.kt
index e6136980b..03c326bc7 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/component/OverlayingComponent.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/component/OverlayingComponent.kt
@@ -36,7 +36,6 @@ public class OverlayingComponent(
     public val innerPaddingEndDp: Float = 0f,
     public val innerPaddingBottomDp: Float = 0f,
 ) : Component() {
-
     public constructor(
         outer: Component,
         inner: Component,
@@ -66,21 +65,22 @@ public class OverlayingComponent(
         right: Float,
         bottom: Float,
         opacity: Float,
-    ): Unit = with(context) {
-        val leftWithMargin = left + margins.startDp.pixels
-        val topWithMargin = top + margins.topDp.pixels
-        val rightWithMargin = right - margins.endDp.pixels
-        val bottomWithMargin = bottom - margins.bottomDp.pixels
+    ): Unit =
+        with(context) {
+            val leftWithMargin = left + margins.startDp.pixels
+            val topWithMargin = top + margins.topDp.pixels
+            val rightWithMargin = right - margins.endDp.pixels
+            val bottomWithMargin = bottom - margins.bottomDp.pixels
 
-        outer.draw(context, leftWithMargin, topWithMargin, rightWithMargin, bottomWithMargin, opacity)
-        inner.draw(context, leftWithMargin, topWithMargin, rightWithMargin, bottomWithMargin, opacity)
+            outer.draw(context, leftWithMargin, topWithMargin, rightWithMargin, bottomWithMargin, opacity)
+            inner.draw(context, leftWithMargin, topWithMargin, rightWithMargin, bottomWithMargin, opacity)
 
-        DebugHelper.drawDebugBounds(
-            context = context,
-            left = left,
-            top = top,
-            right = right,
-            bottom = bottom,
-        )
-    }
+            DebugHelper.drawDebugBounds(
+                context = context,
+                left = left,
+                top = top,
+                right = right,
+                bottom = bottom,
+            )
+        }
 }
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/component/dimension/Margins.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/component/dimension/Margins.kt
index 5bb05f41b..ee655621a 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/component/dimension/Margins.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/component/dimension/Margins.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 by Patryk Goworowski and Patrick Michalik.
+ * Copyright 2023 by Patryk Goworowski and Patrick Michalik.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,7 +23,6 @@ import com.patrykandpatrick.vico.core.dimensions.MutableDimensions
  * Allows a component to implement margins.
  */
 public interface Margins {
-
     /**
      * The current margins.
      */
@@ -44,9 +43,7 @@ public interface Margins {
     /**
      * Sets a common size for each margin.
      */
-    public fun setMargins(
-        all: Float = 0f,
-    ) {
+    public fun setMargins(all: Float = 0f) {
         margins.set(all)
     }
 }
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/component/dimension/Padding.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/component/dimension/Padding.kt
index fb22a2345..aac9f76d4 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/component/dimension/Padding.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/component/dimension/Padding.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 by Patryk Goworowski and Patrick Michalik.
+ * Copyright 2023 by Patryk Goworowski and Patrick Michalik.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,7 +22,6 @@ import com.patrykandpatrick.vico.core.dimensions.MutableDimensions
  * Allows a component to implement padding.
  */
 public interface Padding {
-
     /**
      * The current padding.
      */
@@ -53,9 +52,7 @@ public interface Padding {
     /**
      * Sets a common padding value for each side.
      */
-    public fun setPadding(
-        all: Float = 0f,
-    ) {
+    public fun setPadding(all: Float = 0f) {
         padding.set(all)
     }
 }
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/component/marker/MarkerComponent.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/component/marker/MarkerComponent.kt
index d4d54f061..40caf5bab 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/component/marker/MarkerComponent.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/component/marker/MarkerComponent.kt
@@ -50,7 +50,6 @@ public open class MarkerComponent(
     public val indicator: Component?,
     public val guideline: LineComponent?,
 ) : Marker {
-
     private val tempBounds = RectF()
 
     private val TextComponent.tickSizeDp: Float
@@ -77,56 +76,64 @@ public open class MarkerComponent(
         bounds: RectF,
         markedEntries: List<Marker.EntryModel>,
         chartValuesProvider: ChartValuesProvider,
-    ): Unit = with(context) {
-        drawGuideline(context, bounds, markedEntries)
-        val halfIndicatorSize = indicatorSizeDp.half.pixels
+    ): Unit =
+        with(context) {
+            drawGuideline(context, bounds, markedEntries)
+            val halfIndicatorSize = indicatorSizeDp.half.pixels
 
-        markedEntries.forEachIndexed { _, model ->
-            onApplyEntryColor?.invoke(model.color)
-            indicator?.draw(
-                context,
-                model.location.x - halfIndicatorSize,
-                model.location.y - halfIndicatorSize,
-                model.location.x + halfIndicatorSize,
-                model.location.y + halfIndicatorSize,
-            )
+            markedEntries.forEachIndexed { _, model ->
+                onApplyEntryColor?.invoke(model.color)
+                indicator?.draw(
+                    context,
+                    model.location.x - halfIndicatorSize,
+                    model.location.y - halfIndicatorSize,
+                    model.location.x + halfIndicatorSize,
+                    model.location.y + halfIndicatorSize,
+                )
+            }
+            drawLabel(context, bounds, markedEntries, chartValuesProvider.getChartValues())
         }
-        drawLabel(context, bounds, markedEntries, chartValuesProvider.getChartValues())
-    }
 
     private fun drawLabel(
         context: DrawContext,
         bounds: RectF,
         markedEntries: List<Marker.EntryModel>,
         chartValues: ChartValues,
-    ): Unit = with(context) {
-        val text = labelFormatter.getLabel(markedEntries, chartValues)
-        val entryX = markedEntries.averageOf { it.location.x }
-        val labelBounds =
-            label.getTextBounds(context = context, text = text, width = bounds.width().toInt(), outRect = tempBounds)
-        val halfOfTextWidth = labelBounds.width().half
-        val x = overrideXPositionToFit(entryX, bounds, halfOfTextWidth)
-        this[MarkerCorneredShape.tickXKey] = entryX
+    ): Unit =
+        with(context) {
+            val text = labelFormatter.getLabel(markedEntries, chartValues)
+            val entryX = markedEntries.averageOf { it.location.x }
+            val labelBounds =
+                label.getTextBounds(
+                    context = context,
+                    text = text,
+                    width = bounds.width().toInt(),
+                    outRect = tempBounds,
+                )
+            val halfOfTextWidth = labelBounds.width().half
+            val x = overrideXPositionToFit(entryX, bounds, halfOfTextWidth)
+            this[MarkerCorneredShape.TICK_X_KEY] = entryX
 
-        label.drawText(
-            context = context,
-            text = text,
-            textX = x,
-            textY = bounds.top - labelBounds.height() - label.tickSizeDp.pixels,
-            verticalPosition = VerticalPosition.Bottom,
-            maxTextWidth = minOf(bounds.right - x, x - bounds.left).doubled.ceil.toInt(),
-        )
-    }
+            label.drawText(
+                context = context,
+                text = text,
+                textX = x,
+                textY = bounds.top - labelBounds.height() - label.tickSizeDp.pixels,
+                verticalPosition = VerticalPosition.Bottom,
+                maxTextWidth = minOf(bounds.right - x, x - bounds.left).doubled.ceil.toInt(),
+            )
+        }
 
     private fun overrideXPositionToFit(
         xPosition: Float,
         bounds: RectF,
         halfOfTextWidth: Float,
-    ): Float = when {
-        xPosition - halfOfTextWidth < bounds.left -> bounds.left + halfOfTextWidth
-        xPosition + halfOfTextWidth > bounds.right -> bounds.right - halfOfTextWidth
-        else -> xPosition
-    }
+    ): Float =
+        when {
+            xPosition - halfOfTextWidth < bounds.left -> bounds.left + halfOfTextWidth
+            xPosition + halfOfTextWidth > bounds.right -> bounds.right - halfOfTextWidth
+            else -> xPosition
+        }
 
     private fun drawGuideline(
         context: DrawContext,
@@ -150,7 +157,8 @@ public open class MarkerComponent(
         context: MeasureContext,
         outInsets: Insets,
         horizontalDimensions: HorizontalDimensions,
-    ): Unit = with(context) {
-        outInsets.top = label.getHeight(context) + label.tickSizeDp.pixels
-    }
+    ): Unit =
+        with(context) {
+            outInsets.top = label.getHeight(context) + label.tickSizeDp.pixels
+        }
 }
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/component/shape/DashedShape.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/component/shape/DashedShape.kt
index 9a04b76e9..1ed807286 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/component/shape/DashedShape.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/component/shape/DashedShape.kt
@@ -36,7 +36,6 @@ public class DashedShape(
     public val gapLengthDp: Float = DefaultDimens.DASH_GAP,
     public val fitStrategy: FitStrategy = FitStrategy.Resize,
 ) : Shape {
-
     private var drawDashLength = dashLengthDp
     private var drawGapLength = gapLengthDp
 
@@ -70,21 +69,22 @@ public class DashedShape(
         var index = 0
         var drawnLength = 0f
         while (right - left - drawnLength > 0) {
-            drawnLength += if (index % 2 == 0) {
-                path.reset()
-                shape.drawShape(
-                    context = context,
-                    paint = paint,
-                    path = path,
-                    left = left + drawnLength,
-                    top = top,
-                    right = left + drawnLength + drawDashLength,
-                    bottom = bottom,
-                )
-                drawDashLength
-            } else {
-                drawGapLength
-            }
+            drawnLength +=
+                if (index % 2 == 0) {
+                    path.reset()
+                    shape.drawShape(
+                        context = context,
+                        paint = paint,
+                        path = path,
+                        left = left + drawnLength,
+                        top = top,
+                        right = left + drawnLength + drawDashLength,
+                        bottom = bottom,
+                    )
+                    drawDashLength
+                } else {
+                    drawGapLength
+                }
             index++
         }
     }
@@ -103,28 +103,33 @@ public class DashedShape(
         var index = 0
         var drawnLength = 0f
         while (bottom - top - drawnLength > 0) {
-            drawnLength += if (index % 2 == 0) {
-                path.reset()
-                shape.drawShape(
-                    context = context,
-                    paint = paint,
-                    path = path,
-                    left = left,
-                    top = top + drawnLength,
-                    right = right,
-                    bottom = top + drawnLength + drawDashLength,
-                )
-                drawDashLength
-            } else {
-                drawGapLength
-            }
+            drawnLength +=
+                if (index % 2 == 0) {
+                    path.reset()
+                    shape.drawShape(
+                        context = context,
+                        paint = paint,
+                        path = path,
+                        left = left,
+                        top = top + drawnLength,
+                        right = right,
+                        bottom = top + drawnLength + drawDashLength,
+                    )
+                    drawDashLength
+                } else {
+                    drawGapLength
+                }
             index++
         }
     }
 
-    private fun calculateDrawLengths(context: DrawContext, length: Float): Unit = with(context) {
-        calculateDrawLengths(dashLengthDp.pixels, gapLengthDp.pixels, length)
-    }
+    private fun calculateDrawLengths(
+        context: DrawContext,
+        length: Float,
+    ): Unit =
+        with(context) {
+            calculateDrawLengths(dashLengthDp.pixels, gapLengthDp.pixels, length)
+        }
 
     private fun calculateDrawLengths(
         dashLength: Float,
@@ -136,18 +141,19 @@ public class DashedShape(
             return
         }
         when (fitStrategy) {
-            FitStrategy.Resize -> when {
-                length < dashLength + gapLength -> {
-                    drawDashLength = length
-                    drawGapLength = 0f
-                }
-                else -> {
-                    val gapAndDashLength = gapLength + dashLength
-                    val ratio = length / (dashLength + (length / gapAndDashLength).ceil * gapAndDashLength)
-                    drawDashLength = dashLength * ratio
-                    drawGapLength = gapLength * ratio
+            FitStrategy.Resize ->
+                when {
+                    length < dashLength + gapLength -> {
+                        drawDashLength = length
+                        drawGapLength = 0f
+                    }
+                    else -> {
+                        val gapAndDashLength = gapLength + dashLength
+                        val ratio = length / (dashLength + (length / gapAndDashLength).ceil * gapAndDashLength)
+                        drawDashLength = dashLength * ratio
+                        drawGapLength = gapLength * ratio
+                    }
                 }
-            }
             FitStrategy.Fixed -> {
                 drawDashLength = dashLength
                 drawGapLength = gapLength
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/component/shape/LineComponent.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/component/shape/LineComponent.kt
index de7f77740..6e11335d7 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/component/shape/LineComponent.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/component/shape/LineComponent.kt
@@ -44,7 +44,6 @@ public open class LineComponent(
     strokeWidthDp: Float = 0f,
     strokeColor: Int = Color.TRANSPARENT,
 ) : ShapeComponent(shape, color, dynamicShader, margins, strokeWidthDp, strokeColor) {
-
     private val MeasureContext.thickness: Float
         get() = thicknessDp.pixels
 
@@ -58,16 +57,17 @@ public open class LineComponent(
         centerY: Float,
         thicknessScale: Float = 1f,
         opacity: Float = 1f,
-    ): Unit = with(context) {
-        draw(
-            context,
-            left = left,
-            top = centerY - thickness * thicknessScale / 2,
-            right = right,
-            bottom = centerY + thickness * thicknessScale / 2,
-            opacity = opacity,
-        )
-    }
+    ): Unit =
+        with(context) {
+            draw(
+                context,
+                left = left,
+                top = centerY - thickness * thicknessScale / 2,
+                right = right,
+                bottom = centerY + thickness * thicknessScale / 2,
+                opacity = opacity,
+            )
+        }
 
     /**
      * Checks whether the [LineComponent] fits horizontally within the given [boundingBox] with its current
@@ -80,14 +80,15 @@ public open class LineComponent(
         centerY: Float,
         boundingBox: RectF,
         thicknessScale: Float = 1f,
-    ): Boolean = with(context) {
-        boundingBox.contains(
-            left,
-            centerY - thickness * thicknessScale / 2,
-            right,
-            centerY + thickness * thicknessScale / 2,
-        )
-    }
+    ): Boolean =
+        with(context) {
+            boundingBox.contains(
+                left,
+                centerY - thickness * thicknessScale / 2,
+                right,
+                centerY + thickness * thicknessScale / 2,
+            )
+        }
 
     /**
      * A convenience function for [draw] that draws the [LineComponent] vertically.
@@ -99,16 +100,17 @@ public open class LineComponent(
         centerX: Float,
         thicknessScale: Float = 1f,
         opacity: Float = 1f,
-    ): Unit = with(context) {
-        draw(
-            context,
-            left = centerX - thickness * thicknessScale / 2,
-            top = top,
-            right = centerX + thickness * thicknessScale / 2,
-            bottom = bottom,
-            opacity = opacity,
-        )
-    }
+    ): Unit =
+        with(context) {
+            draw(
+                context,
+                left = centerX - thickness * thicknessScale / 2,
+                top = top,
+                right = centerX + thickness * thicknessScale / 2,
+                bottom = bottom,
+                opacity = opacity,
+            )
+        }
 
     /**
      * Checks whether the [LineComponent] fits vertically within the given [boundingBox] with its current [thicknessDp].
@@ -120,14 +122,15 @@ public open class LineComponent(
         centerX: Float,
         boundingBox: RectF,
         thicknessScale: Float = 1f,
-    ): Boolean = with(context) {
-        boundingBox.contains(
-            centerX - thickness * thicknessScale / 2,
-            top,
-            centerX + thickness * thicknessScale / 2,
-            bottom,
-        )
-    }
+    ): Boolean =
+        with(context) {
+            boundingBox.contains(
+                centerX - thickness * thicknessScale / 2,
+                top,
+                centerX + thickness * thicknessScale / 2,
+                bottom,
+            )
+        }
 
     /**
      * Checks whether the [LineComponent] vertically intersects the given [boundingBox] with its current [thicknessDp].
@@ -139,12 +142,13 @@ public open class LineComponent(
         centerX: Float,
         boundingBox: RectF,
         thicknessScale: Float = 1f,
-    ): Boolean = with(context) {
-        boundingBox.intersects(
-            centerX - thickness * thicknessScale / 2,
-            top,
-            centerX + thickness * thicknessScale / 2,
-            bottom,
-        )
-    }
+    ): Boolean =
+        with(context) {
+            boundingBox.intersects(
+                centerX - thickness * thicknessScale / 2,
+                top,
+                centerX + thickness * thicknessScale / 2,
+                bottom,
+            )
+        }
 }
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/component/shape/Shape.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/component/shape/Shape.kt
index 8a119ad65..8765010dc 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/component/shape/Shape.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/component/shape/Shape.kt
@@ -24,7 +24,6 @@ import com.patrykandpatrick.vico.core.context.DrawContext
  * Defines a shape that can be drawn on a canvas.
  */
 public interface Shape {
-
     /**
      * Draws the [Shape] on the canvas.
      *
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/component/shape/ShapeComponent.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/component/shape/ShapeComponent.kt
index 653cd3458..ff1769f86 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/component/shape/ShapeComponent.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/component/shape/ShapeComponent.kt
@@ -52,7 +52,6 @@ public open class ShapeComponent(
     public val strokeWidthDp: Float = 0f,
     strokeColor: Int = Color.TRANSPARENT,
 ) : Component() {
-
     private val paint: Paint = Paint(Paint.ANTI_ALIAS_FLAG)
     private val strokePaint: Paint = Paint(Paint.ANTI_ALIAS_FLAG)
     private val shadowProperties: ComponentShadow = ComponentShadow()
@@ -87,41 +86,42 @@ public open class ShapeComponent(
         right: Float,
         bottom: Float,
         opacity: Float,
-    ): Unit = with(context) {
-        if (left == right || top == bottom) return // Skip drawing shape that will be invisible.
-        path.rewind()
-        applyShader(context, left, top, right, bottom)
-        val centerX = (left + right).half
-        val centerY = (top + bottom).half
-        shadowProperties.maybeUpdateShadowLayer(context = this, paint = paint, backgroundColor = color)
-
-        val strokeWidth = strokeWidthDp.pixels
-        strokePaint.strokeWidth = strokeWidth
-
-        fun drawShape(paint: Paint) {
-            shape.drawShape(
+    ): Unit =
+        with(context) {
+            if (left == right || top == bottom) return // Skip drawing shape that will be invisible.
+            path.rewind()
+            applyShader(context, left, top, right, bottom)
+            val centerX = (left + right).half
+            val centerY = (top + bottom).half
+            shadowProperties.maybeUpdateShadowLayer(context = this, paint = paint, backgroundColor = color)
+
+            val strokeWidth = strokeWidthDp.pixels
+            strokePaint.strokeWidth = strokeWidth
+
+            fun drawShape(paint: Paint) {
+                shape.drawShape(
+                    context = context,
+                    paint = paint,
+                    path = path,
+                    left = minOf(left + margins.startDp.pixels + strokeWidth.half, centerX),
+                    top = minOf(top + margins.topDp.pixels + strokeWidth.half, centerY),
+                    right = maxOf(right - margins.endDp.pixels - strokeWidth.half, centerX),
+                    bottom = maxOf(bottom - margins.bottomDp.pixels - strokeWidth.half, centerY),
+                )
+            }
+
+            paint.withOpacity(opacity, ::drawShape)
+            if (strokeWidth > 0f && strokeColor.alpha > 0) strokePaint.withOpacity(opacity, ::drawShape)
+
+            DebugHelper.drawDebugBounds(
                 context = context,
-                paint = paint,
-                path = path,
-                left = minOf(left + margins.startDp.pixels + strokeWidth.half, centerX),
-                top = minOf(top + margins.topDp.pixels + strokeWidth.half, centerY),
-                right = maxOf(right - margins.endDp.pixels - strokeWidth.half, centerX),
-                bottom = maxOf(bottom - margins.bottomDp.pixels - strokeWidth.half, centerY),
+                left = left,
+                top = top,
+                right = right,
+                bottom = bottom,
             )
         }
 
-        paint.withOpacity(opacity, ::drawShape)
-        if (strokeWidth > 0f && strokeColor.alpha > 0) strokePaint.withOpacity(opacity, ::drawShape)
-
-        DebugHelper.drawDebugBounds(
-            context = context,
-            left = left,
-            top = top,
-            right = right,
-            bottom = bottom,
-        )
-    }
-
     protected fun applyShader(
         context: DrawContext,
         left: Float,
@@ -149,25 +149,27 @@ public open class ShapeComponent(
         dy: Float = 0f,
         color: Int = DEF_SHADOW_COLOR,
         applyElevationOverlay: Boolean = false,
-    ): ShapeComponent = apply {
-        shadowProperties.apply {
-            this.radius = radius
-            this.dx = dx
-            this.dy = dy
-            this.color = color
-            this.applyElevationOverlay = applyElevationOverlay
+    ): ShapeComponent =
+        apply {
+            shadowProperties.apply {
+                this.radius = radius
+                this.dx = dx
+                this.dy = dy
+                this.color = color
+                this.applyElevationOverlay = applyElevationOverlay
+            }
         }
-    }
 
     /**
      * Removes this [ShapeComponent]’s drop shadow.
      */
-    public fun clearShadow(): ShapeComponent = apply {
-        shadowProperties.apply {
-            this.radius = 0f
-            this.dx = 0f
-            this.dy = 0f
-            this.color = 0
+    public fun clearShadow(): ShapeComponent =
+        apply {
+            shadowProperties.apply {
+                this.radius = 0f
+                this.dx = 0f
+                this.dy = 0f
+                this.color = 0
+            }
         }
-    }
 }
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/component/shape/Shapes.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/component/shape/Shapes.kt
index fbb1b4f60..cdc8efe28 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/component/shape/Shapes.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/component/shape/Shapes.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 by Patryk Goworowski and Patrick Michalik.
+ * Copyright 2023 by Patryk Goworowski and Patrick Michalik.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -33,7 +33,6 @@ import com.patrykandpatrick.vico.core.extension.setBounds
  * Houses utilities for creating [Shape]s.
  */
 public object Shapes {
-
     /**
      * A shape whose each corner is fully rounded.
      */
@@ -42,25 +41,25 @@ public object Shapes {
     /**
      * A rectangle with sharp corners.
      */
-    public val rectShape: Shape = object : Shape {
-
-        override fun drawShape(
-            context: DrawContext,
-            paint: Paint,
-            path: Path,
-            left: Float,
-            top: Float,
-            right: Float,
-            bottom: Float,
-        ) {
-            path.moveTo(left, top)
-            path.lineTo(right, top)
-            path.lineTo(right, bottom)
-            path.lineTo(left, bottom)
-            path.close()
-            context.canvas.drawPath(path, paint)
+    public val rectShape: Shape =
+        object : Shape {
+            override fun drawShape(
+                context: DrawContext,
+                paint: Paint,
+                path: Path,
+                left: Float,
+                top: Float,
+                right: Float,
+                bottom: Float,
+            ) {
+                path.moveTo(left, top)
+                path.lineTo(right, top)
+                path.lineTo(right, bottom)
+                path.lineTo(left, bottom)
+                path.close()
+                context.canvas.drawPath(path, paint)
+            }
         }
-    }
 
     /**
      * Creates a [Shape] with all corners rounded.
@@ -83,12 +82,13 @@ public object Shapes {
         topRightPercent: Int = 0,
         bottomRightPercent: Int = 0,
         bottomLeftPercent: Int = 0,
-    ): CorneredShape = CorneredShape(
-        Corner.Relative(topLeftPercent, RoundedCornerTreatment),
-        Corner.Relative(topRightPercent, RoundedCornerTreatment),
-        Corner.Relative(bottomRightPercent, RoundedCornerTreatment),
-        Corner.Relative(bottomLeftPercent, RoundedCornerTreatment),
-    )
+    ): CorneredShape =
+        CorneredShape(
+            Corner.Relative(topLeftPercent, RoundedCornerTreatment),
+            Corner.Relative(topRightPercent, RoundedCornerTreatment),
+            Corner.Relative(bottomRightPercent, RoundedCornerTreatment),
+            Corner.Relative(bottomLeftPercent, RoundedCornerTreatment),
+        )
 
     /**
      * Creates a [Shape] with all corners cut.
@@ -111,12 +111,13 @@ public object Shapes {
         topRightPercent: Int = 0,
         bottomRightPercent: Int = 0,
         bottomLeftPercent: Int = 0,
-    ): CorneredShape = CorneredShape(
-        Corner.Relative(topLeftPercent, CutCornerTreatment),
-        Corner.Relative(topRightPercent, CutCornerTreatment),
-        Corner.Relative(bottomRightPercent, CutCornerTreatment),
-        Corner.Relative(bottomLeftPercent, CutCornerTreatment),
-    )
+    ): CorneredShape =
+        CorneredShape(
+            Corner.Relative(topLeftPercent, CutCornerTreatment),
+            Corner.Relative(topRightPercent, CutCornerTreatment),
+            Corner.Relative(bottomRightPercent, CutCornerTreatment),
+            Corner.Relative(bottomLeftPercent, CutCornerTreatment),
+        )
 
     /**
      * Creates a [Shape] out of a [Drawable].
@@ -130,69 +131,70 @@ public object Shapes {
         tintDrawable: Boolean = true,
         keepAspectRatio: Boolean = false,
         otherShape: Shape? = rectShape,
-    ): Shape = object : Shape {
-
-        private val ratio: Float = drawable.intrinsicWidth.coerceAtLeast(1) /
-            drawable.intrinsicHeight.coerceAtLeast(1).toFloat()
-
-        override fun drawShape(
-            context: DrawContext,
-            paint: Paint,
-            path: Path,
-            left: Float,
-            top: Float,
-            right: Float,
-            bottom: Float,
-        ) {
-            if (bottom - top == 0f || left - right == 0f) return
-            val width = right - left
-            val height = bottom - top
-
-            var otherComponentLeft = left
-            var otherComponentTop = top
-
-            if (tintDrawable) drawable.setTintCompat(paint.color)
-
-            if (height > width) {
-                val drawableHeight = if (keepAspectRatio) width / ratio else height
-                val topWithoutClipping = minOf(top, bottom - drawableHeight)
-                drawable.setBounds(
-                    left = left,
-                    top = topWithoutClipping,
-                    right = right,
-                    bottom = topWithoutClipping + drawableHeight,
-                )
-
-                otherComponentTop = topWithoutClipping + drawableHeight
-            } else {
-                val drawableWidth = if (keepAspectRatio) height * ratio else width
-                val leftWithoutClipping = minOf(left, right - drawableWidth)
-                drawable.setBounds(
-                    left = leftWithoutClipping,
-                    top = top,
-                    right = leftWithoutClipping + drawableWidth,
-                    bottom = bottom,
-                )
-
-                otherComponentLeft = leftWithoutClipping + drawableWidth
-            }
-
-            drawable.draw(context.canvas)
-            otherShape ?: return
-
-            if (bottom - otherComponentTop > 0 && right - otherComponentLeft > 0) {
-                otherShape.drawShape(
-                    context = context,
-                    paint = paint,
-                    path = path,
-                    left = otherComponentLeft,
-                    top = otherComponentTop,
-                    right = right,
-                    bottom = bottom,
-                )
+    ): Shape =
+        object : Shape {
+            private val ratio: Float =
+                drawable.intrinsicWidth.coerceAtLeast(1) /
+                    drawable.intrinsicHeight.coerceAtLeast(1).toFloat()
+
+            override fun drawShape(
+                context: DrawContext,
+                paint: Paint,
+                path: Path,
+                left: Float,
+                top: Float,
+                right: Float,
+                bottom: Float,
+            ) {
+                if (bottom - top == 0f || left - right == 0f) return
+                val width = right - left
+                val height = bottom - top
+
+                var otherComponentLeft = left
+                var otherComponentTop = top
+
+                if (tintDrawable) drawable.setTintCompat(paint.color)
+
+                if (height > width) {
+                    val drawableHeight = if (keepAspectRatio) width / ratio else height
+                    val topWithoutClipping = minOf(top, bottom - drawableHeight)
+                    drawable.setBounds(
+                        left = left,
+                        top = topWithoutClipping,
+                        right = right,
+                        bottom = topWithoutClipping + drawableHeight,
+                    )
+
+                    otherComponentTop = topWithoutClipping + drawableHeight
+                } else {
+                    val drawableWidth = if (keepAspectRatio) height * ratio else width
+                    val leftWithoutClipping = minOf(left, right - drawableWidth)
+                    drawable.setBounds(
+                        left = leftWithoutClipping,
+                        top = top,
+                        right = leftWithoutClipping + drawableWidth,
+                        bottom = bottom,
+                    )
+
+                    otherComponentLeft = leftWithoutClipping + drawableWidth
+                }
+
+                drawable.draw(context.canvas)
+                otherShape ?: return
+
+                if (bottom - otherComponentTop > 0 && right - otherComponentLeft > 0) {
+                    otherShape.drawShape(
+                        context = context,
+                        paint = paint,
+                        path = path,
+                        left = otherComponentLeft,
+                        top = otherComponentTop,
+                        right = right,
+                        bottom = bottom,
+                    )
+                }
             }
         }
-    }
 }
 
 private fun Drawable.setTintCompat(tint: Int) {
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/component/shape/cornered/Corner.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/component/shape/cornered/Corner.kt
index 7620d124a..2595034ba 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/component/shape/cornered/Corner.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/component/shape/cornered/Corner.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 by Patryk Goworowski and Patrick Michalik.
+ * Copyright 2023 by Patryk Goworowski and Patrick Michalik.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,7 +26,6 @@ import com.patrykandpatrick.vico.core.throwable.IllegalPercentageException
 public sealed class Corner(
     public val cornerTreatment: CornerTreatment,
 ) {
-
     /**
      * Calculates the size of the corner.
      *
@@ -35,7 +34,10 @@ public sealed class Corner(
      *
      * @return the size of the corner (in pixels).
      */
-    public abstract fun getCornerSize(availableCornerSize: Float, density: Float): Float
+    public abstract fun getCornerSize(
+        availableCornerSize: Float,
+        density: Float,
+    ): Float
 
     /**
      * Defines an absolute size for a corner (in dp).
@@ -46,9 +48,10 @@ public sealed class Corner(
         public val sizeDp: Float,
         cornerTreatment: CornerTreatment,
     ) : Corner(cornerTreatment) {
-
-        override fun getCornerSize(availableCornerSize: Float, density: Float): Float =
-            sizeDp * density
+        override fun getCornerSize(
+            availableCornerSize: Float,
+            density: Float,
+        ): Float = sizeDp * density
     }
 
     /**
@@ -60,13 +63,14 @@ public sealed class Corner(
         public val percentage: Int,
         cornerTreatment: CornerTreatment,
     ) : Corner(cornerTreatment) {
-
         init {
             if (percentage !in 0..MAX_PERCENTAGE) throw IllegalPercentageException(percentage)
         }
 
-        override fun getCornerSize(availableCornerSize: Float, density: Float): Float =
-            availableCornerSize / MAX_PERCENTAGE * percentage
+        override fun getCornerSize(
+            availableCornerSize: Float,
+            density: Float,
+        ): Float = availableCornerSize / MAX_PERCENTAGE * percentage
     }
 
     public companion object {
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/component/shape/cornered/CornerTreatment.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/component/shape/cornered/CornerTreatment.kt
index bbba1743d..9821965bb 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/component/shape/cornered/CornerTreatment.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/component/shape/cornered/CornerTreatment.kt
@@ -22,7 +22,6 @@ import android.graphics.Path
  * Defines a shape corner style.
  */
 public interface CornerTreatment {
-
     /**
      * Draws a shape corner of the appropriate style.
      * @param x1 the horizontal coordinate of the starting point.
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/component/shape/cornered/CornerTreatments.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/component/shape/cornered/CornerTreatments.kt
index 066c3da05..9b85d145c 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/component/shape/cornered/CornerTreatments.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/component/shape/cornered/CornerTreatments.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 by Patryk Goworowski and Patrick Michalik.
+ * Copyright 2023 by Patryk Goworowski and Patrick Michalik.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,7 +24,6 @@ import com.patrykandpatrick.vico.core.extension.piRad
  * Creates sharp corners.
  */
 public object SharpCornerTreatment : CornerTreatment {
-
     public override fun createCorner(
         x1: Float,
         y1: Float,
@@ -32,27 +31,27 @@ public object SharpCornerTreatment : CornerTreatment {
         y2: Float,
         cornerLocation: CornerLocation,
         path: Path,
-    ): Unit = when (cornerLocation) {
-        CornerLocation.TopLeft -> {
-            path.lineTo(x1, y2)
-        }
-        CornerLocation.TopRight -> {
-            path.lineTo(x2, y1)
-        }
-        CornerLocation.BottomRight -> {
-            path.lineTo(x1, y2)
-        }
-        CornerLocation.BottomLeft -> {
-            path.lineTo(x2, y1)
+    ): Unit =
+        when (cornerLocation) {
+            CornerLocation.TopLeft -> {
+                path.lineTo(x1, y2)
+            }
+            CornerLocation.TopRight -> {
+                path.lineTo(x2, y1)
+            }
+            CornerLocation.BottomRight -> {
+                path.lineTo(x1, y2)
+            }
+            CornerLocation.BottomLeft -> {
+                path.lineTo(x2, y1)
+            }
         }
-    }
 }
 
 /**
  * Creates cut corners.
  */
 public object CutCornerTreatment : CornerTreatment {
-
     override fun createCorner(
         x1: Float,
         y1: Float,
@@ -70,7 +69,6 @@ public object CutCornerTreatment : CornerTreatment {
  * Creates rounded corners.
  */
 public object RoundedCornerTreatment : CornerTreatment {
-
     private val tempRect = RectF()
 
     override fun createCorner(
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/component/shape/cornered/CorneredShape.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/component/shape/cornered/CorneredShape.kt
index e7cc91685..c1573aba5 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/component/shape/cornered/CorneredShape.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/component/shape/cornered/CorneredShape.kt
@@ -36,7 +36,6 @@ public open class CorneredShape(
     public val bottomRight: Corner = Corner.Sharp,
     public val bottomLeft: Corner = Corner.Sharp,
 ) : Shape {
-
     private val Float.nonZero: Float
         get() = if (this == 0f) 1f else this
 
@@ -48,7 +47,11 @@ public open class CorneredShape(
      * @param height the height of the [Shape].
      * @param density the pixel density of the screen (used in pixel size calculation).
      */
-    public fun getCornerScale(width: Float, height: Float, density: Float): Float {
+    public fun getCornerScale(
+        width: Float,
+        height: Float,
+        density: Float,
+    ): Float {
         val availableSize = minOf(width, height)
         val tL = topLeft.getCornerSize(availableSize, density)
         val tR = topRight.getCornerSize(availableSize, density)
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/component/shape/cornered/MarkerCorneredShape.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/component/shape/cornered/MarkerCorneredShape.kt
index 2294d415b..749211de7 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/component/shape/cornered/MarkerCorneredShape.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/component/shape/cornered/MarkerCorneredShape.kt
@@ -41,7 +41,6 @@ public open class MarkerCorneredShape(
     bottomLeft: Corner,
     public val tickSizeDp: Float = DEF_MARKER_TICK_SIZE,
 ) : CorneredShape(topLeft, topRight, bottomRight, bottomLeft) {
-
     public constructor(
         all: Corner,
         tickSizeDp: Float = DEF_MARKER_TICK_SIZE,
@@ -66,41 +65,42 @@ public open class MarkerCorneredShape(
         top: Float,
         right: Float,
         bottom: Float,
-    ): Unit = with(context) {
-        val tickX: Float? = context[tickXKey]
-        if (tickX != null) {
-            createPath(
-                context = context,
-                path = path,
-                left = left,
-                top = top,
-                right = right,
-                bottom = bottom,
-            )
-            val tickSize = context.dpToPx(tickSizeDp)
-            val availableCornerSize = minOf(right - left, bottom - top)
-            val cornerScale = getCornerScale(right - left, bottom - top, density)
+    ): Unit =
+        with(context) {
+            val tickX: Float? = context[TICK_X_KEY]
+            if (tickX != null) {
+                createPath(
+                    context = context,
+                    path = path,
+                    left = left,
+                    top = top,
+                    right = right,
+                    bottom = bottom,
+                )
+                val tickSize = context.dpToPx(tickSizeDp)
+                val availableCornerSize = minOf(right - left, bottom - top)
+                val cornerScale = getCornerScale(right - left, bottom - top, density)
 
-            val minLeft = left + bottomLeft.getCornerSize(availableCornerSize, density) * cornerScale
-            val maxLeft = right - bottomRight.getCornerSize(availableCornerSize, density) * cornerScale
+                val minLeft = left + bottomLeft.getCornerSize(availableCornerSize, density) * cornerScale
+                val maxLeft = right - bottomRight.getCornerSize(availableCornerSize, density) * cornerScale
 
-            val coercedTickSize = tickSize.coerceAtMost((maxLeft - minLeft).half.coerceAtLeast(0f))
+                val coercedTickSize = tickSize.coerceAtMost((maxLeft - minLeft).half.coerceAtLeast(0f))
 
-            (tickX - coercedTickSize)
-                .takeIf { minLeft < maxLeft }
-                ?.coerceIn(minLeft, maxLeft - coercedTickSize.doubled)
-                ?.also { tickTopLeft ->
-                    path.moveTo(tickTopLeft, bottom)
-                    path.lineTo(tickX, bottom + tickSize)
-                    path.lineTo(tickTopLeft + coercedTickSize.doubled, bottom)
-                }
+                (tickX - coercedTickSize)
+                    .takeIf { minLeft < maxLeft }
+                    ?.coerceIn(minLeft, maxLeft - coercedTickSize.doubled)
+                    ?.also { tickTopLeft ->
+                        path.moveTo(tickTopLeft, bottom)
+                        path.lineTo(tickX, bottom + tickSize)
+                        path.lineTo(tickTopLeft + coercedTickSize.doubled, bottom)
+                    }
 
-            path.close()
-            context.canvas.drawPath(path, paint)
-        } else {
-            super.drawShape(context, paint, path, left, top, right, bottom)
+                path.close()
+                context.canvas.drawPath(path, paint)
+            } else {
+                super.drawShape(context, paint, path, left, top, right, bottom)
+            }
         }
-    }
 
     public companion object {
         /**
@@ -108,6 +108,6 @@ public open class MarkerCorneredShape(
          *
          * @see Extras
          */
-        public const val tickXKey: String = "tickX"
+        public const val TICK_X_KEY: String = "tickX"
     }
 }
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/component/shape/shader/CacheableDynamicShader.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/component/shape/shader/CacheableDynamicShader.kt
index 3611d2edd..3d637e2ca 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/component/shape/shader/CacheableDynamicShader.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/component/shape/shader/CacheableDynamicShader.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 by Patryk Goworowski and Patrick Michalik.
+ * Copyright 2023 by Patryk Goworowski and Patrick Michalik.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,7 +23,6 @@ import com.patrykandpatrick.vico.core.context.DrawContext
  * [CacheableDynamicShader] can cache created [Shader] instances for reuse between identical sets of bounds.
  */
 public abstract class CacheableDynamicShader : DynamicShader {
-
     private val cache = HashMap<String, Shader>(1)
 
     override fun provideShader(
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/component/shape/shader/ComponentShader.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/component/shape/shader/ComponentShader.kt
index 289641019..1e824169a 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/component/shape/shader/ComponentShader.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/component/shape/shader/ComponentShader.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 by Patryk Goworowski and Patrick Michalik.
+ * Copyright 2023 by Patryk Goworowski and Patrick Michalik.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -40,34 +40,34 @@ public class ComponentShader(
     private val tileXMode: Shader.TileMode = Shader.TileMode.REPEAT,
     private val tileYMode: Shader.TileMode = tileXMode,
 ) : CacheableDynamicShader() {
-
     override fun createShader(
         context: DrawContext,
         left: Float,
         top: Float,
         right: Float,
         bottom: Float,
-    ): Shader = with(context) {
-        val size = componentSizeDp.pixels.toInt() * if (checkeredArrangement) 2 else 1
-        val bitmap = Bitmap.createBitmap(size, size, Bitmap.Config.ARGB_8888)
+    ): Shader =
+        with(context) {
+            val size = componentSizeDp.pixels.toInt() * if (checkeredArrangement) 2 else 1
+            val bitmap = Bitmap.createBitmap(size, size, Bitmap.Config.ARGB_8888)
 
-        val canvas = Canvas(bitmap)
-        context.withOtherCanvas(canvas) {
-            if (checkeredArrangement) {
-                val halfSize = componentSizeDp.pixels.half
-                with(component) {
-                    draw(context, -halfSize, -halfSize, componentSizeDp.pixels)
-                    draw(context, -halfSize, size - halfSize, componentSizeDp.pixels)
-                    draw(context, size - halfSize, -halfSize, componentSizeDp.pixels)
-                    draw(context, size - halfSize, size - halfSize, componentSizeDp.pixels)
-                    draw(context, halfSize, halfSize, componentSizeDp.pixels)
+            val canvas = Canvas(bitmap)
+            context.withOtherCanvas(canvas) {
+                if (checkeredArrangement) {
+                    val halfSize = componentSizeDp.pixels.half
+                    with(component) {
+                        draw(context, -halfSize, -halfSize, componentSizeDp.pixels)
+                        draw(context, -halfSize, size - halfSize, componentSizeDp.pixels)
+                        draw(context, size - halfSize, -halfSize, componentSizeDp.pixels)
+                        draw(context, size - halfSize, size - halfSize, componentSizeDp.pixels)
+                        draw(context, halfSize, halfSize, componentSizeDp.pixels)
+                    }
+                } else {
+                    component.draw(context, 0f, 0f, componentSizeDp.pixels, componentSizeDp.pixels)
                 }
-            } else {
-                component.draw(context, 0f, 0f, componentSizeDp.pixels, componentSizeDp.pixels)
             }
+            return BitmapShader(bitmap, tileXMode, tileYMode)
         }
-        return BitmapShader(bitmap, tileXMode, tileYMode)
-    }
 
     private fun Component.draw(
         context: DrawContext,
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/component/shape/shader/DynamicShader.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/component/shape/shader/DynamicShader.kt
index 068814357..9a7e4542d 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/component/shape/shader/DynamicShader.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/component/shape/shader/DynamicShader.kt
@@ -32,7 +32,6 @@ import kotlin.math.roundToInt
  * @see Shader
  */
 public fun interface DynamicShader {
-
     private val bitmapPixelExtractionKey: Any
         get() = "bitmapPixelExtractionKey${hashCode()}"
 
@@ -42,13 +41,14 @@ public fun interface DynamicShader {
     public fun provideShader(
         context: DrawContext,
         bounds: RectF,
-    ): Shader = provideShader(
-        context = context,
-        left = bounds.left,
-        top = bounds.top,
-        right = bounds.right,
-        bottom = bounds.bottom,
-    )
+    ): Shader =
+        provideShader(
+            context = context,
+            left = bounds.left,
+            top = bounds.top,
+            right = bounds.right,
+            bottom = bounds.bottom,
+        )
 
     /**
      * Creates a [Shader] by using the provided [left], [top], [right], and [bottom] bounds.
@@ -69,7 +69,12 @@ public fun interface DynamicShader {
      * @param rectF the [RectF] holding coordinates of the area to apply the style to.
      * @param zeroLineYFraction the fraction of the height of the area to apply the style to, that the zero line is at.
      */
-    public fun applyTo(paint: Paint, drawContext: DrawContext, rectF: RectF, zeroLineYFraction: Float) {
+    public fun applyTo(
+        paint: Paint,
+        drawContext: DrawContext,
+        rectF: RectF,
+        zeroLineYFraction: Float,
+    ) {
         applyTo(paint, drawContext, rectF.left, rectF.top, rectF.right, rectF.bottom, zeroLineYFraction)
     }
 
@@ -104,11 +109,17 @@ public fun interface DynamicShader {
      * @param rectF the [RectF] holding coordinates of the area to apply the style to.
      * @param zeroLineYFraction the fraction of the height of the area to apply the style to, that the zero line is at.
      */
-    public fun getColorAt(point: Point, drawContext: DrawContext, rectF: RectF, zeroLineYFraction: Float): Int {
-        val bitmap = drawContext.getOrPutExtra(bitmapPixelExtractionKey) {
-            val paint = Paint(Paint.ANTI_ALIAS_FLAG)
-            getBitmap(drawContext, paint, rectF)
-        }
+    public fun getColorAt(
+        point: Point,
+        drawContext: DrawContext,
+        rectF: RectF,
+        zeroLineYFraction: Float,
+    ): Int {
+        val bitmap =
+            drawContext.getOrPutExtra(bitmapPixelExtractionKey) {
+                val paint = Paint(Paint.ANTI_ALIAS_FLAG)
+                getBitmap(drawContext, paint, rectF)
+            }
         return bitmap.getPixel(
             (point.x - rectF.left).toInt().coerceIn(0, rectF.width().toInt() - 1),
             (point.y - rectF.top).toInt().coerceIn(0, rectF.height().toInt() - 1),
@@ -116,8 +127,11 @@ public fun interface DynamicShader {
     }
 
     public companion object {
-
-        private fun DynamicShader.getBitmap(drawContext: DrawContext, paint: Paint, rectF: RectF): Bitmap {
+        private fun DynamicShader.getBitmap(
+            drawContext: DrawContext,
+            paint: Paint,
+            rectF: RectF,
+        ): Bitmap {
             val width = rectF.width().roundToInt()
             val height = rectF.height().roundToInt()
             paint.shader = provideShader(drawContext, 0f, 0f, width.toFloat(), height.toFloat())
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/component/shape/shader/DynamicShaders.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/component/shape/shader/DynamicShaders.kt
index 6ba8e93eb..1c370cf3b 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/component/shape/shader/DynamicShaders.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/component/shape/shader/DynamicShaders.kt
@@ -30,7 +30,6 @@ import com.patrykandpatrick.vico.core.context.DrawContext
  * An object that holds simple, anonymous implementations of [DynamicShader].
  */
 public object DynamicShaders {
-
     /**
      * Creates a [DynamicShader] out of the given [bitmap].
      */
@@ -38,15 +37,16 @@ public object DynamicShaders {
         bitmap: Bitmap,
         tileXMode: Shader.TileMode = Shader.TileMode.REPEAT,
         tileYMode: Shader.TileMode = tileXMode,
-    ): DynamicShader = object : CacheableDynamicShader() {
-        override fun createShader(
-            context: DrawContext,
-            left: Float,
-            top: Float,
-            right: Float,
-            bottom: Float,
-        ): Shader = BitmapShader(bitmap, tileXMode, tileYMode)
-    }
+    ): DynamicShader =
+        object : CacheableDynamicShader() {
+            override fun createShader(
+                context: DrawContext,
+                left: Float,
+                top: Float,
+                right: Float,
+                bottom: Float,
+            ): Shader = BitmapShader(bitmap, tileXMode, tileYMode)
+        }
 
     /**
      * Creates a [ComposeShader] out of two [DynamicShader]s by using a [BlendMode].
@@ -56,13 +56,14 @@ public object DynamicShaders {
         first: DynamicShader,
         second: DynamicShader,
         mode: BlendMode,
-    ): DynamicShader = DynamicShader { context, left, top, right, bottom ->
-        ComposeShader(
-            first.provideShader(context, left, top, right, bottom),
-            second.provideShader(context, left, top, right, bottom),
-            mode,
-        )
-    }
+    ): DynamicShader =
+        DynamicShader { context, left, top, right, bottom ->
+            ComposeShader(
+                first.provideShader(context, left, top, right, bottom),
+                second.provideShader(context, left, top, right, bottom),
+                mode,
+            )
+        }
 
     /**
      * Creates a [ComposeShader] out of two [DynamicShader]s by using a [PorterDuff.Mode].
@@ -71,13 +72,14 @@ public object DynamicShaders {
         first: DynamicShader,
         second: DynamicShader,
         mode: PorterDuff.Mode,
-    ): DynamicShader = DynamicShader { context, left, top, right, bottom ->
-        ComposeShader(
-            first.provideShader(context, left, top, right, bottom),
-            second.provideShader(context, left, top, right, bottom),
-            mode,
-        )
-    }
+    ): DynamicShader =
+        DynamicShader { context, left, top, right, bottom ->
+            ComposeShader(
+                first.provideShader(context, left, top, right, bottom),
+                second.provideShader(context, left, top, right, bottom),
+                mode,
+            )
+        }
 }
 
 /**
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/component/shape/shader/HorizontalSplitShader.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/component/shape/shader/HorizontalSplitShader.kt
index 985098e11..b56ce7124 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/component/shape/shader/HorizontalSplitShader.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/component/shape/shader/HorizontalSplitShader.kt
@@ -34,10 +34,15 @@ import com.patrykandpatrick.vico.core.model.Point
 public abstract class HorizontalSplitShader(
     public var dividerYFraction: Float = 0f,
 ) : CacheableDynamicShader() {
-
     private val paint = Paint()
 
-    override fun createShader(context: DrawContext, left: Float, top: Float, right: Float, bottom: Float): Shader {
+    override fun createShader(
+        context: DrawContext,
+        left: Float,
+        top: Float,
+        right: Float,
+        bottom: Float,
+    ): Shader {
         val height = (bottom - top).toInt()
         val width = (right - left).toInt()
         val bitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888)
@@ -94,8 +99,12 @@ public abstract class HorizontalSplitShader(
         bottom: Float,
     )
 
-    override fun createKey(left: Float, top: Float, right: Float, bottom: Float): String =
-        super.createKey(left, top, right, bottom) + ",$dividerYFraction"
+    override fun createKey(
+        left: Float,
+        top: Float,
+        right: Float,
+        bottom: Float,
+    ): String = super.createKey(left, top, right, bottom) + ",$dividerYFraction"
 
     override fun applyTo(
         paint: Paint,
@@ -110,7 +119,12 @@ public abstract class HorizontalSplitShader(
         super.applyTo(paint, drawContext, left, top, right, bottom, zeroLineYFraction)
     }
 
-    override fun getColorAt(point: Point, drawContext: DrawContext, rectF: RectF, zeroLineYFraction: Float): Int {
+    override fun getColorAt(
+        point: Point,
+        drawContext: DrawContext,
+        rectF: RectF,
+        zeroLineYFraction: Float,
+    ): Int {
         dividerYFraction = zeroLineYFraction
         return super.getColorAt(point, drawContext, rectF, zeroLineYFraction)
     }
@@ -127,7 +141,6 @@ public abstract class HorizontalSplitShader(
         public var colorBottom: Int,
         dividerYFraction: Float = 0f,
     ) : HorizontalSplitShader(dividerYFraction) {
-
         override fun applyTopTo(
             paint: Paint,
             drawContext: DrawContext,
@@ -152,8 +165,12 @@ public abstract class HorizontalSplitShader(
             paint.shader = null
         }
 
-        override fun createKey(left: Float, top: Float, right: Float, bottom: Float): String =
-            super.createKey(left, top, right, bottom) + ",$colorTop,$colorBottom"
+        override fun createKey(
+            left: Float,
+            top: Float,
+            right: Float,
+            bottom: Float,
+        ): String = super.createKey(left, top, right, bottom) + ",$colorTop,$colorBottom"
 
         override fun equals(other: Any?): Boolean =
             when {
@@ -185,7 +202,6 @@ public abstract class HorizontalSplitShader(
         public var bottomShader: DynamicShader,
         dividerYFraction: Float = 0f,
     ) : HorizontalSplitShader(dividerYFraction) {
-
         override fun applyTopTo(
             paint: Paint,
             drawContext: DrawContext,
@@ -208,8 +224,12 @@ public abstract class HorizontalSplitShader(
             paint.shader = bottomShader.provideShader(drawContext, left, top, right, bottom)
         }
 
-        override fun createKey(left: Float, top: Float, right: Float, bottom: Float): String =
-            super.createKey(left, top, right, bottom) + ",${topShader.hashCode()},${bottomShader.hashCode()}"
+        override fun createKey(
+            left: Float,
+            top: Float,
+            right: Float,
+            bottom: Float,
+        ): String = super.createKey(left, top, right, bottom) + ",${topShader.hashCode()},${bottomShader.hashCode()}"
 
         override fun equals(other: Any?): Boolean =
             when {
@@ -221,7 +241,6 @@ public abstract class HorizontalSplitShader(
                         dividerYFraction == other.dividerYFraction
             }
 
-        override fun hashCode(): Int =
-            31 * topShader.hashCode() + bottomShader.hashCode()
+        override fun hashCode(): Int = 31 * topShader.hashCode() + bottomShader.hashCode()
     }
 }
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/component/shape/shader/SolidShader.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/component/shape/shader/SolidShader.kt
index 1da7b4cda..fc07e092e 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/component/shape/shader/SolidShader.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/component/shape/shader/SolidShader.kt
@@ -30,7 +30,6 @@ import com.patrykandpatrick.vico.core.model.Point
  * A [DynamicShader] that fills the area with the solid [color].
  */
 public class SolidShader(public val color: Int) : DynamicShader {
-
     private val shader: Shader = getShaderImplementation()
 
     private fun getShaderImplementation(): Shader {
@@ -39,15 +38,21 @@ public class SolidShader(public val color: Int) : DynamicShader {
                 setColorUniform(INPUT_COLOR, color)
             }
         } else {
-            val bitmap = Bitmap.createBitmap(1, 1, Bitmap.Config.ARGB_8888).apply {
-                setPixel(0, 0, color)
-            }
+            val bitmap =
+                Bitmap.createBitmap(1, 1, Bitmap.Config.ARGB_8888).apply {
+                    setPixel(0, 0, color)
+                }
             BitmapShader(bitmap, Shader.TileMode.CLAMP, Shader.TileMode.CLAMP)
         }
     }
 
-    override fun provideShader(context: DrawContext, left: Float, top: Float, right: Float, bottom: Float): Shader =
-        shader
+    override fun provideShader(
+        context: DrawContext,
+        left: Float,
+        top: Float,
+        right: Float,
+        bottom: Float,
+    ): Shader = shader
 
     override fun applyTo(
         paint: Paint,
@@ -61,11 +66,14 @@ public class SolidShader(public val color: Int) : DynamicShader {
         paint.shader = shader
     }
 
-    override fun getColorAt(point: Point, drawContext: DrawContext, rectF: RectF, zeroLineYFraction: Float): Int =
-        color
+    override fun getColorAt(
+        point: Point,
+        drawContext: DrawContext,
+        rectF: RectF,
+        zeroLineYFraction: Float,
+    ): Int = color
 
     private companion object {
-
         private const val INPUT_COLOR = "inputColor"
 
         private val SHADER_CODE =
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/component/shape/shader/StaticShader.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/component/shape/shader/StaticShader.kt
index 09e86300f..937c61175 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/component/shape/shader/StaticShader.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/component/shape/shader/StaticShader.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 by Patryk Goworowski and Patrick Michalik.
+ * Copyright 2023 by Patryk Goworowski and Patrick Michalik.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,7 +25,6 @@ import com.patrykandpatrick.vico.core.context.DrawContext
  * @property shader the [Shader] that will always be provided, regardless of the [provideShader] function’s arguments.
  */
 public class StaticShader(private val shader: Shader) : DynamicShader {
-
     override fun provideShader(
         context: DrawContext,
         left: Float,
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/component/shape/shadow/ComponentShadow.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/component/shape/shadow/ComponentShadow.kt
index 53f4b975d..6e72c698b 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/component/shape/shadow/ComponentShadow.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/component/shape/shadow/ComponentShadow.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 by Patryk Goworowski and Patrick Michalik.
+ * Copyright 2023 by Patryk Goworowski and Patrick Michalik.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -29,7 +29,6 @@ import com.patrykandpatrick.vico.core.extension.applyElevationOverlayToColor
  * @property color the shadow color.
  * @property applyElevationOverlay whether to apply an elevation overlay to the component casting the shadow.
  */
-@Suppress("ComplexCondition")
 public data class ComponentShadow(
     var radius: Float = 0f,
     var dx: Float = 0f,
@@ -50,11 +49,12 @@ public data class ComponentShadow(
         context: DrawContext,
         paint: Paint,
         backgroundColor: Int,
-    ): Unit = with(context) {
-        if (shouldUpdateShadowLayer()) {
-            updateShadowLayer(paint, backgroundColor)
+    ): Unit =
+        with(context) {
+            if (shouldUpdateShadowLayer()) {
+                updateShadowLayer(paint, backgroundColor)
+            }
         }
-    }
 
     private fun DrawContext.updateShadowLayer(
         paint: Paint,
@@ -63,11 +63,12 @@ public data class ComponentShadow(
         if (color == 0 || radius == 0f && dx == 0f && dy == 0f) {
             paint.clearShadowLayer()
         } else {
-            paint.color = if (applyElevationOverlay) {
-                applyElevationOverlayToColor(color = backgroundColor, elevationDp = radius)
-            } else {
-                backgroundColor
-            }
+            paint.color =
+                if (applyElevationOverlay) {
+                    applyElevationOverlayToColor(color = backgroundColor, elevationDp = radius)
+                } else {
+                    backgroundColor
+                }
             paint.setShadowLayer(
                 radius.pixels,
                 dx.pixels,
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/component/text/TextComponent.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/component/text/TextComponent.kt
index fd015ea41..0fb1e0f90 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/component/text/TextComponent.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/component/text/TextComponent.kt
@@ -67,7 +67,6 @@ private const val DEF_LAYOUT_SIZE = 100000
  * @see [textComponent]
  */
 public open class TextComponent protected constructor() : Padding, Margins {
-
     private val textPaint: TextPaint = TextPaint(Paint.ANTI_ALIAS_FLAG)
     private val tempMeasureBounds = RectF()
 
@@ -149,89 +148,92 @@ public open class TextComponent protected constructor() : Padding, Margins {
         maxTextWidth: Int = DEF_LAYOUT_SIZE,
         maxTextHeight: Int = DEF_LAYOUT_SIZE,
         rotationDegrees: Float = 0f,
-    ): Unit = with(context) {
-        if (text.isBlank()) return
-        layout = getLayout(text, maxTextWidth, maxTextHeight, rotationDegrees)
-
-        val shouldRotate = rotationDegrees % 2f.piRad != 0f
-        val textStartPosition = horizontalPosition.getTextStartPosition(context, textX, layout.widestLineWidth)
-        val textTopPosition = verticalPosition.getTextTopPosition(context, textY, layout.height.toFloat())
-
-        context.withCanvas {
-            save()
-
-            val bounds = layout.getBounds(tempMeasureBounds)
-            val textAlignmentCorrection = getTextAlignmentCorrection(bounds.width())
-
-            with(receiver = bounds) {
-                left -= padding.getLeftDp(isLtr).pixels
-                top -= padding.topDp.pixels
-                right += padding.getRightDp(isLtr).pixels
-                bottom += padding.bottomDp.pixels
-            }
-
-            var xCorrection = 0f
-            var yCorrection = 0f
+    ): Unit =
+        with(context) {
+            if (text.isBlank()) return
+            layout = getLayout(text, maxTextWidth, maxTextHeight, rotationDegrees)
+
+            val shouldRotate = rotationDegrees % 2f.piRad != 0f
+            val textStartPosition = horizontalPosition.getTextStartPosition(context, textX, layout.widestLineWidth)
+            val textTopPosition = verticalPosition.getTextTopPosition(context, textY, layout.height.toFloat())
+
+            context.withCanvas {
+                save()
+
+                val bounds = layout.getBounds(tempMeasureBounds)
+                val textAlignmentCorrection = getTextAlignmentCorrection(bounds.width())
+
+                with(receiver = bounds) {
+                    left -= padding.getLeftDp(isLtr).pixels
+                    top -= padding.topDp.pixels
+                    right += padding.getRightDp(isLtr).pixels
+                    bottom += padding.bottomDp.pixels
+                }
 
-            if (shouldRotate) {
-                val boundsPostRotation = bounds.copy().rotate(rotationDegrees)
-                val heightDelta = bounds.height() - boundsPostRotation.height()
-                val widthDelta = bounds.width() - boundsPostRotation.width()
+                var xCorrection = 0f
+                var yCorrection = 0f
+
+                if (shouldRotate) {
+                    val boundsPostRotation = bounds.copy().rotate(rotationDegrees)
+                    val heightDelta = bounds.height() - boundsPostRotation.height()
+                    val widthDelta = bounds.width() - boundsPostRotation.width()
+
+                    xCorrection = when (horizontalPosition) {
+                        HorizontalPosition.Start -> widthDelta.half
+                        HorizontalPosition.End -> -widthDelta.half
+                        else -> 0f
+                    } * context.layoutDirectionMultiplier
+
+                    yCorrection =
+                        when (verticalPosition) {
+                            VerticalPosition.Top -> heightDelta.half
+                            VerticalPosition.Bottom -> -heightDelta.half
+                            else -> 0f
+                        }
+                }
 
-                xCorrection = when (horizontalPosition) {
-                    HorizontalPosition.Start -> widthDelta.half
-                    HorizontalPosition.End -> -widthDelta.half
-                    else -> 0f
-                } * context.layoutDirectionMultiplier
+                bounds.translate(
+                    x = textStartPosition + xCorrection,
+                    y = textTopPosition + yCorrection,
+                )
 
-                yCorrection = when (verticalPosition) {
-                    VerticalPosition.Top -> heightDelta.half
-                    VerticalPosition.Bottom -> -heightDelta.half
-                    else -> 0f
+                if (shouldRotate) {
+                    rotate(rotationDegrees, bounds.centerX(), bounds.centerY())
                 }
-            }
-
-            bounds.translate(
-                x = textStartPosition + xCorrection,
-                y = textTopPosition + yCorrection,
-            )
 
-            if (shouldRotate) {
-                rotate(rotationDegrees, bounds.centerX(), bounds.centerY())
+                background?.draw(
+                    context = context,
+                    left = bounds.left,
+                    top = bounds.top,
+                    right = bounds.right,
+                    bottom = bounds.bottom,
+                )
+
+                translate(
+                    bounds.left + padding.getLeftDp(isLtr).pixels + textAlignmentCorrection,
+                    bounds.top + padding.topDp.pixels,
+                )
+
+                layout.draw(this)
+                restore()
             }
-
-            background?.draw(
-                context = context,
-                left = bounds.left,
-                top = bounds.top,
-                right = bounds.right,
-                bottom = bounds.bottom,
-            )
-
-            translate(
-                bounds.left + padding.getLeftDp(isLtr).pixels + textAlignmentCorrection,
-                bounds.top + padding.topDp.pixels,
-            )
-
-            layout.draw(this)
-            restore()
         }
-    }
 
     private fun HorizontalPosition.getTextStartPosition(
         context: MeasureContext,
         baseXPosition: Float,
         width: Float,
-    ): Float = with(context) {
-        when (this@getTextStartPosition) {
-            HorizontalPosition.Start ->
-                if (isLtr) getTextRightPosition(baseXPosition, width) else getTextLeftPosition(baseXPosition)
-            HorizontalPosition.Center ->
-                baseXPosition - width.half
-            HorizontalPosition.End ->
-                if (isLtr) getTextLeftPosition(baseXPosition) else getTextRightPosition(baseXPosition, width)
+    ): Float =
+        with(context) {
+            when (this@getTextStartPosition) {
+                HorizontalPosition.Start ->
+                    if (isLtr) getTextRightPosition(baseXPosition, width) else getTextLeftPosition(baseXPosition)
+                HorizontalPosition.Center ->
+                    baseXPosition - width.half
+                HorizontalPosition.End ->
+                    if (isLtr) getTextLeftPosition(baseXPosition) else getTextRightPosition(baseXPosition, width)
+            }
         }
-    }
 
     private fun MeasureContext.getTextLeftPosition(baseXPosition: Float): Float =
         baseXPosition + padding.getLeftDp(isLtr).pixels + margins.getLeftDp(isLtr).pixels
@@ -242,15 +244,16 @@ public open class TextComponent protected constructor() : Padding, Margins {
     ): Float = baseXPosition - padding.getRightDp(isLtr).pixels - margins.getRightDp(isLtr).pixels - width
 
     private fun getTextAlignmentCorrection(width: Float): Float {
-        val ltrAlignment = if (layout.getParagraphDirection(0) == Layout.DIR_LEFT_TO_RIGHT) {
-            textAlignment
-        } else {
-            when (textAlignment) {
-                Layout.Alignment.ALIGN_NORMAL -> Layout.Alignment.ALIGN_OPPOSITE
-                Layout.Alignment.ALIGN_OPPOSITE -> Layout.Alignment.ALIGN_NORMAL
-                Layout.Alignment.ALIGN_CENTER -> Layout.Alignment.ALIGN_CENTER
+        val ltrAlignment =
+            if (layout.getParagraphDirection(0) == Layout.DIR_LEFT_TO_RIGHT) {
+                textAlignment
+            } else {
+                when (textAlignment) {
+                    Layout.Alignment.ALIGN_NORMAL -> Layout.Alignment.ALIGN_OPPOSITE
+                    Layout.Alignment.ALIGN_OPPOSITE -> Layout.Alignment.ALIGN_NORMAL
+                    Layout.Alignment.ALIGN_CENTER -> Layout.Alignment.ALIGN_CENTER
+                }
             }
-        }
         return when (ltrAlignment) {
             Layout.Alignment.ALIGN_NORMAL -> 0f
             Layout.Alignment.ALIGN_OPPOSITE -> width - layout.width
@@ -263,13 +266,15 @@ public open class TextComponent protected constructor() : Padding, Margins {
         context: MeasureContext,
         textY: Float,
         layoutHeight: Float,
-    ): Float = with(context) {
-        textY + when (this@getTextTopPosition) {
-            VerticalPosition.Top -> -layoutHeight - padding.bottomDp.pixels - margins.bottomDp.pixels
-            VerticalPosition.Center -> -layoutHeight.half
-            VerticalPosition.Bottom -> padding.topDp.pixels + margins.topDp.pixels
+    ): Float =
+        with(context) {
+            textY +
+                when (this@getTextTopPosition) {
+                    VerticalPosition.Top -> -layoutHeight - padding.bottomDp.pixels - margins.bottomDp.pixels
+                    VerticalPosition.Center -> -layoutHeight.half
+                    VerticalPosition.Bottom -> padding.topDp.pixels + margins.topDp.pixels
+                }
         }
-    }
 
     /**
      * Returns the width of this [TextComponent] for the given [text] and the available [width] and [height]. [pad]
@@ -282,14 +287,15 @@ public open class TextComponent protected constructor() : Padding, Margins {
         height: Int = DEF_LAYOUT_SIZE,
         rotationDegrees: Float = 0f,
         pad: Boolean = text == null,
-    ): Float = getTextBounds(
-        context = context,
-        text = text,
-        width = width,
-        height = height,
-        rotationDegrees = rotationDegrees,
-        pad = pad,
-    ).width()
+    ): Float =
+        getTextBounds(
+            context = context,
+            text = text,
+            width = width,
+            height = height,
+            rotationDegrees = rotationDegrees,
+            pad = pad,
+        ).width()
 
     /**
      * Returns the height of this [TextComponent] for the given [text] and the available [width] and [height]. [pad]
@@ -302,14 +308,15 @@ public open class TextComponent protected constructor() : Padding, Margins {
         height: Int = DEF_LAYOUT_SIZE,
         rotationDegrees: Float = 0f,
         pad: Boolean = text == null,
-    ): Float = getTextBounds(
-        context = context,
-        text = text,
-        width = width,
-        height = height,
-        rotationDegrees = rotationDegrees,
-        pad = pad,
-    ).height()
+    ): Float =
+        getTextBounds(
+            context = context,
+            text = text,
+            width = width,
+            height = height,
+            rotationDegrees = rotationDegrees,
+            pad = pad,
+        ).height()
 
     /**
      * Returns the bounds ([RectF]) of this [TextComponent] for the given [text] and the available [width] and [height].
@@ -324,25 +331,26 @@ public open class TextComponent protected constructor() : Padding, Margins {
         includePaddingAndMargins: Boolean = true,
         rotationDegrees: Float = 0f,
         pad: Boolean = text == null,
-    ): RectF = with(context) {
-        var measuredText = text?.toString().orEmpty()
-        if (pad) repeat((lineCount - measuredText.lines().size).coerceAtLeast(0)) { measuredText += '\n' }
-        getLayout(measuredText, width, height, rotationDegrees)
-            .getBounds(outRect)
-            .apply {
-                if (includePaddingAndMargins) {
-                    right += padding.horizontalDp.pixels
-                    bottom += padding.verticalDp.pixels
+    ): RectF =
+        with(context) {
+            var measuredText = text?.toString().orEmpty()
+            if (pad) repeat((lineCount - measuredText.lines().size).coerceAtLeast(0)) { measuredText += '\n' }
+            getLayout(measuredText, width, height, rotationDegrees)
+                .getBounds(outRect)
+                .apply {
+                    if (includePaddingAndMargins) {
+                        right += padding.horizontalDp.pixels
+                        bottom += padding.verticalDp.pixels
+                    }
                 }
-            }
-            .rotate(rotationDegrees)
-            .apply {
-                if (includePaddingAndMargins) {
-                    right += margins.horizontalDp.pixels
-                    bottom += margins.verticalDp.pixels
+                .rotate(rotationDegrees)
+                .apply {
+                    if (includePaddingAndMargins) {
+                        right += margins.horizontalDp.pixels
+                        bottom += margins.verticalDp.pixels
+                    }
                 }
-            }
-    }
+        }
 
     private fun MeasureContext.getLayout(
         text: CharSequence,
@@ -353,20 +361,21 @@ public open class TextComponent protected constructor() : Padding, Margins {
         val widthWithoutMargins = width - margins.horizontalDp.wholePixels
         val heightWithoutMargins = height - margins.verticalDp.wholePixels
 
-        val correctedWidth = (
-            when {
-                rotationDegrees % 1f.piRad == 0f -> widthWithoutMargins
-                rotationDegrees % .5f.piRad == 0f -> heightWithoutMargins
-                else -> {
-                    val cumulatedHeight = lineCount * textPaint.lineHeight + padding.verticalDp.wholePixels
-                    val alpha = Math.toRadians(rotationDegrees.toDouble())
-                    val absSinAlpha = sin(alpha).absoluteValue
-                    val absCosAlpha = cos(alpha).absoluteValue
-                    val basedOnWidth = (widthWithoutMargins - cumulatedHeight * absSinAlpha) / absCosAlpha
-                    val basedOnHeight = (heightWithoutMargins - cumulatedHeight * absCosAlpha) / absSinAlpha
-                    min(basedOnWidth, basedOnHeight).toInt()
-                }
-            } - padding.horizontalDp.wholePixels
+        val correctedWidth =
+            (
+                when {
+                    rotationDegrees % 1f.piRad == 0f -> widthWithoutMargins
+                    rotationDegrees % .5f.piRad == 0f -> heightWithoutMargins
+                    else -> {
+                        val cumulatedHeight = lineCount * textPaint.lineHeight + padding.verticalDp.wholePixels
+                        val alpha = Math.toRadians(rotationDegrees.toDouble())
+                        val absSinAlpha = sin(alpha).absoluteValue
+                        val absCosAlpha = cos(alpha).absoluteValue
+                        val basedOnWidth = (widthWithoutMargins - cumulatedHeight * absSinAlpha) / absCosAlpha
+                        val basedOnHeight = (heightWithoutMargins - cumulatedHeight * absCosAlpha) / absSinAlpha
+                        min(basedOnWidth, basedOnHeight).toInt()
+                    }
+                } - padding.horizontalDp.wholePixels
             ).coerceAtLeast(0)
 
         val key = LAYOUT_KEY_PREFIX + text + correctedWidth + rotationDegrees + textPaint.hashCode()
@@ -388,7 +397,6 @@ public open class TextComponent protected constructor() : Padding, Margins {
      * @see textComponent
      */
     public class Builder {
-
         /**
          * @see [TextComponent.color]
          */
@@ -437,17 +445,18 @@ public open class TextComponent protected constructor() : Padding, Margins {
         /**
          * Creates a new instance of [TextComponent] with the supplied properties.
          */
-        public fun build(): TextComponent = TextComponent().apply {
-            color = this@Builder.color
-            textSizeSp = this@Builder.textSizeSp
-            typeface = this@Builder.typeface
-            ellipsize = this@Builder.ellipsize
-            lineCount = this@Builder.lineCount
-            background = this@Builder.background
-            textAlignment = this@Builder.textAlignment
-            padding.set(this@Builder.padding)
-            margins.set(this@Builder.margins)
-        }
+        public fun build(): TextComponent =
+            TextComponent().apply {
+                color = this@Builder.color
+                textSizeSp = this@Builder.textSizeSp
+                typeface = this@Builder.typeface
+                ellipsize = this@Builder.ellipsize
+                lineCount = this@Builder.lineCount
+                background = this@Builder.background
+                textAlignment = this@Builder.textAlignment
+                padding.set(this@Builder.padding)
+                margins.set(this@Builder.margins)
+            }
     }
 }
 
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/component/text/VerticalPosition.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/component/text/VerticalPosition.kt
index 22d108cfe..e2ca837ac 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/component/text/VerticalPosition.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/component/text/VerticalPosition.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 by Patryk Goworowski and Patrick Michalik.
+ * Copyright 2023 by Patryk Goworowski and Patrick Michalik.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,9 +28,10 @@ public enum class VerticalPosition {
     /**
      * Returns the inverse of this [VerticalPosition].
      */
-    public fun negative(): VerticalPosition = when (this) {
-        Top -> Bottom
-        Center -> Center
-        Bottom -> Top
-    }
+    public fun negative(): VerticalPosition =
+        when (this) {
+            Top -> Bottom
+            Center -> Center
+            Bottom -> Top
+        }
 }
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/component/text/VerticalPositionExtensions.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/component/text/VerticalPositionExtensions.kt
index 8e14fa55b..fa66eb1ce 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/component/text/VerticalPositionExtensions.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/component/text/VerticalPositionExtensions.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 by Patryk Goworowski and Patrick Michalik.
+ * Copyright 2023 by Patryk Goworowski and Patrick Michalik.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -32,10 +32,11 @@ internal fun VerticalPosition.inBounds(
     return when (this) {
         VerticalPosition.Top -> if (topFits) this else VerticalPosition.Bottom
         VerticalPosition.Bottom -> if (bottomFits) this else VerticalPosition.Top
-        VerticalPosition.Center -> when {
-            centerFits -> this
-            topFits -> VerticalPosition.Top
-            else -> VerticalPosition.Bottom
-        }
+        VerticalPosition.Center ->
+            when {
+                centerFits -> this
+                topFits -> VerticalPosition.Top
+                else -> VerticalPosition.Bottom
+            }
     }
 }
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/context/DefaultExtras.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/context/DefaultExtras.kt
index cfeeb7384..8e531ab3c 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/context/DefaultExtras.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/context/DefaultExtras.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 by Patryk Goworowski and Patrick Michalik.
+ * Copyright 2023 by Patryk Goworowski and Patrick Michalik.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,10 +24,12 @@ private const val INITIAL_CAPACITY = 8
  */
 @Suppress("UNCHECKED_CAST")
 public class DefaultExtras : Extras {
-
     private val extrasMap: HashMap<Any, Any> = HashMap(INITIAL_CAPACITY)
 
-    public override fun putExtra(key: Any, value: Any) {
+    public override fun putExtra(
+        key: Any,
+        value: Any,
+    ) {
         extrasMap[key] = value
     }
 
@@ -35,9 +37,10 @@ public class DefaultExtras : Extras {
 
     override fun <T> getExtra(key: Any): T = extrasMap[key] as T
 
-    public override fun <T> consumeExtra(key: Any): T = getExtra<T>(key).also {
-        extrasMap.remove(key)
-    }
+    public override fun <T> consumeExtra(key: Any): T =
+        getExtra<T>(key).also {
+            extrasMap.remove(key)
+        }
 
     override fun clearExtras() {
         extrasMap.clear()
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/context/DrawContext.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/context/DrawContext.kt
index 4091b5760..615e42243 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/context/DrawContext.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/context/DrawContext.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 by Patryk Goworowski and Patrick Michalik.
+ * Copyright 2023 by Patryk Goworowski and Patrick Michalik.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,7 +26,6 @@ import com.patrykandpatrick.vico.core.extension.saveLayer
  * It also defines helpful drawing functions.
  */
 public interface DrawContext : MeasureContext {
-
     /**
      * The elevation overlay color, applied to [ShapeComponent]s that cast shadows.
      */
@@ -47,14 +46,22 @@ public interface DrawContext : MeasureContext {
     /**
      * Temporarily swaps the [Canvas] and yields [DrawContext] as the [block]’s receiver.
      */
-    public fun withOtherCanvas(canvas: Canvas, block: (DrawContext) -> Unit)
+    public fun withOtherCanvas(
+        canvas: Canvas,
+        block: (DrawContext) -> Unit,
+    )
 
     /**
      * Clips the [Canvas] to the specified rectangle.
      *
      * @see Canvas.clipRect
      */
-    public fun clipRect(left: Float, top: Float, right: Float, bottom: Float) {
+    public fun clipRect(
+        left: Float,
+        top: Float,
+        right: Float,
+        bottom: Float,
+    ) {
         canvas.clipRect(left, top, right, bottom)
     }
 
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/context/Extras.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/context/Extras.kt
index b5ac5b0c7..eba959917 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/context/Extras.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/context/Extras.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 by Patryk Goworowski and Patrick Michalik.
+ * Copyright 2023 by Patryk Goworowski and Patrick Michalik.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,14 +25,16 @@ import kotlin.collections.Map
  * Extras are kept in memory while measuring or drawing is taking place. Afterwards, they are removed.
  */
 public interface Extras {
-
     /**
      * Saves an extra.
      *
      * @param key the extra’s unique identifier.
      * @param value the extra’s value.
      */
-    public fun putExtra(key: Any, value: Any)
+    public fun putExtra(
+        key: Any,
+        value: Any,
+    )
 
     /**
      * Checks whether an extra with the given key exists.
@@ -59,7 +61,10 @@ public interface Extras {
      *
      * @see putExtra
      */
-    public operator fun set(key: Any, value: Any): Unit = putExtra(key, value)
+    public operator fun set(
+        key: Any,
+        value: Any,
+    ): Unit = putExtra(key, value)
 
     /**
      * Operator function for [consumeExtra].
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/context/MeasureContext.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/context/MeasureContext.kt
index 67d526536..4ddb51173 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/context/MeasureContext.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/context/MeasureContext.kt
@@ -25,7 +25,6 @@ import com.patrykandpatrick.vico.core.chart.values.ChartValuesProvider
  * [MeasureContext] holds data used by various chart components during the measuring and drawing phases.
  */
 public interface MeasureContext : Extras {
-
     /**
      * The bounds of the canvas that will be used to draw the chart and its components.
      */
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/context/MutableMeasureContext.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/context/MutableMeasureContext.kt
index 6922d90fa..76d32b6db 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/context/MutableMeasureContext.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/context/MutableMeasureContext.kt
@@ -34,7 +34,6 @@ public data class MutableMeasureContext(
     public var spToPx: (Float) -> Float,
     override var chartValuesProvider: ChartValuesProvider,
 ) : MeasureContext, Extras by DefaultExtras() {
-
     override fun reset() {
         clearExtras()
     }
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/debug/DebugHelper.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/debug/DebugHelper.kt
index f3aca9dd9..1ce7b6e9d 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/debug/DebugHelper.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/debug/DebugHelper.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 by Patryk Goworowski and Patrick Michalik.
+ * Copyright 2023 by Patryk Goworowski and Patrick Michalik.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,10 +24,11 @@ internal object DebugHelper {
     public var enabled: Boolean = false
 
     public var strokeWidthDp: Float = 1f
-    public var debugPaint = Paint(Paint.ANTI_ALIAS_FLAG).apply {
-        style = Paint.Style.STROKE
-        color = Color.MAGENTA
-    }
+    public var debugPaint =
+        Paint(Paint.ANTI_ALIAS_FLAG).apply {
+            style = Paint.Style.STROKE
+            color = Color.MAGENTA
+        }
 
     public fun drawDebugBounds(
         context: DrawContext,
@@ -35,9 +36,10 @@ internal object DebugHelper {
         top: Float,
         right: Float,
         bottom: Float,
-    ): Unit = with(context) {
-        if (!enabled) return@with
-        debugPaint.strokeWidth = strokeWidthDp.pixels
-        canvas.drawRect(left, top, right, bottom, debugPaint)
-    }
+    ): Unit =
+        with(context) {
+            if (!enabled) return@with
+            debugPaint.strokeWidth = strokeWidthDp.pixels
+            canvas.drawRect(left, top, right, bottom, debugPaint)
+        }
 }
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/dimensions/BoundsAware.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/dimensions/BoundsAware.kt
index d7998fb30..933392bc8 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/dimensions/BoundsAware.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/dimensions/BoundsAware.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 by Patryk Goworowski and Patrick Michalik.
+ * Copyright 2023 by Patryk Goworowski and Patrick Michalik.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,7 +23,6 @@ import com.patrykandpatrick.vico.core.extension.set
  * Defines an abstract component that has some physical bounds.
  */
 public interface BoundsAware {
-
     /**
      * The bounds of the abstract component.
      */
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/dimensions/Dimensions.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/dimensions/Dimensions.kt
index 64072a073..3c17b8770 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/dimensions/Dimensions.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/dimensions/Dimensions.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 by Patryk Goworowski and Patrick Michalik.
+ * Copyright 2023 by Patryk Goworowski and Patrick Michalik.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,7 +21,6 @@ package com.patrykandpatrick.vico.core.dimensions
  * Used to store measurements such as padding or margin values.
  */
 public interface Dimensions {
-
     /**
      * The value for the start edge in the dp unit.
      */
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/dimensions/MutableDimensions.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/dimensions/MutableDimensions.kt
index 929d030c7..0da79eaaf 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/dimensions/MutableDimensions.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/dimensions/MutableDimensions.kt
@@ -25,7 +25,6 @@ public data class MutableDimensions(
     override var endDp: Float,
     override var bottomDp: Float,
 ) : Dimensions {
-
     public constructor(
         horizontalDp: Float,
         verticalDp: Float,
@@ -51,14 +50,12 @@ public data class MutableDimensions(
     /**
      * Updates these [MutableDimensions] to match the provided [Dimensions].
      */
-    public fun set(other: Dimensions): MutableDimensions =
-        set(other.startDp, other.topDp, other.endDp, other.bottomDp)
+    public fun set(other: Dimensions): MutableDimensions = set(other.startDp, other.topDp, other.endDp, other.bottomDp)
 
     /**
      * Sets a common value for each coordinate.
      */
-    public fun set(all: Float): MutableDimensions =
-        set(all, all, all, all)
+    public fun set(all: Float): MutableDimensions = set(all, all, all, all)
 
     /**
      * Updates the coordinates to the provided values.
@@ -68,28 +65,31 @@ public data class MutableDimensions(
         topDp: Float = 0f,
         endDp: Float = 0f,
         bottomDp: Float = 0f,
-    ): MutableDimensions = apply {
-        this.startDp = startDp
-        this.topDp = topDp
-        this.endDp = endDp
-        this.bottomDp = bottomDp
-    }
+    ): MutableDimensions =
+        apply {
+            this.startDp = startDp
+            this.topDp = topDp
+            this.endDp = endDp
+            this.bottomDp = bottomDp
+        }
 
     /**
      * Evenly distributes the provided measurement between [startDp] and [endDp].
      */
-    public fun setHorizontal(valueDp: Float): MutableDimensions = apply {
-        startDp = if (valueDp == 0f) valueDp else valueDp / 2
-        endDp = if (valueDp == 0f) valueDp else valueDp / 2
-    }
+    public fun setHorizontal(valueDp: Float): MutableDimensions =
+        apply {
+            startDp = if (valueDp == 0f) valueDp else valueDp / 2
+            endDp = if (valueDp == 0f) valueDp else valueDp / 2
+        }
 
     /**
      * Evenly distributes the provided measurement between [topDp] and [bottomDp].
      */
-    public fun setVertical(valueDp: Float): MutableDimensions = apply {
-        topDp = if (valueDp == 0f) valueDp else valueDp / 2
-        bottomDp = if (valueDp == 0f) valueDp else valueDp / 2
-    }
+    public fun setVertical(valueDp: Float): MutableDimensions =
+        apply {
+            topDp = if (valueDp == 0f) valueDp else valueDp / 2
+            bottomDp = if (valueDp == 0f) valueDp else valueDp / 2
+        }
 
     /**
      * Sets all coordinates to 0.
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/draw/DrawContextExtensions.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/draw/DrawContextExtensions.kt
index 29f24a168..14c31b544 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/draw/DrawContextExtensions.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/draw/DrawContextExtensions.kt
@@ -47,26 +47,30 @@ public fun drawContext(
     isLtr: Boolean = true,
     elevationOverlayColor: Long = DefaultColors.Light.elevationOverlayColor,
     spToPx: (Float) -> Float = { it },
-): DrawContext = object : DrawContext, Extras by DefaultExtras() {
-    override val canvasBounds: RectF = RectF(0f, 0f, canvas.width.toFloat(), canvas.height.toFloat())
-    override val elevationOverlayColor: Long = elevationOverlayColor
-    override var canvas: Canvas = canvas
-    override val density: Float = density
-    override val isLtr: Boolean = isLtr
-    override val isHorizontalScrollEnabled: Boolean = false
-    override val chartValuesProvider: ChartValuesProvider = ChartValuesProvider.Empty
-    override val horizontalLayout: HorizontalLayout = HorizontalLayout.Segmented
+): DrawContext =
+    object : DrawContext, Extras by DefaultExtras() {
+        override val canvasBounds: RectF = RectF(0f, 0f, canvas.width.toFloat(), canvas.height.toFloat())
+        override val elevationOverlayColor: Long = elevationOverlayColor
+        override var canvas: Canvas = canvas
+        override val density: Float = density
+        override val isLtr: Boolean = isLtr
+        override val isHorizontalScrollEnabled: Boolean = false
+        override val chartValuesProvider: ChartValuesProvider = ChartValuesProvider.Empty
+        override val horizontalLayout: HorizontalLayout = HorizontalLayout.Segmented
 
-    override fun withOtherCanvas(canvas: Canvas, block: (DrawContext) -> Unit) {
-        val originalCanvas = this.canvas
-        this.canvas = canvas
-        block(this)
-        this.canvas = originalCanvas
-    }
+        override fun withOtherCanvas(
+            canvas: Canvas,
+            block: (DrawContext) -> Unit,
+        ) {
+            val originalCanvas = this.canvas
+            this.canvas = canvas
+            block(this)
+            this.canvas = originalCanvas
+        }
 
-    override fun reset() {
-        clearExtras()
-    }
+        override fun reset() {
+            clearExtras()
+        }
 
-    override fun spToPx(sp: Float): Float = spToPx(sp)
-}
+        override fun spToPx(sp: Float): Float = spToPx(sp)
+    }
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/entry/ChartEntry.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/entry/ChartEntry.kt
index 6996a1200..eb0d12fe9 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/entry/ChartEntry.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/entry/ChartEntry.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 by Patryk Goworowski and Patrick Michalik.
+ * Copyright 2023 by Patryk Goworowski and Patrick Michalik.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,7 +23,6 @@ import com.patrykandpatrick.vico.core.chart.Chart
  * It holds information about the location of the chart entry on the x-axis and y-axis.
  */
 public interface ChartEntry {
-
     /**
      * The position of this [ChartEntry] on the x-axis.
      */
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/entry/ChartEntryExtensions.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/entry/ChartEntryExtensions.kt
index 135e4cb8f..ee743a1b6 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/entry/ChartEntryExtensions.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/entry/ChartEntryExtensions.kt
@@ -29,7 +29,10 @@ import kotlin.math.abs
  *
  * @see [entriesOf]
  */
-public fun entryOf(x: Float, y: Float): FloatEntry = FloatEntry(x, y)
+public fun entryOf(
+    x: Float,
+    y: Float,
+): FloatEntry = FloatEntry(x, y)
 
 /**
  * Creates a [FloatEntry] instance.
@@ -39,7 +42,10 @@ public fun entryOf(x: Float, y: Float): FloatEntry = FloatEntry(x, y)
  *
  * @see [entriesOf]
  */
-public fun entryOf(x: Number, y: Number): FloatEntry = entryOf(x.toFloat(), y.toFloat())
+public fun entryOf(
+    x: Number,
+    y: Number,
+): FloatEntry = entryOf(x.toFloat(), y.toFloat())
 
 /**
  * Creates a [List] of [FloatEntry] instances. Each of the provided [Pair]s corresponds to a single [FloatEntry], with
@@ -56,8 +62,7 @@ public fun entryOf(x: Number, y: Number): FloatEntry = entryOf(x.toFloat(), y.to
  *
  * @see [entryOf]
  */
-public fun entriesOf(vararg pairs: Pair<Number, Number>): List<FloatEntry> =
-    pairs.map { (x, y) -> entryOf(x, y) }
+public fun entriesOf(vararg pairs: Pair<Number, Number>): List<FloatEntry> = pairs.map { (x, y) -> entryOf(x, y) }
 
 /**
  * Creates a [List] of [FloatEntry] instances out of an array of y-axis values.
@@ -79,8 +84,7 @@ public fun entriesOf(vararg pairs: Pair<Number, Number>): List<FloatEntry> =
  *
  * @see [entryOf]
  */
-public fun entriesOf(vararg yValues: Number): List<FloatEntry> =
-    yValues.mapIndexed { index, y -> entryOf(index, y) }
+public fun entriesOf(vararg yValues: Number): List<FloatEntry> = yValues.mapIndexed { index, y -> entryOf(index, y) }
 
 internal inline val Iterable<Iterable<ChartEntry>>.yRange: ClosedFloatingPointRange<Float>
     get() = flatten().rangeOfOrNull { it.y } ?: 0f..0f
@@ -88,11 +92,14 @@ internal inline val Iterable<Iterable<ChartEntry>>.yRange: ClosedFloatingPointRa
 internal inline val Iterable<Iterable<ChartEntry>>.xRange: ClosedFloatingPointRange<Float>
     get() = flatten().rangeOfOrNull { it.x } ?: 0f..0f
 
-internal fun Iterable<Iterable<ChartEntry>>.calculateXGcd() = flatten()
-    .zipWithNext { firstEntry, secondEntry -> abs(secondEntry.x - firstEntry.x) }
-    .fold<Float, Float?>(null) { gcd, delta -> gcd?.gcdWith(delta) ?: delta }
-    ?.also { require(it != 0f) { "The precision of the x values is too large. The maximum is two decimal places." } }
-    ?: 1f
+internal fun Iterable<Iterable<ChartEntry>>.calculateXGcd() =
+    flatten()
+        .zipWithNext { firstEntry, secondEntry -> abs(secondEntry.x - firstEntry.x) }
+        .fold<Float, Float?>(null) { gcd, delta -> gcd?.gcdWith(delta) ?: delta }
+        ?.also {
+            require(it != 0f) { "The precision of the x values is too large. The maximum is two decimal places." }
+        }
+        ?: 1f
 
 internal fun Iterable<Iterable<ChartEntry>>.calculateStackedYRange(): ClosedFloatingPointRange<Float> =
     flatten().fold(HashMap<Float, Pair<Float, Float>>()) { map, entry ->
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/entry/ChartEntryModel.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/entry/ChartEntryModel.kt
index 5ace93f79..be8802d9c 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/entry/ChartEntryModel.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/entry/ChartEntryModel.kt
@@ -39,7 +39,6 @@ import com.patrykandpatrick.vico.core.entry.diff.ExtraStore
  * @see [ComposedChartEntryModelProducer].
  */
 public interface ChartEntryModel {
-
     /**
      * The [ChartEntryModel]’s identifier. Different [ChartEntryModel] instances don’t necessarily have different
      * identifiers. [ChartEntryModelProducer] and [ComposedChartEntryModelProducer] use the same [id] for all
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/entry/ChartEntryModelProducer.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/entry/ChartEntryModelProducer.kt
index 9e63c2679..b40ca2634 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/entry/ChartEntryModelProducer.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/entry/ChartEntryModelProducer.kt
@@ -46,7 +46,6 @@ public class ChartEntryModelProducer(
     entryCollections: List<List<ChartEntry>>,
     dispatcher: CoroutineDispatcher = Dispatchers.Default,
 ) : ChartModelProducer<ChartEntryModel> {
-
     private var series = emptyList<List<ChartEntry>>()
     private var cachedInternalModel: InternalModel? = null
     private val mutex = Mutex()
@@ -69,14 +68,18 @@ public class ChartEntryModelProducer(
      * behavior, use [setEntriesSuspending]. [updateExtras] allows for adding auxiliary data, which can later be
      * retrieved via [ChartEntryModel.extraStore].
      */
-    public fun setEntries(entries: List<List<ChartEntry>>, updateExtras: (MutableExtraStore) -> Unit = {}): Boolean {
+    public fun setEntries(
+        entries: List<List<ChartEntry>>,
+        updateExtras: (MutableExtraStore) -> Unit = {},
+    ): Boolean {
         if (!mutex.tryLock()) return false
         series = entries.copy()
         updateExtras(extraStore)
         cachedInternalModel = null
-        val deferredUpdates = updateReceivers.values.map { updateReceiver ->
-            coroutineScope.async { updateReceiver.handleUpdate() }
-        }
+        val deferredUpdates =
+            updateReceivers.values.map { updateReceiver ->
+                coroutineScope.async { updateReceiver.handleUpdate() }
+            }
         coroutineScope.launch {
             deferredUpdates.awaitAll()
             mutex.unlock()
@@ -99,9 +102,10 @@ public class ChartEntryModelProducer(
         updateExtras(extraStore)
         cachedInternalModel = null
         val completableDeferred = CompletableDeferred<Unit>()
-        val deferredUpdates = updateReceivers.values.map { updateReceiver ->
-            coroutineScope.async { updateReceiver.handleUpdate() }
-        }
+        val deferredUpdates =
+            updateReceivers.values.map { updateReceiver ->
+                coroutineScope.async { updateReceiver.handleUpdate() }
+            }
         coroutineScope.launch {
             deferredUpdates.awaitAll()
             mutex.unlock()
@@ -116,8 +120,10 @@ public class ChartEntryModelProducer(
      * behavior, use [setEntriesSuspending]. [updateExtras] allows for adding auxiliary data, which can later be
      * retrieved via [ChartEntryModel.extraStore].
      */
-    public fun setEntries(vararg entries: List<ChartEntry>, updateExtras: (MutableExtraStore) -> Unit = {}): Boolean =
-        setEntries(entries.toList(), updateExtras)
+    public fun setEntries(
+        vararg entries: List<ChartEntry>,
+        updateExtras: (MutableExtraStore) -> Unit = {},
+    ): Boolean = setEntries(entries.toList(), updateExtras)
 
     /**
      * Updates the data set. Unlike [setEntries], this function suspends the current coroutine and waits until an update
@@ -157,7 +163,10 @@ public class ChartEntryModelProducer(
 
     override fun getModel(): ChartEntryModel? = getInternalModel()
 
-    override suspend fun transformModel(key: Any, fraction: Float) {
+    override suspend fun transformModel(
+        key: Any,
+        fraction: Float,
+    ) {
         with(updateReceivers[key] ?: return) {
             modelTransformer?.transform(extraStore, fraction)
             val internalModel = getInternalModel(extraStore.copy())
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/entry/ChartModelProducer.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/entry/ChartModelProducer.kt
index 8f35b4e5b..fef077573 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/entry/ChartModelProducer.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/entry/ChartModelProducer.kt
@@ -29,7 +29,6 @@ import com.patrykandpatrick.vico.core.entry.diff.MutableExtraStore
  * @see ComposedChartEntryModelProducer
  */
 public interface ChartModelProducer<Model : ChartEntryModel> {
-
     /**
      * Returns the [ChartEntryModel] or, if no [ChartEntryModel] is available, `null`.
      */
@@ -44,7 +43,10 @@ public interface ChartModelProducer<Model : ChartEntryModel> {
      * Creates an intermediate [ChartEntryModel] for difference animations. [fraction] is the balance between the
      * initial and target [ChartEntryModel]s.
      */
-    public suspend fun transformModel(key: Any, fraction: Float)
+    public suspend fun transformModel(
+        key: Any,
+        fraction: Float,
+    )
 
     /**
      * Registers an update listener associated with a [key]. [cancelAnimation] and [startAnimation] are
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/entry/FloatEntry.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/entry/FloatEntry.kt
index 469fbb097..2fc45a206 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/entry/FloatEntry.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/entry/FloatEntry.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 by Patryk Goworowski and Patrick Michalik.
+ * Copyright 2023 by Patryk Goworowski and Patrick Michalik.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,9 +23,9 @@ public data class FloatEntry(
     override val x: Float,
     override val y: Float,
 ) : ChartEntry {
-
-    override fun withY(y: Float): ChartEntry = FloatEntry(
-        x = x,
-        y = y,
-    )
+    override fun withY(y: Float): ChartEntry =
+        FloatEntry(
+            x = x,
+            y = y,
+        )
 }
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/entry/composed/ComposedChartEntryModelProducer.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/entry/composed/ComposedChartEntryModelProducer.kt
index 885692e65..acaa5d8f4 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/entry/composed/ComposedChartEntryModelProducer.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/entry/composed/ComposedChartEntryModelProducer.kt
@@ -52,292 +52,305 @@ import kotlinx.coroutines.sync.Mutex
  */
 public class ComposedChartEntryModelProducer private constructor(dispatcher: CoroutineDispatcher) :
     ChartModelProducer<ComposedChartEntryModel<ChartEntryModel>> {
+        private var dataSets = emptyList<List<List<ChartEntry>>>()
+        private var cachedInternalComposedModel: InternalComposedModel? = null
+        private val mutex = Mutex()
+        private val coroutineScope = CoroutineScope(dispatcher)
+        private val updateReceivers = mutableMapOf<Any, UpdateReceiver>()
+        private val extraStore = MutableExtraStore()
 
-    private var dataSets = emptyList<List<List<ChartEntry>>>()
-    private var cachedInternalComposedModel: InternalComposedModel? = null
-    private val mutex = Mutex()
-    private val coroutineScope = CoroutineScope(dispatcher)
-    private val updateReceivers = mutableMapOf<Any, UpdateReceiver>()
-    private val extraStore = MutableExtraStore()
-
-    private fun setDataSets(dataSets: List<List<List<ChartEntry>>>): Boolean {
-        if (!mutex.tryLock()) return false
-        this.dataSets = dataSets.copy()
-        cachedInternalComposedModel = null
-        val deferredUpdates = updateReceivers.values.map { updateReceiver ->
-            coroutineScope.async { updateReceiver.handleUpdate() }
-        }
-        coroutineScope.launch {
-            deferredUpdates.awaitAll()
-            mutex.unlock()
+        private fun setDataSets(dataSets: List<List<List<ChartEntry>>>): Boolean {
+            if (!mutex.tryLock()) return false
+            this.dataSets = dataSets.copy()
+            cachedInternalComposedModel = null
+            val deferredUpdates =
+                updateReceivers.values.map { updateReceiver ->
+                    coroutineScope.async { updateReceiver.handleUpdate() }
+                }
+            coroutineScope.launch {
+                deferredUpdates.awaitAll()
+                mutex.unlock()
+            }
+            return true
         }
-        return true
-    }
 
-    private suspend fun setDataSetsSuspending(dataSets: List<List<List<ChartEntry>>>): Deferred<Unit> {
-        mutex.lock()
-        this.dataSets = dataSets.copy()
-        cachedInternalComposedModel = null
-        val completableDeferred = CompletableDeferred<Unit>()
-        val deferredUpdates = updateReceivers.values.map { updateReceiver ->
-            coroutineScope.async { updateReceiver.handleUpdate() }
-        }
-        coroutineScope.launch {
-            deferredUpdates.awaitAll()
-            mutex.unlock()
-            completableDeferred.complete(Unit)
+        private suspend fun setDataSetsSuspending(dataSets: List<List<List<ChartEntry>>>): Deferred<Unit> {
+            mutex.lock()
+            this.dataSets = dataSets.copy()
+            cachedInternalComposedModel = null
+            val completableDeferred = CompletableDeferred<Unit>()
+            val deferredUpdates =
+                updateReceivers.values.map { updateReceiver ->
+                    coroutineScope.async { updateReceiver.handleUpdate() }
+                }
+            coroutineScope.launch {
+                deferredUpdates.awaitAll()
+                mutex.unlock()
+                completableDeferred.complete(Unit)
+            }
+            return completableDeferred
         }
-        return completableDeferred
-    }
 
-    private fun getInternalModel(extraStore: ExtraStore? = null) =
-        if (dataSets.isEmpty()) {
-            null
-        } else {
-            val mergedExtraStore = this.extraStore.let { if (extraStore != null) it + extraStore else it }
-            cachedInternalComposedModel
-                ?.let { composedModel ->
-                    composedModel.copy(
-                        composedEntryCollections = composedModel.composedEntryCollections
-                            .map { model -> model.copy(extraStore = mergedExtraStore) },
-                        extraStore = mergedExtraStore,
-                    )
-                }
-                ?: run {
-                    val models = dataSets.map { dataSet ->
-                        val xRange = dataSet.xRange
-                        val yRange = dataSet.yRange
-                        val aggregateYRange = dataSet.calculateStackedYRange()
-                        InternalModel(
-                            entries = dataSet,
-                            minX = xRange.start,
-                            maxX = xRange.endInclusive,
-                            minY = yRange.start,
-                            maxY = yRange.endInclusive,
-                            stackedPositiveY = aggregateYRange.endInclusive,
-                            stackedNegativeY = aggregateYRange.start,
-                            xGcd = dataSet.calculateXGcd(),
+        private fun getInternalModel(extraStore: ExtraStore? = null) =
+            if (dataSets.isEmpty()) {
+                null
+            } else {
+                val mergedExtraStore = this.extraStore.let { if (extraStore != null) it + extraStore else it }
+                cachedInternalComposedModel
+                    ?.let { composedModel ->
+                        composedModel.copy(
+                            composedEntryCollections =
+                                composedModel.composedEntryCollections
+                                    .map { model -> model.copy(extraStore = mergedExtraStore) },
                             extraStore = mergedExtraStore,
                         )
                     }
-                    InternalComposedModel(
-                        composedEntryCollections = models,
-                        entries = models.map { it.entries }.flatten(),
-                        minX = models.minOf { it.minX },
-                        maxX = models.maxOf { it.maxX },
-                        minY = models.minOf { it.minY },
-                        maxY = models.maxOf { it.maxY },
-                        stackedPositiveY = models.maxOf { it.stackedPositiveY },
-                        stackedNegativeY = models.minOf { it.stackedNegativeY },
-                        xGcd = models.fold<ChartEntryModel, Float?>(null) { gcd, model ->
-                            gcd?.gcdWith(model.xGcd) ?: model.xGcd
-                        } ?: 1f,
-                        id = models.map { it.id }.hashCode(),
-                        extraStore = mergedExtraStore,
-                    ).also { cachedInternalComposedModel = it }
-                }
-        }
+                    ?: run {
+                        val models =
+                            dataSets.map { dataSet ->
+                                val xRange = dataSet.xRange
+                                val yRange = dataSet.yRange
+                                val aggregateYRange = dataSet.calculateStackedYRange()
+                                InternalModel(
+                                    entries = dataSet,
+                                    minX = xRange.start,
+                                    maxX = xRange.endInclusive,
+                                    minY = yRange.start,
+                                    maxY = yRange.endInclusive,
+                                    stackedPositiveY = aggregateYRange.endInclusive,
+                                    stackedNegativeY = aggregateYRange.start,
+                                    xGcd = dataSet.calculateXGcd(),
+                                    extraStore = mergedExtraStore,
+                                )
+                            }
+                        InternalComposedModel(
+                            composedEntryCollections = models,
+                            entries = models.map { it.entries }.flatten(),
+                            minX = models.minOf { it.minX },
+                            maxX = models.maxOf { it.maxX },
+                            minY = models.minOf { it.minY },
+                            maxY = models.maxOf { it.maxY },
+                            stackedPositiveY = models.maxOf { it.stackedPositiveY },
+                            stackedNegativeY = models.minOf { it.stackedNegativeY },
+                            xGcd =
+                                models.fold<ChartEntryModel, Float?>(null) { gcd, model ->
+                                    gcd?.gcdWith(model.xGcd) ?: model.xGcd
+                                } ?: 1f,
+                            id = models.map { it.id }.hashCode(),
+                            extraStore = mergedExtraStore,
+                        ).also { cachedInternalComposedModel = it }
+                    }
+            }
 
-    override fun getModel(): ComposedChartEntryModel<ChartEntryModel>? = getInternalModel()
+        override fun getModel(): ComposedChartEntryModel<ChartEntryModel>? = getInternalModel()
 
-    override suspend fun transformModel(key: Any, fraction: Float) {
-        with(updateReceivers[key] ?: return) {
-            modelTransformer?.transform(extraStore, fraction)
-            val internalModel = getInternalModel(extraStore.copy())
-            currentCoroutineContext().ensureActive()
-            onModelCreated(internalModel)
+        override suspend fun transformModel(
+            key: Any,
+            fraction: Float,
+        ) {
+            with(updateReceivers[key] ?: return) {
+                modelTransformer?.transform(extraStore, fraction)
+                val internalModel = getInternalModel(extraStore.copy())
+                currentCoroutineContext().ensureActive()
+                onModelCreated(internalModel)
+            }
         }
-    }
 
-    @WorkerThread
-    override fun registerForUpdates(
-        key: Any,
-        cancelAnimation: () -> Unit,
-        startAnimation: (transformModel: suspend (chartKey: Any, fraction: Float) -> Unit) -> Unit,
-        getOldModel: () -> ComposedChartEntryModel<ChartEntryModel>?,
-        modelTransformerProvider: Chart.ModelTransformerProvider?,
-        extraStore: MutableExtraStore,
-        updateChartValues: (ComposedChartEntryModel<ChartEntryModel>?) -> ChartValuesProvider,
-        onModelCreated: (ComposedChartEntryModel<ChartEntryModel>?) -> Unit,
-    ) {
-        UpdateReceiver(
-            cancelAnimation,
-            startAnimation,
-            onModelCreated,
-            extraStore,
-            modelTransformerProvider?.getModelTransformer(),
-            getOldModel,
-            updateChartValues,
-        ).run {
-            updateReceivers[key] = this
-            handleUpdate()
+        @WorkerThread
+        override fun registerForUpdates(
+            key: Any,
+            cancelAnimation: () -> Unit,
+            startAnimation: (transformModel: suspend (chartKey: Any, fraction: Float) -> Unit) -> Unit,
+            getOldModel: () -> ComposedChartEntryModel<ChartEntryModel>?,
+            modelTransformerProvider: Chart.ModelTransformerProvider?,
+            extraStore: MutableExtraStore,
+            updateChartValues: (ComposedChartEntryModel<ChartEntryModel>?) -> ChartValuesProvider,
+            onModelCreated: (ComposedChartEntryModel<ChartEntryModel>?) -> Unit,
+        ) {
+            UpdateReceiver(
+                cancelAnimation,
+                startAnimation,
+                onModelCreated,
+                extraStore,
+                modelTransformerProvider?.getModelTransformer(),
+                getOldModel,
+                updateChartValues,
+            ).run {
+                updateReceivers[key] = this
+                handleUpdate()
+            }
         }
-    }
 
-    override fun isRegistered(key: Any): Boolean = updateReceivers.containsKey(key)
+        override fun isRegistered(key: Any): Boolean = updateReceivers.containsKey(key)
 
-    override fun unregisterFromUpdates(key: Any) {
-        updateReceivers.remove(key)
-    }
-
-    /**
-     * Creates a [Transaction] instance.
-     */
-    public fun createTransaction(): Transaction = Transaction()
-
-    /**
-     * Creates a [Transaction], runs [block], and calls [Transaction.commit], returning its output. For suspending
-     * behavior, use [runTransactionSuspending].
-     */
-    public fun runTransaction(block: Transaction.() -> Unit): Boolean = createTransaction().also(block).commit()
-
-    /**
-     * Creates a [Transaction], runs [block], and calls [Transaction.commitSuspending], returning its output.
-     */
-    public suspend fun runTransactionSuspending(block: Transaction.() -> Unit): Deferred<Unit> =
-        createTransaction().also(block).commitSuspending()
-
-    /**
-     * Handles data updates. An initially empty list of data sets is created and can be updated via the class’s
-     * functions. Each data set corresponds to a single nested [Chart].
-     */
-    public inner class Transaction internal constructor() {
-        private val newDataSets = mutableListOf<List<List<ChartEntry>>>()
-
-        /**
-         * Populates the new list of data sets with the current data sets.
-         */
-        public fun populate() {
-            newDataSets.setAll(dataSets)
+        override fun unregisterFromUpdates(key: Any) {
+            updateReceivers.remove(key)
         }
 
         /**
-         * Replaces the data set at the specified index ([Pair.first]) with the provided data set ([Pair.second]).
+         * Creates a [Transaction] instance.
          */
-        public fun set(pair: Pair<Int, List<List<ChartEntry>>>) {
-            set(pair.first, pair.second)
-        }
+        public fun createTransaction(): Transaction = Transaction()
 
         /**
-         * Removes the data set at the specified index.
+         * Creates a [Transaction], runs [block], and calls [Transaction.commit], returning its output. For suspending
+         * behavior, use [runTransactionSuspending].
          */
-        public fun removeAt(index: Int) {
-            newDataSets.removeAt(index)
-        }
+        public fun runTransaction(block: Transaction.() -> Unit): Boolean = createTransaction().also(block).commit()
 
         /**
-         * Replaces the data set at the specified index with the provided data set.
+         * Creates a [Transaction], runs [block], and calls [Transaction.commitSuspending], returning its output.
          */
-        public fun set(index: Int, dataSet: List<List<ChartEntry>>) {
-            newDataSets[index] = dataSet
-        }
+        public suspend fun runTransactionSuspending(block: Transaction.() -> Unit): Deferred<Unit> =
+            createTransaction().also(block).commitSuspending()
 
         /**
-         * Adds a data set.
+         * Handles data updates. An initially empty list of data sets is created and can be updated via the class’s
+         * functions. Each data set corresponds to a single nested [Chart].
          */
-        public fun add(dataSet: List<List<ChartEntry>>) {
-            newDataSets.add(dataSet)
-        }
+        public inner class Transaction internal constructor() {
+            private val newDataSets = mutableListOf<List<List<ChartEntry>>>()
 
-        /**
-         * Adds a data set.
-         */
-        public fun add(index: Int, dataSet: List<List<ChartEntry>>) {
-            newDataSets.add(index, dataSet)
-        }
+            /**
+             * Populates the new list of data sets with the current data sets.
+             */
+            public fun populate() {
+                newDataSets.setAll(dataSets)
+            }
 
-        /**
-         * Adds a data set comprising the provided series.
-         */
-        public fun add(vararg series: List<ChartEntry>) {
-            add(series.toList())
-        }
+            /**
+             * Replaces the data set at the specified index ([Pair.first]) with the provided data set ([Pair.second]).
+             */
+            public fun set(pair: Pair<Int, List<List<ChartEntry>>>) {
+                set(pair.first, pair.second)
+            }
 
-        /**
-         * Clears the new list of data sets.
-         */
-        public fun clear() {
-            newDataSets.clear()
-        }
+            /**
+             * Removes the data set at the specified index.
+             */
+            public fun removeAt(index: Int) {
+                newDataSets.removeAt(index)
+            }
 
-        /**
-         * Allows for adding auxiliary values, which can later be retrieved via [ChartEntryModel.extraStore].
-         */
-        public fun updateExtras(block: (MutableExtraStore) -> Unit) {
-            block(extraStore)
-        }
+            /**
+             * Replaces the data set at the specified index with the provided data set.
+             */
+            public fun set(
+                index: Int,
+                dataSet: List<List<ChartEntry>>,
+            ) {
+                newDataSets[index] = dataSet
+            }
 
-        /**
-         * Requests a data update. If the update is accepted, `true` is returned. If the update is rejected, which
-         * occurs when there’s already an update in progress, `false` is returned. For suspending behavior, use
-         * [commitSuspending].
-         */
-        public fun commit(): Boolean = setDataSets(newDataSets)
+            /**
+             * Adds a data set.
+             */
+            public fun add(dataSet: List<List<ChartEntry>>) {
+                newDataSets.add(dataSet)
+            }
 
-        /**
-         * Runs a data update. Unlike [commit], this function suspends the current coroutine and waits until an update
-         * can be run, meaning the update cannot be rejected. The returned [Deferred] implementation is marked as
-         * completed once the update has been processed.
-         */
-        public suspend fun commitSuspending(): Deferred<Unit> = setDataSetsSuspending(newDataSets)
-    }
+            /**
+             * Adds a data set.
+             */
+            public fun add(
+                index: Int,
+                dataSet: List<List<ChartEntry>>,
+            ) {
+                newDataSets.add(index, dataSet)
+            }
+
+            /**
+             * Adds a data set comprising the provided series.
+             */
+            public fun add(vararg series: List<ChartEntry>) {
+                add(series.toList())
+            }
+
+            /**
+             * Clears the new list of data sets.
+             */
+            public fun clear() {
+                newDataSets.clear()
+            }
+
+            /**
+             * Allows for adding auxiliary values, which can later be retrieved via [ChartEntryModel.extraStore].
+             */
+            public fun updateExtras(block: (MutableExtraStore) -> Unit) {
+                block(extraStore)
+            }
+
+            /**
+             * Requests a data update. If the update is accepted, `true` is returned. If the update is rejected, which
+             * occurs when there’s already an update in progress, `false` is returned. For suspending behavior, use
+             * [commitSuspending].
+             */
+            public fun commit(): Boolean = setDataSets(newDataSets)
 
-    private inner class UpdateReceiver(
-        val cancelAnimation: () -> Unit,
-        val startAnimation: (transformModel: suspend (chartKey: Any, fraction: Float) -> Unit) -> Unit,
-        val onModelCreated: (ComposedChartEntryModel<ChartEntryModel>?) -> Unit,
-        val extraStore: MutableExtraStore,
-        val modelTransformer: Chart.ModelTransformer<ComposedChartEntryModel<ChartEntryModel>>?,
-        val getOldModel: () -> ComposedChartEntryModel<ChartEntryModel>?,
-        val updateChartValues: (ComposedChartEntryModel<ChartEntryModel>?) -> ChartValuesProvider,
-    ) {
-        fun handleUpdate() {
-            cancelAnimation()
-            modelTransformer?.prepareForTransformation(
-                oldModel = getOldModel(),
-                newModel = getModel(),
-                extraStore = extraStore,
-                chartValuesProvider = updateChartValues(getModel()),
-            )
-            startAnimation(::transformModel)
+            /**
+             * Runs a data update. Unlike [commit], this function suspends the current coroutine and waits until an update
+             * can be run, meaning the update cannot be rejected. The returned [Deferred] implementation is marked as
+             * completed once the update has been processed.
+             */
+            public suspend fun commitSuspending(): Deferred<Unit> = setDataSetsSuspending(newDataSets)
         }
-    }
 
-    private data class InternalModel(
-        override val entries: List<List<ChartEntry>>,
-        override val minX: Float,
-        override val maxX: Float,
-        override val minY: Float,
-        override val maxY: Float,
-        override val stackedPositiveY: Float,
-        override val stackedNegativeY: Float,
-        override val xGcd: Float,
-        override val extraStore: ExtraStore,
-    ) : ChartEntryModel
+        private inner class UpdateReceiver(
+            val cancelAnimation: () -> Unit,
+            val startAnimation: (transformModel: suspend (chartKey: Any, fraction: Float) -> Unit) -> Unit,
+            val onModelCreated: (ComposedChartEntryModel<ChartEntryModel>?) -> Unit,
+            val extraStore: MutableExtraStore,
+            val modelTransformer: Chart.ModelTransformer<ComposedChartEntryModel<ChartEntryModel>>?,
+            val getOldModel: () -> ComposedChartEntryModel<ChartEntryModel>?,
+            val updateChartValues: (ComposedChartEntryModel<ChartEntryModel>?) -> ChartValuesProvider,
+        ) {
+            fun handleUpdate() {
+                cancelAnimation()
+                modelTransformer?.prepareForTransformation(
+                    oldModel = getOldModel(),
+                    newModel = getModel(),
+                    extraStore = extraStore,
+                    chartValuesProvider = updateChartValues(getModel()),
+                )
+                startAnimation(::transformModel)
+            }
+        }
 
-    private data class InternalComposedModel(
-        override val composedEntryCollections: List<InternalModel>,
-        override val entries: List<List<ChartEntry>>,
-        override val minX: Float,
-        override val maxX: Float,
-        override val minY: Float,
-        override val maxY: Float,
-        override val stackedPositiveY: Float,
-        override val stackedNegativeY: Float,
-        override val xGcd: Float,
-        override val id: Int,
-        override val extraStore: ExtraStore,
-    ) : ComposedChartEntryModel<ChartEntryModel>
+        private data class InternalModel(
+            override val entries: List<List<ChartEntry>>,
+            override val minX: Float,
+            override val maxX: Float,
+            override val minY: Float,
+            override val maxY: Float,
+            override val stackedPositiveY: Float,
+            override val stackedNegativeY: Float,
+            override val xGcd: Float,
+            override val extraStore: ExtraStore,
+        ) : ChartEntryModel
 
-    public companion object {
-        /**
-         * Creates a [ComposedChartEntryModelProducer], running an initial [Transaction]. [dispatcher] is the
-         * [CoroutineDispatcher] to be used for update handling.
-         */
-        public fun build(
-            dispatcher: CoroutineDispatcher = Dispatchers.Default,
-            transaction: Transaction.() -> Unit = {},
-        ): ComposedChartEntryModelProducer =
-            ComposedChartEntryModelProducer(dispatcher).also { it.runTransaction(transaction) }
+        private data class InternalComposedModel(
+            override val composedEntryCollections: List<InternalModel>,
+            override val entries: List<List<ChartEntry>>,
+            override val minX: Float,
+            override val maxX: Float,
+            override val minY: Float,
+            override val maxY: Float,
+            override val stackedPositiveY: Float,
+            override val stackedNegativeY: Float,
+            override val xGcd: Float,
+            override val id: Int,
+            override val extraStore: ExtraStore,
+        ) : ComposedChartEntryModel<ChartEntryModel>
+
+        public companion object {
+            /**
+             * Creates a [ComposedChartEntryModelProducer], running an initial [Transaction]. [dispatcher] is the
+             * [CoroutineDispatcher] to be used for update handling.
+             */
+            public fun build(
+                dispatcher: CoroutineDispatcher = Dispatchers.Default,
+                transaction: Transaction.() -> Unit = {},
+            ): ComposedChartEntryModelProducer =
+                ComposedChartEntryModelProducer(dispatcher).also { it.runTransaction(transaction) }
+        }
     }
-}
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/entry/diff/DefaultDrawingModelInterpolator.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/entry/diff/DefaultDrawingModelInterpolator.kt
index e0518b847..fea534420 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/entry/diff/DefaultDrawingModelInterpolator.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/entry/diff/DefaultDrawingModelInterpolator.kt
@@ -27,12 +27,14 @@ import kotlin.math.max
 @Suppress("UNCHECKED_CAST")
 public class DefaultDrawingModelInterpolator<T : DrawingModel.DrawingInfo, R : DrawingModel<T>> :
     DrawingModelInterpolator<T, R> {
-
     private var transformationMaps = emptyList<Map<Float, TransformationModel<T>>>()
     private var oldDrawingModel: R? = null
     private var newDrawingModel: R? = null
 
-    override fun setModels(old: R?, new: R?) {
+    override fun setModels(
+        old: R?,
+        new: R?,
+    ) {
         synchronized(this) {
             oldDrawingModel = old
             newDrawingModel = new
@@ -40,33 +42,36 @@ public class DefaultDrawingModelInterpolator<T : DrawingModel.DrawingInfo, R : D
         }
     }
 
-    override suspend fun transform(fraction: Float): R? = newDrawingModel?.transform(
-        drawingInfo = transformationMaps.mapNotNull { map ->
-            map
-                .mapNotNull { (x, model) ->
-                    currentCoroutineContext().ensureActive()
-                    model.transform(fraction)?.let { drawingInfo -> x to drawingInfo }
-                }
-                .takeIf { list -> list.isNotEmpty() }
-                ?.toMap()
-        },
-        from = oldDrawingModel,
-        fraction = fraction,
-    ) as R?
+    override suspend fun transform(fraction: Float): R? =
+        newDrawingModel?.transform(
+            drawingInfo =
+                transformationMaps.mapNotNull { map ->
+                    map
+                        .mapNotNull { (x, model) ->
+                            currentCoroutineContext().ensureActive()
+                            model.transform(fraction)?.let { drawingInfo -> x to drawingInfo }
+                        }
+                        .takeIf { list -> list.isNotEmpty() }
+                        ?.toMap()
+                },
+            from = oldDrawingModel,
+            fraction = fraction,
+        ) as R?
 
     private fun updateTransformationMap() {
-        transformationMaps = buildList {
-            repeat(max(oldDrawingModel?.size.orZero, newDrawingModel?.size.orZero)) { index ->
-                val map = mutableMapOf<Float, TransformationModel<T>>()
-                oldDrawingModel
-                    ?.getOrNull(index)
-                    ?.forEach { (x, drawingInfo) -> map[x] = TransformationModel(drawingInfo) }
-                newDrawingModel
-                    ?.getOrNull(index)
-                    ?.forEach { (x, drawingInfo) -> map[x] = TransformationModel(map[x]?.old, drawingInfo) }
-                add(map)
+        transformationMaps =
+            buildList {
+                repeat(max(oldDrawingModel?.size.orZero, newDrawingModel?.size.orZero)) { index ->
+                    val map = mutableMapOf<Float, TransformationModel<T>>()
+                    oldDrawingModel
+                        ?.getOrNull(index)
+                        ?.forEach { (x, drawingInfo) -> map[x] = TransformationModel(drawingInfo) }
+                    newDrawingModel
+                        ?.getOrNull(index)
+                        ?.forEach { (x, drawingInfo) -> map[x] = TransformationModel(map[x]?.old, drawingInfo) }
+                    add(map)
+                }
             }
-        }
     }
 
     private class TransformationModel<T : DrawingModel.DrawingInfo>(val old: T?, val new: T? = null) {
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/entry/diff/DrawingModel.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/entry/diff/DrawingModel.kt
index b02ffbfaf..a6b613409 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/entry/diff/DrawingModel.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/entry/diff/DrawingModel.kt
@@ -23,7 +23,6 @@ import com.patrykandpatrick.vico.core.chart.Chart
  */
 public abstract class DrawingModel<T : DrawingModel.DrawingInfo>(private val drawingInfo: List<Map<Float, T>>) :
     List<Map<Float, T>> by drawingInfo {
-
     /**
      * Returns an intermediate [DrawingModel] between this one and [from]. The returned drawing model includes the
      * provided [DrawingInfo] list. [fraction] is the balance between [from] and this [DrawingModel], with 0
@@ -46,6 +45,9 @@ public abstract class DrawingModel<T : DrawingModel.DrawingInfo>(private val dra
          * this [DrawingInfo] implementation. The returned object should be an instance of the [DrawingInfo]
          * implementation to which this function belongs.
          */
-        public fun transform(from: DrawingInfo?, fraction: Float): DrawingInfo
+        public fun transform(
+            from: DrawingInfo?,
+            fraction: Float,
+        ): DrawingInfo
     }
 }
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/entry/diff/DrawingModelInterpolator.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/entry/diff/DrawingModelInterpolator.kt
index 28668325b..0644ade2d 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/entry/diff/DrawingModelInterpolator.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/entry/diff/DrawingModelInterpolator.kt
@@ -23,7 +23,10 @@ public interface DrawingModelInterpolator<T : DrawingModel.DrawingInfo, R : Draw
     /**
      * Sets the initial and target [DrawingModel]s.
      */
-    public fun setModels(old: R?, new: R?)
+    public fun setModels(
+        old: R?,
+        new: R?,
+    )
 
     /**
      * Interpolates the two [DrawingModel]s. [fraction] is the balance between the initial and target [DrawingModel]s,
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/entry/diff/ExtraStore.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/entry/diff/ExtraStore.kt
index 8a0e0f100..6a30739b0 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/entry/diff/ExtraStore.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/entry/diff/ExtraStore.kt
@@ -79,7 +79,10 @@ public class MutableExtraStore internal constructor(mapDelegate: Map<Key<*>, Any
     /**
      * Saves the provided value to this [MutableExtraStore], associating the value with the given key.
      */
-    public operator fun <T : Any> set(key: Key<T>, value: T) {
+    public operator fun <T : Any> set(
+        key: Key<T>,
+        value: T,
+    ) {
         mapDelegate[key] = value
     }
 
@@ -96,10 +99,11 @@ public class MutableExtraStore internal constructor(mapDelegate: Map<Key<*>, Any
         destination.putAll(mapDelegate)
     }
 
-    override operator fun plus(other: ExtraStore): ExtraStore = MutableExtraStore(
-        buildMap {
-            putAll(mapDelegate)
-            other.copyContentTo(this)
-        },
-    )
+    override operator fun plus(other: ExtraStore): ExtraStore =
+        MutableExtraStore(
+            buildMap {
+                putAll(mapDelegate)
+                other.copyContentTo(this)
+            },
+        )
 }
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/extension/CollectionExtensions.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/extension/CollectionExtensions.kt
index 8cc4fdcba..dfd99418c 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/extension/CollectionExtensions.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/extension/CollectionExtensions.kt
@@ -65,8 +65,7 @@ private fun <T> ArrayList<ArrayList<T>>.ensureSize(size: Int) {
 /**
  * Creates a copy of this [ArrayList] and each child [ArrayList] contained in this [ArrayList].
  */
-public fun <T> ArrayList<ArrayList<T>>.copy(): List<List<T>> =
-    List(size) { index -> ArrayList(get(index)) }
+public fun <T> ArrayList<ArrayList<T>>.copy(): List<List<T>> = List(size) { index -> ArrayList(get(index)) }
 
 /**
  * Replaces all of the elements of this [MutableMap] with the elements of the provided map.
@@ -116,11 +115,12 @@ internal fun Collection<Float>.findClosestPositiveValue(value: Float): Float? {
     if (isEmpty()) return null
     var closestValue: Float? = null
     forEach { checkedValue ->
-        closestValue = when {
-            closestValue == null -> checkedValue
-            abs(closestValue!! - value) > abs(checkedValue - value) -> checkedValue
-            else -> closestValue
-        }
+        closestValue =
+            when {
+                closestValue == null -> checkedValue
+                abs(closestValue!! - value) > abs(checkedValue - value) -> checkedValue
+                else -> closestValue
+            }
     }
     return closestValue
 }
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/extension/ColorExtensions.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/extension/ColorExtensions.kt
index 5f2f1e1bb..49c0c4306 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/extension/ColorExtensions.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/extension/ColorExtensions.kt
@@ -31,10 +31,11 @@ public fun Int.copyColor(
     red: Int = this.extractColorChannel(RED_BIT_SHIFT),
     green: Int = this.extractColorChannel(GREEN_BIT_SHIFT),
     blue: Int = this.extractColorChannel(BLUE_BIT_SHIFT),
-): Int = alpha shl ALPHA_BIT_SHIFT or
-    (red shl RED_BIT_SHIFT) or
-    (green shl GREEN_BIT_SHIFT) or
-    (blue shl BLUE_BIT_SHIFT)
+): Int =
+    alpha shl ALPHA_BIT_SHIFT or
+        (red shl RED_BIT_SHIFT) or
+        (green shl GREEN_BIT_SHIFT) or
+        (blue shl BLUE_BIT_SHIFT)
 
 /**
  * Copies this color, updating any or all of the color channels.
@@ -44,17 +45,18 @@ public fun Int.copyColor(
     red: Float = this.extractColorChannel(RED_BIT_SHIFT) / MAX_HEX_VALUE,
     green: Float = this.extractColorChannel(GREEN_BIT_SHIFT) / MAX_HEX_VALUE,
     blue: Float = this.extractColorChannel(BLUE_BIT_SHIFT) / MAX_HEX_VALUE,
-): Int = copyColor(
-    alpha = (alpha * MAX_HEX_VALUE).toInt(),
-    red = (red * MAX_HEX_VALUE).toInt(),
-    green = (green * MAX_HEX_VALUE).toInt(),
-    blue = (blue * MAX_HEX_VALUE).toInt(),
-)
+): Int =
+    copyColor(
+        alpha = (alpha * MAX_HEX_VALUE).toInt(),
+        red = (red * MAX_HEX_VALUE).toInt(),
+        green = (green * MAX_HEX_VALUE).toInt(),
+        blue = (blue * MAX_HEX_VALUE).toInt(),
+    )
 
 /**
  * The hex code for this color.
  */
-@Suppress("MagicNumber", "ImplicitDefaultLocale")
+@Suppress("ImplicitDefaultLocale")
 public val Int.colorHex: String
     get() = String.format("#%08X", 0xFFFFFFFF and this.toLong())
 
@@ -64,5 +66,4 @@ public val Int.colorHex: String
 public val Int.alpha: Int
     get() = extractColorChannel(ALPHA_BIT_SHIFT)
 
-private fun Int.extractColorChannel(bitShift: Int): Int =
-    this shr bitShift and COLOR_MASK
+private fun Int.extractColorChannel(bitShift: Int): Int = this shr bitShift and COLOR_MASK
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/extension/ColorOverlayExtensions.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/extension/ColorOverlayExtensions.kt
index ea3534f33..c72536dfb 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/extension/ColorOverlayExtensions.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/extension/ColorOverlayExtensions.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 by Patryk Goworowski and Patrick Michalik.
+ * Copyright 2023 by Patryk Goworowski and Patrick Michalik.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,23 +19,23 @@ package com.patrykandpatrick.vico.core.extension
 import android.graphics.Color
 import com.patrykandpatrick.vico.core.context.DrawContext
 
-@Suppress("MagicNumber")
 private fun getElevationOverlayColorWithCorrectAlpha(
     elevationOverlayColor: Long,
     elevationDp: Float,
 ): Int {
-    val overlayPercentage = when {
-        elevationDp < 1f -> 0.00f
-        elevationDp < 2f -> 0.05f
-        elevationDp < 3f -> 0.07f
-        elevationDp < 4f -> 0.08f
-        elevationDp < 6f -> 0.09f
-        elevationDp < 8f -> 0.11f
-        elevationDp < 12f -> 0.12f
-        elevationDp < 16f -> 0.14f
-        elevationDp < 24f -> 0.15f
-        else -> 0.16f
-    }
+    val overlayPercentage =
+        when {
+            elevationDp < 1f -> 0.00f
+            elevationDp < 2f -> 0.05f
+            elevationDp < 3f -> 0.07f
+            elevationDp < 4f -> 0.08f
+            elevationDp < 6f -> 0.09f
+            elevationDp < 8f -> 0.11f
+            elevationDp < 12f -> 0.12f
+            elevationDp < 16f -> 0.14f
+            elevationDp < 24f -> 0.15f
+            else -> 0.16f
+        }
     return if (elevationOverlayColor.alpha == 0f) {
         Color.TRANSPARENT
     } else {
@@ -47,7 +47,10 @@ private fun getElevationOverlayColorWithCorrectAlpha(
  * Overlays the given [color] with [DrawContext.elevationOverlayColor], changing the opacity of
  * [DrawContext.elevationOverlayColor] depending on the value of [elevationDp].
  */
-public fun DrawContext.applyElevationOverlayToColor(color: Int, elevationDp: Float): Int =
+public fun DrawContext.applyElevationOverlayToColor(
+    color: Int,
+    elevationDp: Float,
+): Int =
     color.overlayColor(
         getElevationOverlayColorWithCorrectAlpha(
             elevationOverlayColor = elevationOverlayColor,
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/extension/ColorUtils.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/extension/ColorUtils.kt
index 445ebca42..050067761 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/extension/ColorUtils.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/extension/ColorUtils.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 by Patryk Goworowski and Patrick Michalik.
+ * Copyright 2023 by Patryk Goworowski and Patrick Michalik.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,7 +20,6 @@ import android.graphics.Color
 
 private const val BYTE_MAX_VALUE: Int = 0xFF
 
-@Suppress("MagicNumber")
 internal val Long.alpha: Float
     get() = if (this and 0x3fL == 0L) (this shr 56 and 0xff) / 255.0f else (this shr 6 and 0x3ff) / 1023.0f
 
@@ -34,8 +33,15 @@ internal fun Int.overlayColor(overlayingColor: Int): Int {
     return Color.argb(alpha, red, green, blue)
 }
 
-private fun compositeAlpha(foregroundAlpha: Int, backgroundAlpha: Int): Int =
-    BYTE_MAX_VALUE - (BYTE_MAX_VALUE - backgroundAlpha) * (BYTE_MAX_VALUE - foregroundAlpha) / BYTE_MAX_VALUE
+private fun compositeAlpha(
+    foregroundAlpha: Int,
+    backgroundAlpha: Int,
+): Int = BYTE_MAX_VALUE - (BYTE_MAX_VALUE - backgroundAlpha) * (BYTE_MAX_VALUE - foregroundAlpha) / BYTE_MAX_VALUE
 
-private fun compositeComponent(fgC: Int, fgA: Int, bgC: Int, bgA: Int, a: Int): Int =
-    if (a == 0) 0 else (BYTE_MAX_VALUE * fgC * fgA + bgC * bgA * (BYTE_MAX_VALUE - fgA)) / (a * BYTE_MAX_VALUE)
+private fun compositeComponent(
+    fgC: Int,
+    fgA: Int,
+    bgC: Int,
+    bgA: Int,
+    a: Int,
+): Int = if (a == 0) 0 else (BYTE_MAX_VALUE * fgC * fgA + bgC * bgA * (BYTE_MAX_VALUE - fgA)) / (a * BYTE_MAX_VALUE)
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/extension/CommonExtensions.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/extension/CommonExtensions.kt
index ca3c20c6f..881360f2e 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/extension/CommonExtensions.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/extension/CommonExtensions.kt
@@ -20,7 +20,11 @@ package com.patrykandpatrick.vico.core.extension
  * Calls the specified function block with [t1] and [t2] as its arguments if [t1] and [t2] are not null.
  * Returns the function block’s result if it was called, and `null` if it wasn’t.
  */
-public inline fun <T1, T2, R> ifNotNull(t1: T1?, t2: T2?, onNotNull: (T1, T2) -> R): R? =
+public inline fun <T1, T2, R> ifNotNull(
+    t1: T1?,
+    t2: T2?,
+    onNotNull: (T1, T2) -> R,
+): R? =
     if (t1 != null && t2 != null) {
         onNotNull(t1, t2)
     } else {
@@ -31,7 +35,12 @@ public inline fun <T1, T2, R> ifNotNull(t1: T1?, t2: T2?, onNotNull: (T1, T2) ->
  * Calls the specified function block with [t1], [t2], and [t3] as its arguments if [t1], [t2], and [t3] are not null.
  * Returns the function block’s result if it was called, and `null` if it wasn’t.
  */
-public inline fun <T1, T2, T3, R> ifNotNull(t1: T1?, t2: T2?, t3: T3?, onNotNull: (T1, T2, T3) -> R): R? =
+public inline fun <T1, T2, T3, R> ifNotNull(
+    t1: T1?,
+    t2: T2?,
+    t3: T3?,
+    onNotNull: (T1, T2, T3) -> R,
+): R? =
     if (t1 != null && t2 != null && t3 != null) {
         onNotNull(t1, t2, t3)
     } else {
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/extension/DrawableExtensions.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/extension/DrawableExtensions.kt
index 553719e5f..43391ba31 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/extension/DrawableExtensions.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/extension/DrawableExtensions.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 by Patryk Goworowski and Patrick Michalik.
+ * Copyright 2023 by Patryk Goworowski and Patrick Michalik.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,6 +21,11 @@ import android.graphics.drawable.Drawable
 /**
  * Sets a bounding box for this [Drawable].
  */
-public fun Drawable.setBounds(left: Float, top: Float, right: Float, bottom: Float) {
+public fun Drawable.setBounds(
+    left: Float,
+    top: Float,
+    right: Float,
+    bottom: Float,
+) {
     setBounds(left.toInt(), top.toInt(), right.toInt(), bottom.toInt())
 }
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/extension/MapExtensions.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/extension/MapExtensions.kt
index dee58c98f..bc8a449e2 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/extension/MapExtensions.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/extension/MapExtensions.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 by Patryk Goworowski and Patrick Michalik.
+ * Copyright 2023 by Patryk Goworowski and Patrick Michalik.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -38,12 +38,11 @@ public fun Map<Float, List<Marker.EntryModel>>.getClosestMarkerEntryModel(
  *
  * @see Marker.EntryModel
  */
-public fun Map<Float, List<Marker.EntryModel>>.getEntryModel(
-    xValue: Float,
-): List<Marker.EntryModel>? = values
-    .mapNotNull { entries -> entries.takeIf { it.firstOrNull()?.entry?.x == xValue } }
-    .flatten()
-    .takeIf { it.isNotEmpty() }
+public fun Map<Float, List<Marker.EntryModel>>.getEntryModel(xValue: Float): List<Marker.EntryModel>? =
+    values
+        .mapNotNull { entries -> entries.takeIf { it.firstOrNull()?.entry?.x == xValue } }
+        .flatten()
+        .takeIf { it.isNotEmpty() }
 
 /**
  * Updates the receiver [TreeMap] with the contents of another [Map].
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/extension/NumberExtensions.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/extension/NumberExtensions.kt
index 0869b477b..8e5e5de53 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/extension/NumberExtensions.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/extension/NumberExtensions.kt
@@ -34,16 +34,21 @@ private fun Float.round(decimals: Int): Float {
     return (this * multiplier).round / multiplier
 }
 
-private fun Float.gcdWithImpl(other: Float, threshold: Float): Float = when {
-    this < other -> other.gcdWithImpl(other = this, threshold = threshold)
-    abs(x = other) < threshold -> this
-    else -> other.gcdWithImpl(other = this - (this / other).floor * other, threshold = threshold)
-}
-
-internal fun Float.gcdWith(other: Float): Float = gcdWithImpl(
-    other = other,
-    threshold = 10f.pow(n = -FLOAT_GCD_DECIMALS - 1),
-).round(decimals = FLOAT_GCD_DECIMALS)
+private fun Float.gcdWithImpl(
+    other: Float,
+    threshold: Float,
+): Float =
+    when {
+        this < other -> other.gcdWithImpl(other = this, threshold = threshold)
+        abs(x = other) < threshold -> this
+        else -> other.gcdWithImpl(other = this - (this / other).floor * other, threshold = threshold)
+    }
+
+internal fun Float.gcdWith(other: Float): Float =
+    gcdWithImpl(
+        other = other,
+        threshold = 10f.pow(n = -FLOAT_GCD_DECIMALS - 1),
+    ).round(decimals = FLOAT_GCD_DECIMALS)
 
 internal fun Float.toPrettyString(): String = if (this < 0f) "−${-this}" else this.toString()
 
@@ -144,4 +149,7 @@ public fun firstNonNegativeOf(vararg floats: Float): Float? = floats.firstOrNull
 public fun Float.rangeWith(other: Float): ClosedFloatingPointRange<Float> =
     if (other > this) this..other else other..this
 
-internal fun Float.lerp(to: Float, fraction: Float): Float = this + (to - this) * fraction
+internal fun Float.lerp(
+    to: Float,
+    fraction: Float,
+): Float = this + (to - this) * fraction
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/extension/PaintExtensions.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/extension/PaintExtensions.kt
index 20a135b6d..86999ccb0 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/extension/PaintExtensions.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/extension/PaintExtensions.kt
@@ -20,7 +20,10 @@ import android.graphics.Paint
 
 private val fm: Paint.FontMetrics = Paint.FontMetrics()
 
-internal fun Paint.withOpacity(opacity: Float, action: (Paint) -> Unit) {
+internal fun Paint.withOpacity(
+    opacity: Float,
+    action: (Paint) -> Unit,
+) {
     val previousOpacity = this.alpha
     color = color.copyColor(opacity * previousOpacity / MAX_HEX_VALUE)
     action(this)
@@ -48,5 +51,4 @@ public val Paint.textHeight: Float
 /**
  * Returns the width of the provided text.
  */
-public fun Paint.measureText(text: CharSequence): Float =
-    measureText(text, 0, text.length)
+public fun Paint.measureText(text: CharSequence): Float = measureText(text, 0, text.length)
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/extension/RectExtensions.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/extension/RectExtensions.kt
index f35bb092a..1568525ed 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/extension/RectExtensions.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/extension/RectExtensions.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 by Patryk Goworowski and Patrick Michalik.
+ * Copyright 2023 by Patryk Goworowski and Patrick Michalik.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -127,12 +127,16 @@ public fun RectF.rotate(degrees: Float): RectF {
 /**
  * Moves this [RectF] horizontally and vertically by the specified distances.
  */
-public fun RectF.translate(x: Float, y: Float): RectF = apply {
-    left += x
-    top += y
-    right += x
-    bottom += y
-}
+public fun RectF.translate(
+    x: Float,
+    y: Float,
+): RectF =
+    apply {
+        left += x
+        top += y
+        right += x
+        bottom += y
+    }
 
 /**
  * Returns [RectF.left] if [isLtr] is true, and [RectF.right] otherwise.
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/extension/ReflectionExtensions.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/extension/ReflectionExtensions.kt
index 606831a39..337f6a640 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/extension/ReflectionExtensions.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/extension/ReflectionExtensions.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 by Patryk Goworowski and Patrick Michalik.
+ * Copyright 2023 by Patryk Goworowski and Patrick Michalik.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,7 +20,10 @@ package com.patrykandpatrick.vico.core.extension
  * Updates the value of the field with the specified name to the given value.
  * This involves temporarily setting the `accessible` flag to `true`.
  */
-public inline fun <reified T, V> T.setFieldValue(fieldName: String, value: V) {
+public inline fun <reified T, V> T.setFieldValue(
+    fieldName: String,
+    value: V,
+) {
     val field = T::class.java.getDeclaredField(fieldName)
     val wasAccessible = field.isAccessible
     field.isAccessible = true
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/formatter/DecimalFormatValueFormatter.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/formatter/DecimalFormatValueFormatter.kt
index 195e70714..6fd60783b 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/formatter/DecimalFormatValueFormatter.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/formatter/DecimalFormatValueFormatter.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 by Patryk Goworowski and Patrick Michalik.
+ * Copyright 2023 by Patryk Goworowski and Patrick Michalik.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,7 +24,6 @@ import java.text.DecimalFormat
  * A [ValueFormatter] implementation that formats values using a [DecimalFormat] with a given pattern.
  */
 public open class DecimalFormatValueFormatter(private val decimalFormat: DecimalFormat) : ValueFormatter {
-
     /**
      * Creates a [DecimalFormatValueFormatter] using the default pattern.
      */
@@ -44,7 +43,6 @@ public open class DecimalFormatValueFormatter(private val decimalFormat: Decimal
     ): String = decimalFormat.format(value)
 
     public companion object {
-
         /**
          * The default pattern for the [DecimalFormat].
          */
@@ -56,8 +54,9 @@ public open class DecimalFormatValueFormatter(private val decimalFormat: Decimal
         public fun getDecimalFormat(
             pattern: String,
             roundingMode: RoundingMode,
-        ): DecimalFormat = DecimalFormat(pattern).apply {
-            this.roundingMode = roundingMode
-        }
+        ): DecimalFormat =
+            DecimalFormat(pattern).apply {
+                this.roundingMode = roundingMode
+            }
     }
 }
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/formatter/PercentageFormatValueFormatter.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/formatter/PercentageFormatValueFormatter.kt
index 3f2340524..f591cde1c 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/formatter/PercentageFormatValueFormatter.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/formatter/PercentageFormatValueFormatter.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 by Patryk Goworowski and Patrick Michalik.
+ * Copyright 2023 by Patryk Goworowski and Patrick Michalik.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,7 +26,6 @@ import java.text.DecimalFormat
  * @param pattern the pattern used by [DecimalFormat] to format values as percentages.
  */
 public open class PercentageFormatValueFormatter(pattern: String) : ValueFormatter {
-
     private val decimalFormat = DecimalFormat(pattern)
 
     /**
@@ -43,7 +42,6 @@ public open class PercentageFormatValueFormatter(pattern: String) : ValueFormatt
     }
 
     public companion object {
-
         /**
          * The default percentage pattern.
          */
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/formatter/ValueFormatter.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/formatter/ValueFormatter.kt
index e816afc40..7ec7da6ba 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/formatter/ValueFormatter.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/formatter/ValueFormatter.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 by Patryk Goworowski and Patrick Michalik.
+ * Copyright 2023 by Patryk Goworowski and Patrick Michalik.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,7 +22,6 @@ import com.patrykandpatrick.vico.core.chart.values.ChartValues
  * Formats values for display.
  */
 public interface ValueFormatter {
-
     /**
      * Called to format axis labels and data labels.
      *
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/layout/VirtualLayout.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/layout/VirtualLayout.kt
index 74a5b37b9..40226c351 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/layout/VirtualLayout.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/layout/VirtualLayout.kt
@@ -35,7 +35,6 @@ import com.patrykandpatrick.vico.core.legend.Legend
 public open class VirtualLayout(
     private val axisManager: AxisManager,
 ) {
-
     private val tempInsetters = ArrayList<ChartInsetter>(TEMP_INSETTERS_INITIAL_SIZE)
 
     private val finalInsets: Insets = Insets()
@@ -61,56 +60,58 @@ public open class VirtualLayout(
         legend: Legend?,
         horizontalDimensions: HorizontalDimensions,
         vararg chartInsetter: ChartInsetter?,
-    ): RectF = with(context) {
-        tempInsetters.clear()
-        finalInsets.clear()
-        tempInsets.clear()
-
-        val legendHeight = legend?.getHeight(context, contentBounds.width()).orZero
-
-        axisManager.addInsetters(tempInsetters)
-        chartInsetter.filterNotNull().forEach(tempInsetters::add)
-        tempInsetters.addAll(chart.chartInsetters)
-        tempInsetters.add(chart)
-
-        tempInsetters.forEach { insetter ->
-            insetter.getInsets(context, tempInsets, horizontalDimensions)
-            finalInsets.setValuesIfGreater(tempInsets)
-        }
-
-        val availableHeight = contentBounds.height() - finalInsets.vertical - legendHeight
-
-        tempInsetters.forEach { insetter ->
-            insetter.getHorizontalInsets(context, availableHeight, tempInsets)
-            finalInsets.setValuesIfGreater(tempInsets)
+    ): RectF =
+        with(context) {
+            tempInsetters.clear()
+            finalInsets.clear()
+            tempInsets.clear()
+
+            val legendHeight = legend?.getHeight(context, contentBounds.width()).orZero
+
+            axisManager.addInsetters(tempInsetters)
+            chartInsetter.filterNotNull().forEach(tempInsetters::add)
+            tempInsetters.addAll(chart.chartInsetters)
+            tempInsetters.add(chart)
+
+            tempInsetters.forEach { insetter ->
+                insetter.getInsets(context, tempInsets, horizontalDimensions)
+                finalInsets.setValuesIfGreater(tempInsets)
+            }
+
+            val availableHeight = contentBounds.height() - finalInsets.vertical - legendHeight
+
+            tempInsetters.forEach { insetter ->
+                insetter.getHorizontalInsets(context, availableHeight, tempInsets)
+                finalInsets.setValuesIfGreater(tempInsets)
+            }
+
+            val chartBounds =
+                RectF().apply {
+                    left = contentBounds.left + finalInsets.getLeft(isLtr)
+                    top = contentBounds.top + finalInsets.top
+                    right = contentBounds.right - finalInsets.getRight(isLtr)
+                    bottom = contentBounds.bottom - finalInsets.bottom - legendHeight
+                }
+
+            chart.setBounds(
+                left = chartBounds.left,
+                top = chartBounds.top,
+                right = chartBounds.right,
+                bottom = chartBounds.bottom,
+            )
+
+            axisManager.setAxesBounds(context, contentBounds, chartBounds, finalInsets)
+
+            legend?.setBounds(
+                left = contentBounds.left,
+                top = chart.bounds.bottom + finalInsets.bottom,
+                right = contentBounds.right,
+                bottom = chart.bounds.bottom + finalInsets.bottom + legendHeight,
+            )
+
+            chartBounds
         }
 
-        val chartBounds = RectF().apply {
-            left = contentBounds.left + finalInsets.getLeft(isLtr)
-            top = contentBounds.top + finalInsets.top
-            right = contentBounds.right - finalInsets.getRight(isLtr)
-            bottom = contentBounds.bottom - finalInsets.bottom - legendHeight
-        }
-
-        chart.setBounds(
-            left = chartBounds.left,
-            top = chartBounds.top,
-            right = chartBounds.right,
-            bottom = chartBounds.bottom,
-        )
-
-        axisManager.setAxesBounds(context, contentBounds, chartBounds, finalInsets)
-
-        legend?.setBounds(
-            left = contentBounds.left,
-            top = chart.bounds.bottom + finalInsets.bottom,
-            right = contentBounds.right,
-            bottom = chart.bounds.bottom + finalInsets.bottom + legendHeight,
-        )
-
-        chartBounds
-    }
-
     private companion object {
         const val TEMP_INSETTERS_INITIAL_SIZE = 5
     }
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/legend/HorizontalLegend.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/legend/HorizontalLegend.kt
index 4c31b7894..26efafd71 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/legend/HorizontalLegend.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/legend/HorizontalLegend.kt
@@ -44,90 +44,99 @@ public open class HorizontalLegend(
     public var spacingDp: Float = 0f,
     override val padding: MutableDimensions = emptyDimensions(),
 ) : Legend, Padding {
-
     private val heights = mutableListOf<Float>()
 
     private val lines = mutableListOf<MutableList<LegendItem>>(mutableListOf())
 
     override val bounds: RectF = RectF()
 
-    override fun getHeight(context: MeasureContext, availableWidth: Float): Float = with(context) {
-        if (items.isEmpty()) return@with 0f
-        lines.clear()
-        lines.add(mutableListOf())
-        var height = maxOf(
-            items.first().getLabelHeight(context, availableWidth, iconPaddingDp, iconSizeDp),
-            iconSizeDp.pixels,
-        )
-        heights.add(height)
-        buildLines(context, availableWidth) {
-            val currentHeight =
-                maxOf(it.getLabelHeight(context, availableWidth, iconPaddingDp, iconSizeDp), iconSizeDp.pixels)
-            heights.add(currentHeight)
-            height += currentHeight
-        }
-        height + (lines.size - 1) * lineSpacingDp.pixels + padding.verticalDp.pixels
-    }
-
-    override fun draw(context: ChartDrawContext): Unit = with(context) {
-        var currentTop = bounds.top + padding.topDp.pixels
-        // isLtr? startX means the line starts at X from left : it starts at X from right
-        val startX = if (isLtr) {
-            chartBounds.left + padding.startDp.pixels
-        } else {
-            chartBounds.right - padding.startDp.pixels - iconSizeDp.pixels
-        }
-        val availableWidth = chartBounds.width()
-        if (lines.isEmpty()) {
-            buildLines(context, availableWidth)
-        }
-
-        lines.forEachIndexed { index, item ->
-            var currentStart = 0f
-            val currentLineHeight = heights.getOrElse(index) {
-                item.first().getLabelHeight(context, availableWidth, iconPaddingDp, iconSizeDp)
+    override fun getHeight(
+        context: MeasureContext,
+        availableWidth: Float,
+    ): Float =
+        with(context) {
+            if (items.isEmpty()) return@with 0f
+            lines.clear()
+            lines.add(mutableListOf())
+            var height =
+                maxOf(
+                    items.first().getLabelHeight(context, availableWidth, iconPaddingDp, iconSizeDp),
+                    iconSizeDp.pixels,
+                )
+            heights.add(height)
+            buildLines(context, availableWidth) {
+                val currentHeight =
+                    maxOf(it.getLabelHeight(context, availableWidth, iconPaddingDp, iconSizeDp), iconSizeDp.pixels)
+                heights.add(currentHeight)
+                height += currentHeight
             }
-            val centerY = currentTop + currentLineHeight.half
+            height + (lines.size - 1) * lineSpacingDp.pixels + padding.verticalDp.pixels
+        }
 
-            item.forEach {
-                it.icon.draw(
-                    context = context,
-                    left = startX + currentStart,
-                    top = centerY - iconSizeDp.half.pixels,
-                    right = startX + iconSizeDp.pixels + currentStart,
-                    bottom = centerY + iconSizeDp.half.pixels,
-                )
-                currentStart += if (isLtr) {
-                    (iconSizeDp + iconPaddingDp).pixels
+    override fun draw(context: ChartDrawContext): Unit =
+        with(context) {
+            var currentTop = bounds.top + padding.topDp.pixels
+            // isLtr? startX means the line starts at X from left : it starts at X from right
+            val startX =
+                if (isLtr) {
+                    chartBounds.left + padding.startDp.pixels
                 } else {
-                    -iconPaddingDp.pixels
+                    chartBounds.right - padding.startDp.pixels - iconSizeDp.pixels
                 }
-                it.label.drawText(
-                    context = context,
-                    text = it.labelText,
-                    textX = startX + currentStart,
-                    textY = centerY,
-                    horizontalPosition = HorizontalPosition.End,
-                    verticalPosition = VerticalPosition.Center,
-                    maxTextWidth =
-                    (chartBounds.width() - (iconSizeDp + iconPaddingDp + padding.horizontalDp).pixels).toInt(),
-                )
-                currentStart += if (isLtr) {
-                    it.getLabelWidth(context, availableWidth, iconPaddingDp, iconSizeDp) + spacingDp.pixels
-                } else {
-                    -(
-                        it.getLabelWidth(
-                            context,
-                            availableWidth,
-                            iconPaddingDp,
-                            iconSizeDp,
-                        ) + spacingDp.pixels + iconSizeDp.pixels
-                        )
+            val availableWidth = chartBounds.width()
+            if (lines.isEmpty()) {
+                buildLines(context, availableWidth)
+            }
+
+            lines.forEachIndexed { index, item ->
+                var currentStart = 0f
+                val currentLineHeight =
+                    heights.getOrElse(index) {
+                        item.first().getLabelHeight(context, availableWidth, iconPaddingDp, iconSizeDp)
+                    }
+                val centerY = currentTop + currentLineHeight.half
+
+                item.forEach {
+                    it.icon.draw(
+                        context = context,
+                        left = startX + currentStart,
+                        top = centerY - iconSizeDp.half.pixels,
+                        right = startX + iconSizeDp.pixels + currentStart,
+                        bottom = centerY + iconSizeDp.half.pixels,
+                    )
+                    currentStart +=
+                        if (isLtr) {
+                            (iconSizeDp + iconPaddingDp).pixels
+                        } else {
+                            -iconPaddingDp.pixels
+                        }
+                    it.label.drawText(
+                        context = context,
+                        text = it.labelText,
+                        textX = startX + currentStart,
+                        textY = centerY,
+                        horizontalPosition = HorizontalPosition.End,
+                        verticalPosition = VerticalPosition.Center,
+                        maxTextWidth =
+                            (chartBounds.width() - (iconSizeDp + iconPaddingDp + padding.horizontalDp).pixels).toInt(),
+                    )
+                    currentStart +=
+                        if (isLtr) {
+                            it.getLabelWidth(context, availableWidth, iconPaddingDp, iconSizeDp) + spacingDp.pixels
+                        } else {
+                            -(
+                                it.getLabelWidth(
+                                    context,
+                                    availableWidth,
+                                    iconPaddingDp,
+                                    iconSizeDp,
+                                ) + spacingDp.pixels + iconSizeDp.pixels
+                            )
+                        }
                 }
+                currentTop += currentLineHeight + lineSpacingDp.pixels
             }
-            currentTop += currentLineHeight + lineSpacingDp.pixels
         }
-    }
 
     protected fun buildLines(
         context: MeasureContext,
@@ -152,12 +161,13 @@ public open class HorizontalLegend(
                 }
 
                 currentLine++
-                remainWidth = availableWidth - it.getWidth(
-                    context,
-                    availableWidth,
-                    iconPaddingDp,
-                    iconSizeDp,
-                ) - spacingDp.pixels
+                remainWidth = availableWidth -
+                    it.getWidth(
+                        context,
+                        availableWidth,
+                        iconPaddingDp,
+                        iconSizeDp,
+                    ) - spacingDp.pixels
                 lines.add(mutableListOf(it))
                 callback(it)
             }
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/legend/Legend.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/legend/Legend.kt
index 5daae0901..9e5956d17 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/legend/Legend.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/legend/Legend.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 by Patryk Goworowski and Patrick Michalik.
+ * Copyright 2023 by Patryk Goworowski and Patrick Michalik.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,11 +24,13 @@ import com.patrykandpatrick.vico.core.dimensions.BoundsAware
  * Defines the functions required by the library to draw a chart legend.
  */
 public interface Legend : BoundsAware {
-
     /**
      * Returns the height of the legend.
      */
-    public fun getHeight(context: MeasureContext, availableWidth: Float): Float
+    public fun getHeight(
+        context: MeasureContext,
+        availableWidth: Float,
+    ): Float
 
     /**
      * Draws the legend.
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/legend/LegendItem.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/legend/LegendItem.kt
index 4a6839870..901efe48f 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/legend/LegendItem.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/legend/LegendItem.kt
@@ -45,13 +45,14 @@ public open class LegendItem(
         availableWidth: Float,
         iconPaddingDp: Float,
         iconSizeDp: Float,
-    ): Float = with(context) {
-        label.getHeight(
-            context = context,
-            text = labelText,
-            width = (availableWidth - iconSizeDp.pixels - iconPaddingDp.pixels).toInt(),
-        )
-    }
+    ): Float =
+        with(context) {
+            label.getHeight(
+                context = context,
+                text = labelText,
+                width = (availableWidth - iconSizeDp.pixels - iconPaddingDp.pixels).toInt(),
+            )
+        }
 
     /**
      * Measures the width of the label.
@@ -66,13 +67,14 @@ public open class LegendItem(
         availableWidth: Float,
         iconPaddingDp: Float,
         iconSizeDp: Float,
-    ): Float = with(context) {
-        label.getWidth(
-            context = context,
-            text = labelText,
-            width = (availableWidth - iconSizeDp.pixels - iconPaddingDp.pixels).toInt(),
-        )
-    }
+    ): Float =
+        with(context) {
+            label.getWidth(
+                context = context,
+                text = labelText,
+                width = (availableWidth - iconSizeDp.pixels - iconPaddingDp.pixels).toInt(),
+            )
+        }
 
     /**
      * Measures the width of this [LegendItem].
@@ -87,12 +89,13 @@ public open class LegendItem(
         availableWidth: Float,
         iconPaddingDp: Float,
         iconSizeDp: Float,
-    ): Float = with(context) {
-        getLabelWidth(
-            context,
-            availableWidth,
-            iconPaddingDp,
-            iconSizeDp,
-        ) + (iconSizeDp + iconPaddingDp).pixels
-    }
+    ): Float =
+        with(context) {
+            getLabelWidth(
+                context,
+                availableWidth,
+                iconPaddingDp,
+                iconSizeDp,
+            ) + (iconSizeDp + iconPaddingDp).pixels
+        }
 }
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/legend/VerticalLegend.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/legend/VerticalLegend.kt
index 6f670480e..efe091e2c 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/legend/VerticalLegend.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/legend/VerticalLegend.kt
@@ -41,60 +41,69 @@ public open class VerticalLegend(
     public var spacingDp: Float = 0f,
     override val padding: MutableDimensions = emptyDimensions(),
 ) : Legend, Padding {
-
     private val heights: HashMap<LegendItem, Float> = HashMap()
 
     override val bounds: RectF = RectF()
 
-    override fun getHeight(context: MeasureContext, availableWidth: Float): Float = with(context) {
-        items.fold(0f) { sum, item ->
-            sum + maxOf(
-                iconSizeDp.pixels,
-                item.getLabelHeight(context, availableWidth, iconPaddingDp, iconSizeDp),
-            ).also { height -> heights[item] = height }
-        } + (padding.verticalDp + spacingDp * (items.size - 1)).pixels
-    }
+    override fun getHeight(
+        context: MeasureContext,
+        availableWidth: Float,
+    ): Float =
+        with(context) {
+            items.fold(0f) { sum, item ->
+                sum +
+                    maxOf(
+                        iconSizeDp.pixels,
+                        item.getLabelHeight(context, availableWidth, iconPaddingDp, iconSizeDp),
+                    ).also { height -> heights[item] = height }
+            } + (padding.verticalDp + spacingDp * (items.size - 1)).pixels
+        }
 
-    override fun draw(context: ChartDrawContext): Unit = with(context) {
-        var currentTop = bounds.top + padding.topDp.pixels
+    override fun draw(context: ChartDrawContext): Unit =
+        with(context) {
+            var currentTop = bounds.top + padding.topDp.pixels
 
-        items.forEach { item ->
+            items.forEach { item ->
 
-            val height = heights.getOrPut(item) {
-                item.getLabelHeight(this, chartBounds.width(), iconPaddingDp, iconSizeDp)
-            }
-            val centerY = currentTop + height.half
-            var startX = if (isLtr) {
-                chartBounds.left + padding.startDp.pixels
-            } else {
-                chartBounds.right - padding.startDp.pixels - iconSizeDp.pixels
-            }
+                val height =
+                    heights.getOrPut(item) {
+                        item.getLabelHeight(this, chartBounds.width(), iconPaddingDp, iconSizeDp)
+                    }
+                val centerY = currentTop + height.half
+                var startX =
+                    if (isLtr) {
+                        chartBounds.left + padding.startDp.pixels
+                    } else {
+                        chartBounds.right - padding.startDp.pixels - iconSizeDp.pixels
+                    }
 
-            item.icon.draw(
-                context = context,
-                left = startX,
-                top = centerY - iconSizeDp.half.pixels,
-                right = startX + iconSizeDp.pixels,
-                bottom = centerY + iconSizeDp.half.pixels,
-            )
+                item.icon.draw(
+                    context = context,
+                    left = startX,
+                    top = centerY - iconSizeDp.half.pixels,
+                    right = startX + iconSizeDp.pixels,
+                    bottom = centerY + iconSizeDp.half.pixels,
+                )
 
-            startX += if (isLtr) {
-                (iconSizeDp + iconPaddingDp).pixels
-            } else {
-                -iconPaddingDp.pixels
-            }
+                startX +=
+                    if (isLtr) {
+                        (iconSizeDp + iconPaddingDp).pixels
+                    } else {
+                        -iconPaddingDp.pixels
+                    }
 
-            item.label.drawText(
-                context = context,
-                text = item.labelText,
-                textX = startX,
-                textY = centerY,
-                horizontalPosition = HorizontalPosition.End,
-                maxTextWidth = (chartBounds.width() - (iconSizeDp + iconPaddingDp + padding.horizontalDp).pixels)
-                    .toInt(),
-            )
+                item.label.drawText(
+                    context = context,
+                    text = item.labelText,
+                    textX = startX,
+                    textY = centerY,
+                    horizontalPosition = HorizontalPosition.End,
+                    maxTextWidth =
+                        (chartBounds.width() - (iconSizeDp + iconPaddingDp + padding.horizontalDp).pixels)
+                            .toInt(),
+                )
 
-            currentTop += height + spacingDp.pixels
+                currentTop += height + spacingDp.pixels
+            }
         }
-    }
 }
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/marker/DefaultMarkerLabelFormatter.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/marker/DefaultMarkerLabelFormatter.kt
index b6e98aab0..f638feb79 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/marker/DefaultMarkerLabelFormatter.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/marker/DefaultMarkerLabelFormatter.kt
@@ -30,25 +30,25 @@ import com.patrykandpatrick.vico.core.extension.transformToSpannable
  * @see MarkerLabelFormatter
  */
 public class DefaultMarkerLabelFormatter(private val colorCode: Boolean = true) : MarkerLabelFormatter {
-
     override fun getLabel(
         markedEntries: List<Marker.EntryModel>,
         chartValues: ChartValues,
-    ): CharSequence = markedEntries.transformToSpannable(
-        prefix = if (markedEntries.size > 1) PATTERN.format(markedEntries.sumOf { it.entry.y }) + " (" else "",
-        postfix = if (markedEntries.size > 1) ")" else "",
-        separator = "; ",
-    ) { model ->
-        if (colorCode) {
-            appendCompat(
-                PATTERN.format(model.entry.y),
-                ForegroundColorSpan(model.color),
-                Spannable.SPAN_EXCLUSIVE_EXCLUSIVE,
-            )
-        } else {
-            append(PATTERN.format(model.entry.y))
+    ): CharSequence =
+        markedEntries.transformToSpannable(
+            prefix = if (markedEntries.size > 1) PATTERN.format(markedEntries.sumOf { it.entry.y }) + " (" else "",
+            postfix = if (markedEntries.size > 1) ")" else "",
+            separator = "; ",
+        ) { model ->
+            if (colorCode) {
+                appendCompat(
+                    PATTERN.format(model.entry.y),
+                    ForegroundColorSpan(model.color),
+                    Spannable.SPAN_EXCLUSIVE_EXCLUSIVE,
+                )
+            } else {
+                append(PATTERN.format(model.entry.y))
+            }
         }
-    }
 
     private companion object {
         const val PATTERN = "%.02f"
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/marker/Marker.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/marker/Marker.kt
index c4a35a535..8f1315c74 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/marker/Marker.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/marker/Marker.kt
@@ -28,7 +28,6 @@ import com.patrykandpatrick.vico.core.model.Point
  * Highlights points on a chart and displays their corresponding values in a bubble.
  */
 public interface Marker : ChartInsetter {
-
     /**
      * Draws the marker.
      * @param context the [DrawContext] used to draw the marker.
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/marker/MarkerLabelFormatter.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/marker/MarkerLabelFormatter.kt
index db4043aa6..069b56b21 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/marker/MarkerLabelFormatter.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/marker/MarkerLabelFormatter.kt
@@ -22,7 +22,6 @@ import com.patrykandpatrick.vico.core.chart.values.ChartValues
  * Formats marker labels.
  */
 public fun interface MarkerLabelFormatter {
-
     /**
      * Creates a formatted label for the given list of marked entries.
      */
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/marker/MarkerVisibilityChangeListener.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/marker/MarkerVisibilityChangeListener.kt
index 472a87999..d0e6aaded 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/marker/MarkerVisibilityChangeListener.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/marker/MarkerVisibilityChangeListener.kt
@@ -20,7 +20,6 @@ package com.patrykandpatrick.vico.core.marker
  * Allows for listening to [Marker] visibility changes.
  */
 public interface MarkerVisibilityChangeListener {
-
     /**
      * Called when the linked [Marker] is shown.
      *
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/model/Point.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/model/Point.kt
index 895820062..c38dd55c2 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/model/Point.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/model/Point.kt
@@ -24,19 +24,24 @@ import com.patrykandpatrick.vico.core.util.unpackFloat2
 /**
  * Creates a new [Point] with the provided coordinates.
  */
-public fun Point(x: Float, y: Float): Point = Point(packFloats(x, y))
+public fun Point(
+    x: Float,
+    y: Float,
+): Point = Point(packFloats(x, y))
 
 /**
  * Creates a new [Point] with the provided coordinates.
  */
-public fun Point(x: Int, y: Int): Point = Point(packInts(x, y))
+public fun Point(
+    x: Int,
+    y: Int,
+): Point = Point(packInts(x, y))
 
 /**
  * Represents a point in a coordinate system.
  */
 @JvmInline
 public value class Point internal constructor(private val packedValue: Long) {
-
     /**
      * The _x_ coordinate.
      */
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/scroll/AutoScrollCondition.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/scroll/AutoScrollCondition.kt
index 253c9609e..563929bdb 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/scroll/AutoScrollCondition.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/scroll/AutoScrollCondition.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 by Patryk Goworowski and Patrick Michalik.
+ * Copyright 2023 by Patryk Goworowski and Patrick Michalik.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,14 +23,15 @@ import com.patrykandpatrick.vico.core.extension.ifNotNull
  * Defines when an automatic scroll should be performed.
  */
 public fun interface AutoScrollCondition<in Model : ChartEntryModel> {
-
     /**
      * Given a chart’s new and old models, defines whether an automatic scroll should be performed.
      */
-    public fun shouldPerformAutoScroll(newModel: Model, oldModel: Model?): Boolean
+    public fun shouldPerformAutoScroll(
+        newModel: Model,
+        oldModel: Model?,
+    ): Boolean
 
     public companion object {
-
         /**
          * Prevents any automatic scrolling from occurring.
          */
@@ -40,18 +41,19 @@ public fun interface AutoScrollCondition<in Model : ChartEntryModel> {
          * Triggers an automatic scroll when the size of the model increases (that is, the contents of the chart become
          * wider).
          */
-        public val OnModelSizeIncreased: AutoScrollCondition<ChartEntryModel> = AutoScrollCondition { n, o ->
-            if (o != null) {
-                val new = n.entries
-                val old = o.entries
-                new.size > old.size ||
-                    ifNotNull(
-                        t1 = new.maxOfOrNull { entries -> entries.size },
-                        t2 = old.maxOfOrNull { entries -> entries.size },
-                    ) { t1, t2 -> t1 > t2 } == true
-            } else {
-                false
+        public val OnModelSizeIncreased: AutoScrollCondition<ChartEntryModel> =
+            AutoScrollCondition { n, o ->
+                if (o != null) {
+                    val new = n.entries
+                    val old = o.entries
+                    new.size > old.size ||
+                        ifNotNull(
+                            t1 = new.maxOfOrNull { entries -> entries.size },
+                            t2 = old.maxOfOrNull { entries -> entries.size },
+                        ) { t1, t2 -> t1 > t2 } == true
+                } else {
+                    false
+                }
             }
-        }
     }
 }
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/scroll/ScrollHandler.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/scroll/ScrollHandler.kt
index 0861f1c4d..532d11763 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/scroll/ScrollHandler.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/scroll/ScrollHandler.kt
@@ -25,7 +25,6 @@ import kotlin.properties.Delegates
  * @param initialMaxValue the initial maximum scroll amount.
  */
 public class ScrollHandler(initialMaxValue: Float = 0f) : ScrollListenerHost {
-
     private var initialScrollHandled: Boolean = false
     private val scrollListeners: MutableSet<ScrollListener> = mutableSetOf()
 
@@ -71,10 +70,11 @@ public class ScrollHandler(initialMaxValue: Float = 0f) : ScrollListenerHost {
      */
     public fun handleInitialScroll(initialScroll: InitialScroll) {
         if (initialScrollHandled) return
-        value = when (initialScroll) {
-            InitialScroll.Start -> 0f
-            InitialScroll.End -> maxValue
-        }
+        value =
+            when (initialScroll) {
+                InitialScroll.Start -> 0f
+                InitialScroll.End -> maxValue
+            }
         initialScrollHandled = true
     }
 
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/scroll/ScrollListener.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/scroll/ScrollListener.kt
index b23d24698..c456de9ec 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/scroll/ScrollListener.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/scroll/ScrollListener.kt
@@ -20,16 +20,21 @@ package com.patrykandpatrick.vico.core.scroll
  * Allows for listening to a chart’s scroll state.
  */
 public interface ScrollListener {
-
     /**
      * Called when the scroll amount changes.
      */
-    public fun onValueChanged(oldValue: Float, newValue: Float): Unit = Unit
+    public fun onValueChanged(
+        oldValue: Float,
+        newValue: Float,
+    ): Unit = Unit
 
     /**
      * Called when the maximum scroll amount changes.
      */
-    public fun onMaxValueChanged(oldMaxValue: Float, newMaxValue: Float): Unit = Unit
+    public fun onMaxValueChanged(
+        oldMaxValue: Float,
+        newMaxValue: Float,
+    ): Unit = Unit
 
     /**
      * Called when the scroll has reached the limit and cannot be consumed further.
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/scroll/ScrollListenerHost.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/scroll/ScrollListenerHost.kt
index 3a1a4736d..f07e82ac7 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/scroll/ScrollListenerHost.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/scroll/ScrollListenerHost.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 by Patryk Goworowski and Patrick Michalik.
+ * Copyright 2023 by Patryk Goworowski and Patrick Michalik.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,7 +20,6 @@ package com.patrykandpatrick.vico.core.scroll
  * Declares functions for registering and removing [ScrollListener]s.
  */
 public interface ScrollListenerHost {
-
     /**
      * Registers a [ScrollListener].
      */
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/text/StaticLayoutExtensions.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/text/StaticLayoutExtensions.kt
index 6c747bc9b..98300b62a 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/text/StaticLayoutExtensions.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/text/StaticLayoutExtensions.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 by Patryk Goworowski and Patrick Michalik.
+ * Copyright 2023 by Patryk Goworowski and Patrick Michalik.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -73,9 +73,10 @@ internal fun staticLayout(
         ).setLineCount(maxLines)
     }
 
-internal fun StaticLayout.setLineCount(count: Int) = apply {
-    setFieldValue(LINE_COUNT_FIELD, count)
-}
+internal fun StaticLayout.setLineCount(count: Int) =
+    apply {
+        setFieldValue(LINE_COUNT_FIELD, count)
+    }
 
 internal fun Layout.getBounds(outBounds: RectF): RectF =
     outBounds.apply {
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/util/InlineClassHelper.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/util/InlineClassHelper.kt
index ba9b7d897..44521b58f 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/util/InlineClassHelper.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/util/InlineClassHelper.kt
@@ -13,15 +13,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  *
- * Modifications copyright 2022 by Patryk Goworowski and Patrick Michalik.
+ * Modifications copyright 2023 by Patryk Goworowski and Patrick Michalik.
  */
-@file:Suppress("NOTHING_TO_INLINE", "MagicNumber")
+@file:Suppress("NOTHING_TO_INLINE")
 
 package com.patrykandpatrick.vico.core.util
+
 /**
  * Packs two [Float] values into one [Long] value for use in inline classes.
  */
-internal inline fun packFloats(val1: Float, val2: Float): Long {
+internal inline fun packFloats(
+    val1: Float,
+    val2: Float,
+): Long {
     val v1 = val1.toBits().toLong()
     val v2 = val2.toBits().toLong()
     return v1.shl(32) or (v2 and 0xFFFFFFFF)
@@ -40,7 +44,10 @@ internal inline fun unpackFloat2(value: Long) = Float.fromBits(value.and(0xFFFFF
 /**
  * Packs two [Int] values into one [Long] value for use in inline classes.
  */
-internal inline fun packInts(val1: Int, val2: Int) = val1.toLong().shl(32) or (val2.toLong() and 0xFFFFFFFF)
+internal inline fun packInts(
+    val1: Int,
+    val2: Int,
+) = val1.toLong().shl(32) or (val2.toLong() and 0xFFFFFFFF)
 
 /**
  * Unpacks the first [Int] value in [packInts] from its returned [ULong].
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/util/RandomEntriesGenerator.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/util/RandomEntriesGenerator.kt
index 6d3dadf41..9a7daca1c 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/util/RandomEntriesGenerator.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/util/RandomEntriesGenerator.kt
@@ -55,17 +55,17 @@ public class RandomEntriesGenerator(
      * Creates a [ChartEntryModel] containing a collection of [FloatEntry] instances with randomized _y_ values.
      * The size of the collection is equal to the number of values in [xRange].
      */
-    public fun randomEntryModel(): ChartEntryModel =
-        getChartEntryModelProducer().requireModel()
+    public fun randomEntryModel(): ChartEntryModel = getChartEntryModelProducer().requireModel()
 
     /**
      * Creates a [ComposedChartEntryModel] with three [ChartEntryModelProducer]s, each containing a collection of
      * [FloatEntry] instances with randomized y values. The size of each collection is equal to the number of values in
      * [xRange].
      */
-    public fun randomComposedEntryModel(): ComposedChartEntryModel<ChartEntryModel> = ComposedChartEntryModelProducer
-        .build { repeat(modelCount) { add(List(seriesCount) { generateRandomEntries() }) } }
-        .requireModel()
+    public fun randomComposedEntryModel(): ComposedChartEntryModel<ChartEntryModel> =
+        ComposedChartEntryModelProducer
+            .build { repeat(modelCount) { add(List(seriesCount) { generateRandomEntries() }) } }
+            .requireModel()
 
     @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
     public companion object {
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/util/ValueWrapper.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/util/ValueWrapper.kt
index 776ea0483..300f7f8b2 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/util/ValueWrapper.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/util/ValueWrapper.kt
@@ -23,10 +23,17 @@ import kotlin.reflect.KProperty
 public class ValueWrapper<T>(public var value: T)
 
 @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
-public operator fun <T> ValueWrapper<T>.getValue(thisObj: Any?, property: KProperty<*>): T = value
+public operator fun <T> ValueWrapper<T>.getValue(
+    thisObj: Any?,
+    property: KProperty<*>,
+): T = value
 
 @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
-public operator fun <T> ValueWrapper<T>.setValue(thisObj: Any?, property: KProperty<*>, value: T) {
+public operator fun <T> ValueWrapper<T>.setValue(
+    thisObj: Any?,
+    property: KProperty<*>,
+    value: T,
+) {
     this.value = value
 }
 
diff --git a/vico/core/src/test/java/com/patrykandpatrick/vico/core/ChartEntryModelProducerTest.kt b/vico/core/src/test/java/com/patrykandpatrick/vico/core/ChartEntryModelProducerTest.kt
index 6df03efed..d99315149 100644
--- a/vico/core/src/test/java/com/patrykandpatrick/vico/core/ChartEntryModelProducerTest.kt
+++ b/vico/core/src/test/java/com/patrykandpatrick/vico/core/ChartEntryModelProducerTest.kt
@@ -22,7 +22,6 @@ import org.junit.Test
 import kotlin.test.assertEquals
 
 public class ChartEntryModelProducerTest {
-
     private val minX = 0f
     private val maxX = 3f
     private val minY = 1f
diff --git a/vico/core/src/test/java/com/patrykandpatrick/vico/core/CollectionExtensionsTest.kt b/vico/core/src/test/java/com/patrykandpatrick/vico/core/CollectionExtensionsTest.kt
index ae77cec73..fa9c54b26 100644
--- a/vico/core/src/test/java/com/patrykandpatrick/vico/core/CollectionExtensionsTest.kt
+++ b/vico/core/src/test/java/com/patrykandpatrick/vico/core/CollectionExtensionsTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 by Patryk Goworowski and Patrick Michalik.
+ * Copyright 2023 by Patryk Goworowski and Patrick Michalik.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,7 +22,6 @@ import kotlin.test.assertEquals
 import kotlin.test.fail
 
 public class CollectionExtensionsTest {
-
     private val format = "index=%d, isFirst=%s, isLast=%s, value=%d"
 
     @Test
@@ -30,10 +29,11 @@ public class CollectionExtensionsTest {
         (0..<1).forEachIndexedExtended { index, isFirst, isLast, int ->
             val actual = format.format(index, isFirst, isLast, int)
             when (int) {
-                0 -> assertEquals(
-                    expected = format.format(0, true, true, 0),
-                    actual = actual,
-                )
+                0 ->
+                    assertEquals(
+                        expected = format.format(0, true, true, 0),
+                        actual = actual,
+                    )
                 else -> fail("Unexpected value")
             }
         }
@@ -44,14 +44,16 @@ public class CollectionExtensionsTest {
         (0..<2).forEachIndexedExtended { index, isFirst, isLast, int ->
             val actual = format.format(index, isFirst, isLast, int)
             when (int) {
-                0 -> assertEquals(
-                    expected = format.format(0, true, false, 0),
-                    actual = actual,
-                )
-                1 -> assertEquals(
-                    expected = format.format(1, false, true, 1),
-                    actual = actual,
-                )
+                0 ->
+                    assertEquals(
+                        expected = format.format(0, true, false, 0),
+                        actual = actual,
+                    )
+                1 ->
+                    assertEquals(
+                        expected = format.format(1, false, true, 1),
+                        actual = actual,
+                    )
                 else -> fail("Unexpected value")
             }
         }
@@ -62,18 +64,21 @@ public class CollectionExtensionsTest {
         (0..<3).forEachIndexedExtended { index, isFirst, isLast, int ->
             val actual = format.format(index, isFirst, isLast, int)
             when (int) {
-                0 -> assertEquals(
-                    expected = format.format(0, true, false, 0),
-                    actual = actual,
-                )
-                1 -> assertEquals(
-                    expected = format.format(1, false, false, 1),
-                    actual = actual,
-                )
-                2 -> assertEquals(
-                    expected = format.format(2, false, true, 2),
-                    actual = actual,
-                )
+                0 ->
+                    assertEquals(
+                        expected = format.format(0, true, false, 0),
+                        actual = actual,
+                    )
+                1 ->
+                    assertEquals(
+                        expected = format.format(1, false, false, 1),
+                        actual = actual,
+                    )
+                2 ->
+                    assertEquals(
+                        expected = format.format(2, false, true, 2),
+                        actual = actual,
+                    )
                 else -> fail("Unexpected value")
             }
         }
diff --git a/vico/core/src/test/java/com/patrykandpatrick/vico/core/extension/RectFExtensionsTest.kt b/vico/core/src/test/java/com/patrykandpatrick/vico/core/extension/RectFExtensionsTest.kt
index e0f7b9732..bfce1f2b0 100644
--- a/vico/core/src/test/java/com/patrykandpatrick/vico/core/extension/RectFExtensionsTest.kt
+++ b/vico/core/src/test/java/com/patrykandpatrick/vico/core/extension/RectFExtensionsTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 by Patryk Goworowski and Patrick Michalik.
+ * Copyright 2023 by Patryk Goworowski and Patrick Michalik.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,7 +26,6 @@ import org.junit.Test
 import kotlin.math.sqrt
 
 public class RectFExtensionsTest {
-
     @MockK
     private lateinit var rect: RectF
 
diff --git a/vico/views/src/main/java/com/patrykandpatrick/vico/views/chart/BaseChartView.kt b/vico/views/src/main/java/com/patrykandpatrick/vico/views/chart/BaseChartView.kt
index da3ef6519..ef0696816 100644
--- a/vico/views/src/main/java/com/patrykandpatrick/vico/views/chart/BaseChartView.kt
+++ b/vico/views/src/main/java/com/patrykandpatrick/vico/views/chart/BaseChartView.kt
@@ -100,7 +100,6 @@ public abstract class BaseChartView<Model : ChartEntryModel> internal constructo
     defStyleAttr: Int = 0,
     chartType: ThemeHandler.ChartType,
 ) : FrameLayout(context, attrs, defStyleAttr), ScrollListenerHost {
-
     private val contentBounds = RectF()
 
     private val scrollHandler = ScrollHandler()
@@ -113,22 +112,24 @@ public abstract class BaseChartView<Model : ChartEntryModel> internal constructo
 
     private val chartValuesManager = ChartValuesManager()
 
-    private val motionEventHandler = MotionEventHandler(
-        scroller = scroller,
-        scrollHandler = scrollHandler,
-        density = resources.displayMetrics.density,
-        onTouchPoint = ::handleTouchEvent,
-        requestInvalidate = ::invalidate,
-    )
-
-    private val measureContext = MutableMeasureContext(
-        canvasBounds = contentBounds,
-        density = context.density,
-        isLtr = context.isLtr,
-        isHorizontalScrollEnabled = false,
-        spToPx = context::spToPx,
-        chartValuesProvider = ChartValuesProvider.Empty,
-    )
+    private val motionEventHandler =
+        MotionEventHandler(
+            scroller = scroller,
+            scrollHandler = scrollHandler,
+            density = resources.displayMetrics.density,
+            onTouchPoint = ::handleTouchEvent,
+            requestInvalidate = ::invalidate,
+        )
+
+    private val measureContext =
+        MutableMeasureContext(
+            canvasBounds = contentBounds,
+            density = context.density,
+            isLtr = context.isLtr,
+            isHorizontalScrollEnabled = false,
+            spToPx = context::spToPx,
+            chartValuesProvider = ChartValuesProvider.Empty,
+        )
 
     private val scaleGestureListener: ScaleGestureDetector.OnScaleGestureListener =
         ChartScaleGestureListener(
@@ -284,9 +285,10 @@ public abstract class BaseChartView<Model : ChartEntryModel> internal constructo
                             animator.start()
                         }
                     } else {
-                        finalAnimationFrameJob = coroutineScope?.launch(dispatcher) {
-                            transformModel(this@BaseChartView, Animation.range.endInclusive)
-                        }
+                        finalAnimationFrameJob =
+                            coroutineScope?.launch(dispatcher) {
+                                transformModel(this@BaseChartView, Animation.range.endInclusive)
+                            }
                     }
                 },
                 getOldModel = { model },
@@ -374,7 +376,10 @@ public abstract class BaseChartView<Model : ChartEntryModel> internal constructo
         setModel(model = model, updateChartValues = true)
     }
 
-    private fun setModel(model: Model?, updateChartValues: Boolean) {
+    private fun setModel(
+        model: Model?,
+        updateChartValues: Boolean,
+    ) {
         val oldModel = this.model
         this.model = model
         updatePlaceholderVisibility()
@@ -390,7 +395,11 @@ public abstract class BaseChartView<Model : ChartEntryModel> internal constructo
         }
     }
 
-    protected fun tryInvalidate(chart: Chart<Model>?, model: Model?, updateChartValues: Boolean) {
+    protected fun tryInvalidate(
+        chart: Chart<Model>?,
+        model: Model?,
+        updateChartValues: Boolean,
+    ) {
         if (chart == null || model == null) return
         if (updateChartValues) {
             chartValuesManager.resetChartValues()
@@ -412,11 +421,12 @@ public abstract class BaseChartView<Model : ChartEntryModel> internal constructo
     }
 
     override fun onTouchEvent(event: MotionEvent): Boolean {
-        val scaleHandled = if (isZoomEnabled && event.pointerCount > 1 && chartScrollSpec.isScrollEnabled) {
-            scaleGestureDetector.onTouchEvent(event)
-        } else {
-            false
-        }
+        val scaleHandled =
+            if (isZoomEnabled && event.pointerCount > 1 && chartScrollSpec.isScrollEnabled) {
+                scaleGestureDetector.onTouchEvent(event)
+            } else {
+                false
+            }
         val touchHandled = motionEventHandler.handleMotionEvent(event)
 
         if (scrollDirectionResolved.not() && event.historySize > 0) {
@@ -431,7 +441,10 @@ public abstract class BaseChartView<Model : ChartEntryModel> internal constructo
         return touchHandled || scaleHandled
     }
 
-    private fun handleZoom(focusX: Float, zoomChange: Float) {
+    private fun handleZoom(
+        focusX: Float,
+        zoomChange: Float,
+    ) {
         val chart = chart ?: return
         val newZoom = zoom * zoomChange
         if (newZoom !in DEF_MIN_ZOOM..DEF_MAX_ZOOM) return
@@ -489,24 +502,26 @@ public abstract class BaseChartView<Model : ChartEntryModel> internal constructo
                 if (chartScrollSpec.isScrollEnabled) zoom = finalZoom
             }
 
-            scrollHandler.maxValue = measureContext.getMaxScrollDistance(
-                chartWidth = chart.bounds.width(),
-                horizontalDimensions = horizontalDimensions,
-                zoom = finalZoom,
-            )
+            scrollHandler.maxValue =
+                measureContext.getMaxScrollDistance(
+                    chartWidth = chart.bounds.width(),
+                    horizontalDimensions = horizontalDimensions,
+                    zoom = finalZoom,
+                )
 
             scrollHandler.handleInitialScroll(initialScroll = chartScrollSpec.initialScroll)
 
-            val chartDrawContext = chartDrawContext(
-                canvas = canvas,
-                elevationOverlayColor = elevationOverlayColor,
-                measureContext = measureContext,
-                markerTouchPoint = markerTouchPoint,
-                horizontalDimensions = horizontalDimensions,
-                chartBounds = chart.bounds,
-                horizontalScroll = scrollHandler.value,
-                zoom = finalZoom,
-            )
+            val chartDrawContext =
+                chartDrawContext(
+                    canvas = canvas,
+                    elevationOverlayColor = elevationOverlayColor,
+                    measureContext = measureContext,
+                    markerTouchPoint = markerTouchPoint,
+                    horizontalDimensions = horizontalDimensions,
+                    chartBounds = chart.bounds,
+                    horizontalScroll = scrollHandler.value,
+                    zoom = finalZoom,
+                )
 
             val count = if (fadingEdges != null) chartDrawContext.saveLayer() else -1
 
@@ -543,29 +558,35 @@ public abstract class BaseChartView<Model : ChartEntryModel> internal constructo
             !isAnimationRunning -> return
             !isAnimationFrameGenerationRunning -> {
                 isAnimationFrameGenerationRunning = true
-                animationFrameJob = coroutineScope?.launch(dispatcher) {
-                    entryProducer?.transformModel(this@BaseChartView, fraction)
-                    isAnimationFrameGenerationRunning = false
-                }
+                animationFrameJob =
+                    coroutineScope?.launch(dispatcher) {
+                        entryProducer?.transformModel(this@BaseChartView, fraction)
+                        isAnimationFrameGenerationRunning = false
+                    }
             }
             fraction == 1f -> {
-                finalAnimationFrameJob = coroutineScope?.launch(dispatcher) {
-                    animationFrameJob?.cancelAndJoin()
-                    entryProducer?.transformModel(this@BaseChartView, fraction)
-                    isAnimationFrameGenerationRunning = false
-                }
+                finalAnimationFrameJob =
+                    coroutineScope?.launch(dispatcher) {
+                        animationFrameJob?.cancelAndJoin()
+                        entryProducer?.transformModel(this@BaseChartView, fraction)
+                        isAnimationFrameGenerationRunning = false
+                    }
             }
         }
     }
 
-    override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
+    override fun onMeasure(
+        widthMeasureSpec: Int,
+        heightMeasureSpec: Int,
+    ) {
         val width = widthMeasureSpec.specSize.coerceAtLeast(suggestedMinimumWidth)
         val defaultHeight = DefaultDimens.CHART_HEIGHT.dpInt + verticalPadding
-        val height = when (heightMeasureSpec.specMode) {
-            MeasureSpec.EXACTLY -> heightMeasureSpec.specSize
-            MeasureSpec.AT_MOST -> defaultHeight.coerceAtMost(heightMeasureSpec.specSize)
-            else -> defaultHeight
-        }.coerceAtLeast(suggestedMinimumHeight)
+        val height =
+            when (heightMeasureSpec.specMode) {
+                MeasureSpec.EXACTLY -> heightMeasureSpec.specSize
+                MeasureSpec.AT_MOST -> defaultHeight.coerceAtMost(heightMeasureSpec.specSize)
+                else -> defaultHeight
+            }.coerceAtLeast(suggestedMinimumHeight)
         super.onMeasure(
             MeasureSpec.makeMeasureSpec(width, MeasureSpec.EXACTLY),
             MeasureSpec.makeMeasureSpec(height, MeasureSpec.EXACTLY),
@@ -574,7 +595,11 @@ public abstract class BaseChartView<Model : ChartEntryModel> internal constructo
             .set(left = paddingLeft, top = paddingTop, right = width - paddingRight, bottom = height - paddingBottom)
     }
 
-    override fun addView(child: View, index: Int, params: ViewGroup.LayoutParams?) {
+    override fun addView(
+        child: View,
+        index: Int,
+        params: ViewGroup.LayoutParams?,
+    ) {
         check(childCount == 0) { "Only one placeholder can be added." }
         super.addView(child, index, params)
         placeholder = child
@@ -589,7 +614,10 @@ public abstract class BaseChartView<Model : ChartEntryModel> internal constructo
     /**
      * Updates the placeholder, which is shown when no [ChartEntryModel] is available.
      */
-    public fun setPlaceholder(view: View?, params: LayoutParams? = null) {
+    public fun setPlaceholder(
+        view: View?,
+        params: LayoutParams? = null,
+    ) {
         if (view === placeholder) return
         removeAllViews()
         if (view != null) addView(view, params)
diff --git a/vico/views/src/main/java/com/patrykandpatrick/vico/views/chart/ChartView.kt b/vico/views/src/main/java/com/patrykandpatrick/vico/views/chart/ChartView.kt
index c5963b018..15a618520 100644
--- a/vico/views/src/main/java/com/patrykandpatrick/vico/views/chart/ChartView.kt
+++ b/vico/views/src/main/java/com/patrykandpatrick/vico/views/chart/ChartView.kt
@@ -29,35 +29,38 @@ import com.patrykandpatrick.vico.views.theme.ThemeHandler
 /**
  * A subclass of [BaseChartView] that displays charts that use [ChartEntryModel].
  */
-public class ChartView @JvmOverloads constructor(
-    context: Context,
-    attrs: AttributeSet? = null,
-    defStyleAttr: Int = 0,
-) : BaseChartView<ChartEntryModel>(
-    context = context,
-    attrs = attrs,
-    defStyleAttr = defStyleAttr,
-    chartType = ThemeHandler.ChartType.Single,
-) {
-    init {
-        chart = themeHandler.chart
-        if (isInEditMode && attrs != null) setPreviewModel(attrs)
-    }
+public class ChartView
+    @JvmOverloads
+    constructor(
+        context: Context,
+        attrs: AttributeSet? = null,
+        defStyleAttr: Int = 0,
+    ) : BaseChartView<ChartEntryModel>(
+            context = context,
+            attrs = attrs,
+            defStyleAttr = defStyleAttr,
+            chartType = ThemeHandler.ChartType.Single,
+        ) {
+        init {
+            chart = themeHandler.chart
+            if (isInEditMode && attrs != null) setPreviewModel(attrs)
+        }
 
-    private fun setPreviewModel(attrs: AttributeSet) {
-        context.obtainStyledAttributes(attrs, R.styleable.ChartView).use { typedArray ->
-            val seriesCount = typedArray.getInt(R.styleable.ChartView_previewSeriesCount, SERIES_COUNT)
-            val minX = typedArray.getInt(R.styleable.ChartView_previewMinX, 0)
-            val maxX = typedArray.getInt(R.styleable.ChartView_previewMaxX, X_RANGE_TOP)
-            val minY = typedArray.getInt(R.styleable.ChartView_previewMinY, 0)
-            val maxY = typedArray.getInt(R.styleable.ChartView_previewMaxY, Y_RANGE_TOP)
-            setModel(
-                model = RandomEntriesGenerator(
-                    xRange = minX..maxX,
-                    yRange = minY..maxY,
-                    seriesCount = seriesCount,
-                ).randomEntryModel(),
-            )
+        private fun setPreviewModel(attrs: AttributeSet) {
+            context.obtainStyledAttributes(attrs, R.styleable.ChartView).use { typedArray ->
+                val seriesCount = typedArray.getInt(R.styleable.ChartView_previewSeriesCount, SERIES_COUNT)
+                val minX = typedArray.getInt(R.styleable.ChartView_previewMinX, 0)
+                val maxX = typedArray.getInt(R.styleable.ChartView_previewMaxX, X_RANGE_TOP)
+                val minY = typedArray.getInt(R.styleable.ChartView_previewMinY, 0)
+                val maxY = typedArray.getInt(R.styleable.ChartView_previewMaxY, Y_RANGE_TOP)
+                setModel(
+                    model =
+                        RandomEntriesGenerator(
+                            xRange = minX..maxX,
+                            yRange = minY..maxY,
+                            seriesCount = seriesCount,
+                        ).randomEntryModel(),
+                )
+            }
         }
     }
-}
diff --git a/vico/views/src/main/java/com/patrykandpatrick/vico/views/chart/ComposedChartView.kt b/vico/views/src/main/java/com/patrykandpatrick/vico/views/chart/ComposedChartView.kt
index 6e577098e..47f9bdf40 100644
--- a/vico/views/src/main/java/com/patrykandpatrick/vico/views/chart/ComposedChartView.kt
+++ b/vico/views/src/main/java/com/patrykandpatrick/vico/views/chart/ComposedChartView.kt
@@ -31,38 +31,40 @@ import com.patrykandpatrick.vico.views.theme.ThemeHandler
 /**
  * A subclass of [BaseChartView] that displays charts that use [ComposedChartEntryModel].
  */
-public class ComposedChartView @JvmOverloads constructor(
-    context: Context,
-    attrs: AttributeSet? = null,
-    defStyleAttr: Int = 0,
-) : BaseChartView<ComposedChartEntryModel<ChartEntryModel>>(
-    context = context,
-    attrs = attrs,
-    defStyleAttr = defStyleAttr,
-    chartType = ThemeHandler.ChartType.Composed,
-) {
-
-    init {
-        chart = themeHandler.composedChart
-        if (isInEditMode && attrs != null) setPreviewModel(attrs)
-    }
+public class ComposedChartView
+    @JvmOverloads
+    constructor(
+        context: Context,
+        attrs: AttributeSet? = null,
+        defStyleAttr: Int = 0,
+    ) : BaseChartView<ComposedChartEntryModel<ChartEntryModel>>(
+            context = context,
+            attrs = attrs,
+            defStyleAttr = defStyleAttr,
+            chartType = ThemeHandler.ChartType.Composed,
+        ) {
+        init {
+            chart = themeHandler.composedChart
+            if (isInEditMode && attrs != null) setPreviewModel(attrs)
+        }
 
-    private fun setPreviewModel(attrs: AttributeSet) {
-        context.obtainStyledAttributes(attrs, R.styleable.ComposedChartView).use { typedArray ->
-            val modelCount = typedArray.getInt(R.styleable.ComposedChartView_previewModelCount, MODEL_COUNT)
-            val seriesCount = typedArray.getInt(R.styleable.ComposedChartView_previewSeriesCount, SERIES_COUNT)
-            val minX = typedArray.getInt(R.styleable.ComposedChartView_previewMinX, 0)
-            val maxX = typedArray.getInt(R.styleable.ComposedChartView_previewMaxX, X_RANGE_TOP)
-            val minY = typedArray.getInt(R.styleable.ComposedChartView_previewMinY, 0)
-            val maxY = typedArray.getInt(R.styleable.ComposedChartView_previewMaxY, Y_RANGE_TOP)
-            setModel(
-                model = RandomEntriesGenerator(
-                    xRange = minX..maxX,
-                    yRange = minY..maxY,
-                    seriesCount = seriesCount,
-                    modelCount = modelCount,
-                ).randomComposedEntryModel(),
-            )
+        private fun setPreviewModel(attrs: AttributeSet) {
+            context.obtainStyledAttributes(attrs, R.styleable.ComposedChartView).use { typedArray ->
+                val modelCount = typedArray.getInt(R.styleable.ComposedChartView_previewModelCount, MODEL_COUNT)
+                val seriesCount = typedArray.getInt(R.styleable.ComposedChartView_previewSeriesCount, SERIES_COUNT)
+                val minX = typedArray.getInt(R.styleable.ComposedChartView_previewMinX, 0)
+                val maxX = typedArray.getInt(R.styleable.ComposedChartView_previewMaxX, X_RANGE_TOP)
+                val minY = typedArray.getInt(R.styleable.ComposedChartView_previewMinY, 0)
+                val maxY = typedArray.getInt(R.styleable.ComposedChartView_previewMaxY, Y_RANGE_TOP)
+                setModel(
+                    model =
+                        RandomEntriesGenerator(
+                            xRange = minX..maxX,
+                            yRange = minY..maxY,
+                            seriesCount = seriesCount,
+                            modelCount = modelCount,
+                        ).randomComposedEntryModel(),
+                )
+            }
         }
     }
-}
diff --git a/vico/views/src/main/java/com/patrykandpatrick/vico/views/chart/column/ColumnChartExtensions.kt b/vico/views/src/main/java/com/patrykandpatrick/vico/views/chart/column/ColumnChartExtensions.kt
index 64ca93b77..0e8b70f74 100644
--- a/vico/views/src/main/java/com/patrykandpatrick/vico/views/chart/column/ColumnChartExtensions.kt
+++ b/vico/views/src/main/java/com/patrykandpatrick/vico/views/chart/column/ColumnChartExtensions.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 by Patryk Goworowski and Patrick Michalik.
+ * Copyright 2023 by Patryk Goworowski and Patrick Michalik.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -76,28 +76,31 @@ public fun columnChart(
 ): ColumnChart {
     val tempArray = IntArray(1)
 
-    val columns = listOf(R.attr.column1, R.attr.column2, R.attr.column3)
-        .map { themeAttrResItem -> columnLineComponent(context, themeAttrResItem, styleResId) }
+    val columns =
+        listOf(R.attr.column1, R.attr.column2, R.attr.column3)
+            .map { themeAttrResItem -> columnLineComponent(context, themeAttrResItem, styleResId) }
 
     tempArray[0] = R.styleable.ColumnChartStyle_columnOuterSpacing
 
-    val spacingDp = context.obtainStyledAttributes(null, tempArray)
-        .use { typedArray ->
-            typedArray.getRawDimension(
-                context = context,
-                index = R.styleable.ColumnChartStyle_columnOuterSpacing,
-                defaultValue = DefaultDimens.COLUMN_OUTSIDE_SPACING,
-            )
-        }
+    val spacingDp =
+        context.obtainStyledAttributes(null, tempArray)
+            .use { typedArray ->
+                typedArray.getRawDimension(
+                    context = context,
+                    index = R.styleable.ColumnChartStyle_columnOuterSpacing,
+                    defaultValue = DefaultDimens.COLUMN_OUTSIDE_SPACING,
+                )
+            }
 
-    val innerSpacingDp = context.obtainStyledAttributes(null, tempArray)
-        .use { typedArray ->
-            typedArray.getRawDimension(
-                context = context,
-                index = R.styleable.ColumnChartStyle_columnInnerSpacing,
-                defaultValue = DefaultDimens.COLUMN_INSIDE_SPACING,
-            )
-        }
+    val innerSpacingDp =
+        context.obtainStyledAttributes(null, tempArray)
+            .use { typedArray ->
+                typedArray.getRawDimension(
+                    context = context,
+                    index = R.styleable.ColumnChartStyle_columnInnerSpacing,
+                    defaultValue = DefaultDimens.COLUMN_INSIDE_SPACING,
+                )
+            }
 
     return ColumnChart(
         columns = columns,
diff --git a/vico/views/src/main/java/com/patrykandpatrick/vico/views/chart/line/LineChartExtensions.kt b/vico/views/src/main/java/com/patrykandpatrick/vico/views/chart/line/LineChartExtensions.kt
index 08822c3c4..155382aa5 100644
--- a/vico/views/src/main/java/com/patrykandpatrick/vico/views/chart/line/LineChartExtensions.kt
+++ b/vico/views/src/main/java/com/patrykandpatrick/vico/views/chart/line/LineChartExtensions.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 by Patryk Goworowski and Patrick Michalik.
+ * Copyright 2023 by Patryk Goworowski and Patrick Michalik.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -73,18 +73,20 @@ public fun lineChart(
 ): LineChart {
     val tempArray = IntArray(1)
 
-    val lineSpecs = listOf(R.attr.line1Spec, R.attr.line2Spec, R.attr.line3Spec)
-        .map { themeAttrResItem -> lineSpec(context, themeAttrResItem, styleResId) }
+    val lineSpecs =
+        listOf(R.attr.line1Spec, R.attr.line2Spec, R.attr.line3Spec)
+            .map { themeAttrResItem -> lineSpec(context, themeAttrResItem, styleResId) }
 
     tempArray[0] = R.styleable.LineChartStyle_spacing
-    val spacingDp = context.obtainStyledAttributes(null, tempArray)
-        .use { typedArray ->
-            typedArray.getRawDimension(
-                context = context,
-                index = R.styleable.LineChartStyle_spacing,
-                defaultValue = DefaultDimens.POINT_SPACING,
-            )
-        }
+    val spacingDp =
+        context.obtainStyledAttributes(null, tempArray)
+            .use { typedArray ->
+                typedArray.getRawDimension(
+                    context = context,
+                    index = R.styleable.LineChartStyle_spacing,
+                    defaultValue = DefaultDimens.POINT_SPACING,
+                )
+            }
 
     return LineChart(
         lines = lineSpecs,
diff --git a/vico/views/src/main/java/com/patrykandpatrick/vico/views/component/shape/ShapeDrawable.kt b/vico/views/src/main/java/com/patrykandpatrick/vico/views/component/shape/ShapeDrawable.kt
index e8102f9a8..c76f4a1ad 100644
--- a/vico/views/src/main/java/com/patrykandpatrick/vico/views/component/shape/ShapeDrawable.kt
+++ b/vico/views/src/main/java/com/patrykandpatrick/vico/views/component/shape/ShapeDrawable.kt
@@ -48,7 +48,6 @@ public class ShapeDrawable(
     private val width: Int = 0,
     private val height: Int = 0,
 ) : Drawable() {
-
     public constructor(
         context: Context,
         shape: Shape,
@@ -69,9 +68,10 @@ public class ShapeDrawable(
     /**
      * The [Paint] used to draw the shape.
      */
-    public val paint: Paint = Paint(Paint.ANTI_ALIAS_FLAG).apply {
-        color = DEF_COLOR
-    }
+    public val paint: Paint =
+        Paint(Paint.ANTI_ALIAS_FLAG).apply {
+            color = DEF_COLOR
+        }
 
     init {
         setBounds(0, 0, width, height)
@@ -94,11 +94,12 @@ public class ShapeDrawable(
         path.reset()
     }
 
-    private fun isLtr(): Boolean = if (Build.VERSION.SDK_INT == Build.VERSION_CODES.M) {
-        layoutDirection == LayoutDirection.LTR
-    } else {
-        isLtr
-    }
+    private fun isLtr(): Boolean =
+        if (Build.VERSION.SDK_INT == Build.VERSION_CODES.M) {
+            layoutDirection == LayoutDirection.LTR
+        } else {
+            isLtr
+        }
 
     override fun setAlpha(alpha: Int) {
         paint.alpha = alpha
diff --git a/vico/views/src/main/java/com/patrykandpatrick/vico/views/component/shape/Shapes.kt b/vico/views/src/main/java/com/patrykandpatrick/vico/views/component/shape/Shapes.kt
index 3a9232dc8..1e4b248fd 100644
--- a/vico/views/src/main/java/com/patrykandpatrick/vico/views/component/shape/Shapes.kt
+++ b/vico/views/src/main/java/com/patrykandpatrick/vico/views/component/shape/Shapes.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 by Patryk Goworowski and Patrick Michalik.
+ * Copyright 2023 by Patryk Goworowski and Patrick Michalik.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,8 +28,7 @@ import com.patrykandpatrick.vico.core.component.shape.cornered.RoundedCornerTrea
 /**
  * Creates a [CorneredShape] with rounded corners of the provided size.
  */
-public fun Shapes.roundedCornerShape(all: Float): Shape =
-    roundedCornerShape(all, all, all, all)
+public fun Shapes.roundedCornerShape(all: Float): Shape = roundedCornerShape(all, all, all, all)
 
 /**
  * Creates a [CorneredShape] with rounded corners of the provided sizes.
@@ -39,18 +38,18 @@ public fun Shapes.roundedCornerShape(
     topRight: Float = 0f,
     bottomRight: Float = 0f,
     bottomLeft: Float = 0f,
-): CorneredShape = CorneredShape(
-    Corner.Absolute(topLeft, RoundedCornerTreatment),
-    Corner.Absolute(topRight, RoundedCornerTreatment),
-    Corner.Absolute(bottomRight, RoundedCornerTreatment),
-    Corner.Absolute(bottomLeft, RoundedCornerTreatment),
-)
+): CorneredShape =
+    CorneredShape(
+        Corner.Absolute(topLeft, RoundedCornerTreatment),
+        Corner.Absolute(topRight, RoundedCornerTreatment),
+        Corner.Absolute(bottomRight, RoundedCornerTreatment),
+        Corner.Absolute(bottomLeft, RoundedCornerTreatment),
+    )
 
 /**
  * Creates a [CorneredShape] with cut corners of the provided size.
  */
-public fun Shapes.cutCornerShape(all: Float): Shape =
-    cutCornerShape(all, all, all, all)
+public fun Shapes.cutCornerShape(all: Float): Shape = cutCornerShape(all, all, all, all)
 
 /**
  * Creates a [CorneredShape] with cut corners of the provided sizes.
@@ -60,9 +59,10 @@ public fun Shapes.cutCornerShape(
     topRight: Float = 0f,
     bottomRight: Float = 0f,
     bottomLeft: Float = 0f,
-): CorneredShape = CorneredShape(
-    Corner.Absolute(topLeft, CutCornerTreatment),
-    Corner.Absolute(topRight, CutCornerTreatment),
-    Corner.Absolute(bottomRight, CutCornerTreatment),
-    Corner.Absolute(bottomLeft, CutCornerTreatment),
-)
+): CorneredShape =
+    CorneredShape(
+        Corner.Absolute(topLeft, CutCornerTreatment),
+        Corner.Absolute(topRight, CutCornerTreatment),
+        Corner.Absolute(bottomRight, CutCornerTreatment),
+        Corner.Absolute(bottomLeft, CutCornerTreatment),
+    )
diff --git a/vico/views/src/main/java/com/patrykandpatrick/vico/views/component/shape/shader/DynamicShaders.kt b/vico/views/src/main/java/com/patrykandpatrick/vico/views/component/shape/shader/DynamicShaders.kt
index 56db49014..4d4bff195 100644
--- a/vico/views/src/main/java/com/patrykandpatrick/vico/views/component/shape/shader/DynamicShaders.kt
+++ b/vico/views/src/main/java/com/patrykandpatrick/vico/views/component/shape/shader/DynamicShaders.kt
@@ -45,22 +45,21 @@ public fun DynamicShaders.fromComponent(
     checkeredArrangement: Boolean = true,
     tileXMode: Shader.TileMode = Shader.TileMode.REPEAT,
     tileYMode: Shader.TileMode = tileXMode,
-): ComponentShader = ComponentShader(
-    component = component,
-    componentSizeDp = componentSizeDp,
-    checkeredArrangement = checkeredArrangement,
-    tileXMode = tileXMode,
-    tileYMode = tileYMode,
-)
+): ComponentShader =
+    ComponentShader(
+        component = component,
+        componentSizeDp = componentSizeDp,
+        checkeredArrangement = checkeredArrangement,
+        tileXMode = tileXMode,
+        tileYMode = tileYMode,
+    )
 
 /**
  * Creates a [DynamicShader] in the form of a horizontal gradient.
  *
  * @param colors the sRGB colors to be distributed along the gradient line.
  */
-public fun DynamicShaders.horizontalGradient(
-    vararg colors: Int,
-): DynamicShader = horizontalGradient(colors)
+public fun DynamicShaders.horizontalGradient(vararg colors: Int): DynamicShader = horizontalGradient(colors)
 
 /**
  * Creates a [DynamicShader] in the form of a horizontal gradient.
@@ -74,37 +73,43 @@ public fun DynamicShaders.horizontalGradient(
 public fun DynamicShaders.horizontalGradient(
     colors: IntArray,
     positions: FloatArray? = null,
-): DynamicShader = object : CacheableDynamicShader() {
-
-    override fun createShader(
-        context: DrawContext,
-        left: Float,
-        top: Float,
-        right: Float,
-        bottom: Float,
-    ): Shader =
-        LinearGradient(
-            left,
-            top,
-            right,
-            top,
-            colors,
-            positions,
-            Shader.TileMode.CLAMP,
-        )
+): DynamicShader =
+    object : CacheableDynamicShader() {
+        override fun createShader(
+            context: DrawContext,
+            left: Float,
+            top: Float,
+            right: Float,
+            bottom: Float,
+        ): Shader =
+            LinearGradient(
+                left,
+                top,
+                right,
+                top,
+                colors,
+                positions,
+                Shader.TileMode.CLAMP,
+            )
 
-    override fun createKey(left: Float, top: Float, right: Float, bottom: Float): String =
-        "%s,%s".format(left, right)
-}
+        override fun createKey(
+            left: Float,
+            top: Float,
+            right: Float,
+            bottom: Float,
+        ): String =
+            "%s,%s".format(
+                left,
+                right,
+            )
+    }
 
 /**
  * Creates a [DynamicShader] in the form of a vertical gradient.
  *
  * @param colors the sRGB colors to be distributed along the gradient line.
  */
-public fun DynamicShaders.verticalGradient(
-    vararg colors: Int,
-): DynamicShader = verticalGradient(colors)
+public fun DynamicShaders.verticalGradient(vararg colors: Int): DynamicShader = verticalGradient(colors)
 
 /**
  * Creates a [DynamicShader] in the form of a vertical gradient.
@@ -118,33 +123,43 @@ public fun DynamicShaders.verticalGradient(
 public fun DynamicShaders.verticalGradient(
     colors: IntArray,
     positions: FloatArray? = null,
-): DynamicShader = object : CacheableDynamicShader() {
-
-    override fun createShader(
-        context: DrawContext,
-        left: Float,
-        top: Float,
-        right: Float,
-        bottom: Float,
-    ): Shader =
-        LinearGradient(
-            left,
-            top,
-            left,
-            bottom,
-            colors,
-            positions,
-            Shader.TileMode.CLAMP,
-        )
+): DynamicShader =
+    object : CacheableDynamicShader() {
+        override fun createShader(
+            context: DrawContext,
+            left: Float,
+            top: Float,
+            right: Float,
+            bottom: Float,
+        ): Shader =
+            LinearGradient(
+                left,
+                top,
+                left,
+                bottom,
+                colors,
+                positions,
+                Shader.TileMode.CLAMP,
+            )
 
-    override fun createKey(left: Float, top: Float, right: Float, bottom: Float): String =
-        "%s,%s".format(top, bottom)
-}
+        override fun createKey(
+            left: Float,
+            top: Float,
+            right: Float,
+            bottom: Float,
+        ): String =
+            "%s,%s".format(
+                top,
+                bottom,
+            )
+    }
 
 /**
  * Creates a [DynamicShader] that fills the area with a solid color.
  */
-public fun DynamicShaders.solid(@ColorInt color: Int): SolidShader = SolidShader(color)
+public fun DynamicShaders.solid(
+    @ColorInt color: Int,
+): SolidShader = SolidShader(color)
 
 /**
  * Creates a [DynamicShader] with split colors. The positive color is used for values above the zero line,
diff --git a/vico/views/src/main/java/com/patrykandpatrick/vico/views/dimensions/DimensionsExtensions.kt b/vico/views/src/main/java/com/patrykandpatrick/vico/views/dimensions/DimensionsExtensions.kt
index e2e35a25b..8323ee2e2 100644
--- a/vico/views/src/main/java/com/patrykandpatrick/vico/views/dimensions/DimensionsExtensions.kt
+++ b/vico/views/src/main/java/com/patrykandpatrick/vico/views/dimensions/DimensionsExtensions.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 by Patryk Goworowski and Patrick Michalik.
+ * Copyright 2023 by Patryk Goworowski and Patrick Michalik.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,12 +21,13 @@ import com.patrykandpatrick.vico.core.dimensions.MutableDimensions
 /**
  * Creates a [MutableDimensions] instance with a common value for each coordinate.
  */
-public fun dimensionsOf(allDp: Float): MutableDimensions = dimensionsOf(
-    startDp = allDp,
-    topDp = allDp,
-    endDp = allDp,
-    bottomDp = allDp,
-)
+public fun dimensionsOf(allDp: Float): MutableDimensions =
+    dimensionsOf(
+        startDp = allDp,
+        topDp = allDp,
+        endDp = allDp,
+        bottomDp = allDp,
+    )
 
 /**
  * Creates a [MutableDimensions] instance using the provided measurements.
@@ -36,12 +37,13 @@ public fun dimensionsOf(
     topDp: Float = 0f,
     endDp: Float = 0f,
     bottomDp: Float = 0f,
-): MutableDimensions = MutableDimensions(
-    startDp = startDp,
-    topDp = topDp,
-    endDp = endDp,
-    bottomDp = bottomDp,
-)
+): MutableDimensions =
+    MutableDimensions(
+        startDp = startDp,
+        topDp = topDp,
+        endDp = endDp,
+        bottomDp = bottomDp,
+    )
 
 /**
  * Creates a [MutableDimensions] instance using the provided measurements.
@@ -49,9 +51,10 @@ public fun dimensionsOf(
 public fun dimensionsOf(
     verticalDp: Float = 0f,
     horizontalDp: Float = 0f,
-): MutableDimensions = MutableDimensions(
-    startDp = horizontalDp,
-    topDp = verticalDp,
-    endDp = horizontalDp,
-    bottomDp = verticalDp,
-)
+): MutableDimensions =
+    MutableDimensions(
+        startDp = horizontalDp,
+        topDp = verticalDp,
+        endDp = horizontalDp,
+        bottomDp = verticalDp,
+    )
diff --git a/vico/views/src/main/java/com/patrykandpatrick/vico/views/extension/ContextExtensions.kt b/vico/views/src/main/java/com/patrykandpatrick/vico/views/extension/ContextExtensions.kt
index dcb2f3b36..b6d88933d 100644
--- a/vico/views/src/main/java/com/patrykandpatrick/vico/views/extension/ContextExtensions.kt
+++ b/vico/views/src/main/java/com/patrykandpatrick/vico/views/extension/ContextExtensions.kt
@@ -26,11 +26,12 @@ internal val Context.density: Float
     get() = resources.displayMetrics.density
 
 internal val Context.isLtr: Boolean
-    get() = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
-        resources.configuration.layoutDirection == ViewCompat.LAYOUT_DIRECTION_LTR
-    } else {
-        true
-    }
+    get() =
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
+            resources.configuration.layoutDirection == ViewCompat.LAYOUT_DIRECTION_LTR
+        } else {
+            true
+        }
 
 internal val Context.isDarkMode: Boolean
     get() = resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK == Configuration.UI_MODE_NIGHT_YES
diff --git a/vico/views/src/main/java/com/patrykandpatrick/vico/views/extension/ViewExtensions.kt b/vico/views/src/main/java/com/patrykandpatrick/vico/views/extension/ViewExtensions.kt
index 75870e1e8..1ee228779 100644
--- a/vico/views/src/main/java/com/patrykandpatrick/vico/views/extension/ViewExtensions.kt
+++ b/vico/views/src/main/java/com/patrykandpatrick/vico/views/extension/ViewExtensions.kt
@@ -25,7 +25,10 @@ import androidx.core.view.updatePadding
 import com.patrykandpatrick.vico.core.model.Point
 import kotlin.math.min
 
-internal fun View.measureDimension(desiredSize: Int, measureSpec: Int): Int {
+internal fun View.measureDimension(
+    desiredSize: Int,
+    measureSpec: Int,
+): Int {
     val specMode = View.MeasureSpec.getMode(measureSpec)
     val specSize = View.MeasureSpec.getSize(measureSpec)
     return when (specMode) {
diff --git a/vico/views/src/main/java/com/patrykandpatrick/vico/views/gestures/ChartScaleGestureListener.kt b/vico/views/src/main/java/com/patrykandpatrick/vico/views/gestures/ChartScaleGestureListener.kt
index e9660be07..01028dd87 100644
--- a/vico/views/src/main/java/com/patrykandpatrick/vico/views/gestures/ChartScaleGestureListener.kt
+++ b/vico/views/src/main/java/com/patrykandpatrick/vico/views/gestures/ChartScaleGestureListener.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 by Patryk Goworowski and Patrick Michalik.
+ * Copyright 2023 by Patryk Goworowski and Patrick Michalik.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,7 +23,6 @@ internal class ChartScaleGestureListener(
     private val getChartBounds: () -> RectF?,
     private val onZoom: (focusX: Float, zoomChange: Float) -> Unit,
 ) : ScaleGestureDetector.OnScaleGestureListener {
-
     override fun onScale(detector: ScaleGestureDetector): Boolean {
         onZoom(detector.focusX, detector.scaleFactor)
         return true
diff --git a/vico/views/src/main/java/com/patrykandpatrick/vico/views/gestures/MotionEventHandler.kt b/vico/views/src/main/java/com/patrykandpatrick/vico/views/gestures/MotionEventHandler.kt
index 9ab6245bc..29affbc66 100644
--- a/vico/views/src/main/java/com/patrykandpatrick/vico/views/gestures/MotionEventHandler.kt
+++ b/vico/views/src/main/java/com/patrykandpatrick/vico/views/gestures/MotionEventHandler.kt
@@ -41,7 +41,6 @@ public open class MotionEventHandler(
     private val onTouchPoint: (Point?) -> Unit,
     private val requestInvalidate: () -> Unit,
 ) {
-
     private val velocityUnits = (VELOCITY_PIXELS * density).toInt()
     private val dragThreshold = DRAG_THRESHOLD_PIXELS * density
     private var initialX = -dragThreshold
@@ -114,12 +113,10 @@ public open class MotionEventHandler(
     }
 
     private class VelocityTrackerHelper {
-
         private var tracker: VelocityTracker? = null
 
         @SuppressLint("Recycle")
-        fun get(): VelocityTracker =
-            tracker ?: VelocityTracker.obtain().also { tracker = it }
+        fun get(): VelocityTracker = tracker ?: VelocityTracker.obtain().also { tracker = it }
 
         fun clear() {
             tracker?.recycle()
diff --git a/vico/views/src/main/java/com/patrykandpatrick/vico/views/scroll/ChartScrollSpec.kt b/vico/views/src/main/java/com/patrykandpatrick/vico/views/scroll/ChartScrollSpec.kt
index 3d6a2a146..65d5a2bf1 100644
--- a/vico/views/src/main/java/com/patrykandpatrick/vico/views/scroll/ChartScrollSpec.kt
+++ b/vico/views/src/main/java/com/patrykandpatrick/vico/views/scroll/ChartScrollSpec.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 by Patryk Goworowski and Patrick Michalik.
+ * Copyright 2023 by Patryk Goworowski and Patrick Michalik.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -41,13 +41,14 @@ public class ChartScrollSpec<in Model : ChartEntryModel>(
     public val autoScrollInterpolator: TimeInterpolator = AccelerateDecelerateInterpolator(),
     public val autoScrollDuration: Long = Animation.DIFF_DURATION.toLong(),
 ) {
-    private val animator: ValueAnimator = ValueAnimator.ofFloat(
-        Animation.range.start,
-        Animation.range.endInclusive,
-    ).apply {
-        duration = autoScrollDuration
-        interpolator = autoScrollInterpolator
-    }
+    private val animator: ValueAnimator =
+        ValueAnimator.ofFloat(
+            Animation.range.start,
+            Animation.range.endInclusive,
+        ).apply {
+            duration = autoScrollDuration
+            interpolator = autoScrollInterpolator
+        }
 
     /**
      * Performs an automatic scroll.
@@ -63,12 +64,13 @@ public class ChartScrollSpec<in Model : ChartEntryModel>(
             removeAllUpdateListeners()
             addUpdateListener {
                 scrollHandler.handleScroll(
-                    targetScroll = when (initialScroll) {
-                        InitialScroll.Start -> (1 - it.animatedFraction) * scrollHandler.value
-                        InitialScroll.End ->
-                            scrollHandler.value + it.animatedFraction *
-                                (scrollHandler.maxValue - scrollHandler.value)
-                    },
+                    targetScroll =
+                        when (initialScroll) {
+                            InitialScroll.Start -> (1 - it.animatedFraction) * scrollHandler.value
+                            InitialScroll.End ->
+                                scrollHandler.value + it.animatedFraction *
+                                    (scrollHandler.maxValue - scrollHandler.value)
+                        },
                 )
             }
             start()
@@ -85,10 +87,11 @@ public fun <Model : ChartEntryModel> ChartScrollSpec<Model>.copy(
     autoScrollCondition: AutoScrollCondition<Model> = this.autoScrollCondition,
     autoScrollInterpolator: TimeInterpolator = this.autoScrollInterpolator,
     autoScrollDuration: Long = this.autoScrollDuration,
-): ChartScrollSpec<Model> = ChartScrollSpec(
-    isScrollEnabled = isScrollEnabled,
-    initialScroll = initialScroll,
-    autoScrollCondition = autoScrollCondition,
-    autoScrollInterpolator = autoScrollInterpolator,
-    autoScrollDuration = autoScrollDuration,
-)
+): ChartScrollSpec<Model> =
+    ChartScrollSpec(
+        isScrollEnabled = isScrollEnabled,
+        initialScroll = initialScroll,
+        autoScrollCondition = autoScrollCondition,
+        autoScrollInterpolator = autoScrollInterpolator,
+        autoScrollDuration = autoScrollDuration,
+    )
diff --git a/vico/views/src/main/java/com/patrykandpatrick/vico/views/theme/ChartStyleExtensions.kt b/vico/views/src/main/java/com/patrykandpatrick/vico/views/theme/ChartStyleExtensions.kt
index 1a85dc941..f6bd0398f 100644
--- a/vico/views/src/main/java/com/patrykandpatrick/vico/views/theme/ChartStyleExtensions.kt
+++ b/vico/views/src/main/java/com/patrykandpatrick/vico/views/theme/ChartStyleExtensions.kt
@@ -33,108 +33,118 @@ internal fun TypedArray.getColumnChart(
     @StyleableRes resourceId: Int = R.styleable.BaseChartView_columnChartStyle,
     @StyleableRes styleableResourceId: IntArray = R.styleable.ColumnChartStyle,
     mergeMode: MergeMode,
-): ColumnChart = getNestedTypedArray(context, resourceId, styleableResourceId).run {
-    val defaultShape = Shapes.roundedCornerShape(allPercent = DefaultDimens.COLUMN_ROUNDNESS_PERCENT)
-    ColumnChart(
-        columns = listOf(
-            getNestedTypedArray(
-                context = context,
-                resourceId = R.styleable.ColumnChartStyle_column1,
-                styleableResourceId = R.styleable.LineComponent,
-            ).getLineComponent(
-                context = context,
-                defaultColor = context.defaultColors.entity1Color.toInt(),
-                defaultThickness = DefaultDimens.COLUMN_WIDTH,
-                defaultShape = defaultShape,
-            ),
-            getNestedTypedArray(
-                context = context,
-                resourceId = R.styleable.ColumnChartStyle_column2,
-                styleableResourceId = R.styleable.LineComponent,
-            ).getLineComponent(
-                context = context,
-                defaultColor = context.defaultColors.entity2Color.toInt(),
-                defaultThickness = DefaultDimens.COLUMN_WIDTH,
-                defaultShape = defaultShape,
-            ),
-            getNestedTypedArray(
-                context = context,
-                resourceId = R.styleable.ColumnChartStyle_column3,
-                styleableResourceId = R.styleable.LineComponent,
-            ).getLineComponent(
-                context = context,
-                defaultColor = context.defaultColors.entity3Color.toInt(),
-                defaultThickness = DefaultDimens.COLUMN_WIDTH,
-                defaultShape = defaultShape,
-            ),
-        ),
-        spacingDp = getRawDimension(
-            context = context,
-            index = R.styleable.ColumnChartStyle_columnOuterSpacing,
-            defaultValue = DefaultDimens.COLUMN_OUTSIDE_SPACING,
-        ),
-        innerSpacingDp = getRawDimension(
-            context = context,
-            index = R.styleable.ColumnChartStyle_columnInnerSpacing,
-            defaultValue = DefaultDimens.COLUMN_INSIDE_SPACING,
-        ),
-        mergeMode = mergeMode,
-        dataLabel = if (getBoolean(R.styleable.ColumnChartStyle_showDataLabels, false)) {
-            getNestedTypedArray(
-                context = context,
-                resourceId = R.styleable.ColumnChartStyle_dataLabelStyle,
-                styleableResourceId = R.styleable.TextComponentStyle,
-            ).getTextComponent(context = context)
-        } else {
-            null
-        },
-        dataLabelVerticalPosition = getInteger(R.styleable.ColumnChartStyle_dataLabelVerticalPosition, 0).let { value ->
-            val values = VerticalPosition.values()
-            values[value % values.size]
-        },
-        dataLabelRotationDegrees = getFloat(
-            R.styleable.ColumnChartStyle_dataLabelRotationDegrees,
-            0f,
-        ),
-    )
-}
+): ColumnChart =
+    getNestedTypedArray(context, resourceId, styleableResourceId).run {
+        val defaultShape = Shapes.roundedCornerShape(allPercent = DefaultDimens.COLUMN_ROUNDNESS_PERCENT)
+        ColumnChart(
+            columns =
+                listOf(
+                    getNestedTypedArray(
+                        context = context,
+                        resourceId = R.styleable.ColumnChartStyle_column1,
+                        styleableResourceId = R.styleable.LineComponent,
+                    ).getLineComponent(
+                        context = context,
+                        defaultColor = context.defaultColors.entity1Color.toInt(),
+                        defaultThickness = DefaultDimens.COLUMN_WIDTH,
+                        defaultShape = defaultShape,
+                    ),
+                    getNestedTypedArray(
+                        context = context,
+                        resourceId = R.styleable.ColumnChartStyle_column2,
+                        styleableResourceId = R.styleable.LineComponent,
+                    ).getLineComponent(
+                        context = context,
+                        defaultColor = context.defaultColors.entity2Color.toInt(),
+                        defaultThickness = DefaultDimens.COLUMN_WIDTH,
+                        defaultShape = defaultShape,
+                    ),
+                    getNestedTypedArray(
+                        context = context,
+                        resourceId = R.styleable.ColumnChartStyle_column3,
+                        styleableResourceId = R.styleable.LineComponent,
+                    ).getLineComponent(
+                        context = context,
+                        defaultColor = context.defaultColors.entity3Color.toInt(),
+                        defaultThickness = DefaultDimens.COLUMN_WIDTH,
+                        defaultShape = defaultShape,
+                    ),
+                ),
+            spacingDp =
+                getRawDimension(
+                    context = context,
+                    index = R.styleable.ColumnChartStyle_columnOuterSpacing,
+                    defaultValue = DefaultDimens.COLUMN_OUTSIDE_SPACING,
+                ),
+            innerSpacingDp =
+                getRawDimension(
+                    context = context,
+                    index = R.styleable.ColumnChartStyle_columnInnerSpacing,
+                    defaultValue = DefaultDimens.COLUMN_INSIDE_SPACING,
+                ),
+            mergeMode = mergeMode,
+            dataLabel =
+                if (getBoolean(R.styleable.ColumnChartStyle_showDataLabels, false)) {
+                    getNestedTypedArray(
+                        context = context,
+                        resourceId = R.styleable.ColumnChartStyle_dataLabelStyle,
+                        styleableResourceId = R.styleable.TextComponentStyle,
+                    ).getTextComponent(context = context)
+                } else {
+                    null
+                },
+            dataLabelVerticalPosition =
+                getInteger(R.styleable.ColumnChartStyle_dataLabelVerticalPosition, 0).let { value ->
+                    val values = VerticalPosition.values()
+                    values[value % values.size]
+                },
+            dataLabelRotationDegrees =
+                getFloat(
+                    R.styleable.ColumnChartStyle_dataLabelRotationDegrees,
+                    0f,
+                ),
+        )
+    }
 
 internal fun TypedArray.getLineChart(
     context: Context,
     @StyleableRes resourceId: Int = R.styleable.BaseChartView_lineChartStyle,
     @StyleableRes styleableResourceId: IntArray = R.styleable.LineChartStyle,
-): LineChart = getNestedTypedArray(context, resourceId, styleableResourceId).run {
-    LineChart(
-        lines = listOf(
-            getNestedTypedArray(
-                context = context,
-                resourceId = R.styleable.LineChartStyle_line1Spec,
-                styleableResourceId = R.styleable.LineSpec,
-            ).getLineSpec(
-                context = context,
-                defaultColor = context.defaultColors.entity1Color.toInt(),
-            ),
-            getNestedTypedArray(
-                context = context,
-                resourceId = R.styleable.LineChartStyle_line2Spec,
-                styleableResourceId = R.styleable.LineSpec,
-            ).getLineSpec(
-                context = context,
-                defaultColor = context.defaultColors.entity2Color.toInt(),
-            ),
-            getNestedTypedArray(
-                context = context,
-                resourceId = R.styleable.LineChartStyle_line3Spec,
-                styleableResourceId = R.styleable.LineSpec,
-            ).getLineSpec(
-                context = context,
-                defaultColor = context.defaultColors.entity3Color.toInt(),
-            ),
-        ),
-        spacingDp = getRawDimension(
-            context = context,
-            index = R.styleable.LineChartStyle_spacing,
-            defaultValue = DefaultDimens.POINT_SPACING,
-        ),
-    )
-}
+): LineChart =
+    getNestedTypedArray(context, resourceId, styleableResourceId).run {
+        LineChart(
+            lines =
+                listOf(
+                    getNestedTypedArray(
+                        context = context,
+                        resourceId = R.styleable.LineChartStyle_line1Spec,
+                        styleableResourceId = R.styleable.LineSpec,
+                    ).getLineSpec(
+                        context = context,
+                        defaultColor = context.defaultColors.entity1Color.toInt(),
+                    ),
+                    getNestedTypedArray(
+                        context = context,
+                        resourceId = R.styleable.LineChartStyle_line2Spec,
+                        styleableResourceId = R.styleable.LineSpec,
+                    ).getLineSpec(
+                        context = context,
+                        defaultColor = context.defaultColors.entity2Color.toInt(),
+                    ),
+                    getNestedTypedArray(
+                        context = context,
+                        resourceId = R.styleable.LineChartStyle_line3Spec,
+                        styleableResourceId = R.styleable.LineSpec,
+                    ).getLineSpec(
+                        context = context,
+                        defaultColor = context.defaultColors.entity3Color.toInt(),
+                    ),
+                ),
+            spacingDp =
+                getRawDimension(
+                    context = context,
+                    index = R.styleable.LineChartStyle_spacing,
+                    defaultValue = DefaultDimens.POINT_SPACING,
+                ),
+        )
+    }
diff --git a/vico/views/src/main/java/com/patrykandpatrick/vico/views/theme/ComponentStyleExtensions.kt b/vico/views/src/main/java/com/patrykandpatrick/vico/views/theme/ComponentStyleExtensions.kt
index 74d2dc363..d7f390725 100644
--- a/vico/views/src/main/java/com/patrykandpatrick/vico/views/theme/ComponentStyleExtensions.kt
+++ b/vico/views/src/main/java/com/patrykandpatrick/vico/views/theme/ComponentStyleExtensions.kt
@@ -43,186 +43,211 @@ internal fun TypedArray.getLineComponent(
     defaultColor: Int = context.defaultColors.axisLineColor.toInt(),
     defaultThickness: Float = DefaultDimens.AXIS_LINE_WIDTH,
     defaultShape: Shape = Shapes.rectShape,
-): LineComponent = use { array ->
-    LineComponent(
-        color = array.getColorExtended(
-            index = R.styleable.LineComponent_color,
-            defaultColor = defaultColor,
-        ),
-        thicknessDp = array.getRawDimension(
-            context = context,
-            index = R.styleable.LineComponent_thickness,
-            defaultValue = defaultThickness,
-        ),
-        shape = if (hasValue(R.styleable.LineComponent_shapeStyle)) {
-            getNestedTypedArray(
-                context = context,
-                resourceId = R.styleable.LineComponent_shapeStyle,
-                styleableResourceId = R.styleable.Shape,
-            ).getShape(
-                context = context,
-            )
-        } else {
-            defaultShape
-        },
-        strokeColor = array.getColorExtended(
-            index = R.styleable.LineComponent_strokeColor,
-            defaultColor = Color.TRANSPARENT,
-        ),
-        strokeWidthDp = array.getRawDimension(
-            context = context,
-            index = R.styleable.LineComponent_strokeWidth,
-            defaultValue = 0f,
-        ),
-    )
-}
-
-internal fun TypedArray.getComponent(
-    context: Context,
-): Component? = use { array ->
-
-    if (!hasValue(R.styleable.ComponentStyle_color)) {
-        return@use null
-    }
-
-    val overlayingComponent = if (hasValue(R.styleable.ComponentStyle_overlayingComponentStyle)) {
-        getNestedTypedArray(
-            context = context,
-            resourceId = R.styleable.ComponentStyle_overlayingComponentStyle,
-            styleableResourceId = R.styleable.ComponentStyle,
-        ).getComponent(context)
-    } else {
-        null
+): LineComponent =
+    use { array ->
+        LineComponent(
+            color =
+                array.getColorExtended(
+                    index = R.styleable.LineComponent_color,
+                    defaultColor = defaultColor,
+                ),
+            thicknessDp =
+                array.getRawDimension(
+                    context = context,
+                    index = R.styleable.LineComponent_thickness,
+                    defaultValue = defaultThickness,
+                ),
+            shape =
+                if (hasValue(R.styleable.LineComponent_shapeStyle)) {
+                    getNestedTypedArray(
+                        context = context,
+                        resourceId = R.styleable.LineComponent_shapeStyle,
+                        styleableResourceId = R.styleable.Shape,
+                    ).getShape(
+                        context = context,
+                    )
+                } else {
+                    defaultShape
+                },
+            strokeColor =
+                array.getColorExtended(
+                    index = R.styleable.LineComponent_strokeColor,
+                    defaultColor = Color.TRANSPARENT,
+                ),
+            strokeWidthDp =
+                array.getRawDimension(
+                    context = context,
+                    index = R.styleable.LineComponent_strokeWidth,
+                    defaultValue = 0f,
+                ),
+        )
     }
 
-    val baseComponent = ShapeComponent(
-        color = array.getColorExtended(index = R.styleable.ComponentStyle_color),
-        shape = getNestedTypedArray(
-            context = context,
-            resourceId = R.styleable.ComponentStyle_shapeStyle,
-            styleableResourceId = R.styleable.Shape,
-        ).getShape(context),
-        strokeColor = array.getColorExtended(
-            index = R.styleable.ComponentStyle_strokeColor,
-            defaultColor = Color.TRANSPARENT,
-        ),
-        strokeWidthDp = array.getRawDimension(
-            context = context,
-            index = R.styleable.ComponentStyle_strokeWidth,
-            defaultValue = 0f,
-        ),
-    )
+internal fun TypedArray.getComponent(context: Context): Component? =
+    use { array ->
+
+        if (!hasValue(R.styleable.ComponentStyle_color)) {
+            return@use null
+        }
+
+        val overlayingComponent =
+            if (hasValue(R.styleable.ComponentStyle_overlayingComponentStyle)) {
+                getNestedTypedArray(
+                    context = context,
+                    resourceId = R.styleable.ComponentStyle_overlayingComponentStyle,
+                    styleableResourceId = R.styleable.ComponentStyle,
+                ).getComponent(context)
+            } else {
+                null
+            }
+
+        val baseComponent =
+            ShapeComponent(
+                color = array.getColorExtended(index = R.styleable.ComponentStyle_color),
+                shape =
+                    getNestedTypedArray(
+                        context = context,
+                        resourceId = R.styleable.ComponentStyle_shapeStyle,
+                        styleableResourceId = R.styleable.Shape,
+                    ).getShape(context),
+                strokeColor =
+                    array.getColorExtended(
+                        index = R.styleable.ComponentStyle_strokeColor,
+                        defaultColor = Color.TRANSPARENT,
+                    ),
+                strokeWidthDp =
+                    array.getRawDimension(
+                        context = context,
+                        index = R.styleable.ComponentStyle_strokeWidth,
+                        defaultValue = 0f,
+                    ),
+            )
 
-    if (overlayingComponent != null) {
-        OverlayingComponent(
-            outer = baseComponent,
-            inner = overlayingComponent,
-            innerPaddingAllDp = getRawDimension(
-                context = context,
-                index = R.styleable.ComponentStyle_overlayingComponentPadding,
-                defaultValue = 0f,
-            ),
-        )
-    } else {
-        baseComponent
+        if (overlayingComponent != null) {
+            OverlayingComponent(
+                outer = baseComponent,
+                inner = overlayingComponent,
+                innerPaddingAllDp =
+                    getRawDimension(
+                        context = context,
+                        index = R.styleable.ComponentStyle_overlayingComponentPadding,
+                        defaultValue = 0f,
+                    ),
+            )
+        } else {
+            baseComponent
+        }
     }
-}
 
 internal fun TypedArray.getLineSpec(
     context: Context,
     defaultColor: Int = context.defaultColors.entity1Color.toInt(),
 ): LineChart.LineSpec {
-    val positiveLineColor = getColor(
-        R.styleable.LineSpec_positiveColor,
-        getColor(R.styleable.LineSpec_color, defaultColor),
-    )
+    val positiveLineColor =
+        getColor(
+            R.styleable.LineSpec_positiveColor,
+            getColor(R.styleable.LineSpec_color, defaultColor),
+        )
 
     val negativeLineColor = getColorExtended(R.styleable.LineSpec_negativeColor)
 
-    val lineShader = if (hasValue(R.styleable.LineSpec_negativeColor)) {
-        HorizontalSplitShader.Solid(positiveLineColor, negativeLineColor)
-    } else {
-        SolidShader(positiveLineColor)
-    }
-
-    val positiveShader = if (
-        hasValue(R.styleable.LineSpec_gradientTopColor) ||
-        hasValue(R.styleable.LineSpec_gradientBottomColor) ||
-        hasValue(R.styleable.LineSpec_positiveGradientTopColor) ||
-        hasValue(R.styleable.LineSpec_positiveGradientBottomColor)
-    ) {
-        val gradientTopColor = getColorExtended(
-            index = R.styleable.LineSpec_positiveGradientTopColor,
-            defaultColor = getColorExtended(R.styleable.LineSpec_gradientTopColor),
-        )
-        val gradientBottomColor = getColorExtended(
-            index = R.styleable.LineSpec_positiveGradientBottomColor,
-            defaultColor = getColorExtended(R.styleable.LineSpec_gradientBottomColor),
-        )
+    val lineShader =
+        if (hasValue(R.styleable.LineSpec_negativeColor)) {
+            HorizontalSplitShader.Solid(positiveLineColor, negativeLineColor)
+        } else {
+            SolidShader(positiveLineColor)
+        }
+
+    val positiveShader =
+        if (
+            hasValue(R.styleable.LineSpec_gradientTopColor) ||
+            hasValue(R.styleable.LineSpec_gradientBottomColor) ||
+            hasValue(R.styleable.LineSpec_positiveGradientTopColor) ||
+            hasValue(R.styleable.LineSpec_positiveGradientBottomColor)
+        ) {
+            val gradientTopColor =
+                getColorExtended(
+                    index = R.styleable.LineSpec_positiveGradientTopColor,
+                    defaultColor = getColorExtended(R.styleable.LineSpec_gradientTopColor),
+                )
+            val gradientBottomColor =
+                getColorExtended(
+                    index = R.styleable.LineSpec_positiveGradientBottomColor,
+                    defaultColor = getColorExtended(R.styleable.LineSpec_gradientBottomColor),
+                )
+
+            DynamicShaders.verticalGradient(gradientTopColor, gradientBottomColor)
+        } else {
+            DynamicShaders.verticalGradient(
+                positiveLineColor.copyColor(alpha = DefaultAlpha.LINE_BACKGROUND_SHADER_START),
+                positiveLineColor.copyColor(alpha = DefaultAlpha.LINE_BACKGROUND_SHADER_END),
+            )
+        }
 
-        DynamicShaders.verticalGradient(gradientTopColor, gradientBottomColor)
-    } else {
-        DynamicShaders.verticalGradient(
-            positiveLineColor.copyColor(alpha = DefaultAlpha.LINE_BACKGROUND_SHADER_START),
-            positiveLineColor.copyColor(alpha = DefaultAlpha.LINE_BACKGROUND_SHADER_END),
-        )
-    }
+    val negativeShader =
+        if (
+            hasValue(R.styleable.LineSpec_negativeGradientTopColor) ||
+            hasValue(R.styleable.LineSpec_negativeGradientBottomColor)
+        ) {
+            val gradientTopColor = getColorExtended(R.styleable.LineSpec_negativeGradientTopColor)
+            val gradientBottomColor = getColorExtended(R.styleable.LineSpec_negativeGradientBottomColor)
 
-    val negativeShader = if (
-        hasValue(R.styleable.LineSpec_negativeGradientTopColor) ||
-        hasValue(R.styleable.LineSpec_negativeGradientBottomColor)
-    ) {
-        val gradientTopColor = getColorExtended(R.styleable.LineSpec_negativeGradientTopColor)
-        val gradientBottomColor = getColorExtended(R.styleable.LineSpec_negativeGradientBottomColor)
-
-        DynamicShaders.verticalGradient(gradientTopColor, gradientBottomColor)
-    } else {
-        DynamicShaders.verticalGradient(
-            negativeLineColor.copyColor(alpha = DefaultAlpha.LINE_BACKGROUND_SHADER_END),
-            negativeLineColor.copyColor(alpha = DefaultAlpha.LINE_BACKGROUND_SHADER_START),
-        )
-    }
+            DynamicShaders.verticalGradient(gradientTopColor, gradientBottomColor)
+        } else {
+            DynamicShaders.verticalGradient(
+                negativeLineColor.copyColor(alpha = DefaultAlpha.LINE_BACKGROUND_SHADER_END),
+                negativeLineColor.copyColor(alpha = DefaultAlpha.LINE_BACKGROUND_SHADER_START),
+            )
+        }
 
     return LineChart.LineSpec(
         lineShader = lineShader,
-        point = getNestedTypedArray(
-            context = context,
-            resourceId = R.styleable.LineSpec_pointStyle,
-            styleableResourceId = R.styleable.ComponentStyle,
-        ).getComponent(context),
-        pointSizeDp = getRawDimension(
-            context = context,
-            index = R.styleable.LineSpec_pointSize,
-            defaultValue = DefaultDimens.POINT_SIZE,
-        ),
-        lineThicknessDp = getRawDimension(
-            context = context,
-            index = R.styleable.LineSpec_lineThickness,
-            defaultValue = DefaultDimens.LINE_THICKNESS,
-        ),
-        lineBackgroundShader = HorizontalSplitShader.Double(positiveShader, negativeShader),
-        dataLabel = if (getBoolean(R.styleable.LineSpec_showDataLabels, false)) {
+        point =
             getNestedTypedArray(
                 context = context,
-                resourceId = R.styleable.LineSpec_dataLabelStyle,
-                styleableResourceId = R.styleable.TextComponentStyle,
-            ).getTextComponent(context = context)
-        } else {
-            null
-        },
-        dataLabelVerticalPosition = getInteger(R.styleable.LineSpec_dataLabelVerticalPosition, 0).let { value ->
-            val values = VerticalPosition.entries
-            values[value % values.size]
-        },
-        dataLabelRotationDegrees = getFloat(
-            R.styleable.LineSpec_dataLabelRotationDegrees,
-            0f,
-        ),
-        pointConnector = DefaultPointConnector(
-            cubicStrength = getFraction(
-                index = R.styleable.LineSpec_cubicStrength,
-                defaultValue = DefaultDimens.CUBIC_STRENGTH,
+                resourceId = R.styleable.LineSpec_pointStyle,
+                styleableResourceId = R.styleable.ComponentStyle,
+            ).getComponent(context),
+        pointSizeDp =
+            getRawDimension(
+                context = context,
+                index = R.styleable.LineSpec_pointSize,
+                defaultValue = DefaultDimens.POINT_SIZE,
+            ),
+        lineThicknessDp =
+            getRawDimension(
+                context = context,
+                index = R.styleable.LineSpec_lineThickness,
+                defaultValue = DefaultDimens.LINE_THICKNESS,
+            ),
+        lineBackgroundShader = HorizontalSplitShader.Double(positiveShader, negativeShader),
+        dataLabel =
+            if (getBoolean(R.styleable.LineSpec_showDataLabels, false)) {
+                getNestedTypedArray(
+                    context = context,
+                    resourceId = R.styleable.LineSpec_dataLabelStyle,
+                    styleableResourceId = R.styleable.TextComponentStyle,
+                ).getTextComponent(context = context)
+            } else {
+                null
+            },
+        dataLabelVerticalPosition =
+            getInteger(R.styleable.LineSpec_dataLabelVerticalPosition, 0).let { value ->
+                val values = VerticalPosition.entries
+                values[value % values.size]
+            },
+        dataLabelRotationDegrees =
+            getFloat(
+                R.styleable.LineSpec_dataLabelRotationDegrees,
+                0f,
+            ),
+        pointConnector =
+            DefaultPointConnector(
+                cubicStrength =
+                    getFraction(
+                        index = R.styleable.LineSpec_cubicStrength,
+                        defaultValue = DefaultDimens.CUBIC_STRENGTH,
+                    ),
             ),
-        ),
     )
 }
diff --git a/vico/views/src/main/java/com/patrykandpatrick/vico/views/theme/ShapeStyleExtensions.kt b/vico/views/src/main/java/com/patrykandpatrick/vico/views/theme/ShapeStyleExtensions.kt
index 42b330ed9..b29325fe5 100644
--- a/vico/views/src/main/java/com/patrykandpatrick/vico/views/theme/ShapeStyleExtensions.kt
+++ b/vico/views/src/main/java/com/patrykandpatrick/vico/views/theme/ShapeStyleExtensions.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 by Patryk Goworowski and Patrick Michalik.
+ * Copyright 2023 by Patryk Goworowski and Patrick Michalik.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -31,42 +31,47 @@ import com.patrykandpatrick.vico.views.R
 
 private const val ONE_HUNDRED_PERCENT = 100
 
-internal fun TypedArray.getShape(
-    context: Context,
-): Shape {
-    val shape = CorneredShape(
-        topLeft = getCorner(
-            context = context,
-            sizeIndex = R.styleable.Shape_topStartCornerSize,
-            treatmentIndex = R.styleable.Shape_topStartCornerTreatment,
-        ),
-        topRight = getCorner(
-            context = context,
-            sizeIndex = R.styleable.Shape_topEndCornerSize,
-            treatmentIndex = R.styleable.Shape_topEndCornerTreatment,
-        ),
-        bottomLeft = getCorner(
+internal fun TypedArray.getShape(context: Context): Shape {
+    val shape =
+        CorneredShape(
+            topLeft =
+                getCorner(
+                    context = context,
+                    sizeIndex = R.styleable.Shape_topStartCornerSize,
+                    treatmentIndex = R.styleable.Shape_topStartCornerTreatment,
+                ),
+            topRight =
+                getCorner(
+                    context = context,
+                    sizeIndex = R.styleable.Shape_topEndCornerSize,
+                    treatmentIndex = R.styleable.Shape_topEndCornerTreatment,
+                ),
+            bottomLeft =
+                getCorner(
+                    context = context,
+                    sizeIndex = R.styleable.Shape_bottomStartCornerSize,
+                    treatmentIndex = R.styleable.Shape_bottomStartCornerTreatment,
+                ),
+            bottomRight =
+                getCorner(
+                    context = context,
+                    sizeIndex = R.styleable.Shape_bottomEndCornerSize,
+                    treatmentIndex = R.styleable.Shape_bottomEndCornerTreatment,
+                ),
+        )
+
+    val dashLength =
+        getRawDimension(
             context = context,
-            sizeIndex = R.styleable.Shape_bottomStartCornerSize,
-            treatmentIndex = R.styleable.Shape_bottomStartCornerTreatment,
-        ),
-        bottomRight = getCorner(
+            index = R.styleable.Shape_dashLength,
+            defaultValue = 0f,
+        )
+    val dashGapLength =
+        getRawDimension(
             context = context,
-            sizeIndex = R.styleable.Shape_bottomEndCornerSize,
-            treatmentIndex = R.styleable.Shape_bottomEndCornerTreatment,
-        ),
-    )
-
-    val dashLength = getRawDimension(
-        context = context,
-        index = R.styleable.Shape_dashLength,
-        defaultValue = 0f,
-    )
-    val dashGapLength = getRawDimension(
-        context = context,
-        index = R.styleable.Shape_dashGapLength,
-        defaultValue = 0f,
-    )
+            index = R.styleable.Shape_dashGapLength,
+            defaultValue = 0f,
+        )
 
     return if (dashLength == 0f) {
         shape
@@ -84,38 +89,41 @@ private fun TypedArray.getCorner(
     @StyleableRes sizeIndex: Int,
     @StyleableRes treatmentIndex: Int,
     handleNullSizeIndex: Boolean = true,
-): Corner = when {
-    !hasValue(sizeIndex) && handleNullSizeIndex -> {
-        getCorner(
-            context = context,
-            sizeIndex = R.styleable.Shape_cornerSize,
-            treatmentIndex = treatmentIndex,
-            handleNullSizeIndex = false,
-        )
-    }
-    isFraction(sizeIndex) -> {
-        val percentage = (getFraction(sizeIndex, defaultValue = 0f) * ONE_HUNDRED_PERCENT).toInt()
-        Corner.Relative(
-            percentage = percentage,
-            cornerTreatment = if (percentage == 0) {
-                SharpCornerTreatment
-            } else {
-                getCornerTreatment(treatmentIndex)
-            },
-        )
+): Corner =
+    when {
+        !hasValue(sizeIndex) && handleNullSizeIndex -> {
+            getCorner(
+                context = context,
+                sizeIndex = R.styleable.Shape_cornerSize,
+                treatmentIndex = treatmentIndex,
+                handleNullSizeIndex = false,
+            )
+        }
+        isFraction(sizeIndex) -> {
+            val percentage = (getFraction(sizeIndex, defaultValue = 0f) * ONE_HUNDRED_PERCENT).toInt()
+            Corner.Relative(
+                percentage = percentage,
+                cornerTreatment =
+                    if (percentage == 0) {
+                        SharpCornerTreatment
+                    } else {
+                        getCornerTreatment(treatmentIndex)
+                    },
+            )
+        }
+        else -> {
+            val sizeDp = getRawDimension(context, sizeIndex, defaultValue = 0f)
+            Corner.Absolute(
+                sizeDp = sizeDp,
+                cornerTreatment =
+                    if (sizeDp == 0f) {
+                        SharpCornerTreatment
+                    } else {
+                        getCornerTreatment(treatmentIndex)
+                    },
+            )
+        }
     }
-    else -> {
-        val sizeDp = getRawDimension(context, sizeIndex, defaultValue = 0f)
-        Corner.Absolute(
-            sizeDp = sizeDp,
-            cornerTreatment = if (sizeDp == 0f) {
-                SharpCornerTreatment
-            } else {
-                getCornerTreatment(treatmentIndex)
-            },
-        )
-    }
-}
 
 private fun TypedArray.getCornerTreatment(
     @StyleableRes index: Int,
diff --git a/vico/views/src/main/java/com/patrykandpatrick/vico/views/theme/TextComponentStyleExtensions.kt b/vico/views/src/main/java/com/patrykandpatrick/vico/views/theme/TextComponentStyleExtensions.kt
index e3b300c17..d97333a99 100644
--- a/vico/views/src/main/java/com/patrykandpatrick/vico/views/theme/TextComponentStyleExtensions.kt
+++ b/vico/views/src/main/java/com/patrykandpatrick/vico/views/theme/TextComponentStyleExtensions.kt
@@ -38,32 +38,33 @@ import com.patrykandpatrick.vico.views.extension.defaultColors
 
 private const val FONT_WEIGHT_NORMAL = 400
 
-internal fun TypedArray.getTextComponent(
-    context: Context,
-): TextComponent = use {
-    val color = getColor(R.styleable.TextComponentStyle_labelColor, context.defaultColors.axisLabelColor.toInt())
-    val background = getNestedTypedArray(
-        context = context,
-        resourceId = R.styleable.TextComponentStyle_backgroundStyle,
-        styleableResourceId = R.styleable.ComponentStyle,
-    ).getComponent(context)
+internal fun TypedArray.getTextComponent(context: Context): TextComponent =
+    use {
+        val color = getColor(R.styleable.TextComponentStyle_labelColor, context.defaultColors.axisLabelColor.toInt())
+        val background =
+            getNestedTypedArray(
+                context = context,
+                resourceId = R.styleable.TextComponentStyle_backgroundStyle,
+                styleableResourceId = R.styleable.ComponentStyle,
+            ).getComponent(context)
 
-    textComponent {
-        this.color = color
-        this.background = background
-        this.padding = getPadding(context)
-        this.margins = getMargins(context)
-        this.textSizeSp = getRawDimension(
-            context = context,
-            index = R.styleable.TextComponentStyle_android_textSize,
-            defaultValue = TEXT_COMPONENT_TEXT_SIZE,
-        )
-        this.lineCount = getInteger(R.styleable.TextComponentStyle_android_maxLines, DEF_LABEL_LINE_COUNT)
-        this.ellipsize = getTruncateAt()
-        getTypeface(context)?.let { this.typeface = it }
-        this.textAlignment = getTextAlignment()
+        textComponent {
+            this.color = color
+            this.background = background
+            this.padding = getPadding(context)
+            this.margins = getMargins(context)
+            this.textSizeSp =
+                getRawDimension(
+                    context = context,
+                    index = R.styleable.TextComponentStyle_android_textSize,
+                    defaultValue = TEXT_COMPONENT_TEXT_SIZE,
+                )
+            this.lineCount = getInteger(R.styleable.TextComponentStyle_android_maxLines, DEF_LABEL_LINE_COUNT)
+            this.ellipsize = getTruncateAt()
+            getTypeface(context)?.let { this.typeface = it }
+            this.textAlignment = getTextAlignment()
+        }
     }
-}
 
 private fun TypedArray.getTruncateAt(): TextUtils.TruncateAt {
     val int = getInt(R.styleable.TextComponentStyle_android_ellipsize, TextUtils.TruncateAt.END.ordinal)
@@ -74,33 +75,35 @@ private fun TypedArray.getTruncateAt(): TextUtils.TruncateAt {
     }
 }
 
-@Suppress("MagicNumber")
 private fun TypedArray.getTypeface(context: Context): Typeface? {
-    val fontIndex = if (hasValue(R.styleable.TextComponentStyle_android_fontFamily)) {
-        R.styleable.TextComponentStyle_android_fontFamily
-    } else {
-        R.styleable.TextComponentStyle_fontFamily
-    }
+    val fontIndex =
+        if (hasValue(R.styleable.TextComponentStyle_android_fontFamily)) {
+            R.styleable.TextComponentStyle_android_fontFamily
+        } else {
+            R.styleable.TextComponentStyle_fontFamily
+        }
 
-    val fontStyle = if (hasValue(R.styleable.TextComponentStyle_android_fontStyle)) {
-        R.styleable.TextComponentStyle_android_fontStyle
-    } else {
-        R.styleable.TextComponentStyle_fontStyle
-    }
+    val fontStyle =
+        if (hasValue(R.styleable.TextComponentStyle_android_fontStyle)) {
+            R.styleable.TextComponentStyle_android_fontStyle
+        } else {
+            R.styleable.TextComponentStyle_fontStyle
+        }
 
     val fontResId = getResourceId(fontIndex, 0)
     val fontWeight = getInteger(R.styleable.TextComponentStyle_android_textFontWeight, FONT_WEIGHT_NORMAL)
 
-    val family = if (fontResId > 0) {
-        ResourcesCompat.getFont(context, fontResId)
-    } else {
-        when (getInteger(R.styleable.TextComponentStyle_typeface, 3)) {
-            0 -> Typeface.DEFAULT
-            1 -> Typeface.SANS_SERIF
-            2 -> Typeface.SERIF
-            else -> Typeface.MONOSPACE
+    val family =
+        if (fontResId > 0) {
+            ResourcesCompat.getFont(context, fontResId)
+        } else {
+            when (getInteger(R.styleable.TextComponentStyle_typeface, 3)) {
+                0 -> Typeface.DEFAULT
+                1 -> Typeface.SANS_SERIF
+                2 -> Typeface.SERIF
+                else -> Typeface.MONOSPACE
+            }
         }
-    }
     return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
         Typeface.create(family, fontWeight, fontStyle == 1)
     } else {
@@ -109,8 +112,9 @@ private fun TypedArray.getTypeface(context: Context): Typeface? {
 }
 
 private fun TypedArray.getPadding(context: Context): MutableDimensions {
-    fun getDpDimension(@StyleableRes index: Int): Float =
-        getRawDimension(context, index, -1f)
+    fun getDpDimension(
+        @StyleableRes index: Int,
+    ): Float = getRawDimension(context, index, -1f)
 
     val padding = getDpDimension(R.styleable.TextComponentStyle_android_padding)
     val paddingVertical = getDpDimension(R.styleable.TextComponentStyle_android_paddingVertical)
@@ -120,20 +124,25 @@ private fun TypedArray.getPadding(context: Context): MutableDimensions {
     val paddingEnd = getDpDimension(R.styleable.TextComponentStyle_android_paddingEnd)
     val paddingBottom = getDpDimension(R.styleable.TextComponentStyle_android_paddingBottom)
     return MutableDimensions(
-        startDp = firstNonNegativeOf(paddingStart, paddingHorizontal, padding)
-            ?: AXIS_LABEL_HORIZONTAL_PADDING.toFloat(),
-        topDp = firstNonNegativeOf(paddingTop, paddingVertical, padding)
-            ?: AXIS_LABEL_VERTICAL_PADDING.toFloat(),
-        endDp = firstNonNegativeOf(paddingEnd, paddingHorizontal, padding)
-            ?: AXIS_LABEL_HORIZONTAL_PADDING.toFloat(),
-        bottomDp = firstNonNegativeOf(paddingBottom, paddingVertical, padding)
-            ?: AXIS_LABEL_VERTICAL_PADDING.toFloat(),
+        startDp =
+            firstNonNegativeOf(paddingStart, paddingHorizontal, padding)
+                ?: AXIS_LABEL_HORIZONTAL_PADDING.toFloat(),
+        topDp =
+            firstNonNegativeOf(paddingTop, paddingVertical, padding)
+                ?: AXIS_LABEL_VERTICAL_PADDING.toFloat(),
+        endDp =
+            firstNonNegativeOf(paddingEnd, paddingHorizontal, padding)
+                ?: AXIS_LABEL_HORIZONTAL_PADDING.toFloat(),
+        bottomDp =
+            firstNonNegativeOf(paddingBottom, paddingVertical, padding)
+                ?: AXIS_LABEL_VERTICAL_PADDING.toFloat(),
     )
 }
 
 private fun TypedArray.getMargins(context: Context): MutableDimensions {
-    fun getDpDimension(@StyleableRes index: Int): Float =
-        getRawDimension(context, index, -1f)
+    fun getDpDimension(
+        @StyleableRes index: Int,
+    ): Float = getRawDimension(context, index, -1f)
 
     val padding = getDpDimension(R.styleable.TextComponentStyle_margin)
     val paddingVertical = getDpDimension(R.styleable.TextComponentStyle_marginVertical)
diff --git a/vico/views/src/main/java/com/patrykandpatrick/vico/views/theme/ThemeHandler.kt b/vico/views/src/main/java/com/patrykandpatrick/vico/views/theme/ThemeHandler.kt
index 0480a1dd5..24f49fb30 100644
--- a/vico/views/src/main/java/com/patrykandpatrick/vico/views/theme/ThemeHandler.kt
+++ b/vico/views/src/main/java/com/patrykandpatrick/vico/views/theme/ThemeHandler.kt
@@ -52,7 +52,6 @@ internal class ThemeHandler(
     attrs: AttributeSet?,
     chartType: ChartType,
 ) {
-
     public var startAxis: Axis<AxisPosition.Vertical.Start>? = null
         private set
 
@@ -86,33 +85,39 @@ internal class ThemeHandler(
     init {
         context.obtainStyledAttributes(attrs, R.styleable.BaseChartView).use { typedArray ->
             if (typedArray.getBoolean(R.styleable.BaseChartView_showStartAxis, false)) {
-                startAxis = typedArray.getAxisBuilder(
-                    R.styleable.BaseChartView_startAxisStyle,
-                    VerticalAxis.Builder(),
-                ).build()
+                startAxis =
+                    typedArray.getAxisBuilder(
+                        R.styleable.BaseChartView_startAxisStyle,
+                        VerticalAxis.Builder(),
+                    ).build()
             }
             if (typedArray.getBoolean(R.styleable.BaseChartView_showTopAxis, false)) {
-                topAxis = typedArray.getAxisBuilder(
-                    R.styleable.BaseChartView_topAxisStyle,
-                    HorizontalAxis.Builder(),
-                ).build()
+                topAxis =
+                    typedArray.getAxisBuilder(
+                        R.styleable.BaseChartView_topAxisStyle,
+                        HorizontalAxis.Builder(),
+                    ).build()
             }
             if (typedArray.getBoolean(R.styleable.BaseChartView_showEndAxis, false)) {
-                endAxis = typedArray.getAxisBuilder(
-                    R.styleable.BaseChartView_endAxisStyle,
-                    VerticalAxis.Builder(),
-                ).build()
+                endAxis =
+                    typedArray.getAxisBuilder(
+                        R.styleable.BaseChartView_endAxisStyle,
+                        VerticalAxis.Builder(),
+                    ).build()
             }
             if (typedArray.getBoolean(R.styleable.BaseChartView_showBottomAxis, false)) {
-                bottomAxis = typedArray.getAxisBuilder(
-                    R.styleable.BaseChartView_bottomAxisStyle,
-                    HorizontalAxis.Builder(),
-                ).build()
+                bottomAxis =
+                    typedArray.getAxisBuilder(
+                        R.styleable.BaseChartView_bottomAxisStyle,
+                        HorizontalAxis.Builder(),
+                    ).build()
             }
-            isHorizontalScrollEnabled = typedArray
-                .getBoolean(R.styleable.BaseChartView_chartHorizontalScrollingEnabled, true)
-            isChartZoomEnabled = typedArray
-                .getBoolean(R.styleable.BaseChartView_chartZoomEnabled, true)
+            isHorizontalScrollEnabled =
+                typedArray
+                    .getBoolean(R.styleable.BaseChartView_chartHorizontalScrollingEnabled, true)
+            isChartZoomEnabled =
+                typedArray
+                    .getBoolean(R.styleable.BaseChartView_chartZoomEnabled, true)
             fadingEdges = typedArray.getFadingEdges()
             horizontalLayout = typedArray.getHorizontalLayout()
 
@@ -149,83 +154,94 @@ internal class ThemeHandler(
                 styleableResourceId = styleableResourceId,
             ).getLineComponent(context = context, defaultShape = defaultShape)
 
-        val axisStyle = getNestedTypedArray(
-            context = context,
-            resourceId = if (hasValue(styleAttrId)) styleAttrId else R.styleable.BaseChartView_axisStyle,
-            styleableResourceId = R.styleable.Axis,
-        )
+        val axisStyle =
+            getNestedTypedArray(
+                context = context,
+                resourceId = if (hasValue(styleAttrId)) styleAttrId else R.styleable.BaseChartView_axisStyle,
+                styleableResourceId = R.styleable.Axis,
+            )
 
         return builder.apply {
-            axis = axisStyle
-                .takeIf { it.getBoolean(R.styleable.Axis_showAxisLine, true) }
-                ?.getLineComponent(
-                    resourceId = R.styleable.Axis_axisLineStyle,
-                    styleableResourceId = R.styleable.LineComponent,
-                )
-            tick = axisStyle
-                .takeIf { it.getBoolean(R.styleable.Axis_showTick, true) }
-                ?.getLineComponent(
-                    resourceId = R.styleable.Axis_axisTickStyle,
-                    styleableResourceId = R.styleable.LineComponent,
+            axis =
+                axisStyle
+                    .takeIf { it.getBoolean(R.styleable.Axis_showAxisLine, true) }
+                    ?.getLineComponent(
+                        resourceId = R.styleable.Axis_axisLineStyle,
+                        styleableResourceId = R.styleable.LineComponent,
+                    )
+            tick =
+                axisStyle
+                    .takeIf { it.getBoolean(R.styleable.Axis_showTick, true) }
+                    ?.getLineComponent(
+                        resourceId = R.styleable.Axis_axisTickStyle,
+                        styleableResourceId = R.styleable.LineComponent,
+                    )
+            tickLengthDp =
+                axisStyle.getRawDimension(
+                    context = context,
+                    R.styleable.Axis_axisTickLength,
+                    defaultValue = DefaultDimens.AXIS_TICK_LENGTH,
                 )
-            tickLengthDp = axisStyle.getRawDimension(
-                context = context,
-                R.styleable.Axis_axisTickLength,
-                defaultValue = DefaultDimens.AXIS_TICK_LENGTH,
-            )
-            guideline = axisStyle
-                .takeIf { it.getBoolean(R.styleable.Axis_showGuideline, true) }
-                ?.getLineComponent(
-                    resourceId = R.styleable.Axis_axisGuidelineStyle,
-                    styleableResourceId = R.styleable.LineComponent,
-                    defaultShape = DashedShape(),
+            guideline =
+                axisStyle
+                    .takeIf { it.getBoolean(R.styleable.Axis_showGuideline, true) }
+                    ?.getLineComponent(
+                        resourceId = R.styleable.Axis_axisGuidelineStyle,
+                        styleableResourceId = R.styleable.LineComponent,
+                        defaultShape = DashedShape(),
+                    )
+            labelRotationDegrees =
+                axisStyle.getFloat(
+                    R.styleable.Axis_labelRotationDegrees,
+                    0f,
                 )
-            labelRotationDegrees = axisStyle.getFloat(
-                R.styleable.Axis_labelRotationDegrees,
-                0f,
-            )
-            label = axisStyle.getNestedTypedArray(
-                context = context,
-                resourceId = R.styleable.Axis_axisLabelStyle,
-                styleableResourceId = R.styleable.TextComponentStyle,
-            ).getTextComponent(context = context)
-            titleComponent = if (axisStyle.getBoolean(R.styleable.Axis_showTitle, false)) {
+            label =
                 axisStyle.getNestedTypedArray(
                     context = context,
-                    resourceId = R.styleable.Axis_titleStyle,
+                    resourceId = R.styleable.Axis_axisLabelStyle,
                     styleableResourceId = R.styleable.TextComponentStyle,
                 ).getTextComponent(context = context)
-            } else {
-                null
-            }
+            titleComponent =
+                if (axisStyle.getBoolean(R.styleable.Axis_showTitle, false)) {
+                    axisStyle.getNestedTypedArray(
+                        context = context,
+                        resourceId = R.styleable.Axis_titleStyle,
+                        styleableResourceId = R.styleable.TextComponentStyle,
+                    ).getTextComponent(context = context)
+                } else {
+                    null
+                }
             title = axisStyle.getString(R.styleable.Axis_title)
 
             when (this) {
                 is VerticalAxis.Builder<*> -> {
-                    horizontalLabelPosition = axisStyle
-                        .getInteger(R.styleable.Axis_verticalAxisHorizontalLabelPosition, 0)
-                        .let { value ->
-                            val values = VerticalAxis.HorizontalLabelPosition.entries
-                            values[value % values.size]
-                        }
-
-                    verticalLabelPosition = axisStyle
-                        .getInteger(R.styleable.Axis_verticalAxisVerticalLabelPosition, 0)
-                        .let { value ->
-                            val values = VerticalAxis.VerticalLabelPosition.entries
-                            values[value % values.size]
-                        }
+                    horizontalLabelPosition =
+                        axisStyle
+                            .getInteger(R.styleable.Axis_verticalAxisHorizontalLabelPosition, 0)
+                            .let { value ->
+                                val values = VerticalAxis.HorizontalLabelPosition.entries
+                                values[value % values.size]
+                            }
+
+                    verticalLabelPosition =
+                        axisStyle
+                            .getInteger(R.styleable.Axis_verticalAxisVerticalLabelPosition, 0)
+                            .let { value ->
+                                val values = VerticalAxis.VerticalLabelPosition.entries
+                                values[value % values.size]
+                            }
 
                     itemPlacer = axisStyle.getVerticalAxisItemPlacer()
                 }
 
                 is HorizontalAxis.Builder<*> -> {
-                    itemPlacer = AxisItemPlacer.Horizontal.default(
-                        axisStyle.getInteger(R.styleable.Axis_horizontalAxisLabelSpacing, 1),
-                        axisStyle.getInteger(R.styleable.Axis_horizontalAxisLabelOffset, 0),
-                        axisStyle.getBoolean(R.styleable.Axis_shiftExtremeHorizontalAxisTicks, true),
-                        axisStyle.getBoolean(R.styleable.Axis_addExtremeHorizontalAxisLabelPadding, false),
-                    )
+                    itemPlacer =
+                        AxisItemPlacer.Horizontal.default(
+                            axisStyle.getInteger(R.styleable.Axis_horizontalAxisLabelSpacing, 1),
+                            axisStyle.getInteger(R.styleable.Axis_horizontalAxisLabelOffset, 0),
+                            axisStyle.getBoolean(R.styleable.Axis_shiftExtremeHorizontalAxisTicks, true),
+                            axisStyle.getBoolean(R.styleable.Axis_addExtremeHorizontalAxisLabelPadding, false),
+                        )
                 }
             }
         }.also { axisStyle.recycle() }
@@ -245,12 +261,13 @@ internal class ThemeHandler(
     private fun TypedArray.getHorizontalLayout(): HorizontalLayout =
         when (getInt(R.styleable.BaseChartView_horizontalLayout, 0)) {
             0 -> HorizontalLayout.Segmented
-            else -> HorizontalLayout.FullWidth(
-                getRawDimension(context, R.styleable.BaseChartView_scalableStartContentPadding, 0f),
-                getRawDimension(context, R.styleable.BaseChartView_scalableEndContentPadding, 0f),
-                getRawDimension(context, R.styleable.BaseChartView_unscalableStartContentPadding, 0f),
-                getRawDimension(context, R.styleable.BaseChartView_unscalableEndContentPadding, 0f),
-            )
+            else ->
+                HorizontalLayout.FullWidth(
+                    getRawDimension(context, R.styleable.BaseChartView_scalableStartContentPadding, 0f),
+                    getRawDimension(context, R.styleable.BaseChartView_scalableEndContentPadding, 0f),
+                    getRawDimension(context, R.styleable.BaseChartView_unscalableStartContentPadding, 0f),
+                    getRawDimension(context, R.styleable.BaseChartView_unscalableEndContentPadding, 0f),
+                )
         }
 
     private fun getComposedChart(
@@ -259,19 +276,21 @@ internal class ThemeHandler(
     ): Chart<ComposedChartEntryModel<ChartEntryModel>>? {
         val chartFlags = composedChartViewTypedArray.getInt(R.styleable.ComposedChartView_charts, 0)
 
-        val columnChart: ColumnChart? = if (chartFlags.hasAnyFlagOf(COLUMN_CHART, STACKED_COLUMN_CHART)) {
-            baseTypedArray.getColumnChart(
-                context,
-                mergeMode = if (chartFlags.hasFlag(STACKED_COLUMN_CHART)) MergeMode.Stack else MergeMode.Grouped,
-            )
-        } else {
-            null
-        }
-        val lineChart = if (chartFlags.hasFlag(LINE_CHART)) {
-            baseTypedArray.getLineChart(context)
-        } else {
-            null
-        }
+        val columnChart: ColumnChart? =
+            if (chartFlags.hasAnyFlagOf(COLUMN_CHART, STACKED_COLUMN_CHART)) {
+                baseTypedArray.getColumnChart(
+                    context,
+                    mergeMode = if (chartFlags.hasFlag(STACKED_COLUMN_CHART)) MergeMode.Stack else MergeMode.Grouped,
+                )
+            } else {
+                null
+            }
+        val lineChart =
+            if (chartFlags.hasFlag(LINE_CHART)) {
+                baseTypedArray.getLineChart(context)
+            } else {
+                null
+            }
 
         return when {
             columnChart != null && lineChart != null -> ComposedChart(columnChart, lineChart)
@@ -281,35 +300,36 @@ internal class ThemeHandler(
         }
     }
 
-    @Suppress("TooGenericExceptionCaught")
     private fun TypedArray.getFadingEdges(): FadingEdges? {
         val edgesLength = getRawDimension(context, R.styleable.BaseChartView_fadingEdgeWidth, 0f)
         val startLength = getRawDimension(context, R.styleable.BaseChartView_startFadingEdgeWidth, edgesLength)
         val endLength = getRawDimension(context, R.styleable.BaseChartView_endFadingEdgeWidth, edgesLength)
-        val threshold = getRawDimension(
-            context,
-            R.styleable.BaseChartView_fadingEdgeVisibilityThreshold,
-            FADING_EDGE_VISIBILITY_THRESHOLD_DP,
-        )
+        val threshold =
+            getRawDimension(
+                context,
+                R.styleable.BaseChartView_fadingEdgeVisibilityThreshold,
+                FADING_EDGE_VISIBILITY_THRESHOLD_DP,
+            )
 
         return if (startLength > 0f || endLength > 0f) {
             val interpolatorClassName = getString(R.styleable.BaseChartView_fadingEdgeVisibilityInterpolator)
 
-            val interpolator = if (interpolatorClassName != null) {
-                try {
-                    context.classLoader.loadClass(interpolatorClassName).getDeclaredConstructor().newInstance()
-                        as? TimeInterpolator
-                } catch (e: Exception) {
-                    Log.e(
-                        "ChartView",
-                        "Caught exception when trying to instantiate $interpolatorClassName " +
-                            "as fade interpolator.",
-                    )
+            val interpolator =
+                if (interpolatorClassName != null) {
+                    try {
+                        context.classLoader.loadClass(interpolatorClassName).getDeclaredConstructor().newInstance()
+                            as? TimeInterpolator
+                    } catch (e: Exception) {
+                        Log.e(
+                            "ChartView",
+                            "Caught exception when trying to instantiate $interpolatorClassName " +
+                                "as fade interpolator.",
+                        )
+                        null
+                    }
+                } else {
                     null
                 }
-            } else {
-                null
-            }
 
             FadingEdges(
                 startEdgeWidthDp = startLength,
diff --git a/vico/views/src/main/java/com/patrykandpatrick/vico/views/theme/TypedArrayExtensions.kt b/vico/views/src/main/java/com/patrykandpatrick/vico/views/theme/TypedArrayExtensions.kt
index 860096433..775665ca9 100644
--- a/vico/views/src/main/java/com/patrykandpatrick/vico/views/theme/TypedArrayExtensions.kt
+++ b/vico/views/src/main/java/com/patrykandpatrick/vico/views/theme/TypedArrayExtensions.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 by Patryk Goworowski and Patrick Michalik.
+ * Copyright 2023 by Patryk Goworowski and Patrick Michalik.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -31,8 +31,7 @@ private val lock = Any()
 /**
  * Calls the given function block with this [TypedArray] as its argument, then recycles this [TypedArray].
  */
-public inline fun <R> TypedArray.use(block: (TypedArray) -> R): R =
-    block(this).also { recycle() }
+public inline fun <R> TypedArray.use(block: (TypedArray) -> R): R = block(this).also { recycle() }
 
 /**
  * Retrieves the color at the given index.
@@ -50,14 +49,15 @@ public fun TypedArray.getRawDimension(
     context: Context,
     @StyleableRes index: Int,
     defaultValue: Float,
-): Float = synchronized(lock) {
-    if (getValue(index, rawValueTypedValue)) {
-        rawValueTypedValue.getDimension(context.resources.displayMetrics) / context.density
-        TypedValue.complexToFloat(rawValueTypedValue.data)
-    } else {
-        defaultValue
+): Float =
+    synchronized(lock) {
+        if (getValue(index, rawValueTypedValue)) {
+            rawValueTypedValue.getDimension(context.resources.displayMetrics) / context.density
+            TypedValue.complexToFloat(rawValueTypedValue.data)
+        } else {
+            defaultValue
+        }
     }
-}
 
 /**
  * Returns a [TypedArray] nested inside the receiver [TypedArray].
@@ -73,19 +73,25 @@ public fun TypedArray.getNestedTypedArray(
 /**
  * Retrieves the fraction at the given index as a [Float].
  */
-public fun TypedArray.getFraction(@StyleableRes index: Int, defaultValue: Float = -1f): Float =
-    getFraction(index, 1, 1, defaultValue)
+public fun TypedArray.getFraction(
+    @StyleableRes index: Int,
+    defaultValue: Float = -1f,
+): Float = getFraction(index, 1, 1, defaultValue)
 
 /**
  * Returns a boolean indicating whether the value at the given index is a fraction.
  */
-public fun TypedArray.isFraction(@StyleableRes index: Int): Boolean =
-    getTypeCompat(index) == TypedValue.TYPE_FRACTION
+public fun TypedArray.isFraction(
+    @StyleableRes index: Int,
+): Boolean = getTypeCompat(index) == TypedValue.TYPE_FRACTION
 
 /**
  * Returns the type of the value at the given index.
  */
-public fun TypedArray.getTypeCompat(@StyleableRes index: Int): Int = synchronized(lock) {
-    getValue(index, typeCompatTypedValue)
-    typeCompatTypedValue.type
-}
+public fun TypedArray.getTypeCompat(
+    @StyleableRes index: Int,
+): Int =
+    synchronized(lock) {
+        getValue(index, typeCompatTypedValue)
+        typeCompatTypedValue.type
+    }

From 84e011588585b3ff33b518b6903b7afe87dfe4a0 Mon Sep 17 00:00:00 2001
From: Patrick Michalik <120058021+patrickmichalik@users.noreply.github.com>
Date: Fri, 1 Dec 2023 18:24:57 +0100
Subject: [PATCH 15/15] Rework selected core APIs

Co-authored-by: Patryk Goworowski <patrykgoworowski@gmail.com>
---
 .../vico/sample/previews/AxisLinePreviews.kt  |  32 +-
 .../ColumnChartsWithNegativeValuesPreviews.kt |  50 +-
 .../sample/previews/ContainedChartsPreview.kt |  84 +-
 .../vico/sample/previews/LineChartPreviews.kt | 133 ++--
 .../LineChartsWithNegativeValuesPreviews.kt   |  82 +-
 .../vico/sample/previews/Previews.kt          |  56 +-
 ...dColumnChartsWithNegativeValuesPreviews.kt |  80 +-
 .../sample/previews/ThresholdLinePreviews.kt  | 280 +++----
 .../composables/column/ColumnCharts.kt        |  27 +-
 .../previews/composables/line/LineCharts.kt   |  23 +-
 .../sample/previews/resource/SampleModels.kt  |  15 +-
 .../vico/sample/showcase/ChartStyle.kt        |  25 +-
 .../vico/sample/showcase/ShowcaseScreen.kt    |  22 +-
 .../vico/sample/showcase/ShowcaseViewModel.kt |  73 +-
 .../vico/sample/showcase/charts/Chart1.kt     |  31 +-
 .../vico/sample/showcase/charts/Chart2.kt     |  34 +-
 .../vico/sample/showcase/charts/Chart3.kt     |  37 +-
 .../vico/sample/showcase/charts/Chart4.kt     |  62 +-
 .../vico/sample/showcase/charts/Chart5.kt     |  76 +-
 .../vico/sample/showcase/charts/Chart6.kt     |  36 +-
 .../vico/sample/showcase/charts/Chart7.kt     |  35 +-
 .../vico/sample/showcase/charts/Chart8.kt     |  52 +-
 .../vico/sample/showcase/charts/Chart9.kt     | 126 +--
 sample/src/main/res/layout/chart_1.xml        |   7 +-
 sample/src/main/res/layout/chart_2.xml        |   6 +-
 sample/src/main/res/layout/chart_3.xml        |   6 +-
 sample/src/main/res/layout/chart_4.xml        |   8 +-
 sample/src/main/res/layout/chart_5.xml        |   6 +-
 sample/src/main/res/layout/chart_6.xml        |   6 +-
 sample/src/main/res/layout/chart_7.xml        |   6 +-
 sample/src/main/res/layout/chart_8.xml        |   8 +-
 sample/src/main/res/layout/chart_9.xml        |   8 +-
 .../main/res/values-night/chart_9_styles.xml  |   4 +-
 sample/src/main/res/values/chart_1_styles.xml |   2 +-
 sample/src/main/res/values/chart_2_styles.xml |   2 +-
 sample/src/main/res/values/chart_3_styles.xml |   2 +-
 sample/src/main/res/values/chart_4_styles.xml |   4 +-
 sample/src/main/res/values/chart_5_styles.xml |   3 +-
 sample/src/main/res/values/chart_6_styles.xml |   2 +-
 sample/src/main/res/values/chart_7_styles.xml |   2 +-
 sample/src/main/res/values/chart_8_styles.xml |   5 +-
 sample/src/main/res/values/chart_9_styles.xml |   3 +-
 sample/src/main/res/values/strings.xml        |   2 +-
 .../vico/compose/chart/CartesianChart.kt      |  44 +
 .../{Charts.kt => CartesianChartHost.kt}      | 122 ++-
 .../vico/compose/chart/column/ColumnChart.kt  |  96 ---
 .../chart/layer/ColumnCartesianLayer.kt       |  85 ++
 .../compose/chart/layer/LineCartesianLayer.kt | 192 +++++
 .../vico/compose/chart/line/LineChart.kt      | 254 ------
 .../compose/chart/scroll/ChartScrollSpec.kt   |  16 +-
 .../compose/chart/scroll/ChartScrollState.kt  |   4 +-
 .../component/shape/shader/DynamicShaders.kt  |  19 +-
 .../compose/extension/ModifierExtensions.kt   |   2 +-
 .../layout/MeasureContextExtensions.kt        |  11 +-
 .../ChartEntryModelExtensions.kt              |  61 +-
 .../state/CartesianChartModelWrapper.kt       |  67 ++
 .../compose/state/ChartEntryModelWrapper.kt   |  68 --
 .../vico/compose/style/ChartStyle.kt          |  38 +-
 .../vico/core/axis/AxisItemPlacer.kt          |  15 +-
 .../vico/core/axis/AxisManager.kt             |  10 +-
 .../vico/core/axis/AxisPosition.kt            |  28 +-
 .../vico/core/axis/AxisRenderer.kt            |  11 +-
 .../DefaultHorizontalAxisItemPlacer.kt        |  82 +-
 .../core/axis/horizontal/HorizontalAxis.kt    |  32 +-
 .../vertical/DefaultVerticalAxisItemPlacer.kt |  30 +-
 .../vico/core/axis/vertical/VerticalAxis.kt   |  25 +-
 .../vico/core/chart/BaseChart.kt              | 144 ----
 .../vico/core/chart/CartesianChart.kt         | 309 ++++++++
 .../patrykandpatrick/vico/core/chart/Chart.kt | 221 ------
 .../vico/core/chart/ChartExtensions.kt        |  41 -
 .../vico/core/chart/DefaultPointConnector.kt  |   8 +-
 .../vico/core/chart/EntryModelExtensions.kt   |  86 --
 .../vico/core/chart/LineSpecExtensions.kt     |  28 +-
 .../vico/core/chart/composed/ComposedChart.kt | 183 -----
 .../chart/composed/ComposedChartEntryModel.kt |  29 -
 .../chart/composed/ComposedChartExtensions.kt |  39 -
 .../vico/core/chart/decoration/Decoration.kt  |  16 +-
 .../core/chart/decoration/ThresholdLine.kt    |  19 +-
 .../chart/dimensions/HorizontalDimensions.kt  |  11 +-
 .../vico/core/chart/draw/ChartDrawContext.kt  |  14 +-
 .../chart/draw/ChartDrawContextExtensions.kt  |  17 +-
 .../vico/core/chart/insets/ChartInsetter.kt   |  14 +-
 .../core/chart/insets/HorizontalInsets.kt     |   4 +-
 .../core/chart/layer/BaseCartesianLayer.kt    |  59 ++
 .../vico/core/chart/layer/CartesianLayer.kt   |  87 ++
 .../ColumnCartesianLayer.kt}                  | 223 +++---
 .../LineCartesianLayer.kt}                    | 328 ++++----
 .../LineCartesianLayerExtensions.kt}          |   6 +-
 .../core/chart/layout/HorizontalLayout.kt     |  18 +-
 ...luesOverrider.kt => AxisValueOverrider.kt} |  50 +-
 .../vico/core/chart/values/ChartValues.kt     |  89 ++-
 .../core/chart/values/ChartValuesManager.kt   | 108 ---
 .../core/chart/values/ChartValuesProvider.kt  |  38 -
 .../core/chart/values/MutableChartValues.kt   | 105 +--
 .../core/component/marker/MarkerComponent.kt  |   5 +-
 .../component/shape/shader/ColorShader.kt     |  50 ++
 .../component/shape/shader/DynamicShader.kt   |  50 +-
 .../component/shape/shader/DynamicShaders.kt  |  13 +-
 .../shape/shader/HorizontalSplitShader.kt     | 246 ------
 .../component/shape/shader/SolidShader.kt     |  87 --
 .../component/shape/shader/TopBottomShader.kt |  87 ++
 .../vico/core/context/MeasureContext.kt       |   7 +-
 .../core/context/MutableMeasureContext.kt     |   4 +-
 .../vico/core/draw/DrawContextExtensions.kt   |   4 +-
 .../vico/core/entry/ChartEntry.kt             |  50 --
 .../vico/core/entry/ChartEntryExtensions.kt   | 109 ---
 .../vico/core/entry/ChartEntryModel.kt        | 103 ---
 .../core/entry/ChartEntryModelProducer.kt     | 242 ------
 .../vico/core/entry/ChartModelProducer.kt     |  79 --
 .../vico/core/entry/EntryListExtensions.kt    |  48 --
 .../vico/core/entry/FloatEntry.kt             |  31 -
 .../ComposedChartEntryModelProducer.kt        | 356 ---------
 .../composed/ComposedEntryListExtensions.kt   |  35 -
 .../vico/core/extension/MapExtensions.kt      |   7 +-
 .../vico/core/extension/NumberExtensions.kt   |   6 +
 .../formatter/DecimalFormatValueFormatter.kt  |   2 +
 .../core/formatter/DefaultValueFormatter.kt   |   4 +-
 .../PercentageFormatValueFormatter.kt         |   4 +-
 .../vico/core/formatter/ValueFormatter.kt     |   9 +-
 .../vico/core/layout/VirtualLayout.kt         |   7 +-
 .../marker/DefaultMarkerLabelFormatter.kt     |  11 +
 .../vico/core/marker/Marker.kt                |  31 +-
 .../vico/core/model/CartesianChartModel.kt    | 109 +++
 .../core/model/CartesianChartModelProducer.kt | 229 ++++++
 .../vico/core/model/CartesianLayerModel.kt    | 109 +++
 .../core/model/ColumnCartesianLayerModel.kt   | 189 +++++
 .../core/{entry/diff => model}/ExtraStore.kt  |   2 +-
 .../core/model/LineCartesianLayerModel.kt     | 150 ++++
 .../ColumnCartesianLayerDrawingModel.kt}      |  18 +-
 .../DefaultDrawingModelInterpolator.kt        |   2 +-
 .../diff => model/drawing}/DrawingModel.kt    |   8 +-
 .../drawing}/DrawingModelInterpolator.kt      |   2 +-
 .../LineCartesianLayerDrawingModel.kt}        |  25 +-
 .../vico/core/scroll/AutoScrollCondition.kt   |  27 +-
 .../vico/core/{model => util}/Point.kt        |   7 +-
 .../util/RandomCartesianModelGenerator.kt     |  71 ++
 .../vico/core/util/RandomEntriesGenerator.kt  |  80 --
 .../vico/core/ChartEntryModelProducerTest.kt  |  43 -
 .../vico/views/chart/BaseChartView.kt         | 705 -----------------
 .../vico/views/chart/CartesianChartView.kt    | 749 ++++++++++++++++++
 .../vico/views/chart/ChartView.kt             |  66 --
 .../vico/views/chart/ComposedChartView.kt     |  70 --
 .../ColumnChartExtensions.kt                  |  22 +-
 .../{line => layer}/LineChartExtensions.kt    |  23 +-
 .../component/shape/shader/DynamicShaders.kt  |  33 +-
 .../vico/views/extension/ViewExtensions.kt    |  33 +-
 .../vico/views/gestures/MotionEventHandler.kt |   2 +-
 .../vico/views/scroll/ChartScrollSpec.kt      |  16 +-
 .../vico/views/theme/ChartStyleExtensions.kt  |  63 +-
 .../views/theme/ComponentStyleExtensions.kt   |  20 +-
 .../theme/TextComponentStyleExtensions.kt     |   4 +-
 .../vico/views/theme/ThemeHandler.kt          | 140 ++--
 vico/views/src/main/res/values/attrs.xml      |  44 +-
 .../main/res/values/column_chart_attrs.xml    |  10 +-
 .../src/main/res/values/line_chart_attrs.xml  |   4 +-
 155 files changed, 4328 insertions(+), 5603 deletions(-)
 create mode 100644 vico/compose/src/main/java/com/patrykandpatrick/vico/compose/chart/CartesianChart.kt
 rename vico/compose/src/main/java/com/patrykandpatrick/vico/compose/chart/{Charts.kt => CartesianChartHost.kt} (83%)
 delete mode 100644 vico/compose/src/main/java/com/patrykandpatrick/vico/compose/chart/column/ColumnChart.kt
 create mode 100644 vico/compose/src/main/java/com/patrykandpatrick/vico/compose/chart/layer/ColumnCartesianLayer.kt
 create mode 100644 vico/compose/src/main/java/com/patrykandpatrick/vico/compose/chart/layer/LineCartesianLayer.kt
 delete mode 100644 vico/compose/src/main/java/com/patrykandpatrick/vico/compose/chart/line/LineChart.kt
 rename vico/compose/src/main/java/com/patrykandpatrick/vico/compose/{chart/entry => model}/ChartEntryModelExtensions.kt (71%)
 create mode 100644 vico/compose/src/main/java/com/patrykandpatrick/vico/compose/state/CartesianChartModelWrapper.kt
 delete mode 100644 vico/compose/src/main/java/com/patrykandpatrick/vico/compose/state/ChartEntryModelWrapper.kt
 delete mode 100644 vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/BaseChart.kt
 create mode 100644 vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/CartesianChart.kt
 delete mode 100644 vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/Chart.kt
 delete mode 100644 vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/ChartExtensions.kt
 delete mode 100644 vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/EntryModelExtensions.kt
 delete mode 100644 vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/composed/ComposedChart.kt
 delete mode 100644 vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/composed/ComposedChartEntryModel.kt
 delete mode 100644 vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/composed/ComposedChartExtensions.kt
 create mode 100644 vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/layer/BaseCartesianLayer.kt
 create mode 100644 vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/layer/CartesianLayer.kt
 rename vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/{column/ColumnChart.kt => layer/ColumnCartesianLayer.kt} (68%)
 rename vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/{line/LineChart.kt => layer/LineCartesianLayer.kt} (64%)
 rename vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/{line/LineChartExtensions.kt => layer/LineCartesianLayerExtensions.kt} (84%)
 rename vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/values/{AxisValuesOverrider.kt => AxisValueOverrider.kt} (59%)
 delete mode 100644 vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/values/ChartValuesManager.kt
 delete mode 100644 vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/values/ChartValuesProvider.kt
 create mode 100644 vico/core/src/main/java/com/patrykandpatrick/vico/core/component/shape/shader/ColorShader.kt
 delete mode 100644 vico/core/src/main/java/com/patrykandpatrick/vico/core/component/shape/shader/HorizontalSplitShader.kt
 delete mode 100644 vico/core/src/main/java/com/patrykandpatrick/vico/core/component/shape/shader/SolidShader.kt
 create mode 100644 vico/core/src/main/java/com/patrykandpatrick/vico/core/component/shape/shader/TopBottomShader.kt
 delete mode 100644 vico/core/src/main/java/com/patrykandpatrick/vico/core/entry/ChartEntry.kt
 delete mode 100644 vico/core/src/main/java/com/patrykandpatrick/vico/core/entry/ChartEntryExtensions.kt
 delete mode 100644 vico/core/src/main/java/com/patrykandpatrick/vico/core/entry/ChartEntryModel.kt
 delete mode 100644 vico/core/src/main/java/com/patrykandpatrick/vico/core/entry/ChartEntryModelProducer.kt
 delete mode 100644 vico/core/src/main/java/com/patrykandpatrick/vico/core/entry/ChartModelProducer.kt
 delete mode 100644 vico/core/src/main/java/com/patrykandpatrick/vico/core/entry/EntryListExtensions.kt
 delete mode 100644 vico/core/src/main/java/com/patrykandpatrick/vico/core/entry/FloatEntry.kt
 delete mode 100644 vico/core/src/main/java/com/patrykandpatrick/vico/core/entry/composed/ComposedChartEntryModelProducer.kt
 delete mode 100644 vico/core/src/main/java/com/patrykandpatrick/vico/core/entry/composed/ComposedEntryListExtensions.kt
 create mode 100644 vico/core/src/main/java/com/patrykandpatrick/vico/core/model/CartesianChartModel.kt
 create mode 100644 vico/core/src/main/java/com/patrykandpatrick/vico/core/model/CartesianChartModelProducer.kt
 create mode 100644 vico/core/src/main/java/com/patrykandpatrick/vico/core/model/CartesianLayerModel.kt
 create mode 100644 vico/core/src/main/java/com/patrykandpatrick/vico/core/model/ColumnCartesianLayerModel.kt
 rename vico/core/src/main/java/com/patrykandpatrick/vico/core/{entry/diff => model}/ExtraStore.kt (98%)
 create mode 100644 vico/core/src/main/java/com/patrykandpatrick/vico/core/model/LineCartesianLayerModel.kt
 rename vico/core/src/main/java/com/patrykandpatrick/vico/core/{chart/column/ColumnChartDrawingModel.kt => model/drawing/ColumnCartesianLayerDrawingModel.kt} (62%)
 rename vico/core/src/main/java/com/patrykandpatrick/vico/core/{entry/diff => model/drawing}/DefaultDrawingModelInterpolator.kt (98%)
 rename vico/core/src/main/java/com/patrykandpatrick/vico/core/{entry/diff => model/drawing}/DrawingModel.kt (87%)
 rename vico/core/src/main/java/com/patrykandpatrick/vico/core/{entry/diff => model/drawing}/DrawingModelInterpolator.kt (95%)
 rename vico/core/src/main/java/com/patrykandpatrick/vico/core/{chart/line/LineChartDrawingModel.kt => model/drawing/LineCartesianLayerDrawingModel.kt} (59%)
 rename vico/core/src/main/java/com/patrykandpatrick/vico/core/{model => util}/Point.kt (87%)
 create mode 100644 vico/core/src/main/java/com/patrykandpatrick/vico/core/util/RandomCartesianModelGenerator.kt
 delete mode 100644 vico/core/src/main/java/com/patrykandpatrick/vico/core/util/RandomEntriesGenerator.kt
 delete mode 100644 vico/core/src/test/java/com/patrykandpatrick/vico/core/ChartEntryModelProducerTest.kt
 delete mode 100644 vico/views/src/main/java/com/patrykandpatrick/vico/views/chart/BaseChartView.kt
 create mode 100644 vico/views/src/main/java/com/patrykandpatrick/vico/views/chart/CartesianChartView.kt
 delete mode 100644 vico/views/src/main/java/com/patrykandpatrick/vico/views/chart/ChartView.kt
 delete mode 100644 vico/views/src/main/java/com/patrykandpatrick/vico/views/chart/ComposedChartView.kt
 rename vico/views/src/main/java/com/patrykandpatrick/vico/views/chart/{column => layer}/ColumnChartExtensions.kt (84%)
 rename vico/views/src/main/java/com/patrykandpatrick/vico/views/chart/{line => layer}/LineChartExtensions.kt (82%)

diff --git a/sample/src/main/java/com/patrykandpatrick/vico/sample/previews/AxisLinePreviews.kt b/sample/src/main/java/com/patrykandpatrick/vico/sample/previews/AxisLinePreviews.kt
index e3b3c2568..885e6ed41 100644
--- a/sample/src/main/java/com/patrykandpatrick/vico/sample/previews/AxisLinePreviews.kt
+++ b/sample/src/main/java/com/patrykandpatrick/vico/sample/previews/AxisLinePreviews.kt
@@ -25,8 +25,9 @@ import com.patrykandpatrick.vico.compose.axis.axisLabelComponent
 import com.patrykandpatrick.vico.compose.axis.horizontal.rememberBottomAxis
 import com.patrykandpatrick.vico.compose.axis.vertical.rememberEndAxis
 import com.patrykandpatrick.vico.compose.axis.vertical.rememberStartAxis
-import com.patrykandpatrick.vico.compose.chart.Chart
-import com.patrykandpatrick.vico.compose.chart.column.columnChart
+import com.patrykandpatrick.vico.compose.chart.CartesianChartHost
+import com.patrykandpatrick.vico.compose.chart.layer.rememberColumnCartesianLayer
+import com.patrykandpatrick.vico.compose.chart.rememberCartesianChart
 import com.patrykandpatrick.vico.compose.component.lineComponent
 import com.patrykandpatrick.vico.compose.component.shapeComponent
 import com.patrykandpatrick.vico.compose.style.LocalChartStyle
@@ -36,9 +37,10 @@ import com.patrykandpatrick.vico.core.component.shape.cornered.Corner
 import com.patrykandpatrick.vico.core.component.shape.cornered.CorneredShape
 import com.patrykandpatrick.vico.core.component.shape.cornered.CutCornerTreatment
 import com.patrykandpatrick.vico.core.component.shape.cornered.RoundedCornerTreatment
-import com.patrykandpatrick.vico.core.entry.entryModelOf
+import com.patrykandpatrick.vico.core.model.CartesianChartModel
+import com.patrykandpatrick.vico.core.model.ColumnCartesianLayerModel
 
-private val model = entryModelOf(1, 2, 3, 4)
+private val model = CartesianChartModel(ColumnCartesianLayerModel.build { series(1, 2, 3, 4) })
 
 @Composable
 private fun ProvidePreviewChartStyle(content: @Composable () -> Unit) {
@@ -50,10 +52,10 @@ private fun ProvidePreviewChartStyle(content: @Composable () -> Unit) {
                     axisLineColor = Color.Black.copy(alpha = 0.5f),
                     axisGuidelineColor = Color.Black.copy(alpha = 0.2f),
                 ),
-            columnChart =
-                LocalChartStyle.current.columnChart.copy(
+            columnLayer =
+                LocalChartStyle.current.columnLayer.copy(
                     columns =
-                        LocalChartStyle.current.columnChart.columns.map {
+                        LocalChartStyle.current.columnLayer.columns.map {
                             lineComponent(
                                 color = Color.Gray,
                                 thickness = it.thicknessDp.dp,
@@ -97,8 +99,8 @@ public fun HorizontalAxisTextInside() {
                 verticalMargin = 4.dp,
                 horizontalMargin = 4.dp,
             )
-        Chart(
-            chart = columnChart(),
+        CartesianChartHost(
+            chart = rememberCartesianChart(rememberColumnCartesianLayer()),
             model = model,
             startAxis =
                 rememberStartAxis(
@@ -131,8 +133,8 @@ public fun HorizontalAxisTextInsideAndBottomAxis() {
                 verticalMargin = 4.dp,
                 horizontalMargin = 4.dp,
             )
-        Chart(
-            chart = columnChart(),
+        CartesianChartHost(
+            chart = rememberCartesianChart(rememberColumnCartesianLayer()),
             model = model,
             startAxis =
                 rememberStartAxis(
@@ -154,8 +156,8 @@ public fun HorizontalAxisTextInsideAndBottomAxis() {
 @Preview(showBackground = true, widthDp = 250)
 public fun HorizontalAxisTextOutside() {
     ProvidePreviewChartStyle {
-        Chart(
-            chart = columnChart(),
+        CartesianChartHost(
+            chart = rememberCartesianChart(rememberColumnCartesianLayer()),
             model = model,
             startAxis =
                 rememberStartAxis(
@@ -174,8 +176,8 @@ public fun HorizontalAxisTextOutside() {
 @Preview(showBackground = true, widthDp = 250)
 public fun HorizontalAxisGuidelineDoesNotOverlayBottomAxisLine() {
     ProvidePreviewChartStyle {
-        Chart(
-            chart = columnChart(),
+        CartesianChartHost(
+            chart = rememberCartesianChart(rememberColumnCartesianLayer()),
             model = model,
             startAxis =
                 rememberStartAxis(
diff --git a/sample/src/main/java/com/patrykandpatrick/vico/sample/previews/ColumnChartsWithNegativeValuesPreviews.kt b/sample/src/main/java/com/patrykandpatrick/vico/sample/previews/ColumnChartsWithNegativeValuesPreviews.kt
index fb60f2a0a..2eb5c16b0 100644
--- a/sample/src/main/java/com/patrykandpatrick/vico/sample/previews/ColumnChartsWithNegativeValuesPreviews.kt
+++ b/sample/src/main/java/com/patrykandpatrick/vico/sample/previews/ColumnChartsWithNegativeValuesPreviews.kt
@@ -25,30 +25,29 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import com.patrykandpatrick.vico.compose.axis.horizontal.rememberBottomAxis
 import com.patrykandpatrick.vico.compose.axis.vertical.rememberStartAxis
-import com.patrykandpatrick.vico.compose.chart.Chart
-import com.patrykandpatrick.vico.compose.chart.column.columnChart
+import com.patrykandpatrick.vico.compose.chart.CartesianChartHost
+import com.patrykandpatrick.vico.compose.chart.layer.rememberColumnCartesianLayer
+import com.patrykandpatrick.vico.compose.chart.rememberCartesianChart
 import com.patrykandpatrick.vico.core.axis.AxisItemPlacer
-import com.patrykandpatrick.vico.core.chart.values.AxisValuesOverrider
+import com.patrykandpatrick.vico.core.chart.values.AxisValueOverrider
 import com.patrykandpatrick.vico.core.component.text.textComponent
-import com.patrykandpatrick.vico.core.entry.entryModelOf
+import com.patrykandpatrick.vico.core.model.CartesianChartModel
+import com.patrykandpatrick.vico.core.model.LineCartesianLayerModel
 import com.patrykandpatrick.vico.sample.showcase.rememberMarker
 
-private val model = entryModelOf(2f, -1f, 4f, -2f, 1f, 5f, -3f)
+private val model = CartesianChartModel(LineCartesianLayerModel.build { series(2, -1, 4, -2, 1, 5, -3) })
 
 @Preview
 @Composable
 public fun SingleColumnChartWithNegativeValues() {
     val marker = rememberMarker()
     Surface {
-        Chart(
+        CartesianChartHost(
             modifier = Modifier.height(250.dp),
             chart =
-                columnChart(
-                    persistentMarkers =
-                        mapOf(
-                            2f to marker,
-                            3f to marker,
-                        ),
+                rememberCartesianChart(
+                    rememberColumnCartesianLayer(),
+                    persistentMarkers = mapOf(2f to marker, 3f to marker),
                 ),
             model = model,
             startAxis = rememberStartAxis(itemPlacer = remember { AxisItemPlacer.Vertical.default(maxItemCount = 9) }),
@@ -61,11 +60,8 @@ public fun SingleColumnChartWithNegativeValues() {
 @Composable
 public fun SingleColumnChartWithNegativeValuesAndDataLabels() {
     Surface {
-        Chart(
-            chart =
-                columnChart(
-                    dataLabel = textComponent(),
-                ),
+        CartesianChartHost(
+            chart = rememberCartesianChart(rememberColumnCartesianLayer(dataLabel = textComponent())),
             model = model,
             startAxis = rememberStartAxis(),
             bottomAxis = rememberBottomAxis(),
@@ -77,14 +73,10 @@ public fun SingleColumnChartWithNegativeValuesAndDataLabels() {
 @Composable
 public fun SingleColumnChartWithNegativeValuesAndAxisValuesOverridden() {
     Surface {
-        Chart(
+        CartesianChartHost(
             chart =
-                columnChart(
-                    axisValuesOverrider =
-                        AxisValuesOverrider.fixed(
-                            minY = 1f,
-                            maxY = 4f,
-                        ),
+                rememberCartesianChart(
+                    rememberColumnCartesianLayer(axisValueOverrider = AxisValueOverrider.fixed(minY = 1f, maxY = 4f)),
                 ),
             model = model,
             startAxis = rememberStartAxis(itemPlacer = remember { AxisItemPlacer.Vertical.default(maxItemCount = 4) }),
@@ -97,14 +89,10 @@ public fun SingleColumnChartWithNegativeValuesAndAxisValuesOverridden() {
 @Composable
 public fun SingleColumnChartWithNegativeValuesAndAxisValuesOverridden2() {
     Surface {
-        Chart(
+        CartesianChartHost(
             chart =
-                columnChart(
-                    axisValuesOverrider =
-                        AxisValuesOverrider.fixed(
-                            minY = -2f,
-                            maxY = 0f,
-                        ),
+                rememberCartesianChart(
+                    rememberColumnCartesianLayer(axisValueOverrider = AxisValueOverrider.fixed(minY = -2f, maxY = 0f)),
                 ),
             model = model,
             startAxis = rememberStartAxis(itemPlacer = remember { AxisItemPlacer.Vertical.default(maxItemCount = 3) }),
diff --git a/sample/src/main/java/com/patrykandpatrick/vico/sample/previews/ContainedChartsPreview.kt b/sample/src/main/java/com/patrykandpatrick/vico/sample/previews/ContainedChartsPreview.kt
index 986550528..8d2fac1b0 100644
--- a/sample/src/main/java/com/patrykandpatrick/vico/sample/previews/ContainedChartsPreview.kt
+++ b/sample/src/main/java/com/patrykandpatrick/vico/sample/previews/ContainedChartsPreview.kt
@@ -25,11 +25,13 @@ import androidx.compose.ui.unit.dp
 import com.patrykandpatrick.vico.compose.axis.horizontal.rememberBottomAxis
 import com.patrykandpatrick.vico.compose.axis.vertical.rememberEndAxis
 import com.patrykandpatrick.vico.compose.axis.vertical.rememberStartAxis
-import com.patrykandpatrick.vico.compose.chart.Chart
-import com.patrykandpatrick.vico.compose.chart.column.columnChart
-import com.patrykandpatrick.vico.compose.chart.line.lineChart
-import com.patrykandpatrick.vico.compose.chart.line.lineSpec
+import com.patrykandpatrick.vico.compose.chart.CartesianChartHost
+import com.patrykandpatrick.vico.compose.chart.layer.lineSpec
+import com.patrykandpatrick.vico.compose.chart.layer.rememberColumnCartesianLayer
+import com.patrykandpatrick.vico.compose.chart.layer.rememberLineCartesianLayer
+import com.patrykandpatrick.vico.compose.chart.rememberCartesianChart
 import com.patrykandpatrick.vico.compose.component.lineComponent
+import com.patrykandpatrick.vico.compose.component.shape.shader.color
 import com.patrykandpatrick.vico.compose.component.shape.shader.verticalGradient
 import com.patrykandpatrick.vico.compose.component.textComponent
 import com.patrykandpatrick.vico.core.axis.Axis
@@ -37,27 +39,26 @@ import com.patrykandpatrick.vico.core.axis.AxisItemPlacer
 import com.patrykandpatrick.vico.core.axis.AxisPosition.Vertical
 import com.patrykandpatrick.vico.core.axis.AxisPosition.Vertical.End
 import com.patrykandpatrick.vico.core.axis.AxisPosition.Vertical.Start
-import com.patrykandpatrick.vico.core.chart.column.ColumnChart
-import com.patrykandpatrick.vico.core.chart.composed.plus
-import com.patrykandpatrick.vico.core.chart.line.LineChart
 import com.patrykandpatrick.vico.core.component.shape.Shapes
-import com.patrykandpatrick.vico.core.entry.composed.plus
-import com.patrykandpatrick.vico.core.entry.entryModelOf
+import com.patrykandpatrick.vico.core.component.shape.shader.DynamicShaders
 import com.patrykandpatrick.vico.core.marker.Marker
+import com.patrykandpatrick.vico.core.model.CartesianChartModel
+import com.patrykandpatrick.vico.core.model.ColumnCartesianLayerModel
+import com.patrykandpatrick.vico.core.model.LineCartesianLayerModel
 import com.patrykandpatrick.vico.sample.showcase.rememberMarker
 
-private val model1 = entryModelOf(0 to 1, 1 to 2, 2 to 4, 3 to 1, 4 to 4)
-private val model2 = entryModelOf(1 to 4, 2 to 1, 3 to 8, 4 to 12, 5 to 5)
+private val model =
+    CartesianChartModel(
+        ColumnCartesianLayerModel.build { series(1, 2, 4, 1, 4) },
+        LineCartesianLayerModel.build { series(4, 1, 8, 12, 5) },
+    )
 
 private val markerMap: Map<Float, Marker>
     @Composable get() = mapOf(4f to rememberMarker())
 
 @Composable
-private fun getColumnChart(
-    markerMap: Map<Float, Marker> = emptyMap(),
-    targetVerticalAxisPosition: Vertical? = null,
-): ColumnChart =
-    columnChart(
+private fun getColumnLayer(verticalAxisPosition: Vertical? = null) =
+    rememberColumnCartesianLayer(
         columns =
             listOf(
                 lineComponent(
@@ -66,28 +67,23 @@ private fun getColumnChart(
                     shape = Shapes.pillShape,
                 ),
             ),
-        persistentMarkers = markerMap,
-        targetVerticalAxisPosition = targetVerticalAxisPosition,
+        verticalAxisPosition = verticalAxisPosition,
     )
 
 @Composable
-private fun getLineChart(
-    markerMap: Map<Float, Marker> = emptyMap(),
-    targetVerticalAxisPosition: Vertical? = null,
-): LineChart =
-    lineChart(
+private fun getLineLayer(verticalAxisPosition: Vertical? = null) =
+    rememberLineCartesianLayer(
         lines =
             listOf(
                 lineSpec(
-                    lineColor = Color.DarkGray,
-                    lineBackgroundShader =
+                    shader = DynamicShaders.color(Color.DarkGray),
+                    backgroundShader =
                         verticalGradient(
                             arrayOf(Color.DarkGray, Color.DarkGray.copy(alpha = 0f)),
                         ),
                 ),
             ),
-        persistentMarkers = markerMap,
-        targetVerticalAxisPosition = targetVerticalAxisPosition,
+        verticalAxisPosition = verticalAxisPosition,
     )
 
 private val startAxis: Axis<Start>
@@ -107,15 +103,9 @@ private val endAxis: Axis<End>
 @Composable
 @Preview("Chart with independent axes", widthDp = 350)
 public fun ChartWithIndependentAxes(modifier: Modifier = Modifier) {
-    val composedChart =
-        getColumnChart(targetVerticalAxisPosition = Start) +
-            getLineChart(targetVerticalAxisPosition = End)
-
-    composedChart.setPersistentMarkers(markerMap)
-
-    Chart(
-        chart = composedChart,
-        model = model1 + model2,
+    CartesianChartHost(
+        chart = rememberCartesianChart(getColumnLayer(Start), getLineLayer(End)),
+        model = model,
         startAxis = startAxis,
         bottomAxis = rememberBottomAxis(),
         endAxis = endAxis,
@@ -126,13 +116,9 @@ public fun ChartWithIndependentAxes(modifier: Modifier = Modifier) {
 @Composable
 @Preview("Chart with dependent axes", widthDp = 350)
 public fun ChartWithDependentAxes(modifier: Modifier = Modifier) {
-    val composedChart = getColumnChart() + getLineChart()
-
-    composedChart.setPersistentMarkers(markerMap)
-
-    Chart(
-        chart = composedChart,
-        model = model1 + model2,
+    CartesianChartHost(
+        chart = rememberCartesianChart(getColumnLayer(), getLineLayer(), persistentMarkers = markerMap),
+        model = model,
         startAxis = startAxis,
         bottomAxis = rememberBottomAxis(),
         endAxis = endAxis,
@@ -143,9 +129,9 @@ public fun ChartWithDependentAxes(modifier: Modifier = Modifier) {
 @Composable
 @Preview("Column chart", widthDp = 350)
 public fun ColumnChart(modifier: Modifier = Modifier) {
-    Chart(
-        chart = getColumnChart(markerMap = markerMap),
-        model = model1,
+    CartesianChartHost(
+        chart = rememberCartesianChart(getColumnLayer(), persistentMarkers = markerMap),
+        model = model,
         startAxis = startAxis,
         bottomAxis = rememberBottomAxis(),
         modifier = modifier,
@@ -155,9 +141,9 @@ public fun ColumnChart(modifier: Modifier = Modifier) {
 @Composable
 @Preview("Line chart", widthDp = 350)
 public fun LineChart(modifier: Modifier = Modifier) {
-    Chart(
-        chart = getLineChart(markerMap = markerMap),
-        model = model2,
+    CartesianChartHost(
+        chart = rememberCartesianChart(getLineLayer(), persistentMarkers = markerMap),
+        model = model,
         startAxis = startAxis,
         bottomAxis = rememberBottomAxis(),
         modifier = modifier,
diff --git a/sample/src/main/java/com/patrykandpatrick/vico/sample/previews/LineChartPreviews.kt b/sample/src/main/java/com/patrykandpatrick/vico/sample/previews/LineChartPreviews.kt
index f98dce63d..85384d6e5 100644
--- a/sample/src/main/java/com/patrykandpatrick/vico/sample/previews/LineChartPreviews.kt
+++ b/sample/src/main/java/com/patrykandpatrick/vico/sample/previews/LineChartPreviews.kt
@@ -25,19 +25,32 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import com.patrykandpatrick.vico.compose.axis.vertical.rememberStartAxis
-import com.patrykandpatrick.vico.compose.chart.Chart
-import com.patrykandpatrick.vico.compose.chart.line.lineChart
-import com.patrykandpatrick.vico.compose.chart.line.lineSpec
+import com.patrykandpatrick.vico.compose.chart.CartesianChartHost
+import com.patrykandpatrick.vico.compose.chart.layer.lineSpec
+import com.patrykandpatrick.vico.compose.chart.layer.rememberLineCartesianLayer
+import com.patrykandpatrick.vico.compose.chart.rememberCartesianChart
+import com.patrykandpatrick.vico.compose.component.shape.shader.color
 import com.patrykandpatrick.vico.compose.component.shape.shader.verticalGradient
-import com.patrykandpatrick.vico.core.chart.composed.plus
-import com.patrykandpatrick.vico.core.chart.values.AxisValuesOverrider
-import com.patrykandpatrick.vico.core.entry.composed.plus
-import com.patrykandpatrick.vico.core.entry.entriesOf
-import com.patrykandpatrick.vico.core.entry.entryModelOf
+import com.patrykandpatrick.vico.core.chart.values.AxisValueOverrider
+import com.patrykandpatrick.vico.core.component.shape.shader.DynamicShaders
+import com.patrykandpatrick.vico.core.model.CartesianChartModel
+import com.patrykandpatrick.vico.core.model.LineCartesianLayerModel
 
-private val model1 = entryModelOf(0, 2, 4, 0, 2)
-private val model2 = entryModelOf(1, 3, 4, 1, 3)
-private val model3 = entryModelOf(entriesOf(3, 2, 2, 3, 1), entriesOf(1, 3, 1, 2, 3))
+private val model1 = CartesianChartModel(LineCartesianLayerModel.build { series(0, 2, 4, 0, 2) })
+
+private val model2 =
+    CartesianChartModel(
+        LineCartesianLayerModel.build { series(0, 2, 4, 0, 2) },
+        LineCartesianLayerModel.build { series(1, 3, 4, 1, 3) },
+    )
+
+private val model3 =
+    CartesianChartModel(
+        LineCartesianLayerModel.build {
+            series(3, 2, 2, 3, 1)
+            series(1, 3, 1, 2, 3)
+        },
+    )
 
 @Preview("Line Chart Dark", widthDp = 200)
 @Composable
@@ -49,28 +62,29 @@ public fun LineChartDark() {
         val yellow = Color(0xFFFFAA4A)
         val pink = Color(0xFFFF4AAA)
 
-        Chart(
+        CartesianChartHost(
             modifier = Modifier.padding(8.dp),
             chart =
-                lineChart(
-                    lines =
+                rememberCartesianChart(
+                    rememberLineCartesianLayer(
                         listOf(
                             lineSpec(
-                                lineColor = yellow,
-                                lineBackgroundShader =
+                                shader = DynamicShaders.color(yellow),
+                                backgroundShader =
                                     verticalGradient(
-                                        arrayOf(yellow.copy(0.5f), yellow.copy(alpha = 0f)),
+                                        arrayOf(yellow.copy(alpha = 0.5f), yellow.copy(alpha = 0f)),
                                     ),
                             ),
                             lineSpec(
-                                lineColor = pink,
-                                lineBackgroundShader =
+                                shader = DynamicShaders.color(pink),
+                                backgroundShader =
                                     verticalGradient(
-                                        arrayOf(pink.copy(0.5f), pink.copy(alpha = 0f)),
+                                        arrayOf(pink.copy(alpha = 0.5f), pink.copy(alpha = 0f)),
                                     ),
                             ),
                         ),
-                    axisValuesOverrider = AxisValuesOverrider.fixed(maxY = 4f),
+                        axisValueOverrider = AxisValueOverrider.fixed(maxY = 4f),
+                    ),
                 ),
             model = model3,
         )
@@ -80,8 +94,8 @@ public fun LineChartDark() {
 @Preview("Line Chart", widthDp = 200)
 @Composable
 public fun RegularLineChart() {
-    Chart(
-        chart = lineChart(),
+    CartesianChartHost(
+        chart = rememberCartesianChart(rememberLineCartesianLayer()),
         model = model1,
         startAxis = rememberStartAxis(),
     )
@@ -90,14 +104,10 @@ public fun RegularLineChart() {
 @Preview("Line Chart Expanded", widthDp = 200)
 @Composable
 public fun RegularLineChartExpanded() {
-    Chart(
+    CartesianChartHost(
         chart =
-            lineChart(
-                axisValuesOverrider =
-                    AxisValuesOverrider.fixed(
-                        minY = -1f,
-                        maxY = 5f,
-                    ),
+            rememberCartesianChart(
+                rememberLineCartesianLayer(axisValueOverrider = AxisValueOverrider.fixed(minY = -1f, maxY = 5f)),
             ),
         model = model1,
         startAxis = rememberStartAxis(),
@@ -107,14 +117,10 @@ public fun RegularLineChartExpanded() {
 @Preview("Line Chart Collapsed", widthDp = 200)
 @Composable
 public fun RegularLineChartCollapsed() {
-    Chart(
+    CartesianChartHost(
         chart =
-            lineChart(
-                axisValuesOverrider =
-                    AxisValuesOverrider.fixed(
-                        minY = 1f,
-                        maxY = 3f,
-                    ),
+            rememberCartesianChart(
+                rememberLineCartesianLayer(axisValueOverrider = AxisValueOverrider.fixed(minY = 1f, maxY = 3f)),
             ),
         model = model1,
         startAxis = rememberStartAxis(),
@@ -124,26 +130,23 @@ public fun RegularLineChartCollapsed() {
 @Preview("Composed Chart", widthDp = 200)
 @Composable
 public fun ComposedLineChart() {
-    Chart(
+    CartesianChartHost(
         chart =
-            lineChart() +
-                lineChart(
-                    lines =
-                        listOf(
-                            lineSpec(
-                                lineColor = Color.Blue,
-                                lineBackgroundShader =
-                                    verticalGradient(
-                                        colors =
-                                            arrayOf(
-                                                Color.Blue.copy(alpha = 0.4f),
-                                                Color.Blue.copy(alpha = 0f),
-                                            ),
-                                    ),
-                            ),
+            rememberCartesianChart(
+                rememberLineCartesianLayer(),
+                rememberLineCartesianLayer(
+                    listOf(
+                        lineSpec(
+                            shader = DynamicShaders.color(Color.Blue),
+                            backgroundShader =
+                                verticalGradient(
+                                    arrayOf(Color.Blue.copy(alpha = 0.4f), Color.Blue.copy(alpha = 0f)),
+                                ),
                         ),
+                    ),
                 ),
-        model = model1 + model2,
+            ),
+        model = model2,
         startAxis = rememberStartAxis(),
     )
 }
@@ -151,23 +154,13 @@ public fun ComposedLineChart() {
 @Preview("Composed Chart Collapsed", widthDp = 200)
 @Composable
 public fun ComposedLineChartCollapsed() {
-    Chart(
+    CartesianChartHost(
         chart =
-            lineChart(
-                axisValuesOverrider =
-                    AxisValuesOverrider.fixed(
-                        minY = 1f,
-                        maxY = 3f,
-                    ),
-            ) +
-                lineChart(
-                    axisValuesOverrider =
-                        AxisValuesOverrider.fixed(
-                            minY = 1f,
-                            maxY = 3f,
-                        ),
-                ),
-        model = model1 + model2,
+            rememberCartesianChart(
+                rememberLineCartesianLayer(axisValueOverrider = AxisValueOverrider.fixed(minY = 1f, maxY = 3f)),
+                rememberLineCartesianLayer(axisValueOverrider = AxisValueOverrider.fixed(minY = 1f, maxY = 3f)),
+            ),
+        model = model2,
         startAxis = rememberStartAxis(),
     )
 }
diff --git a/sample/src/main/java/com/patrykandpatrick/vico/sample/previews/LineChartsWithNegativeValuesPreviews.kt b/sample/src/main/java/com/patrykandpatrick/vico/sample/previews/LineChartsWithNegativeValuesPreviews.kt
index 94460afcd..f3c067c6a 100644
--- a/sample/src/main/java/com/patrykandpatrick/vico/sample/previews/LineChartsWithNegativeValuesPreviews.kt
+++ b/sample/src/main/java/com/patrykandpatrick/vico/sample/previews/LineChartsWithNegativeValuesPreviews.kt
@@ -27,46 +27,46 @@ import androidx.compose.ui.unit.dp
 import com.patrykandpatrick.vico.compose.axis.axisLineComponent
 import com.patrykandpatrick.vico.compose.axis.horizontal.rememberBottomAxis
 import com.patrykandpatrick.vico.compose.axis.vertical.rememberStartAxis
-import com.patrykandpatrick.vico.compose.chart.Chart
+import com.patrykandpatrick.vico.compose.chart.CartesianChartHost
+import com.patrykandpatrick.vico.compose.chart.layer.lineSpec
+import com.patrykandpatrick.vico.compose.chart.layer.rememberLineCartesianLayer
 import com.patrykandpatrick.vico.compose.chart.layout.fullWidth
-import com.patrykandpatrick.vico.compose.chart.line.lineChart
-import com.patrykandpatrick.vico.compose.chart.line.lineSpec
-import com.patrykandpatrick.vico.compose.component.shape.shader.solid
-import com.patrykandpatrick.vico.compose.component.shape.shader.split
+import com.patrykandpatrick.vico.compose.chart.rememberCartesianChart
+import com.patrykandpatrick.vico.compose.component.shape.shader.color
 import com.patrykandpatrick.vico.compose.component.textComponent
 import com.patrykandpatrick.vico.core.axis.AxisItemPlacer
 import com.patrykandpatrick.vico.core.chart.layout.HorizontalLayout
-import com.patrykandpatrick.vico.core.chart.values.AxisValuesOverrider
+import com.patrykandpatrick.vico.core.chart.values.AxisValueOverrider
 import com.patrykandpatrick.vico.core.component.shape.shader.DynamicShaders
-import com.patrykandpatrick.vico.core.entry.entryModelOf
+import com.patrykandpatrick.vico.core.component.shape.shader.TopBottomShader
+import com.patrykandpatrick.vico.core.model.CartesianChartModel
+import com.patrykandpatrick.vico.core.model.LineCartesianLayerModel
 import com.patrykandpatrick.vico.sample.showcase.rememberMarker
 
-private val model = entryModelOf(-2f, -1f, 4f, -2f, 1f, 5f, -3f)
+private val model = CartesianChartModel(LineCartesianLayerModel.build { series(-2, -1, 4, -2, 1, 5, -3) })
 
 @Preview
 @Composable
 public fun SingleLineChartWithNegativeValues() {
     val marker = rememberMarker()
     Surface {
-        Chart(
+        CartesianChartHost(
             modifier = Modifier.height(250.dp),
             chart =
-                lineChart(
-                    lines =
-                        listOf(
-                            lineSpec(
-                                lineShader =
-                                    DynamicShaders.split(
-                                        positiveColor = Color(0xFF25BE53),
-                                        negativeColor = Color(0xFFE73B3B),
-                                    ),
+                rememberCartesianChart(
+                    rememberLineCartesianLayer(
+                        lines =
+                            listOf(
+                                lineSpec(
+                                    shader =
+                                        TopBottomShader(
+                                            DynamicShaders.color(Color(0xFF25BE53)),
+                                            DynamicShaders.color(Color(0xFFE73B3B)),
+                                        ),
+                                ),
                             ),
-                        ),
-                    persistentMarkers =
-                        mapOf(
-                            2f to marker,
-                            3f to marker,
-                        ),
+                    ),
+                    persistentMarkers = mapOf(2f to marker, 3f to marker),
                 ),
             model = model,
             startAxis =
@@ -91,13 +91,15 @@ public fun SingleLineChartWithNegativeValues() {
 @Composable
 public fun SingleLineChartWithNegativeValuesAndDataLabels() {
     Surface {
-        Chart(
+        CartesianChartHost(
             chart =
-                lineChart(
-                    lines =
-                        listOf(
-                            lineSpec(lineShader = DynamicShaders.solid(Color.DarkGray), dataLabel = textComponent()),
-                        ),
+                rememberCartesianChart(
+                    rememberLineCartesianLayer(
+                        lines =
+                            listOf(
+                                lineSpec(shader = DynamicShaders.color(Color.DarkGray), dataLabel = textComponent()),
+                            ),
+                    ),
                 ),
             model = model,
             startAxis = rememberStartAxis(),
@@ -110,14 +112,10 @@ public fun SingleLineChartWithNegativeValuesAndDataLabels() {
 @Composable
 public fun SingleLineChartWithNegativeValuesAndAxisValuesOverridden() {
     Surface {
-        Chart(
+        CartesianChartHost(
             chart =
-                lineChart(
-                    axisValuesOverrider =
-                        AxisValuesOverrider.fixed(
-                            minY = 1f,
-                            maxY = 4f,
-                        ),
+                rememberCartesianChart(
+                    rememberLineCartesianLayer(axisValueOverrider = AxisValueOverrider.fixed(minY = 1f, maxY = 4f)),
                 ),
             model = model,
             startAxis = rememberStartAxis(itemPlacer = remember { AxisItemPlacer.Vertical.default(maxItemCount = 4) }),
@@ -130,14 +128,10 @@ public fun SingleLineChartWithNegativeValuesAndAxisValuesOverridden() {
 @Composable
 public fun SingleLineChartWithNegativeValuesAndAxisValuesOverridden2() {
     Surface {
-        Chart(
+        CartesianChartHost(
             chart =
-                lineChart(
-                    axisValuesOverrider =
-                        AxisValuesOverrider.fixed(
-                            minY = -2f,
-                            maxY = 0f,
-                        ),
+                rememberCartesianChart(
+                    rememberLineCartesianLayer(axisValueOverrider = AxisValueOverrider.fixed(minY = -2f, maxY = 0f)),
                 ),
             model = model,
             startAxis = rememberStartAxis(itemPlacer = remember { AxisItemPlacer.Vertical.default(maxItemCount = 3) }),
diff --git a/sample/src/main/java/com/patrykandpatrick/vico/sample/previews/Previews.kt b/sample/src/main/java/com/patrykandpatrick/vico/sample/previews/Previews.kt
index fb920ab43..171699c44 100644
--- a/sample/src/main/java/com/patrykandpatrick/vico/sample/previews/Previews.kt
+++ b/sample/src/main/java/com/patrykandpatrick/vico/sample/previews/Previews.kt
@@ -34,11 +34,13 @@ import androidx.compose.ui.graphics.toArgb
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import com.patrykandpatrick.vico.compose.chart.Chart
-import com.patrykandpatrick.vico.compose.chart.column.columnChart
-import com.patrykandpatrick.vico.compose.chart.line.lineChart
-import com.patrykandpatrick.vico.compose.chart.line.lineSpec
+import com.patrykandpatrick.vico.compose.chart.CartesianChartHost
+import com.patrykandpatrick.vico.compose.chart.layer.lineSpec
+import com.patrykandpatrick.vico.compose.chart.layer.rememberColumnCartesianLayer
+import com.patrykandpatrick.vico.compose.chart.layer.rememberLineCartesianLayer
+import com.patrykandpatrick.vico.compose.chart.rememberCartesianChart
 import com.patrykandpatrick.vico.compose.component.lineComponent
+import com.patrykandpatrick.vico.compose.component.shape.shader.color
 import com.patrykandpatrick.vico.compose.component.shape.shader.fromComponent
 import com.patrykandpatrick.vico.compose.component.shape.shader.verticalGradient
 import com.patrykandpatrick.vico.compose.component.shapeComponent
@@ -47,13 +49,15 @@ import com.patrykandpatrick.vico.compose.dimensions.dimensionsOf
 import com.patrykandpatrick.vico.core.axis.horizontal.createHorizontalAxis
 import com.patrykandpatrick.vico.core.axis.vertical.VerticalAxis
 import com.patrykandpatrick.vico.core.axis.vertical.createVerticalAxis
-import com.patrykandpatrick.vico.core.chart.values.AxisValuesOverrider
+import com.patrykandpatrick.vico.core.chart.values.AxisValueOverrider
 import com.patrykandpatrick.vico.core.component.shape.DashedShape
 import com.patrykandpatrick.vico.core.component.shape.LineComponent
 import com.patrykandpatrick.vico.core.component.shape.Shapes.pillShape
 import com.patrykandpatrick.vico.core.component.shape.Shapes.rectShape
 import com.patrykandpatrick.vico.core.component.shape.shader.DynamicShaders
-import com.patrykandpatrick.vico.core.entry.entryModelOf
+import com.patrykandpatrick.vico.core.model.CartesianChartModel
+import com.patrykandpatrick.vico.core.model.ColumnCartesianLayerModel
+import com.patrykandpatrick.vico.core.model.LineCartesianLayerModel
 import com.patrykandpatrick.vico.sample.utils.VicoTheme
 
 private val chartModifier = Modifier.height(100.dp)
@@ -65,19 +69,20 @@ public fun ColumnChartCard(): Unit =
         val colors = MaterialTheme.colors
 
         SampleCard {
-            Chart(
+            CartesianChartHost(
                 modifier = chartModifier,
                 chart =
-                    columnChart(
-                        columns =
+                    rememberCartesianChart(
+                        rememberColumnCartesianLayer(
                             listOf(
                                 lineComponent(
-                                    colors.primary,
+                                    color = colors.primary,
                                     thickness = 8.dp,
                                     shape = RoundedCornerShape(4.dp),
                                     dynamicShader = verticalGradient(arrayOf(colors.primary, colors.secondary)),
                                 ),
                             ),
+                        ),
                     ),
                 startAxis =
                     createVerticalAxis {
@@ -106,7 +111,7 @@ public fun ColumnChartCard(): Unit =
                                 1.dp.value,
                             )
                     },
-                model = entryModelOf(1, 2, 3, 2),
+                model = CartesianChartModel(ColumnCartesianLayerModel.build { series(1, 2, 3, 2) }),
             )
         }
     }
@@ -118,32 +123,33 @@ public fun LineChartCard(): Unit =
         val colors = MaterialTheme.colors
 
         SampleCard {
-            Chart(
+            CartesianChartHost(
                 modifier = Modifier.height(100.dp),
                 chart =
-                    lineChart(
-                        lines =
+                    rememberCartesianChart(
+                        rememberLineCartesianLayer(
                             listOf(
                                 lineSpec(
                                     point = null,
-                                    lineColor = colors.primary,
-                                    lineBackgroundShader =
+                                    shader = DynamicShaders.color(colors.primary),
+                                    backgroundShader =
                                         DynamicShaders.fromComponent(
                                             componentSize = 4.dp,
                                             component =
-                                                shapeComponent(shape = pillShape, color = colors.primary).apply {
-                                                    setMargins(0.5.dp.value)
-                                                },
+                                                shapeComponent(shape = pillShape, color = colors.primary)
+                                                    .apply { setMargins(0.5.dp.value) },
                                         ),
                                 ),
                             ),
-                        axisValuesOverrider =
-                            AxisValuesOverrider.fixed(
-                                minX = 0f,
-                                maxY = 3f,
-                            ),
+                            axisValueOverrider = AxisValueOverrider.fixed(minX = 0f, maxY = 3f),
+                        ),
+                    ),
+                model =
+                    CartesianChartModel(
+                        LineCartesianLayerModel.build {
+                            series(x = listOf(-1, 0, 1, 2, 3, 4, 5), y = listOf(0, 0, 1, 2, 0, 2, 1))
+                        },
                     ),
-                model = entryModelOf(-1 to 0, 0 to 0, 1 to 1, 2 to 2, 3 to 0, 4 to 2, 5 to 1),
                 startAxis =
                     createVerticalAxis {
                         label =
diff --git a/sample/src/main/java/com/patrykandpatrick/vico/sample/previews/StackedColumnChartsWithNegativeValuesPreviews.kt b/sample/src/main/java/com/patrykandpatrick/vico/sample/previews/StackedColumnChartsWithNegativeValuesPreviews.kt
index a2fddb4d6..c445d90f0 100644
--- a/sample/src/main/java/com/patrykandpatrick/vico/sample/previews/StackedColumnChartsWithNegativeValuesPreviews.kt
+++ b/sample/src/main/java/com/patrykandpatrick/vico/sample/previews/StackedColumnChartsWithNegativeValuesPreviews.kt
@@ -26,23 +26,26 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import com.patrykandpatrick.vico.compose.axis.horizontal.rememberBottomAxis
 import com.patrykandpatrick.vico.compose.axis.vertical.rememberStartAxis
-import com.patrykandpatrick.vico.compose.chart.Chart
-import com.patrykandpatrick.vico.compose.chart.column.columnChart
+import com.patrykandpatrick.vico.compose.chart.CartesianChartHost
+import com.patrykandpatrick.vico.compose.chart.layer.rememberColumnCartesianLayer
+import com.patrykandpatrick.vico.compose.chart.rememberCartesianChart
 import com.patrykandpatrick.vico.compose.component.lineComponent
 import com.patrykandpatrick.vico.core.axis.AxisItemPlacer
-import com.patrykandpatrick.vico.core.chart.column.ColumnChart.MergeMode.Stack
-import com.patrykandpatrick.vico.core.chart.values.AxisValuesOverrider
+import com.patrykandpatrick.vico.core.chart.layer.ColumnCartesianLayer
+import com.patrykandpatrick.vico.core.chart.values.AxisValueOverrider
 import com.patrykandpatrick.vico.core.component.shape.LineComponent
 import com.patrykandpatrick.vico.core.component.text.textComponent
-import com.patrykandpatrick.vico.core.entry.entriesOf
-import com.patrykandpatrick.vico.core.entry.entryModelOf
+import com.patrykandpatrick.vico.core.model.CartesianChartModel
+import com.patrykandpatrick.vico.core.model.ColumnCartesianLayerModel
 import com.patrykandpatrick.vico.sample.showcase.rememberMarker
 
 private val model =
-    entryModelOf(
-        entriesOf(2f, -1f, -4f, 2f, 1f, -5f, -2f, -3f),
-        entriesOf(3f, -2f, 2f, -1f, 2f, -3f, -4f, -1f),
-        entriesOf(1f, -2f, 2f, 1f, -1f, 4f, 4f, -2f),
+    CartesianChartModel(
+        ColumnCartesianLayerModel.build {
+            series(2, -1, -4, 2, 1, -5, -2, -3)
+            series(3, -2, 2, -1, 2, -3, -4, -1)
+            series(1, -2, 2, 1, -1, 4, 4, -2)
+        },
     )
 
 private val columns: List<LineComponent>
@@ -59,17 +62,12 @@ private val columns: List<LineComponent>
 public fun StackedColumnChartWithNegativeValues() {
     val marker = rememberMarker()
     Surface {
-        Chart(
+        CartesianChartHost(
             modifier = Modifier.height(250.dp),
             chart =
-                columnChart(
-                    columns = columns,
-                    persistentMarkers =
-                        mapOf(
-                            2f to marker,
-                            3f to marker,
-                        ),
-                    mergeMode = Stack,
+                rememberCartesianChart(
+                    rememberColumnCartesianLayer(columns = columns, mergeMode = ColumnCartesianLayer.MergeMode.Stacked),
+                    persistentMarkers = mapOf(2f to marker, 3f to marker),
                 ),
             model = model,
             startAxis = rememberStartAxis(itemPlacer = remember { AxisItemPlacer.Vertical.default(maxItemCount = 8) }),
@@ -82,12 +80,14 @@ public fun StackedColumnChartWithNegativeValues() {
 @Composable
 public fun StackedColumnChartWithNegativeValuesAndDataLabels() {
     Surface {
-        Chart(
+        CartesianChartHost(
             chart =
-                columnChart(
-                    columns = columns,
-                    dataLabel = textComponent(),
-                    mergeMode = Stack,
+                rememberCartesianChart(
+                    rememberColumnCartesianLayer(
+                        columns = columns,
+                        dataLabel = textComponent(),
+                        mergeMode = ColumnCartesianLayer.MergeMode.Stacked,
+                    ),
                 ),
             model = model,
             startAxis = rememberStartAxis(itemPlacer = remember { AxisItemPlacer.Vertical.default(maxItemCount = 8) }),
@@ -100,16 +100,14 @@ public fun StackedColumnChartWithNegativeValuesAndDataLabels() {
 @Composable
 public fun StackedColumnChartWithNegativeValuesAndAxisValuesOverridden() {
     Surface {
-        Chart(
+        CartesianChartHost(
             chart =
-                columnChart(
-                    columns = columns,
-                    axisValuesOverrider =
-                        AxisValuesOverrider.fixed(
-                            minY = 1f,
-                            maxY = 4f,
-                        ),
-                    mergeMode = Stack,
+                rememberCartesianChart(
+                    rememberColumnCartesianLayer(
+                        columns = columns,
+                        axisValueOverrider = AxisValueOverrider.fixed(minY = 1f, maxY = 4f),
+                        mergeMode = ColumnCartesianLayer.MergeMode.Stacked,
+                    ),
                 ),
             model = model,
             startAxis = rememberStartAxis(itemPlacer = remember { AxisItemPlacer.Vertical.default(maxItemCount = 4) }),
@@ -122,16 +120,14 @@ public fun StackedColumnChartWithNegativeValuesAndAxisValuesOverridden() {
 @Composable
 public fun StackedColumnChartWithNegativeValuesAndAxisValuesOverridden2() {
     Surface {
-        Chart(
+        CartesianChartHost(
             chart =
-                columnChart(
-                    columns = columns,
-                    axisValuesOverrider =
-                        AxisValuesOverrider.fixed(
-                            minY = -2f,
-                            maxY = 0f,
-                        ),
-                    mergeMode = Stack,
+                rememberCartesianChart(
+                    rememberColumnCartesianLayer(
+                        columns = columns,
+                        axisValueOverrider = AxisValueOverrider.fixed(minY = -2f, maxY = 0f),
+                        mergeMode = ColumnCartesianLayer.MergeMode.Stacked,
+                    ),
                 ),
             model = model,
             startAxis = rememberStartAxis(itemPlacer = remember { AxisItemPlacer.Vertical.default(maxItemCount = 3) }),
diff --git a/sample/src/main/java/com/patrykandpatrick/vico/sample/previews/ThresholdLinePreviews.kt b/sample/src/main/java/com/patrykandpatrick/vico/sample/previews/ThresholdLinePreviews.kt
index a1c6f3940..40c0adf35 100644
--- a/sample/src/main/java/com/patrykandpatrick/vico/sample/previews/ThresholdLinePreviews.kt
+++ b/sample/src/main/java/com/patrykandpatrick/vico/sample/previews/ThresholdLinePreviews.kt
@@ -29,8 +29,9 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import com.patrykandpatrick.vico.compose.axis.horizontal.rememberBottomAxis
 import com.patrykandpatrick.vico.compose.axis.vertical.rememberStartAxis
-import com.patrykandpatrick.vico.compose.chart.Chart
-import com.patrykandpatrick.vico.compose.chart.column.columnChart
+import com.patrykandpatrick.vico.compose.chart.CartesianChartHost
+import com.patrykandpatrick.vico.compose.chart.layer.rememberColumnCartesianLayer
+import com.patrykandpatrick.vico.compose.chart.rememberCartesianChart
 import com.patrykandpatrick.vico.compose.chart.scroll.rememberChartScrollSpec
 import com.patrykandpatrick.vico.compose.component.lineComponent
 import com.patrykandpatrick.vico.compose.component.shape.shader.toDynamicShader
@@ -41,9 +42,10 @@ import com.patrykandpatrick.vico.compose.style.LocalChartStyle
 import com.patrykandpatrick.vico.core.chart.decoration.ThresholdLine
 import com.patrykandpatrick.vico.core.component.shape.Shapes
 import com.patrykandpatrick.vico.core.component.shape.shader.ComponentShader
-import com.patrykandpatrick.vico.core.entry.entryModelOf
+import com.patrykandpatrick.vico.core.model.CartesianChartModel
+import com.patrykandpatrick.vico.core.model.ColumnCartesianLayerModel
 
-private val model = entryModelOf(1, 2, 3, 4)
+private val model = CartesianChartModel(ColumnCartesianLayerModel.build { series(1, 2, 3, 4) })
 
 public val Color.Companion.DimmedGray: Color
     get() = Color(0xFFAAAAAA)
@@ -59,10 +61,10 @@ private fun ProvidePreviewChartStyle(content: @Composable () -> Unit) {
                     axisTickColor = Color.DimmedGray,
                     axisGuidelineColor = Color.DimmedGray,
                 ),
-            columnChart =
-                LocalChartStyle.current.columnChart.copy(
+            columnLayer =
+                LocalChartStyle.current.columnLayer.copy(
                     columns =
-                        LocalChartStyle.current.columnChart.columns.map {
+                        LocalChartStyle.current.columnLayer.columns.map {
                             lineComponent(
                                 color = Color.DimmedGray,
                                 thickness = it.thicknessDp.dp,
@@ -88,18 +90,20 @@ private fun ProvidePreviewChartStyle(content: @Composable () -> Unit) {
 @Composable
 public fun ThresholdLine() {
     ProvidePreviewChartStyle {
-        Chart(
+        CartesianChartHost(
             modifier = Modifier,
             chart =
-                columnChart().apply {
-                    addDecoration(
-                        ThresholdLine(
-                            thresholdValue = 2f,
-                            lineComponent = shapeComponent(color = Color.Black),
-                            labelComponent = textComponent(Color.Black, padding = dimensionsOf(horizontal = 8.dp)),
+                rememberCartesianChart(
+                    rememberColumnCartesianLayer(),
+                    decorations =
+                        listOf(
+                            ThresholdLine(
+                                thresholdValue = 2f,
+                                lineComponent = shapeComponent(color = Color.Black),
+                                labelComponent = textComponent(Color.Black, padding = dimensionsOf(horizontal = 8.dp)),
+                            ),
                         ),
-                    )
-                },
+                ),
             model = model,
             startAxis = rememberStartAxis(),
             bottomAxis = rememberBottomAxis(),
@@ -112,66 +116,70 @@ public fun ThresholdLine() {
 @Composable
 public fun ThresholdLineWithCustomText() {
     ProvidePreviewChartStyle {
-        Chart(
+        CartesianChartHost(
             modifier = Modifier,
             chart =
-                columnChart().apply {
-                    addDecoration(
-                        ThresholdLine(
-                            thresholdValue = 2f,
-                            thresholdLabel = "Threshold line 1 📐",
-                            lineComponent = shapeComponent(color = Color.Black),
-                            labelComponent =
-                                textComponent(
-                                    color = Color.White,
-                                    lineCount = 3,
-                                    background =
-                                        shapeComponent(
-                                            shape =
-                                                Shapes.roundedCornerShape(
-                                                    bottomLeftPercent = 25,
-                                                    bottomRightPercent = 25,
-                                                ),
-                                            color = Color.Black,
-                                        ),
-                                    padding =
-                                        dimensionsOf(
-                                            start = 8.dp,
-                                            top = 2.dp,
-                                            end = 8.dp,
-                                            bottom = 4.dp,
-                                        ),
-                                    margins = dimensionsOf(horizontal = 4.dp),
-                                ),
-                            labelVerticalPosition = ThresholdLine.LabelVerticalPosition.Bottom,
-                        ),
-                    )
-                    addDecoration(
-                        ThresholdLine(
-                            thresholdValue = 3f,
-                            thresholdLabel = "Threshold line 2 📐",
-                            lineComponent = shapeComponent(color = Color.DarkGray),
-                            labelComponent =
-                                textComponent(
-                                    color = Color.White,
-                                    lineCount = 3,
-                                    background =
-                                        shapeComponent(
-                                            shape = Shapes.cutCornerShape(topLeftPercent = 25, topRightPercent = 25),
-                                            color = Color.DarkGray,
-                                        ),
-                                    padding =
-                                        dimensionsOf(
-                                            start = 8.dp,
-                                            top = 4.dp,
-                                            end = 8.dp,
-                                            bottom = 2.dp,
-                                        ),
-                                    margins = dimensionsOf(horizontal = 4.dp),
-                                ),
+                rememberCartesianChart(
+                    rememberColumnCartesianLayer(),
+                    decorations =
+                        listOf(
+                            ThresholdLine(
+                                thresholdValue = 2f,
+                                thresholdLabel = "Threshold line 1 📐",
+                                lineComponent = shapeComponent(color = Color.Black),
+                                labelComponent =
+                                    textComponent(
+                                        color = Color.White,
+                                        lineCount = 3,
+                                        background =
+                                            shapeComponent(
+                                                shape =
+                                                    Shapes.roundedCornerShape(
+                                                        bottomLeftPercent = 25,
+                                                        bottomRightPercent = 25,
+                                                    ),
+                                                color = Color.Black,
+                                            ),
+                                        padding =
+                                            dimensionsOf(
+                                                start = 8.dp,
+                                                top = 2.dp,
+                                                end = 8.dp,
+                                                bottom = 4.dp,
+                                            ),
+                                        margins = dimensionsOf(horizontal = 4.dp),
+                                    ),
+                                labelVerticalPosition = ThresholdLine.LabelVerticalPosition.Bottom,
+                            ),
+                            ThresholdLine(
+                                thresholdValue = 3f,
+                                thresholdLabel = "Threshold line 2 📐",
+                                lineComponent = shapeComponent(color = Color.DarkGray),
+                                labelComponent =
+                                    textComponent(
+                                        color = Color.White,
+                                        lineCount = 3,
+                                        background =
+                                            shapeComponent(
+                                                shape =
+                                                    Shapes.cutCornerShape(
+                                                        topLeftPercent = 25,
+                                                        topRightPercent = 25,
+                                                    ),
+                                                color = Color.DarkGray,
+                                            ),
+                                        padding =
+                                            dimensionsOf(
+                                                start = 8.dp,
+                                                top = 4.dp,
+                                                end = 8.dp,
+                                                bottom = 2.dp,
+                                            ),
+                                        margins = dimensionsOf(horizontal = 4.dp),
+                                    ),
+                            ),
                         ),
-                    )
-                },
+                ),
             model = model,
             startAxis = rememberStartAxis(),
             bottomAxis = rememberBottomAxis(),
@@ -184,22 +192,24 @@ public fun ThresholdLineWithCustomText() {
 @Composable
 public fun RangedThresholdLine() {
     ProvidePreviewChartStyle {
-        Chart(
+        CartesianChartHost(
             modifier = Modifier,
             chart =
-                columnChart().apply {
-                    addDecoration(
-                        ThresholdLine(
-                            thresholdRange = 2f..3f,
-                            lineComponent = shapeComponent(color = Color.Black.copy(alpha = 0.5f)),
-                            labelComponent =
-                                textComponent(
-                                    color = Color.Black,
-                                    padding = dimensionsOf(horizontal = 8.dp),
-                                ),
+                rememberCartesianChart(
+                    rememberColumnCartesianLayer(),
+                    decorations =
+                        listOf(
+                            ThresholdLine(
+                                thresholdRange = 2f..3f,
+                                lineComponent = shapeComponent(color = Color.Black.copy(alpha = 0.5f)),
+                                labelComponent =
+                                    textComponent(
+                                        color = Color.Black,
+                                        padding = dimensionsOf(horizontal = 8.dp),
+                                    ),
+                            ),
                         ),
-                    )
-                },
+                ),
             model = model,
             startAxis = rememberStartAxis(),
             bottomAxis = rememberBottomAxis(),
@@ -212,33 +222,35 @@ public fun RangedThresholdLine() {
 @Composable
 public fun RangedThresholdLineWithBrushShader() {
     ProvidePreviewChartStyle {
-        Chart(
+        CartesianChartHost(
             modifier = Modifier,
             chart =
-                columnChart().apply {
-                    addDecoration(
-                        ThresholdLine(
-                            thresholdRange = 2f..3f,
-                            lineComponent =
-                                shapeComponent(
-                                    color = Color.Black,
-                                    dynamicShader =
-                                        Brush.verticalGradient(
-                                            colors =
-                                                listOf(
-                                                    Color.Black.copy(0.75f),
-                                                    Color.Black.copy(0.25f),
-                                                ),
-                                        ).toDynamicShader(),
-                                ),
-                            labelComponent =
-                                textComponent(
-                                    color = Color.Black,
-                                    padding = dimensionsOf(horizontal = 8.dp),
-                                ),
+                rememberCartesianChart(
+                    rememberColumnCartesianLayer(),
+                    decorations =
+                        listOf(
+                            ThresholdLine(
+                                thresholdRange = 2f..3f,
+                                lineComponent =
+                                    shapeComponent(
+                                        color = Color.Black,
+                                        dynamicShader =
+                                            Brush.verticalGradient(
+                                                colors =
+                                                    listOf(
+                                                        Color.Black.copy(0.75f),
+                                                        Color.Black.copy(0.25f),
+                                                    ),
+                                            ).toDynamicShader(),
+                                    ),
+                                labelComponent =
+                                    textComponent(
+                                        color = Color.Black,
+                                        padding = dimensionsOf(horizontal = 8.dp),
+                                    ),
+                            ),
                         ),
-                    )
-                },
+                ),
             model = model,
             startAxis = rememberStartAxis(),
             bottomAxis = rememberBottomAxis(),
@@ -251,32 +263,34 @@ public fun RangedThresholdLineWithBrushShader() {
 @Composable
 public fun RangedThresholdLineWithComponentShader() {
     ProvidePreviewChartStyle {
-        Chart(
+        CartesianChartHost(
             modifier = Modifier,
             chart =
-                columnChart().apply {
-                    addDecoration(
-                        ThresholdLine(
-                            thresholdRange = 2f..3f,
-                            lineComponent =
-                                shapeComponent(
-                                    color = Color.Black,
-                                    dynamicShader =
-                                        ComponentShader(
-                                            shapeComponent(shape = Shapes.pillShape, color = Color.Black),
-                                            componentSizeDp = 4f,
-                                        ),
-                                    strokeWidth = 2.dp,
-                                    strokeColor = Color.Black,
-                                ),
-                            labelComponent =
-                                textComponent(
-                                    color = Color.Black,
-                                    padding = dimensionsOf(horizontal = 8.dp),
-                                ),
+                rememberCartesianChart(
+                    rememberColumnCartesianLayer(),
+                    decorations =
+                        listOf(
+                            ThresholdLine(
+                                thresholdRange = 2f..3f,
+                                lineComponent =
+                                    shapeComponent(
+                                        color = Color.Black,
+                                        dynamicShader =
+                                            ComponentShader(
+                                                shapeComponent(shape = Shapes.pillShape, color = Color.Black),
+                                                componentSizeDp = 4f,
+                                            ),
+                                        strokeWidth = 2.dp,
+                                        strokeColor = Color.Black,
+                                    ),
+                                labelComponent =
+                                    textComponent(
+                                        color = Color.Black,
+                                        padding = dimensionsOf(horizontal = 8.dp),
+                                    ),
+                            ),
                         ),
-                    )
-                },
+                ),
             model = model,
             startAxis = rememberStartAxis(),
             bottomAxis = rememberBottomAxis(),
diff --git a/sample/src/main/java/com/patrykandpatrick/vico/sample/previews/composables/column/ColumnCharts.kt b/sample/src/main/java/com/patrykandpatrick/vico/sample/previews/composables/column/ColumnCharts.kt
index c2f22f1b7..2c9e37db0 100644
--- a/sample/src/main/java/com/patrykandpatrick/vico/sample/previews/composables/column/ColumnCharts.kt
+++ b/sample/src/main/java/com/patrykandpatrick/vico/sample/previews/composables/column/ColumnCharts.kt
@@ -19,29 +19,30 @@ package com.patrykandpatrick.vico.sample.previews.composables.column
 import androidx.compose.runtime.Composable
 import com.patrykandpatrick.vico.compose.axis.horizontal.rememberBottomAxis
 import com.patrykandpatrick.vico.compose.axis.vertical.rememberStartAxis
-import com.patrykandpatrick.vico.compose.chart.Chart
-import com.patrykandpatrick.vico.compose.chart.column.columnChart
+import com.patrykandpatrick.vico.compose.chart.CartesianChartHost
+import com.patrykandpatrick.vico.compose.chart.layer.rememberColumnCartesianLayer
+import com.patrykandpatrick.vico.compose.chart.rememberCartesianChart
 import com.patrykandpatrick.vico.compose.chart.scroll.rememberChartScrollSpec
-import com.patrykandpatrick.vico.core.entry.ChartEntryModel
+import com.patrykandpatrick.vico.core.model.CartesianChartModel
 import com.patrykandpatrick.vico.core.scroll.AutoScrollCondition
 import com.patrykandpatrick.vico.core.scroll.InitialScroll
 import com.patrykandpatrick.vico.sample.previews.annotation.ChartPreview
 import com.patrykandpatrick.vico.sample.previews.resource.PreviewSurface
-import com.patrykandpatrick.vico.sample.previews.resource.mediumEntryModel
-import com.patrykandpatrick.vico.sample.previews.resource.shortEntryModel
+import com.patrykandpatrick.vico.sample.previews.resource.mediumColumnModel
+import com.patrykandpatrick.vico.sample.previews.resource.shortColumnModel
 
 @ChartPreview
 @Composable
 public fun DefaultColumnChart(
-    model: ChartEntryModel = shortEntryModel,
-    oldModel: ChartEntryModel? = null,
+    model: CartesianChartModel = shortColumnModel,
+    oldModel: CartesianChartModel? = null,
     scrollable: Boolean = true,
     initialScroll: InitialScroll = InitialScroll.Start,
-    autoScrollCondition: AutoScrollCondition<ChartEntryModel> = AutoScrollCondition.Never,
+    autoScrollCondition: AutoScrollCondition = AutoScrollCondition.Never,
 ) {
     PreviewSurface {
-        Chart(
-            chart = columnChart(),
+        CartesianChartHost(
+            chart = rememberCartesianChart(rememberColumnCartesianLayer()),
             model = model,
             oldModel = oldModel,
             startAxis = rememberStartAxis(),
@@ -59,17 +60,17 @@ public fun DefaultColumnChart(
 @ChartPreview
 @Composable
 public fun DefaultColumnChartLongScrollable() {
-    DefaultColumnChart(model = mediumEntryModel)
+    DefaultColumnChart(model = mediumColumnModel)
 }
 
 @ChartPreview
 @Composable
 public fun DefaultColumnChartLongScrollableEnd() {
-    DefaultColumnChart(model = mediumEntryModel, initialScroll = InitialScroll.End)
+    DefaultColumnChart(model = mediumColumnModel, initialScroll = InitialScroll.End)
 }
 
 @ChartPreview
 @Composable
 public fun DefaultColumnChartLongNonScrollable() {
-    DefaultColumnChart(model = mediumEntryModel, scrollable = false)
+    DefaultColumnChart(model = mediumColumnModel, scrollable = false)
 }
diff --git a/sample/src/main/java/com/patrykandpatrick/vico/sample/previews/composables/line/LineCharts.kt b/sample/src/main/java/com/patrykandpatrick/vico/sample/previews/composables/line/LineCharts.kt
index 77eae7c41..fcc942a2e 100644
--- a/sample/src/main/java/com/patrykandpatrick/vico/sample/previews/composables/line/LineCharts.kt
+++ b/sample/src/main/java/com/patrykandpatrick/vico/sample/previews/composables/line/LineCharts.kt
@@ -19,26 +19,27 @@ package com.patrykandpatrick.vico.sample.previews.composables.line
 import androidx.compose.runtime.Composable
 import com.patrykandpatrick.vico.compose.axis.horizontal.rememberBottomAxis
 import com.patrykandpatrick.vico.compose.axis.vertical.rememberStartAxis
-import com.patrykandpatrick.vico.compose.chart.Chart
-import com.patrykandpatrick.vico.compose.chart.line.lineChart
+import com.patrykandpatrick.vico.compose.chart.CartesianChartHost
+import com.patrykandpatrick.vico.compose.chart.layer.rememberLineCartesianLayer
+import com.patrykandpatrick.vico.compose.chart.rememberCartesianChart
 import com.patrykandpatrick.vico.compose.chart.scroll.rememberChartScrollSpec
-import com.patrykandpatrick.vico.core.entry.ChartEntryModel
+import com.patrykandpatrick.vico.core.model.CartesianChartModel
 import com.patrykandpatrick.vico.core.scroll.InitialScroll
 import com.patrykandpatrick.vico.sample.previews.annotation.ChartPreview
 import com.patrykandpatrick.vico.sample.previews.resource.PreviewSurface
-import com.patrykandpatrick.vico.sample.previews.resource.mediumEntryModel
-import com.patrykandpatrick.vico.sample.previews.resource.shortEntryModel
+import com.patrykandpatrick.vico.sample.previews.resource.mediumLineModel
+import com.patrykandpatrick.vico.sample.previews.resource.shortLineModel
 
 @ChartPreview
 @Composable
 public fun DefaultLineChart(
-    model: ChartEntryModel = shortEntryModel,
+    model: CartesianChartModel = shortLineModel,
     scrollable: Boolean = true,
     initialScroll: InitialScroll = InitialScroll.Start,
 ) {
     PreviewSurface {
-        Chart(
-            chart = lineChart(),
+        CartesianChartHost(
+            chart = rememberCartesianChart(rememberLineCartesianLayer()),
             model = model,
             startAxis = rememberStartAxis(),
             bottomAxis = rememberBottomAxis(),
@@ -50,17 +51,17 @@ public fun DefaultLineChart(
 @ChartPreview
 @Composable
 public fun DefaultLineChartLongScrollable() {
-    DefaultLineChart(model = mediumEntryModel)
+    DefaultLineChart(model = mediumLineModel)
 }
 
 @ChartPreview
 @Composable
 public fun DefaultLineChartLongScrollableEnd() {
-    DefaultLineChart(model = mediumEntryModel, initialScroll = InitialScroll.End)
+    DefaultLineChart(model = mediumLineModel, initialScroll = InitialScroll.End)
 }
 
 @ChartPreview
 @Composable
 public fun DefaultLineChartLongNonScrollable() {
-    DefaultLineChart(model = mediumEntryModel, scrollable = false)
+    DefaultLineChart(model = mediumLineModel, scrollable = false)
 }
diff --git a/sample/src/main/java/com/patrykandpatrick/vico/sample/previews/resource/SampleModels.kt b/sample/src/main/java/com/patrykandpatrick/vico/sample/previews/resource/SampleModels.kt
index 90134f735..4a10d3053 100644
--- a/sample/src/main/java/com/patrykandpatrick/vico/sample/previews/resource/SampleModels.kt
+++ b/sample/src/main/java/com/patrykandpatrick/vico/sample/previews/resource/SampleModels.kt
@@ -16,9 +16,16 @@
 
 package com.patrykandpatrick.vico.sample.previews.resource
 
-import com.patrykandpatrick.vico.core.entry.ChartEntryModel
-import com.patrykandpatrick.vico.core.entry.entryModelOf
+import com.patrykandpatrick.vico.core.model.CartesianChartModel
+import com.patrykandpatrick.vico.core.model.ColumnCartesianLayerModel
+import com.patrykandpatrick.vico.core.model.LineCartesianLayerModel
 
-public val shortEntryModel: ChartEntryModel = entryModelOf(1, 2, 4, 8, 3)
+public val shortColumnModel = CartesianChartModel(ColumnCartesianLayerModel.build { series(1, 2, 4, 8, 3) })
 
-public val mediumEntryModel: ChartEntryModel = entryModelOf(1, 2, 4, 8, 3, 10, 4, 7, 2, 6, 4, 8)
+public val mediumColumnModel =
+    CartesianChartModel(ColumnCartesianLayerModel.build { series(1, 2, 4, 8, 3, 10, 4, 7, 2, 6, 4, 8) })
+
+public val shortLineModel = CartesianChartModel(LineCartesianLayerModel.build { series(1, 2, 4, 8, 3) })
+
+public val mediumLineModel =
+    CartesianChartModel(LineCartesianLayerModel.build { series(1, 2, 4, 8, 3, 10, 4, 7, 2, 6, 4, 8) })
diff --git a/sample/src/main/java/com/patrykandpatrick/vico/sample/showcase/ChartStyle.kt b/sample/src/main/java/com/patrykandpatrick/vico/sample/showcase/ChartStyle.kt
index 6f84e962b..24600a6aa 100644
--- a/sample/src/main/java/com/patrykandpatrick/vico/sample/showcase/ChartStyle.kt
+++ b/sample/src/main/java/com/patrykandpatrick/vico/sample/showcase/ChartStyle.kt
@@ -22,23 +22,24 @@ import androidx.compose.runtime.remember
 import androidx.compose.ui.graphics.Brush
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.toArgb
+import com.patrykandpatrick.vico.compose.component.shape.shader.color
 import com.patrykandpatrick.vico.compose.component.shape.shader.fromBrush
 import com.patrykandpatrick.vico.compose.style.ChartStyle
 import com.patrykandpatrick.vico.core.DefaultAlpha
 import com.patrykandpatrick.vico.core.DefaultColors
 import com.patrykandpatrick.vico.core.DefaultDimens
-import com.patrykandpatrick.vico.core.chart.line.LineChart
+import com.patrykandpatrick.vico.core.chart.layer.LineCartesianLayer
 import com.patrykandpatrick.vico.core.component.shape.LineComponent
 import com.patrykandpatrick.vico.core.component.shape.Shapes
 import com.patrykandpatrick.vico.core.component.shape.shader.DynamicShaders
 
 @Composable
 internal fun rememberChartStyle(
-    columnChartColors: List<Color>,
-    lineChartColors: List<Color>,
+    columnLayerColors: List<Color>,
+    lineLayerColors: List<Color>,
 ): ChartStyle {
     val isSystemInDarkTheme = isSystemInDarkTheme()
-    return remember(columnChartColors, lineChartColors, isSystemInDarkTheme) {
+    return remember(columnLayerColors, lineLayerColors, isSystemInDarkTheme) {
         val defaultColors = if (isSystemInDarkTheme) DefaultColors.Dark else DefaultColors.Light
         ChartStyle(
             ChartStyle.Axis(
@@ -46,8 +47,8 @@ internal fun rememberChartStyle(
                 axisGuidelineColor = Color(defaultColors.axisGuidelineColor),
                 axisLineColor = Color(defaultColors.axisLineColor),
             ),
-            ChartStyle.ColumnChart(
-                columnChartColors.map { columnChartColor ->
+            ChartStyle.ColumnLayer(
+                columnLayerColors.map { columnChartColor ->
                     LineComponent(
                         columnChartColor.toArgb(),
                         DefaultDimens.COLUMN_WIDTH,
@@ -55,11 +56,11 @@ internal fun rememberChartStyle(
                     )
                 },
             ),
-            ChartStyle.LineChart(
-                lineChartColors.map { lineChartColor ->
-                    LineChart.LineSpec(
-                        lineColor = lineChartColor.toArgb(),
-                        lineBackgroundShader =
+            ChartStyle.LineLayer(
+                lineLayerColors.map { lineChartColor ->
+                    LineCartesianLayer.LineSpec(
+                        shader = DynamicShaders.color(lineChartColor),
+                        backgroundShader =
                             DynamicShaders.fromBrush(
                                 Brush.verticalGradient(
                                     listOf(
@@ -79,4 +80,4 @@ internal fun rememberChartStyle(
 
 @Composable
 internal fun rememberChartStyle(chartColors: List<Color>) =
-    rememberChartStyle(columnChartColors = chartColors, lineChartColors = chartColors)
+    rememberChartStyle(columnLayerColors = chartColors, lineLayerColors = chartColors)
diff --git a/sample/src/main/java/com/patrykandpatrick/vico/sample/showcase/ShowcaseScreen.kt b/sample/src/main/java/com/patrykandpatrick/vico/sample/showcase/ShowcaseScreen.kt
index 77dc9fb3e..edaf6a561 100644
--- a/sample/src/main/java/com/patrykandpatrick/vico/sample/showcase/ShowcaseScreen.kt
+++ b/sample/src/main/java/com/patrykandpatrick/vico/sample/showcase/ShowcaseScreen.kt
@@ -26,7 +26,6 @@ import androidx.compose.foundation.lazy.LazyListScope
 import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.material3.Card
 import androidx.compose.material3.CardDefaults
-import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.NavigationBar
@@ -51,14 +50,13 @@ import com.patrykandpatrick.vico.sample.showcase.charts.Chart9
 import com.patrykandpatrick.vico.sample.utils.plus
 
 @Composable
-@OptIn(ExperimentalMaterial3Api::class)
 internal fun ShowcaseScreen(viewModel: ShowcaseViewModel = viewModel()) {
     val composeShowcaseState = rememberLazyListState()
     val viewShowcaseState = rememberLazyListState()
     Scaffold(
         bottomBar = {
             NavigationBar {
-                UISystem.values().forEach { uiSystem ->
+                UISystem.entries.forEach { uiSystem ->
                     NavigationBarItem(
                         selected = viewModel.uiSystem == uiSystem,
                         onClick = { viewModel.setUISystem(uiSystem) },
@@ -94,15 +92,15 @@ private fun LazyListScope.chartItems(
     uiSystem: UISystem,
     viewModel: ShowcaseViewModel,
 ) {
-    cardItem { Chart9(uiSystem, viewModel.positiveAndNegativeChartEntryModelProducer) }
-    cardItem { Chart1(uiSystem, viewModel.customStepChartEntryModelProducer) }
-    cardItem { Chart2(uiSystem, viewModel.chartEntryModelProducer) }
-    cardItem { Chart3(uiSystem, viewModel.chartEntryModelProducer) }
-    cardItem { Chart4(uiSystem, viewModel.composedChartEntryModelProducer) }
-    cardItem { Chart5(uiSystem, viewModel.multiDataSetChartEntryModelProducer) }
-    cardItem { Chart6(uiSystem, viewModel.multiDataSetChartEntryModelProducer) }
-    cardItem { Chart7(uiSystem, viewModel.multiDataSetChartEntryModelProducer) }
-    cardItem { Chart8(uiSystem, viewModel.composedChartEntryModelProducer) }
+    cardItem { Chart1(uiSystem, viewModel.modelProducer1) }
+    cardItem { Chart2(uiSystem, viewModel.modelProducer2) }
+    cardItem { Chart3(uiSystem, viewModel.modelProducer1) }
+    cardItem { Chart4(uiSystem, viewModel.modelProducer3) }
+    cardItem { Chart5(uiSystem, viewModel.modelProducer4) }
+    cardItem { Chart6(uiSystem, viewModel.modelProducer4) }
+    cardItem { Chart7(uiSystem, viewModel.modelProducer5) }
+    cardItem { Chart8(uiSystem, viewModel.modelProducer3) }
+    cardItem { Chart9(uiSystem, viewModel.modelProducer6) }
 }
 
 private fun LazyListScope.cardItem(content: @Composable () -> Unit) {
diff --git a/sample/src/main/java/com/patrykandpatrick/vico/sample/showcase/ShowcaseViewModel.kt b/sample/src/main/java/com/patrykandpatrick/vico/sample/showcase/ShowcaseViewModel.kt
index 00077bdae..93dbc3e6e 100644
--- a/sample/src/main/java/com/patrykandpatrick/vico/sample/showcase/ShowcaseViewModel.kt
+++ b/sample/src/main/java/com/patrykandpatrick/vico/sample/showcase/ShowcaseViewModel.kt
@@ -21,59 +21,46 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.setValue
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.patrykandpatrick.vico.core.entry.ChartEntryModelProducer
-import com.patrykandpatrick.vico.core.entry.composed.ComposedChartEntryModelProducer
-import com.patrykandpatrick.vico.core.util.RandomEntriesGenerator
+import com.patrykandpatrick.vico.core.model.CartesianChartModelProducer
+import com.patrykandpatrick.vico.core.util.RandomCartesianModelGenerator
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.currentCoroutineContext
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.isActive
 import kotlinx.coroutines.launch
 
 internal class ShowcaseViewModel : ViewModel() {
-    private val generator =
-        RandomEntriesGenerator(
-            xRange = 0..GENERATOR_X_RANGE_TOP,
-            yRange = GENERATOR_Y_RANGE_BOTTOM..GENERATOR_Y_RANGE_TOP,
-        )
-
-    private val customStepGenerator =
-        RandomEntriesGenerator(
-            xRange = IntProgression.fromClosedRange(rangeStart = 0, rangeEnd = GENERATOR_X_RANGE_TOP, step = 2),
-            yRange = GENERATOR_Y_RANGE_BOTTOM..GENERATOR_Y_RANGE_TOP,
-        )
-
-    private val positiveAndNegativeValuesGenerator =
-        RandomEntriesGenerator(
-            xRange = 0..GENERATOR_X_RANGE_TOP,
-            yRange = -10..GENERATOR_Y_RANGE_TOP,
-        )
-
-    internal val chartEntryModelProducer: ChartEntryModelProducer = ChartEntryModelProducer()
-
-    internal val positiveAndNegativeChartEntryModelProducer: ChartEntryModelProducer = ChartEntryModelProducer()
-
-    internal val customStepChartEntryModelProducer: ChartEntryModelProducer = ChartEntryModelProducer()
-
-    internal val multiDataSetChartEntryModelProducer: ChartEntryModelProducer = ChartEntryModelProducer()
-
-    internal val composedChartEntryModelProducer = ComposedChartEntryModelProducer.build()
+    internal val modelProducer1 = CartesianChartModelProducer.build()
+    internal val modelProducer2 = CartesianChartModelProducer.build()
+    internal val modelProducer3 = CartesianChartModelProducer.build()
+    internal val modelProducer4 = CartesianChartModelProducer.build()
+    internal val modelProducer5 = CartesianChartModelProducer.build()
+    internal val modelProducer6 = CartesianChartModelProducer.build()
 
     var uiSystem by mutableStateOf(UISystem.Compose)
         private set
 
     init {
-        viewModelScope.launch {
+        viewModelScope.launch(Dispatchers.Default) {
             while (currentCoroutineContext().isActive) {
-                val randomSeries = generator.generateRandomEntries()
-                val randomDataSet = List(MULTI_ENTRIES_COMBINED) { generator.generateRandomEntries() }
-                chartEntryModelProducer.setEntries(randomSeries)
-                positiveAndNegativeChartEntryModelProducer
-                    .setEntries(positiveAndNegativeValuesGenerator.generateRandomEntries())
-                multiDataSetChartEntryModelProducer.setEntries(randomDataSet)
-                customStepChartEntryModelProducer.setEntries(customStepGenerator.generateRandomEntries())
-                composedChartEntryModelProducer.runTransaction {
-                    add(randomDataSet)
-                    add(randomSeries)
+                val singleSeriesLineLayerModelPartial =
+                    RandomCartesianModelGenerator.getRandomLineLayerModelPartial()
+                val tripleSeriesColumnLayerModelPartial =
+                    RandomCartesianModelGenerator.getRandomColumnLayerModelPartial(seriesCount = 3)
+                modelProducer1.tryRunTransaction { add(singleSeriesLineLayerModelPartial) }
+                modelProducer2.tryRunTransaction {
+                    add(RandomCartesianModelGenerator.getRandomColumnLayerModelPartial())
+                }
+                modelProducer3.tryRunTransaction {
+                    add(tripleSeriesColumnLayerModelPartial)
+                    add(singleSeriesLineLayerModelPartial)
+                }
+                modelProducer4.tryRunTransaction { add(tripleSeriesColumnLayerModelPartial) }
+                modelProducer5.tryRunTransaction {
+                    add(RandomCartesianModelGenerator.getRandomLineLayerModelPartial(seriesCount = 3))
+                }
+                modelProducer6.tryRunTransaction {
+                    add(RandomCartesianModelGenerator.getRandomLineLayerModelPartial(y = -10f..20f))
                 }
                 delay(UPDATE_FREQUENCY)
             }
@@ -85,10 +72,6 @@ internal class ShowcaseViewModel : ViewModel() {
     }
 
     private companion object {
-        const val MULTI_ENTRIES_COMBINED = 3
-        const val GENERATOR_X_RANGE_TOP = 96
-        const val GENERATOR_Y_RANGE_BOTTOM = 2
-        const val GENERATOR_Y_RANGE_TOP = 20
         const val UPDATE_FREQUENCY = 2000L
     }
 }
diff --git a/sample/src/main/java/com/patrykandpatrick/vico/sample/showcase/charts/Chart1.kt b/sample/src/main/java/com/patrykandpatrick/vico/sample/showcase/charts/Chart1.kt
index 15999688d..fb51175e8 100644
--- a/sample/src/main/java/com/patrykandpatrick/vico/sample/showcase/charts/Chart1.kt
+++ b/sample/src/main/java/com/patrykandpatrick/vico/sample/showcase/charts/Chart1.kt
@@ -22,11 +22,12 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.viewinterop.AndroidViewBinding
 import com.patrykandpatrick.vico.compose.axis.horizontal.rememberBottomAxis
 import com.patrykandpatrick.vico.compose.axis.vertical.rememberStartAxis
-import com.patrykandpatrick.vico.compose.chart.Chart
-import com.patrykandpatrick.vico.compose.chart.line.lineChart
+import com.patrykandpatrick.vico.compose.chart.CartesianChartHost
+import com.patrykandpatrick.vico.compose.chart.layer.rememberLineCartesianLayer
+import com.patrykandpatrick.vico.compose.chart.rememberCartesianChart
 import com.patrykandpatrick.vico.compose.style.ProvideChartStyle
 import com.patrykandpatrick.vico.core.axis.Axis
-import com.patrykandpatrick.vico.core.entry.ChartEntryModelProducer
+import com.patrykandpatrick.vico.core.model.CartesianChartModelProducer
 import com.patrykandpatrick.vico.databinding.Chart1Binding
 import com.patrykandpatrick.vico.sample.showcase.UISystem
 import com.patrykandpatrick.vico.sample.showcase.rememberChartStyle
@@ -35,21 +36,25 @@ import com.patrykandpatrick.vico.sample.showcase.rememberMarker
 @Composable
 internal fun Chart1(
     uiSystem: UISystem,
-    chartEntryModelProducer: ChartEntryModelProducer,
+    modelProducer: CartesianChartModelProducer,
 ) {
     when (uiSystem) {
-        UISystem.Compose -> ComposeChart1(chartEntryModelProducer)
-        UISystem.Views -> ViewChart1(chartEntryModelProducer)
+        UISystem.Compose -> ComposeChart1(modelProducer)
+        UISystem.Views -> ViewChart1(modelProducer)
     }
 }
 
 @Composable
-private fun ComposeChart1(chartEntryModelProducer: ChartEntryModelProducer) {
+private fun ComposeChart1(modelProducer: CartesianChartModelProducer) {
     val marker = rememberMarker()
     ProvideChartStyle(rememberChartStyle(chartColors)) {
-        Chart(
-            chart = lineChart(persistentMarkers = remember(marker) { mapOf(PERSISTENT_MARKER_X to marker) }),
-            chartModelProducer = chartEntryModelProducer,
+        CartesianChartHost(
+            chart =
+                rememberCartesianChart(
+                    rememberLineCartesianLayer(),
+                    persistentMarkers = remember(marker) { mapOf(PERSISTENT_MARKER_X to marker) },
+                ),
+            modelProducer = modelProducer,
             startAxis = rememberStartAxis(),
             bottomAxis = rememberBottomAxis(guideline = null),
             marker = marker,
@@ -59,13 +64,13 @@ private fun ComposeChart1(chartEntryModelProducer: ChartEntryModelProducer) {
 }
 
 @Composable
-private fun ViewChart1(chartEntryModelProducer: ChartEntryModelProducer) {
+private fun ViewChart1(modelProducer: CartesianChartModelProducer) {
     val marker = rememberMarker()
     AndroidViewBinding(Chart1Binding::inflate) {
         with(chartView) {
             chart?.addPersistentMarker(PERSISTENT_MARKER_X, marker)
             runInitialAnimation = false
-            entryProducer = chartEntryModelProducer
+            this.modelProducer = modelProducer
             (bottomAxis as Axis).guideline = null
             this.marker = marker
         }
@@ -73,7 +78,7 @@ private fun ViewChart1(chartEntryModelProducer: ChartEntryModelProducer) {
 }
 
 private const val COLOR_1_CODE = 0xffa485e0
-private const val PERSISTENT_MARKER_X = 10f
+private const val PERSISTENT_MARKER_X = 5f
 
 private val color1 = Color(COLOR_1_CODE)
 private val chartColors = listOf(color1)
diff --git a/sample/src/main/java/com/patrykandpatrick/vico/sample/showcase/charts/Chart2.kt b/sample/src/main/java/com/patrykandpatrick/vico/sample/showcase/charts/Chart2.kt
index e1bc87a44..1d4de3064 100644
--- a/sample/src/main/java/com/patrykandpatrick/vico/sample/showcase/charts/Chart2.kt
+++ b/sample/src/main/java/com/patrykandpatrick/vico/sample/showcase/charts/Chart2.kt
@@ -24,8 +24,9 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.viewinterop.AndroidViewBinding
 import com.patrykandpatrick.vico.compose.axis.horizontal.rememberBottomAxis
 import com.patrykandpatrick.vico.compose.axis.vertical.rememberStartAxis
-import com.patrykandpatrick.vico.compose.chart.Chart
-import com.patrykandpatrick.vico.compose.chart.column.columnChart
+import com.patrykandpatrick.vico.compose.chart.CartesianChartHost
+import com.patrykandpatrick.vico.compose.chart.layer.rememberColumnCartesianLayer
+import com.patrykandpatrick.vico.compose.chart.rememberCartesianChart
 import com.patrykandpatrick.vico.compose.component.shapeComponent
 import com.patrykandpatrick.vico.compose.component.textComponent
 import com.patrykandpatrick.vico.compose.dimensions.dimensionsOf
@@ -41,8 +42,8 @@ import com.patrykandpatrick.vico.core.chart.decoration.ThresholdLine
 import com.patrykandpatrick.vico.core.chart.layout.HorizontalLayout
 import com.patrykandpatrick.vico.core.component.shape.LineComponent
 import com.patrykandpatrick.vico.core.component.shape.Shapes
-import com.patrykandpatrick.vico.core.entry.ChartEntryModelProducer
 import com.patrykandpatrick.vico.core.extension.half
+import com.patrykandpatrick.vico.core.model.CartesianChartModelProducer
 import com.patrykandpatrick.vico.databinding.Chart2Binding
 import com.patrykandpatrick.vico.sample.showcase.UISystem
 import com.patrykandpatrick.vico.sample.showcase.rememberChartStyle
@@ -51,31 +52,30 @@ import com.patrykandpatrick.vico.sample.showcase.rememberMarker
 @Composable
 internal fun Chart2(
     uiSystem: UISystem,
-    chartEntryModelProducer: ChartEntryModelProducer,
+    modelProducer: CartesianChartModelProducer,
 ) {
     when (uiSystem) {
-        UISystem.Compose -> ComposeChart2(chartEntryModelProducer)
-        UISystem.Views -> ViewChart2(chartEntryModelProducer)
+        UISystem.Compose -> ComposeChart2(modelProducer)
+        UISystem.Views -> ViewChart2(modelProducer)
     }
 }
 
 @Composable
-private fun ComposeChart2(chartEntryModelProducer: ChartEntryModelProducer) {
+private fun ComposeChart2(modelProducer: CartesianChartModelProducer) {
     val thresholdLine = rememberThresholdLine()
     ProvideChartStyle(rememberChartStyle(chartColors)) {
-        val defaultColumns = currentChartStyle.columnChart.columns
-        Chart(
+        val defaultColumns = currentChartStyle.columnLayer.columns
+        CartesianChartHost(
             chart =
-                columnChart(
-                    columns =
+                rememberCartesianChart(
+                    rememberColumnCartesianLayer(
                         remember(defaultColumns) {
-                            defaultColumns.map { defaultColumn ->
-                                LineComponent(defaultColumn.color, COLUMN_WIDTH_DP, defaultColumn.shape)
-                            }
+                            defaultColumns.map { LineComponent(it.color, COLUMN_WIDTH_DP, it.shape) }
                         },
+                    ),
                     decorations = remember(thresholdLine) { listOf(thresholdLine) },
                 ),
-            chartModelProducer = chartEntryModelProducer,
+            modelProducer = modelProducer,
             startAxis = rememberStartAxis(valueFormatter = startAxisValueFormatter, itemPlacer = startAxisItemPlacer),
             bottomAxis = rememberBottomAxis(itemPlacer = bottomAxisItemPlacer),
             marker = rememberMarker(),
@@ -86,14 +86,14 @@ private fun ComposeChart2(chartEntryModelProducer: ChartEntryModelProducer) {
 }
 
 @Composable
-private fun ViewChart2(chartEntryModelProducer: ChartEntryModelProducer) {
+private fun ViewChart2(modelProducer: CartesianChartModelProducer) {
     val thresholdLine = rememberThresholdLine()
     val marker = rememberMarker()
     AndroidViewBinding(Chart2Binding::inflate) {
         with(chartView) {
             chart?.addDecoration(thresholdLine)
             runInitialAnimation = false
-            entryProducer = chartEntryModelProducer
+            this.modelProducer = modelProducer
             with(startAxis as VerticalAxis) {
                 itemPlacer = startAxisItemPlacer
                 valueFormatter = startAxisValueFormatter
diff --git a/sample/src/main/java/com/patrykandpatrick/vico/sample/showcase/charts/Chart3.kt b/sample/src/main/java/com/patrykandpatrick/vico/sample/showcase/charts/Chart3.kt
index bcbf83e1b..73ada2230 100644
--- a/sample/src/main/java/com/patrykandpatrick/vico/sample/showcase/charts/Chart3.kt
+++ b/sample/src/main/java/com/patrykandpatrick/vico/sample/showcase/charts/Chart3.kt
@@ -25,20 +25,22 @@ import androidx.compose.ui.viewinterop.AndroidViewBinding
 import com.patrykandpatrick.vico.R
 import com.patrykandpatrick.vico.compose.axis.horizontal.rememberBottomAxis
 import com.patrykandpatrick.vico.compose.axis.vertical.rememberStartAxis
-import com.patrykandpatrick.vico.compose.chart.Chart
+import com.patrykandpatrick.vico.compose.chart.CartesianChartHost
 import com.patrykandpatrick.vico.compose.chart.edges.rememberFadingEdges
+import com.patrykandpatrick.vico.compose.chart.layer.rememberLineCartesianLayer
 import com.patrykandpatrick.vico.compose.chart.layout.fullWidth
-import com.patrykandpatrick.vico.compose.chart.line.lineChart
+import com.patrykandpatrick.vico.compose.chart.rememberCartesianChart
 import com.patrykandpatrick.vico.compose.component.shapeComponent
 import com.patrykandpatrick.vico.compose.component.textComponent
 import com.patrykandpatrick.vico.compose.dimensions.dimensionsOf
 import com.patrykandpatrick.vico.compose.style.ProvideChartStyle
 import com.patrykandpatrick.vico.core.axis.vertical.VerticalAxis
+import com.patrykandpatrick.vico.core.chart.layer.LineCartesianLayer
 import com.patrykandpatrick.vico.core.chart.layout.HorizontalLayout
-import com.patrykandpatrick.vico.core.chart.line.LineChart
-import com.patrykandpatrick.vico.core.chart.values.AxisValuesOverrider
+import com.patrykandpatrick.vico.core.chart.values.AxisValueOverrider
 import com.patrykandpatrick.vico.core.component.shape.Shapes
-import com.patrykandpatrick.vico.core.entry.ChartEntryModelProducer
+import com.patrykandpatrick.vico.core.model.CartesianChartModelProducer
+import com.patrykandpatrick.vico.core.model.LineCartesianLayerModel
 import com.patrykandpatrick.vico.databinding.Chart3Binding
 import com.patrykandpatrick.vico.sample.showcase.UISystem
 import com.patrykandpatrick.vico.sample.showcase.rememberChartStyle
@@ -47,20 +49,20 @@ import com.patrykandpatrick.vico.sample.showcase.rememberMarker
 @Composable
 internal fun Chart3(
     uiSystem: UISystem,
-    chartEntryModelProducer: ChartEntryModelProducer,
+    modelProducer: CartesianChartModelProducer,
 ) {
     when (uiSystem) {
-        UISystem.Compose -> ComposeChart3(chartEntryModelProducer)
-        UISystem.Views -> ViewChart3(chartEntryModelProducer)
+        UISystem.Compose -> ComposeChart3(modelProducer)
+        UISystem.Views -> ViewChart3(modelProducer)
     }
 }
 
 @Composable
-private fun ComposeChart3(chartEntryModelProducer: ChartEntryModelProducer) {
+private fun ComposeChart3(modelProducer: CartesianChartModelProducer) {
     ProvideChartStyle(rememberChartStyle(chartColors)) {
-        Chart(
-            chart = lineChart(axisValuesOverrider = axisValueOverrider),
-            chartModelProducer = chartEntryModelProducer,
+        CartesianChartHost(
+            chart = rememberCartesianChart(rememberLineCartesianLayer(axisValueOverrider = axisValueOverrider)),
+            modelProducer = modelProducer,
             startAxis =
                 rememberStartAxis(
                     guideline = null,
@@ -96,13 +98,13 @@ private fun ComposeChart3(chartEntryModelProducer: ChartEntryModelProducer) {
 }
 
 @Composable
-private fun ViewChart3(chartEntryModelProducer: ChartEntryModelProducer) {
+private fun ViewChart3(modelProducer: CartesianChartModelProducer) {
     val marker = rememberMarker()
     AndroidViewBinding(Chart3Binding::inflate) {
         with(chartView) {
-            (chart as LineChart).axisValuesOverrider = axisValueOverrider
+            (chart?.layers?.get(0) as LineCartesianLayer?)?.axisValueOverrider = axisValueOverrider
             runInitialAnimation = false
-            entryProducer = chartEntryModelProducer
+            this.modelProducer = modelProducer
             this.marker = marker
         }
     }
@@ -116,7 +118,10 @@ private val color1 = Color(COLOR_1_CODE)
 private val color2 = Color(COLOR_2_CODE)
 private val chartColors = listOf(color1, color2)
 private val axisValueOverrider =
-    AxisValuesOverrider.adaptiveYValues(yFraction = AXIS_VALUE_OVERRIDER_Y_FRACTION, round = true)
+    AxisValueOverrider.adaptiveYValues<LineCartesianLayerModel>(
+        yFraction = AXIS_VALUE_OVERRIDER_Y_FRACTION,
+        round = true,
+    )
 private val axisTitleHorizontalPaddingValue = 8.dp
 private val axisTitleVerticalPaddingValue = 2.dp
 private val axisTitlePadding = dimensionsOf(axisTitleHorizontalPaddingValue, axisTitleVerticalPaddingValue)
diff --git a/sample/src/main/java/com/patrykandpatrick/vico/sample/showcase/charts/Chart4.kt b/sample/src/main/java/com/patrykandpatrick/vico/sample/showcase/charts/Chart4.kt
index a3ec02270..375cac2fb 100644
--- a/sample/src/main/java/com/patrykandpatrick/vico/sample/showcase/charts/Chart4.kt
+++ b/sample/src/main/java/com/patrykandpatrick/vico/sample/showcase/charts/Chart4.kt
@@ -23,18 +23,18 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.viewinterop.AndroidViewBinding
 import com.patrykandpatrick.vico.compose.axis.horizontal.rememberTopAxis
 import com.patrykandpatrick.vico.compose.axis.vertical.rememberEndAxis
-import com.patrykandpatrick.vico.compose.chart.Chart
-import com.patrykandpatrick.vico.compose.chart.column.columnChart
-import com.patrykandpatrick.vico.compose.chart.line.lineChart
+import com.patrykandpatrick.vico.compose.chart.CartesianChartHost
+import com.patrykandpatrick.vico.compose.chart.layer.rememberColumnCartesianLayer
+import com.patrykandpatrick.vico.compose.chart.layer.rememberLineCartesianLayer
+import com.patrykandpatrick.vico.compose.chart.rememberCartesianChart
 import com.patrykandpatrick.vico.compose.component.shape.roundedCornerShape
 import com.patrykandpatrick.vico.compose.style.ProvideChartStyle
 import com.patrykandpatrick.vico.compose.style.currentChartStyle
 import com.patrykandpatrick.vico.core.chart.DefaultPointConnector
-import com.patrykandpatrick.vico.core.chart.composed.plus
 import com.patrykandpatrick.vico.core.chart.copy
 import com.patrykandpatrick.vico.core.component.shape.LineComponent
 import com.patrykandpatrick.vico.core.component.shape.Shapes
-import com.patrykandpatrick.vico.core.entry.composed.ComposedChartEntryModelProducer
+import com.patrykandpatrick.vico.core.model.CartesianChartModelProducer
 import com.patrykandpatrick.vico.databinding.Chart4Binding
 import com.patrykandpatrick.vico.sample.showcase.UISystem
 import com.patrykandpatrick.vico.sample.showcase.rememberChartStyle
@@ -43,40 +43,34 @@ import com.patrykandpatrick.vico.sample.showcase.rememberMarker
 @Composable
 internal fun Chart4(
     uiSystem: UISystem,
-    chartEntryModelProducer: ComposedChartEntryModelProducer,
+    modelProducer: CartesianChartModelProducer,
 ) {
     when (uiSystem) {
-        UISystem.Compose -> ComposeChart4(chartEntryModelProducer)
-        UISystem.Views -> ViewChart4(chartEntryModelProducer)
+        UISystem.Compose -> ComposeChart4(modelProducer)
+        UISystem.Views -> ViewChart4(modelProducer)
     }
 }
 
 @Composable
-private fun ComposeChart4(chartEntryModelProducer: ComposedChartEntryModelProducer) {
+private fun ComposeChart4(modelProducer: CartesianChartModelProducer) {
     ProvideChartStyle(rememberChartStyle(columnChartColors, lineChartColors)) {
-        val defaultColumns = currentChartStyle.columnChart.columns
-        val defaultLines = currentChartStyle.lineChart.lines
-        val columnChart =
-            columnChart(
-                remember(defaultColumns) {
-                    defaultColumns.map { defaultColumn ->
-                        LineComponent(
-                            defaultColumn.color,
-                            defaultColumn.thicknessDp,
-                            Shapes.roundedCornerShape(columnCornerRadius),
-                        )
-                    }
-                },
-            )
-        val lineChart =
-            lineChart(
-                remember(defaultLines) {
-                    defaultLines.map { defaultLine -> defaultLine.copy(pointConnector = pointConnector) }
-                },
-            )
-        Chart(
-            chart = remember(columnChart, lineChart) { columnChart + lineChart },
-            chartModelProducer = chartEntryModelProducer,
+        val defaultColumns = currentChartStyle.columnLayer.columns
+        val defaultLines = currentChartStyle.lineLayer.lines
+        CartesianChartHost(
+            chart =
+                rememberCartesianChart(
+                    rememberColumnCartesianLayer(
+                        remember(defaultColumns) {
+                            defaultColumns.map {
+                                LineComponent(it.color, it.thicknessDp, Shapes.roundedCornerShape(columnCornerRadius))
+                            }
+                        },
+                    ),
+                    rememberLineCartesianLayer(
+                        remember(defaultLines) { defaultLines.map { it.copy(pointConnector = pointConnector) } },
+                    ),
+                ),
+            modelProducer = modelProducer,
             topAxis = rememberTopAxis(),
             endAxis = rememberEndAxis(),
             marker = rememberMarker(),
@@ -86,12 +80,12 @@ private fun ComposeChart4(chartEntryModelProducer: ComposedChartEntryModelProduc
 }
 
 @Composable
-private fun ViewChart4(chartEntryModelProducer: ComposedChartEntryModelProducer) {
+private fun ViewChart4(modelProducer: CartesianChartModelProducer) {
     val marker = rememberMarker()
     AndroidViewBinding(Chart4Binding::inflate) {
         with(chartView) {
             runInitialAnimation = false
-            entryProducer = chartEntryModelProducer
+            this.modelProducer = modelProducer
             this.marker = marker
         }
     }
diff --git a/sample/src/main/java/com/patrykandpatrick/vico/sample/showcase/charts/Chart5.kt b/sample/src/main/java/com/patrykandpatrick/vico/sample/showcase/charts/Chart5.kt
index 75602d707..c2a21771e 100644
--- a/sample/src/main/java/com/patrykandpatrick/vico/sample/showcase/charts/Chart5.kt
+++ b/sample/src/main/java/com/patrykandpatrick/vico/sample/showcase/charts/Chart5.kt
@@ -22,17 +22,18 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.viewinterop.AndroidViewBinding
 import com.patrykandpatrick.vico.compose.axis.horizontal.rememberBottomAxis
 import com.patrykandpatrick.vico.compose.axis.vertical.rememberStartAxis
-import com.patrykandpatrick.vico.compose.chart.Chart
-import com.patrykandpatrick.vico.compose.chart.column.columnChart
+import com.patrykandpatrick.vico.compose.chart.CartesianChartHost
+import com.patrykandpatrick.vico.compose.chart.layer.rememberColumnCartesianLayer
+import com.patrykandpatrick.vico.compose.chart.rememberCartesianChart
 import com.patrykandpatrick.vico.compose.style.ProvideChartStyle
 import com.patrykandpatrick.vico.compose.style.currentChartStyle
 import com.patrykandpatrick.vico.core.DefaultDimens
 import com.patrykandpatrick.vico.core.axis.AxisItemPlacer
 import com.patrykandpatrick.vico.core.axis.vertical.VerticalAxis
-import com.patrykandpatrick.vico.core.chart.column.ColumnChart
+import com.patrykandpatrick.vico.core.chart.layer.ColumnCartesianLayer
 import com.patrykandpatrick.vico.core.component.shape.LineComponent
 import com.patrykandpatrick.vico.core.component.shape.Shapes
-import com.patrykandpatrick.vico.core.entry.ChartEntryModelProducer
+import com.patrykandpatrick.vico.core.model.CartesianChartModelProducer
 import com.patrykandpatrick.vico.databinding.Chart5Binding
 import com.patrykandpatrick.vico.sample.showcase.UISystem
 import com.patrykandpatrick.vico.sample.showcase.rememberChartStyle
@@ -41,43 +42,49 @@ import com.patrykandpatrick.vico.sample.showcase.rememberMarker
 @Composable
 internal fun Chart5(
     uiSystem: UISystem,
-    chartEntryModelProducer: ChartEntryModelProducer,
+    modelProducer: CartesianChartModelProducer,
 ) {
     when (uiSystem) {
-        UISystem.Compose -> ComposeChart5(chartEntryModelProducer)
-        UISystem.Views -> ViewChart5(chartEntryModelProducer)
+        UISystem.Compose -> ComposeChart5(modelProducer)
+        UISystem.Views -> ViewChart5(modelProducer)
     }
 }
 
 @Composable
-private fun ComposeChart5(chartEntryModelProducer: ChartEntryModelProducer) {
+private fun ComposeChart5(modelProducer: CartesianChartModelProducer) {
     ProvideChartStyle(rememberChartStyle(chartColors)) {
-        val defaultColumns = currentChartStyle.columnChart.columns
-        Chart(
+        val defaultColumns = currentChartStyle.columnLayer.columns
+        CartesianChartHost(
             chart =
-                columnChart(
-                    columns =
-                        remember(defaultColumns) {
-                            defaultColumns.mapIndexed { index, defaultColumn ->
-                                val topCornerRadiusPercent =
-                                    if (index == defaultColumns.lastIndex) DefaultDimens.COLUMN_ROUNDNESS_PERCENT else 0
-                                val bottomCornerRadiusPercent =
-                                    if (index == 0) DefaultDimens.COLUMN_ROUNDNESS_PERCENT else 0
-                                LineComponent(
-                                    defaultColumn.color,
-                                    defaultColumn.thicknessDp,
-                                    Shapes.roundedCornerShape(
-                                        topCornerRadiusPercent,
-                                        topCornerRadiusPercent,
-                                        bottomCornerRadiusPercent,
-                                        bottomCornerRadiusPercent,
-                                    ),
-                                )
-                            }
-                        },
-                    mergeMode = ColumnChart.MergeMode.Stack,
+                rememberCartesianChart(
+                    rememberColumnCartesianLayer(
+                        columns =
+                            remember(defaultColumns) {
+                                defaultColumns.mapIndexed { index, defaultColumn ->
+                                    val topCornerRadiusPercent =
+                                        if (index == defaultColumns.lastIndex) {
+                                            DefaultDimens.COLUMN_ROUNDNESS_PERCENT
+                                        } else {
+                                            0
+                                        }
+                                    val bottomCornerRadiusPercent =
+                                        if (index == 0) DefaultDimens.COLUMN_ROUNDNESS_PERCENT else 0
+                                    LineComponent(
+                                        defaultColumn.color,
+                                        defaultColumn.thicknessDp,
+                                        Shapes.roundedCornerShape(
+                                            topCornerRadiusPercent,
+                                            topCornerRadiusPercent,
+                                            bottomCornerRadiusPercent,
+                                            bottomCornerRadiusPercent,
+                                        ),
+                                    )
+                                }
+                            },
+                        mergeMode = ColumnCartesianLayer.MergeMode.Stacked,
+                    ),
                 ),
-            chartModelProducer = chartEntryModelProducer,
+            modelProducer = modelProducer,
             startAxis =
                 rememberStartAxis(
                     itemPlacer = startAxisItemPlacer,
@@ -91,13 +98,12 @@ private fun ComposeChart5(chartEntryModelProducer: ChartEntryModelProducer) {
 }
 
 @Composable
-private fun ViewChart5(chartEntryModelProducer: ChartEntryModelProducer) {
+private fun ViewChart5(modelProducer: CartesianChartModelProducer) {
     val marker = rememberMarker()
     AndroidViewBinding(Chart5Binding::inflate) {
         with(chartView) {
-            (chart as ColumnChart).mergeMode = ColumnChart.MergeMode.Stack
             runInitialAnimation = false
-            entryProducer = chartEntryModelProducer
+            this.modelProducer = modelProducer
             (startAxis as VerticalAxis).itemPlacer = startAxisItemPlacer
             this.marker = marker
         }
diff --git a/sample/src/main/java/com/patrykandpatrick/vico/sample/showcase/charts/Chart6.kt b/sample/src/main/java/com/patrykandpatrick/vico/sample/showcase/charts/Chart6.kt
index abc53e17c..351048359 100644
--- a/sample/src/main/java/com/patrykandpatrick/vico/sample/showcase/charts/Chart6.kt
+++ b/sample/src/main/java/com/patrykandpatrick/vico/sample/showcase/charts/Chart6.kt
@@ -24,8 +24,9 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.viewinterop.AndroidViewBinding
 import com.patrykandpatrick.vico.compose.axis.horizontal.rememberBottomAxis
 import com.patrykandpatrick.vico.compose.axis.vertical.rememberStartAxis
-import com.patrykandpatrick.vico.compose.chart.Chart
-import com.patrykandpatrick.vico.compose.chart.column.columnChart
+import com.patrykandpatrick.vico.compose.chart.CartesianChartHost
+import com.patrykandpatrick.vico.compose.chart.layer.rememberColumnCartesianLayer
+import com.patrykandpatrick.vico.compose.chart.rememberCartesianChart
 import com.patrykandpatrick.vico.compose.component.shapeComponent
 import com.patrykandpatrick.vico.compose.component.textComponent
 import com.patrykandpatrick.vico.compose.dimensions.dimensionsOf
@@ -34,11 +35,11 @@ import com.patrykandpatrick.vico.compose.style.currentChartStyle
 import com.patrykandpatrick.vico.core.axis.AxisPosition
 import com.patrykandpatrick.vico.core.axis.formatter.AxisValueFormatter
 import com.patrykandpatrick.vico.core.axis.horizontal.HorizontalAxis
-import com.patrykandpatrick.vico.core.chart.column.ColumnChart
 import com.patrykandpatrick.vico.core.chart.decoration.ThresholdLine
+import com.patrykandpatrick.vico.core.chart.layer.ColumnCartesianLayer
 import com.patrykandpatrick.vico.core.component.shape.LineComponent
 import com.patrykandpatrick.vico.core.component.shape.Shapes
-import com.patrykandpatrick.vico.core.entry.ChartEntryModelProducer
+import com.patrykandpatrick.vico.core.model.CartesianChartModelProducer
 import com.patrykandpatrick.vico.databinding.Chart6Binding
 import com.patrykandpatrick.vico.sample.showcase.UISystem
 import com.patrykandpatrick.vico.sample.showcase.rememberChartStyle
@@ -47,23 +48,23 @@ import com.patrykandpatrick.vico.sample.showcase.rememberMarker
 @Composable
 internal fun Chart6(
     uiSystem: UISystem,
-    chartEntryModelProducer: ChartEntryModelProducer,
+    modelProducer: CartesianChartModelProducer,
 ) {
     when (uiSystem) {
-        UISystem.Compose -> ComposeChart6(chartEntryModelProducer)
-        UISystem.Views -> ViewChart6(chartEntryModelProducer)
+        UISystem.Compose -> ComposeChart6(modelProducer)
+        UISystem.Views -> ViewChart6(modelProducer)
     }
 }
 
 @Composable
-private fun ComposeChart6(chartEntryModelProducer: ChartEntryModelProducer) {
+private fun ComposeChart6(modelProducer: CartesianChartModelProducer) {
     val thresholdLine = rememberThresholdLine()
     ProvideChartStyle(rememberChartStyle(chartColors)) {
-        val defaultColumns = currentChartStyle.columnChart.columns
-        Chart(
+        val defaultColumns = currentChartStyle.columnLayer.columns
+        CartesianChartHost(
             chart =
-                columnChart(
-                    columns =
+                rememberCartesianChart(
+                    rememberColumnCartesianLayer(
                         remember(defaultColumns) {
                             defaultColumns.map { defaultColumn ->
                                 LineComponent(
@@ -73,10 +74,11 @@ private fun ComposeChart6(chartEntryModelProducer: ChartEntryModelProducer) {
                                 )
                             }
                         },
-                    mergeMode = ColumnChart.MergeMode.Grouped,
+                        mergeMode = ColumnCartesianLayer.MergeMode.Grouped,
+                    ),
                     decorations = remember(thresholdLine) { listOf(thresholdLine) },
                 ),
-            chartModelProducer = chartEntryModelProducer,
+            modelProducer = modelProducer,
             startAxis = rememberStartAxis(),
             bottomAxis = rememberBottomAxis(valueFormatter = bottomAxisValueFormatter),
             marker = rememberMarker(),
@@ -86,7 +88,7 @@ private fun ComposeChart6(chartEntryModelProducer: ChartEntryModelProducer) {
 }
 
 @Composable
-private fun ViewChart6(chartEntryModelProducer: ChartEntryModelProducer) {
+private fun ViewChart6(modelProducer: CartesianChartModelProducer) {
     val thresholdLine = rememberThresholdLine()
     val decorations = remember(thresholdLine) { listOf(thresholdLine) }
     val marker = rememberMarker()
@@ -94,7 +96,7 @@ private fun ViewChart6(chartEntryModelProducer: ChartEntryModelProducer) {
         with(chartView) {
             chart?.setDecorations(decorations)
             runInitialAnimation = false
-            entryProducer = chartEntryModelProducer
+            this.modelProducer = modelProducer
             (bottomAxis as? HorizontalAxis<AxisPosition.Horizontal.Bottom>)?.valueFormatter = bottomAxisValueFormatter
             this.marker = marker
         }
@@ -141,4 +143,4 @@ private val thresholdLineLabelMargins = dimensionsOf(thresholdLineLabelMarginVal
 private val thresholdLineColor = color4.copy(THRESHOLD_LINE_ALPHA)
 private val daysOfWeek = listOf("Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun")
 private val bottomAxisValueFormatter =
-    AxisValueFormatter<AxisPosition.Horizontal.Bottom> { x, _ -> daysOfWeek[x.toInt() % daysOfWeek.size] }
+    AxisValueFormatter<AxisPosition.Horizontal.Bottom> { x, _, _ -> daysOfWeek[x.toInt() % daysOfWeek.size] }
diff --git a/sample/src/main/java/com/patrykandpatrick/vico/sample/showcase/charts/Chart7.kt b/sample/src/main/java/com/patrykandpatrick/vico/sample/showcase/charts/Chart7.kt
index 3054f75d1..a7e97968a 100644
--- a/sample/src/main/java/com/patrykandpatrick/vico/sample/showcase/charts/Chart7.kt
+++ b/sample/src/main/java/com/patrykandpatrick/vico/sample/showcase/charts/Chart7.kt
@@ -28,8 +28,9 @@ import com.patrykandpatrick.vico.R
 import com.patrykandpatrick.vico.compose.axis.axisLabelComponent
 import com.patrykandpatrick.vico.compose.axis.horizontal.rememberBottomAxis
 import com.patrykandpatrick.vico.compose.axis.vertical.rememberStartAxis
-import com.patrykandpatrick.vico.compose.chart.Chart
-import com.patrykandpatrick.vico.compose.chart.line.lineChart
+import com.patrykandpatrick.vico.compose.chart.CartesianChartHost
+import com.patrykandpatrick.vico.compose.chart.layer.rememberLineCartesianLayer
+import com.patrykandpatrick.vico.compose.chart.rememberCartesianChart
 import com.patrykandpatrick.vico.compose.component.shape.roundedCornerShape
 import com.patrykandpatrick.vico.compose.component.shapeComponent
 import com.patrykandpatrick.vico.compose.component.textComponent
@@ -41,7 +42,7 @@ import com.patrykandpatrick.vico.compose.style.currentChartStyle
 import com.patrykandpatrick.vico.core.axis.vertical.VerticalAxis
 import com.patrykandpatrick.vico.core.chart.copy
 import com.patrykandpatrick.vico.core.component.shape.Shapes
-import com.patrykandpatrick.vico.core.entry.ChartEntryModelProducer
+import com.patrykandpatrick.vico.core.model.CartesianChartModelProducer
 import com.patrykandpatrick.vico.databinding.Chart7Binding
 import com.patrykandpatrick.vico.sample.showcase.UISystem
 import com.patrykandpatrick.vico.sample.showcase.rememberChartStyle
@@ -50,26 +51,26 @@ import com.patrykandpatrick.vico.sample.showcase.rememberMarker
 @Composable
 internal fun Chart7(
     uiSystem: UISystem,
-    chartEntryModelProducer: ChartEntryModelProducer,
+    modelProducer: CartesianChartModelProducer,
 ) {
     when (uiSystem) {
-        UISystem.Compose -> ComposeChart7(chartEntryModelProducer)
-        UISystem.Views -> ViewChart7(chartEntryModelProducer)
+        UISystem.Compose -> ComposeChart7(modelProducer)
+        UISystem.Views -> ViewChart7(modelProducer)
     }
 }
 
 @Composable
-private fun ComposeChart7(chartEntryModelProducer: ChartEntryModelProducer) {
+private fun ComposeChart7(modelProducer: CartesianChartModelProducer) {
     ProvideChartStyle(rememberChartStyle(chartColors)) {
-        val defaultLines = currentChartStyle.lineChart.lines
-        Chart(
+        val defaultLines = currentChartStyle.lineLayer.lines
+        CartesianChartHost(
             chart =
-                lineChart(
-                    remember(defaultLines) {
-                        defaultLines.map { defaultLine -> defaultLine.copy(lineBackgroundFill = null) }
-                    },
+                rememberCartesianChart(
+                    rememberLineCartesianLayer(
+                        remember(defaultLines) { defaultLines.map { it.copy(backgroundShader = null) } },
+                    ),
                 ),
-            chartModelProducer = chartEntryModelProducer,
+            modelProducer = modelProducer,
             startAxis =
                 rememberStartAxis(
                     label = rememberStartAxisLabel(),
@@ -84,14 +85,14 @@ private fun ComposeChart7(chartEntryModelProducer: ChartEntryModelProducer) {
 }
 
 @Composable
-private fun ViewChart7(chartEntryModelProducer: ChartEntryModelProducer) {
+private fun ViewChart7(modelProducer: CartesianChartModelProducer) {
     val startAxisLabel = rememberStartAxisLabel()
     val marker = rememberMarker()
     val legend = rememberLegend()
     AndroidViewBinding(Chart7Binding::inflate) {
         with(chartView) {
             runInitialAnimation = false
-            entryProducer = chartEntryModelProducer
+            this.modelProducer = modelProducer
             (startAxis as VerticalAxis).horizontalLabelPosition = VerticalAxis.HorizontalLabelPosition.Inside
             (startAxis as VerticalAxis).label = startAxisLabel
             this.marker = marker
@@ -124,7 +125,7 @@ private fun rememberLegend() =
                             textSize = legendItemLabelTextSize,
                             typeface = Typeface.MONOSPACE,
                         ),
-                    labelText = stringResource(R.string.data_set_x, index + 1),
+                    labelText = stringResource(R.string.series_x, index + 1),
                 )
             },
         iconSize = legendItemIconSize,
diff --git a/sample/src/main/java/com/patrykandpatrick/vico/sample/showcase/charts/Chart8.kt b/sample/src/main/java/com/patrykandpatrick/vico/sample/showcase/charts/Chart8.kt
index a72d6dccd..bdb175bd3 100644
--- a/sample/src/main/java/com/patrykandpatrick/vico/sample/showcase/charts/Chart8.kt
+++ b/sample/src/main/java/com/patrykandpatrick/vico/sample/showcase/charts/Chart8.kt
@@ -17,22 +17,20 @@
 package com.patrykandpatrick.vico.sample.showcase.charts
 
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.remember
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.viewinterop.AndroidViewBinding
 import com.patrykandpatrick.vico.compose.axis.vertical.rememberEndAxis
 import com.patrykandpatrick.vico.compose.axis.vertical.rememberStartAxis
-import com.patrykandpatrick.vico.compose.chart.Chart
-import com.patrykandpatrick.vico.compose.chart.column.columnChart
-import com.patrykandpatrick.vico.compose.chart.line.lineChart
+import com.patrykandpatrick.vico.compose.chart.CartesianChartHost
+import com.patrykandpatrick.vico.compose.chart.layer.rememberColumnCartesianLayer
+import com.patrykandpatrick.vico.compose.chart.layer.rememberLineCartesianLayer
+import com.patrykandpatrick.vico.compose.chart.rememberCartesianChart
 import com.patrykandpatrick.vico.compose.style.ProvideChartStyle
 import com.patrykandpatrick.vico.core.axis.Axis
 import com.patrykandpatrick.vico.core.axis.AxisPosition
-import com.patrykandpatrick.vico.core.chart.column.ColumnChart
-import com.patrykandpatrick.vico.core.chart.composed.ComposedChart
-import com.patrykandpatrick.vico.core.chart.composed.plus
-import com.patrykandpatrick.vico.core.chart.line.LineChart
-import com.patrykandpatrick.vico.core.entry.composed.ComposedChartEntryModelProducer
+import com.patrykandpatrick.vico.core.chart.layer.ColumnCartesianLayer
+import com.patrykandpatrick.vico.core.chart.layer.LineCartesianLayer
+import com.patrykandpatrick.vico.core.model.CartesianChartModelProducer
 import com.patrykandpatrick.vico.databinding.Chart8Binding
 import com.patrykandpatrick.vico.sample.showcase.UISystem
 import com.patrykandpatrick.vico.sample.showcase.rememberChartStyle
@@ -41,26 +39,27 @@ import com.patrykandpatrick.vico.sample.showcase.rememberMarker
 @Composable
 internal fun Chart8(
     uiSystem: UISystem,
-    chartEntryModelProducer: ComposedChartEntryModelProducer,
+    modelProducer: CartesianChartModelProducer,
 ) {
     when (uiSystem) {
-        UISystem.Compose -> ComposeChart8(chartEntryModelProducer)
-        UISystem.Views -> ViewChart8(chartEntryModelProducer)
+        UISystem.Compose -> ComposeChart8(modelProducer)
+        UISystem.Views -> ViewChart8(modelProducer)
     }
 }
 
 @Composable
-private fun ComposeChart8(chartEntryModelProducer: ComposedChartEntryModelProducer) {
+private fun ComposeChart8(modelProducer: CartesianChartModelProducer) {
     ProvideChartStyle(rememberChartStyle(columnChartColors, lineChartColors)) {
-        val columnChart =
-            columnChart(
-                mergeMode = ColumnChart.MergeMode.Stack,
-                targetVerticalAxisPosition = AxisPosition.Vertical.Start,
-            )
-        val lineChart = lineChart(targetVerticalAxisPosition = AxisPosition.Vertical.End)
-        Chart(
-            chart = remember(columnChart, lineChart) { columnChart + lineChart },
-            chartModelProducer = chartEntryModelProducer,
+        CartesianChartHost(
+            chart =
+                rememberCartesianChart(
+                    rememberColumnCartesianLayer(
+                        mergeMode = ColumnCartesianLayer.MergeMode.Stacked,
+                        verticalAxisPosition = AxisPosition.Vertical.Start,
+                    ),
+                    rememberLineCartesianLayer(verticalAxisPosition = AxisPosition.Vertical.End),
+                ),
+            modelProducer = modelProducer,
             startAxis = rememberStartAxis(guideline = null),
             endAxis = rememberEndAxis(),
             marker = rememberMarker(),
@@ -70,15 +69,14 @@ private fun ComposeChart8(chartEntryModelProducer: ComposedChartEntryModelProduc
 }
 
 @Composable
-private fun ViewChart8(chartEntryModelProducer: ComposedChartEntryModelProducer) {
+private fun ViewChart8(modelProducer: CartesianChartModelProducer) {
     val marker = rememberMarker()
     AndroidViewBinding(Chart8Binding::inflate) {
         with(chartView) {
-            ((chart as ComposedChart).charts[0] as ColumnChart).mergeMode = ColumnChart.MergeMode.Stack
-            ((chart as ComposedChart).charts[0] as ColumnChart).targetVerticalAxisPosition = AxisPosition.Vertical.Start
-            ((chart as ComposedChart).charts[1] as LineChart).targetVerticalAxisPosition = AxisPosition.Vertical.End
+            (chart?.layers?.get(0) as ColumnCartesianLayer).verticalAxisPosition = AxisPosition.Vertical.Start
+            (chart?.layers?.get(1) as LineCartesianLayer).verticalAxisPosition = AxisPosition.Vertical.End
             runInitialAnimation = false
-            entryProducer = chartEntryModelProducer
+            this.modelProducer = modelProducer
             (startAxis as Axis).guideline = null
             this.marker = marker
         }
diff --git a/sample/src/main/java/com/patrykandpatrick/vico/sample/showcase/charts/Chart9.kt b/sample/src/main/java/com/patrykandpatrick/vico/sample/showcase/charts/Chart9.kt
index c78dee52b..71c95ddc3 100644
--- a/sample/src/main/java/com/patrykandpatrick/vico/sample/showcase/charts/Chart9.kt
+++ b/sample/src/main/java/com/patrykandpatrick/vico/sample/showcase/charts/Chart9.kt
@@ -30,27 +30,28 @@ import com.patrykandpatrick.vico.R
 import com.patrykandpatrick.vico.compose.axis.axisLabelComponent
 import com.patrykandpatrick.vico.compose.axis.horizontal.rememberBottomAxis
 import com.patrykandpatrick.vico.compose.axis.vertical.rememberStartAxis
-import com.patrykandpatrick.vico.compose.chart.Chart
+import com.patrykandpatrick.vico.compose.chart.CartesianChartHost
+import com.patrykandpatrick.vico.compose.chart.layer.lineSpec
+import com.patrykandpatrick.vico.compose.chart.layer.rememberLineCartesianLayer
 import com.patrykandpatrick.vico.compose.chart.layout.fullWidth
-import com.patrykandpatrick.vico.compose.chart.line.lineChart
-import com.patrykandpatrick.vico.compose.chart.line.lineSpec
+import com.patrykandpatrick.vico.compose.chart.rememberCartesianChart
 import com.patrykandpatrick.vico.compose.component.lineComponent
 import com.patrykandpatrick.vico.compose.component.shape.dashedShape
+import com.patrykandpatrick.vico.compose.component.shape.shader.color
 import com.patrykandpatrick.vico.compose.component.shape.shader.fromComponent
-import com.patrykandpatrick.vico.compose.component.shape.shader.split
 import com.patrykandpatrick.vico.compose.component.shape.shader.verticalGradient
 import com.patrykandpatrick.vico.compose.component.shapeComponent
 import com.patrykandpatrick.vico.compose.dimensions.dimensionsOf
 import com.patrykandpatrick.vico.compose.style.ProvideChartStyle
 import com.patrykandpatrick.vico.core.axis.Axis
 import com.patrykandpatrick.vico.core.axis.AxisItemPlacer
+import com.patrykandpatrick.vico.core.chart.layer.LineCartesianLayer
 import com.patrykandpatrick.vico.core.chart.layout.HorizontalLayout
-import com.patrykandpatrick.vico.core.chart.line.LineChart
 import com.patrykandpatrick.vico.core.component.shape.ShapeComponent
 import com.patrykandpatrick.vico.core.component.shape.Shapes
 import com.patrykandpatrick.vico.core.component.shape.shader.DynamicShaders
-import com.patrykandpatrick.vico.core.component.shape.shader.splitShader
-import com.patrykandpatrick.vico.core.entry.ChartEntryModelProducer
+import com.patrykandpatrick.vico.core.component.shape.shader.TopBottomShader
+import com.patrykandpatrick.vico.core.model.CartesianChartModelProducer
 import com.patrykandpatrick.vico.databinding.Chart9Binding
 import com.patrykandpatrick.vico.sample.showcase.UISystem
 import com.patrykandpatrick.vico.sample.showcase.rememberChartStyle
@@ -59,59 +60,65 @@ import com.patrykandpatrick.vico.sample.showcase.rememberMarker
 @Composable
 internal fun Chart9(
     uiSystem: UISystem,
-    chartEntryModelProducer: ChartEntryModelProducer,
+    modelProducer: CartesianChartModelProducer,
 ) {
     when (uiSystem) {
-        UISystem.Compose -> ComposeChart9(chartEntryModelProducer)
-        UISystem.Views -> ViewChart9(chartEntryModelProducer)
+        UISystem.Compose -> ComposeChart9(modelProducer)
+        UISystem.Views -> ViewChart9(modelProducer)
     }
 }
 
 @Composable
-private fun ComposeChart9(chartEntryModelProducer: ChartEntryModelProducer) {
+private fun ComposeChart9(modelProducer: CartesianChartModelProducer) {
     val marker = rememberMarker()
     ProvideChartStyle(rememberChartStyle(chartColors)) {
-        Chart(
+        CartesianChartHost(
             chart =
-                lineChart(
-                    lines =
-                        listOf(
-                            lineSpec(
-                                lineShader = DynamicShaders.split(chartColors[0], chartColors[1]),
-                                lineBackgroundShader =
-                                    DynamicShaders.splitShader(
-                                        DynamicShaders.composeShader(
-                                            DynamicShaders.fromComponent(
-                                                componentSize = 6.dp,
-                                                component =
-                                                    shapeComponent(
-                                                        shape = Shapes.pillShape,
-                                                        color = chartColors[0],
-                                                        margins = remember { dimensionsOf(1.dp) },
-                                                    ),
-                                            ),
-                                            verticalGradient(arrayOf(Color.Black, Color.Transparent)),
-                                            PorterDuff.Mode.DST_IN,
+                rememberCartesianChart(
+                    rememberLineCartesianLayer(
+                        lines =
+                            listOf(
+                                lineSpec(
+                                    shader =
+                                        TopBottomShader(
+                                            DynamicShaders.color(chartColors[0]),
+                                            DynamicShaders.color(chartColors[1]),
                                         ),
-                                        DynamicShaders.composeShader(
-                                            DynamicShaders.fromComponent(
-                                                componentSize = 5.dp,
-                                                component =
-                                                    shapeComponent(
-                                                        shape = Shapes.rectShape,
-                                                        color = chartColors[1],
-                                                        margins = remember { dimensionsOf(horizontal = 2.dp) },
-                                                    ),
-                                                checkeredArrangement = false,
+                                    backgroundShader =
+                                        TopBottomShader(
+                                            DynamicShaders.composeShader(
+                                                DynamicShaders.fromComponent(
+                                                    componentSize = 6.dp,
+                                                    component =
+                                                        shapeComponent(
+                                                            shape = Shapes.pillShape,
+                                                            color = chartColors[0],
+                                                            margins = remember { dimensionsOf(1.dp) },
+                                                        ),
+                                                ),
+                                                verticalGradient(arrayOf(Color.Black, Color.Transparent)),
+                                                PorterDuff.Mode.DST_IN,
+                                            ),
+                                            DynamicShaders.composeShader(
+                                                DynamicShaders.fromComponent(
+                                                    componentSize = 5.dp,
+                                                    component =
+                                                        shapeComponent(
+                                                            shape = Shapes.rectShape,
+                                                            color = chartColors[1],
+                                                            margins = remember { dimensionsOf(horizontal = 2.dp) },
+                                                        ),
+                                                    checkeredArrangement = false,
+                                                ),
+                                                verticalGradient(arrayOf(Color.Transparent, Color.Black)),
+                                                PorterDuff.Mode.DST_IN,
                                             ),
-                                            verticalGradient(arrayOf(Color.Transparent, Color.Black)),
-                                            PorterDuff.Mode.DST_IN,
                                         ),
-                                    ),
+                                ),
                             ),
-                        ),
+                    ),
                 ),
-            chartModelProducer = chartEntryModelProducer,
+            modelProducer = modelProducer,
             startAxis =
                 rememberStartAxis(
                     label =
@@ -148,9 +155,12 @@ private fun ComposeChart9(chartEntryModelProducer: ChartEntryModelProducer) {
                 rememberBottomAxis(
                     guideline = null,
                     itemPlacer =
-                        AxisItemPlacer.Horizontal.default(
-                            spacing = 3,
-                        ),
+                        remember {
+                            AxisItemPlacer.Horizontal.default(
+                                spacing = 3,
+                                addExtremeLabelPadding = true,
+                            )
+                        },
                 ),
             marker = marker,
             runInitialAnimation = false,
@@ -160,22 +170,26 @@ private fun ComposeChart9(chartEntryModelProducer: ChartEntryModelProducer) {
 }
 
 @Composable
-private fun ViewChart9(chartEntryModelProducer: ChartEntryModelProducer) {
+private fun ViewChart9(modelProducer: CartesianChartModelProducer) {
     val marker = rememberMarker()
     val colors = chartColors
     AndroidViewBinding(Chart9Binding::inflate) {
         with(chartView) {
             runInitialAnimation = false
-            entryProducer = chartEntryModelProducer
+            this.modelProducer = modelProducer
             (bottomAxis as Axis).guideline = null
             this.marker = marker
-            with(chart as LineChart) {
+            with(chart?.layers?.get(0) as LineCartesianLayer) {
                 lines =
                     listOf(
-                        LineChart.LineSpec(
-                            lineShader = DynamicShaders.split(colors[0], colors[1]),
-                            lineBackgroundShader =
-                                DynamicShaders.splitShader(
+                        LineCartesianLayer.LineSpec(
+                            shader =
+                                TopBottomShader(
+                                    DynamicShaders.color(colors[0]),
+                                    DynamicShaders.color(colors[1]),
+                                ),
+                            backgroundShader =
+                                TopBottomShader(
                                     DynamicShaders.composeShader(
                                         DynamicShaders.fromComponent(
                                             componentSize = 6.dp,
diff --git a/sample/src/main/res/layout/chart_1.xml b/sample/src/main/res/layout/chart_1.xml
index d725c7366..487d80dc6 100644
--- a/sample/src/main/res/layout/chart_1.xml
+++ b/sample/src/main/res/layout/chart_1.xml
@@ -19,13 +19,12 @@
     android:layout_width="wrap_content"
     android:layout_height="wrap_content">
 
-    <com.patrykandpatrick.vico.views.chart.ChartView
+    <com.patrykandpatrick.vico.views.chart.CartesianChartView
         android:id="@+id/chart_view"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        app:chart="line"
-        app:lineChartStyle="@style/Chart1LineChartStyle"
-        app:previewSeriesCount="1"
+        app:layers="line"
+        app:lineLayerStyle="@style/Chart1LineLayerStyle"
         app:showBottomAxis="true"
         app:showStartAxis="true" />
 </FrameLayout>
diff --git a/sample/src/main/res/layout/chart_2.xml b/sample/src/main/res/layout/chart_2.xml
index 27dab5533..0b803d99d 100644
--- a/sample/src/main/res/layout/chart_2.xml
+++ b/sample/src/main/res/layout/chart_2.xml
@@ -19,13 +19,13 @@
     android:layout_width="wrap_content"
     android:layout_height="wrap_content">
 
-    <com.patrykandpatrick.vico.views.chart.ChartView
+    <com.patrykandpatrick.vico.views.chart.CartesianChartView
         android:id="@+id/chart_view"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        app:chart="column"
-        app:columnChartStyle="@style/Chart2ColumnChartStyle"
+        app:columnLayerStyle="@style/Chart2ColumnLayerStyle"
         app:horizontalLayout="fullWidth"
+        app:layers="column"
         app:scalableEndContentPadding="16dp"
         app:scalableStartContentPadding="16dp"
         app:showBottomAxis="true"
diff --git a/sample/src/main/res/layout/chart_3.xml b/sample/src/main/res/layout/chart_3.xml
index d343594ee..f16b0da41 100644
--- a/sample/src/main/res/layout/chart_3.xml
+++ b/sample/src/main/res/layout/chart_3.xml
@@ -19,16 +19,16 @@
     android:layout_width="wrap_content"
     android:layout_height="wrap_content">
 
-    <com.patrykandpatrick.vico.views.chart.ChartView
+    <com.patrykandpatrick.vico.views.chart.CartesianChartView
         android:id="@+id/chart_view"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:bottomAxisStyle="@style/Chart3BottomAxisStyle"
-        app:chart="line"
         app:fadingEdgeVisibilityInterpolator="androidx.interpolator.view.animation.FastOutSlowInInterpolator"
         app:fadingEdgeWidth="32dp"
         app:horizontalLayout="fullWidth"
-        app:lineChartStyle="@style/Chart3LineChartStyle"
+        app:layers="line"
+        app:lineLayerStyle="@style/Chart3LineLayerStyle"
         app:showBottomAxis="true"
         app:showStartAxis="true"
         app:startAxisStyle="@style/Chart3StartAxisStyle" />
diff --git a/sample/src/main/res/layout/chart_4.xml b/sample/src/main/res/layout/chart_4.xml
index ff8308348..2cddd33e7 100644
--- a/sample/src/main/res/layout/chart_4.xml
+++ b/sample/src/main/res/layout/chart_4.xml
@@ -19,13 +19,13 @@
     android:layout_width="wrap_content"
     android:layout_height="wrap_content">
 
-    <com.patrykandpatrick.vico.views.chart.ComposedChartView
+    <com.patrykandpatrick.vico.views.chart.CartesianChartView
         android:id="@+id/chart_view"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        app:charts="line|column"
-        app:columnChartStyle="@style/Chart4ColumnChartStyle"
-        app:lineChartStyle="@style/Chart4LineChartStyle"
+        app:columnLayerStyle="@style/Chart4ColumnLayerStyle"
+        app:layers="line|column"
+        app:lineLayerStyle="@style/Chart4LineLayerStyle"
         app:showEndAxis="true"
         app:showTopAxis="true" />
 </FrameLayout>
diff --git a/sample/src/main/res/layout/chart_5.xml b/sample/src/main/res/layout/chart_5.xml
index 1aaf69d00..6e060bb88 100644
--- a/sample/src/main/res/layout/chart_5.xml
+++ b/sample/src/main/res/layout/chart_5.xml
@@ -19,13 +19,13 @@
     android:layout_width="wrap_content"
     android:layout_height="wrap_content">
 
-    <com.patrykandpatrick.vico.views.chart.ChartView
+    <com.patrykandpatrick.vico.views.chart.CartesianChartView
         android:id="@+id/chart_view"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:axisStyle="@style/Chart5AxisStyle"
-        app:chart="column"
-        app:columnChartStyle="@style/Chart5ColumnChartStyle"
+        app:columnLayerStyle="@style/Chart5ColumnLayerStyle"
+        app:layers="column"
         app:showBottomAxis="true"
         app:showStartAxis="true" />
 </FrameLayout>
diff --git a/sample/src/main/res/layout/chart_6.xml b/sample/src/main/res/layout/chart_6.xml
index 62426d299..b05159b7e 100644
--- a/sample/src/main/res/layout/chart_6.xml
+++ b/sample/src/main/res/layout/chart_6.xml
@@ -19,12 +19,12 @@
     android:layout_width="wrap_content"
     android:layout_height="wrap_content">
 
-    <com.patrykandpatrick.vico.views.chart.ChartView
+    <com.patrykandpatrick.vico.views.chart.CartesianChartView
         android:id="@+id/chart_view"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        app:chart="column"
-        app:columnChartStyle="@style/Chart6ColumnChartStyle"
+        app:columnLayerStyle="@style/Chart6ColumnLayerStyle"
+        app:layers="column"
         app:showBottomAxis="true"
         app:showStartAxis="true" />
 </FrameLayout>
diff --git a/sample/src/main/res/layout/chart_7.xml b/sample/src/main/res/layout/chart_7.xml
index f29e9408b..029ab4dec 100644
--- a/sample/src/main/res/layout/chart_7.xml
+++ b/sample/src/main/res/layout/chart_7.xml
@@ -19,12 +19,12 @@
     android:layout_width="wrap_content"
     android:layout_height="wrap_content">
 
-    <com.patrykandpatrick.vico.views.chart.ChartView
+    <com.patrykandpatrick.vico.views.chart.CartesianChartView
         android:id="@+id/chart_view"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        app:chart="line"
-        app:lineChartStyle="@style/Chart7LineChartStyle"
+        app:layers="line"
+        app:lineLayerStyle="@style/Chart7LineLayerStyle"
         app:showBottomAxis="true"
         app:showStartAxis="true" />
 </FrameLayout>
diff --git a/sample/src/main/res/layout/chart_8.xml b/sample/src/main/res/layout/chart_8.xml
index 79618a81d..28bf86aee 100644
--- a/sample/src/main/res/layout/chart_8.xml
+++ b/sample/src/main/res/layout/chart_8.xml
@@ -19,13 +19,13 @@
     android:layout_width="wrap_content"
     android:layout_height="wrap_content">
 
-    <com.patrykandpatrick.vico.views.chart.ComposedChartView
+    <com.patrykandpatrick.vico.views.chart.CartesianChartView
         android:id="@+id/chart_view"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        app:charts="line|column"
-        app:columnChartStyle="@style/Chart8ColumnChartStyle"
-        app:lineChartStyle="@style/Chart8LineChartStyle"
+        app:columnLayerStyle="@style/Chart8ColumnLayerStyle"
+        app:layers="line|column"
+        app:lineLayerStyle="@style/Chart8LineLayerStyle"
         app:showEndAxis="true"
         app:showStartAxis="true" />
 </FrameLayout>
diff --git a/sample/src/main/res/layout/chart_9.xml b/sample/src/main/res/layout/chart_9.xml
index 81a618baa..bc0ffd4c8 100644
--- a/sample/src/main/res/layout/chart_9.xml
+++ b/sample/src/main/res/layout/chart_9.xml
@@ -19,20 +19,18 @@
     android:layout_width="wrap_content"
     android:layout_height="wrap_content">
 
-    <com.patrykandpatrick.vico.views.chart.ChartView
+    <com.patrykandpatrick.vico.views.chart.CartesianChartView
         android:id="@+id/chart_view"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:theme="@style/Chart9ThemeOverlay"
         app:bottomAxisStyle="@style/Chart9BottomAxisStyle"
-        app:chart="line"
+        app:layers="line"
         app:horizontalLayout="fullWidth"
-        app:line1Spec="@style/Chart9Line1Style"
-        app:lineChartStyle="@style/Chart9LineChartStyle"
+        app:lineLayerStyle="@style/Chart9LineLayerStyle"
         app:previewMaxX="8"
         app:previewMaxY="10"
         app:previewMinY="-7"
-        app:previewSeriesCount="1"
         app:showBottomAxis="true"
         app:showStartAxis="true"
         app:startAxisStyle="@style/Chart9StartAxisStyle" />
diff --git a/sample/src/main/res/values-night/chart_9_styles.xml b/sample/src/main/res/values-night/chart_9_styles.xml
index 5097869de..240d9d53f 100644
--- a/sample/src/main/res/values-night/chart_9_styles.xml
+++ b/sample/src/main/res/values-night/chart_9_styles.xml
@@ -15,6 +15,6 @@
   -->
 
 <resources>
-    <color name="chart_9_color_positive">#C7FF6C</color>
-    <color name="chart_9_color_negative">#A46CFF</color>
+    <color name="chart_9_color_positive">#735cff</color>
+    <color name="chart_9_color_negative">#ff337d</color>
 </resources>
diff --git a/sample/src/main/res/values/chart_1_styles.xml b/sample/src/main/res/values/chart_1_styles.xml
index 246dcb589..64408d525 100644
--- a/sample/src/main/res/values/chart_1_styles.xml
+++ b/sample/src/main/res/values/chart_1_styles.xml
@@ -21,7 +21,7 @@
         <item name="color">@color/chart_1_color_1</item>
     </style>
 
-    <style name="Chart1LineChartStyle">
+    <style name="Chart1LineLayerStyle">
         <item name="line1Spec">@style/Chart1Line1Style</item>
     </style>
 </resources>
diff --git a/sample/src/main/res/values/chart_2_styles.xml b/sample/src/main/res/values/chart_2_styles.xml
index 6be808647..8afc7aed7 100644
--- a/sample/src/main/res/values/chart_2_styles.xml
+++ b/sample/src/main/res/values/chart_2_styles.xml
@@ -22,7 +22,7 @@
         <item name="thickness">16dp</item>
     </style>
 
-    <style name="Chart2ColumnChartStyle">
+    <style name="Chart2ColumnLayerStyle">
         <item name="column1">@style/Chart2Column1Style</item>
     </style>
 </resources>
diff --git a/sample/src/main/res/values/chart_3_styles.xml b/sample/src/main/res/values/chart_3_styles.xml
index 8dbcb282e..ea172ec95 100644
--- a/sample/src/main/res/values/chart_3_styles.xml
+++ b/sample/src/main/res/values/chart_3_styles.xml
@@ -68,7 +68,7 @@
         <item name="title">@string/x_axis</item>
     </style>
 
-    <style name="Chart3LineChartStyle">
+    <style name="Chart3LineLayerStyle">
         <item name="line1Spec">@style/Chart3Line1Style</item>
     </style>
 
diff --git a/sample/src/main/res/values/chart_4_styles.xml b/sample/src/main/res/values/chart_4_styles.xml
index c13939d66..b6ea074b3 100644
--- a/sample/src/main/res/values/chart_4_styles.xml
+++ b/sample/src/main/res/values/chart_4_styles.xml
@@ -45,13 +45,13 @@
         <item name="cubicStrength">0%</item>
     </style>
 
-    <style name="Chart4ColumnChartStyle">
+    <style name="Chart4ColumnLayerStyle">
         <item name="column1">@style/Chart4Column1Style</item>
         <item name="column2">@style/Chart4Column2Style</item>
         <item name="column3">@style/Chart4Column3Style</item>
     </style>
 
-    <style name="Chart4LineChartStyle">
+    <style name="Chart4LineLayerStyle">
         <item name="line1Spec">@style/Chart4Line1Style</item>
     </style>
 </resources>
diff --git a/sample/src/main/res/values/chart_5_styles.xml b/sample/src/main/res/values/chart_5_styles.xml
index 35150e750..adbd4351d 100644
--- a/sample/src/main/res/values/chart_5_styles.xml
+++ b/sample/src/main/res/values/chart_5_styles.xml
@@ -56,9 +56,10 @@
         <item name="labelRotationDegrees">45</item>
     </style>
 
-    <style name="Chart5ColumnChartStyle">
+    <style name="Chart5ColumnLayerStyle">
         <item name="column1">@style/Chart5Column1Style</item>
         <item name="column2">@style/Chart5Column2Style</item>
         <item name="column3">@style/Chart5Column3Style</item>
+        <item name="mergeMode">stacked</item>
     </style>
 </resources>
diff --git a/sample/src/main/res/values/chart_6_styles.xml b/sample/src/main/res/values/chart_6_styles.xml
index 124b06e1d..1bcb7c47f 100644
--- a/sample/src/main/res/values/chart_6_styles.xml
+++ b/sample/src/main/res/values/chart_6_styles.xml
@@ -40,7 +40,7 @@
         <item name="color">@color/chart_6_color_3</item>
     </style>
 
-    <style name="Chart6ColumnChartStyle">
+    <style name="Chart6ColumnLayerStyle">
         <item name="column1">@style/Chart6Column1Style</item>
         <item name="column2">@style/Chart6Column2Style</item>
         <item name="column3">@style/Chart6Column3Style</item>
diff --git a/sample/src/main/res/values/chart_7_styles.xml b/sample/src/main/res/values/chart_7_styles.xml
index 280ec7327..f6eb57ffa 100644
--- a/sample/src/main/res/values/chart_7_styles.xml
+++ b/sample/src/main/res/values/chart_7_styles.xml
@@ -36,7 +36,7 @@
         <item name="color">@color/chart_7_color_3</item>
     </style>
 
-    <style name="Chart7LineChartStyle">
+    <style name="Chart7LineLayerStyle">
         <item name="line1Spec">@style/Chart7Line1Style</item>
         <item name="line2Spec">@style/Chart7Line2Style</item>
         <item name="line3Spec">@style/Chart7Line3Style</item>
diff --git a/sample/src/main/res/values/chart_8_styles.xml b/sample/src/main/res/values/chart_8_styles.xml
index d93f61daf..61260aa99 100644
--- a/sample/src/main/res/values/chart_8_styles.xml
+++ b/sample/src/main/res/values/chart_8_styles.xml
@@ -36,13 +36,14 @@
         <item name="color">@color/chart_8_color_4</item>
     </style>
 
-    <style name="Chart8ColumnChartStyle">
+    <style name="Chart8ColumnLayerStyle">
         <item name="column1">@style/Chart8Column1Style</item>
         <item name="column2">@style/Chart8Column2Style</item>
         <item name="column3">@style/Chart8Column3Style</item>
+        <item name="mergeMode">stacked</item>
     </style>
 
-    <style name="Chart8LineChartStyle">
+    <style name="Chart8LineLayerStyle">
         <item name="line1Spec">@style/Chart8Line1Style</item>
     </style>
 </resources>
diff --git a/sample/src/main/res/values/chart_9_styles.xml b/sample/src/main/res/values/chart_9_styles.xml
index 378a4ae60..bffef869d 100644
--- a/sample/src/main/res/values/chart_9_styles.xml
+++ b/sample/src/main/res/values/chart_9_styles.xml
@@ -23,13 +23,14 @@
         <item name="negativeColor">?colorSecondary</item>
     </style>
 
-    <style name="Chart9LineChartStyle">
+    <style name="Chart9LineLayerStyle">
         <item name="line1Spec">@style/Chart9Line1Style</item>
     </style>
 
     <style name="Chart9BottomAxisStyle">
         <item name="horizontalAxisLabelSpacing">3</item>
         <item name="showGuideline">false</item>
+        <item name="addExtremeHorizontalAxisLabelPadding">true</item>
     </style>
 
     <style name="Chart9StartAxisStyle">
diff --git a/sample/src/main/res/values/strings.xml b/sample/src/main/res/values/strings.xml
index 1e3ed29ed..bb40df111 100644
--- a/sample/src/main/res/values/strings.xml
+++ b/sample/src/main/res/values/strings.xml
@@ -18,7 +18,7 @@
     <string name="app_name">Vico</string>
     <string name="compose">Compose</string>
     <string name="views">Views</string>
-    <string name="data_set_x">Data set %d</string>
+    <string name="series_x">Series %d</string>
     <string name="x_axis">x-axis</string>
     <string name="y_axis">y-axis</string>
 </resources>
diff --git a/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/chart/CartesianChart.kt b/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/chart/CartesianChart.kt
new file mode 100644
index 000000000..e3d0f35d2
--- /dev/null
+++ b/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/chart/CartesianChart.kt
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2023 by Patryk Goworowski and Patrick Michalik.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.patrykandpatrick.vico.compose.chart
+
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
+import com.patrykandpatrick.vico.compose.chart.layer.rememberColumnCartesianLayer
+import com.patrykandpatrick.vico.compose.chart.layer.rememberLineCartesianLayer
+import com.patrykandpatrick.vico.core.chart.CartesianChart
+import com.patrykandpatrick.vico.core.chart.decoration.Decoration
+import com.patrykandpatrick.vico.core.chart.layer.CartesianLayer
+import com.patrykandpatrick.vico.core.marker.Marker
+
+/**
+ * Creates and remembers a [CartesianChart] with the given [CartesianLayer]s, adding the given [Decoration]s and
+ * persistent [Marker]s.
+ *
+ * @see rememberColumnCartesianLayer
+ * @see rememberLineCartesianLayer
+ */
+@Composable
+public fun rememberCartesianChart(
+    vararg layers: CartesianLayer<*>,
+    decorations: List<Decoration>? = null,
+    persistentMarkers: Map<Float, Marker>? = null,
+): CartesianChart =
+    remember(layers) { CartesianChart(*layers) }.apply {
+        decorations?.let(::setDecorations)
+        persistentMarkers?.let(::setPersistentMarkers)
+    }
diff --git a/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/chart/Charts.kt b/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/chart/CartesianChartHost.kt
similarity index 83%
rename from vico/compose/src/main/java/com/patrykandpatrick/vico/compose/chart/Charts.kt
rename to vico/compose/src/main/java/com/patrykandpatrick/vico/compose/chart/CartesianChartHost.kt
index cdef84178..69d05c021 100644
--- a/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/chart/Charts.kt
+++ b/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/chart/CartesianChartHost.kt
@@ -39,11 +39,7 @@ import androidx.compose.ui.graphics.nativeCanvas
 import androidx.compose.ui.graphics.toArgb
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.unit.dp
-import com.patrykandpatrick.vico.compose.chart.column.columnChart
-import com.patrykandpatrick.vico.compose.chart.entry.collectAsState
-import com.patrykandpatrick.vico.compose.chart.entry.defaultDiffAnimationSpec
 import com.patrykandpatrick.vico.compose.chart.layout.segmented
-import com.patrykandpatrick.vico.compose.chart.line.lineChart
 import com.patrykandpatrick.vico.compose.chart.scroll.ChartScrollSpec
 import com.patrykandpatrick.vico.compose.chart.scroll.ChartScrollState
 import com.patrykandpatrick.vico.compose.chart.scroll.rememberChartScrollSpec
@@ -51,6 +47,8 @@ import com.patrykandpatrick.vico.compose.chart.scroll.rememberChartScrollState
 import com.patrykandpatrick.vico.compose.extension.chartTouchEvent
 import com.patrykandpatrick.vico.compose.gesture.OnZoom
 import com.patrykandpatrick.vico.compose.layout.getMeasureContext
+import com.patrykandpatrick.vico.compose.model.collectAsState
+import com.patrykandpatrick.vico.compose.model.defaultDiffAnimationSpec
 import com.patrykandpatrick.vico.compose.state.component1
 import com.patrykandpatrick.vico.compose.state.component2
 import com.patrykandpatrick.vico.compose.state.component3
@@ -61,7 +59,7 @@ import com.patrykandpatrick.vico.core.DefaultDimens
 import com.patrykandpatrick.vico.core.axis.AxisManager
 import com.patrykandpatrick.vico.core.axis.AxisPosition
 import com.patrykandpatrick.vico.core.axis.AxisRenderer
-import com.patrykandpatrick.vico.core.chart.Chart
+import com.patrykandpatrick.vico.core.chart.CartesianChart
 import com.patrykandpatrick.vico.core.chart.dimensions.MutableHorizontalDimensions
 import com.patrykandpatrick.vico.core.chart.draw.chartDrawContext
 import com.patrykandpatrick.vico.core.chart.draw.drawMarker
@@ -70,30 +68,29 @@ import com.patrykandpatrick.vico.core.chart.draw.getMaxScrollDistance
 import com.patrykandpatrick.vico.core.chart.edges.FadingEdges
 import com.patrykandpatrick.vico.core.chart.layout.HorizontalLayout
 import com.patrykandpatrick.vico.core.chart.scale.AutoScaleUp
-import com.patrykandpatrick.vico.core.chart.values.ChartValuesManager
-import com.patrykandpatrick.vico.core.chart.values.ChartValuesProvider
-import com.patrykandpatrick.vico.core.chart.values.toChartValuesProvider
-import com.patrykandpatrick.vico.core.entry.ChartEntryModel
-import com.patrykandpatrick.vico.core.entry.ChartModelProducer
+import com.patrykandpatrick.vico.core.chart.values.ChartValues
+import com.patrykandpatrick.vico.core.chart.values.MutableChartValues
+import com.patrykandpatrick.vico.core.chart.values.toImmutable
 import com.patrykandpatrick.vico.core.extension.set
 import com.patrykandpatrick.vico.core.extension.spToPx
 import com.patrykandpatrick.vico.core.layout.VirtualLayout
 import com.patrykandpatrick.vico.core.legend.Legend
 import com.patrykandpatrick.vico.core.marker.Marker
 import com.patrykandpatrick.vico.core.marker.MarkerVisibilityChangeListener
-import com.patrykandpatrick.vico.core.model.Point
+import com.patrykandpatrick.vico.core.model.CartesianChartModel
+import com.patrykandpatrick.vico.core.model.CartesianChartModelProducer
 import com.patrykandpatrick.vico.core.scroll.ScrollListener
+import com.patrykandpatrick.vico.core.util.Point
 import com.patrykandpatrick.vico.core.util.ValueWrapper
 import com.patrykandpatrick.vico.core.util.getValue
 import com.patrykandpatrick.vico.core.util.setValue
 import kotlinx.coroutines.launch
 
 /**
- * Displays a chart.
+ * Displays a [CartesianChart].
  *
- * @param chart the chart itself (excluding axes, markers, etc.). You can use [lineChart] or [columnChart], or provide a
- * custom [Chart] implementation.
- * @param chartModelProducer creates and updates the [ChartEntryModel] for the chart.
+ * @param chart the [CartesianChart].
+ * @param modelProducer creates and updates the [CartesianChartModel].
  * @param modifier the modifier to be applied to the chart.
  * @param startAxis the axis displayed at the start of the chart.
  * @param topAxis the axis displayed at the top of the chart.
@@ -113,13 +110,13 @@ import kotlinx.coroutines.launch
  * @param chartScrollState houses information on the chart’s scroll state. Allows for programmatic scrolling.
  * @param horizontalLayout defines how the chart’s content is positioned horizontally.
  * @param getXStep overrides the _x_ step (the difference between the _x_ values of neighboring major entries). If this
- * is null, the default _x_ step ([ChartEntryModel.xGcd]) is used.
- * @param placeholder shown when no [ChartEntryModel] is available.
+ * is null, the default _x_ step ([CartesianChartModel.xDeltaGcd]) is used.
+ * @param placeholder shown when no [CartesianChartModel] is available.
  */
 @Composable
-public fun <Model : ChartEntryModel> Chart(
-    chart: Chart<Model>,
-    chartModelProducer: ChartModelProducer<Model>,
+public fun CartesianChartHost(
+    chart: CartesianChart,
+    modelProducer: CartesianChartModelProducer,
     modifier: Modifier = Modifier,
     startAxis: AxisRenderer<AxisPosition.Vertical.Start>? = null,
     topAxis: AxisRenderer<AxisPosition.Horizontal.Top>? = null,
@@ -128,7 +125,7 @@ public fun <Model : ChartEntryModel> Chart(
     marker: Marker? = null,
     markerVisibilityChangeListener: MarkerVisibilityChangeListener? = null,
     legend: Legend? = null,
-    chartScrollSpec: ChartScrollSpec<Model> = rememberChartScrollSpec(),
+    chartScrollSpec: ChartScrollSpec = rememberChartScrollSpec(),
     isZoomEnabled: Boolean = true,
     diffAnimationSpec: AnimationSpec<Float>? = defaultDiffAnimationSpec,
     runInitialAnimation: Boolean = true,
@@ -136,20 +133,20 @@ public fun <Model : ChartEntryModel> Chart(
     autoScaleUp: AutoScaleUp = AutoScaleUp.Full,
     chartScrollState: ChartScrollState = rememberChartScrollState(),
     horizontalLayout: HorizontalLayout = HorizontalLayout.segmented(),
-    getXStep: ((Model) -> Float)? = null,
+    getXStep: ((CartesianChartModel) -> Float)? = null,
     placeholder: @Composable BoxScope.() -> Unit = {},
 ) {
-    val chartValuesManager = remember(chart) { ChartValuesManager() }
-    val chartEntryModelWrapper by chartModelProducer
-        .collectAsState(chart, chartModelProducer, diffAnimationSpec, runInitialAnimation, chartValuesManager, getXStep)
-    val (chartEntryModel, previousChartEntryModel, chartValuesProvider) = chartEntryModelWrapper
+    val mutableChartValues = remember(chart) { MutableChartValues() }
+    val modelWrapper by modelProducer
+        .collectAsState(chart, modelProducer, diffAnimationSpec, runInitialAnimation, mutableChartValues, getXStep)
+    val (model, previousModel, chartValues) = modelWrapper
 
-    ChartBox(modifier = modifier) {
-        if (chartEntryModel != null) {
-            ChartImpl(
+    CartesianChartHostBox(modifier = modifier) {
+        if (model != null) {
+            CartesianChartHostImpl(
                 chart = chart,
-                model = chartEntryModel,
-                oldModel = previousChartEntryModel,
+                model = model,
+                oldModel = previousModel,
                 startAxis = startAxis,
                 topAxis = topAxis,
                 endAxis = endAxis,
@@ -163,7 +160,7 @@ public fun <Model : ChartEntryModel> Chart(
                 autoScaleUp = autoScaleUp,
                 chartScrollState = chartScrollState,
                 horizontalLayout = horizontalLayout,
-                chartValuesProvider = chartValuesProvider,
+                chartValues = chartValues,
             )
         } else {
             placeholder()
@@ -172,14 +169,11 @@ public fun <Model : ChartEntryModel> Chart(
 }
 
 /**
- * Displays a chart.
+ * Displays a [CartesianChart]. This function accepts a [CartesianChartModel]. For dynamic data, use the function
+ * overload that accepts a [CartesianChartModelProducer] instance.
  *
- * This function accepts a [ChartEntryModel]. For dynamic data, use the function overload that accepts a
- * [ChartModelProducer] instance.
- *
- * @param chart the chart itself (excluding axes, markers, etc.). You can use [lineChart] or [columnChart], or provide a
- * custom [Chart] implementation.
- * @param model the [ChartEntryModel] for the chart.
+ * @param chart the [CartesianChart].
+ * @param model the [CartesianChartModel].
  * @param modifier the modifier to be applied to the chart.
  * @param startAxis the axis displayed at the start of the chart.
  * @param topAxis the axis displayed at the top of the chart.
@@ -190,7 +184,7 @@ public fun <Model : ChartEntryModel> Chart(
  * @param legend an optional legend for the chart.
  * @param chartScrollSpec houses scrolling-related settings.
  * @param isZoomEnabled whether zooming in and out is enabled.
- * @param oldModel the chart’s previous [ChartEntryModel]. This is used to determine whether to perform an automatic
+ * @param oldModel the chart’s previous [CartesianChartModel]. This is used to determine whether to perform an automatic
  * scroll.
  * @param fadingEdges applies a horizontal fade to the edges of the chart area for scrollable charts.
  * @param autoScaleUp defines whether the content of the chart should be scaled up when the dimensions are such that, at
@@ -198,13 +192,13 @@ public fun <Model : ChartEntryModel> Chart(
  * @param chartScrollState houses information on the chart’s scroll state. Allows for programmatic scrolling.
  * @param horizontalLayout defines how the chart’s content is positioned horizontally.
  * @param getXStep overrides the _x_ step (the difference between the _x_ values of neighboring major entries). If this
- * is null, the default _x_ step ([ChartEntryModel.xGcd]) is used.
+ * is null, the default _x_ step ([CartesianChartModel.xDeltaGcd]) is used.
  */
 @Composable
 @SuppressLint("RememberReturnType")
-public fun <Model : ChartEntryModel> Chart(
-    chart: Chart<Model>,
-    model: Model,
+public fun CartesianChartHost(
+    chart: CartesianChart,
+    model: CartesianChartModel,
     modifier: Modifier = Modifier,
     startAxis: AxisRenderer<AxisPosition.Vertical.Start>? = null,
     topAxis: AxisRenderer<AxisPosition.Horizontal.Top>? = null,
@@ -213,22 +207,22 @@ public fun <Model : ChartEntryModel> Chart(
     marker: Marker? = null,
     markerVisibilityChangeListener: MarkerVisibilityChangeListener? = null,
     legend: Legend? = null,
-    chartScrollSpec: ChartScrollSpec<Model> = rememberChartScrollSpec(),
+    chartScrollSpec: ChartScrollSpec = rememberChartScrollSpec(),
     isZoomEnabled: Boolean = true,
-    oldModel: Model? = null,
+    oldModel: CartesianChartModel? = null,
     fadingEdges: FadingEdges? = null,
     autoScaleUp: AutoScaleUp = AutoScaleUp.Full,
     chartScrollState: ChartScrollState = rememberChartScrollState(),
     horizontalLayout: HorizontalLayout = HorizontalLayout.segmented(),
-    getXStep: ((Model) -> Float)? = null,
+    getXStep: ((CartesianChartModel) -> Float)? = null,
 ) {
-    val chartValuesManager = remember(chart) { ChartValuesManager() }
-    remember(chartValuesManager, model, getXStep) {
-        chartValuesManager.resetChartValues()
-        chart.updateChartValues(chartValuesManager, model, getXStep?.invoke(model))
+    val chartValues = remember(chart) { MutableChartValues() }
+    remember(chartValues, model, getXStep) {
+        chartValues.reset()
+        chart.updateChartValues(chartValues, model, getXStep?.invoke(model))
     }
-    ChartBox(modifier = modifier) {
-        ChartImpl(
+    CartesianChartHostBox(modifier = modifier) {
+        CartesianChartHostImpl(
             chart = chart,
             model = model,
             startAxis = startAxis,
@@ -245,15 +239,15 @@ public fun <Model : ChartEntryModel> Chart(
             autoScaleUp = autoScaleUp,
             chartScrollState = chartScrollState,
             horizontalLayout = horizontalLayout,
-            chartValuesProvider = chartValuesManager.toChartValuesProvider(),
+            chartValues = chartValues.toImmutable(),
         )
     }
 }
 
 @Composable
-internal fun <Model : ChartEntryModel> ChartImpl(
-    chart: Chart<Model>,
-    model: Model,
+internal fun CartesianChartHostImpl(
+    chart: CartesianChart,
+    model: CartesianChartModel,
     startAxis: AxisRenderer<AxisPosition.Vertical.Start>?,
     topAxis: AxisRenderer<AxisPosition.Horizontal.Top>?,
     endAxis: AxisRenderer<AxisPosition.Vertical.End>?,
@@ -261,14 +255,14 @@ internal fun <Model : ChartEntryModel> ChartImpl(
     marker: Marker?,
     markerVisibilityChangeListener: MarkerVisibilityChangeListener?,
     legend: Legend?,
-    chartScrollSpec: ChartScrollSpec<Model>,
+    chartScrollSpec: ChartScrollSpec,
     isZoomEnabled: Boolean,
-    oldModel: Model? = null,
+    oldModel: CartesianChartModel? = null,
     fadingEdges: FadingEdges?,
     autoScaleUp: AutoScaleUp,
     chartScrollState: ChartScrollState = rememberChartScrollState(),
     horizontalLayout: HorizontalLayout,
-    chartValuesProvider: ChartValuesProvider,
+    chartValues: ChartValues,
 ) {
     val axisManager = remember { AxisManager() }
     val bounds = remember { RectF() }
@@ -281,7 +275,7 @@ internal fun <Model : ChartEntryModel> ChartImpl(
             bounds,
             horizontalLayout,
             with(LocalContext.current) { ::spToPx },
-            chartValuesProvider,
+            chartValues,
         )
     val scrollListener = rememberScrollListener(markerTouchPoint)
     val lastMarkerEntryModels = remember { mutableStateOf(emptyList<Marker.EntryModel>()) }
@@ -382,7 +376,7 @@ internal fun <Model : ChartEntryModel> ChartImpl(
         val count = if (fadingEdges != null) chartDrawContext.saveLayer() else -1
 
         axisManager.drawBehindChart(chartDrawContext)
-        chart.drawScrollableContent(chartDrawContext, model)
+        chart.draw(chartDrawContext, model)
 
         fadingEdges?.apply {
             applyFadingEdges(chartDrawContext, chart.bounds)
@@ -390,7 +384,7 @@ internal fun <Model : ChartEntryModel> ChartImpl(
         }
 
         axisManager.drawAboveChart(chartDrawContext)
-        chart.drawNonScrollableContent(chartDrawContext, model)
+        chart.drawOverlays(chartDrawContext)
         legend?.draw(chartDrawContext)
 
         if (marker != null) {
@@ -411,7 +405,7 @@ internal fun <Model : ChartEntryModel> ChartImpl(
 }
 
 @Composable
-internal fun ChartBox(
+internal fun CartesianChartHostBox(
     modifier: Modifier,
     content: @Composable BoxScope.() -> Unit,
 ) {
diff --git a/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/chart/column/ColumnChart.kt b/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/chart/column/ColumnChart.kt
deleted file mode 100644
index 55b268901..000000000
--- a/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/chart/column/ColumnChart.kt
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Copyright 2023 by Patryk Goworowski and Patrick Michalik.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.patrykandpatrick.vico.compose.chart.column
-
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.remember
-import androidx.compose.ui.unit.Dp
-import com.patrykandpatrick.vico.compose.chart.Chart
-import com.patrykandpatrick.vico.compose.style.currentChartStyle
-import com.patrykandpatrick.vico.core.axis.AxisPosition
-import com.patrykandpatrick.vico.core.axis.AxisRenderer
-import com.patrykandpatrick.vico.core.chart.column.ColumnChart
-import com.patrykandpatrick.vico.core.chart.column.ColumnChart.MergeMode
-import com.patrykandpatrick.vico.core.chart.column.ColumnChartDrawingModel
-import com.patrykandpatrick.vico.core.chart.composed.ComposedChart
-import com.patrykandpatrick.vico.core.chart.decoration.Decoration
-import com.patrykandpatrick.vico.core.chart.values.AxisValuesOverrider
-import com.patrykandpatrick.vico.core.chart.values.ChartValues
-import com.patrykandpatrick.vico.core.component.shape.LineComponent
-import com.patrykandpatrick.vico.core.component.text.TextComponent
-import com.patrykandpatrick.vico.core.component.text.VerticalPosition
-import com.patrykandpatrick.vico.core.entry.ChartEntryModel
-import com.patrykandpatrick.vico.core.entry.diff.DefaultDrawingModelInterpolator
-import com.patrykandpatrick.vico.core.entry.diff.DrawingModelInterpolator
-import com.patrykandpatrick.vico.core.formatter.ValueFormatter
-import com.patrykandpatrick.vico.core.marker.Marker
-
-/**
- * Creates a [ColumnChart].
- *
- * @param columns the [LineComponent] instances to use for columns. This list is iterated through as many times
- * as necessary for each column collection. If the list contains a single element, all columns have the same appearance.
- * @param spacing the distance between neighboring column collections.
- * @param innerSpacing the distance between neighboring grouped columns.
- * @param mergeMode defines how columns should be drawn in column collections.
- * @param decorations the list of [Decoration]s that will be added to the [ColumnChart].
- * @param persistentMarkers maps x-axis values to persistent [Marker]s.
- * @param dataLabel an optional [TextComponent] to use for data labels.
- * @param dataLabelVerticalPosition the vertical position of data labels relative to the top of their
- * respective columns.
- * @param dataLabelValueFormatter the [ValueFormatter] to use for data labels.
- * @param dataLabelRotationDegrees the rotation of data labels (in degrees).
- * @param axisValuesOverrider overrides the minimum and maximum x-axis and y-axis values.
- * @param targetVerticalAxisPosition if this is set, any [AxisRenderer] with an [AxisPosition] equal to the provided
- * value will use the [ChartValues] provided by this chart. This is meant to be used with [ComposedChart].
- * @param drawingModelInterpolator interpolates the [ColumnChart]’s [ColumnChartDrawingModel]s.
- *
- * @see Chart
- * @see ColumnChart
- */
-@Composable
-public fun columnChart(
-    columns: List<LineComponent> = currentChartStyle.columnChart.columns,
-    spacing: Dp = currentChartStyle.columnChart.outsideSpacing,
-    innerSpacing: Dp = currentChartStyle.columnChart.innerSpacing,
-    mergeMode: MergeMode = currentChartStyle.columnChart.mergeMode,
-    decorations: List<Decoration>? = null,
-    persistentMarkers: Map<Float, Marker>? = null,
-    targetVerticalAxisPosition: AxisPosition.Vertical? = null,
-    dataLabel: TextComponent? = currentChartStyle.columnChart.dataLabel,
-    dataLabelVerticalPosition: VerticalPosition = currentChartStyle.columnChart.dataLabelVerticalPosition,
-    dataLabelValueFormatter: ValueFormatter = currentChartStyle.columnChart.dataLabelValueFormatter,
-    dataLabelRotationDegrees: Float = currentChartStyle.columnChart.dataLabelRotationDegrees,
-    axisValuesOverrider: AxisValuesOverrider<ChartEntryModel>? = null,
-    drawingModelInterpolator: DrawingModelInterpolator<ColumnChartDrawingModel.ColumnInfo, ColumnChartDrawingModel> =
-        remember { DefaultDrawingModelInterpolator() },
-): ColumnChart =
-    remember { ColumnChart() }.apply {
-        this.columns = columns
-        this.spacingDp = spacing.value
-        this.innerSpacingDp = innerSpacing.value
-        this.mergeMode = mergeMode
-        this.dataLabel = dataLabel
-        this.dataLabelVerticalPosition = dataLabelVerticalPosition
-        this.dataLabelValueFormatter = dataLabelValueFormatter
-        this.dataLabelRotationDegrees = dataLabelRotationDegrees
-        this.axisValuesOverrider = axisValuesOverrider
-        this.targetVerticalAxisPosition = targetVerticalAxisPosition
-        this.drawingModelInterpolator = drawingModelInterpolator
-        decorations?.also(::setDecorations)
-        persistentMarkers?.also(::setPersistentMarkers)
-    }
diff --git a/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/chart/layer/ColumnCartesianLayer.kt b/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/chart/layer/ColumnCartesianLayer.kt
new file mode 100644
index 000000000..14bc6416c
--- /dev/null
+++ b/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/chart/layer/ColumnCartesianLayer.kt
@@ -0,0 +1,85 @@
+/*
+ * Copyright 2023 by Patryk Goworowski and Patrick Michalik.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.patrykandpatrick.vico.compose.chart.layer
+
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
+import androidx.compose.ui.unit.Dp
+import com.patrykandpatrick.vico.compose.style.currentChartStyle
+import com.patrykandpatrick.vico.core.axis.AxisPosition
+import com.patrykandpatrick.vico.core.axis.vertical.VerticalAxis
+import com.patrykandpatrick.vico.core.chart.layer.CartesianLayer
+import com.patrykandpatrick.vico.core.chart.layer.ColumnCartesianLayer
+import com.patrykandpatrick.vico.core.chart.layer.ColumnCartesianLayer.MergeMode
+import com.patrykandpatrick.vico.core.chart.values.AxisValueOverrider
+import com.patrykandpatrick.vico.core.component.shape.LineComponent
+import com.patrykandpatrick.vico.core.component.text.TextComponent
+import com.patrykandpatrick.vico.core.component.text.VerticalPosition
+import com.patrykandpatrick.vico.core.formatter.ValueFormatter
+import com.patrykandpatrick.vico.core.model.ColumnCartesianLayerModel
+import com.patrykandpatrick.vico.core.model.drawing.ColumnCartesianLayerDrawingModel
+import com.patrykandpatrick.vico.core.model.drawing.DefaultDrawingModelInterpolator
+import com.patrykandpatrick.vico.core.model.drawing.DrawingModelInterpolator
+
+/**
+ * Creates a [ColumnCartesianLayer].
+ *
+ * @param columns the [LineComponent] instances to use for columns. This list is iterated through as many times
+ * as necessary for each column collection. If the list contains a single element, all columns have the same appearance.
+ * @param spacing the distance between neighboring column collections.
+ * @param innerSpacing the distance between neighboring grouped columns.
+ * @param mergeMode defines how columns should be drawn in column collections.
+ * @param dataLabel an optional [TextComponent] to use for data labels.
+ * @param dataLabelVerticalPosition the vertical position of data labels relative to the top of their
+ * respective columns.
+ * @param dataLabelValueFormatter the [ValueFormatter] to use for data labels.
+ * @param dataLabelRotationDegrees the rotation of data labels (in degrees).
+ * @param axisValueOverrider overrides the _x_ and _y_ ranges.
+ * @param verticalAxisPosition the position of the [VerticalAxis] with which the [ColumnCartesianLayer] should be
+ * associated. Use this for independent [CartesianLayer] scaling.
+ * @param drawingModelInterpolator interpolates the [ColumnCartesianLayer]’s [ColumnCartesianLayerDrawingModel]s.
+ */
+@Composable
+public fun rememberColumnCartesianLayer(
+    columns: List<LineComponent> = currentChartStyle.columnLayer.columns,
+    spacing: Dp = currentChartStyle.columnLayer.outsideSpacing,
+    innerSpacing: Dp = currentChartStyle.columnLayer.innerSpacing,
+    mergeMode: MergeMode = currentChartStyle.columnLayer.mergeMode,
+    verticalAxisPosition: AxisPosition.Vertical? = null,
+    dataLabel: TextComponent? = currentChartStyle.columnLayer.dataLabel,
+    dataLabelVerticalPosition: VerticalPosition = currentChartStyle.columnLayer.dataLabelVerticalPosition,
+    dataLabelValueFormatter: ValueFormatter = currentChartStyle.columnLayer.dataLabelValueFormatter,
+    dataLabelRotationDegrees: Float = currentChartStyle.columnLayer.dataLabelRotationDegrees,
+    axisValueOverrider: AxisValueOverrider<ColumnCartesianLayerModel>? = null,
+    drawingModelInterpolator: DrawingModelInterpolator<
+        ColumnCartesianLayerDrawingModel.ColumnInfo,
+        ColumnCartesianLayerDrawingModel,
+        > = remember { DefaultDrawingModelInterpolator() },
+): ColumnCartesianLayer =
+    remember { ColumnCartesianLayer() }.apply {
+        this.columns = columns
+        this.spacingDp = spacing.value
+        this.innerSpacingDp = innerSpacing.value
+        this.mergeMode = mergeMode
+        this.dataLabel = dataLabel
+        this.dataLabelVerticalPosition = dataLabelVerticalPosition
+        this.dataLabelValueFormatter = dataLabelValueFormatter
+        this.dataLabelRotationDegrees = dataLabelRotationDegrees
+        this.axisValueOverrider = axisValueOverrider
+        this.verticalAxisPosition = verticalAxisPosition
+        this.drawingModelInterpolator = drawingModelInterpolator
+    }
diff --git a/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/chart/layer/LineCartesianLayer.kt b/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/chart/layer/LineCartesianLayer.kt
new file mode 100644
index 000000000..c93a03e2c
--- /dev/null
+++ b/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/chart/layer/LineCartesianLayer.kt
@@ -0,0 +1,192 @@
+/*
+ * Copyright 2023 by Patryk Goworowski and Patrick Michalik.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.patrykandpatrick.vico.compose.chart.layer
+
+import android.graphics.Paint
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
+import androidx.compose.ui.graphics.Brush
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.StrokeCap
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.dp
+import com.patrykandpatrick.vico.compose.component.shape.shader.fromBrush
+import com.patrykandpatrick.vico.compose.style.currentChartStyle
+import com.patrykandpatrick.vico.core.DefaultAlpha
+import com.patrykandpatrick.vico.core.DefaultDimens
+import com.patrykandpatrick.vico.core.axis.AxisPosition
+import com.patrykandpatrick.vico.core.axis.vertical.VerticalAxis
+import com.patrykandpatrick.vico.core.chart.DefaultPointConnector
+import com.patrykandpatrick.vico.core.chart.layer.CartesianLayer
+import com.patrykandpatrick.vico.core.chart.layer.LineCartesianLayer
+import com.patrykandpatrick.vico.core.chart.layer.LineCartesianLayer.LineSpec
+import com.patrykandpatrick.vico.core.chart.values.AxisValueOverrider
+import com.patrykandpatrick.vico.core.component.Component
+import com.patrykandpatrick.vico.core.component.shape.shader.ColorShader
+import com.patrykandpatrick.vico.core.component.shape.shader.DynamicShader
+import com.patrykandpatrick.vico.core.component.shape.shader.DynamicShaders
+import com.patrykandpatrick.vico.core.component.shape.shader.TopBottomShader
+import com.patrykandpatrick.vico.core.component.text.TextComponent
+import com.patrykandpatrick.vico.core.component.text.VerticalPosition
+import com.patrykandpatrick.vico.core.formatter.DecimalFormatValueFormatter
+import com.patrykandpatrick.vico.core.formatter.ValueFormatter
+import com.patrykandpatrick.vico.core.model.LineCartesianLayerModel
+import com.patrykandpatrick.vico.core.model.drawing.DefaultDrawingModelInterpolator
+import com.patrykandpatrick.vico.core.model.drawing.DrawingModelInterpolator
+import com.patrykandpatrick.vico.core.model.drawing.LineCartesianLayerDrawingModel
+
+/**
+ * Creates a [LineCartesianLayer].
+ *
+ * @param lines the [LineCartesianLayer.LineSpec]s to use for the lines. This list is iterated through as many times as
+ * there are lines.
+ * @param spacing the distance between neighboring major entries’ points.
+ * @param axisValueOverrider overrides the _x_ and _y_ ranges.
+ * @param verticalAxisPosition the position of the [VerticalAxis] with which the [LineCartesianLayer] should be
+ * associated. Use this for independent [CartesianLayer] scaling.
+ * @param drawingModelInterpolator interpolates the [LineCartesianLayer]’s [LineCartesianLayerDrawingModel]s.
+ */
+@Composable
+public fun rememberLineCartesianLayer(
+    lines: List<LineSpec> = currentChartStyle.lineLayer.lines,
+    spacing: Dp = currentChartStyle.lineLayer.spacing,
+    axisValueOverrider: AxisValueOverrider<LineCartesianLayerModel>? = null,
+    verticalAxisPosition: AxisPosition.Vertical? = null,
+    drawingModelInterpolator: DrawingModelInterpolator<
+        LineCartesianLayerDrawingModel.PointInfo,
+        LineCartesianLayerDrawingModel,
+        > = remember { DefaultDrawingModelInterpolator() },
+): LineCartesianLayer =
+    remember { LineCartesianLayer(lines) }.apply {
+        this.lines = lines
+        this.spacingDp = spacing.value
+        this.axisValueOverrider = axisValueOverrider
+        this.verticalAxisPosition = verticalAxisPosition
+        this.drawingModelInterpolator = drawingModelInterpolator
+    }
+
+/**
+ * Creates a [LineCartesianLayer.LineSpec] for use in [LineCartesianLayer]s.
+ *
+ * @param shader the [DynamicShader] for the line.
+ * @param thickness the thickness of the line.
+ * @param backgroundShader an optional [DynamicShader] to use for the areas bounded by the [LineCartesianLayer] line and
+ * the zero line (_y_ = 0).
+ * @param cap the stroke cap for the line.
+ * @param point an optional [Component] that can be drawn at a given point on the line.
+ * @param pointSize the size of the [point].
+ * @param dataLabel an optional [TextComponent] to use for data labels.
+ * @param dataLabelVerticalPosition the vertical position of data labels relative to the line.
+ * @param dataLabelValueFormatter the [ValueFormatter] to use for data labels.
+ * @param dataLabelRotationDegrees the rotation of data labels in degrees.
+ * @param pointConnector the [LineSpec.PointConnector] for the line.
+ */
+public fun lineSpec(
+    shader: DynamicShader,
+    thickness: Dp = DefaultDimens.LINE_THICKNESS.dp,
+    backgroundShader: DynamicShader? = shader.getDefaultBackgroundShader(),
+    cap: StrokeCap = StrokeCap.Round,
+    point: Component? = null,
+    pointSize: Dp = DefaultDimens.POINT_SIZE.dp,
+    dataLabel: TextComponent? = null,
+    dataLabelVerticalPosition: VerticalPosition = VerticalPosition.Top,
+    dataLabelValueFormatter: ValueFormatter = DecimalFormatValueFormatter(),
+    dataLabelRotationDegrees: Float = 0f,
+    pointConnector: LineSpec.PointConnector = DefaultPointConnector(),
+): LineSpec =
+    LineSpec(
+        shader = shader,
+        thicknessDp = thickness.value,
+        backgroundShader = backgroundShader,
+        cap = cap.paintCap,
+        point = point,
+        pointSizeDp = pointSize.value,
+        dataLabel = dataLabel,
+        dataLabelVerticalPosition = dataLabelVerticalPosition,
+        dataLabelValueFormatter = dataLabelValueFormatter,
+        dataLabelRotationDegrees = dataLabelRotationDegrees,
+        pointConnector = pointConnector,
+    )
+
+private fun DynamicShader.getDefaultBackgroundShader(): DynamicShader? =
+    when (this) {
+        is ColorShader ->
+            TopBottomShader(
+                topShader =
+                    DynamicShaders.fromBrush(
+                        brush =
+                            Brush.verticalGradient(
+                                listOf(
+                                    Color(color).copy(alpha = DefaultAlpha.LINE_BACKGROUND_SHADER_START),
+                                    Color(color).copy(alpha = DefaultAlpha.LINE_BACKGROUND_SHADER_END),
+                                ),
+                            ),
+                    ),
+                bottomShader =
+                    DynamicShaders.fromBrush(
+                        brush =
+                            Brush.verticalGradient(
+                                listOf(
+                                    Color(color).copy(alpha = DefaultAlpha.LINE_BACKGROUND_SHADER_END),
+                                    Color(color).copy(alpha = DefaultAlpha.LINE_BACKGROUND_SHADER_START),
+                                ),
+                            ),
+                    ),
+            )
+        is TopBottomShader -> {
+            val topShader = topShader
+            val bottomShader = bottomShader
+            if (topShader is ColorShader && bottomShader is ColorShader) {
+                TopBottomShader(
+                    topShader =
+                        DynamicShaders.fromBrush(
+                            brush =
+                                Brush.verticalGradient(
+                                    listOf(
+                                        Color(topShader.color).copy(alpha = DefaultAlpha.LINE_BACKGROUND_SHADER_START),
+                                        Color(topShader.color).copy(alpha = DefaultAlpha.LINE_BACKGROUND_SHADER_END),
+                                    ),
+                                ),
+                        ),
+                    bottomShader =
+                        DynamicShaders.fromBrush(
+                            brush =
+                                Brush.verticalGradient(
+                                    listOf(
+                                        Color(bottomShader.color).copy(alpha = DefaultAlpha.LINE_BACKGROUND_SHADER_END),
+                                        Color(
+                                            bottomShader.color,
+                                        ).copy(alpha = DefaultAlpha.LINE_BACKGROUND_SHADER_START),
+                                    ),
+                                ),
+                        ),
+                )
+            } else {
+                null
+            }
+        }
+        else -> null
+    }
+
+private val StrokeCap.paintCap: Paint.Cap
+    get() =
+        when (this) {
+            StrokeCap.Butt -> Paint.Cap.BUTT
+            StrokeCap.Round -> Paint.Cap.ROUND
+            StrokeCap.Square -> Paint.Cap.SQUARE
+            else -> throw IllegalArgumentException("Not `StrokeCap.Butt`, `StrokeCap.Round`, or `StrokeCap.Square`.")
+        }
diff --git a/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/chart/line/LineChart.kt b/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/chart/line/LineChart.kt
deleted file mode 100644
index 660226609..000000000
--- a/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/chart/line/LineChart.kt
+++ /dev/null
@@ -1,254 +0,0 @@
-/*
- * Copyright 2023 by Patryk Goworowski and Patrick Michalik.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.patrykandpatrick.vico.compose.chart.line
-
-import android.graphics.Paint
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.remember
-import androidx.compose.ui.graphics.Brush
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.StrokeCap
-import androidx.compose.ui.graphics.toArgb
-import androidx.compose.ui.unit.Dp
-import androidx.compose.ui.unit.dp
-import com.patrykandpatrick.vico.compose.chart.Chart
-import com.patrykandpatrick.vico.compose.component.shape.shader.fromBrush
-import com.patrykandpatrick.vico.compose.style.currentChartStyle
-import com.patrykandpatrick.vico.core.DefaultAlpha
-import com.patrykandpatrick.vico.core.DefaultDimens
-import com.patrykandpatrick.vico.core.axis.AxisPosition
-import com.patrykandpatrick.vico.core.axis.AxisRenderer
-import com.patrykandpatrick.vico.core.chart.DefaultPointConnector
-import com.patrykandpatrick.vico.core.chart.column.ColumnChart
-import com.patrykandpatrick.vico.core.chart.composed.ComposedChart
-import com.patrykandpatrick.vico.core.chart.decoration.Decoration
-import com.patrykandpatrick.vico.core.chart.line.LineChart
-import com.patrykandpatrick.vico.core.chart.line.LineChart.LineSpec
-import com.patrykandpatrick.vico.core.chart.line.LineChartDrawingModel
-import com.patrykandpatrick.vico.core.chart.values.AxisValuesOverrider
-import com.patrykandpatrick.vico.core.chart.values.ChartValues
-import com.patrykandpatrick.vico.core.component.Component
-import com.patrykandpatrick.vico.core.component.shape.shader.DynamicShader
-import com.patrykandpatrick.vico.core.component.shape.shader.DynamicShaders
-import com.patrykandpatrick.vico.core.component.shape.shader.HorizontalSplitShader
-import com.patrykandpatrick.vico.core.component.shape.shader.SolidShader
-import com.patrykandpatrick.vico.core.component.text.TextComponent
-import com.patrykandpatrick.vico.core.component.text.VerticalPosition
-import com.patrykandpatrick.vico.core.entry.ChartEntryModel
-import com.patrykandpatrick.vico.core.entry.diff.DefaultDrawingModelInterpolator
-import com.patrykandpatrick.vico.core.entry.diff.DrawingModelInterpolator
-import com.patrykandpatrick.vico.core.formatter.DecimalFormatValueFormatter
-import com.patrykandpatrick.vico.core.formatter.ValueFormatter
-import com.patrykandpatrick.vico.core.marker.Marker
-
-/**
- * Creates a [LineChart].
- *
- * @param lines the [LineChart.LineSpec]s to use for the lines. This list is iterated through as many times as there
- * are lines.
- * @param spacing the distance between neighboring major entries’ points.
- * @param decorations the list of [Decoration]s that will be added to the [LineChart].
- * @param persistentMarkers maps x-axis values to persistent [Marker]s.
- * @param axisValuesOverrider overrides the minimum and maximum x-axis and y-axis values.
- * @param targetVerticalAxisPosition if this is set, any [AxisRenderer] with an [AxisPosition] equal to the provided
- * value will use the [ChartValues] provided by this chart. This is meant to be used with [ComposedChart].
- * @param drawingModelInterpolator interpolates the [LineChart]’s [LineChartDrawingModel]s.
- *
- * @see Chart
- * @see ColumnChart
- */
-@Composable
-public fun lineChart(
-    lines: List<LineSpec> = currentChartStyle.lineChart.lines,
-    spacing: Dp = currentChartStyle.lineChart.spacing,
-    decorations: List<Decoration>? = null,
-    persistentMarkers: Map<Float, Marker>? = null,
-    axisValuesOverrider: AxisValuesOverrider<ChartEntryModel>? = null,
-    targetVerticalAxisPosition: AxisPosition.Vertical? = null,
-    drawingModelInterpolator: DrawingModelInterpolator<LineChartDrawingModel.PointInfo, LineChartDrawingModel> =
-        remember { DefaultDrawingModelInterpolator() },
-): LineChart =
-    remember { LineChart() }.apply {
-        this.lines = lines
-        this.spacingDp = spacing.value
-        this.axisValuesOverrider = axisValuesOverrider
-        this.targetVerticalAxisPosition = targetVerticalAxisPosition
-        this.drawingModelInterpolator = drawingModelInterpolator
-        decorations?.also(::setDecorations)
-        persistentMarkers?.also(::setPersistentMarkers)
-    }
-
-/**
- * Creates a [LineChart.LineSpec] for use in [LineChart]s.
- *
- * @param lineColor the color of the line.
- * @param lineThickness the thickness of the line.
- * @param lineBackgroundShader an optional [DynamicShader] to use for the area below the line.
- * @param lineCap the stroke cap for the line.
- * @param point an optional [Component] that can be drawn at a given point on the line.
- * @param pointSize the size of the [point].
- * @param dataLabel an optional [TextComponent] to use for data labels.
- * @param dataLabelVerticalPosition the vertical position of data labels relative to the line.
- * @param dataLabelValueFormatter the [ValueFormatter] to use for data labels.
- * @param dataLabelRotationDegrees the rotation of data labels in degrees.
- * @param pointConnector the [LineSpec.PointConnector] for the line.
- *
- * @see LineChart
- * @see LineChart.LineSpec
- */
-public fun lineSpec(
-    lineColor: Color,
-    lineThickness: Dp = DefaultDimens.LINE_THICKNESS.dp,
-    lineBackgroundShader: DynamicShader? =
-        DynamicShaders.fromBrush(
-            brush =
-                Brush.verticalGradient(
-                    listOf(
-                        lineColor.copy(alpha = DefaultAlpha.LINE_BACKGROUND_SHADER_START),
-                        lineColor.copy(alpha = DefaultAlpha.LINE_BACKGROUND_SHADER_END),
-                    ),
-                ),
-        ),
-    lineCap: StrokeCap = StrokeCap.Round,
-    point: Component? = null,
-    pointSize: Dp = DefaultDimens.POINT_SIZE.dp,
-    dataLabel: TextComponent? = null,
-    dataLabelVerticalPosition: VerticalPosition = VerticalPosition.Top,
-    dataLabelValueFormatter: ValueFormatter = DecimalFormatValueFormatter(),
-    dataLabelRotationDegrees: Float = 0f,
-    pointConnector: LineSpec.PointConnector = DefaultPointConnector(),
-): LineSpec =
-    LineSpec(
-        lineShader = SolidShader(lineColor.toArgb()),
-        lineThicknessDp = lineThickness.value,
-        lineBackgroundShader = lineBackgroundShader,
-        lineCap = lineCap.paintCap,
-        point = point,
-        pointSizeDp = pointSize.value,
-        dataLabel = dataLabel,
-        dataLabelVerticalPosition = dataLabelVerticalPosition,
-        dataLabelValueFormatter = dataLabelValueFormatter,
-        dataLabelRotationDegrees = dataLabelRotationDegrees,
-        pointConnector = pointConnector,
-    )
-
-/**
- * Creates a [LineChart.LineSpec] for use in [LineChart]s.
- *
- * @param lineShader the [DynamicShader] for the line.
- * @param lineThickness the thickness of the line.
- * @param lineBackgroundShader an optional [DynamicShader] to use for the area below and above the line.
- * @param lineCap the stroke cap for the line.
- * @param point an optional [Component] that can be drawn at a given point on the line.
- * @param pointSize the size of the [point].
- * @param dataLabel an optional [TextComponent] to use for data labels.
- * @param dataLabelVerticalPosition the vertical position of data labels relative to the line.
- * @param dataLabelValueFormatter the [ValueFormatter] to use for data labels.
- * @param dataLabelRotationDegrees the rotation of data labels in degrees.
- * @param pointConnector the [LineSpec.PointConnector] for the line.
- *
- * @see LineChart
- * @see LineChart.LineSpec
- */
-public fun lineSpec(
-    lineShader: DynamicShader,
-    lineThickness: Dp = DefaultDimens.LINE_THICKNESS.dp,
-    lineBackgroundShader: DynamicShader? = lineShader.getBackwardCompatibleBackgroundShader(),
-    lineCap: StrokeCap = StrokeCap.Round,
-    point: Component? = null,
-    pointSize: Dp = DefaultDimens.POINT_SIZE.dp,
-    dataLabel: TextComponent? = null,
-    dataLabelVerticalPosition: VerticalPosition = VerticalPosition.Top,
-    dataLabelValueFormatter: ValueFormatter = DecimalFormatValueFormatter(),
-    dataLabelRotationDegrees: Float = 0f,
-    pointConnector: LineSpec.PointConnector = DefaultPointConnector(),
-): LineSpec =
-    LineSpec(
-        lineShader = lineShader,
-        lineThicknessDp = lineThickness.value,
-        lineBackgroundShader = lineBackgroundShader,
-        lineCap = lineCap.paintCap,
-        point = point,
-        pointSizeDp = pointSize.value,
-        dataLabel = dataLabel,
-        dataLabelVerticalPosition = dataLabelVerticalPosition,
-        dataLabelValueFormatter = dataLabelValueFormatter,
-        dataLabelRotationDegrees = dataLabelRotationDegrees,
-        pointConnector = pointConnector,
-    )
-
-private fun DynamicShader.getBackwardCompatibleBackgroundShader(): DynamicShader? =
-    when (this) {
-        is SolidShader ->
-            HorizontalSplitShader.Double(
-                topShader =
-                    DynamicShaders.fromBrush(
-                        brush =
-                            Brush.verticalGradient(
-                                listOf(
-                                    Color(color).copy(alpha = DefaultAlpha.LINE_BACKGROUND_SHADER_START),
-                                    Color(color).copy(alpha = DefaultAlpha.LINE_BACKGROUND_SHADER_END),
-                                ),
-                            ),
-                    ),
-                bottomShader =
-                    DynamicShaders.fromBrush(
-                        brush =
-                            Brush.verticalGradient(
-                                listOf(
-                                    Color(color).copy(alpha = DefaultAlpha.LINE_BACKGROUND_SHADER_END),
-                                    Color(color).copy(alpha = DefaultAlpha.LINE_BACKGROUND_SHADER_START),
-                                ),
-                            ),
-                    ),
-            )
-
-        is HorizontalSplitShader.Solid ->
-            HorizontalSplitShader.Double(
-                topShader =
-                    DynamicShaders.fromBrush(
-                        brush =
-                            Brush.verticalGradient(
-                                listOf(
-                                    Color(colorTop).copy(alpha = DefaultAlpha.LINE_BACKGROUND_SHADER_START),
-                                    Color(colorTop).copy(alpha = DefaultAlpha.LINE_BACKGROUND_SHADER_END),
-                                ),
-                            ),
-                    ),
-                bottomShader =
-                    DynamicShaders.fromBrush(
-                        brush =
-                            Brush.verticalGradient(
-                                listOf(
-                                    Color(colorBottom).copy(alpha = DefaultAlpha.LINE_BACKGROUND_SHADER_END),
-                                    Color(colorBottom).copy(alpha = DefaultAlpha.LINE_BACKGROUND_SHADER_START),
-                                ),
-                            ),
-                    ),
-            )
-
-        else -> null
-    }
-
-private val StrokeCap.paintCap: Paint.Cap
-    get() =
-        when (this) {
-            StrokeCap.Butt -> Paint.Cap.BUTT
-            StrokeCap.Round -> Paint.Cap.ROUND
-            StrokeCap.Square -> Paint.Cap.SQUARE
-            else -> throw IllegalArgumentException("Not `StrokeCap.Butt`, `StrokeCap.Round`, or `StrokeCap.Square`.")
-        }
diff --git a/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/chart/scroll/ChartScrollSpec.kt b/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/chart/scroll/ChartScrollSpec.kt
index 1d6f751e4..925704b19 100644
--- a/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/chart/scroll/ChartScrollSpec.kt
+++ b/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/chart/scroll/ChartScrollSpec.kt
@@ -24,7 +24,7 @@ import androidx.compose.foundation.gestures.stopScroll
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.Stable
 import androidx.compose.runtime.remember
-import com.patrykandpatrick.vico.core.entry.ChartEntryModel
+import com.patrykandpatrick.vico.core.model.CartesianChartModel
 import com.patrykandpatrick.vico.core.scroll.AutoScrollCondition
 import com.patrykandpatrick.vico.core.scroll.InitialScroll
 
@@ -37,18 +37,18 @@ import com.patrykandpatrick.vico.core.scroll.InitialScroll
  * @property autoScrollAnimationSpec the [AnimationSpec] to use for automatic scrolling.
  */
 @Stable
-public class ChartScrollSpec<in Model : ChartEntryModel>(
+public class ChartScrollSpec(
     public val isScrollEnabled: Boolean,
     public val initialScroll: InitialScroll,
-    public val autoScrollCondition: AutoScrollCondition<Model>,
+    public val autoScrollCondition: AutoScrollCondition,
     public val autoScrollAnimationSpec: AnimationSpec<Float>,
 ) {
     /**
      * Performs an automatic scroll.
      */
     public suspend fun performAutoScroll(
-        model: Model,
-        oldModel: Model?,
+        model: CartesianChartModel,
+        oldModel: CartesianChartModel?,
         chartScrollState: ChartScrollState,
     ) {
         if (autoScrollCondition.shouldPerformAutoScroll(model, oldModel)) {
@@ -72,12 +72,12 @@ public class ChartScrollSpec<in Model : ChartEntryModel>(
  * Creates and remembers an instance of [ChartScrollSpec].
  */
 @Composable
-public fun <Model : ChartEntryModel> rememberChartScrollSpec(
+public fun rememberChartScrollSpec(
     isScrollEnabled: Boolean = true,
     initialScroll: InitialScroll = InitialScroll.Start,
-    autoScrollCondition: AutoScrollCondition<Model> = AutoScrollCondition.Never,
+    autoScrollCondition: AutoScrollCondition = AutoScrollCondition.Never,
     autoScrollAnimationSpec: AnimationSpec<Float> = spring(),
-): ChartScrollSpec<Model> =
+): ChartScrollSpec =
     remember(
         isScrollEnabled,
         initialScroll,
diff --git a/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/chart/scroll/ChartScrollState.kt b/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/chart/scroll/ChartScrollState.kt
index d96fe554f..f969da337 100644
--- a/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/chart/scroll/ChartScrollState.kt
+++ b/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/chart/scroll/ChartScrollState.kt
@@ -22,7 +22,7 @@ import androidx.compose.foundation.gestures.ScrollableState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.mutableFloatStateOf
 import androidx.compose.runtime.remember
-import com.patrykandpatrick.vico.compose.chart.Chart
+import com.patrykandpatrick.vico.compose.chart.CartesianChartHost
 import com.patrykandpatrick.vico.core.extension.rangeWith
 import com.patrykandpatrick.vico.core.scroll.InitialScroll
 import com.patrykandpatrick.vico.core.scroll.ScrollListener
@@ -30,7 +30,7 @@ import com.patrykandpatrick.vico.core.scroll.ScrollListenerHost
 import kotlin.math.abs
 
 /**
- * Houses information on a [Chart]’s scroll state. Allows for programmatic scrolling.
+ * Houses information on a [CartesianChartHost]’s scroll state. Allows for programmatic scrolling.
  */
 public class ChartScrollState : ScrollableState, ScrollListenerHost {
     private val _value = mutableFloatStateOf(0f)
diff --git a/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/component/shape/shader/DynamicShaders.kt b/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/component/shape/shader/DynamicShaders.kt
index 96dd7db6c..187633c69 100644
--- a/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/component/shape/shader/DynamicShaders.kt
+++ b/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/component/shape/shader/DynamicShaders.kt
@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+@file:Suppress("UnusedReceiverParameter")
+
 package com.patrykandpatrick.vico.compose.component.shape.shader
 
 import android.graphics.Shader
@@ -22,11 +24,9 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.toArgb
 import androidx.compose.ui.unit.Dp
 import com.patrykandpatrick.vico.core.component.Component
+import com.patrykandpatrick.vico.core.component.shape.shader.ColorShader
 import com.patrykandpatrick.vico.core.component.shape.shader.ComponentShader
-import com.patrykandpatrick.vico.core.component.shape.shader.DynamicShader
 import com.patrykandpatrick.vico.core.component.shape.shader.DynamicShaders
-import com.patrykandpatrick.vico.core.component.shape.shader.HorizontalSplitShader
-import com.patrykandpatrick.vico.core.component.shape.shader.SolidShader
 
 /**
  * Creates a [ComponentShader] out of the provided [component].
@@ -60,15 +60,6 @@ public fun DynamicShaders.fromComponent(
 public fun DynamicShaders.fromBrush(brush: Brush): BrushShader = BrushShader(brush)
 
 /**
- * Creates a [DynamicShader] that fills the area with a solid color.
- */
-public fun DynamicShaders.solid(color: Color): SolidShader = SolidShader(color.toArgb())
-
-/**
- * Creates a [DynamicShader] with split colors. The positive color is used for values above the zero line,
- * and the negative color is used for values below the zero line.
+ * Creates a [ColorShader].
  */
-public fun DynamicShaders.split(
-    positiveColor: Color,
-    negativeColor: Color,
-): HorizontalSplitShader.Solid = HorizontalSplitShader.Solid(positiveColor.toArgb(), negativeColor.toArgb())
+public fun DynamicShaders.color(color: Color): ColorShader = ColorShader(color.toArgb())
diff --git a/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/extension/ModifierExtensions.kt b/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/extension/ModifierExtensions.kt
index a3669b878..42b1b07b7 100644
--- a/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/extension/ModifierExtensions.kt
+++ b/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/extension/ModifierExtensions.kt
@@ -25,7 +25,7 @@ import androidx.compose.ui.input.pointer.PointerEventType
 import androidx.compose.ui.input.pointer.pointerInput
 import com.patrykandpatrick.vico.compose.chart.scroll.ChartScrollState
 import com.patrykandpatrick.vico.compose.gesture.OnZoom
-import com.patrykandpatrick.vico.core.model.Point
+import com.patrykandpatrick.vico.core.util.Point
 
 internal fun Modifier.chartTouchEvent(
     setTouchPoint: ((Point?) -> Unit)?,
diff --git a/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/layout/MeasureContextExtensions.kt b/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/layout/MeasureContextExtensions.kt
index fd30a8f1b..921d6a5fc 100644
--- a/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/layout/MeasureContextExtensions.kt
+++ b/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/layout/MeasureContextExtensions.kt
@@ -22,11 +22,12 @@ import androidx.compose.runtime.remember
 import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.platform.LocalLayoutDirection
 import androidx.compose.ui.unit.LayoutDirection
+import com.patrykandpatrick.vico.core.chart.CartesianChart
 import com.patrykandpatrick.vico.core.chart.layout.HorizontalLayout
 import com.patrykandpatrick.vico.core.chart.values.ChartValues
-import com.patrykandpatrick.vico.core.chart.values.ChartValuesProvider
 import com.patrykandpatrick.vico.core.context.MeasureContext
 import com.patrykandpatrick.vico.core.context.MutableMeasureContext
+import com.patrykandpatrick.vico.core.model.CartesianChartModel
 
 /**
  * The anonymous implementation of the [MeasureContext].
@@ -35,7 +36,7 @@ import com.patrykandpatrick.vico.core.context.MutableMeasureContext
  * @param canvasBounds the bounds of the canvas that will be used to draw the chart and its components.
  * @param horizontalLayout defines how the chart’s content is positioned horizontally.
  * @param spToPx converts dimensions from sp to px.
- * @param chartValuesProvider provides the chart’s [ChartValues] instances.
+ * @param chartValues houses the [CartesianChart]’s [CartesianChartModel] and _x_ and _y_ ranges.
  */
 @Composable
 public fun getMeasureContext(
@@ -43,7 +44,7 @@ public fun getMeasureContext(
     canvasBounds: RectF,
     horizontalLayout: HorizontalLayout,
     spToPx: (Float) -> Float,
-    chartValuesProvider: ChartValuesProvider,
+    chartValues: ChartValues,
 ): MutableMeasureContext =
     remember {
         MutableMeasureContext(
@@ -51,7 +52,7 @@ public fun getMeasureContext(
             density = 0f,
             isLtr = true,
             spToPx = spToPx,
-            chartValuesProvider = chartValuesProvider,
+            chartValues = chartValues,
         )
     }.apply {
         this.density = LocalDensity.current.density
@@ -59,5 +60,5 @@ public fun getMeasureContext(
         this.isHorizontalScrollEnabled = isHorizontalScrollEnabled
         this.horizontalLayout = horizontalLayout
         this.spToPx = spToPx
-        this.chartValuesProvider = chartValuesProvider
+        this.chartValues = chartValues
     }
diff --git a/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/chart/entry/ChartEntryModelExtensions.kt b/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/model/ChartEntryModelExtensions.kt
similarity index 71%
rename from vico/compose/src/main/java/com/patrykandpatrick/vico/compose/chart/entry/ChartEntryModelExtensions.kt
rename to vico/compose/src/main/java/com/patrykandpatrick/vico/compose/model/ChartEntryModelExtensions.kt
index d95014194..81c95a29a 100644
--- a/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/chart/entry/ChartEntryModelExtensions.kt
+++ b/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/model/ChartEntryModelExtensions.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.patrykandpatrick.vico.compose.chart.entry
+package com.patrykandpatrick.vico.compose.model
 
 import androidx.compose.animation.core.AnimationSpec
 import androidx.compose.animation.core.animate
@@ -25,16 +25,16 @@ import androidx.compose.runtime.State
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.platform.LocalInspectionMode
-import com.patrykandpatrick.vico.compose.state.ChartEntryModelWrapper
-import com.patrykandpatrick.vico.compose.state.ChartEntryModelWrapperState
+import com.patrykandpatrick.vico.compose.state.CartesianChartModelWrapper
+import com.patrykandpatrick.vico.compose.state.CartesianChartModelWrapperState
 import com.patrykandpatrick.vico.core.Animation
-import com.patrykandpatrick.vico.core.chart.Chart
-import com.patrykandpatrick.vico.core.chart.values.ChartValuesManager
-import com.patrykandpatrick.vico.core.chart.values.ChartValuesProvider
-import com.patrykandpatrick.vico.core.chart.values.toChartValuesProvider
-import com.patrykandpatrick.vico.core.entry.ChartEntryModel
-import com.patrykandpatrick.vico.core.entry.ChartModelProducer
-import com.patrykandpatrick.vico.core.entry.diff.MutableExtraStore
+import com.patrykandpatrick.vico.core.chart.CartesianChart
+import com.patrykandpatrick.vico.core.chart.values.ChartValues
+import com.patrykandpatrick.vico.core.chart.values.MutableChartValues
+import com.patrykandpatrick.vico.core.chart.values.toImmutable
+import com.patrykandpatrick.vico.core.model.CartesianChartModel
+import com.patrykandpatrick.vico.core.model.CartesianChartModelProducer
+import com.patrykandpatrick.vico.core.model.MutableExtraStore
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
@@ -50,22 +50,19 @@ import kotlinx.coroutines.runBlocking
 public val defaultDiffAnimationSpec: AnimationSpec<Float> = tween(durationMillis = Animation.DIFF_DURATION)
 
 /**
- * Observes the data provided by this [ChartModelProducer] and launches an animation for each [ChartEntryModel] update.
- *
- * @see ChartModelProducer
+ * Observes the data provided by this [CartesianChartModelProducer] and launches an animation for each update.
  */
 @Composable
-public fun <Model : ChartEntryModel> ChartModelProducer<Model>.collectAsState(
-    chart: Chart<Model>,
+public fun CartesianChartModelProducer.collectAsState(
+    chart: CartesianChart,
     producerKey: Any,
     animationSpec: AnimationSpec<Float>? = defaultDiffAnimationSpec,
     runInitialAnimation: Boolean = true,
-    chartValuesManager: ChartValuesManager,
-    getXStep: ((Model) -> Float)?,
+    mutableChartValues: MutableChartValues,
+    getXStep: ((CartesianChartModel) -> Float)?,
     dispatcher: CoroutineDispatcher = Dispatchers.Default,
-): State<ChartEntryModelWrapper<Model>> {
-    val chartEntryModelWrapperState = remember(chart, producerKey) { ChartEntryModelWrapperState<Model>() }
-    val modelTransformerProvider = remember(chart) { chart.modelTransformerProvider }
+): State<CartesianChartModelWrapper> {
+    val modelWrapperState = remember(chart, producerKey) { CartesianChartModelWrapperState() }
     val extraStore = remember(chart) { MutableExtraStore() }
     val scope = rememberCoroutineScope()
     val isInPreview = LocalInspectionMode.current
@@ -75,10 +72,10 @@ public fun <Model : ChartEntryModel> ChartModelProducer<Model>.collectAsState(
         var finalAnimationFrameJob: Job? = null
         var isAnimationRunning: Boolean
         var isAnimationFrameGenerationRunning = false
-        var chartValuesProvider: ChartValuesProvider = ChartValuesProvider.Empty
+        var chartValues: ChartValues = ChartValues.Empty
         val startAnimation: (transformModel: suspend (key: Any, fraction: Float) -> Unit) -> Unit = { transformModel ->
             if (animationSpec != null && !isInPreview &&
-                (chartEntryModelWrapperState.value.chartEntryModel != null || runInitialAnimation)
+                (modelWrapperState.value.model != null || runInitialAnimation)
             ) {
                 isAnimationRunning = true
                 mainAnimationJob =
@@ -129,20 +126,20 @@ public fun <Model : ChartEntryModel> ChartModelProducer<Model>.collectAsState(
                     isAnimationFrameGenerationRunning = false
                 },
                 startAnimation = startAnimation,
-                getOldModel = { chartEntryModelWrapperState.value.chartEntryModel },
-                modelTransformerProvider = modelTransformerProvider,
+                prepareForTransformation = chart::prepareForTransformation,
+                transform = chart::transform,
                 extraStore = extraStore,
                 updateChartValues = { model ->
-                    chartValuesManager.resetChartValues()
+                    mutableChartValues.reset()
                     if (model != null) {
-                        chart.updateChartValues(chartValuesManager, model, getXStep?.invoke(model))
-                        chartValuesManager.toChartValuesProvider()
+                        chart.updateChartValues(mutableChartValues, model, getXStep?.invoke(model))
+                        mutableChartValues.toImmutable()
                     } else {
-                        ChartValuesProvider.Empty
-                    }.also { provider -> chartValuesProvider = provider }
+                        ChartValues.Empty
+                    }.also { values -> chartValues = values }
                 },
-            ) { chartEntryModel ->
-                chartEntryModelWrapperState.set(chartEntryModel, chartValuesProvider)
+            ) { model ->
+                modelWrapperState.set(model, chartValues)
             }
         }
         onDispose {
@@ -152,5 +149,5 @@ public fun <Model : ChartEntryModel> ChartModelProducer<Model>.collectAsState(
             unregisterFromUpdates(chart)
         }
     }
-    return chartEntryModelWrapperState
+    return modelWrapperState
 }
diff --git a/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/state/CartesianChartModelWrapper.kt b/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/state/CartesianChartModelWrapper.kt
new file mode 100644
index 000000000..0c787d7ea
--- /dev/null
+++ b/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/state/CartesianChartModelWrapper.kt
@@ -0,0 +1,67 @@
+/*
+ * Copyright 2023 by Patryk Goworowski and Patrick Michalik.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.patrykandpatrick.vico.compose.state
+
+import androidx.compose.runtime.Immutable
+import androidx.compose.runtime.State
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.setValue
+import com.patrykandpatrick.vico.core.chart.values.ChartValues
+import com.patrykandpatrick.vico.core.model.CartesianChartModel
+
+/**
+ * Holds a chart’s current [CartesianChartModel] ([model]), previous [CartesianChartModel] ([previousModel]), and
+ * [ChartValues] ([chartValues]).
+ */
+@Immutable
+public class CartesianChartModelWrapper(
+    public val model: CartesianChartModel? = null,
+    public val previousModel: CartesianChartModel? = null,
+    public val chartValues: ChartValues = ChartValues.Empty,
+)
+
+/**
+ * Returns [CartesianChartModelWrapper.model].
+ */
+public operator fun CartesianChartModelWrapper.component1(): CartesianChartModel? = model
+
+/**
+ * Returns [CartesianChartModelWrapper.previousModel].
+ */
+public operator fun CartesianChartModelWrapper.component2(): CartesianChartModel? = previousModel
+
+/**
+ * Returns [CartesianChartModelWrapper.chartValues].
+ */
+public operator fun CartesianChartModelWrapper.component3(): ChartValues = chartValues
+
+internal class CartesianChartModelWrapperState : State<CartesianChartModelWrapper> {
+    private var previousModel: CartesianChartModel? = null
+
+    override var value by mutableStateOf(CartesianChartModelWrapper())
+        private set
+
+    fun set(
+        model: CartesianChartModel?,
+        chartValues: ChartValues,
+    ) {
+        val currentModel = value.model
+        if (model?.id != currentModel?.id) previousModel = currentModel
+        value = CartesianChartModelWrapper(model, previousModel, chartValues)
+    }
+}
diff --git a/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/state/ChartEntryModelWrapper.kt b/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/state/ChartEntryModelWrapper.kt
deleted file mode 100644
index ea5578c15..000000000
--- a/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/state/ChartEntryModelWrapper.kt
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright 2023 by Patryk Goworowski and Patrick Michalik.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.patrykandpatrick.vico.compose.state
-
-import androidx.compose.runtime.Immutable
-import androidx.compose.runtime.State
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.setValue
-import com.patrykandpatrick.vico.core.chart.values.ChartValuesProvider
-import com.patrykandpatrick.vico.core.entry.ChartEntryModel
-
-/**
- * Holds a chart’s current [ChartEntryModel] ([chartEntryModel]), previous [ChartEntryModel]
- * ([previousChartEntryModel]), and [ChartValuesProvider] ([chartValuesProvider]).
- */
-@Immutable
-public class ChartEntryModelWrapper<T : ChartEntryModel>(
-    public val chartEntryModel: T? = null,
-    public val previousChartEntryModel: T? = null,
-    public val chartValuesProvider: ChartValuesProvider = ChartValuesProvider.Empty,
-)
-
-/**
- * Returns [ChartEntryModelWrapper.chartEntryModel].
- */
-public operator fun <T : ChartEntryModel> ChartEntryModelWrapper<T>.component1(): T? = chartEntryModel
-
-/**
- * Returns [ChartEntryModelWrapper.previousChartEntryModel].
- */
-public operator fun <T : ChartEntryModel> ChartEntryModelWrapper<T>.component2(): T? = previousChartEntryModel
-
-/**
- * Returns [ChartEntryModelWrapper.chartValuesProvider].
- */
-public operator fun <T : ChartEntryModel> ChartEntryModelWrapper<T>.component3(): ChartValuesProvider =
-    chartValuesProvider
-
-internal class ChartEntryModelWrapperState<T : ChartEntryModel> : State<ChartEntryModelWrapper<T>> {
-    private var previousChartEntryModel: T? = null
-
-    override var value by mutableStateOf<ChartEntryModelWrapper<T>>(ChartEntryModelWrapper())
-        private set
-
-    fun set(
-        chartEntryModel: T?,
-        chartValuesProvider: ChartValuesProvider,
-    ) {
-        val currentChartEntryModel = value.chartEntryModel
-        if (chartEntryModel?.id != currentChartEntryModel?.id) previousChartEntryModel = currentChartEntryModel
-        value = ChartEntryModelWrapper(chartEntryModel, previousChartEntryModel, chartValuesProvider)
-    }
-}
diff --git a/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/style/ChartStyle.kt b/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/style/ChartStyle.kt
index eeebfa77f..7b211acac 100644
--- a/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/style/ChartStyle.kt
+++ b/vico/compose/src/main/java/com/patrykandpatrick/vico/compose/style/ChartStyle.kt
@@ -31,16 +31,18 @@ import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.TextUnit
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import com.patrykandpatrick.vico.compose.chart.line.lineSpec
+import com.patrykandpatrick.vico.compose.chart.layer.lineSpec
 import com.patrykandpatrick.vico.compose.component.shape.dashedShape
-import com.patrykandpatrick.vico.compose.component.shape.shader.solid
+import com.patrykandpatrick.vico.compose.component.shape.shader.color
 import com.patrykandpatrick.vico.core.DefaultColors
 import com.patrykandpatrick.vico.core.DefaultDimens
 import com.patrykandpatrick.vico.core.axis.AxisPosition
 import com.patrykandpatrick.vico.core.axis.formatter.AxisValueFormatter
 import com.patrykandpatrick.vico.core.axis.formatter.DecimalFormatAxisValueFormatter
-import com.patrykandpatrick.vico.core.chart.column.ColumnChart.MergeMode
-import com.patrykandpatrick.vico.core.chart.line.LineChart.LineSpec
+import com.patrykandpatrick.vico.core.chart.layer.ColumnCartesianLayer
+import com.patrykandpatrick.vico.core.chart.layer.ColumnCartesianLayer.MergeMode
+import com.patrykandpatrick.vico.core.chart.layer.LineCartesianLayer
+import com.patrykandpatrick.vico.core.chart.layer.LineCartesianLayer.LineSpec
 import com.patrykandpatrick.vico.core.component.shape.LineComponent
 import com.patrykandpatrick.vico.core.component.shape.Shape
 import com.patrykandpatrick.vico.core.component.shape.ShapeComponent
@@ -55,15 +57,15 @@ import com.patrykandpatrick.vico.core.formatter.ValueFormatter
  * Defines the appearance of charts.
  *
  * @property axis the appearance of chart axes.
- * @property columnChart the appearance of column charts.
- * @property lineChart the appearance of line charts.
+ * @property columnLayer the appearance of [ColumnCartesianLayer]s.
+ * @property lineLayer the appearance of [LineCartesianLayer]s.
  * @property marker the appearance of chart markers.
  * @property elevationOverlayColor the color used for elevation overlays.
  */
 public data class ChartStyle(
     val axis: Axis,
-    val columnChart: ColumnChart,
-    val lineChart: LineChart,
+    val columnLayer: ColumnLayer,
+    val lineLayer: LineLayer,
     val marker: Marker,
     val elevationOverlayColor: Color,
 ) {
@@ -126,21 +128,21 @@ public data class ChartStyle(
     )
 
     /**
-     * Defines the appearance of column charts.
+     * Defines the appearance of [ColumnCartesianLayer]s.
      *
      * @property columns the [LineComponent] instances to use for columns. This list is iterated through as many times
      * as necessary for each column collection. If the list contains a single element, all columns have the same
      * appearance.
      * @property outsideSpacing the distance between neighboring column collections.
      * @property innerSpacing the distance between neighboring grouped columns.
-     * @property mergeMode defines the way multiple columns are rendered in [ColumnChart]s.
+     * @property mergeMode defines the way multiple columns are rendered in [ColumnLayer]s.
      * @property dataLabel an optional [TextComponent] to use for data labels.
      * @property dataLabelVerticalPosition the vertical position of data labels relative to the top of their
      * respective columns.
      * @property dataLabelValueFormatter the [ValueFormatter] to use for data labels.
      * @property dataLabelRotationDegrees the rotation of data labels in degrees.
      */
-    public data class ColumnChart(
+    public data class ColumnLayer(
         val columns: List<LineComponent>,
         val outsideSpacing: Dp = DefaultDimens.COLUMN_OUTSIDE_SPACING.dp,
         val innerSpacing: Dp = DefaultDimens.COLUMN_INSIDE_SPACING.dp,
@@ -152,13 +154,13 @@ public data class ChartStyle(
     )
 
     /**
-     * Defines the appearance of line charts.
+     * Defines the appearance of [LineCartesianLayer]s.
      *
      * @param lines the [LineSpec]s to use for the lines. This list is iterated through as many times as there are
      * lines.
      * @property spacing the spacing between points.
      */
-    public data class LineChart(
+    public data class LineLayer(
         val lines: List<LineSpec>,
         val spacing: Dp = DefaultDimens.POINT_SPACING.dp,
     )
@@ -195,8 +197,8 @@ public data class ChartStyle(
                         axisGuidelineColor = axisGuidelineColor,
                         axisLineColor = axisLineColor,
                     ),
-                columnChart =
-                    ColumnChart(
+                columnLayer =
+                    ColumnLayer(
                         columns =
                             entityColors.map { entityColor ->
                                 LineComponent(
@@ -209,12 +211,12 @@ public data class ChartStyle(
                                 )
                             },
                     ),
-                lineChart =
-                    LineChart(
+                lineLayer =
+                    LineLayer(
                         lines =
                             entityColors.map { entityColor ->
                                 lineSpec(
-                                    lineShader = DynamicShaders.solid(entityColor),
+                                    shader = DynamicShaders.color(entityColor),
                                 )
                             },
                     ),
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/axis/AxisItemPlacer.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/axis/AxisItemPlacer.kt
index 5fa26d39c..4d88ac27c 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/axis/AxisItemPlacer.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/axis/AxisItemPlacer.kt
@@ -21,7 +21,7 @@ import com.patrykandpatrick.vico.core.axis.horizontal.DefaultHorizontalAxisItemP
 import com.patrykandpatrick.vico.core.axis.horizontal.HorizontalAxis
 import com.patrykandpatrick.vico.core.axis.vertical.DefaultVerticalAxisItemPlacer
 import com.patrykandpatrick.vico.core.axis.vertical.VerticalAxis
-import com.patrykandpatrick.vico.core.chart.Chart
+import com.patrykandpatrick.vico.core.chart.CartesianChart
 import com.patrykandpatrick.vico.core.chart.dimensions.HorizontalDimensions
 import com.patrykandpatrick.vico.core.chart.draw.ChartDrawContext
 import com.patrykandpatrick.vico.core.chart.layout.HorizontalLayout
@@ -129,9 +129,10 @@ public interface AxisItemPlacer {
      */
     public interface Vertical {
         /**
-         * Returns a boolean indicating whether to shift the lines whose _y_ values are equal to [ChartValues.maxY], if
-         * such lines are present, such that they’re immediately above the [Chart]’s bounds. If the chart has a top
-         * axis, the shifted tick will then be aligned with this axis, and the shifted guideline will be hidden.
+         * Returns a boolean indicating whether to shift the lines whose _y_ values are equal to
+         * [ChartValues.YRange.maxY], if such lines are present, such that they’re immediately above the
+         * [CartesianChart]’s bounds. If the chart has a top axis, the shifted tick will then be aligned with this axis,
+         * and the shifted guideline will be hidden.
          */
         public fun getShiftTopLines(chartDrawContext: ChartDrawContext): Boolean = true
 
@@ -199,9 +200,9 @@ public interface AxisItemPlacer {
              * Creates a base [AxisItemPlacer.Vertical] implementation. [maxItemCount] is the maximum number of labels
              * (and their corresponding line pairs) to be displayed. The actual item count is the greatest number
              * smaller than or equal to [maxItemCount] for which no overlaps occur. [shiftTopLines] defines whether
-             * to shift the lines whose _y_ values are equal to [ChartValues.maxY], if such lines are present, such that
-             * they’re immediately above the [Chart]’s bounds. If the chart has a top axis, the shifted tick will then
-             * be aligned with this axis, and the shifted guideline will be hidden.
+             * to shift the lines whose _y_ values are equal to [ChartValues.YRange.maxY], if such lines are present,
+             * such that they’re immediately above the [CartesianChart]’s bounds. If the chart has a top axis, the
+             * shifted tick will then be aligned with this axis, and the shifted guideline will be hidden.
              */
             public fun default(
                 maxItemCount: Int = DEF_LABEL_COUNT,
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/axis/AxisManager.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/axis/AxisManager.kt
index 05973bdc6..eb282471f 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/axis/AxisManager.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/axis/AxisManager.kt
@@ -17,7 +17,7 @@
 package com.patrykandpatrick.vico.core.axis
 
 import android.graphics.RectF
-import com.patrykandpatrick.vico.core.chart.Chart
+import com.patrykandpatrick.vico.core.chart.CartesianChart
 import com.patrykandpatrick.vico.core.chart.draw.ChartDrawContext
 import com.patrykandpatrick.vico.core.chart.insets.ChartInsetter
 import com.patrykandpatrick.vico.core.chart.insets.Insets
@@ -194,8 +194,8 @@ public open class AxisManager {
     }
 
     /**
-     * Called before the associated [Chart] is drawn. This forwards a call to all [Axis] subclasses that causes them to
-     * be drawn behind the chart.
+     * Called before the associated [CartesianChart] is drawn. This forwards a call to all [Axis] subclasses that causes
+     * them to be drawn behind the chart.
      *
      * @param context holds the information necessary to draw the axes.
      *
@@ -208,8 +208,8 @@ public open class AxisManager {
     }
 
     /**
-     * Called after the associated [Chart] is drawn. This forwards a call to all [Axis] subclasses that causes them to
-     * be drawn above the chart.
+     * Called after the associated [CartesianChart] is drawn. This forwards a call to all [Axis] subclasses that causes
+     * them to be drawn above the chart.
      *
      * @param context holds the information necessary to draw the axes.
      *
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/axis/AxisPosition.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/axis/AxisPosition.kt
index 2e8826b22..068f58ebc 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/axis/AxisPosition.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/axis/AxisPosition.kt
@@ -16,72 +16,72 @@
 
 package com.patrykandpatrick.vico.core.axis
 
-import com.patrykandpatrick.vico.core.chart.Chart
+import com.patrykandpatrick.vico.core.chart.CartesianChart
 
 /**
- * Defines the position of an axis relative to its [Chart].
+ * Defines the position of an axis relative to its [CartesianChart].
  */
 public sealed class AxisPosition {
     /**
-     * Whether the axis is at the top of its [Chart].
+     * Whether the axis is at the top of its [CartesianChart].
      */
     public val isTop: Boolean
         get() = this is Horizontal.Top
 
     /**
-     * Whether the axis is at the bottom of its [Chart].
+     * Whether the axis is at the bottom of its [CartesianChart].
      */
     public val isBottom: Boolean
         get() = this is Horizontal.Bottom
 
     /**
-     * Whether the axis is at the start of its [Chart].
+     * Whether the axis is at the start of its [CartesianChart].
      */
     public val isStart: Boolean
         get() = this is Vertical.Start
 
     /**
-     * Whether the axis is at the end of its [Chart].
+     * Whether the axis is at the end of its [CartesianChart].
      */
     public val isEnd: Boolean
         get() = this is Vertical.End
 
     /**
-     * Whether the axis is on the left of its [Chart]. The layout direction is considered here.
+     * Whether the axis is on the left of its [CartesianChart]. The layout direction is considered here.
      */
     public fun isLeft(isLtr: Boolean): Boolean = this is Vertical.Start && isLtr || this is Vertical.End && isLtr.not()
 
     /**
-     * Whether the axis is on the right of its [Chart]. The layout direction is considered here.
+     * Whether the axis is on the right of its [CartesianChart]. The layout direction is considered here.
      */
     public fun isRight(isLtr: Boolean): Boolean = this is Vertical.End && isLtr || this is Vertical.Start && isLtr.not()
 
     /**
-     * Defines the position of a horizontal axis relative to its [Chart].
+     * Defines the position of a horizontal axis relative to its [CartesianChart].
      */
     public sealed class Horizontal : AxisPosition() {
         /**
-         * The horizontal axis will be placed at the top of its [Chart].
+         * The horizontal axis will be placed at the top of its [CartesianChart].
          */
         public object Top : Horizontal()
 
         /**
-         * The horizontal axis will be placed at the bottom of its [Chart].
+         * The horizontal axis will be placed at the bottom of its [CartesianChart].
          */
         public object Bottom : Horizontal()
     }
 
     /**
-     * Defines the position of a vertical axis relative to its [Chart].
+     * Defines the position of a vertical axis relative to its [CartesianChart].
      */
     public sealed class Vertical : AxisPosition() {
         /**
-         * The vertical axis will be placed at the start of its [Chart].
+         * The vertical axis will be placed at the start of its [CartesianChart].
          */
         public object Start : Vertical()
 
         /**
-         * The vertical axis will be placed at the end of its [Chart].
+         * The vertical axis will be placed at the end of its [CartesianChart].
          */
         public object End : Vertical()
     }
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/axis/AxisRenderer.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/axis/AxisRenderer.kt
index f9c267cc6..adc64f274 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/axis/AxisRenderer.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/axis/AxisRenderer.kt
@@ -17,7 +17,7 @@
 package com.patrykandpatrick.vico.core.axis
 
 import android.graphics.RectF
-import com.patrykandpatrick.vico.core.chart.Chart
+import com.patrykandpatrick.vico.core.chart.CartesianChart
 import com.patrykandpatrick.vico.core.chart.dimensions.MutableHorizontalDimensions
 import com.patrykandpatrick.vico.core.chart.draw.ChartDrawContext
 import com.patrykandpatrick.vico.core.chart.insets.ChartInsetter
@@ -29,13 +29,13 @@ import com.patrykandpatrick.vico.core.dimensions.BoundsAware
  */
 public interface AxisRenderer<Position : AxisPosition> : BoundsAware, ChartInsetter {
     /**
-     * Defines the position of the axis relative to the [Chart].
+     * Defines the position of the axis relative to the [CartesianChart].
      */
     public val position: Position
 
     /**
-     * Called before the [Chart] is drawn. Implementations should rely on this function to draw themselves, unless they
-     * need to draw something above the [Chart].
+     * Called before the [CartesianChart] is drawn. Implementations should rely on this function to draw themselves,
+     * unless they need to draw something above the [CartesianChart].
      *
      * @param context holds the information needed to draw the axis.
      *
@@ -44,7 +44,8 @@ public interface AxisRenderer<Position : AxisPosition> : BoundsAware, ChartInset
     public fun drawBehindChart(context: ChartDrawContext)
 
     /**
-     * Called after the [Chart] is drawn. Implementations can use this function to draw content above the [Chart].
+     * Called after the [CartesianChart] is drawn. Implementations can use this function to draw content above the
+     * [CartesianChart].
      *
      * @param context holds the information needed to draw the axis.
      */
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/axis/horizontal/DefaultHorizontalAxisItemPlacer.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/axis/horizontal/DefaultHorizontalAxisItemPlacer.kt
index ab0a54784..b2b3fb40e 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/axis/horizontal/DefaultHorizontalAxisItemPlacer.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/axis/horizontal/DefaultHorizontalAxisItemPlacer.kt
@@ -35,68 +35,68 @@ internal class DefaultHorizontalAxisItemPlacer(
     override fun getAddFirstLabelPadding(context: MeasureContext) =
         context.horizontalLayout is HorizontalLayout.FullWidth && addExtremeLabelPadding && offset == 0
 
-    override fun getAddLastLabelPadding(context: MeasureContext): Boolean {
-        val chartValues = context.chartValuesProvider.getChartValues()
-        return context.horizontalLayout is HorizontalLayout.FullWidth && addExtremeLabelPadding &&
-            (chartValues.maxX - chartValues.minX - chartValues.xStep * offset) % (chartValues.xStep * spacing) == 0f
-    }
+    override fun getAddLastLabelPadding(context: MeasureContext): Boolean =
+        with(context) {
+            context.horizontalLayout is HorizontalLayout.FullWidth && addExtremeLabelPadding &&
+                (chartValues.maxX - chartValues.minX - chartValues.xStep * offset) % (chartValues.xStep * spacing) == 0f
+        }
 
     override fun getLabelValues(
         context: ChartDrawContext,
         visibleXRange: ClosedFloatingPointRange<Float>,
         fullXRange: ClosedFloatingPointRange<Float>,
     ): List<Float> {
-        val chartValues = context.chartValuesProvider.getChartValues()
-        val remainder = ((visibleXRange.start - chartValues.minX) / chartValues.xStep - offset) % spacing
-        val firstValue = visibleXRange.start + (spacing - remainder) % spacing * chartValues.xStep
-        val minXOffset = chartValues.minX % chartValues.xStep
-        val values = mutableListOf<Float>()
-        var multiplier = -LABEL_OVERFLOW_SIZE
-        var hasEndOverflow = false
-        while (true) {
-            var potentialValue = firstValue + multiplier++ * spacing * chartValues.xStep
-            potentialValue = chartValues.xStep * ((potentialValue - minXOffset) / chartValues.xStep).round + minXOffset
-            if (potentialValue < chartValues.minX || potentialValue == fullXRange.start) continue
-            if (potentialValue > chartValues.maxX || potentialValue == fullXRange.endInclusive) break
-            values += potentialValue
-            if (potentialValue > visibleXRange.endInclusive && hasEndOverflow.also { hasEndOverflow = true }) break
+        with(context) {
+            val remainder = ((visibleXRange.start - chartValues.minX) / chartValues.xStep - offset) % spacing
+            val firstValue = visibleXRange.start + (spacing - remainder) % spacing * chartValues.xStep
+            val minXOffset = chartValues.minX % chartValues.xStep
+            val values = mutableListOf<Float>()
+            var multiplier = -LABEL_OVERFLOW_SIZE
+            var hasEndOverflow = false
+            while (true) {
+                var potentialValue = firstValue + multiplier++ * spacing * chartValues.xStep
+                potentialValue = chartValues.xStep * ((potentialValue - minXOffset) / chartValues.xStep).round +
+                    minXOffset
+                if (potentialValue < chartValues.minX || potentialValue == fullXRange.start) continue
+                if (potentialValue > chartValues.maxX || potentialValue == fullXRange.endInclusive) break
+                values += potentialValue
+                if (potentialValue > visibleXRange.endInclusive && hasEndOverflow.also { hasEndOverflow = true }) break
+            }
+            return values
         }
-        return values
     }
 
     override fun getMeasuredLabelValues(
         context: MeasureContext,
         horizontalDimensions: HorizontalDimensions,
         fullXRange: ClosedFloatingPointRange<Float>,
-    ): List<Float> {
-        val chartValues = context.chartValuesProvider.getChartValues()
-        return listOf(chartValues.minX, (chartValues.minX + chartValues.maxX).half, chartValues.maxX)
-    }
+    ): List<Float> =
+        with(context) { listOf(chartValues.minX, (chartValues.minX + chartValues.maxX).half, chartValues.maxX) }
 
     override fun getLineValues(
         context: ChartDrawContext,
         visibleXRange: ClosedFloatingPointRange<Float>,
         fullXRange: ClosedFloatingPointRange<Float>,
-    ): List<Float>? {
-        val chartValues = context.chartValuesProvider.getChartValues()
-        return when (context.horizontalLayout) {
-            is HorizontalLayout.Segmented -> {
-                val remainder = (visibleXRange.start - fullXRange.start) % chartValues.xStep
-                val firstValue = visibleXRange.start + (chartValues.xStep - remainder) % chartValues.xStep
-                var multiplier = -TICK_OVERFLOW_SIZE
-                val values = mutableListOf<Float>()
-                while (true) {
-                    val potentialValue = firstValue + multiplier++ * chartValues.xStep
-                    if (potentialValue < fullXRange.start) continue
-                    if (potentialValue > fullXRange.endInclusive) break
-                    values += potentialValue
-                    if (potentialValue > visibleXRange.endInclusive) break
+    ): List<Float>? =
+        with(context) {
+            when (context.horizontalLayout) {
+                is HorizontalLayout.Segmented -> {
+                    val remainder = (visibleXRange.start - fullXRange.start) % chartValues.xStep
+                    val firstValue = visibleXRange.start + (chartValues.xStep - remainder) % chartValues.xStep
+                    var multiplier = -TICK_OVERFLOW_SIZE
+                    val values = mutableListOf<Float>()
+                    while (true) {
+                        val potentialValue = firstValue + multiplier++ * chartValues.xStep
+                        if (potentialValue < fullXRange.start) continue
+                        if (potentialValue > fullXRange.endInclusive) break
+                        values += potentialValue
+                        if (potentialValue > visibleXRange.endInclusive) break
+                    }
+                    values
                 }
-                values
+                is HorizontalLayout.FullWidth -> null
             }
-            is HorizontalLayout.FullWidth -> null
         }
-    }
 
     override fun getStartHorizontalAxisInset(
         context: MeasureContext,
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/axis/horizontal/HorizontalAxis.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/axis/horizontal/HorizontalAxis.kt
index 34fb6eeeb..91f39ec79 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/axis/horizontal/HorizontalAxis.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/axis/horizontal/HorizontalAxis.kt
@@ -58,7 +58,6 @@ public class HorizontalAxis<Position : AxisPosition.Horizontal>(
             val clipRestoreCount = canvas.save()
             val tickMarkTop = if (position.isBottom) bounds.top else bounds.bottom - axisThickness - tickLength
             val tickMarkBottom = tickMarkTop + axisThickness + tickLength
-            val chartValues = chartValuesProvider.getChartValues()
 
             canvas.clipRect(
                 bounds.left - itemPlacer.getStartHorizontalAxisInset(this, horizontalDimensions, tickThickness),
@@ -91,7 +90,8 @@ public class HorizontalAxis<Position : AxisPosition.Horizontal>(
 
                 label?.drawText(
                     context = context,
-                    text = valueFormatter.formatValue(x, chartValues),
+                    text =
+                        valueFormatter.formatValue(value = x, chartValues = chartValues, verticalAxisPosition = null),
                     textX = canvasX,
                     textY = textY,
                     verticalPosition = position.textVerticalPosition,
@@ -162,8 +162,6 @@ public class HorizontalAxis<Position : AxisPosition.Horizontal>(
         val clipRestoreCount = canvas.save()
         canvas.clipRect(chartBounds)
 
-        val chartValues = chartValuesProvider.getChartValues()
-
         if (lineValues == null) {
             labelValues.forEach { x ->
                 val canvasX =
@@ -206,14 +204,19 @@ public class HorizontalAxis<Position : AxisPosition.Horizontal>(
         context: MeasureContext,
         horizontalDimensions: MutableHorizontalDimensions,
     ) {
-        val chartValues = context.chartValuesProvider.getChartValues()
+        val chartValues = context.chartValues
         horizontalDimensions.ensureValuesAtLeast(
             unscalableStartPadding =
                 label
                     .takeIf { itemPlacer.getAddFirstLabelPadding(context) }
                     ?.getWidth(
                         context = context,
-                        text = valueFormatter.formatValue(chartValues.minX, chartValues),
+                        text =
+                            valueFormatter.formatValue(
+                                value = chartValues.minX,
+                                chartValues = chartValues,
+                                verticalAxisPosition = null,
+                            ),
                         pad = true,
                     )
                     ?.half
@@ -223,7 +226,12 @@ public class HorizontalAxis<Position : AxisPosition.Horizontal>(
                     .takeIf { itemPlacer.getAddLastLabelPadding(context) }
                     ?.getWidth(
                         context = context,
-                        text = valueFormatter.formatValue(chartValues.maxX, chartValues),
+                        text =
+                            valueFormatter.formatValue(
+                                value = chartValues.maxX,
+                                chartValues = chartValues,
+                                verticalAxisPosition = null,
+                            ),
                         pad = true,
                     )
                     ?.half
@@ -247,7 +255,6 @@ public class HorizontalAxis<Position : AxisPosition.Horizontal>(
         horizontalDimensions: HorizontalDimensions,
     ): ClosedFloatingPointRange<Float> =
         with(horizontalDimensions) {
-            val chartValues = chartValuesProvider.getChartValues()
             val start = chartValues.minX - startPadding / xSpacing * chartValues.xStep
             val end = chartValues.maxX + endPadding / xSpacing * chartValues.xStep
             start..end
@@ -258,7 +265,6 @@ public class HorizontalAxis<Position : AxisPosition.Horizontal>(
         horizontalDimensions: HorizontalDimensions,
     ): Float =
         with(context) {
-            val chartValues = chartValuesProvider.getChartValues()
             val fullXRange = getFullXRange(horizontalDimensions)
 
             when (val constraint = sizeConstraint) {
@@ -267,7 +273,13 @@ public class HorizontalAxis<Position : AxisPosition.Horizontal>(
                         label?.let { label ->
                             itemPlacer
                                 .getMeasuredLabelValues(this, horizontalDimensions, fullXRange)
-                                .map { valueFormatter.formatValue(it, chartValues) }
+                                .map { value ->
+                                    valueFormatter.formatValue(
+                                        value = value,
+                                        chartValues = chartValues,
+                                        verticalAxisPosition = null,
+                                    )
+                                }
                                 .maxOf { labelText ->
                                     label.getHeight(
                                         context = this,
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/axis/vertical/DefaultVerticalAxisItemPlacer.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/axis/vertical/DefaultVerticalAxisItemPlacer.kt
index 56e723c36..391875ac7 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/axis/vertical/DefaultVerticalAxisItemPlacer.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/axis/vertical/DefaultVerticalAxisItemPlacer.kt
@@ -48,11 +48,11 @@ internal class DefaultVerticalAxisItemPlacer(
         position: AxisPosition.Vertical,
     ): List<Float> {
         if (maxItemCount == 0) return emptyList()
-        val chartValues = context.chartValuesProvider.getChartValues(position)
-        return if (chartValues.minY * chartValues.maxY >= 0) {
-            getSimpleLabelValues(axisHeight, maxLabelHeight, chartValues)
+        val yRange = context.chartValues.getYRange(position)
+        return if (yRange.minY * yRange.maxY >= 0) {
+            getSimpleLabelValues(axisHeight, maxLabelHeight, yRange)
         } else {
-            getMixedLabelValues(axisHeight, maxLabelHeight, chartValues)
+            getMixedLabelValues(axisHeight, maxLabelHeight, yRange)
         }
     }
 
@@ -60,8 +60,8 @@ internal class DefaultVerticalAxisItemPlacer(
         context: MeasureContext,
         position: AxisPosition.Vertical,
     ): List<Float> {
-        val chartValues = context.chartValuesProvider.getChartValues(position)
-        return listOf(chartValues.minY, (chartValues.minY + chartValues.maxY).half, chartValues.maxY)
+        val yRange = context.chartValues.getYRange(position)
+        return listOf(yRange.minY, (yRange.minY + yRange.maxY).half, yRange.maxY)
     }
 
     override fun getTopVerticalAxisInset(
@@ -98,25 +98,25 @@ internal class DefaultVerticalAxisItemPlacer(
     private fun getSimpleLabelValues(
         axisHeight: Float,
         maxLabelHeight: Float,
-        chartValues: ChartValues,
+        yRange: ChartValues.YRange,
     ): List<Float> {
-        val values = mutableListOf(chartValues.minY)
+        val values = mutableListOf(yRange.minY)
         if (maxItemCount == 1) return values
         val extraItemCount = (axisHeight / maxLabelHeight).toInt().coerceAtMost(maxItemCount - 1)
-        val step = chartValues.lengthY / extraItemCount
-        repeat(extraItemCount) { values += chartValues.minY + (it + 1) * step }
+        val step = yRange.length / extraItemCount
+        repeat(extraItemCount) { values += yRange.minY + (it + 1) * step }
         return values
     }
 
     private fun getMixedLabelValues(
         axisHeight: Float,
         maxLabelHeight: Float,
-        chartValues: ChartValues,
+        yRange: ChartValues.YRange,
     ): List<Float> {
         val values = mutableListOf(0f)
         if (maxItemCount == 1) return values
-        val topHeight = chartValues.maxY / chartValues.lengthY * axisHeight
-        val bottomHeight = -chartValues.minY / chartValues.lengthY * axisHeight
+        val topHeight = yRange.maxY / yRange.length * axisHeight
+        val bottomHeight = -yRange.minY / yRange.length * axisHeight
         val maxTopItemCount = (maxItemCount - 1) * topHeight / axisHeight
         val maxBottomItemCount = (maxItemCount - 1) * bottomHeight / axisHeight
         val topItemCountByHeight = topHeight / maxLabelHeight
@@ -135,11 +135,11 @@ internal class DefaultVerticalAxisItemPlacer(
             }
         }
         if (topItemCount != 0) {
-            val step = chartValues.maxY / topItemCount
+            val step = yRange.maxY / topItemCount
             repeat(topItemCount) { values += (it + 1) * step }
         }
         if (bottomItemCount != 0) {
-            val step = chartValues.minY / bottomItemCount
+            val step = yRange.minY / bottomItemCount
             repeat(bottomItemCount) { values += (it + 1) * step }
         }
         return values
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/axis/vertical/VerticalAxis.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/axis/vertical/VerticalAxis.kt
index c4a04aa7d..9f152b4ca 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/axis/vertical/VerticalAxis.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/axis/vertical/VerticalAxis.kt
@@ -77,14 +77,14 @@ public class VerticalAxis<Position : AxisPosition.Vertical>(
     override fun drawBehindChart(context: ChartDrawContext): Unit =
         with(context) {
             var centerY: Float
-            val chartValues = chartValuesProvider.getChartValues(position)
+            val yRange = chartValues.getYRange(position)
             val maxLabelHeight = getMaxLabelHeight()
             val lineValues =
                 itemPlacer.getLineValues(this, bounds.height(), maxLabelHeight, position)
                     ?: itemPlacer.getLabelValues(this, bounds.height(), maxLabelHeight, position)
 
             lineValues.forEach { lineValue ->
-                centerY = bounds.bottom - bounds.height() * (lineValue - chartValues.minY) / chartValues.lengthY +
+                centerY = bounds.bottom - bounds.height() * (lineValue - yRange.minY) / yRange.length +
                     getLineCanvasYCorrection(guidelineThickness, lineValue)
 
                 guideline?.takeIf {
@@ -123,10 +123,10 @@ public class VerticalAxis<Position : AxisPosition.Vertical>(
             val tickRightX = tickLeftX + axisThickness + tickLength
             val labelX = if (areLabelsOutsideAtStartOrInsideAtEnd == isLtr) tickLeftX else tickRightX
             var tickCenterY: Float
-            val chartValues = chartValuesProvider.getChartValues(position)
+            val yRange = chartValues.getYRange(position)
 
             labelValues.forEach { labelValue ->
-                tickCenterY = bounds.bottom - bounds.height() * (labelValue - chartValues.minY) / chartValues.lengthY +
+                tickCenterY = bounds.bottom - bounds.height() * (labelValue - yRange.minY) / yRange.length +
                     getLineCanvasYCorrection(tickThickness, labelValue)
 
                 tick?.drawHorizontal(
@@ -139,7 +139,7 @@ public class VerticalAxis<Position : AxisPosition.Vertical>(
                 label ?: return@forEach
                 drawLabel(
                     label = label,
-                    labelText = valueFormatter.formatValue(labelValue, chartValues),
+                    labelText = valueFormatter.formatValue(labelValue, chartValues, position),
                     labelX = labelX,
                     tickCenterY = tickCenterY,
                 )
@@ -280,26 +280,27 @@ public class VerticalAxis<Position : AxisPosition.Vertical>(
 
     private fun MeasureContext.getMaxLabelHeight() =
         label?.let { label ->
-            val chartValues = chartValuesProvider.getChartValues(position)
             itemPlacer
                 .getHeightMeasurementLabelValues(this, position)
-                .maxOfOrNull { value -> label.getHeight(this, valueFormatter.formatValue(value, chartValues)) }
+                .maxOfOrNull { value ->
+                    label.getHeight(this, valueFormatter.formatValue(value, chartValues, position))
+                }
         }.orZero
 
     private fun MeasureContext.getMaxLabelWidth(axisHeight: Float) =
         label?.let { label ->
-            val chartValues = chartValuesProvider.getChartValues(position)
             itemPlacer
                 .getWidthMeasurementLabelValues(this, axisHeight, getMaxLabelHeight(), position)
-                .maxOfOrNull { value -> label.getWidth(this, valueFormatter.formatValue(value, chartValues)) }
+                .maxOfOrNull { value -> label.getWidth(this, valueFormatter.formatValue(value, chartValues, position)) }
         }.orZero
 
     private fun ChartDrawContext.getLineCanvasYCorrection(
         thickness: Float,
         y: Float,
-    ): Float {
-        val chartValues = chartValuesProvider.getChartValues(position)
-        return if (y == chartValues.maxY && itemPlacer.getShiftTopLines(this)) -thickness.half else thickness.half
+    ) = if (y == chartValues.getYRange(position).maxY && itemPlacer.getShiftTopLines(this)) {
+        -thickness.half
+    } else {
+        thickness.half
     }
 
     /**
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/BaseChart.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/BaseChart.kt
deleted file mode 100644
index 7ba2f07f9..000000000
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/BaseChart.kt
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
- * Copyright 2023 by Patryk Goworowski and Patrick Michalik.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.patrykandpatrick.vico.core.chart
-
-import android.graphics.RectF
-import com.patrykandpatrick.vico.core.chart.decoration.Decoration
-import com.patrykandpatrick.vico.core.chart.draw.ChartDrawContext
-import com.patrykandpatrick.vico.core.chart.insets.ChartInsetter
-import com.patrykandpatrick.vico.core.chart.insets.Insets
-import com.patrykandpatrick.vico.core.chart.values.AxisValuesOverrider
-import com.patrykandpatrick.vico.core.dimensions.BoundsAware
-import com.patrykandpatrick.vico.core.entry.ChartEntryModel
-import com.patrykandpatrick.vico.core.extension.getEntryModel
-import com.patrykandpatrick.vico.core.extension.inClip
-import com.patrykandpatrick.vico.core.extension.setAll
-import com.patrykandpatrick.vico.core.marker.Marker
-
-/**
- * A base implementation of [Chart].
- *
- * @see Chart
- */
-public abstract class BaseChart<in Model : ChartEntryModel> : Chart<Model>, BoundsAware {
-    private val decorations = ArrayList<Decoration>()
-
-    private val insets: Insets = Insets()
-
-    /**
-     * A [HashMap] that links x-axis values to [Marker]s.
-     */
-    protected val persistentMarkers: HashMap<Float, Marker> = HashMap()
-
-    override val bounds: RectF = RectF()
-
-    override val chartInsetters: Collection<ChartInsetter> = persistentMarkers.values
-
-    override var axisValuesOverrider: AxisValuesOverrider<@UnsafeVariance Model>? = null
-
-    override fun addDecoration(decoration: Decoration): Boolean = decorations.add(decoration)
-
-    override fun setDecorations(decorations: List<Decoration>) {
-        this.decorations.setAll(decorations)
-    }
-
-    override fun removeDecoration(decoration: Decoration): Boolean = decorations.remove(decoration)
-
-    override fun addPersistentMarker(
-        x: Float,
-        marker: Marker,
-    ) {
-        persistentMarkers[x] = marker
-    }
-
-    override fun setPersistentMarkers(markers: Map<Float, Marker>) {
-        persistentMarkers.setAll(markers)
-    }
-
-    override fun removePersistentMarker(x: Float) {
-        persistentMarkers.remove(x) != null
-    }
-
-    override fun drawScrollableContent(
-        context: ChartDrawContext,
-        model: Model,
-    ): Unit =
-        with(context) {
-            insets.clear()
-            getInsets(this, insets, horizontalDimensions)
-            drawChartInternal(context, model)
-        }
-
-    override fun drawNonScrollableContent(
-        context: ChartDrawContext,
-        model: Model,
-    ): Unit =
-        with(context) {
-            canvas.inClip(
-                left = bounds.left,
-                top = 0f,
-                right = bounds.right,
-                bottom = context.canvas.height.toFloat(),
-            ) {
-                drawDecorationAboveChart(context)
-            }
-            persistentMarkers.forEach { (x, marker) ->
-                entryLocationMap.getEntryModel(x)?.also { markerModel ->
-                    marker.draw(
-                        context = context,
-                        bounds = bounds,
-                        markedEntries = markerModel,
-                        chartValuesProvider = chartValuesProvider,
-                    )
-                }
-            }
-        }
-
-    /**
-     * An internal function that draws both [Decoration]s behind the chart and the chart itself in the clip bounds.
-     */
-    protected open fun drawChartInternal(
-        context: ChartDrawContext,
-        model: Model,
-    ): Unit =
-        with(context) {
-            canvas.inClip(
-                left = bounds.left - insets.getLeft(isLtr),
-                top = bounds.top - insets.top,
-                right = bounds.right + insets.getRight(isLtr),
-                bottom = bounds.bottom + insets.bottom,
-            ) {
-                drawDecorationBehindChart(context)
-                if (model.entries.isNotEmpty()) {
-                    drawChart(context, model)
-                }
-            }
-        }
-
-    protected abstract fun drawChart(
-        context: ChartDrawContext,
-        model: Model,
-    )
-
-    protected fun drawDecorationBehindChart(context: ChartDrawContext) {
-        decorations.forEach { line -> line.onDrawBehindChart(context, bounds) }
-    }
-
-    protected fun drawDecorationAboveChart(context: ChartDrawContext) {
-        decorations.forEach { line -> line.onDrawAboveChart(context, bounds) }
-    }
-}
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/CartesianChart.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/CartesianChart.kt
new file mode 100644
index 000000000..7fa0fe5d6
--- /dev/null
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/CartesianChart.kt
@@ -0,0 +1,309 @@
+/*
+ * Copyright 2023 by Patryk Goworowski and Patrick Michalik.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.patrykandpatrick.vico.core.chart
+
+import android.graphics.RectF
+import com.patrykandpatrick.vico.core.chart.decoration.Decoration
+import com.patrykandpatrick.vico.core.chart.dimensions.HorizontalDimensions
+import com.patrykandpatrick.vico.core.chart.dimensions.MutableHorizontalDimensions
+import com.patrykandpatrick.vico.core.chart.draw.ChartDrawContext
+import com.patrykandpatrick.vico.core.chart.insets.ChartInsetter
+import com.patrykandpatrick.vico.core.chart.insets.HorizontalInsets
+import com.patrykandpatrick.vico.core.chart.insets.Insets
+import com.patrykandpatrick.vico.core.chart.layer.CartesianLayer
+import com.patrykandpatrick.vico.core.chart.layer.ColumnCartesianLayer
+import com.patrykandpatrick.vico.core.chart.layer.LineCartesianLayer
+import com.patrykandpatrick.vico.core.chart.values.ChartValues
+import com.patrykandpatrick.vico.core.chart.values.MutableChartValues
+import com.patrykandpatrick.vico.core.context.MeasureContext
+import com.patrykandpatrick.vico.core.dimensions.BoundsAware
+import com.patrykandpatrick.vico.core.extension.getEntryModel
+import com.patrykandpatrick.vico.core.extension.inClip
+import com.patrykandpatrick.vico.core.extension.set
+import com.patrykandpatrick.vico.core.extension.setAll
+import com.patrykandpatrick.vico.core.extension.updateAll
+import com.patrykandpatrick.vico.core.marker.Marker
+import com.patrykandpatrick.vico.core.model.CartesianChartModel
+import com.patrykandpatrick.vico.core.model.CartesianLayerModel
+import com.patrykandpatrick.vico.core.model.MutableExtraStore
+import java.util.TreeMap
+
+/**
+ * A chart based on a Cartesian coordinate plane, composed of [CartesianLayer]s.
+ */
+public open class CartesianChart(layers: List<CartesianLayer<*>>) : BoundsAware, ChartInsetter {
+    private val decorations = mutableListOf<Decoration>()
+    private val persistentMarkers = mutableMapOf<Float, Marker>()
+    private val tempInsets = Insets()
+
+    private val drawingModelAndLayerConsumer =
+        object : ModelAndLayerConsumer {
+            lateinit var context: ChartDrawContext
+
+            override fun <T : CartesianLayerModel> invoke(
+                model: T?,
+                layer: CartesianLayer<T>,
+            ) {
+                layer.draw(context, model ?: return)
+                entryLocationMap.updateAll(layer.entryLocationMap)
+            }
+        }
+
+    private val horizontalDimensionUpdateModelAndLayerConsumer =
+        object : ModelAndLayerConsumer {
+            lateinit var context: MeasureContext
+            lateinit var horizontalDimensions: MutableHorizontalDimensions
+
+            override fun <T : CartesianLayerModel> invoke(
+                model: T?,
+                layer: CartesianLayer<T>,
+            ) {
+                layer.updateHorizontalDimensions(context, horizontalDimensions, model ?: return)
+            }
+        }
+
+    private val chartValueUpdateModelAndLayerConsumer =
+        object : ModelAndLayerConsumer {
+            lateinit var chartValues: MutableChartValues
+
+            override fun <T : CartesianLayerModel> invoke(
+                model: T?,
+                layer: CartesianLayer<T>,
+            ) {
+                layer.updateChartValues(chartValues, model ?: return)
+            }
+        }
+
+    private val transformationPreparationModelAndLayerConsumer =
+        object : ModelAndLayerConsumer {
+            lateinit var extraStore: MutableExtraStore
+            lateinit var chartValues: ChartValues
+
+            override fun <T : CartesianLayerModel> invoke(
+                model: T?,
+                layer: CartesianLayer<T>,
+            ) {
+                layer.prepareForTransformation(model, extraStore, chartValues)
+            }
+        }
+
+    /**
+     * The [CartesianLayer]s of which this [CartesianChart] is composed.
+     */
+    public val layers: List<CartesianLayer<*>> = layers.toList()
+
+    /**
+     * The [CartesianChart]’s [ChartInsetter]s (persistent [Marker]s).
+     */
+    public val chartInsetters: Collection<ChartInsetter> = persistentMarkers.values
+
+    /**
+     * Links _x_ values to [Marker.EntryModel]s.
+     */
+    public val entryLocationMap: TreeMap<Float, MutableList<Marker.EntryModel>> = TreeMap()
+
+    override val bounds: RectF = RectF()
+
+    public constructor(vararg layers: CartesianLayer<*>) : this(layers.toList())
+
+    override fun setBounds(
+        left: Number,
+        top: Number,
+        right: Number,
+        bottom: Number,
+    ) {
+        bounds.set(left, top, right, bottom)
+        layers.forEach { it.setBounds(left, top, right, bottom) }
+    }
+
+    /**
+     * Calls [Decoration.onDrawBehindChart] for each [Decoration] and draws the [CartesianChart].
+     */
+    public fun draw(
+        context: ChartDrawContext,
+        model: CartesianChartModel,
+    ) {
+        entryLocationMap.clear()
+        decorations.forEach { it.onDrawBehindChart(context, bounds) }
+        model.forEachWithLayer(drawingModelAndLayerConsumer.apply { this.context = context })
+    }
+
+    /**
+     * Calls [Decoration.onDrawAboveChart] for each [Decoration] and draws the persistent [Marker]s.
+     */
+    public fun drawOverlays(context: ChartDrawContext) {
+        with(context) {
+            canvas.inClip(
+                left = bounds.left,
+                top = 0f,
+                right = bounds.right,
+                bottom = context.canvas.height.toFloat(),
+            ) {
+                decorations.forEach { it.onDrawAboveChart(this, bounds) }
+            }
+            persistentMarkers.forEach { (x, marker) ->
+                entryLocationMap.getEntryModel(x)?.let { model ->
+                    marker.draw(context, bounds, model, chartValues)
+                }
+            }
+        }
+    }
+
+    /**
+     * Updates [horizontalDimensions] to match the [CartesianLayer]s’ dimensions.
+     */
+    public fun updateHorizontalDimensions(
+        context: MeasureContext,
+        horizontalDimensions: MutableHorizontalDimensions,
+        model: CartesianChartModel,
+    ) {
+        model.forEachWithLayer(
+            horizontalDimensionUpdateModelAndLayerConsumer.apply {
+                this.context = context
+                this.horizontalDimensions = horizontalDimensions
+            },
+        )
+    }
+
+    /**
+     * Updates [chartValues] in accordance with [model].
+     */
+    public fun updateChartValues(
+        chartValues: MutableChartValues,
+        model: CartesianChartModel,
+        xStep: Float?,
+    ) {
+        chartValues.update(xStep ?: model.xDeltaGcd, model)
+        model.forEachWithLayer(chartValueUpdateModelAndLayerConsumer.apply { this.chartValues = chartValues })
+    }
+
+    override fun getInsets(
+        context: MeasureContext,
+        outInsets: Insets,
+        horizontalDimensions: HorizontalDimensions,
+    ) {
+        tempInsets.clear()
+        layers.forEach { it.getInsets(context, tempInsets, horizontalDimensions) }
+        outInsets.setValuesIfGreater(tempInsets)
+    }
+
+    override fun getHorizontalInsets(
+        context: MeasureContext,
+        availableHeight: Float,
+        outInsets: HorizontalInsets,
+    ) {
+        tempInsets.clear()
+        layers.forEach { it.getHorizontalInsets(context, availableHeight, tempInsets) }
+        outInsets.setValuesIfGreater(start = tempInsets.start, end = tempInsets.end)
+    }
+
+    /**
+     * Prepares the [CartesianLayer]s for a difference animation.
+     */
+    public fun prepareForTransformation(
+        model: CartesianChartModel?,
+        extraStore: MutableExtraStore,
+        chartValues: ChartValues,
+    ) {
+        model
+            ?.forEachWithLayer(
+                transformationPreparationModelAndLayerConsumer.apply {
+                    this.extraStore = extraStore
+                    this.chartValues = chartValues
+                },
+            )
+            ?: layers.forEach { it.prepareForTransformation(null, extraStore, chartValues) }
+    }
+
+    /**
+     * Carries out the pending difference animation.
+     */
+    public suspend fun transform(
+        extraStore: MutableExtraStore,
+        fraction: Float,
+    ) {
+        layers.forEach { it.transform(extraStore, fraction) }
+    }
+
+    /**
+     * Adds the provided [Decoration].
+     */
+    public fun addDecoration(decoration: Decoration) {
+        decorations.add(decoration)
+    }
+
+    /**
+     * Removes all [Decoration]s and adds the provided ones.
+     */
+    public fun setDecorations(decorations: List<Decoration>) {
+        this.decorations.setAll(decorations)
+    }
+
+    /**
+     * Removes the specified [Decoration], provided that it’s present.
+     */
+    public fun removeDecoration(decoration: Decoration): Boolean = decorations.remove(decoration)
+
+    /**
+     * Adds the provided persistent [Marker] at [x].
+     */
+    public fun addPersistentMarker(
+        x: Float,
+        marker: Marker,
+    ) {
+        persistentMarkers[x] = marker
+    }
+
+    /**
+     * Removes all persistent [Marker]s and adds the provided ones.
+     */
+    public fun setPersistentMarkers(markers: Map<Float, Marker>) {
+        persistentMarkers.setAll(markers)
+    }
+
+    /**
+     * Removes the persistent [Marker] at [x], provided that there is such a [Marker].
+     */
+    public fun removePersistentMarker(x: Float): Boolean = persistentMarkers.remove(x) != null
+
+    protected fun CartesianChartModel.forEachWithLayer(consumer: ModelAndLayerConsumer) {
+        val freeModels = models.toMutableList()
+        layers.forEach { layer ->
+            when (layer) {
+                is ColumnCartesianLayer -> freeModels.consume(layer, consumer)
+                is LineCartesianLayer -> freeModels.consume(layer, consumer)
+                else -> throw IllegalArgumentException("Unexpected `CartesianLayer` implementation.")
+            }
+        }
+    }
+
+    private inline fun <reified T : CartesianLayerModel> MutableList<CartesianLayerModel>.consume(
+        layer: CartesianLayer<T>,
+        consumer: ModelAndLayerConsumer,
+    ) {
+        val model = filterIsInstance<T>().firstOrNull()
+        consumer(model, layer)
+        if (model != null) remove(model)
+    }
+
+    protected interface ModelAndLayerConsumer {
+        public operator fun <T : CartesianLayerModel> invoke(
+            model: T?,
+            layer: CartesianLayer<T>,
+        )
+    }
+}
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/Chart.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/Chart.kt
deleted file mode 100644
index 6d0f9fdd2..000000000
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/Chart.kt
+++ /dev/null
@@ -1,221 +0,0 @@
-/*
- * Copyright 2023 by Patryk Goworowski and Patrick Michalik.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.patrykandpatrick.vico.core.chart
-
-import com.patrykandpatrick.vico.core.chart.column.ColumnChart
-import com.patrykandpatrick.vico.core.chart.composed.ComposedChart
-import com.patrykandpatrick.vico.core.chart.decoration.Decoration
-import com.patrykandpatrick.vico.core.chart.dimensions.MutableHorizontalDimensions
-import com.patrykandpatrick.vico.core.chart.draw.ChartDrawContext
-import com.patrykandpatrick.vico.core.chart.insets.ChartInsetter
-import com.patrykandpatrick.vico.core.chart.line.LineChart
-import com.patrykandpatrick.vico.core.chart.values.AxisValuesOverrider
-import com.patrykandpatrick.vico.core.chart.values.ChartValues
-import com.patrykandpatrick.vico.core.chart.values.ChartValuesManager
-import com.patrykandpatrick.vico.core.chart.values.ChartValuesProvider
-import com.patrykandpatrick.vico.core.context.MeasureContext
-import com.patrykandpatrick.vico.core.dimensions.BoundsAware
-import com.patrykandpatrick.vico.core.entry.ChartEntryModel
-import com.patrykandpatrick.vico.core.entry.diff.DrawingModel
-import com.patrykandpatrick.vico.core.entry.diff.ExtraStore
-import com.patrykandpatrick.vico.core.entry.diff.MutableExtraStore
-import com.patrykandpatrick.vico.core.marker.Marker
-
-/**
- * Defines the minimal set of properties and functions required by other parts of the library to draw a chart.
- */
-public interface Chart<in Model> : BoundsAware, ChartInsetter {
-    /**
-     * Links x-axis values to [Marker.EntryModel]s. A [Marker.EntryModel] holds the data needed to draw a [Marker].
-     */
-    public val entryLocationMap: Map<Float, MutableList<Marker.EntryModel>>
-
-    /**
-     * A [Collection] of the [ChartInsetter]s that are part of this [Chart]. Each [ChartInsetter] can influence the
-     * final layout of the chart and its components.
-     *
-     * @see ChartInsetter
-     */
-    public val chartInsetters: Collection<ChartInsetter>
-
-    /**
-     * Overrides the minimum and maximum x-axis and y-axis values. In the case of [ColumnChart]s and [LineChart]s
-     * contained in [ComposedChart]s, these overrides can be applied to one vertical axis instead of both. Use
-     * [ColumnChart.targetVerticalAxisPosition] and [LineChart.targetVerticalAxisPosition] for this purpose.
-     */
-    public var axisValuesOverrider: AxisValuesOverrider<@UnsafeVariance Model>?
-
-    /**
-     * Responsible for drawing the chart itself and any decorations behind it.
-     *
-     * @param context holds the data needed to draw the [Chart].
-     * @param model holds data about the [Chart]’s entries.
-     *
-     * @see ChartDrawContext
-     */
-    public fun drawScrollableContent(
-        context: ChartDrawContext,
-        model: Model,
-    )
-
-    /**
-     * Responsible for drawing any decorations placed above the chart, as well as persistent markers.
-     *
-     * @param context holds the data needed to draw the [Chart].
-     * @param model holds data about the [Chart]’s entries.
-     *
-     * @see ChartDrawContext
-     */
-    public fun drawNonScrollableContent(
-        context: ChartDrawContext,
-        model: Model,
-    )
-
-    /**
-     * Adds a [Decoration] to this [Chart].
-     *
-     * @return `true` if the decoration was added successfully.
-     *
-     * @see Decoration
-     */
-    public fun addDecoration(decoration: Decoration): Boolean
-
-    /**
-     * Replaces the current list of decorations with the provided [decorations].
-     */
-    public fun setDecorations(decorations: List<Decoration>)
-
-    /**
-     * Removes a [Decoration] from this [Chart].
-     *
-     * @return `true` if the decoration was removed successfully.
-     *
-     * @see Decoration
-     */
-    public fun removeDecoration(decoration: Decoration): Boolean
-
-    /**
-     * Removes each [Decoration] from [decorations] from this [Chart].
-     *
-     * @return `true` if all decorations were removed successfully.
-     *
-     * @see removeDecoration
-     * @see Decoration
-     */
-    public fun removeDecorations(decorations: List<Decoration>): Boolean = decorations.all(::removeDecoration)
-
-    /**
-     * Adds a persistent [Marker] to this [Chart]. The [Marker] will be anchored to the given [x] value on the x-axis.
-     *
-     * @see Marker
-     */
-    public fun addPersistentMarker(
-        x: Float,
-        marker: Marker,
-    )
-
-    /**
-     * Replaces the current map of markers with the provided [markers].
-     *
-     * @see addPersistentMarker
-     * @see Marker
-     */
-    public fun setPersistentMarkers(markers: Map<Float, Marker>)
-
-    /**
-     * Removes a persistent [Marker] from this [Chart].
-     *
-     * @see Marker
-     */
-    public fun removePersistentMarker(x: Float)
-
-    /**
-     * Updates the chart’s [MutableHorizontalDimensions] instance.
-     */
-    public fun updateHorizontalDimensions(
-        context: MeasureContext,
-        horizontalDimensions: MutableHorizontalDimensions,
-        model: Model,
-    )
-
-    /**
-     * Updates the [ChartValues] stored in the provided [ChartValuesManager] instance to this [Chart]’s [ChartValues].
-     *
-     * @param chartValuesManager the [ChartValuesManager] whose properties will be updated.
-     * @param model holds data about the [Chart]’s entries.
-     * @param xStep the overridden _x_ step (or `null` if no override has occurred).
-     */
-    public fun updateChartValues(
-        chartValuesManager: ChartValuesManager,
-        model: Model,
-        xStep: Float?,
-    )
-
-    /**
-     * Provides the [Chart]’s [ModelTransformer].
-     */
-    public val modelTransformerProvider: ModelTransformerProvider
-
-    /**
-     * Provides a [Chart]’s [ModelTransformer].
-     */
-    public interface ModelTransformerProvider {
-        /**
-         * Returns the [ModelTransformer].
-         */
-        public fun <T : ChartEntryModel> getModelTransformer(): ModelTransformer<T>
-    }
-
-    /**
-     * Transforms [Model]s into [DrawingModel]s.
-     */
-    public abstract class ModelTransformer<in Model> {
-        /**
-         * Used for writing to and reading from the host’s [ExtraStore].
-         */
-        protected abstract val key: ExtraStore.Key<*>
-
-        /**
-         * Prepares the [Chart] for a difference animation.
-         */
-        public abstract fun prepareForTransformation(
-            oldModel: Model?,
-            newModel: Model?,
-            extraStore: MutableExtraStore,
-            chartValuesProvider: ChartValuesProvider,
-        )
-
-        /**
-         * Carries out the pending difference animation. [fraction] is the animation progress.
-         */
-        public abstract suspend fun transform(
-            extraStore: MutableExtraStore,
-            fraction: Float,
-        )
-    }
-}
-
-/**
- * Adds each [Decoration] from [decorations] to this [Chart].
- *
- * @return true if all decorations were added successfully.
- *
- * @see Chart.addDecoration
- * @see Decoration
- */
-public fun <Model> Chart<Model>.addDecorations(decorations: List<Decoration>): Boolean =
-    decorations.all(::addDecoration)
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/ChartExtensions.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/ChartExtensions.kt
deleted file mode 100644
index 638ab06dd..000000000
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/ChartExtensions.kt
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright 2023 by Patryk Goworowski and Patrick Michalik.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.patrykandpatrick.vico.core.chart
-
-import com.patrykandpatrick.vico.core.entry.ChartEntry
-import com.patrykandpatrick.vico.core.extension.updateList
-import com.patrykandpatrick.vico.core.marker.Marker
-import com.patrykandpatrick.vico.core.model.Point
-
-internal fun HashMap<Float, MutableList<Marker.EntryModel>>.put(
-    x: Float,
-    y: Float,
-    entry: ChartEntry,
-    color: Int,
-    index: Int,
-) {
-    updateList(x) {
-        add(
-            Marker.EntryModel(
-                location = Point(x = x, y = y),
-                entry = entry,
-                color = color,
-                index = index,
-            ),
-        )
-    }
-}
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/DefaultPointConnector.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/DefaultPointConnector.kt
index d861cd1c6..f1be6d531 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/DefaultPointConnector.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/DefaultPointConnector.kt
@@ -20,21 +20,19 @@ import android.graphics.Path
 import android.graphics.RectF
 import com.patrykandpatrick.vico.core.DefaultDimens
 import com.patrykandpatrick.vico.core.chart.dimensions.HorizontalDimensions
-import com.patrykandpatrick.vico.core.chart.line.LineChart
+import com.patrykandpatrick.vico.core.chart.layer.LineCartesianLayer
 import com.patrykandpatrick.vico.core.component.shape.extension.horizontalCubicTo
 import com.patrykandpatrick.vico.core.extension.half
 import kotlin.math.abs
 
 /**
- * The default implementation of [LineChart.LineSpec.PointConnector]. This uses cubic bezier curves.
+ * The default implementation of [LineCartesianLayer.LineSpec.PointConnector]. This uses cubic bezier curves.
  *
  * @property cubicStrength the strength of the cubic bezier curve between each point on the line.
- *
- * @see LineChart.LineSpec.PointConnector
  */
 public class DefaultPointConnector(
     private val cubicStrength: Float = DefaultDimens.CUBIC_STRENGTH,
-) : LineChart.LineSpec.PointConnector {
+) : LineCartesianLayer.LineSpec.PointConnector {
     public override fun connect(
         path: Path,
         prevX: Float,
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/EntryModelExtensions.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/EntryModelExtensions.kt
deleted file mode 100644
index b54fa27af..000000000
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/EntryModelExtensions.kt
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright 2023 by Patryk Goworowski and Patrick Michalik.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.patrykandpatrick.vico.core.chart
-
-import com.patrykandpatrick.vico.core.entry.ChartEntry
-
-/**
- * For each [ChartEntry] in the list such that [ChartEntry.x] belongs to the provided range, calls the [action] function
- * block with the [ChartEntry] as the block’s argument.
- */
-public inline fun List<ChartEntry>.forEachIn(
-    range: ClosedFloatingPointRange<Float>,
-    action: (ChartEntry) -> Unit,
-) {
-    forEach { if (it.x in range) action(it) }
-}
-
-/**
- * For each [ChartEntry] in the list such that [ChartEntry.x] belongs to the provided range, calls the [action] function
- * block with the [ChartEntry] and its index in the list as the block’s arguments.
- */
-public inline fun List<ChartEntry>.forEachInAbsolutelyIndexed(
-    range: ClosedFloatingPointRange<Float>,
-    action: (Int, ChartEntry) -> Unit,
-) {
-    var index = 0
-    forEach { entry ->
-        if (entry.x in range) action(index, entry)
-        index++
-    }
-}
-
-/**
- * For each [ChartEntry] in the list such that [ChartEntry.x] belongs to the provided range, calls the [action] function
- * block with the [ChartEntry], its index in the list, and the next [ChartEntry] in the filtered list as the block’s
- * arguments.
- */
-public inline fun List<ChartEntry>.forEachInAbsolutelyIndexed(
-    range: ClosedFloatingPointRange<Float>,
-    action: (Int, ChartEntry, ChartEntry?) -> Unit,
-) {
-    forEachInAbsolutelyIndexed(range) { index, entry ->
-        action(index, entry, getOrNull(index + 1)?.takeIf { it.x in range })
-    }
-}
-
-/**
- * For each [ChartEntry] in the list such that [ChartEntry.x] belongs to the provided range, calls the [action] function
- * block with the [ChartEntry] and its index in the filtered list as the block’s arguments.
- */
-public inline fun List<ChartEntry>.forEachInRelativelyIndexed(
-    range: ClosedFloatingPointRange<Float>,
-    action: (Int, ChartEntry) -> Unit,
-) {
-    var index = 0
-    forEachIn(range) { action(index++, it) }
-}
-
-/**
- * For each [ChartEntry] in the list such that [ChartEntry.x] belongs to the provided range, calls the [action] function
- * block with the [ChartEntry], its index in the filtered list, and the next [ChartEntry] in the filtered list as the
- * block’s arguments.
- */
-public inline fun List<ChartEntry>.forEachInRelativelyIndexed(
-    range: ClosedFloatingPointRange<Float>,
-    action: (Int, ChartEntry, ChartEntry?) -> Unit,
-) {
-    var relativeIndex = 0
-    forEachInAbsolutelyIndexed(range) { absoluteIndex, entry ->
-        action(relativeIndex++, entry, getOrNull(absoluteIndex + 1)?.takeIf { it.x in range })
-    }
-}
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/LineSpecExtensions.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/LineSpecExtensions.kt
index e1004f388..40e3b1984 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/LineSpecExtensions.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/LineSpecExtensions.kt
@@ -17,7 +17,7 @@
 package com.patrykandpatrick.vico.core.chart
 
 import android.graphics.Paint
-import com.patrykandpatrick.vico.core.chart.line.LineChart
+import com.patrykandpatrick.vico.core.chart.layer.LineCartesianLayer
 import com.patrykandpatrick.vico.core.component.Component
 import com.patrykandpatrick.vico.core.component.shape.shader.DynamicShader
 import com.patrykandpatrick.vico.core.component.text.TextComponent
@@ -25,26 +25,26 @@ import com.patrykandpatrick.vico.core.component.text.VerticalPosition
 import com.patrykandpatrick.vico.core.formatter.ValueFormatter
 
 /**
- * Creates a new [LineChart.LineSpec] based on this one, updating select properties.
+ * Creates a new [LineCartesianLayer.LineSpec] based on this one, updating select properties.
  */
-public fun LineChart.LineSpec.copy(
-    lineFill: DynamicShader = this.lineShader,
-    lineThicknessDp: Float = this.lineThicknessDp,
-    lineBackgroundFill: DynamicShader? = this.lineBackgroundShader,
-    lineCap: Paint.Cap = this.lineCap,
+public fun LineCartesianLayer.LineSpec.copy(
+    shader: DynamicShader = this.shader,
+    thicknessDp: Float = this.thicknessDp,
+    backgroundShader: DynamicShader? = this.backgroundShader,
+    cap: Paint.Cap = this.cap,
     point: Component? = this.point,
     pointSizeDp: Float = this.pointSizeDp,
     dataLabel: TextComponent? = this.dataLabel,
     dataLabelVerticalPosition: VerticalPosition = this.dataLabelVerticalPosition,
     dataLabelValueFormatter: ValueFormatter = this.dataLabelValueFormatter,
     dataLabelRotationDegrees: Float = this.dataLabelRotationDegrees,
-    pointConnector: LineChart.LineSpec.PointConnector = this.pointConnector,
-): LineChart.LineSpec =
-    LineChart.LineSpec(
-        lineShader = lineFill,
-        lineThicknessDp = lineThicknessDp,
-        lineBackgroundShader = lineBackgroundFill,
-        lineCap = lineCap,
+    pointConnector: LineCartesianLayer.LineSpec.PointConnector = this.pointConnector,
+): LineCartesianLayer.LineSpec =
+    LineCartesianLayer.LineSpec(
+        shader = shader,
+        thicknessDp = thicknessDp,
+        backgroundShader = backgroundShader,
+        cap = cap,
         point = point,
         pointSizeDp = pointSizeDp,
         dataLabel = dataLabel,
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/composed/ComposedChart.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/composed/ComposedChart.kt
deleted file mode 100644
index 66cbb5ff4..000000000
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/composed/ComposedChart.kt
+++ /dev/null
@@ -1,183 +0,0 @@
-/*
- * Copyright 2023 by Patryk Goworowski and Patrick Michalik.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.patrykandpatrick.vico.core.chart.composed
-
-import com.patrykandpatrick.vico.core.chart.BaseChart
-import com.patrykandpatrick.vico.core.chart.Chart
-import com.patrykandpatrick.vico.core.chart.Chart.ModelTransformerProvider
-import com.patrykandpatrick.vico.core.chart.dimensions.HorizontalDimensions
-import com.patrykandpatrick.vico.core.chart.dimensions.MutableHorizontalDimensions
-import com.patrykandpatrick.vico.core.chart.draw.ChartDrawContext
-import com.patrykandpatrick.vico.core.chart.insets.ChartInsetter
-import com.patrykandpatrick.vico.core.chart.insets.HorizontalInsets
-import com.patrykandpatrick.vico.core.chart.insets.Insets
-import com.patrykandpatrick.vico.core.chart.values.ChartValuesManager
-import com.patrykandpatrick.vico.core.chart.values.ChartValuesProvider
-import com.patrykandpatrick.vico.core.context.MeasureContext
-import com.patrykandpatrick.vico.core.entry.ChartEntryModel
-import com.patrykandpatrick.vico.core.entry.diff.ExtraStore
-import com.patrykandpatrick.vico.core.entry.diff.MutableExtraStore
-import com.patrykandpatrick.vico.core.extension.set
-import com.patrykandpatrick.vico.core.extension.updateAll
-import com.patrykandpatrick.vico.core.marker.Marker
-import java.util.TreeMap
-
-/**
- * Combines multiple [Chart]s and draws them on top of one another.
- */
-public class ComposedChart<Model : ChartEntryModel>(
-    charts: List<Chart<Model>>,
-) : BaseChart<ComposedChartEntryModel<Model>>() {
-    public constructor(vararg charts: Chart<Model>) : this(charts.toList())
-
-    /**
-     * The [Chart]s that make up this [ComposedChart].
-     */
-    public val charts: List<Chart<Model>> = ArrayList(charts)
-
-    private val tempInsets = Insets()
-
-    override val entryLocationMap: TreeMap<Float, MutableList<Marker.EntryModel>> = TreeMap()
-
-    override val chartInsetters: Collection<ChartInsetter>
-        get() = charts.map { it.chartInsetters }.flatten() + persistentMarkers.values
-
-    override fun setBounds(
-        left: Number,
-        top: Number,
-        right: Number,
-        bottom: Number,
-    ) {
-        this.bounds.set(left, top, right, bottom)
-        charts.forEach { chart -> chart.setBounds(left, top, right, bottom) }
-    }
-
-    override fun drawChart(
-        context: ChartDrawContext,
-        model: ComposedChartEntryModel<Model>,
-    ) {
-        entryLocationMap.clear()
-        model.forEachModelWithChart { item, chart ->
-            chart.drawScrollableContent(context, item)
-            entryLocationMap.updateAll(chart.entryLocationMap)
-        }
-    }
-
-    override fun drawChartInternal(
-        context: ChartDrawContext,
-        model: ComposedChartEntryModel<Model>,
-    ) {
-        drawDecorationBehindChart(context)
-        if (model.entries.isNotEmpty()) {
-            drawChart(context, model)
-        }
-    }
-
-    override fun updateHorizontalDimensions(
-        context: MeasureContext,
-        horizontalDimensions: MutableHorizontalDimensions,
-        model: ComposedChartEntryModel<Model>,
-    ) {
-        model.forEachModelWithChart { item, chart ->
-            chart.updateHorizontalDimensions(context, horizontalDimensions, item)
-        }
-    }
-
-    override fun updateChartValues(
-        chartValuesManager: ChartValuesManager,
-        model: ComposedChartEntryModel<Model>,
-        xStep: Float?,
-    ) {
-        model.forEachModelWithChart { item, chart ->
-            chart.updateChartValues(chartValuesManager, item, xStep)
-        }
-    }
-
-    override fun getInsets(
-        context: MeasureContext,
-        outInsets: Insets,
-        horizontalDimensions: HorizontalDimensions,
-    ) {
-        charts.forEach { chart ->
-            chart.getInsets(context, tempInsets, horizontalDimensions)
-            outInsets.setValuesIfGreater(tempInsets)
-        }
-    }
-
-    override fun getHorizontalInsets(
-        context: MeasureContext,
-        availableHeight: Float,
-        outInsets: HorizontalInsets,
-    ) {
-        charts.forEach { chart ->
-            chart.getHorizontalInsets(context, availableHeight, tempInsets)
-            outInsets.setValuesIfGreater(start = tempInsets.start, end = tempInsets.end)
-        }
-    }
-
-    private inline fun ComposedChartEntryModel<Model>.forEachModelWithChart(
-        action: (item: Model, chart: Chart<Model>) -> Unit,
-    ) {
-        val minSize = minOf(composedEntryCollections.size, charts.size)
-        for (index in 0..<minSize) {
-            action(
-                composedEntryCollections[index],
-                charts[index],
-            )
-        }
-    }
-
-    override val modelTransformerProvider: ModelTransformerProvider =
-        object : ModelTransformerProvider {
-            private val modelTransformer =
-                ComposedModelTransformer { charts.map { it.modelTransformerProvider.getModelTransformer() } }
-
-            override fun <T : ChartEntryModel> getModelTransformer(): Chart.ModelTransformer<T> = modelTransformer
-        }
-
-    private class ComposedModelTransformer<T : ChartEntryModel>(
-        private val getModelTransformers: () -> List<Chart.ModelTransformer<T>>,
-    ) : Chart.ModelTransformer<T>() {
-        override val key: ExtraStore.Key<Nothing> = ExtraStore.Key()
-
-        override fun prepareForTransformation(
-            oldModel: T?,
-            newModel: T?,
-            extraStore: MutableExtraStore,
-            chartValuesProvider: ChartValuesProvider,
-        ) {
-            getModelTransformers().forEachIndexed { index, transformer ->
-                @Suppress("UNCHECKED_CAST")
-                transformer.prepareForTransformation(
-                    (oldModel as ComposedChartEntryModel<*>?)?.composedEntryCollections?.getOrNull(index) as T?,
-                    (newModel as ComposedChartEntryModel<*>?)?.composedEntryCollections?.getOrNull(index) as T?,
-                    extraStore,
-                    chartValuesProvider,
-                )
-            }
-        }
-
-        override suspend fun transform(
-            extraStore: MutableExtraStore,
-            fraction: Float,
-        ) {
-            getModelTransformers().forEach { transformer ->
-                transformer.transform(extraStore, fraction)
-            }
-        }
-    }
-}
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/composed/ComposedChartEntryModel.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/composed/ComposedChartEntryModel.kt
deleted file mode 100644
index 8db92a86f..000000000
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/composed/ComposedChartEntryModel.kt
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright 2023 by Patryk Goworowski and Patrick Michalik.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.patrykandpatrick.vico.core.chart.composed
-
-import com.patrykandpatrick.vico.core.entry.ChartEntryModel
-
-/**
- * An extended [ChartEntryModel] that can compose multiple [ChartEntryModel]s. It is used by [ComposedChart].
- */
-public interface ComposedChartEntryModel<Model : ChartEntryModel> : ChartEntryModel {
-    /**
-     * A list of the [ChartEntryModel]s that make up this model.
-     */
-    public val composedEntryCollections: List<Model>
-}
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/composed/ComposedChartExtensions.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/composed/ComposedChartExtensions.kt
deleted file mode 100644
index cfcca4826..000000000
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/composed/ComposedChartExtensions.kt
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright 2023 by Patryk Goworowski and Patrick Michalik.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.patrykandpatrick.vico.core.chart.composed
-
-import com.patrykandpatrick.vico.core.chart.Chart
-import com.patrykandpatrick.vico.core.entry.ChartEntryModel
-
-/**
- * Combines this [Chart] with another one to create a [ComposedChart].
- */
-public operator fun <Model : ChartEntryModel> Chart<Model>.plus(other: Chart<Model>): ComposedChart<Model> =
-    ComposedChart(listOf(this, other))
-
-/**
- * Combines this [ComposedChart] with a [Chart] to create a [ComposedChart].
- */
-public operator fun <Model : ChartEntryModel> ComposedChart<Model>.plus(other: Chart<Model>): ComposedChart<Model> =
-    ComposedChart(charts + other)
-
-/**
- * Combines this [ComposedChart] and another one into a single [ComposedChart].
- */
-public operator fun <Model : ChartEntryModel> ComposedChart<Model>.plus(
-    other: ComposedChart<Model>,
-): ComposedChart<Model> = ComposedChart(charts + other.charts)
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/decoration/Decoration.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/decoration/Decoration.kt
index ac99316ed..52af2b6b5 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/decoration/Decoration.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/decoration/Decoration.kt
@@ -17,11 +17,11 @@
 package com.patrykandpatrick.vico.core.chart.decoration
 
 import android.graphics.RectF
-import com.patrykandpatrick.vico.core.chart.Chart
+import com.patrykandpatrick.vico.core.chart.CartesianChart
 import com.patrykandpatrick.vico.core.chart.draw.ChartDrawContext
 
 /**
- * A [Decoration] presents additional information on a [Chart].
+ * A [Decoration] presents additional information on a [CartesianChart].
  *
  * An example [Decoration] implementation is [ThresholdLine].
  *
@@ -29,10 +29,10 @@ import com.patrykandpatrick.vico.core.chart.draw.ChartDrawContext
  */
 public interface Decoration {
     /**
-     * Called before the [Chart] starts drawing itself.
+     * Called before the [CartesianChart] starts drawing itself.
      *
-     * @param [context] holds the information needed to draw the [Chart].
-     * @param [bounds] the bounding box of the [Chart].
+     * @param [context] holds the information needed to draw the [CartesianChart].
+     * @param [bounds] the bounding box of the [CartesianChart].
      */
     public fun onDrawBehindChart(
         context: ChartDrawContext,
@@ -40,10 +40,10 @@ public interface Decoration {
     ): Unit = Unit
 
     /**
-     * Called immediately after the [Chart] finishes drawing itself.
+     * Called immediately after the [CartesianChart] finishes drawing itself.
      *
-     * @param [context] holds the information needed to draw the [Chart].
-     * @param [bounds] the bounding box of the [Chart].
+     * @param [context] holds the information needed to draw the [CartesianChart].
+     * @param [bounds] the bounding box of the [CartesianChart].
      */
     public fun onDrawAboveChart(
         context: ChartDrawContext,
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/decoration/ThresholdLine.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/decoration/ThresholdLine.kt
index 39cb34326..6da04cf2d 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/decoration/ThresholdLine.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/decoration/ThresholdLine.kt
@@ -18,6 +18,8 @@ package com.patrykandpatrick.vico.core.chart.decoration
 
 import android.graphics.RectF
 import com.patrykandpatrick.vico.core.DefaultDimens
+import com.patrykandpatrick.vico.core.axis.AxisPosition
+import com.patrykandpatrick.vico.core.axis.vertical.VerticalAxis
 import com.patrykandpatrick.vico.core.chart.draw.ChartDrawContext
 import com.patrykandpatrick.vico.core.component.shape.ShapeComponent
 import com.patrykandpatrick.vico.core.component.text.HorizontalPosition
@@ -45,6 +47,8 @@ import java.text.DecimalFormat
  * @property labelHorizontalPosition defines the horizontal position of the label.
  * @property labelVerticalPosition defines the vertical position of the label.
  * @property labelRotationDegrees the rotation of the label (in degrees).
+ * @property verticalAxisPosition the position of the [VerticalAxis] whose scale the [ThresholdLine] should use when
+ * interpreting [thresholdRange].
  *
  * @see Decoration
  */
@@ -61,6 +65,7 @@ public data class ThresholdLine(
     val labelHorizontalPosition: LabelHorizontalPosition = LabelHorizontalPosition.Start,
     val labelVerticalPosition: LabelVerticalPosition = LabelVerticalPosition.Top,
     val labelRotationDegrees: Float = 0f,
+    val verticalAxisPosition: AxisPosition.Vertical? = null,
 ) : Decoration {
     /**
      * An alternative constructor that accepts a single y-axis value as opposed to a range.
@@ -74,6 +79,8 @@ public data class ThresholdLine(
      * @property labelHorizontalPosition defines the horizontal position of the label.
      * @property labelVerticalPosition defines the vertical position of the label.
      * @property labelRotationDegrees the rotation of the label (in degrees).
+     * @property verticalAxisPosition the position of the [VerticalAxis] whose scale the [ThresholdLine] should use when
+     * interpreting [thresholdValue].
      */
     public constructor(
         thresholdValue: Float,
@@ -84,6 +91,7 @@ public data class ThresholdLine(
         labelHorizontalPosition: LabelHorizontalPosition = LabelHorizontalPosition.Start,
         labelVerticalPosition: LabelVerticalPosition = LabelVerticalPosition.Top,
         labelRotationDegrees: Float = 0f,
+        verticalAxisPosition: AxisPosition.Vertical? = null,
     ) : this(
         thresholdRange = thresholdValue..thresholdValue,
         thresholdLabel = thresholdLabel,
@@ -93,6 +101,7 @@ public data class ThresholdLine(
         labelHorizontalPosition = labelHorizontalPosition,
         labelVerticalPosition = labelVerticalPosition,
         labelRotationDegrees = labelRotationDegrees,
+        verticalAxisPosition = verticalAxisPosition,
     )
 
     override fun onDrawAboveChart(
@@ -100,20 +109,18 @@ public data class ThresholdLine(
         bounds: RectF,
     ): Unit =
         with(context) {
-            val chartValues = chartValuesProvider.getChartValues()
+            val yRange = chartValues.getYRange(verticalAxisPosition)
 
-            val valueRange = chartValues.maxY - chartValues.minY
-
-            val centerY = bounds.bottom - (thresholdRange.median - chartValues.minY) / valueRange * bounds.height()
+            val centerY = bounds.bottom - (thresholdRange.median - yRange.minY) / yRange.length * bounds.height()
 
             val topY =
                 minOf(
-                    bounds.bottom - (thresholdRange.endInclusive - chartValues.minY) / valueRange * bounds.height(),
+                    bounds.bottom - (thresholdRange.endInclusive - yRange.minY) / yRange.length * bounds.height(),
                     centerY - minimumLineThicknessDp.pixels.half,
                 ).ceil
             val bottomY =
                 maxOf(
-                    bounds.bottom - (thresholdRange.start - chartValues.minY) / valueRange * bounds.height(),
+                    bounds.bottom - (thresholdRange.start - yRange.minY) / yRange.length * bounds.height(),
                     centerY + minimumLineThicknessDp.pixels.half,
                 ).floor
             val textY =
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/dimensions/HorizontalDimensions.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/dimensions/HorizontalDimensions.kt
index 0665d4d4c..3ab11164f 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/dimensions/HorizontalDimensions.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/dimensions/HorizontalDimensions.kt
@@ -16,10 +16,10 @@
 
 package com.patrykandpatrick.vico.core.chart.dimensions
 
-import com.patrykandpatrick.vico.core.chart.Chart
+import com.patrykandpatrick.vico.core.chart.CartesianChart
 
 /**
- * Holds information on a [Chart]’s horizontal dimensions.
+ * Holds information on a [CartesianChart]’s horizontal dimensions.
  */
 public interface HorizontalDimensions {
     /**
@@ -73,14 +73,15 @@ public interface HorizontalDimensions {
     public val padding: Float get() = startPadding + endPadding
 
     /**
-     * Given the chart’s maximum number of major entries, calculates the width of the [Chart]’s scalable content (in
-     * pixels).
+     * Given the chart’s maximum number of major entries, calculates the width of the [CartesianChart]’s scalable
+     * content (in pixels).
      */
     public fun getScalableContentWidth(maxMajorEntryCount: Int): Float =
         xSpacing * (maxMajorEntryCount - 1) + scalablePadding
 
     /**
-     * Given the chart’s maximum number of major entries, calculates the width of the [Chart]’s content (in pixels).
+     * Given the chart’s maximum number of major entries, calculates the width of the [CartesianChart]’s content (in
+     * pixels).
      */
     public fun getContentWidth(maxMajorEntryCount: Int): Float =
         getScalableContentWidth(maxMajorEntryCount) + unscalablePadding
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/draw/ChartDrawContext.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/draw/ChartDrawContext.kt
index 36627c3f3..fa24ad7b6 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/draw/ChartDrawContext.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/draw/ChartDrawContext.kt
@@ -18,24 +18,24 @@ package com.patrykandpatrick.vico.core.chart.draw
 
 import android.graphics.RectF
 import com.patrykandpatrick.vico.core.DEF_MAX_ZOOM
-import com.patrykandpatrick.vico.core.chart.Chart
+import com.patrykandpatrick.vico.core.chart.CartesianChart
 import com.patrykandpatrick.vico.core.chart.dimensions.HorizontalDimensions
 import com.patrykandpatrick.vico.core.chart.scale.AutoScaleUp
 import com.patrykandpatrick.vico.core.context.DrawContext
 import com.patrykandpatrick.vico.core.context.MeasureContext
-import com.patrykandpatrick.vico.core.model.Point
+import com.patrykandpatrick.vico.core.util.Point
 
 /**
- * An extension of [DrawContext] that holds additional data required to render a [Chart].
+ * An extension of [DrawContext] that holds additional data required to render a [CartesianChart].
  */
 public interface ChartDrawContext : DrawContext {
     /**
-     * The bounds in which the [Chart] will be drawn.
+     * The bounds in which the [CartesianChart] will be drawn.
      */
     public val chartBounds: RectF
 
     /**
-     * Holds information on the [Chart]’s horizontal dimensions.
+     * Holds information on the [CartesianChart]’s horizontal dimensions.
      */
     public val horizontalDimensions: HorizontalDimensions
 
@@ -66,7 +66,7 @@ public fun MeasureContext.getMaxScrollDistance(
     val contentWidth =
         horizontalDimensions
             .run { if (zoom != null) scaled(zoom) else this }
-            .getContentWidth(chartValuesProvider.getChartValues().getMaxMajorEntryCount())
+            .getContentWidth(chartValues.getMaxMajorEntryCount())
 
     return (layoutDirectionMultiplier * (contentWidth - chartWidth)).run {
         if (isLtr) coerceAtLeast(minimumValue = 0f) else coerceAtMost(maximumValue = 0f)
@@ -91,7 +91,7 @@ public fun MeasureContext.getAutoZoom(
     autoScaleUp: AutoScaleUp,
 ): Float {
     val scalableContentWidth =
-        horizontalDimensions.getScalableContentWidth(chartValuesProvider.getChartValues().getMaxMajorEntryCount())
+        horizontalDimensions.getScalableContentWidth(chartValues.getMaxMajorEntryCount())
     val reducedChartWidth = chartBounds.width() - horizontalDimensions.unscalablePadding
     val fillingZoom = reducedChartWidth / scalableContentWidth
     return when {
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/draw/ChartDrawContextExtensions.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/draw/ChartDrawContextExtensions.kt
index 45d40cce9..17140037d 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/draw/ChartDrawContextExtensions.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/draw/ChartDrawContextExtensions.kt
@@ -18,26 +18,25 @@ package com.patrykandpatrick.vico.core.chart.draw
 
 import android.graphics.Canvas
 import android.graphics.RectF
-import com.patrykandpatrick.vico.core.chart.Chart
+import com.patrykandpatrick.vico.core.chart.CartesianChart
 import com.patrykandpatrick.vico.core.chart.dimensions.HorizontalDimensions
 import com.patrykandpatrick.vico.core.component.shape.ShapeComponent
 import com.patrykandpatrick.vico.core.context.DrawContext
 import com.patrykandpatrick.vico.core.context.MeasureContext
-import com.patrykandpatrick.vico.core.entry.ChartEntryModel
 import com.patrykandpatrick.vico.core.extension.getClosestMarkerEntryModel
 import com.patrykandpatrick.vico.core.marker.Marker
 import com.patrykandpatrick.vico.core.marker.MarkerVisibilityChangeListener
-import com.patrykandpatrick.vico.core.model.Point
+import com.patrykandpatrick.vico.core.util.Point
 
 /**
  * The anonymous implementation of [ChartDrawContext].
  *
- * @param canvas the canvas on which the [Chart] is to be drawn.
+ * @param canvas the canvas on which the [CartesianChart] is to be drawn.
  * @param elevationOverlayColor the color of elevation overlays, applied to [ShapeComponent]s that cast shadows.
  * @param measureContext holds data used for component measurements.
  * @param markerTouchPoint the point inside the chart’s bounds where physical touch is occurring.
- * @param horizontalDimensions holds information on the [Chart]’s horizontal dimensions.
- * @param chartBounds the bounds in which the [Chart] will be drawn.
+ * @param horizontalDimensions holds information on the [CartesianChart]’s horizontal dimensions.
+ * @param chartBounds the bounds in which the [CartesianChart] will be drawn.
  * @param horizontalScroll the horizontal scroll.
  * @param zoom the zoom factor.
  *
@@ -83,10 +82,10 @@ public fun chartDrawContext(
  * Draws the provided [marker] on top of the chart at the given [markerTouchPoint] and notifies the
  * [markerVisibilityChangeListener] about the [marker]’s visibility changes.
  */
-public fun <Model : ChartEntryModel> ChartDrawContext.drawMarker(
+public fun ChartDrawContext.drawMarker(
     marker: Marker,
     markerTouchPoint: Point?,
-    chart: Chart<Model>,
+    chart: CartesianChart,
     markerVisibilityChangeListener: MarkerVisibilityChangeListener?,
     wasMarkerVisible: Boolean,
     setWasMarkerVisible: (Boolean) -> Unit,
@@ -100,7 +99,7 @@ public fun <Model : ChartEntryModel> ChartDrawContext.drawMarker(
                 context = this,
                 bounds = chart.bounds,
                 markedEntries = markerEntryModels,
-                chartValuesProvider = chartValuesProvider,
+                chartValues = chartValues,
             )
             if (wasMarkerVisible.not()) {
                 markerVisibilityChangeListener?.onMarkerShown(
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/insets/ChartInsetter.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/insets/ChartInsetter.kt
index aa1257077..ec47d6e9b 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/insets/ChartInsetter.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/insets/ChartInsetter.kt
@@ -17,24 +17,24 @@
 package com.patrykandpatrick.vico.core.chart.insets
 
 import com.patrykandpatrick.vico.core.axis.Axis
-import com.patrykandpatrick.vico.core.chart.Chart
+import com.patrykandpatrick.vico.core.chart.CartesianChart
 import com.patrykandpatrick.vico.core.chart.dimensions.HorizontalDimensions
 import com.patrykandpatrick.vico.core.context.MeasureContext
 import com.patrykandpatrick.vico.core.marker.Marker
 
 /**
- * Enables a component to add insets to [Chart]s to make room for itself. This is used by [Axis], [Marker], and the
- * like.
+ * Enables a component to add insets to [CartesianChart]s to make room for itself. This is used by [Axis], [Marker], and
+ * the like.
  */
 public interface ChartInsetter {
     /**
      * Called during the measurement phase, before [getHorizontalInsets]. Both horizontal and vertical insets can be
-     * requested from this function. The final inset for a given edge of the associated [Chart] is the largest of the
-     * insets requested for the edge.
+     * requested from this function. The final inset for a given edge of the associated [CartesianChart] is the largest
+     * of the insets requested for the edge.
      *
      * @param context holds data used for the measuring of components.
      * @param outInsets used to store the requested insets.
-     * @param horizontalDimensions the associated [Chart]’s [HorizontalDimensions].
+     * @param horizontalDimensions the [CartesianChart]’s [HorizontalDimensions].
      */
     public fun getInsets(
         context: MeasureContext,
@@ -45,7 +45,7 @@ public interface ChartInsetter {
     /**
      * Called during the measurement phase, after [getInsets]. Only horizontal insets can be requested from this
      * function. Unless the available height is of interest, [getInsets] can be used to set all insets. The final inset
-     * for a given edge of the associated [Chart] is the largest of the insets requested for the edge.
+     * for a given edge of the associated [CartesianChart] is the largest of the insets requested for the edge.
      *
      * @param context holds data used for the measuring of components.
      * @param availableHeight the available height. The vertical insets are considered here.
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/insets/HorizontalInsets.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/insets/HorizontalInsets.kt
index b1c0da128..3456029d7 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/insets/HorizontalInsets.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/insets/HorizontalInsets.kt
@@ -16,10 +16,10 @@
 
 package com.patrykandpatrick.vico.core.chart.insets
 
-import com.patrykandpatrick.vico.core.chart.Chart
+import com.patrykandpatrick.vico.core.chart.CartesianChart
 
 /**
- * Used to apply horizontal insets to [Chart]s.
+ * Used to apply horizontal insets to [CartesianChart]s.
  *
  * @see ChartInsetter
  * @see Insets
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/layer/BaseCartesianLayer.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/layer/BaseCartesianLayer.kt
new file mode 100644
index 000000000..1279bd66c
--- /dev/null
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/layer/BaseCartesianLayer.kt
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2023 by Patryk Goworowski and Patrick Michalik.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.patrykandpatrick.vico.core.chart.layer
+
+import android.graphics.RectF
+import com.patrykandpatrick.vico.core.chart.draw.ChartDrawContext
+import com.patrykandpatrick.vico.core.chart.insets.Insets
+import com.patrykandpatrick.vico.core.chart.values.AxisValueOverrider
+import com.patrykandpatrick.vico.core.dimensions.BoundsAware
+import com.patrykandpatrick.vico.core.extension.inClip
+import com.patrykandpatrick.vico.core.model.CartesianLayerModel
+
+/**
+ * A base [CartesianLayer] implementation.
+ */
+public abstract class BaseCartesianLayer<T : CartesianLayerModel> : CartesianLayer<T>, BoundsAware {
+    private val insets: Insets = Insets()
+
+    override val bounds: RectF = RectF()
+
+    override var axisValueOverrider: AxisValueOverrider<T>? = null
+
+    protected abstract fun drawInternal(
+        context: ChartDrawContext,
+        model: T,
+    )
+
+    override fun draw(
+        context: ChartDrawContext,
+        model: T,
+    ) {
+        with(context) {
+            insets.clear()
+            getInsets(this, insets, horizontalDimensions)
+            canvas.inClip(
+                left = bounds.left - insets.getLeft(isLtr),
+                top = bounds.top - insets.top,
+                right = bounds.right + insets.getRight(isLtr),
+                bottom = bounds.bottom + insets.bottom,
+            ) {
+                drawInternal(context, model)
+            }
+        }
+    }
+}
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/layer/CartesianLayer.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/layer/CartesianLayer.kt
new file mode 100644
index 000000000..3d75829b3
--- /dev/null
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/layer/CartesianLayer.kt
@@ -0,0 +1,87 @@
+/*
+ * Copyright 2023 by Patryk Goworowski and Patrick Michalik.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.patrykandpatrick.vico.core.chart.layer
+
+import com.patrykandpatrick.vico.core.chart.CartesianChart
+import com.patrykandpatrick.vico.core.chart.dimensions.MutableHorizontalDimensions
+import com.patrykandpatrick.vico.core.chart.draw.ChartDrawContext
+import com.patrykandpatrick.vico.core.chart.insets.ChartInsetter
+import com.patrykandpatrick.vico.core.chart.values.AxisValueOverrider
+import com.patrykandpatrick.vico.core.chart.values.ChartValues
+import com.patrykandpatrick.vico.core.chart.values.MutableChartValues
+import com.patrykandpatrick.vico.core.context.MeasureContext
+import com.patrykandpatrick.vico.core.dimensions.BoundsAware
+import com.patrykandpatrick.vico.core.marker.Marker
+import com.patrykandpatrick.vico.core.model.CartesianLayerModel
+import com.patrykandpatrick.vico.core.model.MutableExtraStore
+
+/**
+ * Visualizes data on a Cartesian plane. [CartesianLayer]s are combined and drawn by [CartesianChart]s.
+ */
+public interface CartesianLayer<T : CartesianLayerModel> : BoundsAware, ChartInsetter {
+    /**
+     * Links _x_ values to [Marker.EntryModel]s.
+     */
+    public val entryLocationMap: Map<Float, MutableList<Marker.EntryModel>>
+
+    /**
+     * Overrides the _x_ and _y_ ranges.
+     */
+    public var axisValueOverrider: AxisValueOverrider<T>?
+
+    /**
+     * Draws the [CartesianLayer].
+     */
+    public fun draw(
+        context: ChartDrawContext,
+        model: T,
+    )
+
+    /**
+     * Updates [horizontalDimensions] to match this [CartesianLayer]’s dimensions.
+     */
+    public fun updateHorizontalDimensions(
+        context: MeasureContext,
+        horizontalDimensions: MutableHorizontalDimensions,
+        model: T,
+    )
+
+    /**
+     * Updates [chartValues] in accordance with [model].
+     */
+    public fun updateChartValues(
+        chartValues: MutableChartValues,
+        model: T,
+    )
+
+    /**
+     * Prepares the [CartesianLayer] for a difference animation.
+     */
+    public fun prepareForTransformation(
+        model: T?,
+        extraStore: MutableExtraStore,
+        chartValues: ChartValues,
+    )
+
+    /**
+     * Carries out the pending difference animation.
+     */
+    public suspend fun transform(
+        extraStore: MutableExtraStore,
+        fraction: Float,
+    )
+}
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/column/ColumnChart.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/layer/ColumnCartesianLayer.kt
similarity index 68%
rename from vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/column/ColumnChart.kt
rename to vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/layer/ColumnCartesianLayer.kt
index b0cb328c7..ceec7b91e 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/column/ColumnChart.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/layer/ColumnCartesianLayer.kt
@@ -14,33 +14,21 @@
  * limitations under the License.
  */
 
-package com.patrykandpatrick.vico.core.chart.column
+package com.patrykandpatrick.vico.core.chart.layer
 
 import com.patrykandpatrick.vico.core.DefaultDimens
 import com.patrykandpatrick.vico.core.axis.AxisPosition
-import com.patrykandpatrick.vico.core.axis.AxisRenderer
-import com.patrykandpatrick.vico.core.chart.BaseChart
-import com.patrykandpatrick.vico.core.chart.Chart
-import com.patrykandpatrick.vico.core.chart.composed.ComposedChart
+import com.patrykandpatrick.vico.core.axis.vertical.VerticalAxis
 import com.patrykandpatrick.vico.core.chart.dimensions.MutableHorizontalDimensions
 import com.patrykandpatrick.vico.core.chart.draw.ChartDrawContext
-import com.patrykandpatrick.vico.core.chart.forEachInAbsolutelyIndexed
 import com.patrykandpatrick.vico.core.chart.layout.HorizontalLayout
-import com.patrykandpatrick.vico.core.chart.put
 import com.patrykandpatrick.vico.core.chart.values.ChartValues
-import com.patrykandpatrick.vico.core.chart.values.ChartValuesManager
-import com.patrykandpatrick.vico.core.chart.values.ChartValuesProvider
+import com.patrykandpatrick.vico.core.chart.values.MutableChartValues
 import com.patrykandpatrick.vico.core.component.shape.LineComponent
 import com.patrykandpatrick.vico.core.component.text.TextComponent
 import com.patrykandpatrick.vico.core.component.text.VerticalPosition
 import com.patrykandpatrick.vico.core.component.text.inBounds
 import com.patrykandpatrick.vico.core.context.MeasureContext
-import com.patrykandpatrick.vico.core.entry.ChartEntry
-import com.patrykandpatrick.vico.core.entry.ChartEntryModel
-import com.patrykandpatrick.vico.core.entry.diff.DefaultDrawingModelInterpolator
-import com.patrykandpatrick.vico.core.entry.diff.DrawingModelInterpolator
-import com.patrykandpatrick.vico.core.entry.diff.ExtraStore
-import com.patrykandpatrick.vico.core.entry.diff.MutableExtraStore
 import com.patrykandpatrick.vico.core.extension.doubled
 import com.patrykandpatrick.vico.core.extension.getRepeating
 import com.patrykandpatrick.vico.core.extension.getStart
@@ -48,84 +36,92 @@ import com.patrykandpatrick.vico.core.extension.half
 import com.patrykandpatrick.vico.core.formatter.DecimalFormatValueFormatter
 import com.patrykandpatrick.vico.core.formatter.ValueFormatter
 import com.patrykandpatrick.vico.core.marker.Marker
+import com.patrykandpatrick.vico.core.marker.put
+import com.patrykandpatrick.vico.core.model.ColumnCartesianLayerModel
+import com.patrykandpatrick.vico.core.model.ExtraStore
+import com.patrykandpatrick.vico.core.model.MutableExtraStore
+import com.patrykandpatrick.vico.core.model.drawing.ColumnCartesianLayerDrawingModel
+import com.patrykandpatrick.vico.core.model.drawing.DefaultDrawingModelInterpolator
+import com.patrykandpatrick.vico.core.model.drawing.DrawingModelInterpolator
+import com.patrykandpatrick.vico.core.model.forEachInIndexed
 import kotlin.math.abs
 
 /**
- * [ColumnChart] displays data as vertical bars. It can group and stack columns.
+ * [ColumnCartesianLayer] displays data as vertical bars. It can group and stack columns.
  *
  * @param columns the [LineComponent] instances to use for columns. This list is iterated through as many times
  * as necessary for each column collection. If the list contains a single element, all columns have the same appearance.
  * @param spacingDp the distance between neighboring column collections.
  * @param innerSpacingDp the distance between neighboring grouped columns.
  * @param mergeMode defines how columns should be drawn in column collections.
- * @param targetVerticalAxisPosition if this is set, any [AxisRenderer] with an [AxisPosition] equal to the provided
- * value will use the [ChartValues] provided by this chart. This is meant to be used with [ComposedChart].
+ * @param verticalAxisPosition the position of the [VerticalAxis] with which the [ColumnCartesianLayer] should be
+ * associated. Use this for independent [CartesianLayer] scaling.
  * @param dataLabel an optional [TextComponent] to use for data labels.
  * @param dataLabelVerticalPosition the vertical position of data labels relative to the top of their
  * respective columns.
  * @param dataLabelValueFormatter the [ValueFormatter] to use for data labels.
  * @param dataLabelRotationDegrees the rotation of data labels (in degrees).
- * @param drawingModelInterpolator interpolates the [ColumnChart]’s [ColumnChartDrawingModel]s.
+ * @param drawingModelInterpolator interpolates the [ColumnCartesianLayer]’s [ColumnCartesianLayerDrawingModel]s.
  */
-public open class ColumnChart(
+public open class ColumnCartesianLayer(
     public var columns: List<LineComponent>,
     public var spacingDp: Float = DefaultDimens.COLUMN_OUTSIDE_SPACING,
     public var innerSpacingDp: Float = DefaultDimens.COLUMN_INSIDE_SPACING,
     public var mergeMode: MergeMode = MergeMode.Grouped,
-    public var targetVerticalAxisPosition: AxisPosition.Vertical? = null,
+    public var verticalAxisPosition: AxisPosition.Vertical? = null,
     public var dataLabel: TextComponent? = null,
     public var dataLabelVerticalPosition: VerticalPosition = VerticalPosition.Top,
     public var dataLabelValueFormatter: ValueFormatter = DecimalFormatValueFormatter(),
     public var dataLabelRotationDegrees: Float = 0f,
     public var drawingModelInterpolator: DrawingModelInterpolator<
-        ColumnChartDrawingModel.ColumnInfo,
-        ColumnChartDrawingModel,
+        ColumnCartesianLayerDrawingModel.ColumnInfo,
+        ColumnCartesianLayerDrawingModel,
         > = DefaultDrawingModelInterpolator(),
-) : BaseChart<ChartEntryModel>() {
+) : BaseCartesianLayer<ColumnCartesianLayerModel>() {
     /**
-     * Creates a [ColumnChart] with a common style for all columns.
+     * Creates a [ColumnCartesianLayer] with a common style for all columns.
      *
      * @param column a [LineComponent] defining the appearance of the columns.
      * @param spacingDp the distance between neighboring column collections.
-     * @param targetVerticalAxisPosition if this is set, any [AxisRenderer] with an [AxisPosition] equal to the provided
-     * value will use the [ChartValues] provided by this chart. This is meant to be used with [ComposedChart].
+     * @param verticalAxisPosition the position of the [VerticalAxis] with which the [ColumnCartesianLayer] should
+     * be associated. Use this for independent [CartesianLayer] scaling.
      */
     public constructor(
         column: LineComponent,
         spacingDp: Float = DefaultDimens.COLUMN_OUTSIDE_SPACING,
-        targetVerticalAxisPosition: AxisPosition.Vertical? = null,
-    ) : this(columns = listOf(column), spacingDp = spacingDp, targetVerticalAxisPosition = targetVerticalAxisPosition)
+        verticalAxisPosition: AxisPosition.Vertical? = null,
+    ) : this(columns = listOf(column), spacingDp = spacingDp, verticalAxisPosition = verticalAxisPosition)
 
     /**
-     * Creates a [ColumnChart] instance with [columns] set to an empty list. The list must be populated before the chart
-     * is drawn.
+     * Creates a [ColumnCartesianLayer] instance with [columns] set to an empty list. The list must be populated before
+     * the chart is drawn.
      */
     public constructor() : this(emptyList())
 
     /**
-     * When [mergeMode] is set to [MergeMode.Stack], this maps the x-axis value of every column collection to a pair
+     * When [mergeMode] is set to [MergeMode.Stacked], this maps the x-axis value of every column collection to a pair
      * containing the bottom coordinate of the collection’s bottommost column and the top coordinate of the collection’s
-     * topmost column. This hash map is used by [drawChart] and [drawChartInternal].
+     * topmost column. This hash map is used by [drawInternal] and [drawChartInternal].
      */
     protected val heightMap: HashMap<Float, Pair<Float, Float>> = HashMap()
 
     /**
-     * Holds information on the [ColumnChart]’s horizontal dimensions.
+     * Holds information on the [ColumnCartesianLayer]’s horizontal dimensions.
      */
     protected val horizontalDimensions: MutableHorizontalDimensions = MutableHorizontalDimensions()
 
-    protected val drawingModelKey: ExtraStore.Key<ColumnChartDrawingModel> = ExtraStore.Key()
+    protected val drawingModelKey: ExtraStore.Key<ColumnCartesianLayerDrawingModel> = ExtraStore.Key()
 
     override val entryLocationMap: HashMap<Float, MutableList<Marker.EntryModel>> = HashMap()
 
-    override fun drawChart(
+    override fun drawInternal(
         context: ChartDrawContext,
-        model: ChartEntryModel,
+        model: ColumnCartesianLayerModel,
     ): Unit =
         with(context) {
             entryLocationMap.clear()
             drawChartInternal(
-                chartValues = chartValuesProvider.getChartValues(axisPosition = targetVerticalAxisPosition),
+                chartValues = chartValues,
                 model = model,
                 drawingModel = model.extraStore.getOrNull(drawingModelKey),
             )
@@ -134,11 +130,11 @@ public open class ColumnChart(
 
     protected open fun ChartDrawContext.drawChartInternal(
         chartValues: ChartValues,
-        model: ChartEntryModel,
-        drawingModel: ColumnChartDrawingModel?,
+        model: ColumnCartesianLayerModel,
+        drawingModel: ColumnCartesianLayerDrawingModel?,
     ) {
-        val yRange = (chartValues.maxY - chartValues.minY).takeIf { it != 0f } ?: return
-        val heightMultiplier = bounds.height() / yRange
+        val yRange = chartValues.getYRange(verticalAxisPosition)
+        val heightMultiplier = bounds.height() / yRange.length
 
         var drawingStart: Float
         var height: Float
@@ -146,17 +142,17 @@ public open class ColumnChart(
         var column: LineComponent
         var columnTop: Float
         var columnBottom: Float
-        val zeroLinePosition = bounds.bottom + chartValues.minY / yRange * bounds.height()
+        val zeroLinePosition = bounds.bottom + yRange.minY / yRange.length * bounds.height()
 
-        model.entries.forEachIndexed { index, entryCollection ->
+        model.series.forEachIndexed { index, entryCollection ->
 
             column = columns.getRepeating(index)
-            drawingStart = getDrawingStart(index, model.entries.size) - horizontalScroll
+            drawingStart = getDrawingStart(index, model.series.size) - horizontalScroll
 
-            entryCollection.forEachInAbsolutelyIndexed(chartValues.minX..chartValues.maxX) { entryIndex, entry ->
+            entryCollection.forEachInIndexed(chartValues.minX..chartValues.maxX) { entryIndex, entry ->
 
                 val columnInfo = drawingModel?.getOrNull(index)?.get(entry.x)
-                height = (columnInfo?.height ?: (abs(entry.y) / chartValues.lengthY)) * bounds.height()
+                height = (columnInfo?.height ?: (abs(entry.y) / yRange.length)) * bounds.height()
                 val xSpacingMultiplier = (entry.x - chartValues.minX) / chartValues.xStep
                 check(xSpacingMultiplier % 1f == 0f) { "Each entry’s x value must be a multiple of the x step." }
                 columnCenterX = drawingStart +
@@ -164,7 +160,7 @@ public open class ColumnChart(
                     layoutDirectionMultiplier
 
                 when (mergeMode) {
-                    MergeMode.Stack -> {
+                    MergeMode.Stacked -> {
                         val (stackedNegHeight, stackedPosHeight) = heightMap.getOrElse(entry.x) { 0f to 0f }
                         columnBottom = zeroLinePosition +
                             if (entry.y < 0f) {
@@ -205,18 +201,18 @@ public open class ColumnChart(
 
                 if (mergeMode == MergeMode.Grouped) {
                     drawDataLabel(
-                        modelEntriesSize = model.entries.size,
+                        modelEntriesSize = model.series.size,
                         columnThicknessDp = column.thicknessDp,
                         dataLabelValue = entry.y,
                         x = columnCenterX,
                         y = columnSignificantY,
                         isFirst = index == 0 && entry.x == chartValues.minX,
-                        isLast = index == model.entries.lastIndex && entry.x == chartValues.maxX,
+                        isLast = index == model.series.lastIndex && entry.x == chartValues.maxX,
                     )
-                } else if (index == model.entries.lastIndex) {
+                } else if (index == model.series.lastIndex) {
                     val yValues = heightMap[entry.x]
                     drawStackedDataLabel(
-                        modelEntriesSize = model.entries.size,
+                        modelEntriesSize = model.series.size,
                         columnThicknessDp = column.thicknessDp,
                         negativeY = yValues?.first,
                         positiveY = yValues?.second,
@@ -264,7 +260,7 @@ public open class ColumnChart(
         dataLabel?.let { textComponent ->
 
             val canUseXSpacing =
-                mergeMode == MergeMode.Stack ||
+                mergeMode == MergeMode.Stacked ||
                     mergeMode == MergeMode.Grouped && modelEntriesSize == 1
             var maxWidth =
                 when {
@@ -283,7 +279,8 @@ public open class ColumnChart(
             val text =
                 dataLabelValueFormatter.formatValue(
                     value = dataLabelValue,
-                    chartValues = chartValuesProvider.getChartValues(axisPosition = targetVerticalAxisPosition),
+                    chartValues = chartValues,
+                    verticalAxisPosition = verticalAxisPosition,
                 )
             val dataLabelWidth =
                 textComponent.getWidth(
@@ -322,7 +319,7 @@ public open class ColumnChart(
     }
 
     protected open fun updateMarkerLocationMap(
-        entry: ChartEntry,
+        entry: ColumnCartesianLayerModel.Entry,
         columnTop: Float,
         columnCenterX: Float,
         column: LineComponent,
@@ -340,29 +337,26 @@ public open class ColumnChart(
     }
 
     override fun updateChartValues(
-        chartValuesManager: ChartValuesManager,
-        model: ChartEntryModel,
-        xStep: Float?,
+        chartValues: MutableChartValues,
+        model: ColumnCartesianLayerModel,
     ) {
-        chartValuesManager.tryUpdate(
-            minX = axisValuesOverrider?.getMinX(model) ?: model.minX,
-            maxX = axisValuesOverrider?.getMaxX(model) ?: model.maxX,
-            minY = axisValuesOverrider?.getMinY(model) ?: mergeMode.getMinY(model),
-            maxY = axisValuesOverrider?.getMaxY(model) ?: mergeMode.getMaxY(model),
-            xStep = xStep ?: model.xGcd,
-            chartEntryModel = model,
-            axisPosition = targetVerticalAxisPosition,
+        chartValues.tryUpdate(
+            axisPosition = verticalAxisPosition,
+            minX = axisValueOverrider?.getMinX(model) ?: model.minX,
+            maxX = axisValueOverrider?.getMaxX(model) ?: model.maxX,
+            minY = axisValueOverrider?.getMinY(model) ?: mergeMode.getMinY(model),
+            maxY = axisValueOverrider?.getMaxY(model) ?: mergeMode.getMaxY(model),
         )
     }
 
     override fun updateHorizontalDimensions(
         context: MeasureContext,
         horizontalDimensions: MutableHorizontalDimensions,
-        model: ChartEntryModel,
+        model: ColumnCartesianLayerModel,
     ) {
         with(context) {
             val columnCollectionWidth =
-                getColumnCollectionWidth(if (model.entries.isNotEmpty()) model.entries.size else 1)
+                getColumnCollectionWidth(if (model.series.isNotEmpty()) model.series.size else 1)
             val xSpacing = columnCollectionWidth + spacingDp.pixels
             when (val horizontalLayout = horizontalLayout) {
                 is HorizontalLayout.Segmented -> {
@@ -387,21 +381,9 @@ public open class ColumnChart(
         }
     }
 
-    override val modelTransformerProvider: Chart.ModelTransformerProvider =
-        object : Chart.ModelTransformerProvider {
-            private val modelTransformer =
-                ColumnChartModelTransformer(
-                    drawingModelKey,
-                    { targetVerticalAxisPosition },
-                    { drawingModelInterpolator },
-                )
-
-            override fun <T : ChartEntryModel> getModelTransformer(): Chart.ModelTransformer<T> = modelTransformer
-        }
-
     protected open fun MeasureContext.getColumnCollectionWidth(entryCollectionSize: Int): Float =
         when (mergeMode) {
-            MergeMode.Stack ->
+            MergeMode.Stacked ->
                 columns.take(entryCollectionSize).maxOf { it.thicknessDp.pixels }
 
             MergeMode.Grouped ->
@@ -417,7 +399,7 @@ public open class ColumnChart(
                 MergeMode.Grouped ->
                     getCumulatedThickness(entryCollectionIndex) + innerSpacingDp.pixels * entryCollectionIndex
 
-                MergeMode.Stack -> 0f
+                MergeMode.Stacked -> 0f
             }
         return bounds.getStart(isLtr) + (
             horizontalDimensions.startPadding +
@@ -434,7 +416,7 @@ public open class ColumnChart(
     }
 
     /**
-     * Defines how a [ColumnChart] should draw columns in column collections.
+     * Defines how a [ColumnCartesianLayer] should draw columns in column collections.
      */
     public enum class MergeMode {
         /**
@@ -445,66 +427,59 @@ public open class ColumnChart(
         /**
          * Columns with the same x-axis values will be placed on top of each other.
          */
-        Stack,
+        Stacked,
 
         ;
 
         /**
          * Returns the minimum y-axis value, taking into account the current [MergeMode].
          */
-        public fun getMinY(model: ChartEntryModel): Float =
+        public fun getMinY(model: ColumnCartesianLayerModel): Float =
             when (this) {
                 Grouped -> model.minY.coerceAtMost(0f)
-                Stack -> model.stackedNegativeY.coerceAtMost(0f)
+                Stacked -> model.minAggregateY.coerceAtMost(0f)
             }
 
         /**
          * Returns the maximum y-axis value, taking into account the current [MergeMode].
          */
-        public fun getMaxY(model: ChartEntryModel): Float =
+        public fun getMaxY(model: ColumnCartesianLayerModel): Float =
             when (this) {
                 Grouped -> model.maxY
-                Stack -> model.stackedPositiveY
+                Stacked -> model.maxAggregateY
             }
     }
 
-    protected class ColumnChartModelTransformer(
-        override val key: ExtraStore.Key<ColumnChartDrawingModel>,
-        private val getTargetVerticalAxisPosition: () -> AxisPosition.Vertical?,
-        private val getDrawingModelInterpolator: () -> DrawingModelInterpolator<
-            ColumnChartDrawingModel.ColumnInfo,
-            ColumnChartDrawingModel,
-            >,
-    ) : Chart.ModelTransformer<ChartEntryModel>() {
-        override fun prepareForTransformation(
-            oldModel: ChartEntryModel?,
-            newModel: ChartEntryModel?,
-            extraStore: MutableExtraStore,
-            chartValuesProvider: ChartValuesProvider,
-        ) {
-            getDrawingModelInterpolator().setModels(
-                extraStore.getOrNull(key),
-                newModel?.toDrawingModel(chartValuesProvider.getChartValues(getTargetVerticalAxisPosition())),
-            )
-        }
+    override fun prepareForTransformation(
+        model: ColumnCartesianLayerModel?,
+        extraStore: MutableExtraStore,
+        chartValues: ChartValues,
+    ) {
+        drawingModelInterpolator.setModels(
+            old = extraStore.getOrNull(drawingModelKey),
+            new = model?.toDrawingModel(chartValues),
+        )
+    }
 
-        override suspend fun transform(
-            extraStore: MutableExtraStore,
-            fraction: Float,
-        ) {
-            getDrawingModelInterpolator()
-                .transform(fraction)
-                ?.let { extraStore[key] = it }
-                ?: extraStore.remove(key)
-        }
+    override suspend fun transform(
+        extraStore: MutableExtraStore,
+        fraction: Float,
+    ) {
+        drawingModelInterpolator
+            .transform(fraction)
+            ?.let { extraStore[drawingModelKey] = it }
+            ?: extraStore.remove(drawingModelKey)
+    }
 
-        private fun ChartEntryModel.toDrawingModel(chartValues: ChartValues): ColumnChartDrawingModel =
-            entries
-                .map { series ->
-                    series.associate { entry ->
-                        entry.x to ColumnChartDrawingModel.ColumnInfo(abs(entry.y) / chartValues.lengthY)
-                    }
+    private fun ColumnCartesianLayerModel.toDrawingModel(chartValues: ChartValues) =
+        series
+            .map { series ->
+                series.associate { entry ->
+                    entry.x to
+                        ColumnCartesianLayerDrawingModel.ColumnInfo(
+                            height = abs(entry.y) / chartValues.getYRange(verticalAxisPosition).length,
+                        )
                 }
-                .let(::ColumnChartDrawingModel)
-    }
+            }
+            .let(::ColumnCartesianLayerDrawingModel)
 }
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/line/LineChart.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/layer/LineCartesianLayer.kt
similarity index 64%
rename from vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/line/LineChart.kt
rename to vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/layer/LineCartesianLayer.kt
index 7caa4613a..f33bbd90d 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/line/LineChart.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/layer/LineCartesianLayer.kt
@@ -14,45 +14,32 @@
  * limitations under the License.
  */
 
-package com.patrykandpatrick.vico.core.chart.line
+package com.patrykandpatrick.vico.core.chart.layer
 
-import android.graphics.Color
 import android.graphics.Paint
 import android.graphics.Path
 import android.graphics.RectF
 import com.patrykandpatrick.vico.core.DefaultDimens
 import com.patrykandpatrick.vico.core.axis.AxisPosition
-import com.patrykandpatrick.vico.core.axis.AxisRenderer
-import com.patrykandpatrick.vico.core.chart.BaseChart
-import com.patrykandpatrick.vico.core.chart.Chart
+import com.patrykandpatrick.vico.core.axis.vertical.VerticalAxis
 import com.patrykandpatrick.vico.core.chart.DefaultPointConnector
-import com.patrykandpatrick.vico.core.chart.composed.ComposedChart
 import com.patrykandpatrick.vico.core.chart.dimensions.HorizontalDimensions
 import com.patrykandpatrick.vico.core.chart.dimensions.MutableHorizontalDimensions
 import com.patrykandpatrick.vico.core.chart.draw.ChartDrawContext
-import com.patrykandpatrick.vico.core.chart.forEachInAbsolutelyIndexed
 import com.patrykandpatrick.vico.core.chart.insets.Insets
+import com.patrykandpatrick.vico.core.chart.layer.LineCartesianLayer.LineSpec
+import com.patrykandpatrick.vico.core.chart.layer.LineCartesianLayer.LineSpec.PointConnector
 import com.patrykandpatrick.vico.core.chart.layout.HorizontalLayout
-import com.patrykandpatrick.vico.core.chart.line.LineChart.LineSpec
-import com.patrykandpatrick.vico.core.chart.line.LineChart.LineSpec.PointConnector
-import com.patrykandpatrick.vico.core.chart.put
 import com.patrykandpatrick.vico.core.chart.values.ChartValues
-import com.patrykandpatrick.vico.core.chart.values.ChartValuesManager
-import com.patrykandpatrick.vico.core.chart.values.ChartValuesProvider
+import com.patrykandpatrick.vico.core.chart.values.MutableChartValues
 import com.patrykandpatrick.vico.core.component.Component
 import com.patrykandpatrick.vico.core.component.shape.shader.DynamicShader
-import com.patrykandpatrick.vico.core.component.shape.shader.SolidShader
+import com.patrykandpatrick.vico.core.component.shape.shader.TopBottomShader
 import com.patrykandpatrick.vico.core.component.text.TextComponent
 import com.patrykandpatrick.vico.core.component.text.VerticalPosition
 import com.patrykandpatrick.vico.core.component.text.inBounds
 import com.patrykandpatrick.vico.core.context.DrawContext
 import com.patrykandpatrick.vico.core.context.MeasureContext
-import com.patrykandpatrick.vico.core.entry.ChartEntry
-import com.patrykandpatrick.vico.core.entry.ChartEntryModel
-import com.patrykandpatrick.vico.core.entry.diff.DefaultDrawingModelInterpolator
-import com.patrykandpatrick.vico.core.entry.diff.DrawingModelInterpolator
-import com.patrykandpatrick.vico.core.entry.diff.ExtraStore
-import com.patrykandpatrick.vico.core.entry.diff.MutableExtraStore
 import com.patrykandpatrick.vico.core.extension.doubled
 import com.patrykandpatrick.vico.core.extension.getRepeating
 import com.patrykandpatrick.vico.core.extension.getStart
@@ -62,50 +49,59 @@ import com.patrykandpatrick.vico.core.extension.withOpacity
 import com.patrykandpatrick.vico.core.formatter.DecimalFormatValueFormatter
 import com.patrykandpatrick.vico.core.formatter.ValueFormatter
 import com.patrykandpatrick.vico.core.marker.Marker
-import com.patrykandpatrick.vico.core.model.Point
+import com.patrykandpatrick.vico.core.marker.put
+import com.patrykandpatrick.vico.core.model.ExtraStore
+import com.patrykandpatrick.vico.core.model.LineCartesianLayerModel
+import com.patrykandpatrick.vico.core.model.MutableExtraStore
+import com.patrykandpatrick.vico.core.model.drawing.DefaultDrawingModelInterpolator
+import com.patrykandpatrick.vico.core.model.drawing.DrawingModelInterpolator
+import com.patrykandpatrick.vico.core.model.drawing.LineCartesianLayerDrawingModel
+import com.patrykandpatrick.vico.core.model.forEachInIndexed
+import com.patrykandpatrick.vico.core.util.Point
 import kotlin.math.abs
 import kotlin.math.max
 import kotlin.math.min
 
 /**
- * [LineChart] displays data as a continuous line.
+ * [LineCartesianLayer] displays data as a continuous line.
  *
  * @param lines a [List] of [LineSpec]s defining the style of each line.
  * @param spacingDp the spacing between each [LineSpec.point] (in dp).
- * @param targetVerticalAxisPosition if this is set, any [AxisRenderer] with an [AxisPosition] equal to the provided
- * value will use the [ChartValues] provided by this chart. This is meant to be used with [ComposedChart].
- * @param drawingModelInterpolator interpolates the [LineChart]’s [LineChartDrawingModel]s.
+ * @param verticalAxisPosition the position of the [VerticalAxis] with which the [LineCartesianLayer] should be
+ * associated. Use this for independent [CartesianLayer] scaling.
+ * @param drawingModelInterpolator interpolates the [LineCartesianLayer]’s [LineCartesianLayerDrawingModel]s.
  */
-public open class LineChart(
-    public var lines: List<LineSpec> = listOf(LineSpec()),
+public open class LineCartesianLayer(
+    public var lines: List<LineSpec>,
     public var spacingDp: Float = DefaultDimens.POINT_SPACING,
-    public var targetVerticalAxisPosition: AxisPosition.Vertical? = null,
+    public var verticalAxisPosition: AxisPosition.Vertical? = null,
     public var drawingModelInterpolator: DrawingModelInterpolator<
-        LineChartDrawingModel.PointInfo,
-        LineChartDrawingModel,
+        LineCartesianLayerDrawingModel.PointInfo,
+        LineCartesianLayerDrawingModel,
         > = DefaultDrawingModelInterpolator(),
-) : BaseChart<ChartEntryModel>() {
+) : BaseCartesianLayer<LineCartesianLayerModel>() {
     /**
-     * Creates a [LineChart] with a common style for all lines.
+     * Creates a [LineCartesianLayer] with a common style for all lines.
      *
      * @param line a [LineSpec] defining the style of each line.
      * @param spacingDp the spacing between each [LineSpec.point] (in dp).
-     * @param targetVerticalAxisPosition if this is set, any [AxisRenderer] with an [AxisPosition] equal to the provided
-     * value will use the [ChartValues] provided by this chart. This is meant to be used with [ComposedChart].
+     * @param verticalAxisPosition the position of the [VerticalAxis] with which the [LineCartesianLayer] should
+     * be associated. Use this for independent [CartesianLayer] scaling.
      */
     public constructor(
         line: LineSpec,
         spacingDp: Float,
-        targetVerticalAxisPosition: AxisPosition.Vertical? = null,
-    ) : this(listOf(line), spacingDp, targetVerticalAxisPosition)
+        verticalAxisPosition: AxisPosition.Vertical? = null,
+    ) : this(listOf(line), spacingDp, verticalAxisPosition)
 
     /**
      * Defines the appearance of a line in a line chart.
      *
-     * @param lineShader the [DynamicShader] for the line.
-     * @param lineThicknessDp the thickness of the line (in dp).
-     * @param lineBackgroundShader an optional [DynamicShader] to use for the area below and above the line.
-     * @param lineCap the stroke cap for the line.
+     * @param shader the [DynamicShader] for the line.
+     * @param thicknessDp the thickness of the line (in dp).
+     * @param backgroundShader an optional [DynamicShader] to use for the areas bounded by the [LineCartesianLayer] line
+     * and the zero line (_y_ = 0).
+     * @param cap the stroke cap for the line.
      * @param point an optional [Component] that can be drawn at a given point on the line.
      * @param pointSizeDp the size of the [point] (in dp).
      * @param dataLabel an optional [TextComponent] to use for data labels.
@@ -115,10 +111,10 @@ public open class LineChart(
      * @param pointConnector the [PointConnector] for the line.
      */
     public open class LineSpec(
-        public var lineShader: DynamicShader,
-        public var lineThicknessDp: Float = DefaultDimens.LINE_THICKNESS,
-        public var lineBackgroundShader: DynamicShader? = null,
-        public var lineCap: Paint.Cap = Paint.Cap.ROUND,
+        public var shader: DynamicShader,
+        public var thicknessDp: Float = DefaultDimens.LINE_THICKNESS,
+        public var backgroundShader: DynamicShader? = null,
+        public var cap: Paint.Cap = Paint.Cap.ROUND,
         public var point: Component? = null,
         public var pointSizeDp: Float = DefaultDimens.POINT_SIZE,
         public var dataLabel: TextComponent? = null,
@@ -128,54 +124,15 @@ public open class LineChart(
         public var pointConnector: PointConnector = DefaultPointConnector(),
     ) {
         /**
-         * @param lineColor the color of the line.
-         * @param lineThicknessDp the thickness of the line (in dp).
-         * @param lineBackgroundShader an optional [DynamicShader] to use for the area below the line.
-         * @param lineCap the stroke cap for the line.
-         * @param point an optional [Component] that can be drawn at a given point on the line.
-         * @param pointSizeDp the size of the [point] (in dp).
-         * @param dataLabel an optional [TextComponent] to use for data labels.
-         * @param dataLabelVerticalPosition the vertical position of data labels relative to the line.
-         * @param dataLabelValueFormatter the [ValueFormatter] to use for data labels.
-         * @param dataLabelRotationDegrees the rotation of data labels (in degrees).
-         * @param pointConnector the [PointConnector] for the line.
-         */
-        public constructor(
-            lineColor: Int = Color.LTGRAY,
-            lineThicknessDp: Float = DefaultDimens.LINE_THICKNESS,
-            lineBackgroundShader: DynamicShader? = null,
-            lineCap: Paint.Cap = Paint.Cap.ROUND,
-            point: Component? = null,
-            pointSizeDp: Float = DefaultDimens.POINT_SIZE,
-            dataLabel: TextComponent? = null,
-            dataLabelVerticalPosition: VerticalPosition = VerticalPosition.Top,
-            dataLabelValueFormatter: ValueFormatter = DecimalFormatValueFormatter(),
-            dataLabelRotationDegrees: Float = 0f,
-            pointConnector: PointConnector = DefaultPointConnector(),
-        ) : this(
-            lineShader = SolidShader(lineColor),
-            lineThicknessDp = lineThicknessDp,
-            lineBackgroundShader = lineBackgroundShader,
-            lineCap = lineCap,
-            point = point,
-            pointSizeDp = pointSizeDp,
-            dataLabel = dataLabel,
-            dataLabelVerticalPosition = dataLabelVerticalPosition,
-            dataLabelValueFormatter = dataLabelValueFormatter,
-            dataLabelRotationDegrees = dataLabelRotationDegrees,
-            pointConnector = pointConnector,
-        )
-
-        /**
-         * Returns `true` if the [lineBackgroundShader] is not null, and `false` otherwise.
+         * Returns `true` if the [backgroundShader] is not null, and `false` otherwise.
          */
         public val hasLineBackgroundShader: Boolean
-            get() = lineBackgroundShader != null
+            get() = backgroundShader != null
 
         protected val linePaint: Paint =
             Paint(Paint.ANTI_ALIAS_FLAG).apply {
                 style = Paint.Style.STROKE
-                strokeCap = lineCap
+                strokeCap = cap
             }
 
         protected val lineBackgroundPaint: Paint = Paint(Paint.ANTI_ALIAS_FLAG)
@@ -216,8 +173,9 @@ public open class LineChart(
             opacity: Float = 1f,
         ) {
             with(context) {
-                linePaint.strokeWidth = lineThicknessDp.pixels
-                lineShader.applyTo(linePaint, context, bounds, zeroLineYFraction)
+                linePaint.strokeWidth = thicknessDp.pixels
+                setSplitY(zeroLineYFraction)
+                linePaint.shader = shader.provideShader(context, bounds)
                 linePaint.withOpacity(opacity) { canvas.drawPath(path, it) }
             }
         }
@@ -232,11 +190,12 @@ public open class LineChart(
             path: Path,
             opacity: Float = 1f,
         ) {
-            val fill = lineBackgroundShader ?: return
+            val fill = backgroundShader ?: return
             with(lineBackgroundPaint) {
                 if (zeroLineYFraction > 0) {
                     val zeroLineY = bounds.top + (zeroLineYFraction * bounds.height())
-                    fill.applyTo(this, context, bounds.left, bounds.top, bounds.right, zeroLineY, 1f)
+                    setSplitY(1f)
+                    shader = fill.provideShader(context, bounds.left, bounds.top, bounds.right, zeroLineY)
                     lineBackgroundPath.set(path)
                     lineBackgroundPath.computeBounds(pathBounds, false)
                     lineBackgroundPath.lineTo(pathBounds.right, bounds.bottom)
@@ -250,7 +209,8 @@ public open class LineChart(
 
                 if (zeroLineYFraction < 1f) {
                     val zeroLineY = bounds.top + (zeroLineYFraction * bounds.height())
-                    fill.applyTo(this, context, bounds.left, zeroLineY, bounds.right, bounds.bottom, 0f)
+                    setSplitY(0f)
+                    shader = fill.provideShader(context, bounds.left, zeroLineY, bounds.right, bounds.bottom)
                     lineBackgroundPath.set(path)
                     lineBackgroundPath.computeBounds(pathBounds, false)
                     lineBackgroundPath.lineTo(pathBounds.right, bounds.top)
@@ -264,6 +224,15 @@ public open class LineChart(
             }
         }
 
+        /**
+         * For [shader] and [backgroundShader], if the [DynamicShader] is a [TopBottomShader], updates
+         * [TopBottomShader.splitY] to match the position of the zero line (_y_ = 0).
+         */
+        public fun setSplitY(splitY: Float) {
+            (shader as? TopBottomShader)?.splitY = splitY
+            (backgroundShader as? TopBottomShader)?.splitY = splitY
+        }
+
         /**
          * Defines the shape of a line in a line chart by specifying how points are to be connected.
          *
@@ -295,22 +264,22 @@ public open class LineChart(
      */
     protected val lineBackgroundPath: Path = Path()
 
-    protected val drawingModelKey: ExtraStore.Key<LineChartDrawingModel> = ExtraStore.Key()
+    protected val drawingModelKey: ExtraStore.Key<LineCartesianLayerDrawingModel> = ExtraStore.Key()
 
     override val entryLocationMap: HashMap<Float, MutableList<Marker.EntryModel>> = HashMap()
 
-    override fun drawChart(
+    override fun drawInternal(
         context: ChartDrawContext,
-        model: ChartEntryModel,
+        model: LineCartesianLayerModel,
     ): Unit =
         with(context) {
             resetTempData()
 
             val drawingModel = model.extraStore.getOrNull(drawingModelKey)
-            val chartValues = chartValuesProvider.getChartValues(targetVerticalAxisPosition)
-            val zeroLineYFraction = 1f - (drawingModel?.zeroY ?: abs(chartValues.minY / chartValues.lengthY))
+            val yRange = chartValues.getYRange(verticalAxisPosition)
+            val zeroLineYFraction = 1f - (drawingModel?.zeroY ?: abs(yRange.minY / yRange.length))
 
-            model.entries.forEachIndexed { entryListIndex, entries ->
+            model.series.forEachIndexed { entryListIndex, entries ->
 
                 val pointInfoMap = drawingModel?.getOrNull(entryListIndex)
 
@@ -326,7 +295,7 @@ public open class LineChart(
                 val drawingStart = bounds.getStart(isLtr = isLtr) + drawingStartAlignmentCorrection - horizontalScroll
 
                 forEachPointWithinBoundsIndexed(
-                    entries = entries,
+                    series = entries,
                     drawingStart = drawingStart,
                     pointInfoMap = pointInfoMap,
                 ) { entryIndex, entry, x, y, _, _ ->
@@ -348,17 +317,12 @@ public open class LineChart(
 
                     if (x > bounds.left - 1 && x < bounds.right + 1) {
                         val coercedY = y.coerceIn(bounds.top, bounds.bottom)
+                        component.setSplitY(zeroLineYFraction)
                         entryLocationMap.put(
                             x = x,
                             y = coercedY,
                             entry = entry,
-                            color =
-                                component.lineShader.getColorAt(
-                                    Point(x, coercedY),
-                                    context,
-                                    bounds,
-                                    zeroLineYFraction,
-                                ),
+                            color = component.shader.getColorAt(Point(x, coercedY), context, bounds),
                             index = entryIndex,
                         )
                     }
@@ -380,7 +344,7 @@ public open class LineChart(
 
                 drawPointsAndDataLabels(
                     lineSpec = component,
-                    entries = entries,
+                    series = entries,
                     drawingStart = drawingStart,
                     pointInfoMap = pointInfoMap,
                 )
@@ -392,15 +356,14 @@ public open class LineChart(
      */
     protected open fun ChartDrawContext.drawPointsAndDataLabels(
         lineSpec: LineSpec,
-        entries: List<ChartEntry>,
+        series: List<LineCartesianLayerModel.Entry>,
         drawingStart: Float,
-        pointInfoMap: Map<Float, LineChartDrawingModel.PointInfo>?,
+        pointInfoMap: Map<Float, LineCartesianLayerDrawingModel.PointInfo>?,
     ) {
         if (lineSpec.point == null && lineSpec.dataLabel == null) return
-        val chartValues = chartValuesProvider.getChartValues(targetVerticalAxisPosition)
 
         forEachPointWithinBoundsIndexed(
-            entries = entries,
+            series = series,
             drawingStart = drawingStart,
             pointInfoMap = pointInfoMap,
         ) { _, chartEntry, x, y, previousX, nextX ->
@@ -416,7 +379,7 @@ public open class LineChart(
 
                 val distanceFromLine =
                     maxOf(
-                        a = lineSpec.lineThicknessDp,
+                        a = lineSpec.thicknessDp,
                         b = lineSpec.pointSizeDpOrZero,
                     ).half.pixels
 
@@ -424,6 +387,7 @@ public open class LineChart(
                     lineSpec.dataLabelValueFormatter.formatValue(
                         value = chartEntry.y,
                         chartValues = chartValues,
+                        verticalAxisPosition = verticalAxisPosition,
                     )
                 val maxWidth = getMaxDataLabelWidth(chartEntry, x, previousX, nextX)
                 val verticalPosition =
@@ -460,13 +424,12 @@ public open class LineChart(
     }
 
     protected fun ChartDrawContext.getMaxDataLabelWidth(
-        entry: ChartEntry,
+        entry: LineCartesianLayerModel.Entry,
         x: Float,
         previousX: Float?,
         nextX: Float?,
-    ): Int {
-        val chartValues = chartValuesProvider.getChartValues(targetVerticalAxisPosition)
-        return when {
+    ): Int =
+        when {
             previousX != null && nextX != null -> min(x - previousX, nextX - x)
 
             previousX == null && nextX == null ->
@@ -494,10 +457,9 @@ public open class LineChart(
                     .coerceAtMost(x - previousX!!)
             }
         }.toInt()
-    }
 
     /**
-     * Clears the temporary data saved during a single [drawChart] run.
+     * Clears the temporary data saved during a single [drawInternal] run.
      */
     protected fun resetTempData() {
         entryLocationMap.clear()
@@ -505,17 +467,19 @@ public open class LineChart(
         lineBackgroundPath.rewind()
     }
 
-    /**
-     * Performs the given [action] for each [ChartEntry] in [entries] that lies within the chart’s bounds.
-     */
     protected open fun ChartDrawContext.forEachPointWithinBoundsIndexed(
-        entries: List<ChartEntry>,
+        series: List<LineCartesianLayerModel.Entry>,
         drawingStart: Float,
-        pointInfoMap: Map<Float, LineChartDrawingModel.PointInfo>?,
-        action: (index: Int, entry: ChartEntry, x: Float, y: Float, previousX: Float?, nextX: Float?) -> Unit,
+        pointInfoMap: Map<Float, LineCartesianLayerDrawingModel.PointInfo>?,
+        action: (
+            index: Int,
+            entry: LineCartesianLayerModel.Entry,
+            x: Float,
+            y: Float,
+            previousX: Float?,
+            nextX: Float?,
+        ) -> Unit,
     ) {
-        val chartValues = chartValuesProvider.getChartValues(targetVerticalAxisPosition)
-
         val minX = chartValues.minX
         val maxX = chartValues.maxX
         val xStep = chartValues.xStep
@@ -524,21 +488,23 @@ public open class LineChart(
         var nextX: Float? = null
         var y: Float
 
-        var prevEntry: ChartEntry? = null
-        var lastEntry: ChartEntry? = null
+        var prevEntry: LineCartesianLayerModel.Entry? = null
+        var lastEntry: LineCartesianLayerModel.Entry? = null
 
         val boundsStart = bounds.getStart(isLtr = isLtr)
         val boundsEnd = boundsStart + layoutDirectionMultiplier * bounds.width()
 
-        fun getDrawX(entry: ChartEntry): Float =
+        fun getDrawX(entry: LineCartesianLayerModel.Entry): Float =
             drawingStart + layoutDirectionMultiplier *
                 horizontalDimensions.xSpacing * (entry.x - minX) / xStep
 
-        fun getDrawY(entry: ChartEntry): Float =
-            bounds.bottom - (pointInfoMap?.get(entry.x)?.y ?: ((entry.y - chartValues.minY) / chartValues.lengthY)) *
+        fun getDrawY(entry: LineCartesianLayerModel.Entry): Float {
+            val yRange = chartValues.getYRange(verticalAxisPosition)
+            return bounds.bottom - (pointInfoMap?.get(entry.x)?.y ?: ((entry.y - yRange.minY) / yRange.length)) *
                 bounds.height()
+        }
 
-        entries.forEachInAbsolutelyIndexed(minX - xStep..maxX + xStep) { index, entry, next ->
+        series.forEachInIndexed(minX - xStep..maxX + xStep) { index, entry, next ->
 
             val previousX = x.takeIf { it.isFinite() }
             x = nextX ?: getDrawX(entry)
@@ -569,7 +535,7 @@ public open class LineChart(
     override fun updateHorizontalDimensions(
         context: MeasureContext,
         horizontalDimensions: MutableHorizontalDimensions,
-        model: ChartEntryModel,
+        model: LineCartesianLayerModel,
     ) {
         with(context) {
             val maxPointSize = lines.maxOf { it.pointSizeDpOrZero }.pixels
@@ -596,18 +562,15 @@ public open class LineChart(
     }
 
     override fun updateChartValues(
-        chartValuesManager: ChartValuesManager,
-        model: ChartEntryModel,
-        xStep: Float?,
+        chartValues: MutableChartValues,
+        model: LineCartesianLayerModel,
     ) {
-        chartValuesManager.tryUpdate(
-            minX = axisValuesOverrider?.getMinX(model) ?: model.minX,
-            maxX = axisValuesOverrider?.getMaxX(model) ?: model.maxX,
-            minY = axisValuesOverrider?.getMinY(model) ?: min(model.minY, 0f),
-            maxY = axisValuesOverrider?.getMaxY(model) ?: model.maxY,
-            xStep = xStep ?: model.xGcd,
-            chartEntryModel = model,
-            axisPosition = targetVerticalAxisPosition,
+        chartValues.tryUpdate(
+            minX = axisValueOverrider?.getMinX(model) ?: model.minX,
+            maxX = axisValueOverrider?.getMaxX(model) ?: model.maxX,
+            minY = axisValueOverrider?.getMinY(model) ?: min(model.minY, 0f),
+            maxY = axisValueOverrider?.getMaxY(model) ?: model.maxY,
+            axisPosition = verticalAxisPosition,
         )
     }
 
@@ -618,60 +581,43 @@ public open class LineChart(
     ): Unit =
         with(context) {
             outInsets.setVertical(
-                value =
-                    lines.maxOf {
-                        if (it.point != null) max(a = it.lineThicknessDp, b = it.pointSizeDp) else it.lineThicknessDp
-                    }.pixels,
+                lines
+                    .maxOf { if (it.point != null) max(it.thicknessDp, it.thicknessDp) else it.thicknessDp }
+                    .pixels,
             )
         }
 
-    override val modelTransformerProvider: Chart.ModelTransformerProvider =
-        object : Chart.ModelTransformerProvider {
-            private val modelTransformer =
-                LineChartModelTransformer(drawingModelKey, { targetVerticalAxisPosition }, { drawingModelInterpolator })
-
-            override fun <T : ChartEntryModel> getModelTransformer(): Chart.ModelTransformer<T> = modelTransformer
-        }
-
-    protected class LineChartModelTransformer(
-        override val key: ExtraStore.Key<LineChartDrawingModel>,
-        private val getTargetVerticalAxisPosition: () -> AxisPosition.Vertical?,
-        private val getDrawingModelInterpolator: () -> DrawingModelInterpolator<
-            LineChartDrawingModel.PointInfo,
-            LineChartDrawingModel,
-            >,
-    ) : Chart.ModelTransformer<ChartEntryModel>() {
-        override fun prepareForTransformation(
-            oldModel: ChartEntryModel?,
-            newModel: ChartEntryModel?,
-            extraStore: MutableExtraStore,
-            chartValuesProvider: ChartValuesProvider,
-        ) {
-            getDrawingModelInterpolator().setModels(
-                extraStore.getOrNull(key),
-                newModel?.toDrawingModel(chartValuesProvider.getChartValues(getTargetVerticalAxisPosition())),
-            )
-        }
+    override fun prepareForTransformation(
+        model: LineCartesianLayerModel?,
+        extraStore: MutableExtraStore,
+        chartValues: ChartValues,
+    ) {
+        drawingModelInterpolator.setModels(
+            old = extraStore.getOrNull(drawingModelKey),
+            new = model?.toDrawingModel(chartValues),
+        )
+    }
 
-        override suspend fun transform(
-            extraStore: MutableExtraStore,
-            fraction: Float,
-        ) {
-            getDrawingModelInterpolator()
-                .transform(fraction)
-                ?.let { extraStore[key] = it }
-                ?: extraStore.remove(key)
-        }
+    override suspend fun transform(
+        extraStore: MutableExtraStore,
+        fraction: Float,
+    ) {
+        drawingModelInterpolator
+            .transform(fraction)
+            ?.let { extraStore[drawingModelKey] = it }
+            ?: extraStore.remove(drawingModelKey)
+    }
 
-        private fun ChartEntryModel.toDrawingModel(chartValues: ChartValues): LineChartDrawingModel =
-            entries
-                .map { series ->
-                    series.associate { entry ->
-                        entry.x to LineChartDrawingModel.PointInfo((entry.y - chartValues.minY) / chartValues.lengthY)
-                    }
-                }
-                .let { pointInfo ->
-                    LineChartDrawingModel(pointInfo, abs(chartValues.minY / chartValues.lengthY))
+    private fun LineCartesianLayerModel.toDrawingModel(chartValues: ChartValues): LineCartesianLayerDrawingModel {
+        val yRange = chartValues.getYRange(verticalAxisPosition)
+        return series
+            .map { series ->
+                series.associate { entry ->
+                    entry.x to LineCartesianLayerDrawingModel.PointInfo((entry.y - yRange.minY) / yRange.length)
                 }
+            }
+            .let { pointInfo ->
+                LineCartesianLayerDrawingModel(pointInfo, abs(yRange.minY / yRange.length))
+            }
     }
 }
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/line/LineChartExtensions.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/layer/LineCartesianLayerExtensions.kt
similarity index 84%
rename from vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/line/LineChartExtensions.kt
rename to vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/layer/LineCartesianLayerExtensions.kt
index 4e0afcb49..4bb97b42b 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/line/LineChartExtensions.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/layer/LineCartesianLayerExtensions.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 by Patryk Goworowski and Patrick Michalik.
+ * Copyright 2023 by Patryk Goworowski and Patrick Michalik.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.patrykandpatrick.vico.core.chart.line
+package com.patrykandpatrick.vico.core.chart.layer
 
 import com.patrykandpatrick.vico.core.component.Component
 import com.patrykandpatrick.vico.core.context.DrawContext
@@ -34,5 +34,5 @@ internal fun Component.drawPoint(
     )
 }
 
-internal inline val LineChart.LineSpec.pointSizeDpOrZero: Float
+internal inline val LineCartesianLayer.LineSpec.pointSizeDpOrZero: Float
     get() = if (point != null) pointSizeDp else 0f
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/layout/HorizontalLayout.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/layout/HorizontalLayout.kt
index 4a73944fd..adc240784 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/layout/HorizontalLayout.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/layout/HorizontalLayout.kt
@@ -17,26 +17,26 @@
 package com.patrykandpatrick.vico.core.chart.layout
 
 import com.patrykandpatrick.vico.core.axis.horizontal.HorizontalAxis
-import com.patrykandpatrick.vico.core.chart.Chart
+import com.patrykandpatrick.vico.core.chart.CartesianChart
 
 /**
- * Defines how a chart’s content is positioned horizontally. This affects the [Chart] and the [HorizontalAxis]
+ * Defines how a chart’s content is positioned horizontally. This affects the [CartesianChart] and the [HorizontalAxis]
  * instances.
  */
 public sealed interface HorizontalLayout {
     /**
-     * When this is applied, the [Chart] centers each major entry in a designated segment. Some empty space is visible
-     * at the start and end of the [Chart]. [HorizontalAxis] instances display ticks and guidelines at the edges of the
-     * segments.
+     * When this is applied, the [CartesianChart] centers each major entry in a designated segment. Some empty space is
+     * visible at the start and end of the [CartesianChart]. [HorizontalAxis] instances display ticks and guidelines at
+     * the edges of the segments.
      */
     public object Segmented : HorizontalLayout
 
     /**
-     * When this is applied, the [Chart]’s content takes up the [Chart]’s entire width (unless padding is added).
-     * [HorizontalAxis] instances display a tick and a guideline for each label, with the tick, guideline, and label
-     * vertically centered relative to one another. [scalableStartPaddingDp], [scalableEndPaddingDp],
+     * When this is applied, the [CartesianChart]’s content takes up the [CartesianChart]’s entire width (unless padding
+     * is added). [HorizontalAxis] instances display a tick and a guideline for each label, with the tick, guideline,
+     * and label vertically centered relative to one another. [scalableStartPaddingDp], [scalableEndPaddingDp],
      * [unscalableStartPaddingDp], and [unscalableEndPaddingDp] control the amount of empty space at the start and end
-     * of the [Chart]. Scalable padding values are multiplied by the zoom factor, unlike unscalable ones.
+     * of the [CartesianChart]. Scalable padding values are multiplied by the zoom factor, unlike unscalable ones.
      */
     public class FullWidth(
         public val scalableStartPaddingDp: Float = 0f,
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/values/AxisValuesOverrider.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/values/AxisValueOverrider.kt
similarity index 59%
rename from vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/values/AxisValuesOverrider.kt
rename to vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/values/AxisValueOverrider.kt
index fc7cd8b7c..e2a99e358 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/values/AxisValuesOverrider.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/values/AxisValueOverrider.kt
@@ -16,85 +16,85 @@
 
 package com.patrykandpatrick.vico.core.chart.values
 
-import com.patrykandpatrick.vico.core.entry.ChartEntryModel
+import com.patrykandpatrick.vico.core.chart.layer.CartesianLayer
 import com.patrykandpatrick.vico.core.extension.round
+import com.patrykandpatrick.vico.core.model.CartesianLayerModel
 import kotlin.math.abs
 
 /**
- * Overrides a chart’s minimum and maximum x-axis and y-axis values.
- * This can be used with [com.patrykandpatrick.vico.views.chart.BaseChartView] and the
- * [com.patrykandpatrick.vico.compose.chart.Chart] composable.
+ * Overrides a [CartesianLayer]’s _x_ and _y_ ranges.
  */
-public interface AxisValuesOverrider<Model> {
+public interface AxisValueOverrider<T> {
     /**
      * The minimum value shown on the x-axis. If `null` is returned, the chart will fall back to the default value.
      *
      * @param model holds data about the chart’s entries, which can be used to calculate the new minimum x-axis value.
      */
-    public fun getMinX(model: Model): Float? = null
+    public fun getMinX(model: T): Float? = null
 
     /**
      * The maximum value shown on the x-axis. If `null` is returned, the chart will fall back to the default value.
      *
      * @param model holds data about the chart’s entries, which can be used to calculate the new maximum x-axis value.
      */
-    public fun getMaxX(model: Model): Float? = null
+    public fun getMaxX(model: T): Float? = null
 
     /**
      * The minimum value shown on the y-axis. If `null` is returned, the chart will fall back to the default value.
      *
      * @param model holds data about the chart’s entries, which can be used to calculate the new minimum y-axis value.
      */
-    public fun getMinY(model: Model): Float? = null
+    public fun getMinY(model: T): Float? = null
 
     /**
      * The maximum value shown on the y-axis. If `null` is returned, the chart will fall back to the default value.
      *
      * @param model holds data about the chart’s entries, which can be used to calculate the new maximum y-axis value.
      */
-    public fun getMaxY(model: Model): Float? = null
+    public fun getMaxY(model: T): Float? = null
 
     public companion object {
         /**
-         * Creates an [AxisValuesOverrider] with fixed values for [minX], [maxX], [minY], and [maxY]. If one of the
+         * Creates an [AxisValueOverrider] with fixed values for [minX], [maxX], [minY], and [maxY]. If one of the
          * values is `null`, the chart will fall back to the default value.
          */
-        public fun fixed(
+        public fun <T : CartesianLayerModel> fixed(
             minX: Float? = null,
             maxX: Float? = null,
             minY: Float? = null,
             maxY: Float? = null,
-        ): AxisValuesOverrider<ChartEntryModel> =
-            object : AxisValuesOverrider<ChartEntryModel> {
-                override fun getMinX(model: ChartEntryModel): Float? = minX
+        ): AxisValueOverrider<T> =
+            object : AxisValueOverrider<T> {
+                override fun getMinX(model: T): Float? = minX
 
-                override fun getMaxX(model: ChartEntryModel): Float? = maxX
+                override fun getMaxX(model: T): Float? = maxX
 
-                override fun getMinY(model: ChartEntryModel): Float? = minY
+                override fun getMinY(model: T): Float? = minY
 
-                override fun getMaxY(model: ChartEntryModel): Float? = maxY
+                override fun getMaxY(model: T): Float? = maxY
             }
 
         /**
-         * Creates an [AxisValuesOverrider] with adaptive minimum and maximum y-axis values. The overridden maximum
-         * y-axis value is equal to [ChartEntryModel.maxY] × [yFraction]. The overridden minimum y-axis value is smaller
-         * than [ChartEntryModel.minY] by [ChartEntryModel.maxY] × [yFraction] − [ChartEntryModel.maxY].
+         * Creates an [AxisValueOverrider] with adaptive minimum and maximum y-axis values. The overridden maximum
+         * y-axis value is equal to [CartesianLayerModel.maxY] × [yFraction]. The overridden minimum y-axis value is
+         * smaller than [CartesianLayerModel.minY] by [CartesianLayerModel.maxY] × [yFraction] −
+         * [CartesianLayerModel.maxY].
          */
-        public fun adaptiveYValues(
+        public fun <T : CartesianLayerModel> adaptiveYValues(
             yFraction: Float,
             round: Boolean = false,
-        ): AxisValuesOverrider<ChartEntryModel> =
-            object : AxisValuesOverrider<ChartEntryModel> {
+        ): AxisValueOverrider<T> =
+            object : AxisValueOverrider<T> {
                 init {
                     require(yFraction > 0f)
                 }
 
-                override fun getMinY(model: ChartEntryModel): Float {
+                override fun getMinY(model: T): Float {
                     val difference = abs(getMaxY(model) - model.maxY)
                     return (model.minY - difference).maybeRound().coerceAtLeast(0f)
                 }
 
-                override fun getMaxY(model: ChartEntryModel): Float = (model.maxY * yFraction).maybeRound()
+                override fun getMaxY(model: T): Float = (model.maxY * yFraction).maybeRound()
 
                 private fun Float.maybeRound() = if (round) this.round else this
             }
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/values/ChartValues.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/values/ChartValues.kt
index 28ee96f87..39416ada7 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/values/ChartValues.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/values/ChartValues.kt
@@ -16,30 +16,23 @@
 
 package com.patrykandpatrick.vico.core.chart.values
 
-import com.patrykandpatrick.vico.core.chart.Chart
-import com.patrykandpatrick.vico.core.entry.ChartEntryModel
+import com.patrykandpatrick.vico.core.axis.AxisPosition
+import com.patrykandpatrick.vico.core.chart.CartesianChart
+import com.patrykandpatrick.vico.core.model.CartesianChartModel
 import kotlin.math.abs
 import kotlin.math.ceil
 
 /**
- * Where [Chart]s get their data from.
- *
- * By default, [minX], [maxX], [minY], and [maxY] are equal to [ChartEntryModel.minX],
- * [ChartEntryModel.maxX], [ChartEntryModel.minY], and [ChartEntryModel.maxY], respectively,
- * but you can use [AxisValuesOverrider] to override these values.
+ * Houses a [CartesianChart]’s [CartesianChartModel] and _x_ and _y_ ranges.
  */
 public interface ChartValues {
     /**
-     * The minimum value displayed on the x-axis. By default, this is equal to [ChartEntryModel.minX] (the
-     * [ChartEntryModel] instance being [chartEntryModel]), but you can use [AxisValuesOverrider] to override this
-     * value.
+     * The minimum _x_ value.
      */
     public val minX: Float
 
     /**
-     * The maximum value displayed on the x-axis. By default, this is equal to [ChartEntryModel.maxX] (the
-     * [ChartEntryModel] instance being [chartEntryModel]), but you can use [AxisValuesOverrider] to override this
-     * value.
+     * The maximum _x_ value.
      */
     public val maxX: Float
 
@@ -49,39 +42,71 @@ public interface ChartValues {
     public val xStep: Float
 
     /**
-     * The minimum value displayed on the y-axis. By default, this is equal to [ChartEntryModel.minY] (the
-     * [ChartEntryModel] instance being [chartEntryModel]), but you can use [AxisValuesOverrider] to override this
-     * value.
+     * The [CartesianChart]’s [CartesianChartModel].
      */
-    public val minY: Float
+    public val model: CartesianChartModel
 
     /**
-     * The maximum value displayed on the y-axis. By default, this is equal to [ChartEntryModel.maxY] (the
-     * [ChartEntryModel] instance being [chartEntryModel]), but you can use [AxisValuesOverrider] to override this
-     * value.
+     * Returns the _y_ range associated with the given [AxisPosition.Vertical] subclass. If [axisPosition] is `null` or
+     * has no associated _y_ range, the global _y_ range is returned.
      */
-    public val maxY: Float
+    public fun getYRange(axisPosition: AxisPosition.Vertical?): YRange
 
     /**
-     * The source of the associated [Chart]’s entries. The [ChartEntryModel] defines the default values for [minX],
-     * [maxX], [minY], and [maxY].
+     * The difference between [maxX] and [minX].
      */
-    public val chartEntryModel: ChartEntryModel
+    public val xLength: Float get() = maxX - minX
 
     /**
-     * The difference between [maxX] and [minX].
+     * Returns the maximum number of major entries that can be present, based on [minX], [maxX], and [xStep].
      */
-    public val lengthX: Float
-        get() = maxX - minX
+    public fun getMaxMajorEntryCount(): Int = ceil(abs(maxX - minX) / xStep + 1).toInt()
 
     /**
-     * The difference between [maxY] and [minY].
+     * Holds information on a _y_ range.
      */
-    public val lengthY: Float
-        get() = maxY - minY
+    public interface YRange {
+        /**
+         * The minimum _y_ value.
+         */
+        public val minY: Float
+
+        /**
+         * The maximum _y_ value.
+         */
+        public val maxY: Float
+
+        /**
+         * The difference between [maxY] and [minY].
+         */
+        public val length: Float
+    }
 
     /**
-     * Returns the maximum number of major entries that can be present, based on [minX], [maxX], and [xStep].
+     * An empty [ChartValues] implementation.
      */
-    public fun getMaxMajorEntryCount(): Int = ceil(abs(maxX - minX) / xStep + 1).toInt()
+    public object Empty : ChartValues {
+        private const val ERROR_MESSAGE = "`ChartValues.Empty` shouldn’t be used."
+
+        override val minX: Float
+            get() {
+                error(ERROR_MESSAGE)
+            }
+
+        override val maxX: Float
+            get() {
+                error(ERROR_MESSAGE)
+            }
+
+        override val xStep: Float
+            get() {
+                error(ERROR_MESSAGE)
+            }
+
+        override val model: CartesianChartModel = CartesianChartModel.empty
+
+        override fun getYRange(axisPosition: AxisPosition.Vertical?): YRange {
+            error(ERROR_MESSAGE)
+        }
+    }
 }
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/values/ChartValuesManager.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/values/ChartValuesManager.kt
deleted file mode 100644
index 3f1907f38..000000000
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/values/ChartValuesManager.kt
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * Copyright 2023 by Patryk Goworowski and Patrick Michalik.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.patrykandpatrick.vico.core.chart.values
-
-import com.patrykandpatrick.vico.core.axis.AxisPosition
-import com.patrykandpatrick.vico.core.axis.AxisRenderer
-import com.patrykandpatrick.vico.core.chart.Chart
-import com.patrykandpatrick.vico.core.chart.column.ColumnChart
-import com.patrykandpatrick.vico.core.chart.line.LineChart
-import com.patrykandpatrick.vico.core.entry.ChartEntryModel
-
-/**
- * Manages the [ChartValues] used by a chart. There may be many [ChartValues], but all of them have the same
- * [ChartValues.minX] and [ChartValues.maxX] values. The following [ChartValues] instances exist in a chart:
- * - A main [ChartValues] instance, which is used by all components by default. It’s accessible with a null key and
- * always available in the drawing phase.
- * - A [ChartValues] instance for [AxisRenderer]s with [AxisPosition.Vertical.Start]. It’s available when the [Chart]
- * is configured to use [AxisPosition.Vertical.Start] as a key to update and retrieve its [ChartValues].
- * - A [ChartValues] instance for [AxisRenderer]s with [AxisPosition.Vertical.End]. It’s available when the [Chart]
- * is configured to use [AxisPosition.Vertical.End] as a key to update and retrieve its [ChartValues].
- *
- * @see ColumnChart.targetVerticalAxisPosition
- * @see LineChart.targetVerticalAxisPosition
- */
-public class ChartValuesManager : ChartValuesProvider {
-    internal val chartValues: MutableMap<AxisPosition.Vertical?, MutableChartValues> = mutableMapOf()
-
-    override fun getChartValues(axisPosition: AxisPosition.Vertical?): ChartValues =
-        chartValues[axisPosition]
-            ?.takeIf { it.hasValuesSet }
-            ?: chartValues.getOrPut(null) { MutableChartValues() }
-
-    /**
-     * Attempts to update the stored values to the provided values.
-     * [MutableChartValues.minX] and [MutableChartValues.minY] can be updated to a lower value.
-     * [MutableChartValues.maxX] and [MutableChartValues.maxY] can be updated to a higher value.
-     * [MutableChartValues.chartEntryModel] and [MutableChartValues.xStep] are always updated.
-     * If [axisPosition] is null, only the main [ChartValues] are updated. Otherwise, both the main [ChartValues]
-     * and the [ChartValues] associated with the given [axisPosition] are updated.
-     */
-    public fun tryUpdate(
-        minX: Float,
-        maxX: Float,
-        minY: Float,
-        maxY: Float,
-        xStep: Float,
-        chartEntryModel: ChartEntryModel,
-        axisPosition: AxisPosition.Vertical? = null,
-    ) {
-        chartValues.getOrPut(axisPosition) { MutableChartValues() }
-            .tryUpdate(
-                minX = minX,
-                maxX = maxX,
-                minY = minY,
-                maxY = maxY,
-                xStep = xStep,
-                chartEntryModel = chartEntryModel,
-            )
-
-        if (axisPosition != null) {
-            tryUpdate(minX, maxX, minY, maxY, xStep, chartEntryModel)
-        } else {
-            val mainValues = getChartValues(null)
-            chartValues.forEach { (key, values) ->
-                if (key != null) {
-                    values.tryUpdate(minX = mainValues.minX, maxX = mainValues.maxX)
-                }
-            }
-        }
-    }
-
-    /**
-     * Resets the values stored in each of the [ChartValues] instances in the [chartValues] map.
-     */
-    public fun resetChartValues() {
-        chartValues.values.forEach { it.reset() }
-    }
-}
-
-/**
- * Creates and returns a [ChartValuesProvider] implementation with this [ChartValuesManager]’s [ChartValues]
- * instances.
- */
-public fun ChartValuesManager.toChartValuesProvider(): ChartValuesProvider =
-    object : ChartValuesProvider {
-        val chartValues =
-            this@toChartValuesProvider
-                .chartValues
-                .map { (axisPosition, chartValues) -> axisPosition to chartValues.toImmutable() }
-                .toMap()
-
-        override fun getChartValues(axisPosition: AxisPosition.Vertical?): ChartValues =
-            chartValues[axisPosition] ?: chartValues.getValue(null)
-    }
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/values/ChartValuesProvider.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/values/ChartValuesProvider.kt
deleted file mode 100644
index 85f4a34c4..000000000
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/values/ChartValuesProvider.kt
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright 2023 by Patryk Goworowski and Patrick Michalik.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.patrykandpatrick.vico.core.chart.values
-
-import com.patrykandpatrick.vico.core.axis.AxisPosition
-
-/**
- * Provides a chart’s [ChartValues] instances.
- */
-public interface ChartValuesProvider {
-    /**
-     * Returns the [ChartValues] instance associated with the specified [AxisPosition.Vertical] subclass. If
-     * [axisPosition] is `null`, the chart’s main [ChartValues] instance is returned.
-     */
-    public fun getChartValues(axisPosition: AxisPosition.Vertical? = null): ChartValues
-
-    /**
-     * An empty [ChartValuesProvider] implementation. [getChartValues] throws an exception when called.
-     */
-    public companion object Empty : ChartValuesProvider {
-        override fun getChartValues(axisPosition: AxisPosition.Vertical?): ChartValues =
-            error("`ChartValuesProvider.Empty#getChartValues` shouldn’t be used.")
-    }
-}
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/values/MutableChartValues.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/values/MutableChartValues.kt
index 916d78147..87c1438aa 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/values/MutableChartValues.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/values/MutableChartValues.kt
@@ -16,9 +16,11 @@
 
 package com.patrykandpatrick.vico.core.chart.values
 
-import com.patrykandpatrick.vico.core.entry.ChartEntry
-import com.patrykandpatrick.vico.core.entry.ChartEntryModel
+import com.patrykandpatrick.vico.core.axis.AxisPosition
 import com.patrykandpatrick.vico.core.extension.orZero
+import com.patrykandpatrick.vico.core.model.CartesianChartModel
+import kotlin.math.max
+import kotlin.math.min
 
 /**
  * An implementation of [ChartValues] whose every property is mutable.
@@ -30,9 +32,7 @@ public class MutableChartValues : ChartValues {
 
     private var _xStep: Float? = null
 
-    private var _minY: Float? = null
-
-    private var _maxY: Float? = null
+    internal val yRanges: MutableMap<AxisPosition.Vertical?, MutableYRange> = mutableMapOf()
 
     override val minX: Float
         get() = _minX.orZero
@@ -43,67 +43,68 @@ public class MutableChartValues : ChartValues {
     override val xStep: Float
         get() = _xStep ?: 1f
 
-    override val minY: Float
-        get() = _minY.orZero
-
-    override val maxY: Float
-        get() = _maxY.orZero
+    override fun getYRange(axisPosition: AxisPosition.Vertical?): ChartValues.YRange =
+        yRanges[axisPosition] ?: yRanges.getValue(null)
 
-    override var chartEntryModel: ChartEntryModel = emptyChartEntryModel()
+    override var model: CartesianChartModel = CartesianChartModel.empty
 
     /**
-     * Returns `true` if all values have been set and at least one call to [tryUpdate] or [set] has been made.
+     * Updates [MutableChartValues.xStep] and [MutableChartValues.model].
      */
-    public val hasValuesSet: Boolean
-        get() = _minX != null || _maxX != null || _minY != null || _maxY != null
+    public fun update(
+        xStep: Float? = null,
+        model: CartesianChartModel,
+    ) {
+        _xStep = xStep
+        this.model = model
+    }
 
     /**
-     * Attempts to update the stored values to the provided values.
-     * [MutableChartValues.minX] and [MutableChartValues.minY] can be updated to a lower value.
-     * [MutableChartValues.maxX] and [MutableChartValues.maxY] can be updated to a higher value.
-     * [MutableChartValues.chartEntryModel] and [MutableChartValues.xStep] are always updated.
+     * Tries to update the stored values. A minimum value can only be decreased. A maximum value can only be increased.
      */
     public fun tryUpdate(
-        minX: Float? = null,
-        maxX: Float? = null,
-        minY: Float? = null,
-        maxY: Float? = null,
-        xStep: Float? = null,
-        chartEntryModel: ChartEntryModel = this.chartEntryModel,
-    ): MutableChartValues =
-        apply {
-            if (minX != null) _minX = if (_minX != null) minOf(this.minX, minX) else minX
-            if (maxX != null) _maxX = if (_maxX != null) maxOf(this.maxX, maxX) else maxX
-            if (minY != null) _minY = if (_minY != null) minOf(this.minY, minY) else minY
-            if (maxY != null) _maxY = if (_maxY != null) maxOf(this.maxY, maxY) else maxY
-            if (xStep != null) _xStep = xStep
-            this.chartEntryModel = chartEntryModel
+        minX: Float,
+        maxX: Float,
+        minY: Float,
+        maxY: Float,
+        axisPosition: AxisPosition.Vertical?,
+    ) {
+        _minX = _minX?.coerceAtMost(minX) ?: minX
+        _maxX = _maxX?.coerceAtLeast(maxX) ?: maxX
+        yRanges[null]?.tryUpdate(minY, maxY) ?: run { yRanges[null] = MutableYRange(minY, maxY) }
+        if (axisPosition != null) {
+            yRanges[axisPosition]?.tryUpdate(minY, maxY) ?: run { yRanges[axisPosition] = MutableYRange(minY, maxY) }
         }
+    }
 
     /**
-     * Sets [minX], [maxX], [minY], and [maxY] to 0.
+     * Clears all values.
      */
     public fun reset() {
         _minX = null
         _maxX = null
-        _minY = null
-        _maxY = null
+        yRanges.clear()
         _xStep = null
-        chartEntryModel = emptyChartEntryModel()
+        model = CartesianChartModel.empty
     }
 
-    private companion object {
-        fun emptyChartEntryModel(): ChartEntryModel =
-            object : ChartEntryModel {
-                override val entries: List<List<ChartEntry>> = emptyList()
-                override val minX: Float = 0f
-                override val maxX: Float = 0f
-                override val minY: Float = 0f
-                override val maxY: Float = 0f
-                override val stackedPositiveY: Float = 0f
-                override val stackedNegativeY: Float = 0f
-                override val xGcd: Float = 1f
-            }
+    /**
+     * A mutable implementation of [ChartValues.YRange].
+     */
+    public class MutableYRange(override var minY: Float, override var maxY: Float) : ChartValues.YRange {
+        override val length: Float get() = maxY - minY
+
+        /**
+         * Tries to update [MutableYRange.minY] and [MutableYRange.maxY]. [MutableYRange.minY] can only be decreased.
+         * [MutableYRange.maxY] can only be increased.
+         */
+        public fun tryUpdate(
+            minY: Float,
+            maxY: Float,
+        ) {
+            this.minY = min(this.minY, minY)
+            this.maxY = max(this.maxY, maxY)
+        }
     }
 }
 
@@ -112,10 +113,12 @@ public class MutableChartValues : ChartValues {
  */
 public fun MutableChartValues.toImmutable(): ChartValues =
     object : ChartValues {
+        private val yRanges = this@toImmutable.yRanges.toMap()
         override val minX: Float = this@toImmutable.minX
         override val maxX: Float = this@toImmutable.maxX
         override val xStep: Float = this@toImmutable.xStep
-        override val minY: Float = this@toImmutable.minY
-        override val maxY: Float = this@toImmutable.maxY
-        override val chartEntryModel: ChartEntryModel = this@toImmutable.chartEntryModel.toImmutable()
+        override val model: CartesianChartModel = this@toImmutable.model.toImmutable()
+
+        override fun getYRange(axisPosition: AxisPosition.Vertical?): ChartValues.YRange =
+            yRanges[axisPosition] ?: yRanges.getValue(null)
     }
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/component/marker/MarkerComponent.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/component/marker/MarkerComponent.kt
index 40caf5bab..94360fc0e 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/component/marker/MarkerComponent.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/component/marker/MarkerComponent.kt
@@ -20,7 +20,6 @@ import android.graphics.RectF
 import com.patrykandpatrick.vico.core.chart.dimensions.HorizontalDimensions
 import com.patrykandpatrick.vico.core.chart.insets.Insets
 import com.patrykandpatrick.vico.core.chart.values.ChartValues
-import com.patrykandpatrick.vico.core.chart.values.ChartValuesProvider
 import com.patrykandpatrick.vico.core.component.Component
 import com.patrykandpatrick.vico.core.component.shape.LineComponent
 import com.patrykandpatrick.vico.core.component.shape.ShapeComponent
@@ -75,7 +74,7 @@ public open class MarkerComponent(
         context: DrawContext,
         bounds: RectF,
         markedEntries: List<Marker.EntryModel>,
-        chartValuesProvider: ChartValuesProvider,
+        chartValues: ChartValues,
     ): Unit =
         with(context) {
             drawGuideline(context, bounds, markedEntries)
@@ -91,7 +90,7 @@ public open class MarkerComponent(
                     model.location.y + halfIndicatorSize,
                 )
             }
-            drawLabel(context, bounds, markedEntries, chartValuesProvider.getChartValues())
+            drawLabel(context, bounds, markedEntries, chartValues)
         }
 
     private fun drawLabel(
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/component/shape/shader/ColorShader.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/component/shape/shader/ColorShader.kt
new file mode 100644
index 000000000..7123d351b
--- /dev/null
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/component/shape/shader/ColorShader.kt
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2023 by Patryk Goworowski and Patrick Michalik.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.patrykandpatrick.vico.core.component.shape.shader
+
+import android.graphics.Bitmap
+import android.graphics.BitmapShader
+import android.graphics.RectF
+import android.graphics.Shader
+import com.patrykandpatrick.vico.core.context.DrawContext
+import com.patrykandpatrick.vico.core.util.Point
+
+/**
+ * Applies the given color ([color]) to the shaded area.
+ */
+public class ColorShader(public val color: Int) : DynamicShader {
+    private val shader =
+        BitmapShader(
+            Bitmap.createBitmap(1, 1, Bitmap.Config.ARGB_8888).apply { setPixel(0, 0, color) },
+            Shader.TileMode.CLAMP,
+            Shader.TileMode.CLAMP,
+        )
+
+    override fun provideShader(
+        context: DrawContext,
+        left: Float,
+        top: Float,
+        right: Float,
+        bottom: Float,
+    ): Shader = shader
+
+    override fun getColorAt(
+        point: Point,
+        drawContext: DrawContext,
+        rectF: RectF,
+    ): Int = color
+}
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/component/shape/shader/DynamicShader.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/component/shape/shader/DynamicShader.kt
index 9a7e4542d..1f2fb3014 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/component/shape/shader/DynamicShader.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/component/shape/shader/DynamicShader.kt
@@ -23,7 +23,7 @@ import android.graphics.RectF
 import android.graphics.Shader
 import com.patrykandpatrick.vico.core.context.DrawContext
 import com.patrykandpatrick.vico.core.context.getOrPutExtra
-import com.patrykandpatrick.vico.core.model.Point
+import com.patrykandpatrick.vico.core.util.Point
 import kotlin.math.roundToInt
 
 /**
@@ -62,58 +62,12 @@ public fun interface DynamicShader {
     ): Shader
 
     /**
-     * Applies the [Shader] to the [Paint] object.
-     *
-     * @param paint the [Paint] object to apply the style to.
-     * @param drawContext the [DrawContext] for the current draw operation.
-     * @param rectF the [RectF] holding coordinates of the area to apply the style to.
-     * @param zeroLineYFraction the fraction of the height of the area to apply the style to, that the zero line is at.
-     */
-    public fun applyTo(
-        paint: Paint,
-        drawContext: DrawContext,
-        rectF: RectF,
-        zeroLineYFraction: Float,
-    ) {
-        applyTo(paint, drawContext, rectF.left, rectF.top, rectF.right, rectF.bottom, zeroLineYFraction)
-    }
-
-    /**
-     * Applies the [Shader] to the [Paint] object.
-     *
-     * @param paint the [Paint] object to apply the style to.
-     * @param drawContext the [DrawContext] for the current draw operation.
-     * @param left the left coordinate of the area to apply the style to.
-     * @param top the top coordinate of the area to apply the style to.
-     * @param right the right coordinate of the area to apply the style to.
-     * @param bottom the bottom coordinate of the area to apply the style to.
-     * @param zeroLineYFraction the fraction of the height of the area to apply the style to, that the zero line is at.
-     */
-    public fun applyTo(
-        paint: Paint,
-        drawContext: DrawContext,
-        left: Float,
-        top: Float,
-        right: Float,
-        bottom: Float,
-        zeroLineYFraction: Float,
-    ) {
-        paint.shader = provideShader(drawContext, left, top, right, bottom)
-    }
-
-    /**
-     * Gets the pixel color of the [Shader] at the given [point].
-     *
-     * @param point the [Point] to get the color at.
-     * @param drawContext the [DrawContext] for the current draw operation.
-     * @param rectF the [RectF] holding coordinates of the area to apply the style to.
-     * @param zeroLineYFraction the fraction of the height of the area to apply the style to, that the zero line is at.
+     * Gets the color of the pixel at the given point. [rectF] specifies the shaded area.
      */
     public fun getColorAt(
         point: Point,
         drawContext: DrawContext,
         rectF: RectF,
-        zeroLineYFraction: Float,
     ): Int {
         val bitmap =
             drawContext.getOrPutExtra(bitmapPixelExtractionKey) {
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/component/shape/shader/DynamicShaders.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/component/shape/shader/DynamicShaders.kt
index 1c370cf3b..0f1097612 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/component/shape/shader/DynamicShaders.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/component/shape/shader/DynamicShaders.kt
@@ -49,7 +49,7 @@ public object DynamicShaders {
         }
 
     /**
-     * Creates a [ComposeShader] out of two [DynamicShader]s by using a [BlendMode].
+     * Creates a [ComposeShader] out of two [DynamicShader]s, combining [first] and [second] via [mode].
      */
     @RequiresApi(Build.VERSION_CODES.Q)
     public fun composeShader(
@@ -66,7 +66,7 @@ public object DynamicShaders {
         }
 
     /**
-     * Creates a [ComposeShader] out of two [DynamicShader]s by using a [PorterDuff.Mode].
+     * Creates a [ComposeShader] out of two [DynamicShader]s, combining [first] and [second] via [mode].
      */
     public fun composeShader(
         first: DynamicShader,
@@ -81,12 +81,3 @@ public object DynamicShaders {
             )
         }
 }
-
-/**
- * Creates a [DynamicShader] that is split into two shaders. The positive shader is used for values
- * above the zero line, and the negative shader is used for values below the zero line.
- */
-public fun DynamicShaders.splitShader(
-    positiveShader: DynamicShader,
-    negativeShader: DynamicShader,
-): HorizontalSplitShader.Double = HorizontalSplitShader.Double(positiveShader, negativeShader)
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/component/shape/shader/HorizontalSplitShader.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/component/shape/shader/HorizontalSplitShader.kt
deleted file mode 100644
index b56ce7124..000000000
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/component/shape/shader/HorizontalSplitShader.kt
+++ /dev/null
@@ -1,246 +0,0 @@
-/*
- * Copyright 2023 by Patryk Goworowski and Patrick Michalik.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.patrykandpatrick.vico.core.component.shape.shader
-
-import android.graphics.Bitmap
-import android.graphics.BitmapShader
-import android.graphics.Canvas
-import android.graphics.Matrix
-import android.graphics.Paint
-import android.graphics.RectF
-import android.graphics.Shader
-import com.patrykandpatrick.vico.core.context.DrawContext
-import com.patrykandpatrick.vico.core.model.Point
-
-/**
- * A [DynamicShader] that can apply two different [DynamicShader]s to the top and bottom part of the area.
- *
- * @property dividerYFraction the fraction of the height of the area to apply the style to, that the divider is at.
- */
-public abstract class HorizontalSplitShader(
-    public var dividerYFraction: Float = 0f,
-) : CacheableDynamicShader() {
-    private val paint = Paint()
-
-    override fun createShader(
-        context: DrawContext,
-        left: Float,
-        top: Float,
-        right: Float,
-        bottom: Float,
-    ): Shader {
-        val height = (bottom - top).toInt()
-        val width = (right - left).toInt()
-        val bitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888)
-        val canvas = Canvas(bitmap)
-        if (dividerYFraction > 0f) {
-            applyTopTo(paint, context, left, 0f, right, height * dividerYFraction)
-            canvas.drawRect(0f, 0f, width.toFloat(), height * dividerYFraction, paint)
-        }
-        if (dividerYFraction < 1f) {
-            applyBottomTo(paint, context, left, height * dividerYFraction, right, height.toFloat())
-            canvas.drawRect(0f, height * dividerYFraction, width.toFloat(), height.toFloat(), paint)
-        }
-        val matrix = Matrix().apply { postTranslate(left, top) }
-        return BitmapShader(bitmap, Shader.TileMode.CLAMP, Shader.TileMode.CLAMP).apply {
-            setLocalMatrix(matrix)
-        }
-    }
-
-    /**
-     * Applies the top style to the [Paint] object for the top part of the area.
-     *
-     * @param paint the [Paint] object to apply the style to.
-     * @param drawContext the [DrawContext] for the current draw operation.
-     * @param left the left coordinate of the area to apply the style to.
-     * @param top the top coordinate of the area to apply the style to.
-     * @param right the right coordinate of the area to apply the style to.
-     * @param bottom the bottom coordinate of the area to apply the style to.
-     */
-    public abstract fun applyTopTo(
-        paint: Paint,
-        drawContext: DrawContext,
-        left: Float,
-        top: Float,
-        right: Float,
-        bottom: Float,
-    )
-
-    /**
-     * Applies the bottom style to the [Paint] object for the bottom part of the area.
-     *
-     * @param paint the [Paint] object to apply the style to.
-     * @param drawContext the [DrawContext] for the current draw operation.
-     * @param left the left coordinate of the area to apply the style to.
-     * @param top the top coordinate of the area to apply the style to.
-     * @param right the right coordinate of the area to apply the style to.
-     * @param bottom the bottom coordinate of the area to apply the style to.
-     */
-    public abstract fun applyBottomTo(
-        paint: Paint,
-        drawContext: DrawContext,
-        left: Float,
-        top: Float,
-        right: Float,
-        bottom: Float,
-    )
-
-    override fun createKey(
-        left: Float,
-        top: Float,
-        right: Float,
-        bottom: Float,
-    ): String = super.createKey(left, top, right, bottom) + ",$dividerYFraction"
-
-    override fun applyTo(
-        paint: Paint,
-        drawContext: DrawContext,
-        left: Float,
-        top: Float,
-        right: Float,
-        bottom: Float,
-        zeroLineYFraction: Float,
-    ) {
-        dividerYFraction = zeroLineYFraction
-        super.applyTo(paint, drawContext, left, top, right, bottom, zeroLineYFraction)
-    }
-
-    override fun getColorAt(
-        point: Point,
-        drawContext: DrawContext,
-        rectF: RectF,
-        zeroLineYFraction: Float,
-    ): Int {
-        dividerYFraction = zeroLineYFraction
-        return super.getColorAt(point, drawContext, rectF, zeroLineYFraction)
-    }
-
-    /**
-     * A [HorizontalSplitShader] with a solid color for the top and bottom part of the area.
-     *
-     * @param colorTop the color for the top part of the area.
-     * @param colorBottom the color for the bottom part of the area.
-     * @param dividerYFraction the fraction of the height of the area to apply the style to, that the divider is at.
-     */
-    public class Solid(
-        public var colorTop: Int,
-        public var colorBottom: Int,
-        dividerYFraction: Float = 0f,
-    ) : HorizontalSplitShader(dividerYFraction) {
-        override fun applyTopTo(
-            paint: Paint,
-            drawContext: DrawContext,
-            left: Float,
-            top: Float,
-            right: Float,
-            bottom: Float,
-        ) {
-            paint.color = colorTop
-            paint.shader = null
-        }
-
-        override fun applyBottomTo(
-            paint: Paint,
-            drawContext: DrawContext,
-            left: Float,
-            top: Float,
-            right: Float,
-            bottom: Float,
-        ) {
-            paint.color = colorBottom
-            paint.shader = null
-        }
-
-        override fun createKey(
-            left: Float,
-            top: Float,
-            right: Float,
-            bottom: Float,
-        ): String = super.createKey(left, top, right, bottom) + ",$colorTop,$colorBottom"
-
-        override fun equals(other: Any?): Boolean =
-            when {
-                this === other -> true
-                other !is Solid -> false
-                else ->
-                    colorTop == other.colorTop &&
-                        colorBottom == other.colorBottom &&
-                        dividerYFraction == other.dividerYFraction
-            }
-
-        override fun hashCode(): Int {
-            var result = colorTop
-            result = 31 * result + colorBottom
-            result = 31 * result + dividerYFraction.hashCode()
-            return result
-        }
-    }
-
-    /**
-     * A [HorizontalSplitShader] with a [DynamicShader] for the top and bottom part of the area.
-     *
-     * @param topShader the [DynamicShader] for the top part of the area.
-     * @param bottomShader the [DynamicShader] for the bottom part of the area.
-     * @param dividerYFraction the fraction of the height of the area to apply the style to, that the divider is at.
-     */
-    public class Double(
-        public var topShader: DynamicShader,
-        public var bottomShader: DynamicShader,
-        dividerYFraction: Float = 0f,
-    ) : HorizontalSplitShader(dividerYFraction) {
-        override fun applyTopTo(
-            paint: Paint,
-            drawContext: DrawContext,
-            left: Float,
-            top: Float,
-            right: Float,
-            bottom: Float,
-        ) {
-            paint.shader = topShader.provideShader(drawContext, left, top, right, bottom)
-        }
-
-        override fun applyBottomTo(
-            paint: Paint,
-            drawContext: DrawContext,
-            left: Float,
-            top: Float,
-            right: Float,
-            bottom: Float,
-        ) {
-            paint.shader = bottomShader.provideShader(drawContext, left, top, right, bottom)
-        }
-
-        override fun createKey(
-            left: Float,
-            top: Float,
-            right: Float,
-            bottom: Float,
-        ): String = super.createKey(left, top, right, bottom) + ",${topShader.hashCode()},${bottomShader.hashCode()}"
-
-        override fun equals(other: Any?): Boolean =
-            when {
-                this === other -> true
-                other !is Double -> false
-                else ->
-                    topShader == other.topShader &&
-                        bottomShader == other.bottomShader &&
-                        dividerYFraction == other.dividerYFraction
-            }
-
-        override fun hashCode(): Int = 31 * topShader.hashCode() + bottomShader.hashCode()
-    }
-}
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/component/shape/shader/SolidShader.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/component/shape/shader/SolidShader.kt
deleted file mode 100644
index fc07e092e..000000000
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/component/shape/shader/SolidShader.kt
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Copyright 2023 by Patryk Goworowski and Patrick Michalik.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.patrykandpatrick.vico.core.component.shape.shader
-
-import android.graphics.Bitmap
-import android.graphics.BitmapShader
-import android.graphics.Paint
-import android.graphics.RectF
-import android.graphics.RuntimeShader
-import android.graphics.Shader
-import android.os.Build
-import com.patrykandpatrick.vico.core.context.DrawContext
-import com.patrykandpatrick.vico.core.model.Point
-
-/**
- * A [DynamicShader] that fills the area with the solid [color].
- */
-public class SolidShader(public val color: Int) : DynamicShader {
-    private val shader: Shader = getShaderImplementation()
-
-    private fun getShaderImplementation(): Shader {
-        return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-            RuntimeShader(SHADER_CODE).apply {
-                setColorUniform(INPUT_COLOR, color)
-            }
-        } else {
-            val bitmap =
-                Bitmap.createBitmap(1, 1, Bitmap.Config.ARGB_8888).apply {
-                    setPixel(0, 0, color)
-                }
-            BitmapShader(bitmap, Shader.TileMode.CLAMP, Shader.TileMode.CLAMP)
-        }
-    }
-
-    override fun provideShader(
-        context: DrawContext,
-        left: Float,
-        top: Float,
-        right: Float,
-        bottom: Float,
-    ): Shader = shader
-
-    override fun applyTo(
-        paint: Paint,
-        drawContext: DrawContext,
-        left: Float,
-        top: Float,
-        right: Float,
-        bottom: Float,
-        zeroLineYFraction: Float,
-    ) {
-        paint.shader = shader
-    }
-
-    override fun getColorAt(
-        point: Point,
-        drawContext: DrawContext,
-        rectF: RectF,
-        zeroLineYFraction: Float,
-    ): Int = color
-
-    private companion object {
-        private const val INPUT_COLOR = "inputColor"
-
-        private val SHADER_CODE =
-            """
-            layout(color) uniform vec4 $INPUT_COLOR;
-            vec4 main(vec2 canvas_coordinates) {
-                return $INPUT_COLOR;
-            }
-            """.trimIndent()
-    }
-}
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/component/shape/shader/TopBottomShader.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/component/shape/shader/TopBottomShader.kt
new file mode 100644
index 000000000..b8efb225b
--- /dev/null
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/component/shape/shader/TopBottomShader.kt
@@ -0,0 +1,87 @@
+/*
+ * Copyright 2023 by Patryk Goworowski and Patrick Michalik.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.patrykandpatrick.vico.core.component.shape.shader
+
+import android.graphics.Bitmap
+import android.graphics.BitmapShader
+import android.graphics.Canvas
+import android.graphics.Matrix
+import android.graphics.Paint
+import android.graphics.Shader
+import com.patrykandpatrick.vico.core.context.DrawContext
+
+/**
+ * Splits the shaded area into two parts and applies two other [DynamicShader]s, [topShader] and [bottomShader].
+ * [splitY] expresses the distance of the split from the bottom of the shaded area as a fraction of the area’s height.
+ */
+public class TopBottomShader(
+    public var topShader: DynamicShader,
+    public var bottomShader: DynamicShader,
+    public var splitY: Float = 0f,
+) : CacheableDynamicShader() {
+    private val paint = Paint()
+
+    override fun createShader(
+        context: DrawContext,
+        left: Float,
+        top: Float,
+        right: Float,
+        bottom: Float,
+    ): Shader {
+        val width = (right - left).toInt()
+        val height = (bottom - top).toInt()
+        val bitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888)
+        val canvas = Canvas(bitmap)
+        if (splitY > 0f) {
+            paint.shader =
+                topShader.provideShader(
+                    context = context,
+                    left = left,
+                    top = 0f,
+                    right = right,
+                    bottom = height * splitY,
+                )
+            canvas.drawRect(0f, 0f, width.toFloat(), height * splitY, paint)
+        }
+        if (splitY < 1f) {
+            paint.shader =
+                bottomShader.provideShader(
+                    context = context,
+                    left = left,
+                    top = height * splitY,
+                    right = right,
+                    bottom = height.toFloat(),
+                )
+            canvas.drawRect(0f, height * splitY, width.toFloat(), height.toFloat(), paint)
+        }
+        return BitmapShader(bitmap, Shader.TileMode.CLAMP, Shader.TileMode.CLAMP)
+            .apply { setLocalMatrix(Matrix().apply { postTranslate(left, top) }) }
+    }
+
+    override fun createKey(
+        left: Float,
+        top: Float,
+        right: Float,
+        bottom: Float,
+    ): String = "${super.createKey(left, top, right, bottom)},${topShader.hashCode()},${bottomShader.hashCode()}"
+
+    override fun equals(other: Any?): Boolean =
+        this === other || other is TopBottomShader &&
+            topShader == other.topShader && bottomShader == other.bottomShader && splitY == other.splitY
+
+    override fun hashCode(): Int = 31 * topShader.hashCode() + bottomShader.hashCode()
+}
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/context/MeasureContext.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/context/MeasureContext.kt
index 4ddb51173..65ff68cf3 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/context/MeasureContext.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/context/MeasureContext.kt
@@ -19,7 +19,6 @@ package com.patrykandpatrick.vico.core.context
 import android.graphics.RectF
 import com.patrykandpatrick.vico.core.chart.layout.HorizontalLayout
 import com.patrykandpatrick.vico.core.chart.values.ChartValues
-import com.patrykandpatrick.vico.core.chart.values.ChartValuesProvider
 
 /**
  * [MeasureContext] holds data used by various chart components during the measuring and drawing phases.
@@ -31,11 +30,9 @@ public interface MeasureContext : Extras {
     public val canvasBounds: RectF
 
     /**
-     * Provides the chart’s [ChartValues] instances.
-     *
-     * @see [ChartValuesProvider]
+     * The chart’s [ChartValues].
      */
-    public val chartValuesProvider: ChartValuesProvider
+    public val chartValues: ChartValues
 
     /**
      * The pixel density.
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/context/MutableMeasureContext.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/context/MutableMeasureContext.kt
index 76d32b6db..39ef415c3 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/context/MutableMeasureContext.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/context/MutableMeasureContext.kt
@@ -19,7 +19,7 @@ package com.patrykandpatrick.vico.core.context
 import android.graphics.RectF
 import androidx.annotation.RestrictTo
 import com.patrykandpatrick.vico.core.chart.layout.HorizontalLayout
-import com.patrykandpatrick.vico.core.chart.values.ChartValuesProvider
+import com.patrykandpatrick.vico.core.chart.values.ChartValues
 
 /**
  * A [MeasureContext] implementation that facilitates the mutation of some of its properties.
@@ -32,7 +32,7 @@ public data class MutableMeasureContext(
     override var horizontalLayout: HorizontalLayout = HorizontalLayout.Segmented,
     @get:RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
     public var spToPx: (Float) -> Float,
-    override var chartValuesProvider: ChartValuesProvider,
+    override var chartValues: ChartValues,
 ) : MeasureContext, Extras by DefaultExtras() {
     override fun reset() {
         clearExtras()
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/draw/DrawContextExtensions.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/draw/DrawContextExtensions.kt
index 14c31b544..f2637e3b6 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/draw/DrawContextExtensions.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/draw/DrawContextExtensions.kt
@@ -20,7 +20,7 @@ import android.graphics.Canvas
 import android.graphics.RectF
 import com.patrykandpatrick.vico.core.DefaultColors
 import com.patrykandpatrick.vico.core.chart.layout.HorizontalLayout
-import com.patrykandpatrick.vico.core.chart.values.ChartValuesProvider
+import com.patrykandpatrick.vico.core.chart.values.ChartValues
 import com.patrykandpatrick.vico.core.context.DefaultExtras
 import com.patrykandpatrick.vico.core.context.DrawContext
 import com.patrykandpatrick.vico.core.context.Extras
@@ -55,7 +55,7 @@ public fun drawContext(
         override val density: Float = density
         override val isLtr: Boolean = isLtr
         override val isHorizontalScrollEnabled: Boolean = false
-        override val chartValuesProvider: ChartValuesProvider = ChartValuesProvider.Empty
+        override val chartValues: ChartValues = ChartValues.Empty
         override val horizontalLayout: HorizontalLayout = HorizontalLayout.Segmented
 
         override fun withOtherCanvas(
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/entry/ChartEntry.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/entry/ChartEntry.kt
deleted file mode 100644
index eb0d12fe9..000000000
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/entry/ChartEntry.kt
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright 2023 by Patryk Goworowski and Patrick Michalik.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.patrykandpatrick.vico.core.entry
-
-import com.patrykandpatrick.vico.core.chart.Chart
-
-/**
- * The base for a single chart entry rendered by [Chart] subclasses.
- * It holds information about the location of the chart entry on the x-axis and y-axis.
- */
-public interface ChartEntry {
-    /**
-     * The position of this [ChartEntry] on the x-axis.
-     */
-    public val x: Float
-
-    /**
-     * The position of this [ChartEntry] on the y-axis.
-     */
-    public val y: Float
-
-    /**
-     * @see x
-     */
-    public operator fun component1(): Float = x
-
-    /**
-     * @see y
-     */
-    public operator fun component2(): Float = y
-
-    /**
-     * Creates a copy of this [ChartEntry] implementation, but with a new [y] value.
-     */
-    public fun withY(y: Float): ChartEntry
-}
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/entry/ChartEntryExtensions.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/entry/ChartEntryExtensions.kt
deleted file mode 100644
index ee743a1b6..000000000
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/entry/ChartEntryExtensions.kt
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * Copyright 2023 by Patryk Goworowski and Patrick Michalik.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.patrykandpatrick.vico.core.entry
-
-import com.patrykandpatrick.vico.core.extension.gcdWith
-import com.patrykandpatrick.vico.core.extension.rangeOfOrNull
-import com.patrykandpatrick.vico.core.extension.rangeOfPairOrNull
-import kotlin.math.abs
-
-/**
- * Creates a [FloatEntry] instance.
- *
- * @param [x] the [FloatEntry]’s _x_ coordinate.
- * @param [y] the [FloatEntry]’s _y_ coordinate.
- *
- * @see [entriesOf]
- */
-public fun entryOf(
-    x: Float,
-    y: Float,
-): FloatEntry = FloatEntry(x, y)
-
-/**
- * Creates a [FloatEntry] instance.
-
- * @param [x] the [FloatEntry]’s _x_ coordinate. This will be converted to a [Float] instance.
- * @param [y] the [FloatEntry]’s _y_ coordinate. This will be converted to a [Float] instance.
- *
- * @see [entriesOf]
- */
-public fun entryOf(
-    x: Number,
-    y: Number,
-): FloatEntry = entryOf(x.toFloat(), y.toFloat())
-
-/**
- * Creates a [List] of [FloatEntry] instances. Each of the provided [Pair]s corresponds to a single [FloatEntry], with
- * the first element of the [Pair] being the [FloatEntry]’s _x_ coordinate, and the second element of the [Pair] being
- * the [FloatEntry]’s _y_ coordinate.
- *
- * Example usage:
- *
- * ```
- *  entriesOf(0 to 1, 1 to 2, 3 to 5)
- * ```
- *
- * The provided [Number] instances will be converted to [Float] instances.
- *
- * @see [entryOf]
- */
-public fun entriesOf(vararg pairs: Pair<Number, Number>): List<FloatEntry> = pairs.map { (x, y) -> entryOf(x, y) }
-
-/**
- * Creates a [List] of [FloatEntry] instances out of an array of y-axis values.
- *
- * The following are equivalent:
- *
- * ```
- * entriesOf(1, 2, 5)
- * ```
- *
- * ```
- * entriesOf(0 to 1, 1 to 2, 2 to 5)
- * ```
- *
- * An x-axis value will be automatically assigned to each y-axis value from [yValues]. The x-axis value will be equal
- * to the y-axis value’s index in [yValues].
- *
- * The provided [Number] instances will be converted to [Float] instances.
- *
- * @see [entryOf]
- */
-public fun entriesOf(vararg yValues: Number): List<FloatEntry> = yValues.mapIndexed { index, y -> entryOf(index, y) }
-
-internal inline val Iterable<Iterable<ChartEntry>>.yRange: ClosedFloatingPointRange<Float>
-    get() = flatten().rangeOfOrNull { it.y } ?: 0f..0f
-
-internal inline val Iterable<Iterable<ChartEntry>>.xRange: ClosedFloatingPointRange<Float>
-    get() = flatten().rangeOfOrNull { it.x } ?: 0f..0f
-
-internal fun Iterable<Iterable<ChartEntry>>.calculateXGcd() =
-    flatten()
-        .zipWithNext { firstEntry, secondEntry -> abs(secondEntry.x - firstEntry.x) }
-        .fold<Float, Float?>(null) { gcd, delta -> gcd?.gcdWith(delta) ?: delta }
-        ?.also {
-            require(it != 0f) { "The precision of the x values is too large. The maximum is two decimal places." }
-        }
-        ?: 1f
-
-internal fun Iterable<Iterable<ChartEntry>>.calculateStackedYRange(): ClosedFloatingPointRange<Float> =
-    flatten().fold(HashMap<Float, Pair<Float, Float>>()) { map, entry ->
-        val (negY, posY) = map.getOrElse(entry.x) { 0f to 0f }
-        map[entry.x] = if (entry.y < 0f) negY + entry.y to posY else negY to posY + entry.y
-        map
-    }.values.rangeOfPairOrNull { it } ?: 0f..0f
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/entry/ChartEntryModel.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/entry/ChartEntryModel.kt
deleted file mode 100644
index be8802d9c..000000000
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/entry/ChartEntryModel.kt
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * Copyright 2023 by Patryk Goworowski and Patrick Michalik.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.patrykandpatrick.vico.core.entry
-
-import com.patrykandpatrick.vico.core.chart.Chart
-import com.patrykandpatrick.vico.core.chart.column.ColumnChart
-import com.patrykandpatrick.vico.core.chart.line.LineChart
-import com.patrykandpatrick.vico.core.chart.values.AxisValuesOverrider
-import com.patrykandpatrick.vico.core.chart.values.ChartValues
-import com.patrykandpatrick.vico.core.entry.composed.ComposedChartEntryModelProducer
-import com.patrykandpatrick.vico.core.entry.diff.DrawingModel
-import com.patrykandpatrick.vico.core.entry.diff.ExtraStore
-
-/**
- * Contains the data for a [Chart]. Pre-calculates values needed for the rendering of the [Chart].
- *
- * The [Chart] may override [minX], [maxX], [minY], or [maxY] via [AxisValuesOverrider]. These overrides will be used
- * in the [Chart]’s [ChartValues] instance.
- *
- * It’s recommended to delegate the creation of [ChartEntryModel] to [ChartEntryModelProducer] or
- * [ComposedChartEntryModelProducer].
- *
- * @see [ChartValues]
- * @see [ChartEntryModelProducer]
- * @see [ComposedChartEntryModelProducer].
- */
-public interface ChartEntryModel {
-    /**
-     * The [ChartEntryModel]’s identifier. Different [ChartEntryModel] instances don’t necessarily have different
-     * identifiers. [ChartEntryModelProducer] and [ComposedChartEntryModelProducer] use the same [id] for all
-     * [ChartEntryModel] instances created for the purpose of running a single difference animation. This enables
-     * charts to differentiate between data set changes and difference animations.
-     */
-    public val id: Int
-        get() = entries.hashCode()
-
-    /**
-     * The chart entries ([ChartEntry] instances). Multiple lists of [ChartEntry] instances can be provided. In such a
-     * case, entries will be associated by index, and the [Chart] will stack or group them if it’s a [ColumnChart],
-     * and display multiple lines if it’s a [LineChart].
-     */
-    public val entries: List<List<ChartEntry>>
-
-    /**
-     * The minimum x-axis value from among all [entries].
-     */
-    public val minX: Float
-
-    /**
-     * The maximum x-axis value from among all [entries].
-     */
-    public val maxX: Float
-
-    /**
-     * The minimum y-axis value from among all [entries].
-     */
-    public val minY: Float
-
-    /**
-     * The maximum y-axis value from among all [entries].
-     */
-    public val maxY: Float
-
-    /**
-     * The maximum cumulated y-axis value from among all sets of entries associated by [ChartEntry.x].
-     */
-    public val stackedPositiveY: Float
-
-    /**
-     * The minimum cumulated y-axis value from among all sets of entries associated by [ChartEntry.x].
-     */
-    public val stackedNegativeY: Float
-
-    /**
-     * The greatest common divisor of the _x_ values.
-     */
-    public val xGcd: Float
-
-    /**
-     * Houses auxiliary data, including [DrawingModel]s.
-     */
-    public val extraStore: ExtraStore
-        get() = ExtraStore.empty
-
-    /**
-     * Returns an immutable copy of this [ChartEntryModel].
-     */
-    public fun toImmutable(): ChartEntryModel = this
-}
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/entry/ChartEntryModelProducer.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/entry/ChartEntryModelProducer.kt
deleted file mode 100644
index b40ca2634..000000000
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/entry/ChartEntryModelProducer.kt
+++ /dev/null
@@ -1,242 +0,0 @@
-/*
- * Copyright 2023 by Patryk Goworowski and Patrick Michalik.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.patrykandpatrick.vico.core.entry
-
-import androidx.annotation.WorkerThread
-import com.patrykandpatrick.vico.core.chart.Chart
-import com.patrykandpatrick.vico.core.chart.values.ChartValuesProvider
-import com.patrykandpatrick.vico.core.entry.diff.ExtraStore
-import com.patrykandpatrick.vico.core.entry.diff.MutableExtraStore
-import com.patrykandpatrick.vico.core.extension.copy
-import kotlinx.coroutines.CompletableDeferred
-import kotlinx.coroutines.CoroutineDispatcher
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Deferred
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.async
-import kotlinx.coroutines.awaitAll
-import kotlinx.coroutines.currentCoroutineContext
-import kotlinx.coroutines.ensureActive
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.sync.Mutex
-
-/**
- * A [ChartModelProducer] implementation that generates [ChartEntryModel] instances.
- *
- * @param entryCollections the initial data set (list of series).
- * @param dispatcher the [CoroutineDispatcher] to be used for update handling.
- *
- * @see ChartModelProducer
- */
-public class ChartEntryModelProducer(
-    entryCollections: List<List<ChartEntry>>,
-    dispatcher: CoroutineDispatcher = Dispatchers.Default,
-) : ChartModelProducer<ChartEntryModel> {
-    private var series = emptyList<List<ChartEntry>>()
-    private var cachedInternalModel: InternalModel? = null
-    private val mutex = Mutex()
-    private val coroutineScope = CoroutineScope(dispatcher)
-    private val updateReceivers: HashMap<Any, UpdateReceiver> = HashMap()
-    private val extraStore = MutableExtraStore()
-
-    public constructor(
-        vararg entryCollections: List<ChartEntry>,
-        dispatcher: CoroutineDispatcher = Dispatchers.Default,
-    ) : this(entryCollections.toList(), dispatcher)
-
-    init {
-        setEntries(entryCollections)
-    }
-
-    /**
-     * Requests that the data set be updated to the provided one. If the update is accepted, `true` is returned. If the
-     * update is rejected, which occurs when there’s already an update in progress, `false` is returned. For suspending
-     * behavior, use [setEntriesSuspending]. [updateExtras] allows for adding auxiliary data, which can later be
-     * retrieved via [ChartEntryModel.extraStore].
-     */
-    public fun setEntries(
-        entries: List<List<ChartEntry>>,
-        updateExtras: (MutableExtraStore) -> Unit = {},
-    ): Boolean {
-        if (!mutex.tryLock()) return false
-        series = entries.copy()
-        updateExtras(extraStore)
-        cachedInternalModel = null
-        val deferredUpdates =
-            updateReceivers.values.map { updateReceiver ->
-                coroutineScope.async { updateReceiver.handleUpdate() }
-            }
-        coroutineScope.launch {
-            deferredUpdates.awaitAll()
-            mutex.unlock()
-        }
-        return true
-    }
-
-    /**
-     * Updates the data set. Unlike [setEntries], this function suspends the current coroutine and waits until an update
-     * can be run, meaning the update cannot be rejected. The returned [Deferred] implementation is marked as completed
-     * once the update has been processed. [updateExtras] allows for adding auxiliary data, which can later be retrieved
-     * via [ChartEntryModel.extraStore].
-     */
-    public suspend fun setEntriesSuspending(
-        entries: List<List<ChartEntry>>,
-        updateExtras: (MutableExtraStore) -> Unit = {},
-    ): Deferred<Unit> {
-        mutex.lock()
-        series = entries.copy()
-        updateExtras(extraStore)
-        cachedInternalModel = null
-        val completableDeferred = CompletableDeferred<Unit>()
-        val deferredUpdates =
-            updateReceivers.values.map { updateReceiver ->
-                coroutineScope.async { updateReceiver.handleUpdate() }
-            }
-        coroutineScope.launch {
-            deferredUpdates.awaitAll()
-            mutex.unlock()
-            completableDeferred.complete(Unit)
-        }
-        return completableDeferred
-    }
-
-    /**
-     * Requests that the data set be updated to the provided one. If the update is accepted, `true` is returned. If the
-     * update is rejected, which occurs when there’s already an update in progress, `false` is returned. For suspending
-     * behavior, use [setEntriesSuspending]. [updateExtras] allows for adding auxiliary data, which can later be
-     * retrieved via [ChartEntryModel.extraStore].
-     */
-    public fun setEntries(
-        vararg entries: List<ChartEntry>,
-        updateExtras: (MutableExtraStore) -> Unit = {},
-    ): Boolean = setEntries(entries.toList(), updateExtras)
-
-    /**
-     * Updates the data set. Unlike [setEntries], this function suspends the current coroutine and waits until an update
-     * can be run, meaning the update cannot be rejected. The returned [Deferred] implementation is marked as completed
-     * once the update has been processed. [updateExtras] allows for adding auxiliary data, which can later be retrieved
-     * via [ChartEntryModel.extraStore].
-     */
-    public suspend fun setEntriesSuspending(
-        vararg entries: List<ChartEntry>,
-        updateExtras: (MutableExtraStore) -> Unit = {},
-    ): Deferred<Unit> = setEntriesSuspending(entries.toList(), updateExtras)
-
-    private fun getInternalModel(extraStore: ExtraStore? = null) =
-        if (series.isEmpty()) {
-            null
-        } else {
-            val mergedExtraStore = this.extraStore.let { if (extraStore != null) it + extraStore else it }
-            cachedInternalModel?.copy(extraStore = mergedExtraStore)
-                ?: run {
-                    val xRange = series.xRange
-                    val yRange = series.yRange
-                    val aggregateYRange = series.calculateStackedYRange()
-                    InternalModel(
-                        entries = series,
-                        minX = xRange.start,
-                        maxX = xRange.endInclusive,
-                        minY = yRange.start,
-                        maxY = yRange.endInclusive,
-                        stackedPositiveY = aggregateYRange.endInclusive,
-                        stackedNegativeY = aggregateYRange.start,
-                        xGcd = series.calculateXGcd(),
-                        id = series.hashCode(),
-                        extraStore = mergedExtraStore,
-                    ).also { cachedInternalModel = it }
-                }
-        }
-
-    override fun getModel(): ChartEntryModel? = getInternalModel()
-
-    override suspend fun transformModel(
-        key: Any,
-        fraction: Float,
-    ) {
-        with(updateReceivers[key] ?: return) {
-            modelTransformer?.transform(extraStore, fraction)
-            val internalModel = getInternalModel(extraStore.copy())
-            currentCoroutineContext().ensureActive()
-            onModelCreated(internalModel)
-        }
-    }
-
-    @WorkerThread
-    override fun registerForUpdates(
-        key: Any,
-        cancelAnimation: () -> Unit,
-        startAnimation: (transformModel: suspend (chartKey: Any, fraction: Float) -> Unit) -> Unit,
-        getOldModel: () -> ChartEntryModel?,
-        modelTransformerProvider: Chart.ModelTransformerProvider?,
-        extraStore: MutableExtraStore,
-        updateChartValues: (ChartEntryModel?) -> ChartValuesProvider,
-        onModelCreated: (ChartEntryModel?) -> Unit,
-    ) {
-        UpdateReceiver(
-            cancelAnimation,
-            startAnimation,
-            onModelCreated,
-            extraStore,
-            modelTransformerProvider?.getModelTransformer(),
-            getOldModel,
-            updateChartValues,
-        ).run {
-            updateReceivers[key] = this
-            handleUpdate()
-        }
-    }
-
-    override fun unregisterFromUpdates(key: Any) {
-        updateReceivers.remove(key)
-    }
-
-    override fun isRegistered(key: Any): Boolean = updateReceivers.containsKey(key = key)
-
-    private inner class UpdateReceiver(
-        val cancelAnimation: () -> Unit,
-        val startAnimation: (transformModel: suspend (chartKey: Any, fraction: Float) -> Unit) -> Unit,
-        val onModelCreated: (ChartEntryModel?) -> Unit,
-        val extraStore: MutableExtraStore,
-        val modelTransformer: Chart.ModelTransformer<ChartEntryModel>?,
-        val getOldModel: () -> ChartEntryModel?,
-        val updateChartValues: (ChartEntryModel?) -> ChartValuesProvider,
-    ) {
-        fun handleUpdate() {
-            cancelAnimation()
-            modelTransformer?.prepareForTransformation(
-                oldModel = getOldModel(),
-                newModel = getModel(),
-                extraStore = extraStore,
-                chartValuesProvider = updateChartValues(getModel()),
-            )
-            startAnimation(::transformModel)
-        }
-    }
-
-    private data class InternalModel(
-        override val entries: List<List<ChartEntry>>,
-        override val minX: Float,
-        override val maxX: Float,
-        override val minY: Float,
-        override val maxY: Float,
-        override val stackedPositiveY: Float,
-        override val stackedNegativeY: Float,
-        override val xGcd: Float,
-        override val id: Int,
-        override val extraStore: ExtraStore,
-    ) : ChartEntryModel
-}
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/entry/ChartModelProducer.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/entry/ChartModelProducer.kt
deleted file mode 100644
index fef077573..000000000
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/entry/ChartModelProducer.kt
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright 2023 by Patryk Goworowski and Patrick Michalik.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.patrykandpatrick.vico.core.entry
-
-import com.patrykandpatrick.vico.core.chart.Chart
-import com.patrykandpatrick.vico.core.chart.values.ChartValues
-import com.patrykandpatrick.vico.core.chart.values.ChartValuesProvider
-import com.patrykandpatrick.vico.core.entry.composed.ComposedChartEntryModelProducer
-import com.patrykandpatrick.vico.core.entry.diff.MutableExtraStore
-
-/**
- * Generates [ChartEntryModel]s and handles difference animations.
- *
- * @see ChartEntryModelProducer
- * @see ComposedChartEntryModelProducer
- */
-public interface ChartModelProducer<Model : ChartEntryModel> {
-    /**
-     * Returns the [ChartEntryModel] or, if no [ChartEntryModel] is available, `null`.
-     */
-    public fun getModel(): Model?
-
-    /**
-     * Returns the [ChartEntryModel] or, if no [ChartEntryModel] is available, throws an exception.
-     */
-    public fun requireModel(): Model = getModel()!!
-
-    /**
-     * Creates an intermediate [ChartEntryModel] for difference animations. [fraction] is the balance between the
-     * initial and target [ChartEntryModel]s.
-     */
-    public suspend fun transformModel(
-        key: Any,
-        fraction: Float,
-    )
-
-    /**
-     * Registers an update listener associated with a [key]. [cancelAnimation] and [startAnimation] are
-     * called after a data update is requested, with [cancelAnimation] being called before the update starts
-     * being processed (at which point [transformModel] should stop being used), and [startAnimation] being
-     * called once the update has been processed (at which point it’s safe to use [transformModel]). [updateChartValues]
-     * updates the chart’s [ChartValues] and returns its [ChartValuesProvider]. [onModelCreated] is called when a new
-     * [Model] has been generated.
-     */
-    public fun registerForUpdates(
-        key: Any,
-        cancelAnimation: () -> Unit,
-        startAnimation: (transformModel: suspend (chartKey: Any, fraction: Float) -> Unit) -> Unit,
-        getOldModel: () -> Model?,
-        modelTransformerProvider: Chart.ModelTransformerProvider?,
-        extraStore: MutableExtraStore,
-        updateChartValues: (Model?) -> ChartValuesProvider,
-        onModelCreated: (Model?) -> Unit,
-    )
-
-    /**
-     * Checks if an update listener with the given [key] is registered.
-     */
-    public fun isRegistered(key: Any): Boolean
-
-    /**
-     * Unregisters the update listener associated with the given [key].
-     */
-    public fun unregisterFromUpdates(key: Any)
-}
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/entry/EntryListExtensions.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/entry/EntryListExtensions.kt
deleted file mode 100644
index 857e73536..000000000
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/entry/EntryListExtensions.kt
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright 2023 by Patryk Goworowski and Patrick Michalik.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.patrykandpatrick.vico.core.entry
-
-import com.patrykandpatrick.vico.core.chart.column.ColumnChart
-import com.patrykandpatrick.vico.core.chart.line.LineChart
-
-/**
- * Creates a [ChartEntryModel] out of the given pairs of numbers, treating the first number in each pair as the _x_
- * value, and the second one as the _y_ value.
- */
-public fun entryModelOf(vararg entries: Pair<Number, Number>): ChartEntryModel =
-    entries
-        .map { (x, y) -> entryOf(x.toFloat(), y.toFloat()) }
-        .let { entryList -> ChartEntryModelProducer(listOf(entryList)) }
-        .requireModel()
-
-/**
- * Creates a [ChartEntryModel] out of the provided array of numbers, treating each number’s index as the _x_ value, and
- * the number itself as the _y_ value.
- */
-public fun entryModelOf(vararg values: Number): ChartEntryModel =
-    values
-        .mapIndexed { index, value -> entryOf(index.toFloat(), value.toFloat()) }
-        .let { entryList -> ChartEntryModelProducer(listOf(entryList)) }
-        .requireModel()
-
-/**
- * Creates a [ChartEntryModel] out of the provided list of list of [FloatEntry] instances.
- *
- * This can be used to create [LineChart]s with multiple lines and [ColumnChart]s with grouped or stacked columns.
- */
-public fun entryModelOf(vararg values: List<FloatEntry>): ChartEntryModel =
-    ChartEntryModelProducer(values.toList()).requireModel()
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/entry/FloatEntry.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/entry/FloatEntry.kt
deleted file mode 100644
index 2fc45a206..000000000
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/entry/FloatEntry.kt
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright 2023 by Patryk Goworowski and Patrick Michalik.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.patrykandpatrick.vico.core.entry
-
-/**
- * The default implementation of [ChartEntry].
- */
-public data class FloatEntry(
-    override val x: Float,
-    override val y: Float,
-) : ChartEntry {
-    override fun withY(y: Float): ChartEntry =
-        FloatEntry(
-            x = x,
-            y = y,
-        )
-}
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/entry/composed/ComposedChartEntryModelProducer.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/entry/composed/ComposedChartEntryModelProducer.kt
deleted file mode 100644
index acaa5d8f4..000000000
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/entry/composed/ComposedChartEntryModelProducer.kt
+++ /dev/null
@@ -1,356 +0,0 @@
-/*
- * Copyright 2023 by Patryk Goworowski and Patrick Michalik.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.patrykandpatrick.vico.core.entry.composed
-
-import androidx.annotation.WorkerThread
-import com.patrykandpatrick.vico.core.chart.Chart
-import com.patrykandpatrick.vico.core.chart.composed.ComposedChartEntryModel
-import com.patrykandpatrick.vico.core.chart.values.ChartValuesProvider
-import com.patrykandpatrick.vico.core.entry.ChartEntry
-import com.patrykandpatrick.vico.core.entry.ChartEntryModel
-import com.patrykandpatrick.vico.core.entry.ChartModelProducer
-import com.patrykandpatrick.vico.core.entry.calculateStackedYRange
-import com.patrykandpatrick.vico.core.entry.calculateXGcd
-import com.patrykandpatrick.vico.core.entry.diff.ExtraStore
-import com.patrykandpatrick.vico.core.entry.diff.MutableExtraStore
-import com.patrykandpatrick.vico.core.entry.xRange
-import com.patrykandpatrick.vico.core.entry.yRange
-import com.patrykandpatrick.vico.core.extension.copy
-import com.patrykandpatrick.vico.core.extension.gcdWith
-import com.patrykandpatrick.vico.core.extension.setAll
-import kotlinx.coroutines.CompletableDeferred
-import kotlinx.coroutines.CoroutineDispatcher
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Deferred
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.async
-import kotlinx.coroutines.awaitAll
-import kotlinx.coroutines.currentCoroutineContext
-import kotlinx.coroutines.ensureActive
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.sync.Mutex
-
-/**
- * A [ChartModelProducer] implementation that generates [ComposedChartEntryModel] instances.
- *
- * @see ComposedChartEntryModel
- * @see ChartModelProducer
- */
-public class ComposedChartEntryModelProducer private constructor(dispatcher: CoroutineDispatcher) :
-    ChartModelProducer<ComposedChartEntryModel<ChartEntryModel>> {
-        private var dataSets = emptyList<List<List<ChartEntry>>>()
-        private var cachedInternalComposedModel: InternalComposedModel? = null
-        private val mutex = Mutex()
-        private val coroutineScope = CoroutineScope(dispatcher)
-        private val updateReceivers = mutableMapOf<Any, UpdateReceiver>()
-        private val extraStore = MutableExtraStore()
-
-        private fun setDataSets(dataSets: List<List<List<ChartEntry>>>): Boolean {
-            if (!mutex.tryLock()) return false
-            this.dataSets = dataSets.copy()
-            cachedInternalComposedModel = null
-            val deferredUpdates =
-                updateReceivers.values.map { updateReceiver ->
-                    coroutineScope.async { updateReceiver.handleUpdate() }
-                }
-            coroutineScope.launch {
-                deferredUpdates.awaitAll()
-                mutex.unlock()
-            }
-            return true
-        }
-
-        private suspend fun setDataSetsSuspending(dataSets: List<List<List<ChartEntry>>>): Deferred<Unit> {
-            mutex.lock()
-            this.dataSets = dataSets.copy()
-            cachedInternalComposedModel = null
-            val completableDeferred = CompletableDeferred<Unit>()
-            val deferredUpdates =
-                updateReceivers.values.map { updateReceiver ->
-                    coroutineScope.async { updateReceiver.handleUpdate() }
-                }
-            coroutineScope.launch {
-                deferredUpdates.awaitAll()
-                mutex.unlock()
-                completableDeferred.complete(Unit)
-            }
-            return completableDeferred
-        }
-
-        private fun getInternalModel(extraStore: ExtraStore? = null) =
-            if (dataSets.isEmpty()) {
-                null
-            } else {
-                val mergedExtraStore = this.extraStore.let { if (extraStore != null) it + extraStore else it }
-                cachedInternalComposedModel
-                    ?.let { composedModel ->
-                        composedModel.copy(
-                            composedEntryCollections =
-                                composedModel.composedEntryCollections
-                                    .map { model -> model.copy(extraStore = mergedExtraStore) },
-                            extraStore = mergedExtraStore,
-                        )
-                    }
-                    ?: run {
-                        val models =
-                            dataSets.map { dataSet ->
-                                val xRange = dataSet.xRange
-                                val yRange = dataSet.yRange
-                                val aggregateYRange = dataSet.calculateStackedYRange()
-                                InternalModel(
-                                    entries = dataSet,
-                                    minX = xRange.start,
-                                    maxX = xRange.endInclusive,
-                                    minY = yRange.start,
-                                    maxY = yRange.endInclusive,
-                                    stackedPositiveY = aggregateYRange.endInclusive,
-                                    stackedNegativeY = aggregateYRange.start,
-                                    xGcd = dataSet.calculateXGcd(),
-                                    extraStore = mergedExtraStore,
-                                )
-                            }
-                        InternalComposedModel(
-                            composedEntryCollections = models,
-                            entries = models.map { it.entries }.flatten(),
-                            minX = models.minOf { it.minX },
-                            maxX = models.maxOf { it.maxX },
-                            minY = models.minOf { it.minY },
-                            maxY = models.maxOf { it.maxY },
-                            stackedPositiveY = models.maxOf { it.stackedPositiveY },
-                            stackedNegativeY = models.minOf { it.stackedNegativeY },
-                            xGcd =
-                                models.fold<ChartEntryModel, Float?>(null) { gcd, model ->
-                                    gcd?.gcdWith(model.xGcd) ?: model.xGcd
-                                } ?: 1f,
-                            id = models.map { it.id }.hashCode(),
-                            extraStore = mergedExtraStore,
-                        ).also { cachedInternalComposedModel = it }
-                    }
-            }
-
-        override fun getModel(): ComposedChartEntryModel<ChartEntryModel>? = getInternalModel()
-
-        override suspend fun transformModel(
-            key: Any,
-            fraction: Float,
-        ) {
-            with(updateReceivers[key] ?: return) {
-                modelTransformer?.transform(extraStore, fraction)
-                val internalModel = getInternalModel(extraStore.copy())
-                currentCoroutineContext().ensureActive()
-                onModelCreated(internalModel)
-            }
-        }
-
-        @WorkerThread
-        override fun registerForUpdates(
-            key: Any,
-            cancelAnimation: () -> Unit,
-            startAnimation: (transformModel: suspend (chartKey: Any, fraction: Float) -> Unit) -> Unit,
-            getOldModel: () -> ComposedChartEntryModel<ChartEntryModel>?,
-            modelTransformerProvider: Chart.ModelTransformerProvider?,
-            extraStore: MutableExtraStore,
-            updateChartValues: (ComposedChartEntryModel<ChartEntryModel>?) -> ChartValuesProvider,
-            onModelCreated: (ComposedChartEntryModel<ChartEntryModel>?) -> Unit,
-        ) {
-            UpdateReceiver(
-                cancelAnimation,
-                startAnimation,
-                onModelCreated,
-                extraStore,
-                modelTransformerProvider?.getModelTransformer(),
-                getOldModel,
-                updateChartValues,
-            ).run {
-                updateReceivers[key] = this
-                handleUpdate()
-            }
-        }
-
-        override fun isRegistered(key: Any): Boolean = updateReceivers.containsKey(key)
-
-        override fun unregisterFromUpdates(key: Any) {
-            updateReceivers.remove(key)
-        }
-
-        /**
-         * Creates a [Transaction] instance.
-         */
-        public fun createTransaction(): Transaction = Transaction()
-
-        /**
-         * Creates a [Transaction], runs [block], and calls [Transaction.commit], returning its output. For suspending
-         * behavior, use [runTransactionSuspending].
-         */
-        public fun runTransaction(block: Transaction.() -> Unit): Boolean = createTransaction().also(block).commit()
-
-        /**
-         * Creates a [Transaction], runs [block], and calls [Transaction.commitSuspending], returning its output.
-         */
-        public suspend fun runTransactionSuspending(block: Transaction.() -> Unit): Deferred<Unit> =
-            createTransaction().also(block).commitSuspending()
-
-        /**
-         * Handles data updates. An initially empty list of data sets is created and can be updated via the class’s
-         * functions. Each data set corresponds to a single nested [Chart].
-         */
-        public inner class Transaction internal constructor() {
-            private val newDataSets = mutableListOf<List<List<ChartEntry>>>()
-
-            /**
-             * Populates the new list of data sets with the current data sets.
-             */
-            public fun populate() {
-                newDataSets.setAll(dataSets)
-            }
-
-            /**
-             * Replaces the data set at the specified index ([Pair.first]) with the provided data set ([Pair.second]).
-             */
-            public fun set(pair: Pair<Int, List<List<ChartEntry>>>) {
-                set(pair.first, pair.second)
-            }
-
-            /**
-             * Removes the data set at the specified index.
-             */
-            public fun removeAt(index: Int) {
-                newDataSets.removeAt(index)
-            }
-
-            /**
-             * Replaces the data set at the specified index with the provided data set.
-             */
-            public fun set(
-                index: Int,
-                dataSet: List<List<ChartEntry>>,
-            ) {
-                newDataSets[index] = dataSet
-            }
-
-            /**
-             * Adds a data set.
-             */
-            public fun add(dataSet: List<List<ChartEntry>>) {
-                newDataSets.add(dataSet)
-            }
-
-            /**
-             * Adds a data set.
-             */
-            public fun add(
-                index: Int,
-                dataSet: List<List<ChartEntry>>,
-            ) {
-                newDataSets.add(index, dataSet)
-            }
-
-            /**
-             * Adds a data set comprising the provided series.
-             */
-            public fun add(vararg series: List<ChartEntry>) {
-                add(series.toList())
-            }
-
-            /**
-             * Clears the new list of data sets.
-             */
-            public fun clear() {
-                newDataSets.clear()
-            }
-
-            /**
-             * Allows for adding auxiliary values, which can later be retrieved via [ChartEntryModel.extraStore].
-             */
-            public fun updateExtras(block: (MutableExtraStore) -> Unit) {
-                block(extraStore)
-            }
-
-            /**
-             * Requests a data update. If the update is accepted, `true` is returned. If the update is rejected, which
-             * occurs when there’s already an update in progress, `false` is returned. For suspending behavior, use
-             * [commitSuspending].
-             */
-            public fun commit(): Boolean = setDataSets(newDataSets)
-
-            /**
-             * Runs a data update. Unlike [commit], this function suspends the current coroutine and waits until an update
-             * can be run, meaning the update cannot be rejected. The returned [Deferred] implementation is marked as
-             * completed once the update has been processed.
-             */
-            public suspend fun commitSuspending(): Deferred<Unit> = setDataSetsSuspending(newDataSets)
-        }
-
-        private inner class UpdateReceiver(
-            val cancelAnimation: () -> Unit,
-            val startAnimation: (transformModel: suspend (chartKey: Any, fraction: Float) -> Unit) -> Unit,
-            val onModelCreated: (ComposedChartEntryModel<ChartEntryModel>?) -> Unit,
-            val extraStore: MutableExtraStore,
-            val modelTransformer: Chart.ModelTransformer<ComposedChartEntryModel<ChartEntryModel>>?,
-            val getOldModel: () -> ComposedChartEntryModel<ChartEntryModel>?,
-            val updateChartValues: (ComposedChartEntryModel<ChartEntryModel>?) -> ChartValuesProvider,
-        ) {
-            fun handleUpdate() {
-                cancelAnimation()
-                modelTransformer?.prepareForTransformation(
-                    oldModel = getOldModel(),
-                    newModel = getModel(),
-                    extraStore = extraStore,
-                    chartValuesProvider = updateChartValues(getModel()),
-                )
-                startAnimation(::transformModel)
-            }
-        }
-
-        private data class InternalModel(
-            override val entries: List<List<ChartEntry>>,
-            override val minX: Float,
-            override val maxX: Float,
-            override val minY: Float,
-            override val maxY: Float,
-            override val stackedPositiveY: Float,
-            override val stackedNegativeY: Float,
-            override val xGcd: Float,
-            override val extraStore: ExtraStore,
-        ) : ChartEntryModel
-
-        private data class InternalComposedModel(
-            override val composedEntryCollections: List<InternalModel>,
-            override val entries: List<List<ChartEntry>>,
-            override val minX: Float,
-            override val maxX: Float,
-            override val minY: Float,
-            override val maxY: Float,
-            override val stackedPositiveY: Float,
-            override val stackedNegativeY: Float,
-            override val xGcd: Float,
-            override val id: Int,
-            override val extraStore: ExtraStore,
-        ) : ComposedChartEntryModel<ChartEntryModel>
-
-        public companion object {
-            /**
-             * Creates a [ComposedChartEntryModelProducer], running an initial [Transaction]. [dispatcher] is the
-             * [CoroutineDispatcher] to be used for update handling.
-             */
-            public fun build(
-                dispatcher: CoroutineDispatcher = Dispatchers.Default,
-                transaction: Transaction.() -> Unit = {},
-            ): ComposedChartEntryModelProducer =
-                ComposedChartEntryModelProducer(dispatcher).also { it.runTransaction(transaction) }
-        }
-    }
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/entry/composed/ComposedEntryListExtensions.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/entry/composed/ComposedEntryListExtensions.kt
deleted file mode 100644
index bc452ae0d..000000000
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/entry/composed/ComposedEntryListExtensions.kt
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright 2023 by Patryk Goworowski and Patrick Michalik.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.patrykandpatrick.vico.core.entry.composed
-
-import com.patrykandpatrick.vico.core.chart.composed.ComposedChartEntryModel
-import com.patrykandpatrick.vico.core.entry.ChartEntryModel
-
-private fun ComposedChartEntryModelProducer.Transaction.add(chartEntryModels: List<ChartEntryModel>) {
-    chartEntryModels.forEach { add(it.entries) }
-}
-
-/**
- * Combines two [ChartEntryModel] implementations—the receiver and [other]—into a [ComposedChartEntryModel].
- */
-public operator fun <Model : ChartEntryModel> Model.plus(other: Model): ComposedChartEntryModel<ChartEntryModel> =
-    ComposedChartEntryModelProducer
-        .build {
-            if (this@plus is ComposedChartEntryModel<*>) add(composedEntryCollections) else add(entries)
-            if (other is ComposedChartEntryModel<*>) add(other.composedEntryCollections) else add(other.entries)
-        }
-        .requireModel()
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/extension/MapExtensions.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/extension/MapExtensions.kt
index bc8a449e2..c2821a7e9 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/extension/MapExtensions.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/extension/MapExtensions.kt
@@ -16,9 +16,9 @@
 
 package com.patrykandpatrick.vico.core.extension
 
-import com.patrykandpatrick.vico.core.entry.ChartEntry
 import com.patrykandpatrick.vico.core.marker.Marker
-import com.patrykandpatrick.vico.core.model.Point
+import com.patrykandpatrick.vico.core.model.CartesianLayerModel
+import com.patrykandpatrick.vico.core.util.Point
 import java.util.TreeMap
 import kotlin.collections.ArrayList
 import kotlin.collections.HashMap
@@ -34,7 +34,8 @@ public fun Map<Float, List<Marker.EntryModel>>.getClosestMarkerEntryModel(
 ): List<Marker.EntryModel>? = keys.findClosestPositiveValue(touchPoint.x)?.let(::get)
 
 /**
- * Returns those of the [Marker.EntryModel]s stored in the [Map] whose [ChartEntry.x] is equal to [xValue].
+ * Returns those of the [Marker.EntryModel]s stored in the [Map] whose [CartesianLayerModel.Entry.x] is equal to
+ * [xValue].
  *
  * @see Marker.EntryModel
  */
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/extension/NumberExtensions.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/extension/NumberExtensions.kt
index 8e5e5de53..1a19c07b4 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/extension/NumberExtensions.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/extension/NumberExtensions.kt
@@ -21,6 +21,7 @@ import kotlin.math.ceil
 import kotlin.math.floor
 import kotlin.math.pow
 import kotlin.math.roundToInt
+import kotlin.random.Random
 
 /**
  * The number of degrees equivalent to π radians.
@@ -55,6 +56,11 @@ internal fun Float.toPrettyString(): String = if (this < 0f) "−${-this}" else
 internal fun <T : Comparable<T>> T.isBoundOf(range: ClosedFloatingPointRange<T>) =
     this == range.start || this == range.endInclusive
 
+internal fun ClosedFloatingPointRange<Float>.random(): Float = start + (endInclusive - start) * Random.nextFloat()
+
+internal val ClosedFloatingPointRange<Float>?.orZero: ClosedFloatingPointRange<Float>
+    get() = this ?: 0f..0f
+
 /**
  * Half of this value.
  */
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/formatter/DecimalFormatValueFormatter.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/formatter/DecimalFormatValueFormatter.kt
index 6fd60783b..44b60dc7b 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/formatter/DecimalFormatValueFormatter.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/formatter/DecimalFormatValueFormatter.kt
@@ -16,6 +16,7 @@
 
 package com.patrykandpatrick.vico.core.formatter
 
+import com.patrykandpatrick.vico.core.axis.AxisPosition
 import com.patrykandpatrick.vico.core.chart.values.ChartValues
 import java.math.RoundingMode
 import java.text.DecimalFormat
@@ -40,6 +41,7 @@ public open class DecimalFormatValueFormatter(private val decimalFormat: Decimal
     override fun formatValue(
         value: Float,
         chartValues: ChartValues,
+        verticalAxisPosition: AxisPosition.Vertical?,
     ): String = decimalFormat.format(value)
 
     public companion object {
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/formatter/DefaultValueFormatter.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/formatter/DefaultValueFormatter.kt
index 4ebdae340..78a313eb2 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/formatter/DefaultValueFormatter.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/formatter/DefaultValueFormatter.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 by Patryk Goworowski and Patrick Michalik.
+ * Copyright 2023 by Patryk Goworowski and Patrick Michalik.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
 
 package com.patrykandpatrick.vico.core.formatter
 
+import com.patrykandpatrick.vico.core.axis.AxisPosition
 import com.patrykandpatrick.vico.core.chart.values.ChartValues
 import com.patrykandpatrick.vico.core.extension.toPrettyString
 
@@ -26,5 +27,6 @@ public open class DefaultValueFormatter : ValueFormatter {
     override fun formatValue(
         value: Float,
         chartValues: ChartValues,
+        verticalAxisPosition: AxisPosition.Vertical?,
     ): String = value.toPrettyString()
 }
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/formatter/PercentageFormatValueFormatter.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/formatter/PercentageFormatValueFormatter.kt
index f591cde1c..5e76e4b9d 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/formatter/PercentageFormatValueFormatter.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/formatter/PercentageFormatValueFormatter.kt
@@ -16,6 +16,7 @@
 
 package com.patrykandpatrick.vico.core.formatter
 
+import com.patrykandpatrick.vico.core.axis.AxisPosition
 import com.patrykandpatrick.vico.core.chart.values.ChartValues
 import java.text.DecimalFormat
 
@@ -36,8 +37,9 @@ public open class PercentageFormatValueFormatter(pattern: String) : ValueFormatt
     override fun formatValue(
         value: Float,
         chartValues: ChartValues,
+        verticalAxisPosition: AxisPosition.Vertical?,
     ): String {
-        val percentage = value / chartValues.maxY
+        val percentage = value / chartValues.getYRange(verticalAxisPosition).maxY
         return decimalFormat.format(percentage)
     }
 
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/formatter/ValueFormatter.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/formatter/ValueFormatter.kt
index 7ec7da6ba..f222d7991 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/formatter/ValueFormatter.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/formatter/ValueFormatter.kt
@@ -16,7 +16,11 @@
 
 package com.patrykandpatrick.vico.core.formatter
 
+import com.patrykandpatrick.vico.core.axis.AxisPosition
+import com.patrykandpatrick.vico.core.axis.vertical.VerticalAxis
+import com.patrykandpatrick.vico.core.chart.CartesianChart
 import com.patrykandpatrick.vico.core.chart.values.ChartValues
+import com.patrykandpatrick.vico.core.model.CartesianChartModel
 
 /**
  * Formats values for display.
@@ -26,7 +30,9 @@ public interface ValueFormatter {
      * Called to format axis labels and data labels.
      *
      * @param value the value to be formatted.
-     * @param chartValues the [ChartValues] used by the chart.
+     * @param chartValues houses the [CartesianChart]’s [CartesianChartModel] and _x_ and _y_ ranges.
+     * @param verticalAxisPosition the position of the [VerticalAxis] with which the caller is associated. This
+     * [VerticalAxis]’s scale should be used during the interpretation of [value].
      *
      * @see ChartValues
      *
@@ -35,5 +41,6 @@ public interface ValueFormatter {
     public fun formatValue(
         value: Float,
         chartValues: ChartValues,
+        verticalAxisPosition: AxisPosition.Vertical?,
     ): CharSequence
 }
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/layout/VirtualLayout.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/layout/VirtualLayout.kt
index 40226c351..be946bd70 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/layout/VirtualLayout.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/layout/VirtualLayout.kt
@@ -18,12 +18,11 @@ package com.patrykandpatrick.vico.core.layout
 
 import android.graphics.RectF
 import com.patrykandpatrick.vico.core.axis.AxisManager
-import com.patrykandpatrick.vico.core.chart.Chart
+import com.patrykandpatrick.vico.core.chart.CartesianChart
 import com.patrykandpatrick.vico.core.chart.dimensions.HorizontalDimensions
 import com.patrykandpatrick.vico.core.chart.insets.ChartInsetter
 import com.patrykandpatrick.vico.core.chart.insets.Insets
 import com.patrykandpatrick.vico.core.context.MeasureContext
-import com.patrykandpatrick.vico.core.entry.ChartEntryModel
 import com.patrykandpatrick.vico.core.extension.orZero
 import com.patrykandpatrick.vico.core.legend.Legend
 
@@ -53,10 +52,10 @@ public open class VirtualLayout(
      *
      * @return the bounds applied to the chart.
      */
-    public open fun <Model : ChartEntryModel> setBounds(
+    public open fun setBounds(
         context: MeasureContext,
         contentBounds: RectF,
-        chart: Chart<Model>,
+        chart: CartesianChart,
         legend: Legend?,
         horizontalDimensions: HorizontalDimensions,
         vararg chartInsetter: ChartInsetter?,
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/marker/DefaultMarkerLabelFormatter.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/marker/DefaultMarkerLabelFormatter.kt
index f638feb79..0f2525acd 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/marker/DefaultMarkerLabelFormatter.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/marker/DefaultMarkerLabelFormatter.kt
@@ -22,6 +22,9 @@ import com.patrykandpatrick.vico.core.chart.values.ChartValues
 import com.patrykandpatrick.vico.core.extension.appendCompat
 import com.patrykandpatrick.vico.core.extension.sumOf
 import com.patrykandpatrick.vico.core.extension.transformToSpannable
+import com.patrykandpatrick.vico.core.model.CartesianLayerModel
+import com.patrykandpatrick.vico.core.model.ColumnCartesianLayerModel
+import com.patrykandpatrick.vico.core.model.LineCartesianLayerModel
 
 /**
  * The default label formatter used for markers. [colorCode] specifies whether to color-code the _y_ values in the
@@ -50,6 +53,14 @@ public class DefaultMarkerLabelFormatter(private val colorCode: Boolean = true)
             }
         }
 
+    private val CartesianLayerModel.Entry.y
+        get() =
+            when (this) {
+                is ColumnCartesianLayerModel.Entry -> y
+                is LineCartesianLayerModel.Entry -> y
+                else -> throw IllegalArgumentException("Unexpected `CartesianLayerModel.Entry` implementation.")
+            }
+
     private companion object {
         const val PATTERN = "%.02f"
     }
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/marker/Marker.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/marker/Marker.kt
index 8f1315c74..470d2165c 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/marker/Marker.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/marker/Marker.kt
@@ -17,12 +17,13 @@
 package com.patrykandpatrick.vico.core.marker
 
 import android.graphics.RectF
-import com.patrykandpatrick.vico.core.chart.Chart
+import com.patrykandpatrick.vico.core.chart.CartesianChart
 import com.patrykandpatrick.vico.core.chart.insets.ChartInsetter
-import com.patrykandpatrick.vico.core.chart.values.ChartValuesProvider
+import com.patrykandpatrick.vico.core.chart.values.ChartValues
 import com.patrykandpatrick.vico.core.context.DrawContext
-import com.patrykandpatrick.vico.core.entry.ChartEntry
-import com.patrykandpatrick.vico.core.model.Point
+import com.patrykandpatrick.vico.core.extension.updateList
+import com.patrykandpatrick.vico.core.model.CartesianLayerModel
+import com.patrykandpatrick.vico.core.util.Point
 
 /**
  * Highlights points on a chart and displays their corresponding values in a bubble.
@@ -33,26 +34,36 @@ public interface Marker : ChartInsetter {
      * @param context the [DrawContext] used to draw the marker.
      * @param bounds the bounds in which the marker is drawn.
      * @param markedEntries a list of [EntryModel]s representing the entries to which the marker refers.
-     * @param chartValuesProvider the [Chart]’s [ChartValuesProvider].
+     * @param chartValues the [CartesianChart]’s [ChartValues].
      */
     public fun draw(
         context: DrawContext,
         bounds: RectF,
         markedEntries: List<EntryModel>,
-        chartValuesProvider: ChartValuesProvider,
+        chartValues: ChartValues,
     )
 
     /**
      * Contains information on a single chart entry to which a chart marker refers.
      * @param location the coordinates of the indicator.
-     * @param entry the [ChartEntry].
-     * @param color the color associated with the [ChartEntry].
-     * @param index the index of the [ChartEntry] in its series.
+     * @param entry the [CartesianLayerModel.Entry].
+     * @param color the color associated with the [CartesianLayerModel.Entry].
+     * @param index the index of the [CartesianLayerModel.Entry] in its series.
      */
     public data class EntryModel(
         public val location: Point,
-        public val entry: ChartEntry,
+        public val entry: CartesianLayerModel.Entry,
         public val color: Int,
         public val index: Int,
     )
 }
+
+internal fun HashMap<Float, MutableList<Marker.EntryModel>>.put(
+    x: Float,
+    y: Float,
+    entry: CartesianLayerModel.Entry,
+    color: Int,
+    index: Int,
+) {
+    updateList(x) { add(Marker.EntryModel(Point(x, y), entry, color, index)) }
+}
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/model/CartesianChartModel.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/model/CartesianChartModel.kt
new file mode 100644
index 000000000..15add0fd1
--- /dev/null
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/model/CartesianChartModel.kt
@@ -0,0 +1,109 @@
+/*
+ * Copyright 2023 by Patryk Goworowski and Patrick Michalik.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.patrykandpatrick.vico.core.model
+
+import com.patrykandpatrick.vico.core.chart.CartesianChart
+import com.patrykandpatrick.vico.core.extension.gcdWith
+import com.patrykandpatrick.vico.core.model.drawing.DrawingModel
+
+/**
+ * Stores a [CartesianChart]’s data.
+ */
+public class CartesianChartModel {
+    /**
+     * The [CartesianLayerModel]s.
+     */
+    public val models: List<CartesianLayerModel>
+
+    /**
+     * Identifies this [CartesianChartModel] in terms of the [CartesianLayerModel.id]s.
+     */
+    public val id: Int
+
+    /**
+     * Expresses the size of this [CartesianChartModel] in terms of the range of the _x_ values covered.
+     */
+    public val width: Float
+
+    /**
+     * The greatest common divisor of the _x_ values’ differences.
+     */
+    public val xDeltaGcd: Float
+
+    /**
+     * Stores auxiliary data, including [DrawingModel]s.
+     */
+    public val extraStore: ExtraStore
+
+    /**
+     * Creates a [CartesianChartModel] consisting of the given [CartesianLayerModel]s.
+     */
+    public constructor(models: List<CartesianLayerModel>) : this(models, ExtraStore.empty)
+
+    /**
+     * Creates a [CartesianChartModel] consisting of the given [CartesianLayerModel]s.
+     */
+    public constructor(vararg models: CartesianLayerModel) : this(models.toList())
+
+    internal constructor(models: List<CartesianLayerModel>, extraStore: ExtraStore) : this(
+        models = models,
+        id = models.map { it.id }.hashCode(),
+        width = models.maxOf { it.maxX } - models.minOf { it.minX },
+        xDeltaGcd =
+            models
+                .fold<CartesianLayerModel, Float?>(null) { gcd, model ->
+                    gcd?.gcdWith(model.xDeltaGcd) ?: model.xDeltaGcd
+                }
+                ?: 1f,
+        extraStore = extraStore,
+    )
+
+    internal constructor(
+        models: List<CartesianLayerModel>,
+        id: Int,
+        width: Float,
+        xDeltaGcd: Float,
+        extraStore: ExtraStore,
+    ) {
+        this.models = models
+        this.id = id
+        this.width = width
+        this.xDeltaGcd = xDeltaGcd
+        this.extraStore = extraStore
+    }
+
+    /**
+     * Creates a copy of this [CartesianLayerModel] with the given [CartesianLayerModel]s and [ExtraStore].
+     */
+    public fun copy(
+        models: List<CartesianLayerModel>,
+        extraStore: ExtraStore,
+    ): CartesianChartModel = CartesianChartModel(models, id, width, xDeltaGcd, extraStore)
+
+    /**
+     * Creates an immutable copy of this [CartesianChartModel].
+     */
+    public fun toImmutable(): CartesianChartModel = this
+
+    public companion object {
+        /**
+         * An empty [CartesianChartModel].
+         */
+        public val empty: CartesianChartModel =
+            CartesianChartModel(models = emptyList(), id = 0, width = 0f, xDeltaGcd = 0f, extraStore = ExtraStore.empty)
+    }
+}
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/model/CartesianChartModelProducer.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/model/CartesianChartModelProducer.kt
new file mode 100644
index 000000000..7e6d3f06e
--- /dev/null
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/model/CartesianChartModelProducer.kt
@@ -0,0 +1,229 @@
+/*
+ * Copyright 2023 by Patryk Goworowski and Patrick Michalik.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.patrykandpatrick.vico.core.model
+
+import androidx.annotation.WorkerThread
+import com.patrykandpatrick.vico.core.chart.layer.CartesianLayer
+import com.patrykandpatrick.vico.core.chart.values.ChartValues
+import com.patrykandpatrick.vico.core.chart.values.MutableChartValues
+import kotlinx.coroutines.CompletableDeferred
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Deferred
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.async
+import kotlinx.coroutines.awaitAll
+import kotlinx.coroutines.currentCoroutineContext
+import kotlinx.coroutines.ensureActive
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.sync.Mutex
+
+/**
+ * Creates [CartesianChartModel]s and handles difference animations.
+ */
+public class CartesianChartModelProducer private constructor(dispatcher: CoroutineDispatcher) {
+    private var partials = emptyList<CartesianLayerModel.Partial>()
+    private var cachedModel: CartesianChartModel? = null
+    private val mutex = Mutex()
+    private val coroutineScope = CoroutineScope(dispatcher)
+    private val updateReceivers = mutableMapOf<Any, UpdateReceiver>()
+    private val extraStore = MutableExtraStore()
+
+    private fun trySetPartials(partials: List<CartesianLayerModel.Partial>): Boolean {
+        if (!mutex.tryLock()) return false
+        this.partials = partials.toList()
+        cachedModel = null
+        val deferredUpdates = updateReceivers.values.map { coroutineScope.async { it.handleUpdate() } }
+        coroutineScope.launch {
+            deferredUpdates.awaitAll()
+            mutex.unlock()
+        }
+        return true
+    }
+
+    private suspend fun setPartials(partials: List<CartesianLayerModel.Partial>): Deferred<Unit> {
+        mutex.lock()
+        this.partials = partials.toList()
+        cachedModel = null
+        val completableDeferred = CompletableDeferred<Unit>()
+        val deferredUpdates = updateReceivers.values.map { coroutineScope.async { it.handleUpdate() } }
+        coroutineScope.launch {
+            deferredUpdates.awaitAll()
+            mutex.unlock()
+            completableDeferred.complete(Unit)
+        }
+        return completableDeferred
+    }
+
+    private fun getModel(extraStore: ExtraStore? = null) =
+        if (partials.isEmpty()) {
+            null
+        } else {
+            val mergedExtraStore = this.extraStore.let { if (extraStore != null) it + extraStore else it }
+            cachedModel
+                ?.let { chartModel ->
+                    chartModel.copy(
+                        chartModel.models.map { layerModel -> layerModel.copy(mergedExtraStore) },
+                        mergedExtraStore,
+                    )
+                }
+                ?: CartesianChartModel(partials.map { it.complete(mergedExtraStore) }, mergedExtraStore)
+                    .also { cachedModel = it }
+        }
+
+    /**
+     * Creates an intermediate [CartesianChartModel] for difference animations. [fraction] is the balance between the
+     * initial and target [CartesianChartModel]s.
+     */
+    public suspend fun transformModel(
+        key: Any,
+        fraction: Float,
+    ) {
+        with(updateReceivers[key] ?: return) {
+            transform(extraStore, fraction)
+            val internalModel = getModel(extraStore.copy())
+            currentCoroutineContext().ensureActive()
+            onModelCreated(internalModel)
+        }
+    }
+
+    /**
+     * Registers an update listener associated with a [key]. [cancelAnimation] and [startAnimation] are called after a
+     * data update is requested, with [cancelAnimation] being called before the update starts being processed (at which
+     * point [transformModel] should stop being used), and [startAnimation] being called once the update has been
+     * processed (at which point it’s safe to use [transformModel]). [updateChartValues] updates the chart’s
+     * [MutableChartValues] instance and returns an immutable copy of it. [onModelCreated] is called when a new
+     * [CartesianChartModel] has been generated.
+     */
+    @WorkerThread
+    public fun registerForUpdates(
+        key: Any,
+        cancelAnimation: () -> Unit,
+        startAnimation: (transformModel: suspend (chartKey: Any, fraction: Float) -> Unit) -> Unit,
+        prepareForTransformation: (CartesianChartModel?, MutableExtraStore, ChartValues) -> Unit,
+        transform: suspend (MutableExtraStore, Float) -> Unit,
+        extraStore: MutableExtraStore,
+        updateChartValues: (CartesianChartModel?) -> ChartValues,
+        onModelCreated: (CartesianChartModel?) -> Unit,
+    ) {
+        UpdateReceiver(
+            cancelAnimation,
+            startAnimation,
+            onModelCreated,
+            extraStore,
+            prepareForTransformation,
+            transform,
+            updateChartValues,
+        ).run {
+            updateReceivers[key] = this
+            handleUpdate()
+        }
+    }
+
+    /**
+     * Checks if an update listener with the given key is registered.
+     */
+    public fun isRegistered(key: Any): Boolean = updateReceivers.containsKey(key)
+
+    /**
+     * Unregisters the update listener associated with the given [key].
+     */
+    public fun unregisterFromUpdates(key: Any) {
+        updateReceivers.remove(key)
+    }
+
+    /**
+     * Creates a [Transaction] instance.
+     */
+    public fun createTransaction(): Transaction = Transaction()
+
+    /**
+     * Creates a [Transaction], runs [block], and calls [Transaction.tryCommit], returning its output. For suspending
+     * behavior, use [runTransaction].
+     */
+    public fun tryRunTransaction(block: Transaction.() -> Unit): Boolean = createTransaction().also(block).tryCommit()
+
+    /**
+     * Creates a [Transaction], runs [block], and calls [Transaction.commit], returning its output.
+     */
+    public suspend fun runTransaction(block: Transaction.() -> Unit): Deferred<Unit> =
+        createTransaction().also(block).commit()
+
+    /**
+     * Handles data updates. An initially empty list of [CartesianLayerModel.Partial]s is created and can be updated via
+     * the class’s functions. Each [CartesianLayerModel.Partial] corresponds to a [CartesianLayer].
+     */
+    public inner class Transaction internal constructor() {
+        private val newPartials = mutableListOf<CartesianLayerModel.Partial>()
+
+        /**
+         * Adds a [CartesianLayerModel.Partial].
+         */
+        public fun add(partial: CartesianLayerModel.Partial) {
+            newPartials.add(partial)
+        }
+
+        /**
+         * Allows for adding auxiliary values, which can later be retrieved via [CartesianChartModel.extraStore].
+         */
+        public fun updateExtras(block: (MutableExtraStore) -> Unit) {
+            block(extraStore)
+        }
+
+        /**
+         * Requests a data update. If the update is accepted, `true` is returned. If the update is rejected, which
+         * occurs when there’s already an update in progress, `false` is returned. For suspending behavior, use
+         * [commit].
+         */
+        public fun tryCommit(): Boolean = trySetPartials(newPartials)
+
+        /**
+         * Runs a data update. Unlike [tryCommit], this function suspends the current coroutine and waits until an
+         * update can be run, meaning the update cannot be rejected. The returned [Deferred] implementation is marked as
+         * completed once the update has been processed.
+         */
+        public suspend fun commit(): Deferred<Unit> = setPartials(newPartials)
+    }
+
+    private inner class UpdateReceiver(
+        val cancelAnimation: () -> Unit,
+        val startAnimation: (transformModel: suspend (chartKey: Any, fraction: Float) -> Unit) -> Unit,
+        val onModelCreated: (CartesianChartModel?) -> Unit,
+        val extraStore: MutableExtraStore,
+        val prepareForTransformation: (CartesianChartModel?, MutableExtraStore, ChartValues) -> Unit,
+        val transform: suspend (MutableExtraStore, Float) -> Unit,
+        val updateChartValues: (CartesianChartModel?) -> ChartValues,
+    ) {
+        fun handleUpdate() {
+            cancelAnimation()
+            prepareForTransformation(getModel(), extraStore, updateChartValues(getModel()))
+            startAnimation(::transformModel)
+        }
+    }
+
+    public companion object {
+        /**
+         * Creates a [CartesianChartModelProducer], running an initial [Transaction]. [dispatcher] is the
+         * [CoroutineDispatcher] to be used for update handling.
+         */
+        public fun build(
+            dispatcher: CoroutineDispatcher = Dispatchers.Default,
+            transaction: Transaction.() -> Unit = {},
+        ): CartesianChartModelProducer =
+            CartesianChartModelProducer(dispatcher).also { it.tryRunTransaction(transaction) }
+    }
+}
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/model/CartesianLayerModel.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/model/CartesianLayerModel.kt
new file mode 100644
index 000000000..3b90e9915
--- /dev/null
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/model/CartesianLayerModel.kt
@@ -0,0 +1,109 @@
+/*
+ * Copyright 2023 by Patryk Goworowski and Patrick Michalik.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.patrykandpatrick.vico.core.model
+
+import com.patrykandpatrick.vico.core.chart.layer.CartesianLayer
+import com.patrykandpatrick.vico.core.extension.gcdWith
+import com.patrykandpatrick.vico.core.model.drawing.DrawingModel
+import kotlin.math.abs
+
+/**
+ * Stores a [CartesianLayer]’s data.
+ */
+public interface CartesianLayerModel {
+    /**
+     * Identifies this [CartesianLayerModel].
+     */
+    public val id: Int
+
+    /**
+     * The minimum _x_ value.
+     */
+    public val minX: Float
+
+    /**
+     * The maximum _x_ value.
+     */
+    public val maxX: Float
+
+    /**
+     * The minimum _y_ value.
+     */
+    public val minY: Float
+
+    /**
+     * The maximum _y_ value.
+     */
+    public val maxY: Float
+
+    /**
+     * The greatest common divisor of the _x_ values’ differences.
+     */
+    public val xDeltaGcd: Float
+
+    /**
+     * Stores auxiliary data, including [DrawingModel]s.
+     */
+    public val extraStore: ExtraStore
+
+    /**
+     * Creates a copy of this [CartesianLayerModel] with the given [ExtraStore].
+     */
+    public fun copy(extraStore: ExtraStore): CartesianLayerModel
+
+    /**
+     * Represents a single entity in a [CartesianLayerModel].
+     */
+    public interface Entry {
+        /**
+         * The _x_ coordinate.
+         */
+        public val x: Float
+    }
+
+    /**
+     * Stores the minimum amount of data required to create a [CartesianLayerModel] and facilitates this creation.
+     */
+    public interface Partial {
+        /**
+         * Creates a full [CartesianLayerModel] with the given [ExtraStore] from this [Partial].
+         */
+        public fun complete(extraStore: ExtraStore = ExtraStore.empty): CartesianLayerModel
+    }
+}
+
+internal fun Iterable<CartesianLayerModel.Entry>.getXDeltaGcd() =
+    zipWithNext { firstEntry, secondEntry -> abs(secondEntry.x - firstEntry.x) }
+        .fold<Float, Float?>(null) { gcd, delta -> gcd?.gcdWith(delta) ?: delta }
+        ?: 1f
+
+internal fun <T : CartesianLayerModel.Entry> Iterable<T>.forEachInIndexed(
+    range: ClosedFloatingPointRange<Float>,
+    action: (Int, T) -> Unit,
+) {
+    var index = 0
+    forEach { if (it.x in range) action(index++, it) }
+}
+
+internal fun <T : CartesianLayerModel.Entry> List<T>.forEachInIndexed(
+    range: ClosedFloatingPointRange<Float>,
+    action: (Int, T, T?) -> Unit,
+) {
+    forEachInIndexed(range) { index, entry ->
+        action(index, entry, getOrNull(index + 1)?.takeIf { it.x in range })
+    }
+}
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/model/ColumnCartesianLayerModel.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/model/ColumnCartesianLayerModel.kt
new file mode 100644
index 000000000..0f86b9033
--- /dev/null
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/model/ColumnCartesianLayerModel.kt
@@ -0,0 +1,189 @@
+/*
+ * Copyright 2023 by Patryk Goworowski and Patrick Michalik.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.patrykandpatrick.vico.core.model
+
+import com.patrykandpatrick.vico.core.chart.layer.ColumnCartesianLayer
+import com.patrykandpatrick.vico.core.extension.orZero
+import com.patrykandpatrick.vico.core.extension.rangeOfOrNull
+import com.patrykandpatrick.vico.core.extension.rangeOfPairOrNull
+
+/**
+ * Stores a [ColumnCartesianLayer]’s data.
+ */
+public class ColumnCartesianLayerModel : CartesianLayerModel {
+    /**
+     * The series (lists of [Entry] instances).
+     */
+    public val series: List<List<Entry>>
+
+    override val id: Int
+
+    override val minX: Float
+
+    override val maxX: Float
+
+    override val minY: Float
+
+    override val maxY: Float
+
+    /**
+     * The minimum sum of all _y_ values associated with a given _x_ value.
+     */
+    public val minAggregateY: Float
+
+    /**
+     * The maximum sum of all _y_ values associated with a given _x_ value.
+     */
+    public val maxAggregateY: Float
+
+    override val xDeltaGcd: Float
+
+    override val extraStore: ExtraStore
+
+    public constructor(series: List<List<Entry>>) : this(series, ExtraStore.empty)
+
+    private constructor(series: List<List<Entry>>, extraStore: ExtraStore) {
+        val entries = series.flatten()
+        val xRange = entries.rangeOfOrNull { it.x }.orZero
+        val yRange = entries.rangeOfOrNull { it.y }.orZero
+        val aggregateYRange = entries.getAggregateYRange()
+        this.series = series
+        this.id = series.hashCode()
+        this.minX = xRange.start
+        this.maxX = xRange.endInclusive
+        this.minY = yRange.start
+        this.maxY = yRange.endInclusive
+        this.minAggregateY = aggregateYRange.start
+        this.maxAggregateY = aggregateYRange.endInclusive
+        this.xDeltaGcd = entries.getXDeltaGcd()
+        this.extraStore = extraStore
+    }
+
+    private constructor(
+        series: List<List<Entry>>,
+        id: Int,
+        minX: Float,
+        maxX: Float,
+        minY: Float,
+        maxY: Float,
+        minAggregateY: Float,
+        maxAggregateY: Float,
+        xDeltaGcd: Float,
+        extraStore: ExtraStore,
+    ) {
+        this.series = series
+        this.id = id
+        this.minX = minX
+        this.maxX = maxX
+        this.minY = minY
+        this.maxY = maxY
+        this.minAggregateY = minAggregateY
+        this.maxAggregateY = maxAggregateY
+        this.xDeltaGcd = xDeltaGcd
+        this.extraStore = extraStore
+    }
+
+    override fun copy(extraStore: ExtraStore): CartesianLayerModel =
+        ColumnCartesianLayerModel(
+            series,
+            id,
+            minX,
+            maxX,
+            minY,
+            maxY,
+            minAggregateY,
+            maxAggregateY,
+            xDeltaGcd,
+            extraStore,
+        )
+
+    /**
+     * Represents a column of height [y] at [x].
+     */
+    public class Entry internal constructor(override val x: Float, public val y: Float) : CartesianLayerModel.Entry {
+        public constructor(x: Number, y: Number) : this(x.toFloat(), y.toFloat())
+    }
+
+    /**
+     * Stores the minimum amount of data required to create a [ColumnCartesianLayerModel] and facilitates this creation.
+     */
+    public class Partial(private val series: List<List<Entry>>) : CartesianLayerModel.Partial {
+        override fun complete(extraStore: ExtraStore): CartesianLayerModel =
+            ColumnCartesianLayerModel(series, extraStore)
+    }
+
+    /**
+     * Facilitates the creation of [ColumnCartesianLayerModel]s and [Partial]s.
+     */
+    public class BuilderScope {
+        internal val series = mutableListOf<List<Entry>>()
+
+        /**
+         * Adds a series with the provided _x_ values ([x]) and _y_ values ([y]). [x] and [y] should have the same size.
+         */
+        public fun series(
+            x: Collection<Number>,
+            y: Collection<Number>,
+        ) {
+            series.add(x.zip(y, ColumnCartesianLayerModel::Entry))
+        }
+
+        /**
+         * Adds a series with the provided _y_ values ([y]), using their indices as the _x_ values.
+         */
+        public fun series(y: Collection<Number>) {
+            series(y.indices.toList(), y)
+        }
+
+        /**
+         * Adds a series with the provided _y_ values ([y]), using their indices as the _x_ values.
+         */
+        public fun series(vararg y: Number) {
+            series(y.toList())
+        }
+    }
+
+    public companion object {
+        /**
+         * Creates a [ColumnCartesianLayerModel].
+         */
+        public fun build(block: BuilderScope.() -> Unit): ColumnCartesianLayerModel =
+            ColumnCartesianLayerModel(BuilderScope().apply(block).series)
+
+        /**
+         * Creates a [Partial].
+         */
+        public fun partial(block: BuilderScope.() -> Unit): Partial = Partial(BuilderScope().apply(block).series)
+    }
+}
+
+/**
+ * Calls [block] to create a [ColumnCartesianLayerModel.Partial] and adds it to the
+ * [CartesianChartModelProducer.Transaction]’s [CartesianLayerModel.Partial] list.
+ */
+public fun CartesianChartModelProducer.Transaction.columnSeries(
+    block: ColumnCartesianLayerModel.BuilderScope.() -> Unit,
+) {
+    add(ColumnCartesianLayerModel.partial(block))
+}
+
+internal fun Iterable<ColumnCartesianLayerModel.Entry>.getAggregateYRange() =
+    fold(mutableMapOf<Float, Pair<Float, Float>>()) { map, entry ->
+        val (negativeY, positiveY) = map.getOrElse(entry.x) { 0f to 0f }
+        map[entry.x] = if (entry.y < 0f) negativeY + entry.y to positiveY else negativeY to positiveY + entry.y
+        map
+    }.values.rangeOfPairOrNull { it }.orZero
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/entry/diff/ExtraStore.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/model/ExtraStore.kt
similarity index 98%
rename from vico/core/src/main/java/com/patrykandpatrick/vico/core/entry/diff/ExtraStore.kt
rename to vico/core/src/main/java/com/patrykandpatrick/vico/core/model/ExtraStore.kt
index 6a30739b0..1a2e76906 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/entry/diff/ExtraStore.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/model/ExtraStore.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.patrykandpatrick.vico.core.entry.diff
+package com.patrykandpatrick.vico.core.model
 
 /**
  * Houses auxiliary data.
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/model/LineCartesianLayerModel.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/model/LineCartesianLayerModel.kt
new file mode 100644
index 000000000..9ef54bf98
--- /dev/null
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/model/LineCartesianLayerModel.kt
@@ -0,0 +1,150 @@
+/*
+ * Copyright 2023 by Patryk Goworowski and Patrick Michalik.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.patrykandpatrick.vico.core.model
+
+import com.patrykandpatrick.vico.core.chart.layer.LineCartesianLayer
+import com.patrykandpatrick.vico.core.extension.orZero
+import com.patrykandpatrick.vico.core.extension.rangeOfOrNull
+
+/**
+ * Stores a [LineCartesianLayer]’s data.
+ */
+public class LineCartesianLayerModel : CartesianLayerModel {
+    /**
+     * The series (lists of [Entry] instances).
+     */
+    public val series: List<List<Entry>>
+
+    override val id: Int
+
+    override val minX: Float
+
+    override val maxX: Float
+
+    override val minY: Float
+
+    override val maxY: Float
+
+    override val xDeltaGcd: Float
+
+    override val extraStore: ExtraStore
+
+    public constructor(series: List<List<Entry>>) : this(series, ExtraStore.empty)
+
+    private constructor(series: List<List<Entry>>, extraStore: ExtraStore) {
+        val entries = series.flatten()
+        val xRange = entries.rangeOfOrNull { it.x }.orZero
+        val yRange = entries.rangeOfOrNull { it.y }.orZero
+        this.series = series
+        this.id = series.hashCode()
+        this.minX = xRange.start
+        this.maxX = xRange.endInclusive
+        this.minY = yRange.start
+        this.maxY = yRange.endInclusive
+        this.xDeltaGcd = entries.getXDeltaGcd()
+        this.extraStore = extraStore
+    }
+
+    private constructor(
+        series: List<List<Entry>>,
+        id: Int,
+        minX: Float,
+        maxX: Float,
+        minY: Float,
+        maxY: Float,
+        xDeltaGcd: Float,
+        extraStore: ExtraStore,
+    ) {
+        this.series = series
+        this.id = id
+        this.minX = minX
+        this.maxX = maxX
+        this.minY = minY
+        this.maxY = maxY
+        this.xDeltaGcd = xDeltaGcd
+        this.extraStore = extraStore
+    }
+
+    override fun copy(extraStore: ExtraStore): CartesianLayerModel =
+        LineCartesianLayerModel(series, id, minX, maxX, minY, maxY, xDeltaGcd, extraStore)
+
+    /**
+     * Represents a line node at ([x], [y]).
+     */
+    public class Entry internal constructor(override val x: Float, public val y: Float) : CartesianLayerModel.Entry {
+        public constructor(x: Number, y: Number) : this(x.toFloat(), y.toFloat())
+    }
+
+    /**
+     * Stores the minimum amount of data required to create a [LineCartesianLayerModel] and facilitates this creation.
+     */
+    public class Partial(private val series: List<List<Entry>>) : CartesianLayerModel.Partial {
+        override fun complete(extraStore: ExtraStore): CartesianLayerModel = LineCartesianLayerModel(series, extraStore)
+    }
+
+    /**
+     * Facilitates the creation of [LineCartesianLayerModel]s and [Partial]s.
+     */
+    public class BuilderScope {
+        internal val series = mutableListOf<List<Entry>>()
+
+        /**
+         * Adds a series with the provided _x_ values ([x]) and _y_ values ([y]). [x] and [y] should have the same size.
+         */
+        public fun series(
+            x: Collection<Number>,
+            y: Collection<Number>,
+        ) {
+            series.add(x.zip(y, LineCartesianLayerModel::Entry))
+        }
+
+        /**
+         * Adds a series with the provided _y_ values ([y]), using their indices as the _x_ values.
+         */
+        public fun series(y: Collection<Number>) {
+            series(y.indices.toList(), y)
+        }
+
+        /**
+         * Adds a series with the provided _y_ values ([y]), using their indices as the _x_ values.
+         */
+        public fun series(vararg y: Number) {
+            series(y.toList())
+        }
+    }
+
+    public companion object {
+        /**
+         * Creates a [LineCartesianLayerModel].
+         */
+        public fun build(block: BuilderScope.() -> Unit): LineCartesianLayerModel =
+            LineCartesianLayerModel(BuilderScope().apply(block).series)
+
+        /**
+         * Creates a [Partial].
+         */
+        public fun partial(block: BuilderScope.() -> Unit): Partial = Partial(BuilderScope().apply(block).series)
+    }
+}
+
+/**
+ * Calls [block] to create a [LineCartesianLayerModel.Partial] and adds it to the
+ * [CartesianChartModelProducer.Transaction]’s [CartesianLayerModel.Partial] list.
+ */
+public fun CartesianChartModelProducer.Transaction.lineSeries(block: LineCartesianLayerModel.BuilderScope.() -> Unit) {
+    add(LineCartesianLayerModel.partial(block))
+}
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/column/ColumnChartDrawingModel.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/model/drawing/ColumnCartesianLayerDrawingModel.kt
similarity index 62%
rename from vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/column/ColumnChartDrawingModel.kt
rename to vico/core/src/main/java/com/patrykandpatrick/vico/core/model/drawing/ColumnCartesianLayerDrawingModel.kt
index 38bd68fbb..d51567680 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/column/ColumnChartDrawingModel.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/model/drawing/ColumnCartesianLayerDrawingModel.kt
@@ -14,29 +14,29 @@
  * limitations under the License.
  */
 
-package com.patrykandpatrick.vico.core.chart.column
+package com.patrykandpatrick.vico.core.model.drawing
 
-import com.patrykandpatrick.vico.core.entry.diff.DrawingModel
+import com.patrykandpatrick.vico.core.chart.layer.ColumnCartesianLayer
 import com.patrykandpatrick.vico.core.extension.lerp
 import com.patrykandpatrick.vico.core.extension.orZero
 
 /**
- * Houses drawing information for a [ColumnChart]. [opacity] is the columns’ opacity.
+ * Houses drawing information for a [ColumnCartesianLayer]. [opacity] is the columns’ opacity.
  */
-public class ColumnChartDrawingModel(entries: List<Map<Float, ColumnInfo>>, public val opacity: Float = 1f) :
-    DrawingModel<ColumnChartDrawingModel.ColumnInfo>(entries) {
+public class ColumnCartesianLayerDrawingModel(entries: List<Map<Float, ColumnInfo>>, public val opacity: Float = 1f) :
+    DrawingModel<ColumnCartesianLayerDrawingModel.ColumnInfo>(entries) {
     override fun transform(
         drawingInfo: List<Map<Float, ColumnInfo>>,
         from: DrawingModel<ColumnInfo>?,
         fraction: Float,
     ): DrawingModel<ColumnInfo> {
-        val oldOpacity = (from as ColumnChartDrawingModel?)?.opacity.orZero
-        return ColumnChartDrawingModel(drawingInfo, oldOpacity.lerp(opacity, fraction))
+        val oldOpacity = (from as ColumnCartesianLayerDrawingModel?)?.opacity.orZero
+        return ColumnCartesianLayerDrawingModel(drawingInfo, oldOpacity.lerp(opacity, fraction))
     }
 
     /**
-     * Houses positional information for a [ColumnChart]’s column. [height] expresses the column’s height as a fraction
-     * of the [ColumnChart]’s height.
+     * Houses positional information for a [ColumnCartesianLayer]’s column. [height] expresses the column’s height as a
+     * fraction of the [ColumnCartesianLayer]’s height.
      */
     public class ColumnInfo(public val height: Float) : DrawingInfo {
         override fun transform(
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/entry/diff/DefaultDrawingModelInterpolator.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/model/drawing/DefaultDrawingModelInterpolator.kt
similarity index 98%
rename from vico/core/src/main/java/com/patrykandpatrick/vico/core/entry/diff/DefaultDrawingModelInterpolator.kt
rename to vico/core/src/main/java/com/patrykandpatrick/vico/core/model/drawing/DefaultDrawingModelInterpolator.kt
index fea534420..c8ab4616e 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/entry/diff/DefaultDrawingModelInterpolator.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/model/drawing/DefaultDrawingModelInterpolator.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.patrykandpatrick.vico.core.entry.diff
+package com.patrykandpatrick.vico.core.model.drawing
 
 import com.patrykandpatrick.vico.core.extension.orZero
 import kotlinx.coroutines.currentCoroutineContext
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/entry/diff/DrawingModel.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/model/drawing/DrawingModel.kt
similarity index 87%
rename from vico/core/src/main/java/com/patrykandpatrick/vico/core/entry/diff/DrawingModel.kt
rename to vico/core/src/main/java/com/patrykandpatrick/vico/core/model/drawing/DrawingModel.kt
index a6b613409..389919b89 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/entry/diff/DrawingModel.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/model/drawing/DrawingModel.kt
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.patrykandpatrick.vico.core.entry.diff
+package com.patrykandpatrick.vico.core.model.drawing
 
-import com.patrykandpatrick.vico.core.chart.Chart
+import com.patrykandpatrick.vico.core.chart.layer.CartesianLayer
 
 /**
- * Houses drawing information for a [Chart].
+ * Houses drawing information for a [CartesianLayer].
  */
 public abstract class DrawingModel<T : DrawingModel.DrawingInfo>(private val drawingInfo: List<Map<Float, T>>) :
     List<Map<Float, T>> by drawingInfo {
@@ -36,7 +36,7 @@ public abstract class DrawingModel<T : DrawingModel.DrawingInfo>(private val dra
     ): DrawingModel<T>
 
     /**
-     * Houses positional information for a single [Chart] entity (e.g., a column or a point).
+     * Houses positional information for a single [CartesianLayer] entity (e.g., a column or a point).
      */
     public interface DrawingInfo {
         /**
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/entry/diff/DrawingModelInterpolator.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/model/drawing/DrawingModelInterpolator.kt
similarity index 95%
rename from vico/core/src/main/java/com/patrykandpatrick/vico/core/entry/diff/DrawingModelInterpolator.kt
rename to vico/core/src/main/java/com/patrykandpatrick/vico/core/model/drawing/DrawingModelInterpolator.kt
index 0644ade2d..a377bba7e 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/entry/diff/DrawingModelInterpolator.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/model/drawing/DrawingModelInterpolator.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.patrykandpatrick.vico.core.entry.diff
+package com.patrykandpatrick.vico.core.model.drawing
 
 /**
  * Interpolates two [DrawingModel]s.
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/line/LineChartDrawingModel.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/model/drawing/LineCartesianLayerDrawingModel.kt
similarity index 59%
rename from vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/line/LineChartDrawingModel.kt
rename to vico/core/src/main/java/com/patrykandpatrick/vico/core/model/drawing/LineCartesianLayerDrawingModel.kt
index 906784cd0..766db9ca1 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/chart/line/LineChartDrawingModel.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/model/drawing/LineCartesianLayerDrawingModel.kt
@@ -14,35 +14,40 @@
  * limitations under the License.
  */
 
-package com.patrykandpatrick.vico.core.chart.line
+package com.patrykandpatrick.vico.core.model.drawing
 
-import com.patrykandpatrick.vico.core.entry.diff.DrawingModel
+import com.patrykandpatrick.vico.core.chart.layer.LineCartesianLayer
 import com.patrykandpatrick.vico.core.extension.lerp
 import com.patrykandpatrick.vico.core.extension.orZero
 
 /**
- * Houses drawing information for a [LineChart]. [zeroY] is the y-axis position of the zero value.
- * [opacity] is the lines’ opacity.
+ * Houses drawing information for a [LineCartesianLayer]. [opacity] is the lines’ opacity. [zeroY] specifies the
+ * position of the zero line (_y_ = 0) from the bottom of the [LineCartesianLayer] as a fraction of the
+ * [LineCartesianLayer]’s height.
  */
-public class LineChartDrawingModel(
+public class LineCartesianLayerDrawingModel(
     pointInfo: List<Map<Float, PointInfo>>,
     public val zeroY: Float,
     public val opacity: Float = 1f,
 ) :
-    DrawingModel<LineChartDrawingModel.PointInfo>(pointInfo) {
+    DrawingModel<LineCartesianLayerDrawingModel.PointInfo>(pointInfo) {
     override fun transform(
         drawingInfo: List<Map<Float, PointInfo>>,
         from: DrawingModel<PointInfo>?,
         fraction: Float,
     ): DrawingModel<PointInfo> {
-        val oldOpacity = (from as LineChartDrawingModel?)?.opacity.orZero
+        val oldOpacity = (from as LineCartesianLayerDrawingModel?)?.opacity.orZero
         val oldZeroY = from?.zeroY ?: zeroY
-        return LineChartDrawingModel(drawingInfo, oldZeroY.lerp(zeroY, fraction), oldOpacity.lerp(opacity, fraction))
+        return LineCartesianLayerDrawingModel(
+            drawingInfo,
+            oldZeroY.lerp(zeroY, fraction),
+            oldOpacity.lerp(opacity, fraction),
+        )
     }
 
     /**
-     * Houses positional information for a [LineChart]’s point. [y] expresses the distance of the point from the bottom
-     * of the [LineChart] as a fraction of the [LineChart]’s height.
+     * Houses positional information for a [LineCartesianLayer]’s point. [y] expresses the distance of the point from
+     * the bottom of the [LineCartesianLayer] as a fraction of the [LineCartesianLayer]’s height.
      */
     public class PointInfo(public val y: Float) : DrawingInfo {
         override fun transform(
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/scroll/AutoScrollCondition.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/scroll/AutoScrollCondition.kt
index 563929bdb..766a6ece5 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/scroll/AutoScrollCondition.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/scroll/AutoScrollCondition.kt
@@ -16,44 +16,33 @@
 
 package com.patrykandpatrick.vico.core.scroll
 
-import com.patrykandpatrick.vico.core.entry.ChartEntryModel
-import com.patrykandpatrick.vico.core.extension.ifNotNull
+import com.patrykandpatrick.vico.core.model.CartesianChartModel
 
 /**
  * Defines when an automatic scroll should be performed.
  */
-public fun interface AutoScrollCondition<in Model : ChartEntryModel> {
+public fun interface AutoScrollCondition {
     /**
      * Given a chart’s new and old models, defines whether an automatic scroll should be performed.
      */
     public fun shouldPerformAutoScroll(
-        newModel: Model,
-        oldModel: Model?,
+        newModel: CartesianChartModel,
+        oldModel: CartesianChartModel?,
     ): Boolean
 
     public companion object {
         /**
          * Prevents any automatic scrolling from occurring.
          */
-        public val Never: AutoScrollCondition<ChartEntryModel> = AutoScrollCondition { _, _ -> false }
+        public val Never: AutoScrollCondition = AutoScrollCondition { _, _ -> false }
 
         /**
          * Triggers an automatic scroll when the size of the model increases (that is, the contents of the chart become
          * wider).
          */
-        public val OnModelSizeIncreased: AutoScrollCondition<ChartEntryModel> =
-            AutoScrollCondition { n, o ->
-                if (o != null) {
-                    val new = n.entries
-                    val old = o.entries
-                    new.size > old.size ||
-                        ifNotNull(
-                            t1 = new.maxOfOrNull { entries -> entries.size },
-                            t2 = old.maxOfOrNull { entries -> entries.size },
-                        ) { t1, t2 -> t1 > t2 } == true
-                } else {
-                    false
-                }
+        public val OnModelSizeIncreased: AutoScrollCondition =
+            AutoScrollCondition { newModel, oldModel ->
+                oldModel != null && (newModel.models.size > oldModel.models.size || newModel.width > oldModel.width)
             }
     }
 }
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/model/Point.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/util/Point.kt
similarity index 87%
rename from vico/core/src/main/java/com/patrykandpatrick/vico/core/model/Point.kt
rename to vico/core/src/main/java/com/patrykandpatrick/vico/core/util/Point.kt
index c38dd55c2..d88cd10fb 100644
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/model/Point.kt
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/util/Point.kt
@@ -14,12 +14,7 @@
  * limitations under the License.
  */
 
-package com.patrykandpatrick.vico.core.model
-
-import com.patrykandpatrick.vico.core.util.packFloats
-import com.patrykandpatrick.vico.core.util.packInts
-import com.patrykandpatrick.vico.core.util.unpackFloat1
-import com.patrykandpatrick.vico.core.util.unpackFloat2
+package com.patrykandpatrick.vico.core.util
 
 /**
  * Creates a new [Point] with the provided coordinates.
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/util/RandomCartesianModelGenerator.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/util/RandomCartesianModelGenerator.kt
new file mode 100644
index 000000000..cddc85204
--- /dev/null
+++ b/vico/core/src/main/java/com/patrykandpatrick/vico/core/util/RandomCartesianModelGenerator.kt
@@ -0,0 +1,71 @@
+/*
+ * Copyright 2023 by Patryk Goworowski and Patrick Michalik.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.patrykandpatrick.vico.core.util
+
+import androidx.annotation.RestrictTo
+import com.patrykandpatrick.vico.core.extension.random
+import com.patrykandpatrick.vico.core.model.CartesianChartModel
+import com.patrykandpatrick.vico.core.model.CartesianLayerModel
+import com.patrykandpatrick.vico.core.model.ColumnCartesianLayerModel
+import com.patrykandpatrick.vico.core.model.LineCartesianLayerModel
+
+/**
+ * Generates randomized [CartesianLayerModel.Partial]s and [CartesianChartModel]s.
+ */
+public object RandomCartesianModelGenerator {
+    @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
+    public val defaultX: IntProgression = 0..96
+
+    @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
+    public val defaultY: ClosedFloatingPointRange<Float> = 2f..20f
+
+    /**
+     * Generates a randomized [ColumnCartesianLayerModel.Partial] with the specified number of series and value ranges.
+     */
+    public fun getRandomColumnLayerModelPartial(
+        seriesCount: Int = 1,
+        x: IntProgression = defaultX,
+        y: ClosedFloatingPointRange<Float> = defaultY,
+    ): ColumnCartesianLayerModel.Partial =
+        ColumnCartesianLayerModel.partial { repeat(seriesCount) { series(x.toList(), x.map { y.random() }) } }
+
+    /**
+     * Generates a randomized [LineCartesianLayerModel.Partial] with the specified number of series and value ranges.
+     */
+    public fun getRandomLineLayerModelPartial(
+        seriesCount: Int = 1,
+        x: IntProgression = defaultX,
+        y: ClosedFloatingPointRange<Float> = defaultY,
+    ): LineCartesianLayerModel.Partial =
+        LineCartesianLayerModel.partial { repeat(seriesCount) { series(x.toList(), x.map { y.random() }) } }
+
+    /**
+     * Generates a randomized [CartesianChartModel] with the specified numbers of series and value ranges.
+     */
+    public fun getRandomModel(
+        columnSeriesCount: Int = 1,
+        lineSeriesCount: Int = 1,
+        x: IntProgression = defaultX,
+        y: ClosedFloatingPointRange<Float> = defaultY,
+    ): CartesianChartModel =
+        CartesianChartModel(
+            buildList {
+                add(getRandomColumnLayerModelPartial(columnSeriesCount, x, y).complete())
+                add(getRandomLineLayerModelPartial(lineSeriesCount, x, y).complete())
+            },
+        )
+}
diff --git a/vico/core/src/main/java/com/patrykandpatrick/vico/core/util/RandomEntriesGenerator.kt b/vico/core/src/main/java/com/patrykandpatrick/vico/core/util/RandomEntriesGenerator.kt
deleted file mode 100644
index 9a7daca1c..000000000
--- a/vico/core/src/main/java/com/patrykandpatrick/vico/core/util/RandomEntriesGenerator.kt
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright 2023 by Patryk Goworowski and Patrick Michalik.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.patrykandpatrick.vico.core.util
-
-import androidx.annotation.RestrictTo
-import com.patrykandpatrick.vico.core.chart.composed.ComposedChartEntryModel
-import com.patrykandpatrick.vico.core.entry.ChartEntryModel
-import com.patrykandpatrick.vico.core.entry.ChartEntryModelProducer
-import com.patrykandpatrick.vico.core.entry.ChartModelProducer
-import com.patrykandpatrick.vico.core.entry.FloatEntry
-import com.patrykandpatrick.vico.core.entry.composed.ComposedChartEntryModelProducer
-import com.patrykandpatrick.vico.core.entry.entryOf
-import kotlin.random.Random
-
-/**
- * Generates randomized chart entries.
- * @param xRange the range of _x_ values.
- * @param yRange the range from which _y_ values are randomly selected.
- * @param seriesCount the number of data series to generate.
- */
-public class RandomEntriesGenerator(
-    private val xRange: IntProgression = 0..X_RANGE_TOP,
-    private val yRange: IntProgression = 0..Y_RANGE_TOP,
-    private val seriesCount: Int = SERIES_COUNT,
-    private val modelCount: Int = MODEL_COUNT,
-) {
-    /**
-     * Generates a [List] of [FloatEntry] instances with randomized _y_ values.
-     * The size of the [List] is equal to the number of values in [xRange].
-     */
-    public fun generateRandomEntries(): List<FloatEntry> {
-        val result = ArrayList<FloatEntry>()
-        val yLength = yRange.last - yRange.first
-        for (x in xRange) {
-            result += entryOf(x.toFloat(), yRange.first + Random.nextFloat() * yLength)
-        }
-        return result
-    }
-
-    /**
-     * Creates a [ChartEntryModel] containing a collection of [FloatEntry] instances with randomized _y_ values.
-     * The size of the collection is equal to the number of values in [xRange].
-     */
-    public fun randomEntryModel(): ChartEntryModel = getChartEntryModelProducer().requireModel()
-
-    /**
-     * Creates a [ComposedChartEntryModel] with three [ChartEntryModelProducer]s, each containing a collection of
-     * [FloatEntry] instances with randomized y values. The size of each collection is equal to the number of values in
-     * [xRange].
-     */
-    public fun randomComposedEntryModel(): ComposedChartEntryModel<ChartEntryModel> =
-        ComposedChartEntryModelProducer
-            .build { repeat(modelCount) { add(List(seriesCount) { generateRandomEntries() }) } }
-            .requireModel()
-
-    @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
-    public companion object {
-        public const val X_RANGE_TOP: Int = 10
-        public const val Y_RANGE_TOP: Int = 20
-        public const val SERIES_COUNT: Int = 3
-        public const val MODEL_COUNT: Int = 3
-
-        private fun RandomEntriesGenerator.getChartEntryModelProducer(): ChartModelProducer<ChartEntryModel> =
-            ChartEntryModelProducer(List(seriesCount) { generateRandomEntries() })
-    }
-}
diff --git a/vico/core/src/test/java/com/patrykandpatrick/vico/core/ChartEntryModelProducerTest.kt b/vico/core/src/test/java/com/patrykandpatrick/vico/core/ChartEntryModelProducerTest.kt
deleted file mode 100644
index d99315149..000000000
--- a/vico/core/src/test/java/com/patrykandpatrick/vico/core/ChartEntryModelProducerTest.kt
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright 2023 by Patryk Goworowski and Patrick Michalik.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.patrykandpatrick.vico.core
-
-import com.patrykandpatrick.vico.core.entry.ChartEntryModelProducer
-import com.patrykandpatrick.vico.core.entry.entriesOf
-import org.junit.Test
-import kotlin.test.assertEquals
-
-public class ChartEntryModelProducerTest {
-    private val minX = 0f
-    private val maxX = 3f
-    private val minY = 1f
-    private val maxY = 5f
-
-    private val entries1 = entriesOf(1 to minY, 2 to 2, maxX to 3)
-    private val entries2 = entriesOf(minX to minY, 1 to maxY, maxX to minY)
-    private val entries3 = entriesOf(minX to 2, 1 to 4, maxX to 3)
-
-    @Test
-    public fun `Test Min Max calculations`() {
-        val entryList = ChartEntryModelProducer(entries1, entries2, entries3).requireModel()
-        assertEquals(minX, entryList.minX)
-        assertEquals(maxX, entryList.maxX)
-        assertEquals(minY, entryList.minY)
-        assertEquals(maxY, entryList.maxY)
-        assertEquals(10f, entryList.stackedPositiveY)
-    }
-}
diff --git a/vico/views/src/main/java/com/patrykandpatrick/vico/views/chart/BaseChartView.kt b/vico/views/src/main/java/com/patrykandpatrick/vico/views/chart/BaseChartView.kt
deleted file mode 100644
index ef0696816..000000000
--- a/vico/views/src/main/java/com/patrykandpatrick/vico/views/chart/BaseChartView.kt
+++ /dev/null
@@ -1,705 +0,0 @@
-/*
- * Copyright 2023 by Patryk Goworowski and Patrick Michalik.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.patrykandpatrick.vico.views.chart
-
-import android.animation.ValueAnimator
-import android.content.Context
-import android.graphics.Canvas
-import android.graphics.RectF
-import android.util.AttributeSet
-import android.view.MotionEvent
-import android.view.ScaleGestureDetector
-import android.view.View
-import android.view.ViewGroup
-import android.view.animation.Interpolator
-import android.widget.FrameLayout
-import android.widget.OverScroller
-import androidx.core.view.ViewCompat
-import androidx.core.view.isVisible
-import androidx.interpolator.view.animation.FastOutSlowInInterpolator
-import com.patrykandpatrick.vico.core.Animation
-import com.patrykandpatrick.vico.core.DEF_MAX_ZOOM
-import com.patrykandpatrick.vico.core.DEF_MIN_ZOOM
-import com.patrykandpatrick.vico.core.DefaultDimens
-import com.patrykandpatrick.vico.core.axis.AxisManager
-import com.patrykandpatrick.vico.core.axis.AxisPosition
-import com.patrykandpatrick.vico.core.axis.AxisRenderer
-import com.patrykandpatrick.vico.core.chart.Chart
-import com.patrykandpatrick.vico.core.chart.dimensions.MutableHorizontalDimensions
-import com.patrykandpatrick.vico.core.chart.draw.chartDrawContext
-import com.patrykandpatrick.vico.core.chart.draw.drawMarker
-import com.patrykandpatrick.vico.core.chart.draw.getAutoZoom
-import com.patrykandpatrick.vico.core.chart.draw.getMaxScrollDistance
-import com.patrykandpatrick.vico.core.chart.edges.FadingEdges
-import com.patrykandpatrick.vico.core.chart.layout.HorizontalLayout
-import com.patrykandpatrick.vico.core.chart.scale.AutoScaleUp
-import com.patrykandpatrick.vico.core.chart.values.ChartValuesManager
-import com.patrykandpatrick.vico.core.chart.values.ChartValuesProvider
-import com.patrykandpatrick.vico.core.chart.values.toChartValuesProvider
-import com.patrykandpatrick.vico.core.component.shape.ShapeComponent
-import com.patrykandpatrick.vico.core.context.MutableMeasureContext
-import com.patrykandpatrick.vico.core.entry.ChartEntryModel
-import com.patrykandpatrick.vico.core.entry.ChartModelProducer
-import com.patrykandpatrick.vico.core.entry.diff.MutableExtraStore
-import com.patrykandpatrick.vico.core.extension.set
-import com.patrykandpatrick.vico.core.extension.spToPx
-import com.patrykandpatrick.vico.core.layout.VirtualLayout
-import com.patrykandpatrick.vico.core.legend.Legend
-import com.patrykandpatrick.vico.core.marker.Marker
-import com.patrykandpatrick.vico.core.marker.MarkerVisibilityChangeListener
-import com.patrykandpatrick.vico.core.model.Point
-import com.patrykandpatrick.vico.core.scroll.ScrollHandler
-import com.patrykandpatrick.vico.core.scroll.ScrollListener
-import com.patrykandpatrick.vico.core.scroll.ScrollListenerHost
-import com.patrykandpatrick.vico.views.extension.defaultColors
-import com.patrykandpatrick.vico.views.extension.density
-import com.patrykandpatrick.vico.views.extension.dpInt
-import com.patrykandpatrick.vico.views.extension.isLtr
-import com.patrykandpatrick.vico.views.extension.specMode
-import com.patrykandpatrick.vico.views.extension.specSize
-import com.patrykandpatrick.vico.views.extension.verticalPadding
-import com.patrykandpatrick.vico.views.gestures.ChartScaleGestureListener
-import com.patrykandpatrick.vico.views.gestures.MotionEventHandler
-import com.patrykandpatrick.vico.views.gestures.movedXDistance
-import com.patrykandpatrick.vico.views.gestures.movedYDistance
-import com.patrykandpatrick.vico.views.scroll.ChartScrollSpec
-import com.patrykandpatrick.vico.views.scroll.copy
-import com.patrykandpatrick.vico.views.theme.ThemeHandler
-import kotlinx.coroutines.CoroutineDispatcher
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.cancel
-import kotlinx.coroutines.cancelAndJoin
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.runBlocking
-import kotlin.coroutines.EmptyCoroutineContext
-import kotlin.properties.Delegates.observable
-import kotlin.properties.ReadWriteProperty
-
-/**
- * The base for [View]s that display a chart. Subclasses define a [Model] implementation they can handle.
- */
-public abstract class BaseChartView<Model : ChartEntryModel> internal constructor(
-    context: Context,
-    attrs: AttributeSet? = null,
-    defStyleAttr: Int = 0,
-    chartType: ThemeHandler.ChartType,
-) : FrameLayout(context, attrs, defStyleAttr), ScrollListenerHost {
-    private val contentBounds = RectF()
-
-    private val scrollHandler = ScrollHandler()
-
-    private val scroller = OverScroller(context)
-
-    private val axisManager = AxisManager()
-
-    private val virtualLayout = VirtualLayout(axisManager)
-
-    private val chartValuesManager = ChartValuesManager()
-
-    private val motionEventHandler =
-        MotionEventHandler(
-            scroller = scroller,
-            scrollHandler = scrollHandler,
-            density = resources.displayMetrics.density,
-            onTouchPoint = ::handleTouchEvent,
-            requestInvalidate = ::invalidate,
-        )
-
-    private val measureContext =
-        MutableMeasureContext(
-            canvasBounds = contentBounds,
-            density = context.density,
-            isLtr = context.isLtr,
-            isHorizontalScrollEnabled = false,
-            spToPx = context::spToPx,
-            chartValuesProvider = ChartValuesProvider.Empty,
-        )
-
-    private val scaleGestureListener: ScaleGestureDetector.OnScaleGestureListener =
-        ChartScaleGestureListener(
-            getChartBounds = { chart?.bounds },
-            onZoom = ::handleZoom,
-        )
-
-    private val scaleGestureDetector = ScaleGestureDetector(context, scaleGestureListener)
-
-    private val animator: ValueAnimator =
-        ValueAnimator.ofFloat(Animation.range.start, Animation.range.endInclusive).apply {
-            duration = Animation.DIFF_DURATION.toLong()
-            interpolator = FastOutSlowInInterpolator()
-            addUpdateListener { transformModelForAnimation(it.animatedFraction) }
-        }
-
-    private val scrollValueAnimator: ValueAnimator =
-        ValueAnimator.ofFloat(Animation.range.start, Animation.range.endInclusive).apply {
-            duration = Animation.ANIMATED_SCROLL_DURATION.toLong()
-            interpolator = FastOutSlowInInterpolator()
-        }
-
-    private val extraStore = MutableExtraStore()
-
-    private var coroutineScope: CoroutineScope? = null
-
-    private var animationFrameJob: Job? = null
-
-    private var finalAnimationFrameJob: Job? = null
-
-    private var isAnimationRunning = false
-
-    private var isAnimationFrameGenerationRunning: Boolean = false
-
-    private var markerTouchPoint: Point? = null
-
-    private var wasMarkerVisible: Boolean = false
-
-    private var scrollDirectionResolved = false
-
-    private var lastMarkerEntryModels = emptyList<Marker.EntryModel>()
-
-    private var zoom = 0f
-
-    private var wasZoomOverridden = false
-
-    private var chartValuesProvider: ChartValuesProvider = ChartValuesProvider.Empty
-
-    private var horizontalDimensions = MutableHorizontalDimensions()
-
-    internal val themeHandler: ThemeHandler = ThemeHandler(context, attrs, chartType)
-
-    protected var placeholder: View? = null
-
-    /**
-     * The [AxisRenderer] for the start axis.
-     */
-    public var startAxis: AxisRenderer<AxisPosition.Vertical.Start>? by axisManager::startAxis
-
-    /**
-     * The [AxisRenderer] for the top axis.
-     */
-    public var topAxis: AxisRenderer<AxisPosition.Horizontal.Top>? by axisManager::topAxis
-
-    /**
-     * The [AxisRenderer] for the end axis.
-     */
-    public var endAxis: AxisRenderer<AxisPosition.Vertical.End>? by axisManager::endAxis
-
-    /**
-     * The [AxisRenderer] for the bottom axis.
-     */
-    public var bottomAxis: AxisRenderer<AxisPosition.Horizontal.Bottom>? by axisManager::bottomAxis
-
-    /**
-     * Houses scrolling-related settings.
-     */
-    public var chartScrollSpec: ChartScrollSpec<Model> by invalidatingObservable(ChartScrollSpec()) { newValue ->
-        measureContext.isHorizontalScrollEnabled = newValue.isScrollEnabled
-    }
-
-    /**
-     * Defines how the chart’s content is positioned horizontally.
-     */
-    public var horizontalLayout: HorizontalLayout by invalidatingObservable(themeHandler.horizontalLayout) { newValue ->
-        measureContext.horizontalLayout = newValue
-    }
-
-    /**
-     * Overrides the _x_ step (the difference between the _x_ values of neighboring major entries). If this is null, the
-     * default _x_ step ([ChartEntryModel.xGcd]) is used.
-     */
-    public var getXStep: ((Model) -> Float)? by invalidatingObservable(null)
-
-    /**
-     * Whether the pinch-to-zoom gesture is enabled.
-     */
-    public var isZoomEnabled: Boolean = true
-
-    /**
-     * Whether to display an animation when the chart is created. In this animation, the value of each chart entry is
-     * animated from zero to the actual value.
-     */
-    public var runInitialAnimation: Boolean = true
-
-    /**
-     * The [CoroutineDispatcher] to be used for the handling of difference animations.
-     */
-    public var dispatcher: CoroutineDispatcher = Dispatchers.Default
-
-    /**
-     * The [Chart] displayed by this [View].
-     */
-    public var chart: Chart<Model>? by observable(null) { _, _, _ ->
-        tryInvalidate(chart = chart, model = model, updateChartValues = true)
-    }
-
-    /**
-     * The [Model] for this [BaseChartView]’s [Chart] instance ([chart]).
-     */
-    public var model: Model? = null
-        private set
-
-    /**
-     * A [ChartModelProducer] can provide [Model] updates asynchronously.
-     *
-     * @see ChartModelProducer
-     */
-    public var entryProducer: ChartModelProducer<Model>? = null
-        set(value) {
-            field?.unregisterFromUpdates(key = this)
-            field = value
-            if (ViewCompat.isAttachedToWindow(this)) registerForUpdates()
-        }
-
-    private fun registerForUpdates() {
-        coroutineScope?.launch(dispatcher) {
-            entryProducer?.registerForUpdates(
-                key = this@BaseChartView,
-                cancelAnimation = {
-                    handler?.post(animator::cancel)
-                    runBlocking {
-                        animationFrameJob?.cancelAndJoin()
-                        finalAnimationFrameJob?.cancelAndJoin()
-                    }
-                    isAnimationRunning = false
-                    isAnimationFrameGenerationRunning = false
-                },
-                startAnimation = { transformModel ->
-                    if (model != null || runInitialAnimation) {
-                        handler?.post {
-                            isAnimationRunning = true
-                            animator.start()
-                        }
-                    } else {
-                        finalAnimationFrameJob =
-                            coroutineScope?.launch(dispatcher) {
-                                transformModel(this@BaseChartView, Animation.range.endInclusive)
-                            }
-                    }
-                },
-                getOldModel = { model },
-                modelTransformerProvider = chart?.modelTransformerProvider,
-                extraStore = extraStore,
-                updateChartValues = { model ->
-                    chartValuesManager.resetChartValues()
-                    if (model != null) {
-                        chart?.updateChartValues(chartValuesManager, model, getXStep?.invoke(model))
-                        chartValuesManager.toChartValuesProvider()
-                    } else {
-                        ChartValuesProvider.Empty
-                    }.also { provider -> chartValuesProvider = provider }
-                },
-            ) { model ->
-                val chartValuesProvider = chartValuesProvider
-                post {
-                    setModel(model = model, updateChartValues = false)
-                    measureContext.chartValuesProvider = chartValuesProvider
-                    postInvalidateOnAnimation()
-                }
-            }
-        }
-    }
-
-    override fun onAttachedToWindow() {
-        super.onAttachedToWindow()
-        coroutineScope = CoroutineScope(EmptyCoroutineContext)
-        if (entryProducer?.isRegistered(key = this) != true) registerForUpdates()
-    }
-
-    override fun onDetachedFromWindow() {
-        super.onDetachedFromWindow()
-        coroutineScope?.cancel()
-        coroutineScope = null
-        animator.cancel()
-        isAnimationRunning = false
-        entryProducer?.unregisterFromUpdates(key = this)
-    }
-
-    /**
-     * The [Marker] for this chart.
-     */
-    public var marker: Marker? = null
-
-    /**
-     * Allows for listening to [marker] visibility changes.
-     */
-    public var markerVisibilityChangeListener: MarkerVisibilityChangeListener? = null
-
-    /**
-     * The legend for this chart.
-     */
-    public var legend: Legend? = null
-
-    /**
-     * The color of elevation overlays, which are applied to [ShapeComponent]s that cast shadows.
-     */
-    public var elevationOverlayColor: Int = context.defaultColors.elevationOverlayColor.toInt()
-
-    /**
-     * Applies a horizontal fade to the edges of the chart area for scrollable charts.
-     */
-    public var fadingEdges: FadingEdges? by invalidatingObservable(themeHandler.fadingEdges)
-
-    /**
-     * Defines whether the content of the chart should be scaled up when the dimensions are such that, at a scale factor
-     * of 1, an empty space would be visible near the end edge of the chart.
-     */
-    public var autoScaleUp: AutoScaleUp = AutoScaleUp.Full
-
-    init {
-        startAxis = themeHandler.startAxis
-        topAxis = themeHandler.topAxis
-        endAxis = themeHandler.endAxis
-        bottomAxis = themeHandler.bottomAxis
-        chartScrollSpec = chartScrollSpec.copy(isScrollEnabled = themeHandler.isHorizontalScrollEnabled)
-        isZoomEnabled = themeHandler.isChartZoomEnabled
-    }
-
-    /**
-     * Sets the [Model] for this [BaseChartView]’s [Chart] instance ([chart]).
-     */
-    public fun setModel(model: Model?) {
-        setModel(model = model, updateChartValues = true)
-    }
-
-    private fun setModel(
-        model: Model?,
-        updateChartValues: Boolean,
-    ) {
-        val oldModel = this.model
-        this.model = model
-        updatePlaceholderVisibility()
-        tryInvalidate(chart, model, updateChartValues)
-        if (model != null && oldModel?.id != model.id && isInEditMode.not()) {
-            handler?.post {
-                chartScrollSpec.performAutoScroll(
-                    model = model,
-                    oldModel = oldModel,
-                    scrollHandler = scrollHandler,
-                )
-            }
-        }
-    }
-
-    protected fun tryInvalidate(
-        chart: Chart<Model>?,
-        model: Model?,
-        updateChartValues: Boolean,
-    ) {
-        if (chart == null || model == null) return
-        if (updateChartValues) {
-            chartValuesManager.resetChartValues()
-            chart.updateChartValues(chartValuesManager, model, getXStep?.invoke(model))
-            measureContext.chartValuesProvider = chartValuesManager.toChartValuesProvider()
-        }
-        if (ViewCompat.isAttachedToWindow(this)) invalidate()
-    }
-
-    protected inline fun <T> invalidatingObservable(
-        initialValue: T,
-        crossinline onChange: (T) -> Unit = {},
-    ): ReadWriteProperty<Any?, T> {
-        onChange(initialValue)
-        return observable(initialValue) { _, _, newValue ->
-            tryInvalidate(chart = chart, model = model, updateChartValues = false)
-            onChange(newValue)
-        }
-    }
-
-    override fun onTouchEvent(event: MotionEvent): Boolean {
-        val scaleHandled =
-            if (isZoomEnabled && event.pointerCount > 1 && chartScrollSpec.isScrollEnabled) {
-                scaleGestureDetector.onTouchEvent(event)
-            } else {
-                false
-            }
-        val touchHandled = motionEventHandler.handleMotionEvent(event)
-
-        if (scrollDirectionResolved.not() && event.historySize > 0) {
-            scrollDirectionResolved = true
-            parent.requestDisallowInterceptTouchEvent(
-                event.movedXDistance > event.movedYDistance || event.pointerCount > 1,
-            )
-        } else if (event.actionMasked == MotionEvent.ACTION_UP || event.actionMasked == MotionEvent.ACTION_CANCEL) {
-            scrollDirectionResolved = false
-        }
-
-        return touchHandled || scaleHandled
-    }
-
-    private fun handleZoom(
-        focusX: Float,
-        zoomChange: Float,
-    ) {
-        val chart = chart ?: return
-        val newZoom = zoom * zoomChange
-        if (newZoom !in DEF_MIN_ZOOM..DEF_MAX_ZOOM) return
-        val transformationAxisX = scrollHandler.value + focusX - chart.bounds.left
-        val zoomedTransformationAxisX = transformationAxisX * zoomChange
-        zoom = newZoom
-        scrollHandler.handleScrollDelta(transformationAxisX - zoomedTransformationAxisX)
-        handleTouchEvent(null)
-        wasZoomOverridden = true
-        invalidate()
-    }
-
-    private fun handleTouchEvent(point: Point?) {
-        markerTouchPoint = point
-    }
-
-    override fun dispatchDraw(canvas: Canvas) {
-        super.dispatchDraw(canvas)
-
-        withChartAndModel { chart, model ->
-            measureContext.clearExtras()
-            horizontalDimensions.clear()
-            chart.updateHorizontalDimensions(measureContext, horizontalDimensions, model)
-
-            startAxis?.updateHorizontalDimensions(measureContext, horizontalDimensions)
-            topAxis?.updateHorizontalDimensions(measureContext, horizontalDimensions)
-            endAxis?.updateHorizontalDimensions(measureContext, horizontalDimensions)
-            bottomAxis?.updateHorizontalDimensions(measureContext, horizontalDimensions)
-
-            if (
-                virtualLayout
-                    .setBounds(
-                        context = measureContext,
-                        contentBounds = contentBounds,
-                        chart = chart,
-                        legend = legend,
-                        horizontalDimensions = horizontalDimensions,
-                        marker,
-                    )
-                    .isEmpty
-            ) {
-                return@withChartAndModel
-            }
-
-            motionEventHandler.isHorizontalScrollEnabled = chartScrollSpec.isScrollEnabled
-            if (scroller.computeScrollOffset()) {
-                scrollHandler.handleScroll(scroller.currX.toFloat())
-                ViewCompat.postInvalidateOnAnimation(this)
-            }
-
-            var finalZoom = zoom
-
-            if (!wasZoomOverridden || !chartScrollSpec.isScrollEnabled) {
-                finalZoom = measureContext.getAutoZoom(horizontalDimensions, chart.bounds, autoScaleUp)
-                if (chartScrollSpec.isScrollEnabled) zoom = finalZoom
-            }
-
-            scrollHandler.maxValue =
-                measureContext.getMaxScrollDistance(
-                    chartWidth = chart.bounds.width(),
-                    horizontalDimensions = horizontalDimensions,
-                    zoom = finalZoom,
-                )
-
-            scrollHandler.handleInitialScroll(initialScroll = chartScrollSpec.initialScroll)
-
-            val chartDrawContext =
-                chartDrawContext(
-                    canvas = canvas,
-                    elevationOverlayColor = elevationOverlayColor,
-                    measureContext = measureContext,
-                    markerTouchPoint = markerTouchPoint,
-                    horizontalDimensions = horizontalDimensions,
-                    chartBounds = chart.bounds,
-                    horizontalScroll = scrollHandler.value,
-                    zoom = finalZoom,
-                )
-
-            val count = if (fadingEdges != null) chartDrawContext.saveLayer() else -1
-
-            axisManager.drawBehindChart(chartDrawContext)
-            chart.drawScrollableContent(chartDrawContext, model)
-
-            fadingEdges?.apply {
-                applyFadingEdges(chartDrawContext, chart.bounds)
-                chartDrawContext.restoreCanvasToCount(count)
-            }
-
-            axisManager.drawAboveChart(chartDrawContext)
-            chart.drawNonScrollableContent(chartDrawContext, model)
-            legend?.draw(chartDrawContext)
-
-            marker?.also { marker ->
-                chartDrawContext.drawMarker(
-                    marker = marker,
-                    markerTouchPoint = markerTouchPoint,
-                    chart = chart,
-                    markerVisibilityChangeListener = markerVisibilityChangeListener,
-                    wasMarkerVisible = wasMarkerVisible,
-                    setWasMarkerVisible = { wasMarkerVisible = it },
-                    lastMarkerEntryModels = lastMarkerEntryModels,
-                    onMarkerEntryModelsChange = { lastMarkerEntryModels = it },
-                )
-            }
-            measureContext.reset()
-        }
-    }
-
-    private fun transformModelForAnimation(fraction: Float) {
-        when {
-            !isAnimationRunning -> return
-            !isAnimationFrameGenerationRunning -> {
-                isAnimationFrameGenerationRunning = true
-                animationFrameJob =
-                    coroutineScope?.launch(dispatcher) {
-                        entryProducer?.transformModel(this@BaseChartView, fraction)
-                        isAnimationFrameGenerationRunning = false
-                    }
-            }
-            fraction == 1f -> {
-                finalAnimationFrameJob =
-                    coroutineScope?.launch(dispatcher) {
-                        animationFrameJob?.cancelAndJoin()
-                        entryProducer?.transformModel(this@BaseChartView, fraction)
-                        isAnimationFrameGenerationRunning = false
-                    }
-            }
-        }
-    }
-
-    override fun onMeasure(
-        widthMeasureSpec: Int,
-        heightMeasureSpec: Int,
-    ) {
-        val width = widthMeasureSpec.specSize.coerceAtLeast(suggestedMinimumWidth)
-        val defaultHeight = DefaultDimens.CHART_HEIGHT.dpInt + verticalPadding
-        val height =
-            when (heightMeasureSpec.specMode) {
-                MeasureSpec.EXACTLY -> heightMeasureSpec.specSize
-                MeasureSpec.AT_MOST -> defaultHeight.coerceAtMost(heightMeasureSpec.specSize)
-                else -> defaultHeight
-            }.coerceAtLeast(suggestedMinimumHeight)
-        super.onMeasure(
-            MeasureSpec.makeMeasureSpec(width, MeasureSpec.EXACTLY),
-            MeasureSpec.makeMeasureSpec(height, MeasureSpec.EXACTLY),
-        )
-        contentBounds
-            .set(left = paddingLeft, top = paddingTop, right = width - paddingRight, bottom = height - paddingBottom)
-    }
-
-    override fun addView(
-        child: View,
-        index: Int,
-        params: ViewGroup.LayoutParams?,
-    ) {
-        check(childCount == 0) { "Only one placeholder can be added." }
-        super.addView(child, index, params)
-        placeholder = child
-        updatePlaceholderVisibility()
-    }
-
-    override fun onViewRemoved(child: View?) {
-        super.onViewRemoved(child)
-        placeholder = null
-    }
-
-    /**
-     * Updates the placeholder, which is shown when no [ChartEntryModel] is available.
-     */
-    public fun setPlaceholder(
-        view: View?,
-        params: LayoutParams? = null,
-    ) {
-        if (view === placeholder) return
-        removeAllViews()
-        if (view != null) addView(view, params)
-        placeholder = view
-        updatePlaceholderVisibility()
-    }
-
-    protected fun updatePlaceholderVisibility() {
-        placeholder?.isVisible = model == null
-    }
-
-    private inline fun withChartAndModel(block: (chart: Chart<Model>, model: Model) -> Unit) {
-        val chart = chart ?: return
-        val model = model ?: return
-        block(chart, model)
-    }
-
-    /**
-     * Sets the duration (in milliseconds) of difference animations.
-     */
-    public fun setDiffAnimationDuration(durationMillis: Long) {
-        animator.duration = durationMillis
-    }
-
-    /**
-     * Sets the [Interpolator] for difference animations.
-     */
-    public fun setDiffAnimationInterpolator(interpolator: Interpolator) {
-        animator.interpolator = interpolator
-    }
-
-    /**
-     * Sets the duration (in milliseconds) of animated scrolls ([animateScrollBy]).
-     */
-    public fun setAnimatedScrollDuration(durationMillis: Long) {
-        scrollValueAnimator.duration = durationMillis
-    }
-
-    /**
-     * Sets the [Interpolator] for animated scrolls ([animateScrollBy]).
-     */
-    public fun setAnimatedScrollInterpolator(interpolator: Interpolator) {
-        scrollValueAnimator.interpolator = interpolator
-    }
-
-    public override fun registerScrollListener(scrollListener: ScrollListener) {
-        scrollHandler.registerScrollListener(scrollListener)
-    }
-
-    public override fun removeScrollListener(scrollListener: ScrollListener) {
-        scrollHandler.removeScrollListener(scrollListener)
-    }
-
-    /**
-     * Invokes the provided function block, passing to it the current scroll amount and the maximum scroll amount, and
-     * scrolls the chart by the number of pixels returned by the function block.
-     */
-    public fun scrollBy(getDelta: (value: Float, maxValue: Float) -> Float) {
-        scrollHandler.handleScrollDelta(getDelta(scrollHandler.value, scrollHandler.maxValue))
-    }
-
-    /**
-     * Invokes the provided function block, passing to it the current scroll amount and the maximum scroll amount, and
-     * scrolls the chart by the number of pixels returned by the function block, using a [ValueAnimator]. Customize the
-     * animation with [setAnimatedScrollDuration] and [setAnimatedScrollInterpolator].
-     */
-    public fun animateScrollBy(getDelta: (value: Float, maxValue: Float) -> Float) {
-        val initialValue = scrollHandler.value
-        val delta = getDelta(initialValue, scrollHandler.maxValue)
-        with(scrollValueAnimator) {
-            cancel()
-            removeAllUpdateListeners()
-            addUpdateListener { scrollHandler.handleScroll(initialValue + it.animatedFraction * delta) }
-            start()
-        }
-    }
-
-    @Suppress("UNNECESSARY_SAFE_CALL")
-    override fun onRtlPropertiesChanged(layoutDirection: Int) {
-        // This function may be invoked inside of the View’s constructor, before the measureContext is initialized.
-        // In this case, we can ignore this callback, as the layout direction will be determined when the MeasureContext
-        // instance is created.
-        measureContext?.isLtr = layoutDirection == ViewCompat.LAYOUT_DIRECTION_LTR
-    }
-}
diff --git a/vico/views/src/main/java/com/patrykandpatrick/vico/views/chart/CartesianChartView.kt b/vico/views/src/main/java/com/patrykandpatrick/vico/views/chart/CartesianChartView.kt
new file mode 100644
index 000000000..ebfc11fe4
--- /dev/null
+++ b/vico/views/src/main/java/com/patrykandpatrick/vico/views/chart/CartesianChartView.kt
@@ -0,0 +1,749 @@
+/*
+ * Copyright 2023 by Patryk Goworowski and Patrick Michalik.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.patrykandpatrick.vico.views.chart
+
+import android.animation.ValueAnimator
+import android.content.Context
+import android.graphics.Canvas
+import android.graphics.RectF
+import android.util.AttributeSet
+import android.view.MotionEvent
+import android.view.ScaleGestureDetector
+import android.view.View
+import android.view.ViewGroup
+import android.view.animation.Interpolator
+import android.widget.FrameLayout
+import android.widget.OverScroller
+import androidx.core.view.ViewCompat
+import androidx.core.view.isVisible
+import androidx.interpolator.view.animation.FastOutSlowInInterpolator
+import com.patrykandpatrick.vico.core.Animation
+import com.patrykandpatrick.vico.core.DEF_MAX_ZOOM
+import com.patrykandpatrick.vico.core.DEF_MIN_ZOOM
+import com.patrykandpatrick.vico.core.DefaultDimens
+import com.patrykandpatrick.vico.core.axis.AxisManager
+import com.patrykandpatrick.vico.core.axis.AxisPosition
+import com.patrykandpatrick.vico.core.axis.AxisRenderer
+import com.patrykandpatrick.vico.core.chart.CartesianChart
+import com.patrykandpatrick.vico.core.chart.dimensions.MutableHorizontalDimensions
+import com.patrykandpatrick.vico.core.chart.draw.chartDrawContext
+import com.patrykandpatrick.vico.core.chart.draw.drawMarker
+import com.patrykandpatrick.vico.core.chart.draw.getAutoZoom
+import com.patrykandpatrick.vico.core.chart.draw.getMaxScrollDistance
+import com.patrykandpatrick.vico.core.chart.edges.FadingEdges
+import com.patrykandpatrick.vico.core.chart.layout.HorizontalLayout
+import com.patrykandpatrick.vico.core.chart.scale.AutoScaleUp
+import com.patrykandpatrick.vico.core.chart.values.ChartValues
+import com.patrykandpatrick.vico.core.chart.values.MutableChartValues
+import com.patrykandpatrick.vico.core.chart.values.toImmutable
+import com.patrykandpatrick.vico.core.component.shape.ShapeComponent
+import com.patrykandpatrick.vico.core.context.MutableMeasureContext
+import com.patrykandpatrick.vico.core.extension.set
+import com.patrykandpatrick.vico.core.extension.spToPx
+import com.patrykandpatrick.vico.core.layout.VirtualLayout
+import com.patrykandpatrick.vico.core.legend.Legend
+import com.patrykandpatrick.vico.core.marker.Marker
+import com.patrykandpatrick.vico.core.marker.MarkerVisibilityChangeListener
+import com.patrykandpatrick.vico.core.model.CartesianChartModel
+import com.patrykandpatrick.vico.core.model.CartesianChartModelProducer
+import com.patrykandpatrick.vico.core.model.MutableExtraStore
+import com.patrykandpatrick.vico.core.scroll.ScrollHandler
+import com.patrykandpatrick.vico.core.scroll.ScrollListener
+import com.patrykandpatrick.vico.core.scroll.ScrollListenerHost
+import com.patrykandpatrick.vico.core.util.Point
+import com.patrykandpatrick.vico.core.util.RandomCartesianModelGenerator
+import com.patrykandpatrick.vico.views.R
+import com.patrykandpatrick.vico.views.extension.defaultColors
+import com.patrykandpatrick.vico.views.extension.density
+import com.patrykandpatrick.vico.views.extension.dpInt
+import com.patrykandpatrick.vico.views.extension.isLtr
+import com.patrykandpatrick.vico.views.extension.specMode
+import com.patrykandpatrick.vico.views.extension.specSize
+import com.patrykandpatrick.vico.views.extension.verticalPadding
+import com.patrykandpatrick.vico.views.gestures.ChartScaleGestureListener
+import com.patrykandpatrick.vico.views.gestures.MotionEventHandler
+import com.patrykandpatrick.vico.views.gestures.movedXDistance
+import com.patrykandpatrick.vico.views.gestures.movedYDistance
+import com.patrykandpatrick.vico.views.scroll.ChartScrollSpec
+import com.patrykandpatrick.vico.views.scroll.copy
+import com.patrykandpatrick.vico.views.theme.ThemeHandler
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.cancel
+import kotlinx.coroutines.cancelAndJoin
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.runBlocking
+import kotlin.coroutines.EmptyCoroutineContext
+import kotlin.properties.Delegates.observable
+import kotlin.properties.ReadWriteProperty
+
+/**
+ * Displays a [CartesianChart].
+ */
+public open class CartesianChartView
+    @JvmOverloads
+    constructor(
+        context: Context,
+        attrs: AttributeSet? = null,
+        defStyleAttr: Int = 0,
+    ) : FrameLayout(context, attrs, defStyleAttr), ScrollListenerHost {
+        private val contentBounds = RectF()
+
+        private val scrollHandler = ScrollHandler()
+
+        private val scroller = OverScroller(context)
+
+        private val axisManager = AxisManager()
+
+        private val virtualLayout = VirtualLayout(axisManager)
+
+        private val mutableChartValues = MutableChartValues()
+
+        private val motionEventHandler =
+            MotionEventHandler(
+                scroller = scroller,
+                scrollHandler = scrollHandler,
+                density = resources.displayMetrics.density,
+                onTouchPoint = ::handleTouchEvent,
+                requestInvalidate = ::invalidate,
+            )
+
+        private val measureContext =
+            MutableMeasureContext(
+                canvasBounds = contentBounds,
+                density = context.density,
+                isLtr = context.isLtr,
+                isHorizontalScrollEnabled = false,
+                spToPx = context::spToPx,
+                chartValues = ChartValues.Empty,
+            )
+
+        private val scaleGestureListener: ScaleGestureDetector.OnScaleGestureListener =
+            ChartScaleGestureListener(
+                getChartBounds = { chart?.bounds },
+                onZoom = ::handleZoom,
+            )
+
+        private val scaleGestureDetector = ScaleGestureDetector(context, scaleGestureListener)
+
+        private val animator: ValueAnimator =
+            ValueAnimator.ofFloat(Animation.range.start, Animation.range.endInclusive).apply {
+                duration = Animation.DIFF_DURATION.toLong()
+                interpolator = FastOutSlowInInterpolator()
+                addUpdateListener { transformModelForAnimation(it.animatedFraction) }
+            }
+
+        private val scrollValueAnimator: ValueAnimator =
+            ValueAnimator.ofFloat(Animation.range.start, Animation.range.endInclusive).apply {
+                duration = Animation.ANIMATED_SCROLL_DURATION.toLong()
+                interpolator = FastOutSlowInInterpolator()
+            }
+
+        private val extraStore = MutableExtraStore()
+
+        private var coroutineScope: CoroutineScope? = null
+
+        private var animationFrameJob: Job? = null
+
+        private var finalAnimationFrameJob: Job? = null
+
+        private var isAnimationRunning = false
+
+        private var isAnimationFrameGenerationRunning: Boolean = false
+
+        private var markerTouchPoint: Point? = null
+
+        private var wasMarkerVisible: Boolean = false
+
+        private var scrollDirectionResolved = false
+
+        private var lastMarkerEntryModels = emptyList<Marker.EntryModel>()
+
+        private var zoom = 0f
+
+        private var wasZoomOverridden = false
+
+        private var chartValues: ChartValues = ChartValues.Empty
+
+        private var horizontalDimensions = MutableHorizontalDimensions()
+
+        private val themeHandler: ThemeHandler = ThemeHandler(context, attrs)
+
+        protected var placeholder: View? = null
+
+        /**
+         * The [AxisRenderer] for the start axis.
+         */
+        public var startAxis: AxisRenderer<AxisPosition.Vertical.Start>? by axisManager::startAxis
+
+        /**
+         * The [AxisRenderer] for the top axis.
+         */
+        public var topAxis: AxisRenderer<AxisPosition.Horizontal.Top>? by axisManager::topAxis
+
+        /**
+         * The [AxisRenderer] for the end axis.
+         */
+        public var endAxis: AxisRenderer<AxisPosition.Vertical.End>? by axisManager::endAxis
+
+        /**
+         * The [AxisRenderer] for the bottom axis.
+         */
+        public var bottomAxis: AxisRenderer<AxisPosition.Horizontal.Bottom>? by axisManager::bottomAxis
+
+        /**
+         * Houses scrolling-related settings.
+         */
+        public var chartScrollSpec: ChartScrollSpec by invalidatingObservable(ChartScrollSpec()) { newValue ->
+            measureContext.isHorizontalScrollEnabled = newValue.isScrollEnabled
+        }
+
+        /**
+         * Defines how the chart’s content is positioned horizontally.
+         */
+        public var horizontalLayout: HorizontalLayout by invalidatingObservable(
+            themeHandler.horizontalLayout,
+        ) { newValue ->
+            measureContext.horizontalLayout = newValue
+        }
+
+        /**
+         * Overrides the _x_ step (the difference between the _x_ values of neighboring major entries). If this is null,
+         * the default _x_ step ([CartesianChartModel.xDeltaGcd]) is used.
+         */
+        public var getXStep: ((CartesianChartModel) -> Float)? by invalidatingObservable(null)
+
+        /**
+         * Whether the pinch-to-zoom gesture is enabled.
+         */
+        public var isZoomEnabled: Boolean = true
+
+        /**
+         * Whether to display an animation when the chart is created. In this animation, the value of each chart entry
+         * is animated from zero to the actual value.
+         */
+        public var runInitialAnimation: Boolean = true
+
+        /**
+         * The [CoroutineDispatcher] to be used for the handling of difference animations.
+         */
+        public var dispatcher: CoroutineDispatcher = Dispatchers.Default
+
+        /**
+         * The [CartesianChart] displayed by this [View].
+         */
+        public var chart: CartesianChart? by observable(null) { _, _, _ ->
+            tryInvalidate(chart = chart, model = model, updateChartValues = true)
+        }
+
+        /**
+         * The [CartesianChartModel].
+         */
+        public var model: CartesianChartModel? = null
+            private set
+
+        /**
+         * Creates and updates the [CartesianChartModel].
+         */
+        public var modelProducer: CartesianChartModelProducer? = null
+            set(value) {
+                field?.unregisterFromUpdates(key = this)
+                field = value
+                if (ViewCompat.isAttachedToWindow(this)) registerForUpdates()
+            }
+
+        private fun registerForUpdates() {
+            coroutineScope?.launch(dispatcher) {
+                modelProducer?.registerForUpdates(
+                    key = this@CartesianChartView,
+                    cancelAnimation = {
+                        handler?.post(animator::cancel)
+                        runBlocking {
+                            animationFrameJob?.cancelAndJoin()
+                            finalAnimationFrameJob?.cancelAndJoin()
+                        }
+                        isAnimationRunning = false
+                        isAnimationFrameGenerationRunning = false
+                    },
+                    startAnimation = { transformModel ->
+                        if (model != null || runInitialAnimation) {
+                            handler?.post {
+                                isAnimationRunning = true
+                                animator.start()
+                            }
+                        } else {
+                            finalAnimationFrameJob =
+                                coroutineScope?.launch(dispatcher) {
+                                    transformModel(this@CartesianChartView, Animation.range.endInclusive)
+                                }
+                        }
+                    },
+                    prepareForTransformation = { model, extraStore, chartValues ->
+                        chart?.prepareForTransformation(model, extraStore, chartValues)
+                    },
+                    transform = { extraStore, fraction -> chart?.transform(extraStore, fraction) },
+                    extraStore = extraStore,
+                    updateChartValues = { model ->
+                        mutableChartValues.reset()
+                        if (model != null) {
+                            chart?.updateChartValues(mutableChartValues, model, getXStep?.invoke(model))
+                            mutableChartValues.toImmutable()
+                        } else {
+                            ChartValues.Empty
+                        }.also { values -> chartValues = values }
+                    },
+                ) { model ->
+                    val chartValues = chartValues
+                    post {
+                        setModel(model = model, updateChartValues = false)
+                        measureContext.chartValues = chartValues
+                        postInvalidateOnAnimation()
+                    }
+                }
+            }
+        }
+
+        override fun onAttachedToWindow() {
+            super.onAttachedToWindow()
+            coroutineScope = CoroutineScope(EmptyCoroutineContext)
+            if (modelProducer?.isRegistered(key = this) != true) registerForUpdates()
+        }
+
+        override fun onDetachedFromWindow() {
+            super.onDetachedFromWindow()
+            coroutineScope?.cancel()
+            coroutineScope = null
+            animator.cancel()
+            isAnimationRunning = false
+            modelProducer?.unregisterFromUpdates(key = this)
+        }
+
+        /**
+         * The [Marker] for this chart.
+         */
+        public var marker: Marker? = null
+
+        /**
+         * Allows for listening to [marker] visibility changes.
+         */
+        public var markerVisibilityChangeListener: MarkerVisibilityChangeListener? = null
+
+        /**
+         * The legend for this chart.
+         */
+        public var legend: Legend? = null
+
+        /**
+         * The color of elevation overlays, which are applied to [ShapeComponent]s that cast shadows.
+         */
+        public var elevationOverlayColor: Int = context.defaultColors.elevationOverlayColor.toInt()
+
+        /**
+         * Applies a horizontal fade to the edges of the chart area for scrollable charts.
+         */
+        public var fadingEdges: FadingEdges? by invalidatingObservable(themeHandler.fadingEdges)
+
+        /**
+         * Defines whether the content of the chart should be scaled up when the dimensions are such that, at a scale
+         * factor of 1, an empty space would be visible near the end edge of the chart.
+         */
+        public var autoScaleUp: AutoScaleUp = AutoScaleUp.Full
+
+        init {
+            chart = themeHandler.chart
+            startAxis = themeHandler.startAxis
+            topAxis = themeHandler.topAxis
+            endAxis = themeHandler.endAxis
+            bottomAxis = themeHandler.bottomAxis
+            chartScrollSpec = chartScrollSpec.copy(isScrollEnabled = themeHandler.isHorizontalScrollEnabled)
+            isZoomEnabled = themeHandler.isChartZoomEnabled
+            if (isInEditMode && attrs != null) {
+                context.obtainStyledAttributes(attrs, R.styleable.CartesianChartView, defStyleAttr, 0).use {
+                        typedArray ->
+                    val minX =
+                        typedArray.getInteger(
+                            R.styleable.CartesianChartView_previewMinX,
+                            RandomCartesianModelGenerator.defaultX.first,
+                        )
+                    val maxX =
+                        typedArray.getInteger(
+                            R.styleable.CartesianChartView_previewMaxX,
+                            RandomCartesianModelGenerator.defaultX.last,
+                        )
+                    val minY =
+                        typedArray.getFloat(
+                            R.styleable.CartesianChartView_previewMinY,
+                            RandomCartesianModelGenerator.defaultY.start,
+                        )
+                    val maxY =
+                        typedArray.getFloat(
+                            R.styleable.CartesianChartView_previewMaxY,
+                            RandomCartesianModelGenerator.defaultY.endInclusive,
+                        )
+                    setModel(
+                        RandomCartesianModelGenerator.getRandomModel(
+                            typedArray.getInt(R.styleable.CartesianChartView_previewColumnSeriesCount, 1),
+                            typedArray.getInt(R.styleable.CartesianChartView_previewLineSeriesCount, 1),
+                            minX..maxX,
+                            minY..maxY,
+                        ),
+                    )
+                }
+            }
+        }
+
+        /**
+         * Sets the [CartesianChartModel].
+         */
+        public fun setModel(model: CartesianChartModel?) {
+            setModel(model = model, updateChartValues = true)
+        }
+
+        private fun setModel(
+            model: CartesianChartModel?,
+            updateChartValues: Boolean,
+        ) {
+            val oldModel = this.model
+            this.model = model
+            updatePlaceholderVisibility()
+            tryInvalidate(chart, model, updateChartValues)
+            if (model != null && oldModel?.id != model.id && isInEditMode.not()) {
+                handler?.post {
+                    chartScrollSpec.performAutoScroll(
+                        model = model,
+                        oldModel = oldModel,
+                        scrollHandler = scrollHandler,
+                    )
+                }
+            }
+        }
+
+        protected fun tryInvalidate(
+            chart: CartesianChart?,
+            model: CartesianChartModel?,
+            updateChartValues: Boolean,
+        ) {
+            if (chart == null || model == null) return
+            if (updateChartValues) {
+                mutableChartValues.reset()
+                chart.updateChartValues(mutableChartValues, model, getXStep?.invoke(model))
+                measureContext.chartValues = mutableChartValues.toImmutable()
+            }
+            if (ViewCompat.isAttachedToWindow(this)) invalidate()
+        }
+
+        protected inline fun <T> invalidatingObservable(
+            initialValue: T,
+            crossinline onChange: (T) -> Unit = {},
+        ): ReadWriteProperty<Any?, T> {
+            onChange(initialValue)
+            return observable(initialValue) { _, _, newValue ->
+                tryInvalidate(chart = chart, model = model, updateChartValues = false)
+                onChange(newValue)
+            }
+        }
+
+        override fun onTouchEvent(event: MotionEvent): Boolean {
+            val scaleHandled =
+                if (isZoomEnabled && event.pointerCount > 1 && chartScrollSpec.isScrollEnabled) {
+                    scaleGestureDetector.onTouchEvent(event)
+                } else {
+                    false
+                }
+            val touchHandled = motionEventHandler.handleMotionEvent(event)
+
+            if (scrollDirectionResolved.not() && event.historySize > 0) {
+                scrollDirectionResolved = true
+                parent.requestDisallowInterceptTouchEvent(
+                    event.movedXDistance > event.movedYDistance || event.pointerCount > 1,
+                )
+            } else if (event.actionMasked == MotionEvent.ACTION_UP || event.actionMasked == MotionEvent.ACTION_CANCEL) {
+                scrollDirectionResolved = false
+            }
+
+            return touchHandled || scaleHandled
+        }
+
+        private fun handleZoom(
+            focusX: Float,
+            zoomChange: Float,
+        ) {
+            val chart = chart ?: return
+            val newZoom = zoom * zoomChange
+            if (newZoom !in DEF_MIN_ZOOM..DEF_MAX_ZOOM) return
+            val transformationAxisX = scrollHandler.value + focusX - chart.bounds.left
+            val zoomedTransformationAxisX = transformationAxisX * zoomChange
+            zoom = newZoom
+            scrollHandler.handleScrollDelta(transformationAxisX - zoomedTransformationAxisX)
+            handleTouchEvent(null)
+            wasZoomOverridden = true
+            invalidate()
+        }
+
+        private fun handleTouchEvent(point: Point?) {
+            markerTouchPoint = point
+        }
+
+        override fun dispatchDraw(canvas: Canvas) {
+            super.dispatchDraw(canvas)
+
+            withChartAndModel { chart, model ->
+                measureContext.clearExtras()
+                horizontalDimensions.clear()
+                chart.updateHorizontalDimensions(measureContext, horizontalDimensions, model)
+
+                startAxis?.updateHorizontalDimensions(measureContext, horizontalDimensions)
+                topAxis?.updateHorizontalDimensions(measureContext, horizontalDimensions)
+                endAxis?.updateHorizontalDimensions(measureContext, horizontalDimensions)
+                bottomAxis?.updateHorizontalDimensions(measureContext, horizontalDimensions)
+
+                if (
+                    virtualLayout
+                        .setBounds(
+                            context = measureContext,
+                            contentBounds = contentBounds,
+                            chart = chart,
+                            legend = legend,
+                            horizontalDimensions = horizontalDimensions,
+                            marker,
+                        )
+                        .isEmpty
+                ) {
+                    return@withChartAndModel
+                }
+
+                motionEventHandler.isHorizontalScrollEnabled = chartScrollSpec.isScrollEnabled
+                if (scroller.computeScrollOffset()) {
+                    scrollHandler.handleScroll(scroller.currX.toFloat())
+                    ViewCompat.postInvalidateOnAnimation(this)
+                }
+
+                var finalZoom = zoom
+
+                if (!wasZoomOverridden || !chartScrollSpec.isScrollEnabled) {
+                    finalZoom = measureContext.getAutoZoom(horizontalDimensions, chart.bounds, autoScaleUp)
+                    if (chartScrollSpec.isScrollEnabled) zoom = finalZoom
+                }
+
+                scrollHandler.maxValue =
+                    measureContext.getMaxScrollDistance(
+                        chartWidth = chart.bounds.width(),
+                        horizontalDimensions = horizontalDimensions,
+                        zoom = finalZoom,
+                    )
+
+                scrollHandler.handleInitialScroll(initialScroll = chartScrollSpec.initialScroll)
+
+                val chartDrawContext =
+                    chartDrawContext(
+                        canvas = canvas,
+                        elevationOverlayColor = elevationOverlayColor,
+                        measureContext = measureContext,
+                        markerTouchPoint = markerTouchPoint,
+                        horizontalDimensions = horizontalDimensions,
+                        chartBounds = chart.bounds,
+                        horizontalScroll = scrollHandler.value,
+                        zoom = finalZoom,
+                    )
+
+                val count = if (fadingEdges != null) chartDrawContext.saveLayer() else -1
+
+                axisManager.drawBehindChart(chartDrawContext)
+                chart.draw(chartDrawContext, model)
+
+                fadingEdges?.apply {
+                    applyFadingEdges(chartDrawContext, chart.bounds)
+                    chartDrawContext.restoreCanvasToCount(count)
+                }
+
+                axisManager.drawAboveChart(chartDrawContext)
+                chart.drawOverlays(chartDrawContext)
+                legend?.draw(chartDrawContext)
+
+                marker?.also { marker ->
+                    chartDrawContext.drawMarker(
+                        marker = marker,
+                        markerTouchPoint = markerTouchPoint,
+                        chart = chart,
+                        markerVisibilityChangeListener = markerVisibilityChangeListener,
+                        wasMarkerVisible = wasMarkerVisible,
+                        setWasMarkerVisible = { wasMarkerVisible = it },
+                        lastMarkerEntryModels = lastMarkerEntryModels,
+                        onMarkerEntryModelsChange = { lastMarkerEntryModels = it },
+                    )
+                }
+                measureContext.reset()
+            }
+        }
+
+        private fun transformModelForAnimation(fraction: Float) {
+            when {
+                !isAnimationRunning -> return
+                !isAnimationFrameGenerationRunning -> {
+                    isAnimationFrameGenerationRunning = true
+                    animationFrameJob =
+                        coroutineScope?.launch(dispatcher) {
+                            modelProducer?.transformModel(this@CartesianChartView, fraction)
+                            isAnimationFrameGenerationRunning = false
+                        }
+                }
+                fraction == 1f -> {
+                    finalAnimationFrameJob =
+                        coroutineScope?.launch(dispatcher) {
+                            animationFrameJob?.cancelAndJoin()
+                            modelProducer?.transformModel(this@CartesianChartView, fraction)
+                            isAnimationFrameGenerationRunning = false
+                        }
+                }
+            }
+        }
+
+        override fun onMeasure(
+            widthMeasureSpec: Int,
+            heightMeasureSpec: Int,
+        ) {
+            val width = widthMeasureSpec.specSize.coerceAtLeast(suggestedMinimumWidth)
+            val defaultHeight = DefaultDimens.CHART_HEIGHT.dpInt + verticalPadding
+            val height =
+                when (heightMeasureSpec.specMode) {
+                    MeasureSpec.EXACTLY -> heightMeasureSpec.specSize
+                    MeasureSpec.AT_MOST -> defaultHeight.coerceAtMost(heightMeasureSpec.specSize)
+                    else -> defaultHeight
+                }.coerceAtLeast(suggestedMinimumHeight)
+            super.onMeasure(
+                MeasureSpec.makeMeasureSpec(width, MeasureSpec.EXACTLY),
+                MeasureSpec.makeMeasureSpec(height, MeasureSpec.EXACTLY),
+            )
+            contentBounds
+                .set(
+                    left = paddingLeft,
+                    top = paddingTop,
+                    right = width - paddingRight,
+                    bottom = height - paddingBottom,
+                )
+        }
+
+        override fun addView(
+            child: View,
+            index: Int,
+            params: ViewGroup.LayoutParams?,
+        ) {
+            check(childCount == 0) { "Only one placeholder can be added." }
+            super.addView(child, index, params)
+            placeholder = child
+            updatePlaceholderVisibility()
+        }
+
+        override fun onViewRemoved(child: View?) {
+            super.onViewRemoved(child)
+            placeholder = null
+        }
+
+        /**
+         * Updates the placeholder, which is shown when no [CartesianChartModel] is available.
+         */
+        public fun setPlaceholder(
+            view: View?,
+            params: LayoutParams? = null,
+        ) {
+            if (view === placeholder) return
+            removeAllViews()
+            if (view != null) addView(view, params)
+            placeholder = view
+            updatePlaceholderVisibility()
+        }
+
+        protected fun updatePlaceholderVisibility() {
+            placeholder?.isVisible = model == null
+        }
+
+        private inline fun withChartAndModel(block: (chart: CartesianChart, model: CartesianChartModel) -> Unit) {
+            val chart = chart ?: return
+            val model = model ?: return
+            block(chart, model)
+        }
+
+        /**
+         * Sets the duration (in milliseconds) of difference animations.
+         */
+        public fun setDiffAnimationDuration(durationMillis: Long) {
+            animator.duration = durationMillis
+        }
+
+        /**
+         * Sets the [Interpolator] for difference animations.
+         */
+        public fun setDiffAnimationInterpolator(interpolator: Interpolator) {
+            animator.interpolator = interpolator
+        }
+
+        /**
+         * Sets the duration (in milliseconds) of animated scrolls ([animateScrollBy]).
+         */
+        public fun setAnimatedScrollDuration(durationMillis: Long) {
+            scrollValueAnimator.duration = durationMillis
+        }
+
+        /**
+         * Sets the [Interpolator] for animated scrolls ([animateScrollBy]).
+         */
+        public fun setAnimatedScrollInterpolator(interpolator: Interpolator) {
+            scrollValueAnimator.interpolator = interpolator
+        }
+
+        public override fun registerScrollListener(scrollListener: ScrollListener) {
+            scrollHandler.registerScrollListener(scrollListener)
+        }
+
+        public override fun removeScrollListener(scrollListener: ScrollListener) {
+            scrollHandler.removeScrollListener(scrollListener)
+        }
+
+        /**
+         * Invokes the provided function block, passing to it the current scroll amount and the maximum scroll amount,
+         * and scrolls the chart by the number of pixels returned by the function block.
+         */
+        public fun scrollBy(getDelta: (value: Float, maxValue: Float) -> Float) {
+            scrollHandler.handleScrollDelta(getDelta(scrollHandler.value, scrollHandler.maxValue))
+        }
+
+        /**
+         * Invokes the provided function block, passing to it the current scroll amount and the maximum scroll amount,
+         * and scrolls the chart by the number of pixels returned by the function block, using a [ValueAnimator].
+         * Customize the animation with [setAnimatedScrollDuration] and [setAnimatedScrollInterpolator].
+         */
+        public fun animateScrollBy(getDelta: (value: Float, maxValue: Float) -> Float) {
+            val initialValue = scrollHandler.value
+            val delta = getDelta(initialValue, scrollHandler.maxValue)
+            with(scrollValueAnimator) {
+                cancel()
+                removeAllUpdateListeners()
+                addUpdateListener { scrollHandler.handleScroll(initialValue + it.animatedFraction * delta) }
+                start()
+            }
+        }
+
+        @Suppress("UNNECESSARY_SAFE_CALL")
+        override fun onRtlPropertiesChanged(layoutDirection: Int) {
+            // This function may be invoked inside of the View’s constructor, before the measureContext is initialized.
+            // In this case, we can ignore this callback, as the layout direction will be determined when the
+            // MeasureContext instance is created.
+            measureContext?.isLtr = layoutDirection == ViewCompat.LAYOUT_DIRECTION_LTR
+        }
+    }
diff --git a/vico/views/src/main/java/com/patrykandpatrick/vico/views/chart/ChartView.kt b/vico/views/src/main/java/com/patrykandpatrick/vico/views/chart/ChartView.kt
deleted file mode 100644
index 15a618520..000000000
--- a/vico/views/src/main/java/com/patrykandpatrick/vico/views/chart/ChartView.kt
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright 2023 by Patryk Goworowski and Patrick Michalik.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.patrykandpatrick.vico.views.chart
-
-import android.content.Context
-import android.util.AttributeSet
-import com.patrykandpatrick.vico.core.entry.ChartEntryModel
-import com.patrykandpatrick.vico.core.util.RandomEntriesGenerator
-import com.patrykandpatrick.vico.core.util.RandomEntriesGenerator.Companion.SERIES_COUNT
-import com.patrykandpatrick.vico.core.util.RandomEntriesGenerator.Companion.X_RANGE_TOP
-import com.patrykandpatrick.vico.core.util.RandomEntriesGenerator.Companion.Y_RANGE_TOP
-import com.patrykandpatrick.vico.views.R
-import com.patrykandpatrick.vico.views.theme.ThemeHandler
-
-/**
- * A subclass of [BaseChartView] that displays charts that use [ChartEntryModel].
- */
-public class ChartView
-    @JvmOverloads
-    constructor(
-        context: Context,
-        attrs: AttributeSet? = null,
-        defStyleAttr: Int = 0,
-    ) : BaseChartView<ChartEntryModel>(
-            context = context,
-            attrs = attrs,
-            defStyleAttr = defStyleAttr,
-            chartType = ThemeHandler.ChartType.Single,
-        ) {
-        init {
-            chart = themeHandler.chart
-            if (isInEditMode && attrs != null) setPreviewModel(attrs)
-        }
-
-        private fun setPreviewModel(attrs: AttributeSet) {
-            context.obtainStyledAttributes(attrs, R.styleable.ChartView).use { typedArray ->
-                val seriesCount = typedArray.getInt(R.styleable.ChartView_previewSeriesCount, SERIES_COUNT)
-                val minX = typedArray.getInt(R.styleable.ChartView_previewMinX, 0)
-                val maxX = typedArray.getInt(R.styleable.ChartView_previewMaxX, X_RANGE_TOP)
-                val minY = typedArray.getInt(R.styleable.ChartView_previewMinY, 0)
-                val maxY = typedArray.getInt(R.styleable.ChartView_previewMaxY, Y_RANGE_TOP)
-                setModel(
-                    model =
-                        RandomEntriesGenerator(
-                            xRange = minX..maxX,
-                            yRange = minY..maxY,
-                            seriesCount = seriesCount,
-                        ).randomEntryModel(),
-                )
-            }
-        }
-    }
diff --git a/vico/views/src/main/java/com/patrykandpatrick/vico/views/chart/ComposedChartView.kt b/vico/views/src/main/java/com/patrykandpatrick/vico/views/chart/ComposedChartView.kt
deleted file mode 100644
index 47f9bdf40..000000000
--- a/vico/views/src/main/java/com/patrykandpatrick/vico/views/chart/ComposedChartView.kt
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright 2023 by Patryk Goworowski and Patrick Michalik.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.patrykandpatrick.vico.views.chart
-
-import android.content.Context
-import android.util.AttributeSet
-import com.patrykandpatrick.vico.core.chart.composed.ComposedChartEntryModel
-import com.patrykandpatrick.vico.core.entry.ChartEntryModel
-import com.patrykandpatrick.vico.core.util.RandomEntriesGenerator
-import com.patrykandpatrick.vico.core.util.RandomEntriesGenerator.Companion.MODEL_COUNT
-import com.patrykandpatrick.vico.core.util.RandomEntriesGenerator.Companion.SERIES_COUNT
-import com.patrykandpatrick.vico.core.util.RandomEntriesGenerator.Companion.X_RANGE_TOP
-import com.patrykandpatrick.vico.core.util.RandomEntriesGenerator.Companion.Y_RANGE_TOP
-import com.patrykandpatrick.vico.views.R
-import com.patrykandpatrick.vico.views.theme.ThemeHandler
-
-/**
- * A subclass of [BaseChartView] that displays charts that use [ComposedChartEntryModel].
- */
-public class ComposedChartView
-    @JvmOverloads
-    constructor(
-        context: Context,
-        attrs: AttributeSet? = null,
-        defStyleAttr: Int = 0,
-    ) : BaseChartView<ComposedChartEntryModel<ChartEntryModel>>(
-            context = context,
-            attrs = attrs,
-            defStyleAttr = defStyleAttr,
-            chartType = ThemeHandler.ChartType.Composed,
-        ) {
-        init {
-            chart = themeHandler.composedChart
-            if (isInEditMode && attrs != null) setPreviewModel(attrs)
-        }
-
-        private fun setPreviewModel(attrs: AttributeSet) {
-            context.obtainStyledAttributes(attrs, R.styleable.ComposedChartView).use { typedArray ->
-                val modelCount = typedArray.getInt(R.styleable.ComposedChartView_previewModelCount, MODEL_COUNT)
-                val seriesCount = typedArray.getInt(R.styleable.ComposedChartView_previewSeriesCount, SERIES_COUNT)
-                val minX = typedArray.getInt(R.styleable.ComposedChartView_previewMinX, 0)
-                val maxX = typedArray.getInt(R.styleable.ComposedChartView_previewMaxX, X_RANGE_TOP)
-                val minY = typedArray.getInt(R.styleable.ComposedChartView_previewMinY, 0)
-                val maxY = typedArray.getInt(R.styleable.ComposedChartView_previewMaxY, Y_RANGE_TOP)
-                setModel(
-                    model =
-                        RandomEntriesGenerator(
-                            xRange = minX..maxX,
-                            yRange = minY..maxY,
-                            seriesCount = seriesCount,
-                            modelCount = modelCount,
-                        ).randomComposedEntryModel(),
-                )
-            }
-        }
-    }
diff --git a/vico/views/src/main/java/com/patrykandpatrick/vico/views/chart/column/ColumnChartExtensions.kt b/vico/views/src/main/java/com/patrykandpatrick/vico/views/chart/layer/ColumnChartExtensions.kt
similarity index 84%
rename from vico/views/src/main/java/com/patrykandpatrick/vico/views/chart/column/ColumnChartExtensions.kt
rename to vico/views/src/main/java/com/patrykandpatrick/vico/views/chart/layer/ColumnChartExtensions.kt
index 0e8b70f74..8440adb7f 100644
--- a/vico/views/src/main/java/com/patrykandpatrick/vico/views/chart/column/ColumnChartExtensions.kt
+++ b/vico/views/src/main/java/com/patrykandpatrick/vico/views/chart/layer/ColumnChartExtensions.kt
@@ -14,16 +14,15 @@
  * limitations under the License.
  */
 
-package com.patrykandpatrick.vico.views.chart.column
+package com.patrykandpatrick.vico.views.chart.layer
 
 import android.content.Context
 import androidx.annotation.AttrRes
 import androidx.annotation.StyleRes
 import com.patrykandpatrick.vico.core.DefaultDimens
-import com.patrykandpatrick.vico.core.chart.column.ColumnChart
+import com.patrykandpatrick.vico.core.chart.layer.ColumnCartesianLayer
 import com.patrykandpatrick.vico.core.component.shape.LineComponent
 import com.patrykandpatrick.vico.views.R
-import com.patrykandpatrick.vico.views.chart.line.lineSpec
 import com.patrykandpatrick.vico.views.theme.getLineComponent
 import com.patrykandpatrick.vico.views.theme.getNestedTypedArray
 import com.patrykandpatrick.vico.views.theme.getRawDimension
@@ -60,7 +59,8 @@ public fun columnLineComponent(
 }
 
 /**
- * Creates a [ColumnChart] using the provided [List] of theme attribute resource identifiers and the given [styleResId].
+ * Creates a [ColumnCartesianLayer] using the provided [List] of theme attribute resource identifiers and the given
+ * [styleResId].
  *
  * @param context the context used to retrieve the style information.
  * @param styleResId if not 0, used to retrieve the style information from the provided style resource.
@@ -69,25 +69,25 @@ public fun columnLineComponent(
  *
  * @see lineSpec
  */
-public fun columnChart(
+public fun columnCartesianLayer(
     context: Context,
     @StyleRes styleResId: Int = 0,
-    mergeMode: ColumnChart.MergeMode = ColumnChart.MergeMode.Grouped,
-): ColumnChart {
+    mergeMode: ColumnCartesianLayer.MergeMode = ColumnCartesianLayer.MergeMode.Grouped,
+): ColumnCartesianLayer {
     val tempArray = IntArray(1)
 
     val columns =
         listOf(R.attr.column1, R.attr.column2, R.attr.column3)
             .map { themeAttrResItem -> columnLineComponent(context, themeAttrResItem, styleResId) }
 
-    tempArray[0] = R.styleable.ColumnChartStyle_columnOuterSpacing
+    tempArray[0] = R.styleable.ColumnCartesianLayerStyle_columnOuterSpacing
 
     val spacingDp =
         context.obtainStyledAttributes(null, tempArray)
             .use { typedArray ->
                 typedArray.getRawDimension(
                     context = context,
-                    index = R.styleable.ColumnChartStyle_columnOuterSpacing,
+                    index = R.styleable.ColumnCartesianLayerStyle_columnOuterSpacing,
                     defaultValue = DefaultDimens.COLUMN_OUTSIDE_SPACING,
                 )
             }
@@ -97,12 +97,12 @@ public fun columnChart(
             .use { typedArray ->
                 typedArray.getRawDimension(
                     context = context,
-                    index = R.styleable.ColumnChartStyle_columnInnerSpacing,
+                    index = R.styleable.ColumnCartesianLayerStyle_columnInnerSpacing,
                     defaultValue = DefaultDimens.COLUMN_INSIDE_SPACING,
                 )
             }
 
-    return ColumnChart(
+    return ColumnCartesianLayer(
         columns = columns,
         spacingDp = spacingDp,
         innerSpacingDp = innerSpacingDp,
diff --git a/vico/views/src/main/java/com/patrykandpatrick/vico/views/chart/line/LineChartExtensions.kt b/vico/views/src/main/java/com/patrykandpatrick/vico/views/chart/layer/LineChartExtensions.kt
similarity index 82%
rename from vico/views/src/main/java/com/patrykandpatrick/vico/views/chart/line/LineChartExtensions.kt
rename to vico/views/src/main/java/com/patrykandpatrick/vico/views/chart/layer/LineChartExtensions.kt
index 155382aa5..12ed9133c 100644
--- a/vico/views/src/main/java/com/patrykandpatrick/vico/views/chart/line/LineChartExtensions.kt
+++ b/vico/views/src/main/java/com/patrykandpatrick/vico/views/chart/layer/LineChartExtensions.kt
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.patrykandpatrick.vico.views.chart.line
+package com.patrykandpatrick.vico.views.chart.layer
 
 import android.content.Context
 import androidx.annotation.AttrRes
 import androidx.annotation.StyleRes
 import com.patrykandpatrick.vico.core.DefaultDimens
-import com.patrykandpatrick.vico.core.chart.line.LineChart
+import com.patrykandpatrick.vico.core.chart.layer.LineCartesianLayer
 import com.patrykandpatrick.vico.views.R
 import com.patrykandpatrick.vico.views.theme.getLineSpec
 import com.patrykandpatrick.vico.views.theme.getNestedTypedArray
@@ -28,10 +28,10 @@ import com.patrykandpatrick.vico.views.theme.getRawDimension
 import com.patrykandpatrick.vico.views.theme.use
 
 /**
- * Creates a [LineChart.LineSpec] using the provided [attrRes] and [styleResId].
+ * Creates a [LineCartesianLayer.LineSpec] using the provided [attrRes] and [styleResId].
  *
  * @param context the context used to retrieve the style information.
- * @param attrRes a theme attribute resource identifier used to retrieve the [LineChart.LineSpec]’s style.
+ * @param attrRes a theme attribute resource identifier used to retrieve the [LineCartesianLayer.LineSpec]’s style.
  * This can be [R.attr.line1Spec], [R.attr.line2Spec], or [R.attr.line3Spec].
  * @param styleResId if not 0, used to retrieve the style information from the provided style resource.
  * The provided style must define the [attrRes]. If [styleResId] is 0, the [attrRes] is retrieved from [Context]’s
@@ -43,7 +43,7 @@ public fun lineSpec(
     context: Context,
     @AttrRes attrRes: Int = R.attr.line1Spec,
     @StyleRes styleResId: Int = 0,
-): LineChart.LineSpec {
+): LineCartesianLayer.LineSpec {
     val tempArray = IntArray(1)
 
     tempArray[0] = attrRes
@@ -58,7 +58,8 @@ public fun lineSpec(
 }
 
 /**
- * Creates a [LineChart] using the provided [List] of theme attribute resource identifiers and the given [styleResId].
+ * Creates a [LineCartesianLayer] using the provided [List] of theme attribute resource identifiers and the given
+ * [styleResId].
  *
  * @param context the context used to retrieve the style information.
  * @param styleResId if not 0, used to retrieve the style information from the provided style resource.
@@ -67,28 +68,28 @@ public fun lineSpec(
  *
  * @see lineSpec
  */
-public fun lineChart(
+public fun lineCartesianLayer(
     context: Context,
     @StyleRes styleResId: Int = 0,
-): LineChart {
+): LineCartesianLayer {
     val tempArray = IntArray(1)
 
     val lineSpecs =
         listOf(R.attr.line1Spec, R.attr.line2Spec, R.attr.line3Spec)
             .map { themeAttrResItem -> lineSpec(context, themeAttrResItem, styleResId) }
 
-    tempArray[0] = R.styleable.LineChartStyle_spacing
+    tempArray[0] = R.styleable.LineCartesianLayerStyle_spacing
     val spacingDp =
         context.obtainStyledAttributes(null, tempArray)
             .use { typedArray ->
                 typedArray.getRawDimension(
                     context = context,
-                    index = R.styleable.LineChartStyle_spacing,
+                    index = R.styleable.LineCartesianLayerStyle_spacing,
                     defaultValue = DefaultDimens.POINT_SPACING,
                 )
             }
 
-    return LineChart(
+    return LineCartesianLayer(
         lines = lineSpecs,
         spacingDp = spacingDp,
     )
diff --git a/vico/views/src/main/java/com/patrykandpatrick/vico/views/component/shape/shader/DynamicShaders.kt b/vico/views/src/main/java/com/patrykandpatrick/vico/views/component/shape/shader/DynamicShaders.kt
index 4d4bff195..1aeb02561 100644
--- a/vico/views/src/main/java/com/patrykandpatrick/vico/views/component/shape/shader/DynamicShaders.kt
+++ b/vico/views/src/main/java/com/patrykandpatrick/vico/views/component/shape/shader/DynamicShaders.kt
@@ -14,20 +14,17 @@
  * limitations under the License.
  */
 
-@file:Suppress("unused")
+@file:Suppress("UnusedReceiverParameter")
 
 package com.patrykandpatrick.vico.views.component.shape.shader
 
 import android.graphics.LinearGradient
 import android.graphics.Shader
-import androidx.annotation.ColorInt
 import com.patrykandpatrick.vico.core.component.Component
 import com.patrykandpatrick.vico.core.component.shape.shader.CacheableDynamicShader
 import com.patrykandpatrick.vico.core.component.shape.shader.ComponentShader
 import com.patrykandpatrick.vico.core.component.shape.shader.DynamicShader
 import com.patrykandpatrick.vico.core.component.shape.shader.DynamicShaders
-import com.patrykandpatrick.vico.core.component.shape.shader.HorizontalSplitShader
-import com.patrykandpatrick.vico.core.component.shape.shader.SolidShader
 import com.patrykandpatrick.vico.core.context.DrawContext
 
 /**
@@ -97,11 +94,7 @@ public fun DynamicShaders.horizontalGradient(
             top: Float,
             right: Float,
             bottom: Float,
-        ): String =
-            "%s,%s".format(
-                left,
-                right,
-            )
+        ): String = "%s,%s".format(left, right)
     }
 
 /**
@@ -147,25 +140,5 @@ public fun DynamicShaders.verticalGradient(
             top: Float,
             right: Float,
             bottom: Float,
-        ): String =
-            "%s,%s".format(
-                top,
-                bottom,
-            )
+        ): String = "%s,%s".format(top, bottom)
     }
-
-/**
- * Creates a [DynamicShader] that fills the area with a solid color.
- */
-public fun DynamicShaders.solid(
-    @ColorInt color: Int,
-): SolidShader = SolidShader(color)
-
-/**
- * Creates a [DynamicShader] with split colors. The positive color is used for values above the zero line,
- * and the negative color is used for values below the zero line.
- */
-public fun DynamicShaders.split(
-    @ColorInt positiveColor: Int,
-    @ColorInt negativeColor: Int,
-): HorizontalSplitShader.Solid = HorizontalSplitShader.Solid(positiveColor, negativeColor)
diff --git a/vico/views/src/main/java/com/patrykandpatrick/vico/views/extension/ViewExtensions.kt b/vico/views/src/main/java/com/patrykandpatrick/vico/views/extension/ViewExtensions.kt
index 1ee228779..e0b21b216 100644
--- a/vico/views/src/main/java/com/patrykandpatrick/vico/views/extension/ViewExtensions.kt
+++ b/vico/views/src/main/java/com/patrykandpatrick/vico/views/extension/ViewExtensions.kt
@@ -18,25 +18,9 @@ package com.patrykandpatrick.vico.views.extension
 
 import android.view.MotionEvent
 import android.view.View
-import android.view.ViewGroup.LayoutParams.WRAP_CONTENT
 import android.widget.OverScroller
-import androidx.core.view.ViewCompat
 import androidx.core.view.updatePadding
-import com.patrykandpatrick.vico.core.model.Point
-import kotlin.math.min
-
-internal fun View.measureDimension(
-    desiredSize: Int,
-    measureSpec: Int,
-): Int {
-    val specMode = View.MeasureSpec.getMode(measureSpec)
-    val specSize = View.MeasureSpec.getSize(measureSpec)
-    return when (specMode) {
-        View.MeasureSpec.EXACTLY -> specSize
-        View.MeasureSpec.AT_MOST -> min(desiredSize, specSize)
-        else -> desiredSize
-    }
-}
+import com.patrykandpatrick.vico.core.util.Point
 
 internal val Int.specSize: Int
     get() = View.MeasureSpec.getSize(this)
@@ -44,27 +28,12 @@ internal val Int.specSize: Int
 internal val Int.specMode: Int
     get() = View.MeasureSpec.getMode(this)
 
-internal val View.widthIsWrapContent: Boolean
-    get() = layoutParams?.width == WRAP_CONTENT
-
-internal val View.parentOrOwnWidth: Int
-    get() = (parent as? View)?.width ?: width
-
-internal var View.horizontalPadding: Int
-    get() = paddingLeft + paddingRight
-    set(value) {
-        updatePadding(left = value / 2, right = value / 2)
-    }
-
 internal var View.verticalPadding: Int
     get() = paddingTop + paddingBottom
     set(value) {
         updatePadding(top = value / 2, bottom = value / 2)
     }
 
-internal val View.isLtr: Boolean
-    get() = ViewCompat.getLayoutDirection(this) == ViewCompat.LAYOUT_DIRECTION_LTR
-
 internal fun OverScroller.fling(
     startX: Int = 0,
     startY: Int = 0,
diff --git a/vico/views/src/main/java/com/patrykandpatrick/vico/views/gestures/MotionEventHandler.kt b/vico/views/src/main/java/com/patrykandpatrick/vico/views/gestures/MotionEventHandler.kt
index 29affbc66..05e7278a1 100644
--- a/vico/views/src/main/java/com/patrykandpatrick/vico/views/gestures/MotionEventHandler.kt
+++ b/vico/views/src/main/java/com/patrykandpatrick/vico/views/gestures/MotionEventHandler.kt
@@ -21,8 +21,8 @@ import android.view.MotionEvent
 import android.view.VelocityTracker
 import android.widget.OverScroller
 import com.patrykandpatrick.vico.core.marker.Marker
-import com.patrykandpatrick.vico.core.model.Point
 import com.patrykandpatrick.vico.core.scroll.ScrollHandler
+import com.patrykandpatrick.vico.core.util.Point
 import com.patrykandpatrick.vico.views.extension.fling
 import com.patrykandpatrick.vico.views.extension.point
 import kotlin.math.abs
diff --git a/vico/views/src/main/java/com/patrykandpatrick/vico/views/scroll/ChartScrollSpec.kt b/vico/views/src/main/java/com/patrykandpatrick/vico/views/scroll/ChartScrollSpec.kt
index 65d5a2bf1..28e4f6aa3 100644
--- a/vico/views/src/main/java/com/patrykandpatrick/vico/views/scroll/ChartScrollSpec.kt
+++ b/vico/views/src/main/java/com/patrykandpatrick/vico/views/scroll/ChartScrollSpec.kt
@@ -20,7 +20,7 @@ import android.animation.TimeInterpolator
 import android.animation.ValueAnimator
 import android.view.animation.AccelerateDecelerateInterpolator
 import com.patrykandpatrick.vico.core.Animation
-import com.patrykandpatrick.vico.core.entry.ChartEntryModel
+import com.patrykandpatrick.vico.core.model.CartesianChartModel
 import com.patrykandpatrick.vico.core.scroll.AutoScrollCondition
 import com.patrykandpatrick.vico.core.scroll.InitialScroll
 import com.patrykandpatrick.vico.core.scroll.ScrollHandler
@@ -34,10 +34,10 @@ import com.patrykandpatrick.vico.core.scroll.ScrollHandler
  * @property autoScrollInterpolator the [TimeInterpolator] to use for automatic scrolling.
  * @property autoScrollDuration the animation duration for automatic scrolling.
  */
-public class ChartScrollSpec<in Model : ChartEntryModel>(
+public class ChartScrollSpec(
     public val isScrollEnabled: Boolean = true,
     public val initialScroll: InitialScroll = InitialScroll.Start,
-    public val autoScrollCondition: AutoScrollCondition<Model> = AutoScrollCondition.Never,
+    public val autoScrollCondition: AutoScrollCondition = AutoScrollCondition.Never,
     public val autoScrollInterpolator: TimeInterpolator = AccelerateDecelerateInterpolator(),
     public val autoScrollDuration: Long = Animation.DIFF_DURATION.toLong(),
 ) {
@@ -54,8 +54,8 @@ public class ChartScrollSpec<in Model : ChartEntryModel>(
      * Performs an automatic scroll.
      */
     public fun performAutoScroll(
-        model: Model,
-        oldModel: Model?,
+        model: CartesianChartModel,
+        oldModel: CartesianChartModel?,
         scrollHandler: ScrollHandler,
     ) {
         if (!autoScrollCondition.shouldPerformAutoScroll(model, oldModel)) return
@@ -81,13 +81,13 @@ public class ChartScrollSpec<in Model : ChartEntryModel>(
 /**
  * Copies this [ChartScrollSpec], changing select values.
  */
-public fun <Model : ChartEntryModel> ChartScrollSpec<Model>.copy(
+public fun ChartScrollSpec.copy(
     isScrollEnabled: Boolean = this.isScrollEnabled,
     initialScroll: InitialScroll = this.initialScroll,
-    autoScrollCondition: AutoScrollCondition<Model> = this.autoScrollCondition,
+    autoScrollCondition: AutoScrollCondition = this.autoScrollCondition,
     autoScrollInterpolator: TimeInterpolator = this.autoScrollInterpolator,
     autoScrollDuration: Long = this.autoScrollDuration,
-): ChartScrollSpec<Model> =
+): ChartScrollSpec =
     ChartScrollSpec(
         isScrollEnabled = isScrollEnabled,
         initialScroll = initialScroll,
diff --git a/vico/views/src/main/java/com/patrykandpatrick/vico/views/theme/ChartStyleExtensions.kt b/vico/views/src/main/java/com/patrykandpatrick/vico/views/theme/ChartStyleExtensions.kt
index f6bd0398f..0609bd80a 100644
--- a/vico/views/src/main/java/com/patrykandpatrick/vico/views/theme/ChartStyleExtensions.kt
+++ b/vico/views/src/main/java/com/patrykandpatrick/vico/views/theme/ChartStyleExtensions.kt
@@ -20,28 +20,26 @@ import android.content.Context
 import android.content.res.TypedArray
 import androidx.annotation.StyleableRes
 import com.patrykandpatrick.vico.core.DefaultDimens
-import com.patrykandpatrick.vico.core.chart.column.ColumnChart
-import com.patrykandpatrick.vico.core.chart.column.ColumnChart.MergeMode
-import com.patrykandpatrick.vico.core.chart.line.LineChart
+import com.patrykandpatrick.vico.core.chart.layer.ColumnCartesianLayer
+import com.patrykandpatrick.vico.core.chart.layer.LineCartesianLayer
 import com.patrykandpatrick.vico.core.component.shape.Shapes
 import com.patrykandpatrick.vico.core.component.text.VerticalPosition
 import com.patrykandpatrick.vico.views.R
 import com.patrykandpatrick.vico.views.extension.defaultColors
 
-internal fun TypedArray.getColumnChart(
+internal fun TypedArray.getColumnCartesianLayer(
     context: Context,
-    @StyleableRes resourceId: Int = R.styleable.BaseChartView_columnChartStyle,
-    @StyleableRes styleableResourceId: IntArray = R.styleable.ColumnChartStyle,
-    mergeMode: MergeMode,
-): ColumnChart =
+    @StyleableRes resourceId: Int = R.styleable.CartesianChartView_columnLayerStyle,
+    @StyleableRes styleableResourceId: IntArray = R.styleable.ColumnCartesianLayerStyle,
+): ColumnCartesianLayer =
     getNestedTypedArray(context, resourceId, styleableResourceId).run {
         val defaultShape = Shapes.roundedCornerShape(allPercent = DefaultDimens.COLUMN_ROUNDNESS_PERCENT)
-        ColumnChart(
+        ColumnCartesianLayer(
             columns =
                 listOf(
                     getNestedTypedArray(
                         context = context,
-                        resourceId = R.styleable.ColumnChartStyle_column1,
+                        resourceId = R.styleable.ColumnCartesianLayerStyle_column1,
                         styleableResourceId = R.styleable.LineComponent,
                     ).getLineComponent(
                         context = context,
@@ -51,7 +49,7 @@ internal fun TypedArray.getColumnChart(
                     ),
                     getNestedTypedArray(
                         context = context,
-                        resourceId = R.styleable.ColumnChartStyle_column2,
+                        resourceId = R.styleable.ColumnCartesianLayerStyle_column2,
                         styleableResourceId = R.styleable.LineComponent,
                     ).getLineComponent(
                         context = context,
@@ -61,7 +59,7 @@ internal fun TypedArray.getColumnChart(
                     ),
                     getNestedTypedArray(
                         context = context,
-                        resourceId = R.styleable.ColumnChartStyle_column3,
+                        resourceId = R.styleable.ColumnCartesianLayerStyle_column3,
                         styleableResourceId = R.styleable.LineComponent,
                     ).getLineComponent(
                         context = context,
@@ -73,51 +71,54 @@ internal fun TypedArray.getColumnChart(
             spacingDp =
                 getRawDimension(
                     context = context,
-                    index = R.styleable.ColumnChartStyle_columnOuterSpacing,
+                    index = R.styleable.ColumnCartesianLayerStyle_columnOuterSpacing,
                     defaultValue = DefaultDimens.COLUMN_OUTSIDE_SPACING,
                 ),
             innerSpacingDp =
                 getRawDimension(
                     context = context,
-                    index = R.styleable.ColumnChartStyle_columnInnerSpacing,
+                    index = R.styleable.ColumnCartesianLayerStyle_columnInnerSpacing,
                     defaultValue = DefaultDimens.COLUMN_INSIDE_SPACING,
                 ),
-            mergeMode = mergeMode,
+            mergeMode =
+                getInteger(R.styleable.ColumnCartesianLayerStyle_mergeMode, 0)
+                    .let(ColumnCartesianLayer.MergeMode.entries::get),
             dataLabel =
-                if (getBoolean(R.styleable.ColumnChartStyle_showDataLabels, false)) {
+                if (getBoolean(R.styleable.ColumnCartesianLayerStyle_showDataLabels, false)) {
                     getNestedTypedArray(
                         context = context,
-                        resourceId = R.styleable.ColumnChartStyle_dataLabelStyle,
+                        resourceId = R.styleable.ColumnCartesianLayerStyle_dataLabelStyle,
                         styleableResourceId = R.styleable.TextComponentStyle,
                     ).getTextComponent(context = context)
                 } else {
                     null
                 },
             dataLabelVerticalPosition =
-                getInteger(R.styleable.ColumnChartStyle_dataLabelVerticalPosition, 0).let { value ->
-                    val values = VerticalPosition.values()
-                    values[value % values.size]
-                },
+                getInteger(R.styleable.ColumnCartesianLayerStyle_dataLabelVerticalPosition, 0)
+                    .let { value ->
+                        val values = VerticalPosition.entries
+                        values[value % values.size]
+                    },
             dataLabelRotationDegrees =
                 getFloat(
-                    R.styleable.ColumnChartStyle_dataLabelRotationDegrees,
+                    R.styleable.ColumnCartesianLayerStyle_dataLabelRotationDegrees,
                     0f,
                 ),
         )
     }
 
-internal fun TypedArray.getLineChart(
+internal fun TypedArray.getLineCartesianLayer(
     context: Context,
-    @StyleableRes resourceId: Int = R.styleable.BaseChartView_lineChartStyle,
-    @StyleableRes styleableResourceId: IntArray = R.styleable.LineChartStyle,
-): LineChart =
+    @StyleableRes resourceId: Int = R.styleable.CartesianChartView_lineLayerStyle,
+    @StyleableRes styleableResourceId: IntArray = R.styleable.LineCartesianLayerStyle,
+): LineCartesianLayer =
     getNestedTypedArray(context, resourceId, styleableResourceId).run {
-        LineChart(
+        LineCartesianLayer(
             lines =
                 listOf(
                     getNestedTypedArray(
                         context = context,
-                        resourceId = R.styleable.LineChartStyle_line1Spec,
+                        resourceId = R.styleable.LineCartesianLayerStyle_line1Spec,
                         styleableResourceId = R.styleable.LineSpec,
                     ).getLineSpec(
                         context = context,
@@ -125,7 +126,7 @@ internal fun TypedArray.getLineChart(
                     ),
                     getNestedTypedArray(
                         context = context,
-                        resourceId = R.styleable.LineChartStyle_line2Spec,
+                        resourceId = R.styleable.LineCartesianLayerStyle_line2Spec,
                         styleableResourceId = R.styleable.LineSpec,
                     ).getLineSpec(
                         context = context,
@@ -133,7 +134,7 @@ internal fun TypedArray.getLineChart(
                     ),
                     getNestedTypedArray(
                         context = context,
-                        resourceId = R.styleable.LineChartStyle_line3Spec,
+                        resourceId = R.styleable.LineCartesianLayerStyle_line3Spec,
                         styleableResourceId = R.styleable.LineSpec,
                     ).getLineSpec(
                         context = context,
@@ -143,7 +144,7 @@ internal fun TypedArray.getLineChart(
             spacingDp =
                 getRawDimension(
                     context = context,
-                    index = R.styleable.LineChartStyle_spacing,
+                    index = R.styleable.LineCartesianLayerStyle_spacing,
                     defaultValue = DefaultDimens.POINT_SPACING,
                 ),
         )
diff --git a/vico/views/src/main/java/com/patrykandpatrick/vico/views/theme/ComponentStyleExtensions.kt b/vico/views/src/main/java/com/patrykandpatrick/vico/views/theme/ComponentStyleExtensions.kt
index d7f390725..6ce14b95f 100644
--- a/vico/views/src/main/java/com/patrykandpatrick/vico/views/theme/ComponentStyleExtensions.kt
+++ b/vico/views/src/main/java/com/patrykandpatrick/vico/views/theme/ComponentStyleExtensions.kt
@@ -22,16 +22,16 @@ import android.graphics.Color
 import com.patrykandpatrick.vico.core.DefaultAlpha
 import com.patrykandpatrick.vico.core.DefaultDimens
 import com.patrykandpatrick.vico.core.chart.DefaultPointConnector
-import com.patrykandpatrick.vico.core.chart.line.LineChart
+import com.patrykandpatrick.vico.core.chart.layer.LineCartesianLayer
 import com.patrykandpatrick.vico.core.component.Component
 import com.patrykandpatrick.vico.core.component.OverlayingComponent
 import com.patrykandpatrick.vico.core.component.shape.LineComponent
 import com.patrykandpatrick.vico.core.component.shape.Shape
 import com.patrykandpatrick.vico.core.component.shape.ShapeComponent
 import com.patrykandpatrick.vico.core.component.shape.Shapes
+import com.patrykandpatrick.vico.core.component.shape.shader.ColorShader
 import com.patrykandpatrick.vico.core.component.shape.shader.DynamicShaders
-import com.patrykandpatrick.vico.core.component.shape.shader.HorizontalSplitShader
-import com.patrykandpatrick.vico.core.component.shape.shader.SolidShader
+import com.patrykandpatrick.vico.core.component.shape.shader.TopBottomShader
 import com.patrykandpatrick.vico.core.component.text.VerticalPosition
 import com.patrykandpatrick.vico.core.extension.copyColor
 import com.patrykandpatrick.vico.views.R
@@ -142,7 +142,7 @@ internal fun TypedArray.getComponent(context: Context): Component? =
 internal fun TypedArray.getLineSpec(
     context: Context,
     defaultColor: Int = context.defaultColors.entity1Color.toInt(),
-): LineChart.LineSpec {
+): LineCartesianLayer.LineSpec {
     val positiveLineColor =
         getColor(
             R.styleable.LineSpec_positiveColor,
@@ -153,9 +153,9 @@ internal fun TypedArray.getLineSpec(
 
     val lineShader =
         if (hasValue(R.styleable.LineSpec_negativeColor)) {
-            HorizontalSplitShader.Solid(positiveLineColor, negativeLineColor)
+            TopBottomShader(ColorShader(positiveLineColor), ColorShader(negativeLineColor))
         } else {
-            SolidShader(positiveLineColor)
+            ColorShader(positiveLineColor)
         }
 
     val positiveShader =
@@ -200,8 +200,8 @@ internal fun TypedArray.getLineSpec(
             )
         }
 
-    return LineChart.LineSpec(
-        lineShader = lineShader,
+    return LineCartesianLayer.LineSpec(
+        shader = lineShader,
         point =
             getNestedTypedArray(
                 context = context,
@@ -214,13 +214,13 @@ internal fun TypedArray.getLineSpec(
                 index = R.styleable.LineSpec_pointSize,
                 defaultValue = DefaultDimens.POINT_SIZE,
             ),
-        lineThicknessDp =
+        thicknessDp =
             getRawDimension(
                 context = context,
                 index = R.styleable.LineSpec_lineThickness,
                 defaultValue = DefaultDimens.LINE_THICKNESS,
             ),
-        lineBackgroundShader = HorizontalSplitShader.Double(positiveShader, negativeShader),
+        backgroundShader = TopBottomShader(positiveShader, negativeShader),
         dataLabel =
             if (getBoolean(R.styleable.LineSpec_showDataLabels, false)) {
                 getNestedTypedArray(
diff --git a/vico/views/src/main/java/com/patrykandpatrick/vico/views/theme/TextComponentStyleExtensions.kt b/vico/views/src/main/java/com/patrykandpatrick/vico/views/theme/TextComponentStyleExtensions.kt
index d97333a99..183c4ccfb 100644
--- a/vico/views/src/main/java/com/patrykandpatrick/vico/views/theme/TextComponentStyleExtensions.kt
+++ b/vico/views/src/main/java/com/patrykandpatrick/vico/views/theme/TextComponentStyleExtensions.kt
@@ -68,7 +68,7 @@ internal fun TypedArray.getTextComponent(context: Context): TextComponent =
 
 private fun TypedArray.getTruncateAt(): TextUtils.TruncateAt {
     val int = getInt(R.styleable.TextComponentStyle_android_ellipsize, TextUtils.TruncateAt.END.ordinal)
-    val values = TextUtils.TruncateAt.values()
+    val values = TextUtils.TruncateAt.entries
     return when (int) {
         in 1..values.size -> values[int]
         else -> TextUtils.TruncateAt.END
@@ -161,6 +161,6 @@ private fun TypedArray.getMargins(context: Context): MutableDimensions {
 
 private fun TypedArray.getTextAlignment(): Layout.Alignment =
     Layout.Alignment
-        .values()
+        .entries
         .getOrNull(getInt(R.styleable.TextComponentStyle_textAlignment, Layout.Alignment.ALIGN_NORMAL.ordinal))
         ?: Layout.Alignment.ALIGN_NORMAL
diff --git a/vico/views/src/main/java/com/patrykandpatrick/vico/views/theme/ThemeHandler.kt b/vico/views/src/main/java/com/patrykandpatrick/vico/views/theme/ThemeHandler.kt
index 24f49fb30..29891543e 100644
--- a/vico/views/src/main/java/com/patrykandpatrick/vico/views/theme/ThemeHandler.kt
+++ b/vico/views/src/main/java/com/patrykandpatrick/vico/views/theme/ThemeHandler.kt
@@ -31,26 +31,19 @@ import com.patrykandpatrick.vico.core.axis.AxisItemPlacer
 import com.patrykandpatrick.vico.core.axis.AxisPosition
 import com.patrykandpatrick.vico.core.axis.horizontal.HorizontalAxis
 import com.patrykandpatrick.vico.core.axis.vertical.VerticalAxis
-import com.patrykandpatrick.vico.core.chart.Chart
-import com.patrykandpatrick.vico.core.chart.column.ColumnChart
-import com.patrykandpatrick.vico.core.chart.column.ColumnChart.MergeMode
-import com.patrykandpatrick.vico.core.chart.composed.ComposedChart
-import com.patrykandpatrick.vico.core.chart.composed.ComposedChartEntryModel
+import com.patrykandpatrick.vico.core.chart.CartesianChart
 import com.patrykandpatrick.vico.core.chart.edges.FadingEdges
 import com.patrykandpatrick.vico.core.chart.layout.HorizontalLayout
 import com.patrykandpatrick.vico.core.component.shape.DashedShape
 import com.patrykandpatrick.vico.core.component.shape.LineComponent
 import com.patrykandpatrick.vico.core.component.shape.Shape
 import com.patrykandpatrick.vico.core.component.shape.Shapes
-import com.patrykandpatrick.vico.core.entry.ChartEntryModel
-import com.patrykandpatrick.vico.core.extension.hasAnyFlagOf
 import com.patrykandpatrick.vico.core.extension.hasFlag
 import com.patrykandpatrick.vico.views.R
 
 internal class ThemeHandler(
     private val context: Context,
     attrs: AttributeSet?,
-    chartType: ChartType,
 ) {
     public var startAxis: Axis<AxisPosition.Vertical.Start>? = null
         private set
@@ -70,10 +63,7 @@ internal class ThemeHandler(
     public var isChartZoomEnabled: Boolean = false
         private set
 
-    public var chart: Chart<ChartEntryModel>? = null
-        private set
-
-    public var composedChart: Chart<ComposedChartEntryModel<ChartEntryModel>>? = null
+    public var chart: CartesianChart? = null
         private set
 
     public var fadingEdges: FadingEdges? = null
@@ -83,59 +73,47 @@ internal class ThemeHandler(
         private set
 
     init {
-        context.obtainStyledAttributes(attrs, R.styleable.BaseChartView).use { typedArray ->
-            if (typedArray.getBoolean(R.styleable.BaseChartView_showStartAxis, false)) {
+        context.obtainStyledAttributes(attrs, R.styleable.CartesianChartView).use { typedArray ->
+            if (typedArray.getBoolean(R.styleable.CartesianChartView_showStartAxis, false)) {
                 startAxis =
                     typedArray.getAxisBuilder(
-                        R.styleable.BaseChartView_startAxisStyle,
+                        R.styleable.CartesianChartView_startAxisStyle,
                         VerticalAxis.Builder(),
                     ).build()
             }
-            if (typedArray.getBoolean(R.styleable.BaseChartView_showTopAxis, false)) {
+            if (typedArray.getBoolean(R.styleable.CartesianChartView_showTopAxis, false)) {
                 topAxis =
                     typedArray.getAxisBuilder(
-                        R.styleable.BaseChartView_topAxisStyle,
+                        R.styleable.CartesianChartView_topAxisStyle,
                         HorizontalAxis.Builder(),
                     ).build()
             }
-            if (typedArray.getBoolean(R.styleable.BaseChartView_showEndAxis, false)) {
+            if (typedArray.getBoolean(R.styleable.CartesianChartView_showEndAxis, false)) {
                 endAxis =
                     typedArray.getAxisBuilder(
-                        R.styleable.BaseChartView_endAxisStyle,
+                        R.styleable.CartesianChartView_endAxisStyle,
                         VerticalAxis.Builder(),
                     ).build()
             }
-            if (typedArray.getBoolean(R.styleable.BaseChartView_showBottomAxis, false)) {
+            if (typedArray.getBoolean(R.styleable.CartesianChartView_showBottomAxis, false)) {
                 bottomAxis =
                     typedArray.getAxisBuilder(
-                        R.styleable.BaseChartView_bottomAxisStyle,
+                        R.styleable.CartesianChartView_bottomAxisStyle,
                         HorizontalAxis.Builder(),
                     ).build()
             }
             isHorizontalScrollEnabled =
                 typedArray
-                    .getBoolean(R.styleable.BaseChartView_chartHorizontalScrollingEnabled, true)
+                    .getBoolean(R.styleable.CartesianChartView_chartHorizontalScrollingEnabled, true)
             isChartZoomEnabled =
                 typedArray
-                    .getBoolean(R.styleable.BaseChartView_chartZoomEnabled, true)
+                    .getBoolean(R.styleable.CartesianChartView_chartZoomEnabled, true)
             fadingEdges = typedArray.getFadingEdges()
             horizontalLayout = typedArray.getHorizontalLayout()
 
-            when (chartType) {
-                ChartType.Single ->
-                    context
-                        .obtainStyledAttributes(attrs, R.styleable.ChartView)
-                        .use { chartViewTypedArray ->
-                            chart = getChart(chartViewTypedArray, typedArray)
-                        }
-
-                ChartType.Composed ->
-                    context
-                        .obtainStyledAttributes(attrs, R.styleable.ComposedChartView)
-                        .use { composedChartViewTypedArray ->
-                            composedChart = getComposedChart(composedChartViewTypedArray, typedArray)
-                        }
-            }
+            context
+                .obtainStyledAttributes(attrs, R.styleable.CartesianChartView)
+                .use { chart = getChart(it, typedArray) }
         }
     }
 
@@ -157,7 +135,7 @@ internal class ThemeHandler(
         val axisStyle =
             getNestedTypedArray(
                 context = context,
-                resourceId = if (hasValue(styleAttrId)) styleAttrId else R.styleable.BaseChartView_axisStyle,
+                resourceId = if (hasValue(styleAttrId)) styleAttrId else R.styleable.CartesianChartView_axisStyle,
                 styleableResourceId = R.styleable.Axis,
             )
 
@@ -247,72 +225,50 @@ internal class ThemeHandler(
         }.also { axisStyle.recycle() }
     }
 
-    private fun getChart(
-        chartViewTypedArray: TypedArray,
-        baseTypedArray: TypedArray,
-    ): Chart<ChartEntryModel>? =
-        when (chartViewTypedArray.getInt(R.styleable.ChartView_chart, 0)) {
-            COLUMN_CHART -> baseTypedArray.getColumnChart(context, mergeMode = MergeMode.Grouped)
-            STACKED_COLUMN_CHART -> baseTypedArray.getColumnChart(context, mergeMode = MergeMode.Stack)
-            LINE_CHART -> baseTypedArray.getLineChart(context)
-            else -> null
-        }
-
     private fun TypedArray.getHorizontalLayout(): HorizontalLayout =
-        when (getInt(R.styleable.BaseChartView_horizontalLayout, 0)) {
+        when (getInt(R.styleable.CartesianChartView_horizontalLayout, 0)) {
             0 -> HorizontalLayout.Segmented
             else ->
                 HorizontalLayout.FullWidth(
-                    getRawDimension(context, R.styleable.BaseChartView_scalableStartContentPadding, 0f),
-                    getRawDimension(context, R.styleable.BaseChartView_scalableEndContentPadding, 0f),
-                    getRawDimension(context, R.styleable.BaseChartView_unscalableStartContentPadding, 0f),
-                    getRawDimension(context, R.styleable.BaseChartView_unscalableEndContentPadding, 0f),
+                    getRawDimension(context, R.styleable.CartesianChartView_scalableStartContentPadding, 0f),
+                    getRawDimension(context, R.styleable.CartesianChartView_scalableEndContentPadding, 0f),
+                    getRawDimension(context, R.styleable.CartesianChartView_unscalableStartContentPadding, 0f),
+                    getRawDimension(context, R.styleable.CartesianChartView_unscalableEndContentPadding, 0f),
                 )
         }
 
-    private fun getComposedChart(
-        composedChartViewTypedArray: TypedArray,
+    private fun getChart(
+        cartesianChartViewTypedArray: TypedArray,
         baseTypedArray: TypedArray,
-    ): Chart<ComposedChartEntryModel<ChartEntryModel>>? {
-        val chartFlags = composedChartViewTypedArray.getInt(R.styleable.ComposedChartView_charts, 0)
-
-        val columnChart: ColumnChart? =
-            if (chartFlags.hasAnyFlagOf(COLUMN_CHART, STACKED_COLUMN_CHART)) {
-                baseTypedArray.getColumnChart(
-                    context,
-                    mergeMode = if (chartFlags.hasFlag(STACKED_COLUMN_CHART)) MergeMode.Stack else MergeMode.Grouped,
-                )
-            } else {
-                null
-            }
-        val lineChart =
-            if (chartFlags.hasFlag(LINE_CHART)) {
-                baseTypedArray.getLineChart(context)
-            } else {
-                null
-            }
-
-        return when {
-            columnChart != null && lineChart != null -> ComposedChart(columnChart, lineChart)
-            columnChart != null -> columnChart
-            lineChart != null -> lineChart
-            else -> null
-        }
+    ): CartesianChart {
+        val layerFlags = cartesianChartViewTypedArray.getInt(R.styleable.CartesianChartView_layers, 0)
+
+        val columnLayer =
+            if (layerFlags.hasFlag(COLUMN_LAYER)) baseTypedArray.getColumnCartesianLayer(context) else null
+        val lineLayer =
+            if (layerFlags.hasFlag(LINE_LAYER)) baseTypedArray.getLineCartesianLayer(context) else null
+
+        return CartesianChart(
+            buildList {
+                if (columnLayer != null) add(columnLayer)
+                if (lineLayer != null) add(lineLayer)
+            },
+        )
     }
 
     private fun TypedArray.getFadingEdges(): FadingEdges? {
-        val edgesLength = getRawDimension(context, R.styleable.BaseChartView_fadingEdgeWidth, 0f)
-        val startLength = getRawDimension(context, R.styleable.BaseChartView_startFadingEdgeWidth, edgesLength)
-        val endLength = getRawDimension(context, R.styleable.BaseChartView_endFadingEdgeWidth, edgesLength)
+        val edgesLength = getRawDimension(context, R.styleable.CartesianChartView_fadingEdgeWidth, 0f)
+        val startLength = getRawDimension(context, R.styleable.CartesianChartView_startFadingEdgeWidth, edgesLength)
+        val endLength = getRawDimension(context, R.styleable.CartesianChartView_endFadingEdgeWidth, edgesLength)
         val threshold =
             getRawDimension(
                 context,
-                R.styleable.BaseChartView_fadingEdgeVisibilityThreshold,
+                R.styleable.CartesianChartView_fadingEdgeVisibilityThreshold,
                 FADING_EDGE_VISIBILITY_THRESHOLD_DP,
             )
 
         return if (startLength > 0f || endLength > 0f) {
-            val interpolatorClassName = getString(R.styleable.BaseChartView_fadingEdgeVisibilityInterpolator)
+            val interpolatorClassName = getString(R.styleable.CartesianChartView_fadingEdgeVisibilityInterpolator)
 
             val interpolator =
                 if (interpolatorClassName != null) {
@@ -348,14 +304,8 @@ internal class ThemeHandler(
             shiftTopLines = getBoolean(R.styleable.Axis_shiftTopVerticalAxisLines, true),
         )
 
-    internal enum class ChartType {
-        Single,
-        Composed,
-    }
-
     private companion object {
-        const val COLUMN_CHART = 1
-        const val STACKED_COLUMN_CHART = 2
-        const val LINE_CHART = 4
+        const val COLUMN_LAYER = 1
+        const val LINE_LAYER = 2
     }
 }
diff --git a/vico/views/src/main/res/values/attrs.xml b/vico/views/src/main/res/values/attrs.xml
index 322829211..9031e4eee 100644
--- a/vico/views/src/main/res/values/attrs.xml
+++ b/vico/views/src/main/res/values/attrs.xml
@@ -24,11 +24,6 @@
     <attr name="dataLabelRotationDegrees" format="float" />
     <attr name="showDataLabels" format="boolean" />
     <attr name="dataLabelStyle" format="reference" />
-    <attr name="previewSeriesCount" format="integer" />
-    <attr name="previewMinX" format="integer" />
-    <attr name="previewMaxX" format="integer" />
-    <attr name="previewMinY" format="integer" />
-    <attr name="previewMaxY" format="integer" />
 
     <attr name="dataLabelVerticalPosition" format="enum">
         <enum name="top" value="0" />
@@ -36,41 +31,18 @@
         <enum name="bottom" value="2" />
     </attr>
 
-    <declare-styleable name="ChartView">
-        <attr name="chart" format="enum">
-            <enum name="column" value="1" />
-            <enum name="stackedColumn" value="2" />
-            <enum name="line" value="4" />
-        </attr>
-        <attr name="previewSeriesCount" />
-        <attr name="previewMinX" />
-        <attr name="previewMaxX" />
-        <attr name="previewMinY" />
-        <attr name="previewMaxY" />
-    </declare-styleable>
-
-    <declare-styleable name="ComposedChartView">
-        <attr name="charts" format="integer">
+    <declare-styleable name="CartesianChartView">
+        <attr name="layers" format="integer">
             <flag name="column" value="1" />
-            <flag name="stackedColumn" value="2" />
-            <flag name="line" value="4" />
+            <flag name="line" value="2" />
         </attr>
-        <attr name="previewModelCount" format="integer" />
-        <attr name="previewSeriesCount" />
-        <attr name="previewMinX" />
-        <attr name="previewMaxX" />
-        <attr name="previewMinY" />
-        <attr name="previewMaxY" />
-    </declare-styleable>
-
-    <declare-styleable name="BaseChartView">
         <attr name="axisStyle" format="reference" />
         <attr name="startAxisStyle" format="reference" />
         <attr name="topAxisStyle" format="reference" />
         <attr name="endAxisStyle" format="reference" />
         <attr name="bottomAxisStyle" format="reference" />
-        <attr name="columnChartStyle" />
-        <attr name="lineChartStyle" />
+        <attr name="columnLayerStyle" />
+        <attr name="lineLayerStyle" />
         <attr name="showStartAxis" format="boolean" />
         <attr name="showTopAxis" format="boolean" />
         <attr name="showEndAxis" format="boolean" />
@@ -90,6 +62,12 @@
         <attr name="scalableEndContentPadding" format="dimension" />
         <attr name="unscalableStartContentPadding" format="dimension" />
         <attr name="unscalableEndContentPadding" format="dimension" />
+        <attr name="previewMinX" format="integer" />
+        <attr name="previewMaxX" format="integer" />
+        <attr name="previewMinY" format="integer" />
+        <attr name="previewMaxY" format="integer" />
+        <attr name="previewColumnSeriesCount" format="integer" />
+        <attr name="previewLineSeriesCount" format="integer" />
     </declare-styleable>
 
     <!-- Defines the appearance of chart axes. -->
diff --git a/vico/views/src/main/res/values/column_chart_attrs.xml b/vico/views/src/main/res/values/column_chart_attrs.xml
index c6e6e5e2d..8404ecfa7 100644
--- a/vico/views/src/main/res/values/column_chart_attrs.xml
+++ b/vico/views/src/main/res/values/column_chart_attrs.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright 2022 by Patryk Goworowski and Patrick Michalik.
+  ~ Copyright 2023 by Patryk Goworowski and Patrick Michalik.
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -15,9 +15,9 @@
   -->
 
 <resources>
-    <attr name="columnChartStyle" format="reference" />
+    <attr name="columnLayerStyle" format="reference" />
 
-    <declare-styleable name="ColumnChartStyle">
+    <declare-styleable name="ColumnCartesianLayerStyle">
         <attr name="column1" format="reference" />
         <attr name="column2" format="reference" />
         <attr name="column3" format="reference" />
@@ -27,5 +27,9 @@
         <attr name="dataLabelStyle" />
         <attr name="dataLabelVerticalPosition" />
         <attr name="dataLabelRotationDegrees" />
+        <attr name="mergeMode" format="enum">
+            <enum name="grouped" value="0" />
+            <enum name="stacked" value="1" />
+        </attr>
     </declare-styleable>
 </resources>
diff --git a/vico/views/src/main/res/values/line_chart_attrs.xml b/vico/views/src/main/res/values/line_chart_attrs.xml
index 0ea50e6c4..2d18f6fa1 100644
--- a/vico/views/src/main/res/values/line_chart_attrs.xml
+++ b/vico/views/src/main/res/values/line_chart_attrs.xml
@@ -15,12 +15,12 @@
   -->
 
 <resources>
-    <attr name="lineChartStyle" format="reference" />
+    <attr name="lineLayerStyle" format="reference" />
     <attr name="line1Spec" format="reference" />
     <attr name="line2Spec" format="reference" />
     <attr name="line3Spec" format="reference" />
 
-    <declare-styleable name="LineChartStyle">
+    <declare-styleable name="LineCartesianLayerStyle">
         <attr name="line1Spec" />
         <attr name="line2Spec" />
         <attr name="line3Spec" />