--- a/ui/material2/build.gradle.kts	Sun Apr 27 15:02:04 2025 -0400
+++ b/ui/material2/build.gradle.kts	Sun Apr 27 16:19:28 2025 -0400
@@ -62,6 +62,7 @@
             implementation(libs.org.jetbrains.compose.material.icons.core)
             implementation(libs.org.jetbrains.androidx.navigation.compose)
             implementation(libs.org.jetbrains.androidx.core.uri)
+            implementation(libs.org.jetbrains.androidx.lifecycle.viewmodel.compose)
         }
 
         androidMain.dependencies {

--- a/ui/material2/src/androidMain/kotlin/OpenSourceLicensesActivity.kt	Sun Apr 27 15:02:04 2025 -0400
+++ b/ui/material2/src/androidMain/kotlin/OpenSourceLicensesActivity.kt	Sun Apr 27 16:19:28 2025 -0400
@@ -24,7 +24,10 @@
 import android.os.Bundle
 import androidx.activity.compose.setContent
 import androidx.activity.viewModels
+import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.material.MaterialTheme
+import androidx.compose.material.darkColors
+import androidx.compose.material.lightColors
 import androidx.compose.runtime.Composable
 import com.geekorum.aboutoss.core.gms.GmsLicenseInfoRepository
 import com.geekorum.aboutoss.ui.common.BaseOpensourceLicenseActivity
@@ -74,7 +77,8 @@
          * Default to base material theme [MaterialTheme]
          */
         var themeProvider: @Composable (@Composable () -> Unit) -> Unit = { content ->
-            MaterialTheme(content = content)
+            val colors = if (isSystemInDarkTheme()) darkColors() else lightColors()
+            MaterialTheme(colors = colors, content = content)
         }
     }
 }

--- a/ui/material2/src/commonMain/kotlin/com/geekorum/aboutoss/ui/material/OpenSourceDependenciesListScreen.kt	Sun Apr 27 15:02:04 2025 -0400
+++ b/ui/material2/src/commonMain/kotlin/com/geekorum/aboutoss/ui/material/OpenSourceDependenciesListScreen.kt	Sun Apr 27 16:19:28 2025 -0400
@@ -110,8 +110,8 @@
             },
             elevation = topBarElevation
         )
-    }) {
-        LazyColumn(Modifier.fillMaxSize(), state = lazyListState, contentPadding = it) {
+    }) { contentPadding ->
+        LazyColumn(Modifier.fillMaxSize(), state = lazyListState, contentPadding = contentPadding) {
             items(dependencies) {
                 Column {
                     ListItem(

--- a/ui/material2/src/commonMain/kotlin/com/geekorum/aboutoss/ui/material/OpenSourceDependenciesNavHost.kt	Sun Apr 27 15:02:04 2025 -0400
+++ b/ui/material2/src/commonMain/kotlin/com/geekorum/aboutoss/ui/material/OpenSourceDependenciesNavHost.kt	Sun Apr 27 16:19:28 2025 -0400
@@ -26,6 +26,7 @@
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
 import androidx.navigation.compose.rememberNavController
+import androidx.savedstate.read
 import com.geekorum.aboutoss.ui.common.OpenSourceLicensesViewModel
 
 @Composable
@@ -45,7 +46,9 @@
             )
         }
         composable("dependency_license/{dependency}") {
-            val dependency = requireNotNull(it.arguments?.getString("dependency"))
+            val dependency = requireNotNull(it.arguments?.read {
+                getString("dependency")
+            })
             OpenSourceLicenseScreen(
                 viewModel = openSourceLicensesViewModel,
                 dependency = dependency,