diff --git a/.github/workflows/pr_checks.yml b/.github/workflows/pr_checks.yml
index 2aa3f25a..a4080911 100644
--- a/.github/workflows/pr_checks.yml
+++ b/.github/workflows/pr_checks.yml
@@ -23,7 +23,7 @@ jobs:
         uses: gradle/actions/setup-gradle@v3
 
       - name: "Run static analysis"
-        run: ./gradlew detektAll mergeLintSarif
+        run: ./gradlew detektAll lintReportDebug mergeLintSarif
         continue-on-error: false
 
       - name: "Upload Detkt sarif results"
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 192dee4c..5d238a15 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -55,6 +55,7 @@
       <option name="ALIGN_MULTILINE_ANNOTATION_PARAMETERS" value="true" />
       <option name="IMPORT_LAYOUT_TABLE">
         <value>
+          <package name="" withSubpackages="true" static="false" module="true" />
           <package name="android" withSubpackages="true" static="false" />
           <emptyLine />
           <package name="com" withSubpackages="true" static="false" />
diff --git a/build-logic/convention/src/main/kotlin/com/github/terrakok/CollectSarifPlugin.kt b/build-logic/convention/src/main/kotlin/com/github/terrakok/CollectSarifPlugin.kt
index 0e9a1e10..499567cb 100644
--- a/build-logic/convention/src/main/kotlin/com/github/terrakok/CollectSarifPlugin.kt
+++ b/build-logic/convention/src/main/kotlin/com/github/terrakok/CollectSarifPlugin.kt
@@ -1,24 +1,90 @@
 package com.github.terrakok
 
 import io.gitlab.arturbosch.detekt.report.ReportMergeTask
+import org.gradle.api.DefaultTask
 import org.gradle.api.Plugin
 import org.gradle.api.Project
+import org.gradle.api.file.ConfigurableFileCollection
+import org.gradle.api.file.DirectoryProperty
 import org.gradle.api.plugins.JavaBasePlugin
+import org.gradle.api.tasks.InputFiles
+import org.gradle.api.tasks.OutputDirectory
+import org.gradle.api.tasks.TaskAction
 import org.gradle.kotlin.dsl.register
 
 class CollectSarifPlugin : Plugin<Project> {
 
     override fun apply(target: Project) {
         with(target) {
+            val fixLintSarifTask = tasks.register<FixLintSarifTask>(FIX_LINT_SARIF) {
+                group = JavaBasePlugin.VERIFICATION_GROUP
+                outputDir.set(layout.buildDirectory.dir("reports/lint-sarif-fixed"))
+            }
+
             tasks.register<ReportMergeTask>(MERGE_LINT_SARIF) {
                 group = JavaBasePlugin.VERIFICATION_GROUP
                 output.set(layout.buildDirectory.file("reports/lint-merged.sarif"))
+                dependsOn(fixLintSarifTask)
+                // Configure inputs from the fix task's output directory
+                input.from(
+                    fixLintSarifTask.map { task ->
+                        task.outputDir.get().asFileTree.matching {
+                            include("**/*.sarif")
+                        }
+                    }
+                )
             }
         }
     }
 
     companion object {
         const val MERGE_LINT_SARIF = "mergeLintSarif"
+        const val FIX_LINT_SARIF = "fixLintSarif"
     }
+}
+
+abstract class FixLintSarifTask : DefaultTask() {
+
+    @get:InputFiles
+    abstract val inputFiles: ConfigurableFileCollection
+
+    @get:OutputDirectory
+    abstract val outputDir: DirectoryProperty
+
+    @TaskAction
+    fun fixSarifFiles() {
+        val outputDirectory = outputDir.get().asFile
+        outputDirectory.mkdirs()
 
+        // Group input files by their parent project to avoid name collisions
+        val filesByProject = inputFiles.files.groupBy { file ->
+            // Extract project path from file path
+            // e.g., /path/to/project/modo-compose/build/reports/lint-results-debug.sarif -> modo-compose
+            val buildIndex = file.absolutePath.indexOf("/build/")
+            if (buildIndex > 0) {
+                val projectPath = file.absolutePath.substring(0, buildIndex)
+                projectPath.substringAfterLast("/")
+            } else {
+                "unknown"
+            }
+        }
+
+        filesByProject.forEach { (projectName, files) ->
+            files.forEach { inputFile ->
+                if (inputFile.exists() && inputFile.extension == "sarif") {
+                    val content = inputFile.readText()
+                    // Fix trailing commas in arrays and objects which are invalid JSON
+                    val fixedContent = content
+                        .replace(Regex(",\\s*]"), "]")  // Remove trailing comma before ]
+                        .replace(Regex(",\\s*}"), "}")  // Remove trailing comma before }
+
+                    // Create unique output filename using project name
+                    val outputFileName = "${projectName}-${inputFile.name}"
+                    val outputFile = outputDirectory.resolve(outputFileName)
+                    outputFile.writeText(fixedContent)
+                    logger.lifecycle("Fixed SARIF file: ${inputFile.absolutePath} -> ${outputFile.absolutePath}")
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/build-logic/convention/src/main/kotlin/com/github/terrakok/KotlinAndroid.kt b/build-logic/convention/src/main/kotlin/com/github/terrakok/KotlinAndroid.kt
index 43941b54..33bee8c4 100644
--- a/build-logic/convention/src/main/kotlin/com/github/terrakok/KotlinAndroid.kt
+++ b/build-logic/convention/src/main/kotlin/com/github/terrakok/KotlinAndroid.kt
@@ -6,11 +6,9 @@ import org.gradle.api.Project
 import org.gradle.api.plugins.JavaPluginExtension
 import org.gradle.kotlin.dsl.configure
 import org.gradle.kotlin.dsl.provideDelegate
-import org.gradle.kotlin.dsl.withType
 import org.jetbrains.kotlin.compose.compiler.gradle.ComposeCompilerGradlePluginExtension
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.dsl.KotlinAndroidProjectExtension
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 private val JAVA_VERSION = JavaVersion.VERSION_11
 private val JVM_TARGET = JvmTarget.JVM_11
diff --git a/build-logic/convention/src/main/kotlin/com/github/terrakok/LintAndroidSetup.kt b/build-logic/convention/src/main/kotlin/com/github/terrakok/LintAndroidSetup.kt
index bc4da43c..bd6e321c 100644
--- a/build-logic/convention/src/main/kotlin/com/github/terrakok/LintAndroidSetup.kt
+++ b/build-logic/convention/src/main/kotlin/com/github/terrakok/LintAndroidSetup.kt
@@ -2,7 +2,6 @@ package com.github.terrakok
 
 import com.android.build.api.dsl.CommonExtension
 import com.android.build.gradle.internal.lint.AndroidLintTask
-import io.gitlab.arturbosch.detekt.report.ReportMergeTask
 import org.gradle.api.Project
 
 fun Project.configureLintAndroid(
@@ -17,14 +16,20 @@ fun Project.configureLintAndroid(
         htmlReport = true
         lintConfig = rootProject.file("config/lint/lint.xml")
     }
-    rootProject.tasks.named(
-        CollectSarifPlugin.MERGE_LINT_SARIF,
-        ReportMergeTask::class.java,
-    ) {
-        input.from(
-            tasks
-                .named("lintReportDebug", AndroidLintTask::class.java)
-                .flatMap { it.sarifReportOutputFile }
-        )
+
+    // Use afterEvaluate to ensure the lintReportDebug task exists
+    afterEvaluate {
+        tasks.matching { it.name == "lintReportDebug" && it is AndroidLintTask }.configureEach {
+            val lintTask = this as AndroidLintTask
+            val lintSarifFile = lintTask.sarifReportOutputFile
+
+            // Add lint SARIF files to the fix task
+            rootProject.tasks.named(
+                CollectSarifPlugin.FIX_LINT_SARIF,
+                FixLintSarifTask::class.java,
+            ) {
+                inputFiles.from(lintSarifFile)
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/config/detekt/detekt.yml b/config/detekt/detekt.yml
index 774d9de6..7e298dd7 100644
--- a/config/detekt/detekt.yml
+++ b/config/detekt/detekt.yml
@@ -881,7 +881,7 @@ Compose:
     # -- You can optionally have a list of types to be treated as lambdas (e.g. typedefs or fun interfaces not picked up automatically)
     # treatAsLambda: MyLambdaType
   CompositionLocalAllowlist:
-    active: true
+    active: false
     # -- You can optionally define a list of CompositionLocals that are allowed here
     allowedCompositionLocals: LocalContainerScreen,LocalMultiScreenNavigation,LocalSaveableStateHolder,LocalBeforeScreenContentOnDispose,LocalAfterScreenContentOnDispose,LocalStackNavigation,
   CompositionLocalNaming:
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 34a0fb04..dc0c9d10 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,13 +1,13 @@
 [versions]
 composeWheelPicker = "1.0.0-beta05"
 leakcanaryAndroid = "2.14"
-modo = "0.10.1"
+modo = "0.11.0"
 androidGradlePlugin = "8.13.0"
 detektComposeVersion = "0.3.20"
 detektVersion = "1.23.6"
 junit = "4.13.2"
-androidxComposeBomModo = "2024.03.00"
-androidxComposeBomApp = "2024.06.00"
+androidxComposeBomModo = "2025.11.01"
+androidxComposeBomApp = "2025.11.01"
 androidxActivityCompose = "1.8.2"
 androidxLifecycle = "2.7.0"
 androidxCore = "1.13.1"
@@ -18,7 +18,7 @@ androidTools = "31.4.0"
 kotlin = "2.0.21"
 kotlinCompilerExtension = "1.5.12"
 minSdk = "21"
-compileSdk = "34"
+compileSdk = "36"
 koin = "4.0.0"
 
 [libraries]
@@ -30,7 +30,8 @@ androidx-compose-foundation-beta = { group = "androidx.compose.foundation", name
 androidx-compose-ui = { group = "androidx.compose.ui", name = "ui" }
 androidx-compose-animation = { group = "androidx.compose.animation", name = "animation" }
 androidx-compose-material = { group = "androidx.compose.material", name = "material" }
-androidx-compose-material3 = { group = "androidx.compose.material3", name = "material3", version = "1.2.1" }
+androidx-compose-material3 = { group = "androidx.compose.material3", name = "material3", version = "1.4.0" }
+androidx-compose-material-icons = { group = "androidx.compose.material", name = "material-icons-core" }
 androidx-compose-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling" }
 androidx-compose-ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-tooling-preview" }
 androidx-activity-compose = { group = "androidx.activity", name = "activity-compose", version.ref = "androidxActivityCompose" }
diff --git a/modo-compose/dependencies/debugCompileClasspath.txt b/modo-compose/dependencies/debugCompileClasspath.txt
index ea6548e7..142fe370 100644
--- a/modo-compose/dependencies/debugCompileClasspath.txt
+++ b/modo-compose/dependencies/debugCompileClasspath.txt
@@ -1,68 +1,81 @@
 androidx.activity:activity-compose:1.8.2
 androidx.activity:activity-ktx:1.8.2
 androidx.activity:activity:1.8.2
-androidx.annotation:annotation-experimental:1.3.0
-androidx.annotation:annotation-jvm:1.7.0
-androidx.annotation:annotation:1.7.0
+androidx.annotation:annotation-experimental:1.4.1
+androidx.annotation:annotation-jvm:1.9.1
+androidx.annotation:annotation:1.9.1
 androidx.arch.core:core-common:2.2.0
 androidx.arch.core:core-runtime:2.2.0
-androidx.collection:collection-jvm:1.4.0
-androidx.collection:collection-ktx:1.4.0
-androidx.collection:collection:1.4.0
-androidx.compose.animation:animation-android:1.6.4
-androidx.compose.animation:animation-core-android:1.6.4
-androidx.compose.animation:animation-core:1.6.4
-androidx.compose.animation:animation:1.6.4
-androidx.compose.foundation:foundation-android:1.6.4
-androidx.compose.foundation:foundation-layout-android:1.6.4
-androidx.compose.foundation:foundation-layout:1.6.4
-androidx.compose.foundation:foundation:1.6.4
-androidx.compose.runtime:runtime-android:1.6.4
-androidx.compose.runtime:runtime-saveable-android:1.6.4
-androidx.compose.runtime:runtime-saveable:1.6.4
-androidx.compose.runtime:runtime:1.6.4
-androidx.compose.ui:ui-android:1.6.4
-androidx.compose.ui:ui-geometry-android:1.6.4
-androidx.compose.ui:ui-geometry:1.6.4
-androidx.compose.ui:ui-graphics-android:1.6.4
-androidx.compose.ui:ui-graphics:1.6.4
-androidx.compose.ui:ui-text-android:1.6.4
-androidx.compose.ui:ui-text:1.6.4
-androidx.compose.ui:ui-unit-android:1.6.4
-androidx.compose.ui:ui-unit:1.6.4
-androidx.compose.ui:ui-util-android:1.6.4
-androidx.compose.ui:ui-util:1.6.4
-androidx.compose.ui:ui:1.6.4
-androidx.compose:compose-bom:2024.03.00
-androidx.core:core-ktx:1.12.0
-androidx.core:core:1.12.0
+androidx.collection:collection-jvm:1.5.0
+androidx.collection:collection-ktx:1.5.0
+androidx.collection:collection:1.5.0
+androidx.compose.animation:animation-android:1.9.5
+androidx.compose.animation:animation-core-android:1.9.5
+androidx.compose.animation:animation-core:1.9.5
+androidx.compose.animation:animation:1.9.5
+androidx.compose.foundation:foundation-android:1.9.5
+androidx.compose.foundation:foundation-layout-android:1.9.5
+androidx.compose.foundation:foundation-layout:1.9.5
+androidx.compose.foundation:foundation:1.9.5
+androidx.compose.runtime:runtime-android:1.9.5
+androidx.compose.runtime:runtime-annotation-android:1.9.5
+androidx.compose.runtime:runtime-annotation:1.9.5
+androidx.compose.runtime:runtime-saveable-android:1.9.5
+androidx.compose.runtime:runtime-saveable:1.9.5
+androidx.compose.runtime:runtime:1.9.5
+androidx.compose.ui:ui-android:1.9.5
+androidx.compose.ui:ui-geometry-android:1.9.5
+androidx.compose.ui:ui-geometry:1.9.5
+androidx.compose.ui:ui-graphics-android:1.9.5
+androidx.compose.ui:ui-graphics:1.9.5
+androidx.compose.ui:ui-text-android:1.9.5
+androidx.compose.ui:ui-text:1.9.5
+androidx.compose.ui:ui-unit-android:1.9.5
+androidx.compose.ui:ui-unit:1.9.5
+androidx.compose.ui:ui-util-android:1.9.5
+androidx.compose.ui:ui-util:1.9.5
+androidx.compose.ui:ui:1.9.5
+androidx.compose:compose-bom:2025.11.01
+androidx.core:core-ktx:1.15.0
+androidx.core:core:1.15.0
 androidx.customview:customview:1.0.0
 androidx.fragment:fragment-ktx:1.6.2
 androidx.fragment:fragment:1.6.2
-androidx.lifecycle:lifecycle-common-java8:2.7.0
-androidx.lifecycle:lifecycle-common:2.7.0
-androidx.lifecycle:lifecycle-livedata-core-ktx:2.7.0
-androidx.lifecycle:lifecycle-livedata-core:2.7.0
-androidx.lifecycle:lifecycle-livedata:2.7.0
-androidx.lifecycle:lifecycle-runtime-ktx:2.7.0
-androidx.lifecycle:lifecycle-runtime:2.7.0
-androidx.lifecycle:lifecycle-viewmodel-compose:2.7.0
-androidx.lifecycle:lifecycle-viewmodel-ktx:2.7.0
-androidx.lifecycle:lifecycle-viewmodel-savedstate:2.7.0
-androidx.lifecycle:lifecycle-viewmodel:2.7.0
+androidx.lifecycle:lifecycle-common-jvm:2.9.4
+androidx.lifecycle:lifecycle-common:2.9.4
+androidx.lifecycle:lifecycle-livedata-core-ktx:2.9.4
+androidx.lifecycle:lifecycle-livedata-core:2.9.4
+androidx.lifecycle:lifecycle-livedata:2.9.4
+androidx.lifecycle:lifecycle-runtime-android:2.9.4
+androidx.lifecycle:lifecycle-runtime-compose-android:2.9.4
+androidx.lifecycle:lifecycle-runtime-compose:2.9.4
+androidx.lifecycle:lifecycle-runtime-ktx-android:2.9.4
+androidx.lifecycle:lifecycle-runtime-ktx:2.9.4
+androidx.lifecycle:lifecycle-runtime:2.9.4
+androidx.lifecycle:lifecycle-viewmodel-android:2.9.4
+androidx.lifecycle:lifecycle-viewmodel-compose-android:2.9.4
+androidx.lifecycle:lifecycle-viewmodel-compose:2.9.4
+androidx.lifecycle:lifecycle-viewmodel-ktx:2.9.4
+androidx.lifecycle:lifecycle-viewmodel-savedstate-android:2.9.4
+androidx.lifecycle:lifecycle-viewmodel-savedstate:2.9.4
+androidx.lifecycle:lifecycle-viewmodel:2.9.4
 androidx.loader:loader:1.0.0
-androidx.savedstate:savedstate-ktx:1.2.1
-androidx.savedstate:savedstate:1.2.1
+androidx.savedstate:savedstate-android:1.3.3
+androidx.savedstate:savedstate-compose-android:1.3.3
+androidx.savedstate:savedstate-compose:1.3.3
+androidx.savedstate:savedstate-ktx:1.3.3
+androidx.savedstate:savedstate:1.3.3
 androidx.versionedparcelable:versionedparcelable:1.1.1
 androidx.viewpager:viewpager:1.0.0
 org.jetbrains.kotlin:kotlin-android-extensions-runtime:2.0.21
 org.jetbrains.kotlin:kotlin-parcelize-runtime:2.0.21
-org.jetbrains.kotlin:kotlin-stdlib-common:2.0.21
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.20
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.20
 org.jetbrains.kotlin:kotlin-stdlib:2.0.21
-org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.1
-org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.7.1
-org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.7.1
-org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.1
+org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.1
+org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.8.1
+org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.8.1
+org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1
+org.jetbrains.kotlinx:kotlinx-serialization-bom:1.7.3
+org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:1.7.3
+org.jetbrains.kotlinx:kotlinx-serialization-core:1.7.3
 org.jetbrains:annotations:23.0.0
+org.jspecify:jspecify:1.0.0
diff --git a/modo-compose/dependencies/debugRuntimeClasspath.txt b/modo-compose/dependencies/debugRuntimeClasspath.txt
index cdd85b8a..5a9b5599 100644
--- a/modo-compose/dependencies/debugRuntimeClasspath.txt
+++ b/modo-compose/dependencies/debugRuntimeClasspath.txt
@@ -1,78 +1,94 @@
 androidx.activity:activity-compose:1.8.2
 androidx.activity:activity-ktx:1.8.2
 androidx.activity:activity:1.8.2
-androidx.annotation:annotation-experimental:1.3.0
-androidx.annotation:annotation-jvm:1.7.0
-androidx.annotation:annotation:1.7.0
+androidx.annotation:annotation-experimental:1.4.1
+androidx.annotation:annotation-jvm:1.9.1
+androidx.annotation:annotation:1.9.1
 androidx.arch.core:core-common:2.2.0
 androidx.arch.core:core-runtime:2.2.0
 androidx.autofill:autofill:1.0.0
-androidx.collection:collection-jvm:1.4.0
-androidx.collection:collection-ktx:1.4.0
-androidx.collection:collection:1.4.0
-androidx.compose.animation:animation-android:1.6.4
-androidx.compose.animation:animation-core-android:1.6.4
-androidx.compose.animation:animation-core:1.6.4
-androidx.compose.animation:animation:1.6.4
-androidx.compose.foundation:foundation-android:1.6.4
-androidx.compose.foundation:foundation-layout-android:1.6.4
-androidx.compose.foundation:foundation-layout:1.6.4
-androidx.compose.foundation:foundation:1.6.4
-androidx.compose.runtime:runtime-android:1.6.4
-androidx.compose.runtime:runtime-saveable-android:1.6.4
-androidx.compose.runtime:runtime-saveable:1.6.4
-androidx.compose.runtime:runtime:1.6.4
-androidx.compose.ui:ui-android:1.6.4
-androidx.compose.ui:ui-geometry-android:1.6.4
-androidx.compose.ui:ui-geometry:1.6.4
-androidx.compose.ui:ui-graphics-android:1.6.4
-androidx.compose.ui:ui-graphics:1.6.4
-androidx.compose.ui:ui-text-android:1.6.4
-androidx.compose.ui:ui-text:1.6.4
-androidx.compose.ui:ui-unit-android:1.6.4
-androidx.compose.ui:ui-unit:1.6.4
-androidx.compose.ui:ui-util-android:1.6.4
-androidx.compose.ui:ui-util:1.6.4
-androidx.compose.ui:ui:1.6.4
-androidx.compose:compose-bom:2024.03.00
+androidx.collection:collection-jvm:1.5.0
+androidx.collection:collection-ktx:1.5.0
+androidx.collection:collection:1.5.0
+androidx.compose.animation:animation-android:1.9.5
+androidx.compose.animation:animation-core-android:1.9.5
+androidx.compose.animation:animation-core:1.9.5
+androidx.compose.animation:animation:1.9.5
+androidx.compose.foundation:foundation-android:1.9.5
+androidx.compose.foundation:foundation-layout-android:1.9.5
+androidx.compose.foundation:foundation-layout:1.9.5
+androidx.compose.foundation:foundation:1.9.5
+androidx.compose.runtime:runtime-android:1.9.5
+androidx.compose.runtime:runtime-annotation-android:1.9.5
+androidx.compose.runtime:runtime-annotation:1.9.5
+androidx.compose.runtime:runtime-saveable-android:1.9.5
+androidx.compose.runtime:runtime-saveable:1.9.5
+androidx.compose.runtime:runtime:1.9.5
+androidx.compose.ui:ui-android:1.9.5
+androidx.compose.ui:ui-geometry-android:1.9.5
+androidx.compose.ui:ui-geometry:1.9.5
+androidx.compose.ui:ui-graphics-android:1.9.5
+androidx.compose.ui:ui-graphics:1.9.5
+androidx.compose.ui:ui-text-android:1.9.5
+androidx.compose.ui:ui-text:1.9.5
+androidx.compose.ui:ui-unit-android:1.9.5
+androidx.compose.ui:ui-unit:1.9.5
+androidx.compose.ui:ui-util-android:1.9.5
+androidx.compose.ui:ui-util:1.9.5
+androidx.compose.ui:ui:1.9.5
+androidx.compose:compose-bom:2025.11.01
 androidx.concurrent:concurrent-futures:1.1.0
-androidx.core:core-ktx:1.12.0
-androidx.core:core:1.12.0
+androidx.core:core-ktx:1.15.0
+androidx.core:core-viewtree:1.0.0
+androidx.core:core:1.15.0
 androidx.customview:customview-poolingcontainer:1.0.0
 androidx.customview:customview:1.0.0
-androidx.emoji2:emoji2:1.3.0
+androidx.emoji2:emoji2:1.4.0
 androidx.fragment:fragment-ktx:1.6.2
 androidx.fragment:fragment:1.6.2
+androidx.graphics:graphics-path:1.0.1
 androidx.interpolator:interpolator:1.0.0
-androidx.lifecycle:lifecycle-common-java8:2.7.0
-androidx.lifecycle:lifecycle-common:2.7.0
-androidx.lifecycle:lifecycle-livedata-core-ktx:2.7.0
-androidx.lifecycle:lifecycle-livedata-core:2.7.0
-androidx.lifecycle:lifecycle-livedata:2.7.0
-androidx.lifecycle:lifecycle-process:2.7.0
-androidx.lifecycle:lifecycle-runtime-ktx:2.7.0
-androidx.lifecycle:lifecycle-runtime:2.7.0
-androidx.lifecycle:lifecycle-viewmodel-compose:2.7.0
-androidx.lifecycle:lifecycle-viewmodel-ktx:2.7.0
-androidx.lifecycle:lifecycle-viewmodel-savedstate:2.7.0
-androidx.lifecycle:lifecycle-viewmodel:2.7.0
+androidx.lifecycle:lifecycle-common-jvm:2.9.4
+androidx.lifecycle:lifecycle-common:2.9.4
+androidx.lifecycle:lifecycle-livedata-core-ktx:2.9.4
+androidx.lifecycle:lifecycle-livedata-core:2.9.4
+androidx.lifecycle:lifecycle-livedata:2.9.4
+androidx.lifecycle:lifecycle-process:2.9.4
+androidx.lifecycle:lifecycle-runtime-android:2.9.4
+androidx.lifecycle:lifecycle-runtime-compose-android:2.9.4
+androidx.lifecycle:lifecycle-runtime-compose:2.9.4
+androidx.lifecycle:lifecycle-runtime-ktx-android:2.9.4
+androidx.lifecycle:lifecycle-runtime-ktx:2.9.4
+androidx.lifecycle:lifecycle-runtime:2.9.4
+androidx.lifecycle:lifecycle-viewmodel-android:2.9.4
+androidx.lifecycle:lifecycle-viewmodel-compose-android:2.9.4
+androidx.lifecycle:lifecycle-viewmodel-compose:2.9.4
+androidx.lifecycle:lifecycle-viewmodel-ktx:2.9.4
+androidx.lifecycle:lifecycle-viewmodel-savedstate-android:2.9.4
+androidx.lifecycle:lifecycle-viewmodel-savedstate:2.9.4
+androidx.lifecycle:lifecycle-viewmodel:2.9.4
 androidx.loader:loader:1.0.0
-androidx.profileinstaller:profileinstaller:1.3.0
-androidx.savedstate:savedstate-ktx:1.2.1
-androidx.savedstate:savedstate:1.2.1
+androidx.profileinstaller:profileinstaller:1.4.0
+androidx.savedstate:savedstate-android:1.3.3
+androidx.savedstate:savedstate-compose-android:1.3.3
+androidx.savedstate:savedstate-compose:1.3.3
+androidx.savedstate:savedstate-ktx:1.3.3
+androidx.savedstate:savedstate:1.3.3
 androidx.startup:startup-runtime:1.1.1
-androidx.tracing:tracing:1.0.0
+androidx.tracing:tracing:1.2.0
 androidx.versionedparcelable:versionedparcelable:1.1.1
 androidx.viewpager:viewpager:1.0.0
 com.google.guava:listenablefuture:1.0
 org.jetbrains.kotlin:kotlin-android-extensions-runtime:2.0.21
 org.jetbrains.kotlin:kotlin-parcelize-runtime:2.0.21
 org.jetbrains.kotlin:kotlin-stdlib-common:2.0.21
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.20
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.20
 org.jetbrains.kotlin:kotlin-stdlib:2.0.21
-org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.1
-org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.7.1
-org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.7.1
-org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.1
+org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.1
+org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.8.1
+org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.8.1
+org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1
+org.jetbrains.kotlinx:kotlinx-serialization-bom:1.7.3
+org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:1.7.3
+org.jetbrains.kotlinx:kotlinx-serialization-core:1.7.3
 org.jetbrains:annotations:23.0.0
+org.jspecify:jspecify:1.0.0
diff --git a/modo-compose/src/debug/kotlin/com/github/terrakok/modo/logs/DevLog.kt b/modo-compose/src/debug/kotlin/com/github/terrakok/modo/logs/DevLog.kt
new file mode 100644
index 00000000..9765434b
--- /dev/null
+++ b/modo-compose/src/debug/kotlin/com/github/terrakok/modo/logs/DevLog.kt
@@ -0,0 +1,26 @@
+package com.github.terrakok.modo.logs
+
+import android.util.Log
+
+@Suppress("LogConditional")
+internal object DevLog {
+    fun v(tag: String? = null, message: () -> String) {
+        Log.v(tag, message())
+    }
+
+    fun d(tag: String? = null, message: () -> String) {
+        Log.d(tag, message())
+    }
+
+    fun i(tag: String? = null, message: () -> String) {
+        Log.i(tag, message())
+    }
+
+    fun w(tag: String? = null, message: () -> String) {
+        Log.w(tag, message())
+    }
+
+    fun e(tag: String? = null, message: () -> String) {
+        Log.e(tag, message())
+    }
+}
\ No newline at end of file
diff --git a/modo-compose/src/main/java/com/github/terrakok/modo/ComposeRender.kt b/modo-compose/src/main/java/com/github/terrakok/modo/ComposeRender.kt
index 89de2722..2763dac1 100644
--- a/modo-compose/src/main/java/com/github/terrakok/modo/ComposeRender.kt
+++ b/modo-compose/src/main/java/com/github/terrakok/modo/ComposeRender.kt
@@ -19,13 +19,14 @@ import androidx.lifecycle.Lifecycle.Event.ON_START
 import androidx.lifecycle.Lifecycle.Event.ON_STOP
 import com.github.terrakok.modo.android.ModoScreenAndroidAdapter
 import com.github.terrakok.modo.animation.ScreenTransition
-import com.github.terrakok.modo.animation.displayingScreensAfterScreenContent
-import com.github.terrakok.modo.animation.displayingScreensBeforeScreenContent
+import com.github.terrakok.modo.animation.cleanupProtectedScreens
+import com.github.terrakok.modo.animation.preDisposeProtectedScreens
 import com.github.terrakok.modo.lifecycle.LifecycleDependency
+import com.github.terrakok.modo.logs.devLogI
+import com.github.terrakok.modo.logs.devLogV
 import com.github.terrakok.modo.model.ScreenModelStore
 import com.github.terrakok.modo.model.dependenciesSortedByRemovePriority
 import com.github.terrakok.modo.util.currentOrThrow
-import kotlinx.coroutines.channels.Channel
 
 typealias RendererContent<State> = @Composable ComposeRendererScope<State>.(Modifier) -> Unit
 
@@ -35,14 +36,18 @@ val defaultRendererContent: (@Composable ComposeRendererScope<*>.(screenModifier
 
 val LocalSaveableStateHolder = staticCompositionLocalOf<SaveableStateHolder?> { null }
 
-private val LocalBeforeScreenContentOnDispose = staticCompositionLocalOf<() -> Unit> {
-    error("No LocalBeforeScreenContentOnDispose provided!")
+private val LocalClearScreens = staticCompositionLocalOf<() -> Unit> {
+    error("No LocalClearScreens provided!")
 }
 
-private val LocalAfterScreenContentOnDispose = staticCompositionLocalOf<() -> Unit> {
-    error("No LocalAfterScreenContentOnDispose provided!")
+private val LocalPreDispose = staticCompositionLocalOf<() -> Unit> {
+    error("No LocalPreDispose provided!")
 }
 
+private const val TAG = "ComposeRenderer"
+
+internal inline val Screen.saveableStateKey: String get() = screenKey.value
+
 /**
  * Provides integration of [Screen] to Modo's navigation system:
  * 1. Adds support of [rememberSaveable] by using [SaveableStateHolder.SaveableStateProvider] to store [Screen]'s state.
@@ -63,41 +68,65 @@ fun Screen.SaveableContent(
     modifier: Modifier = Modifier,
     manualResumePause: Boolean = false
 ) {
-    LocalSaveableStateHolder.currentOrThrow.SaveableStateProvider(key = screenKey) {
+    LocalSaveableStateHolder.currentOrThrow.SaveableStateProvider(key = saveableStateKey) {
+        SetupScreenCleanup()
         ModoScreenAndroidAdapter.get(this).ProvideAndroidIntegration(manualResumePause) {
-            BeforeScreenContent()
             Content(modifier)
-            AfterScreenContent()
         }
     }
 }
 
 /**
- * This function responsible for correct cleaning [Screen]'s when it already has left composition and some clean up can be made.
- * It's not always clean [Screen] when it lives composition, but adds extra logic of tracking displaying [Screen]'s and triggering
- * function provided by [LocalBeforeScreenContentOnDispose] in order to try clean removed screens that are not visible for user.
+ * Sets up safe screen cleanup management for this screen.
+ *
+ *  CRITICAL: Must be called BEFORE user content to ensure cleanup happens AFTER user content is gone.
+ *
+ * While this screen is in composition:
+ * - Protects the screen from being prematurely cleaned by adding it to [cleanupProtectedScreens]
+ * - Acts as a safety gate - [ComposeRenderer.clearScreens] will skip this screen while it's tracked here
+ *
+ * When this screen leaves composition:
+ * - Removes protection by removing it from [cleanupProtectedScreens]
+ * - Triggers immediate cleanup of screen resources (ScreenModelStore, SavedState) via [LocalClearScreens]
+ *
+ * @see ComposeRenderer.clearScreens for the cleanup logic that respects this protection
  */
 @Composable
-private inline fun Screen.BeforeScreenContent() {
-    val onDisposed = LocalBeforeScreenContentOnDispose.current
+internal inline fun Screen.SetupScreenCleanup() {
+    val clearScreens = LocalClearScreens.current
     DisposableEffect(this) {
-        displayingScreensBeforeScreenContent[this@BeforeScreenContent] = Unit
+        devLogV(TAG) { "SetupScreenCleanup DisposableEffect" }
+        cleanupProtectedScreens[this@SetupScreenCleanup] = Unit
         onDispose {
-            displayingScreensBeforeScreenContent -= this@BeforeScreenContent
-//            Log.d("LifecycleDebug", "BeforeScreenContent $screenKey onDispose")
-            onDisposed.invoke()
+            cleanupProtectedScreens -= this@SetupScreenCleanup
+            devLogV(TAG) { "SetupScreenCleanup DisposableEffect.onDispose" }
+            clearScreens.invoke()
         }
     }
 }
 
+/**
+ * Sets up protection for this screen during the disposal phase to prevent premature lifecycle cleanup.
+ *
+ * While this screen is in composition:
+ * - Protects the screen from being prematurely disposed by adding it to [preDisposeProtectedScreens]
+ * - Acts as a safety gate - [ComposeRenderer.onPreDispose] will skip this screen while it's tracked here
+ *
+ * When this screen leaves composition:
+ * - Removes protection by removing it from [preDisposeProtectedScreens]
+ * - Triggers pre-disposal lifecycle callback via [LocalPreDispose]
+ *
+ * @see ComposeRenderer.onPreDispose for the pre-disposal logic that respects this protection
+ */
 @Composable
-private inline fun Screen.AfterScreenContent() {
-    val onPreDispose = LocalAfterScreenContentOnDispose.current
+internal inline fun Screen.SetupPreDispose() {
+    val onPreDispose = LocalPreDispose.current
     DisposableEffect(this) {
-        displayingScreensAfterScreenContent[this@AfterScreenContent] = Unit
+        devLogV(TAG) { "SetupLifecycleDisposal DisposableEffect" }
+        preDisposeProtectedScreens[this@SetupPreDispose] = Unit
         onDispose {
-            displayingScreensAfterScreenContent -= this@AfterScreenContent
-//            Log.d("LifecycleDebug", "AfterScreenContent $screenKey onDispose")
+            devLogV(TAG) { "SetupLifecycleDisposal DisposableEffect.onDispose" }
+            preDisposeProtectedScreens -= this@SetupPreDispose
             onPreDispose()
         }
     }
@@ -118,12 +147,6 @@ internal class ComposeRenderer<State : NavigationState>(
     private val containerScreen: ContainerScreen<*, *>,
 ) : NavigationRenderer<State> {
 
-    /**
-     * A channel that is used to notify about completing of screen transition, so we can dispose
-     * screen that is removed out of the backstack properly.
-     */
-    val transitionCompleteChannel: Channel<Unit> = Channel(Channel.UNLIMITED)
-
     private var lastState: State? = null
     var state: State? by mutableStateOf(null, neverEqualPolicy())
         private set
@@ -152,7 +175,7 @@ internal class ComposeRenderer<State : NavigationState>(
     ) {
         val stateHolder: SaveableStateHolder = LocalSaveableStateHolder.currentOrThrow
 
-        val beforeScreenContentOnDispose = remember {
+        val clearScreens = remember(stateHolder) {
             {
                 clearScreens(stateHolder)
             }
@@ -160,7 +183,7 @@ internal class ComposeRenderer<State : NavigationState>(
 
         // pre dispose means that we can send ON_DISPOSE if screen is removing,
         // to let Screen.Content to handle ON_DISPOSE by using functions like DisposableEffect
-        val afterScreenContentOnDispose = remember {
+        val preDispose = remember {
             {
                 onPreDispose()
             }
@@ -168,8 +191,8 @@ internal class ComposeRenderer<State : NavigationState>(
 
         CompositionLocalProvider(
             LocalContainerScreen provides containerScreen,
-            LocalBeforeScreenContentOnDispose provides beforeScreenContentOnDispose,
-            LocalAfterScreenContentOnDispose provides afterScreenContentOnDispose,
+            LocalClearScreens provides clearScreens,
+            LocalPreDispose provides preDispose,
             *provideCompositionLocal
         ) {
             ComposeRendererScope(lastState, state, screen).content(modifier)
@@ -191,7 +214,7 @@ internal class ComposeRenderer<State : NavigationState>(
         }
         // There can be several transition of different screens on the screen,
         // so it is important properly clear screens that are not visible for user.
-        val safeToRemove = removedScreens.filter { it !in displayingScreensBeforeScreenContent }
+        val safeToRemove = removedScreens.filter { it !in cleanupProtectedScreens }
         safeToRemove.clearStates(stateHolder)
         if (removedScreens.isNotEmpty()) {
             safeToRemove.forEach {
@@ -201,7 +224,7 @@ internal class ComposeRenderer<State : NavigationState>(
     }
 
     /**
-     * Called onPreDispose for removed screens, that are not presented in [displayingScreensAfterScreenContent] (not displayed on screen).
+     * Called onPreDispose for removed screens, that are not presented in [preDisposeProtectedScreens] (not displayed on screen).
      * @param clearAll - forces to call onPreDispose on all children screen states that renderer holds (removed and "displayed")
      */
     private fun onPreDispose(clearAll: Boolean = false) {
@@ -214,14 +237,14 @@ internal class ComposeRenderer<State : NavigationState>(
         }
         // There can be several transition of different screens on the screen,
         // so it is important properly clear screens that are not visible for user.
-        val safeToRemove = removedScreens.filter { it !in displayingScreensAfterScreenContent }
+        val safeToRemove = removedScreens.filter { it !in preDisposeProtectedScreens }
         safeToRemove.onPreDispose()
     }
 
     private fun Screen.clearState(stateHolder: SaveableStateHolder) {
         // It's important to do this check for debug purpose, because we must guaranty that Screen is cleaned only if it is not displaying anymore.
         // But it seems like it is not working with movable content, so this one is going to be triggered.
-        if (this in displayingScreensBeforeScreenContent) {
+        if (this in cleanupProtectedScreens) {
             ModoDevOptions.onIllegalClearState.validationFailed(
                 IllegalStateException(
                     "Trying to remove clean state of the screen $this, why this screen still is visible for User."
@@ -229,18 +252,20 @@ internal class ComposeRenderer<State : NavigationState>(
             )
         }
         ScreenModelStore.remove(this)
-        stateHolder.removeState(screenKey)
+        stateHolder.removeState(saveableStateKey)
+
+        ModoDevOptions.onScreenDisposeListener?.invoke(this)
         // clear nested screens using recursion
         ((this as? ContainerScreen<*, *>)?.renderer as? ComposeRenderer<*>)?.clearScreens(stateHolder, clearAll = true)
     }
 
     // need for correct handling lifecycle
     private fun Screen.onPreDispose() {
-//        Log.d("LifecycleDebug", "afterScreenContentOnDispose $screenKey")
+        devLogI(TAG) { "onPreDispose $screenKey" }
         dependenciesSortedByRemovePriority()
             .filterIsInstance<LifecycleDependency>()
             .forEach { it.onPreDispose() }
-        // send afterScreenContentOnDispose to nested screens
+        // send onPreDispose to nested screens
         ((this as? ContainerScreen<*, *>)?.renderer as? ComposeRenderer<*>)?.onPreDispose(clearAll = true)
     }
 
diff --git a/modo-compose/src/main/java/com/github/terrakok/modo/ModoDevOptions.kt b/modo-compose/src/main/java/com/github/terrakok/modo/ModoDevOptions.kt
index 66ca74db..79a78cbc 100644
--- a/modo-compose/src/main/java/com/github/terrakok/modo/ModoDevOptions.kt
+++ b/modo-compose/src/main/java/com/github/terrakok/modo/ModoDevOptions.kt
@@ -13,7 +13,10 @@ object ModoDevOptions {
         Log.e("Modo", "Modo internal error", throwable)
     }
 
-    internal const val REPORT_ISSUE_URL = "You can report issue here https://github.com/terrakok/Modo/issues"
+    var onScreenDisposeListener: ((Screen) -> Unit)? = null
+    var onScreenPreDisposeListener: ((Screen) -> Unit)? = null
+
+    internal const val REPORT_ISSUE_URL = "https://github.com/ikarenkov/Modo/issues"
 
     fun interface ValidationFailedStrategy {
         fun validationFailed(throwable: Throwable)
diff --git a/modo-compose/src/main/java/com/github/terrakok/modo/android/ModoScreenAndroidAdapter.kt b/modo-compose/src/main/java/com/github/terrakok/modo/android/ModoScreenAndroidAdapter.kt
index 14c576e0..1fc863b4 100644
--- a/modo-compose/src/main/java/com/github/terrakok/modo/android/ModoScreenAndroidAdapter.kt
+++ b/modo-compose/src/main/java/com/github/terrakok/modo/android/ModoScreenAndroidAdapter.kt
@@ -7,15 +7,12 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocal
 import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.DisposableEffect
-import androidx.compose.runtime.ProvidedValue
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.platform.LocalLifecycleOwner
-import androidx.compose.ui.platform.LocalSavedStateRegistryOwner
 import androidx.lifecycle.HasDefaultViewModelProviderFactory
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.Lifecycle.Event.ON_CREATE
@@ -34,6 +31,7 @@ import androidx.lifecycle.VIEW_MODEL_STORE_OWNER_KEY
 import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.ViewModelStore
 import androidx.lifecycle.ViewModelStoreOwner
+import androidx.lifecycle.compose.LocalLifecycleOwner
 import androidx.lifecycle.enableSavedStateHandles
 import androidx.lifecycle.viewmodel.CreationExtras
 import androidx.lifecycle.viewmodel.MutableCreationExtras
@@ -41,8 +39,15 @@ import androidx.lifecycle.viewmodel.compose.LocalViewModelStoreOwner
 import androidx.savedstate.SavedStateRegistry
 import androidx.savedstate.SavedStateRegistryController
 import androidx.savedstate.SavedStateRegistryOwner
+import androidx.savedstate.compose.LocalSavedStateRegistryOwner
+import com.github.terrakok.modo.ModoDevOptions
 import com.github.terrakok.modo.Screen
+import com.github.terrakok.modo.SetupPreDispose
+import com.github.terrakok.modo.android.ModoScreenAndroidAdapter.Companion.needPropagateLifecycleEventFromParent
 import com.github.terrakok.modo.lifecycle.LifecycleDependency
+import com.github.terrakok.modo.logs.devLogD
+import com.github.terrakok.modo.logs.devLogI
+import com.github.terrakok.modo.logs.devLogV
 import com.github.terrakok.modo.model.ScreenModelStore
 import com.github.terrakok.modo.model.ScreenModelStore.remove
 import com.github.terrakok.modo.util.getActivity
@@ -120,10 +125,9 @@ class ModoScreenAndroidAdapter private constructor(
         val context: Context = LocalContext.current
         val parentLifecycleOwner = LocalLifecycleOwner.current
         LifecycleDisposableEffect(context, parentLifecycleOwner, manualResumePause) {
-            @Suppress("SpreadOperator")
-            CompositionLocalProvider(*getProviders()) {
-                content()
-            }
+            DisposableAtomicReference(LocalContext, atomicContext)
+            DisposableAtomicReference(LocalLifecycleOwner, atomicParentLifecycleOwner)
+            ProvideCompositionLocals(content)
         }
     }
 
@@ -133,16 +137,18 @@ class ModoScreenAndroidAdapter private constructor(
      * F.e. to be able to collect ON_DISPOSE lifecycle event.
      */
     override fun onPreDispose() {
-//        Log.d("LifecycleDebug", "${screen.screenKey} ModoScreenAndroidAdapter.onPreDispose, emit ON_DESTROY event.")
+        ModoDevOptions.onScreenPreDisposeListener?.invoke(screen)
         safeHandleLifecycleEvent(ON_DESTROY)
     }
 
     override fun hideTransitionStarted() {
+        screen.devLogD(TAG) { "hideTransitionStarted ${lifecycle.currentState}" }
         screenTransitionState = ScreenTransitionState.HIDING
         safeHandleLifecycleEvent(ON_PAUSE)
     }
 
     override fun showTransitionFinished() {
+        screen.devLogD(TAG) { "showTransitionFinished ${lifecycle.currentState}" }
         screenTransitionState = ScreenTransitionState.SHOWN
         val parentState = atomicParentLifecycleOwner.get()?.lifecycle?.currentState
         // It's crucial to check parent state, because our state can't be greater than a parent state.
@@ -155,9 +161,8 @@ class ModoScreenAndroidAdapter private constructor(
 
     override fun toString(): String = "${ModoScreenAndroidAdapter::class.simpleName}, screenKey: ${screen.screenKey}"
 
-    @Suppress("UnusedParameter")
     private fun onDispose() {
-//        Log.d("LifecycleDebug", "${screen.screenKey} ModoScreenAndroidAdapter.onDispose. Clear ViewModelStore.")
+        screen.devLogI(TAG) { "onDispose. Clear ViewModelStore." }
         viewModelStore.clear()
     }
 
@@ -172,18 +177,24 @@ class ModoScreenAndroidAdapter private constructor(
         controller.performSave(outState)
     }
 
+    /**
+     * Provides essential Android Lifecycle and ViewModel composition locals for the screen:
+     * - [LocalLifecycleOwner]
+     * - [LocalViewModelStoreOwner]
+     * - [LocalSavedStateRegistryOwner]
+     *
+     * This enables Jetpack Compose features that depend on these locals to work properly within the screen's scope.
+     *
+     * @param content The composable content that will have access to these composition locals
+     */
     @Composable
-    private fun getProviders(): Array<ProvidedValue<*>> {
-        DisposableAtomicReference(LocalContext, atomicContext)
-        DisposableAtomicReference(LocalLifecycleOwner, atomicParentLifecycleOwner)
-
-        return remember(this) {
-            arrayOf(
-                LocalLifecycleOwner provides this,
-                LocalViewModelStoreOwner provides this,
-                LocalSavedStateRegistryOwner provides this
-            )
-        }
+    internal fun ProvideCompositionLocals(content: @Composable () -> Unit) {
+        CompositionLocalProvider(
+            LocalLifecycleOwner provides this,
+            LocalViewModelStoreOwner provides this,
+            LocalSavedStateRegistryOwner provides this,
+            content = content
+        )
     }
 
     /**
@@ -244,7 +255,11 @@ class ModoScreenAndroidAdapter private constructor(
 
         content()
 
+        screen.SetupPreDispose()
+
         DisposableEffect(this) {
+            screen.devLogV(TAG) { "LifecycleDisposableEffect parentLifecycleOwner: $parentLifecycleOwner" }
+
             val unregisterLifecycle = registerParentLifecycleListener(parentLifecycleOwner) {
                 LifecycleEventObserver { _, event ->
                     // when the Application goes to background, perform save
@@ -265,7 +280,7 @@ class ModoScreenAndroidAdapter private constructor(
             }
 
             onDispose {
-//                Log.d("LifecycleDebug", "ModoScreenAndroidAdapter registerParentLifecycleListener onDispose ${screen.screenKey}")
+                screen.devLogD(TAG) { "LifecycleDisposableEffect after content DisposableEffect.onDispose ${lifecycle.currentState}" }
                 unregisterLifecycle()
                 // when the screen goes to stack, perform save
                 performSave(savedState)
@@ -281,14 +296,14 @@ class ModoScreenAndroidAdapter private constructor(
     private fun safeHandleLifecycleEvent(event: Lifecycle.Event) {
         val skippEvent = needSkipEvent(lifecycle.currentState, event)
         if (!skippEvent) {
-//            Log.d("ModoScreenAndroidAdapter", "${screen.screenKey} handleLifecycleEvent $event")
+            screen.devLogD(TAG) { "safeHandleLifecycleEvent send $event" }
             screenTransitionState = when {
                 // Whenever we receive ON_RESUME event, we need to move screen to SHOWN state to indicate that there is no transition of this screen.
-                event == Lifecycle.Event.ON_RESUME -> ScreenTransitionState.SHOWN
+                event == ON_RESUME -> ScreenTransitionState.SHOWN
                 // Whe need to check transition state to distinguish between
                 // 1. finishing screen hiding transition. In this case, we need to move screen to hidden state.
                 // 2. hiding screen, because of lifecycle event. In this case we don't need to change animation state.
-                event == Lifecycle.Event.ON_STOP && screenTransitionState == ScreenTransitionState.HIDING -> ScreenTransitionState.HIDDEN
+                event == ON_STOP && screenTransitionState == ScreenTransitionState.HIDING -> ScreenTransitionState.HIDDEN
                 // Pause by itself doesn't mean that screen is hidden, it can be visible, but not active. F.e. when system dialog is shown.
                 else -> screenTransitionState
             }
@@ -321,6 +336,8 @@ class ModoScreenAndroidAdapter private constructor(
             ON_DESTROY
         )
 
+        private val TAG = ModoScreenAndroidAdapter::class.simpleName
+
         /**
          * Creates delegate for integration with android for the given [screen] or returns existed from cache.
          */
@@ -332,6 +349,13 @@ class ModoScreenAndroidAdapter private constructor(
                 onDispose = { it.onDispose() },
             ) { ModoScreenAndroidAdapter(screen) }
 
+        @JvmStatic
+        fun getOrNull(screen: Screen): ModoScreenAndroidAdapter? =
+            ScreenModelStore.getDependencyOrNull(
+                screen = screen,
+                name = LifecycleDependency.KEY,
+            )
+
         @JvmStatic
         private fun needPropagateLifecycleEventFromParent(
             event: Lifecycle.Event,
diff --git a/modo-compose/src/main/java/com/github/terrakok/modo/animation/ScreenTransitions.kt b/modo-compose/src/main/java/com/github/terrakok/modo/animation/ScreenTransitions.kt
index 43671404..a362d405 100644
--- a/modo-compose/src/main/java/com/github/terrakok/modo/animation/ScreenTransitions.kt
+++ b/modo-compose/src/main/java/com/github/terrakok/modo/animation/ScreenTransitions.kt
@@ -19,8 +19,8 @@ import com.github.terrakok.modo.SaveableContent
 import com.github.terrakok.modo.Screen
 import com.github.terrakok.modo.model.lifecycleDependency
 
-val displayingScreensBeforeScreenContent = mutableStateMapOf<Screen, Unit>()
-val displayingScreensAfterScreenContent = mutableStateMapOf<Screen, Unit>()
+val cleanupProtectedScreens = mutableStateMapOf<Screen, Unit>()
+val preDisposeProtectedScreens = mutableStateMapOf<Screen, Unit>()
 
 typealias ScreenTransitionContent = @Composable AnimatedVisibilityScope.(Screen) -> Unit
 
@@ -66,12 +66,10 @@ fun ComposeRendererScope<*>.ScreenTransition(
 //            )
             if (screen == transition.currentState && screen != transition.targetState) {
                 // Start of animation that hides this screen, so we should pause lifecycle
-//                Log.d("LifecycleDebug", "${screen.screenKey}: ON_PAUSE!")
                 screen.lifecycleDependency()?.hideTransitionStarted()
             }
             if (transition.currentState == transition.targetState && screen == transition.currentState) {
                 // Finish of animation that shows this screen, so we should resume lifecycle
-//                Log.d("LifecycleDebug", "${screen.screenKey}: ON_RESUME!")
                 screen.lifecycleDependency()?.showTransitionFinished()
             }
             onDispose { }
diff --git a/modo-compose/src/main/java/com/github/terrakok/modo/lifecycle/LifecycleDependency.kt b/modo-compose/src/main/java/com/github/terrakok/modo/lifecycle/LifecycleDependency.kt
index 1b3584ba..e7c02e00 100644
--- a/modo-compose/src/main/java/com/github/terrakok/modo/lifecycle/LifecycleDependency.kt
+++ b/modo-compose/src/main/java/com/github/terrakok/modo/lifecycle/LifecycleDependency.kt
@@ -3,20 +3,20 @@ package com.github.terrakok.modo.lifecycle
 import com.github.terrakok.modo.Screen
 
 /**
- * Interface for lifecycle dependent objects, on witch we want to call [onPreDispose] just before actual removal of dependency and screen,
+ * Interface for lifecycle-dependent objects, on witch we want to call [onPreDispose] just before actual removal of dependency and screen,
  * to be able to send ON_DISPOSE event and collect it in [Screen.Content].
  */
 interface LifecycleDependency {
 
     /**
-     * Should be called when associated screen is ready to be moved to ON_RESUME state.
-     * F.e. when screen appearance animation is finished and screen is fully visible.
+     * Should be called when the associated screen is ready to be moved to ON_RESUME state.
+     * F.e. when screen appearance animation is finished and the screen is fully visible.
      */
     fun showTransitionFinished()
 
     /**
-     * Should be called when associated screen is ready to be moved to ON_PAUSE state.
-     * F.e. when screen hide animation is started and screen is not fully visible.
+     * Should be called when the associated screen is ready to be moved to ON_PAUSE state.
+     * F.e. when screen hide animation is started and the screen is not fully visible.
      */
     fun hideTransitionStarted()
 
diff --git a/modo-compose/src/main/java/com/github/terrakok/modo/lifecycle/ScreenEffects.kt b/modo-compose/src/main/java/com/github/terrakok/modo/lifecycle/ScreenEffects.kt
index ed6f4b3f..93e61e9f 100644
--- a/modo-compose/src/main/java/com/github/terrakok/modo/lifecycle/ScreenEffects.kt
+++ b/modo-compose/src/main/java/com/github/terrakok/modo/lifecycle/ScreenEffects.kt
@@ -9,8 +9,8 @@ import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.rememberUpdatedState
 import androidx.compose.runtime.saveable.rememberSaveable
-import androidx.compose.ui.platform.LocalLifecycleOwner
 import androidx.lifecycle.LifecycleObserver
+import androidx.lifecycle.compose.LocalLifecycleOwner
 import com.github.terrakok.modo.ExperimentalModoApi
 import com.github.terrakok.modo.Screen
 import com.github.terrakok.modo.model.DependencyKey
diff --git a/modo-compose/src/main/java/com/github/terrakok/modo/logs/LoggingUtils.kt b/modo-compose/src/main/java/com/github/terrakok/modo/logs/LoggingUtils.kt
new file mode 100644
index 00000000..1f25b0a0
--- /dev/null
+++ b/modo-compose/src/main/java/com/github/terrakok/modo/logs/LoggingUtils.kt
@@ -0,0 +1,15 @@
+package com.github.terrakok.modo.logs
+
+import com.github.terrakok.modo.Screen
+
+internal inline fun Screen.devLogV(tag: String? = "ModoDevLogs", crossinline message: () -> String) {
+    DevLog.v(tag) { "${this::class.simpleName} $screenKey ${message()}" }
+}
+
+internal inline fun Screen.devLogD(tag: String? = "ModoDevLogs", crossinline message: () -> String) {
+    DevLog.d(tag) { "${this::class.simpleName} $screenKey ${message()}" }
+}
+
+internal inline fun Screen.devLogI(tag: String? = "ModoDevLogs", crossinline message: () -> String) {
+    DevLog.i(tag) { "${this::class.simpleName} $screenKey ${message()}" }
+}
\ No newline at end of file
diff --git a/modo-compose/src/main/java/com/github/terrakok/modo/model/ScreenModelStore.kt b/modo-compose/src/main/java/com/github/terrakok/modo/model/ScreenModelStore.kt
index 264ebf85..0faff714 100644
--- a/modo-compose/src/main/java/com/github/terrakok/modo/model/ScreenModelStore.kt
+++ b/modo-compose/src/main/java/com/github/terrakok/modo/model/ScreenModelStore.kt
@@ -195,7 +195,7 @@ object ScreenModelStore {
     }
 
     /**
-     * If screen is already removed, and we don't have value in map means,
+     * If the screen is already removed, and we don't have value in the map means
      * that we are going initialize value for removed screen and the error must be reported.
      */
     private fun assertGetOrPutCorrect(isScreenRemoved: Boolean, hasScreenAssociatedValue: Boolean, screenKey: ScreenKey, screen: Screen?) {
diff --git a/modo-compose/src/main/java/com/github/terrakok/modo/stack/StackScreen.kt b/modo-compose/src/main/java/com/github/terrakok/modo/stack/StackScreen.kt
index aff53f38..a7d62092 100644
--- a/modo-compose/src/main/java/com/github/terrakok/modo/stack/StackScreen.kt
+++ b/modo-compose/src/main/java/com/github/terrakok/modo/stack/StackScreen.kt
@@ -225,8 +225,8 @@ data class DialogPlaceHolder(
     @Composable
     override fun Content(modifier: Modifier) {
         Box(
-            // ignore modifier, because it is just invisible placeholder
-            modifier
+            // Make it fill the screen to animate dialog transitions properly.
+            modifier.fillMaxSize()
         )
     }
 
diff --git a/modo-compose/src/release/kotlin/com/github/terrakok/modo/logs/DevLog.kt b/modo-compose/src/release/kotlin/com/github/terrakok/modo/logs/DevLog.kt
new file mode 100644
index 00000000..a41aebd3
--- /dev/null
+++ b/modo-compose/src/release/kotlin/com/github/terrakok/modo/logs/DevLog.kt
@@ -0,0 +1,16 @@
+package com.github.terrakok.modo.logs
+
+@Suppress("UnusedParameter")
+internal object DevLog {
+
+    inline fun v(tag: String? = null, message: () -> String) = Unit
+
+    inline fun d(tag: String? = null, message: () -> String) = Unit
+
+    inline fun i(tag: String? = null, message: () -> String) = Unit
+
+    inline fun w(tag: String? = null, message: () -> String) = Unit
+
+    inline fun e(tag: String? = null, message: () -> String) = Unit
+
+}
\ No newline at end of file
diff --git a/sample/build.gradle.kts b/sample/build.gradle.kts
index f5ce4aa8..e84e0cfc 100644
--- a/sample/build.gradle.kts
+++ b/sample/build.gradle.kts
@@ -33,6 +33,7 @@ dependencies {
 
     implementation(libs.androidx.compose.material)
     implementation(libs.androidx.compose.material3)
+    implementation(libs.androidx.compose.material.icons)
 
     implementation(libs.debug.logcat)
     implementation(libs.kotlinx.coroutines.android)
diff --git a/sample/src/main/java/com/github/terrakok/modo/sample/ModoSampleApplication.kt b/sample/src/main/java/com/github/terrakok/modo/sample/ModoSampleApplication.kt
index 5a91a4a3..0feb531b 100644
--- a/sample/src/main/java/com/github/terrakok/modo/sample/ModoSampleApplication.kt
+++ b/sample/src/main/java/com/github/terrakok/modo/sample/ModoSampleApplication.kt
@@ -2,9 +2,9 @@ package com.github.terrakok.modo.sample
 
 import android.app.Application
 import com.github.terrakok.modo.ModoDevOptions
+import com.github.terrakok.modo.sample.logs.logcat
 import logcat.AndroidLogcatLogger
 import logcat.LogPriority
-import logcat.logcat
 
 class ModoSampleApplication : Application() {
 
@@ -15,7 +15,13 @@ class ModoSampleApplication : Application() {
             throw throwable
         }
         ModoDevOptions.onIllegalClearState = ModoDevOptions.ValidationFailedStrategy { throwable ->
-            logcat(priority = LogPriority.ERROR) { "Cleaning state of composable, which still can be visible for user." }
+            throw throwable
+        }
+        ModoDevOptions.onScreenDisposeListener = {
+            it.logcat { "Screen disposed" }
+        }
+        ModoDevOptions.onScreenPreDisposeListener = {
+            it.logcat { "Screen preDisposed" }
         }
     }
 }
\ No newline at end of file
diff --git a/sample/src/main/java/com/github/terrakok/modo/sample/components/BackButton.kt b/sample/src/main/java/com/github/terrakok/modo/sample/components/BackButton.kt
new file mode 100644
index 00000000..7ec797eb
--- /dev/null
+++ b/sample/src/main/java/com/github/terrakok/modo/sample/components/BackButton.kt
@@ -0,0 +1,36 @@
+package com.github.terrakok.modo.sample.components
+
+import androidx.compose.material.Icon
+import androidx.compose.material.IconButton
+import androidx.compose.material.MaterialTheme
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.filled.ArrowBack
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.vector.rememberVectorPainter
+import androidx.compose.ui.tooling.preview.Preview
+
+@Composable
+fun BackButton(
+    onClick: () -> Unit,
+    modifier: Modifier = Modifier,
+    contentDescription: String = "Back to previous screen",
+) {
+    IconButton(
+        modifier = modifier,
+        onClick = onClick
+    ) {
+        Icon(
+            painter = rememberVectorPainter(image = Icons.AutoMirrored.Filled.ArrowBack),
+            contentDescription = contentDescription
+        )
+    }
+}
+
+@Preview
+@Composable
+private fun Preview() {
+    MaterialTheme {
+        BackButton(onClick = {}, contentDescription = "cancel")
+    }
+}
\ No newline at end of file
diff --git a/sample/src/main/java/com/github/terrakok/modo/sample/logs/LogcatUtils.kt b/sample/src/main/java/com/github/terrakok/modo/sample/logs/LogcatUtils.kt
new file mode 100644
index 00000000..83a19a6e
--- /dev/null
+++ b/sample/src/main/java/com/github/terrakok/modo/sample/logs/LogcatUtils.kt
@@ -0,0 +1,8 @@
+package com.github.terrakok.modo.sample.logs
+
+import com.github.terrakok.modo.Screen
+import logcat.logcat
+
+internal inline fun Screen.logcat(tag: String? = null, crossinline message: () -> String) {
+    logcat(tag = tag) { "${this::class.simpleName} $screenKey ${message()}" }
+}
\ No newline at end of file
diff --git a/sample/src/main/java/com/github/terrakok/modo/sample/screens/base/ButtonsScreenContent.kt b/sample/src/main/java/com/github/terrakok/modo/sample/screens/base/ButtonsScreenContent.kt
index 56034c26..267c45e1 100644
--- a/sample/src/main/java/com/github/terrakok/modo/sample/screens/base/ButtonsScreenContent.kt
+++ b/sample/src/main/java/com/github/terrakok/modo/sample/screens/base/ButtonsScreenContent.kt
@@ -3,6 +3,7 @@ package com.github.terrakok.modo.sample.screens.base
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.ColumnScope
+import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxSize
@@ -20,7 +21,9 @@ import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableIntStateOf
 import androidx.compose.runtime.saveable.rememberSaveable
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalInspectionMode
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
@@ -30,11 +33,14 @@ import com.github.terrakok.modo.ExperimentalModoApi
 import com.github.terrakok.modo.Screen
 import com.github.terrakok.modo.ScreenKey
 import com.github.terrakok.modo.sample.SampleAppConfig
+import com.github.terrakok.modo.sample.components.BackButton
 import com.github.terrakok.modo.sample.randomBackground
 import com.github.terrakok.modo.sample.screens.ButtonsState
 import com.github.terrakok.modo.sample.screens.GroupedButtonsList
 import com.github.terrakok.modo.sample.screens.GroupedButtonsState
 import com.github.terrakok.modo.sample.screens.ModoButtonSpec
+import com.github.terrakok.modo.stack.LocalStackNavigation
+import com.github.terrakok.modo.stack.back
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.isActive
 import logcat.logcat
@@ -105,18 +111,18 @@ internal fun Screen.SampleScreenContent(
 
 @OptIn(ExperimentalModoApi::class)
 @Composable
-fun Screen.LogLifecycle() {
+fun Screen.LogLifecycle(prefix: String = this::class.simpleName.orEmpty()) {
     val lifecycleOwner = LocalLifecycleOwner.current
 
     // You will not be able to observe updates of lifecycleOwner when this content is not in the composition
     DisposableEffect(lifecycleOwner) {
-        logcat(tag = "LifecycleDebug") { "$screenKey DisposableEffect" }
+        logcat(tag = "LifecycleDebug") { "$prefix $screenKey DisposableEffect".trim() }
         val observer = LifecycleEventObserver { _, event ->
-            logcat(tag = "LifecycleDebug") { "$screenKey DisposableEffect $event" }
+            logcat(tag = "LifecycleDebug") { "$prefix $screenKey DisposableEffect $event".trim() }
         }
         lifecycleOwner.lifecycle.addObserver(observer)
         onDispose {
-            logcat(tag = "LifecycleDebug") { "$screenKey DisposableEffect onDispose" }
+            logcat(tag = "LifecycleDebug") { "$prefix $screenKey DisposableEffect onDispose" }
             lifecycleOwner.lifecycle.removeObserver(observer)
         }
     }
@@ -139,13 +145,20 @@ internal fun SampleScreenContent(
     Box(
         modifier = modifier
             .randomBackground()
-            .windowInsetsPadding(WindowInsets.systemBars)
-            .padding(8.dp),
+            .windowInsetsPadding(WindowInsets.systemBars),
     ) {
-        Column {
-            Text(
-                text = counter.toString()
-            )
+        Column(Modifier.padding(8.dp)) {
+            Row(
+                verticalAlignment = Alignment.CenterVertically
+            ) {
+                val stackNavigation = if (LocalInspectionMode.current) null else LocalStackNavigation.current
+                BackButton(
+                    onClick = { stackNavigation?.back() },
+                )
+                Text(
+                    text = counter.toString()
+                )
+            }
             Text(
                 text = "$screenName $screenIndex",
                 style = MaterialTheme.typography.h5,
diff --git a/sample/src/main/java/com/github/terrakok/modo/sample/screens/base/LifecycleEventsHistory.kt b/sample/src/main/java/com/github/terrakok/modo/sample/screens/base/LifecycleEventsHistory.kt
index 0f283a68..044bd97c 100644
--- a/sample/src/main/java/com/github/terrakok/modo/sample/screens/base/LifecycleEventsHistory.kt
+++ b/sample/src/main/java/com/github/terrakok/modo/sample/screens/base/LifecycleEventsHistory.kt
@@ -21,6 +21,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.input.pointer.pointerInput
 import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalInspectionMode
 import androidx.compose.ui.unit.TextUnit
 import androidx.compose.ui.unit.sp
 import androidx.lifecycle.Lifecycle
@@ -28,7 +29,6 @@ import androidx.lifecycle.LifecycleEventObserver
 import androidx.lifecycle.SavedStateHandle
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.compose.LocalLifecycleOwner
-import androidx.lifecycle.createSavedStateHandle
 import androidx.lifecycle.viewModelScope
 import androidx.lifecycle.viewmodel.compose.viewModel
 import com.github.terrakok.modo.sample.SampleAppConfig
@@ -40,13 +40,11 @@ fun LifecycleEventsHistory(
     modifier: Modifier = Modifier,
     key: String? = null,
     enabled: Boolean = SampleAppConfig.displayLifecycleEvents,
-    lifecycleEventsHistory: SnapshotStateList<Lifecycle.Event> =
-        viewModel(key = key) {
-            LifecycleEventsViewModel(createSavedStateHandle())
-        }.lifecycleEventsHistory,
+    lifecycleEventsHistory: SnapshotStateList<Lifecycle.Event>? = null,
     fontSize: TextUnit = 16.sp,
 ) {
-    if (enabled) {
+    if (enabled && !LocalInspectionMode.current) {
+        val lifecycleEventsHistory = lifecycleEventsHistory ?: viewModel<LifecycleEventsViewModel>(key = key).lifecycleEventsHistory
         val lifecycleOwner = LocalLifecycleOwner.current
         val context = LocalContext.current
 
diff --git a/sample/src/main/java/com/github/terrakok/modo/sample/screens/containers/SampleStack.kt b/sample/src/main/java/com/github/terrakok/modo/sample/screens/containers/SampleStack.kt
index ede78462..2b48e428 100644
--- a/sample/src/main/java/com/github/terrakok/modo/sample/screens/containers/SampleStack.kt
+++ b/sample/src/main/java/com/github/terrakok/modo/sample/screens/containers/SampleStack.kt
@@ -81,7 +81,7 @@ open class SampleStack(
         val isDialogPlaceHolder = remember(dialog) {
             dialog is DialogPlaceHolder
         }
-        val isBottomSheet = remember {
+        val isBottomSheet = remember(dialog) {
             dialog is SampleBottomSheet || dialog is SampleBottomSheetStack
         }
         val background by animateColorAsState(
diff --git a/sample/src/main/java/com/github/terrakok/modo/sample/screens/dialogs/DialogsPlayground.kt b/sample/src/main/java/com/github/terrakok/modo/sample/screens/dialogs/DialogsPlayground.kt
index 97482d29..890b660a 100644
--- a/sample/src/main/java/com/github/terrakok/modo/sample/screens/dialogs/DialogsPlayground.kt
+++ b/sample/src/main/java/com/github/terrakok/modo/sample/screens/dialogs/DialogsPlayground.kt
@@ -12,7 +12,6 @@ import com.github.terrakok.modo.sample.screens.GroupedButtonsState
 import com.github.terrakok.modo.sample.screens.MainScreen
 import com.github.terrakok.modo.sample.screens.ModoButtonSpec
 import com.github.terrakok.modo.sample.screens.base.ButtonsScreenContent
-import com.github.terrakok.modo.sample.screens.base.LogLifecycle
 import com.github.terrakok.modo.stack.LocalStackNavigation
 import com.github.terrakok.modo.stack.StackNavContainer
 import com.github.terrakok.modo.stack.forward
@@ -31,7 +30,6 @@ class DialogsPlayground(
 
 @Composable
 internal fun Screen.DialogsPlaygroundContent(screenIndex: Int, modifier: Modifier = Modifier) {
-    LogLifecycle()
     ButtonsScreenContent(
         screenIndex = screenIndex,
         screenName = "DialogsPlayground",
diff --git a/workshop-app/build.gradle.kts b/workshop-app/build.gradle.kts
index 68d68723..fc69aaa9 100644
--- a/workshop-app/build.gradle.kts
+++ b/workshop-app/build.gradle.kts
@@ -36,6 +36,7 @@ dependencies {
     implementation(libs.koin.compose)
 
     implementation(libs.androidx.compose.material3)
+    implementation(libs.androidx.compose.material.icons)
 
     implementation(libs.debug.logcat)
     implementation(libs.kotlinx.coroutines.android)