diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 3405c8ce1..a683e4f74 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,6 +1,6 @@
 [versions]
 accompanist = "0.36.0"
-agp = "8.7.0-beta02"
+agp = "8.7.0"
 androidx-activity = "1.10.0-alpha02"
 androidx-core = "1.15.0-beta01"
 androidx-sqlite = "2.5.0-alpha09"
@@ -214,7 +214,7 @@ kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotl
 kotlinx-immutable = "org.jetbrains.kotlinx:kotlinx-collections-immutable:0.3.8"
 kotlinx-serialization-core = { module = "org.jetbrains.kotlinx:kotlinx-serialization-core", version.ref = "kotlinx-serialization" }
 
-lints-compose = "com.slack.lint.compose:compose-lint-checks:1.3.1"
+lints-compose = "com.slack.lint.compose:compose-lint-checks:1.4.1"
 
 markdown = { module = "com.mikepenz:multiplatform-markdown-renderer-m3", version.ref = "markdown" }
 
diff --git a/libraries/base-ui/lint-baseline.xml b/libraries/base-ui/lint-baseline.xml
deleted file mode 100644
index 62b01a35b..000000000
--- a/libraries/base-ui/lint-baseline.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.7.0-alpha01" type="baseline" client="gradle" dependencies="false" name="AGP (8.7.0-alpha01)" variant="all" version="8.7.0-alpha01">
-
-    <issue
-        id="ComposeCompositionLocalUsage"
-        message="`CompositionLocal`s are implicit dependencies and creating new ones should be avoided. See https://slackhq.github.io/compose-lints/rules/#compositionlocals for more information."
-        errorLine1="private val LocalScaffoldContentPadding = staticCompositionLocalOf { PaddingValues(0.dp) }"
-        errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/kotlin/catchup/base/ui/NestedScaffold.kt"
-            line="30"
-            column="1"/>
-    </issue>
-
-    <issue
-        id="ComposeCompositionLocalUsage"
-        message="`CompositionLocal`s are implicit dependencies and creating new ones should be avoided. See https://slackhq.github.io/compose-lints/rules/#compositionlocals for more information."
-        errorLine1="/** CompositionLocal containing a [FabPlacement] that is used to calculate the FAB bottom offset. */"
-        errorLine2="^">
-        <location
-            file="src/main/kotlin/catchup/base/ui/NestedScaffold.kt"
-            line="222"
-            column="1"/>
-    </issue>
-
-</issues>
diff --git a/libraries/compose-extensions/lint-baseline.xml b/libraries/compose-extensions/lint-baseline.xml
index 49d677f87..0be0eccd6 100644
--- a/libraries/compose-extensions/lint-baseline.xml
+++ b/libraries/compose-extensions/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.4.0-alpha06" type="baseline" client="gradle" dependencies="false" name="AGP (8.4.0-alpha06)" variant="all" version="8.4.0-alpha06">
+<issues format="6" by="lint 8.7.0" type="baseline" client="gradle" dependencies="false" name="AGP (8.7.0)" variant="all" version="8.7.0">
 
     <issue
         id="ComposeModifierComposed"
@@ -12,48 +12,4 @@
             column="3"/>
     </issue>
 
-    <issue
-        id="ComposeCompositionLocalUsage"
-        message="`CompositionLocal`s are implicit dependencies and creating new ones should be avoided. See https://slackhq.github.io/compose-lints/rules/#compositionlocals for more information."
-        errorLine1="val LocalEnabled = compositionLocalOf { true }"
-        errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/kotlin/catchup/compose/DisableableContent.kt"
-            line="8"
-            column="1"/>
-    </issue>
-
-    <issue
-        id="ComposeCompositionLocalUsage"
-        message="`CompositionLocal`s are implicit dependencies and creating new ones should be avoided. See https://slackhq.github.io/compose-lints/rules/#compositionlocals for more information."
-        errorLine1="val LocalDisplayFeatures = staticCompositionLocalOf&lt;List&lt;DisplayFeature>> { emptyList() }"
-        errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/kotlin/catchup/compose/DisplayFeatures.kt"
-            line="6"
-            column="1"/>
-    </issue>
-
-    <issue
-        id="ComposeCompositionLocalUsage"
-        message="`CompositionLocal`s are implicit dependencies and creating new ones should be avoided. See https://slackhq.github.io/compose-lints/rules/#compositionlocals for more information."
-        errorLine1="val LocalDynamicTheme = compositionLocalOf { false }"
-        errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/kotlin/catchup/compose/DynamicTheme.kt"
-            line="9"
-            column="1"/>
-    </issue>
-
-    <issue
-        id="ComposeCompositionLocalUsage"
-        message="`CompositionLocal`s are implicit dependencies and creating new ones should be avoided. See https://slackhq.github.io/compose-lints/rules/#compositionlocals for more information."
-        errorLine1="/**"
-        errorLine2="^">
-        <location
-            file="src/main/kotlin/catchup/compose/ScrollToTop.kt"
-            line="32"
-            column="1"/>
-    </issue>
-
 </issues>
diff --git a/libraries/compose-extensions/src/main/kotlin/catchup/compose/WidthAwareContent.kt b/libraries/compose-extensions/src/main/kotlin/catchup/compose/WidthAwareContent.kt
index 0ba19a073..813cbf419 100644
--- a/libraries/compose-extensions/src/main/kotlin/catchup/compose/WidthAwareContent.kt
+++ b/libraries/compose-extensions/src/main/kotlin/catchup/compose/WidthAwareContent.kt
@@ -20,6 +20,7 @@ fun columnCount(minColumns: Int, minColumnWidth: Dp = 250.dp): Int {
   return (availableWidth / minWidthPx).toInt().coerceAtLeast(minColumns)
 }
 
+@Suppress("ComposeContentEmitterReturningValues")
 @Composable
 fun rememberAvailableWidth(): Float {
   var availableWidth by remember { mutableFloatStateOf(0f) }