diff --git a/vico/compose-m2/src/main/java/com/patrykandpatrick/vico/compose/common/M2VicoTheme.kt b/vico/compose-m2/src/main/java/com/patrykandpatrick/vico/compose/m2/common/M2VicoTheme.kt
similarity index 92%
rename from vico/compose-m2/src/main/java/com/patrykandpatrick/vico/compose/common/M2VicoTheme.kt
rename to vico/compose-m2/src/main/java/com/patrykandpatrick/vico/compose/m2/common/M2VicoTheme.kt
index 2c315b857..e3da33076 100644
--- a/vico/compose-m2/src/main/java/com/patrykandpatrick/vico/compose/common/M2VicoTheme.kt
+++ b/vico/compose-m2/src/main/java/com/patrykandpatrick/vico/compose/m2/common/M2VicoTheme.kt
@@ -14,13 +14,15 @@
  * limitations under the License.
  */
 
-package com.patrykandpatrick.vico.compose.common
+package com.patrykandpatrick.vico.compose.m2.common
 
 import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.material.MaterialTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
 import androidx.compose.ui.graphics.Color
+import com.patrykandpatrick.vico.compose.common.VicoTheme
+import com.patrykandpatrick.vico.compose.common.getDefaultColors
 
 /** Creates and remembers a [VicoTheme] based on [MaterialTheme.colors]. */
 @Composable
diff --git a/vico/compose-m3/src/main/java/com/patrykandpatrick/vico/compose/common/M3VicoTheme.kt b/vico/compose-m3/src/main/java/com/patrykandpatrick/vico/compose/m3/common/M3VicoTheme.kt
similarity index 91%
rename from vico/compose-m3/src/main/java/com/patrykandpatrick/vico/compose/common/M3VicoTheme.kt
rename to vico/compose-m3/src/main/java/com/patrykandpatrick/vico/compose/m3/common/M3VicoTheme.kt
index 437acfcb4..399cbdf4e 100644
--- a/vico/compose-m3/src/main/java/com/patrykandpatrick/vico/compose/common/M3VicoTheme.kt
+++ b/vico/compose-m3/src/main/java/com/patrykandpatrick/vico/compose/m3/common/M3VicoTheme.kt
@@ -14,12 +14,14 @@
  * limitations under the License.
  */
 
-package com.patrykandpatrick.vico.compose.common
+package com.patrykandpatrick.vico.compose.m3.common
 
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
 import androidx.compose.ui.graphics.Color
+import com.patrykandpatrick.vico.compose.common.VicoTheme
+import com.patrykandpatrick.vico.compose.common.getDefaultColors
 
 /** Creates and remembers a [VicoTheme] based on [MaterialTheme.colorScheme]. */
 @Composable