diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 4c4d67a..7eef0db 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -94,4 +94,6 @@ dependencies {
     implementation(Libs.Common.arrowCore)
     //----------------------------------------------------------------------------------------------
     implementation(Libs.Common.coil)
+    //----------------------------------------------------------------------------------------------
+    implementation(Libs.Common.material)
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/composecodechallenge/main/ui/theme/Theme.kt b/app/src/main/java/com/example/composecodechallenge/main/ui/theme/Theme.kt
index 8366d57..6bd4b5c 100644
--- a/app/src/main/java/com/example/composecodechallenge/main/ui/theme/Theme.kt
+++ b/app/src/main/java/com/example/composecodechallenge/main/ui/theme/Theme.kt
@@ -1,19 +1,10 @@
 package com.example.composecodechallenge.main.ui.theme
 
-import android.app.Activity
-import android.os.Build
 import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.darkColorScheme
-import androidx.compose.material3.dynamicDarkColorScheme
-import androidx.compose.material3.dynamicLightColorScheme
 import androidx.compose.material3.lightColorScheme
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.SideEffect
-import androidx.compose.ui.graphics.toArgb
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.platform.LocalView
-import androidx.core.view.WindowCompat
 import androidx.compose.ui.graphics.Color
 
 val LightColorScheme = lightColorScheme(
@@ -75,27 +66,10 @@ val DarkColorScheme = darkColorScheme(
 @Composable
 fun ItollTheme(
     darkTheme: Boolean = isSystemInDarkTheme(),
-    // Dynamic color is available on Android 12+
-    dynamicColor: Boolean = true,
     content: @Composable () -> Unit
 ) {
-    val colorScheme = when {
-        dynamicColor && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S -> {
-            val context = LocalContext.current
-            if (darkTheme) dynamicDarkColorScheme(context) else dynamicLightColorScheme(context)
-        }
 
-        darkTheme -> DarkColorScheme
-        else -> LightColorScheme
-    }
-    val view = LocalView.current
-    if (!view.isInEditMode) {
-        SideEffect {
-            val window = (view.context as Activity).window
-            window.statusBarColor = colorScheme.primary.toArgb()
-            WindowCompat.getInsetsController(window, view).isAppearanceLightStatusBars = darkTheme
-        }
-    }
+    val colorScheme = if (darkTheme) DarkColorScheme else LightColorScheme
 
     MaterialTheme(
         colorScheme = colorScheme,
diff --git a/app/src/main/java/com/example/composecodechallenge/main/ui/theme/Type.kt b/app/src/main/java/com/example/composecodechallenge/main/ui/theme/Type.kt
index c2c8c85..1b1f527 100644
--- a/app/src/main/java/com/example/composecodechallenge/main/ui/theme/Type.kt
+++ b/app/src/main/java/com/example/composecodechallenge/main/ui/theme/Type.kt
@@ -15,20 +15,4 @@ val Typography = Typography(
         lineHeight = 24.sp,
         letterSpacing = 0.5.sp
     )
-    /* Other default text styles to override
-    titleLarge = TextStyle(
-        fontFamily = FontFamily.Default,
-        fontWeight = FontWeight.Normal,
-        fontSize = 22.sp,
-        lineHeight = 28.sp,
-        letterSpacing = 0.sp
-    ),
-    labelSmall = TextStyle(
-        fontFamily = FontFamily.Default,
-        fontWeight = FontWeight.Medium,
-        fontSize = 11.sp,
-        lineHeight = 16.sp,
-        letterSpacing = 0.5.sp
-    )
-    */
 )
\ No newline at end of file
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 37a3841..92c4ab5 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="Theme.ComposeCodeChallenge" parent="android:Theme.Material.Light.NoActionBar" />
+    <style name="Theme.ComposeCodeChallenge" parent="Theme.Material3.DayNight.NoActionBar" />
 </resources>
\ No newline at end of file
diff --git a/buildSrc/src/main/java/com/example/buildsrc/Libs.kt b/buildSrc/src/main/java/com/example/buildsrc/Libs.kt
index f6f68fd..137983d 100644
--- a/buildSrc/src/main/java/com/example/buildsrc/Libs.kt
+++ b/buildSrc/src/main/java/com/example/buildsrc/Libs.kt
@@ -42,6 +42,7 @@ object Libs {
         const val stetho_OkHttp = "com.facebook.stetho:stetho-okhttp3:${Versions.stetho}"
         const val arrowCore = "io.arrow-kt:arrow-core:${Versions.arrow}"
         const val coil = "io.coil-kt:coil-compose:${Versions.coil}"
+        const val material = "com.google.android.material:material:${Versions.material}"
     }
 
     object Testing {
diff --git a/buildSrc/src/main/java/com/example/buildsrc/Versions.kt b/buildSrc/src/main/java/com/example/buildsrc/Versions.kt
index 8370135..e1183dc 100644
--- a/buildSrc/src/main/java/com/example/buildsrc/Versions.kt
+++ b/buildSrc/src/main/java/com/example/buildsrc/Versions.kt
@@ -23,4 +23,5 @@ object Versions {
     const val junit = "4.13.2"
     const val junitEx = "1.1.5"
     const val espresso = "3.5.1"
+    const val material = "1.9.0"
 }
\ No newline at end of file