diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 309328f8..4194fd59 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -31,7 +31,7 @@ jobs:
         uses: gradle/actions/wrapper-validation@v6
 
       - name: Setup JDK
-        uses: actions/setup-java@v5
+        uses: actions/setup-java@v6
         with:
           distribution: 'zulu'
           java-version: 21
@@ -56,7 +56,7 @@ jobs:
         uses: gradle/actions/wrapper-validation@v6
 
       - name: Setup JDK
-        uses: actions/setup-java@v5
+        uses: actions/setup-java@v6
         with:
           distribution: 'zulu'
           java-version: 21
@@ -87,7 +87,7 @@ jobs:
         uses: gradle/actions/wrapper-validation@v6
 
       - name: Setup JDK
-        uses: actions/setup-java@v5
+        uses: actions/setup-java@v6
         with:
           distribution: 'zulu'
           java-version: 21
@@ -120,7 +120,7 @@ jobs:
         uses: gradle/actions/wrapper-validation@v6
 
       - name: Setup JDK
-        uses: actions/setup-java@v5
+        uses: actions/setup-java@v6
         with:
           distribution: 'zulu'
           java-version: 21
@@ -151,7 +151,7 @@ jobs:
         uses: gradle/actions/wrapper-validation@v6
 
       - name: Setup JDK
-        uses: actions/setup-java@v5
+        uses: actions/setup-java@v6
         with:
           distribution: 'zulu'
           java-version: 21
@@ -180,7 +180,7 @@ jobs:
         uses: gradle/actions/wrapper-validation@v6
 
       - name: Setup JDK
-        uses: actions/setup-java@v5
+        uses: actions/setup-java@v6
         with:
           distribution: 'zulu'
           java-version: 21
@@ -222,7 +222,7 @@ jobs:
         uses: gradle/actions/wrapper-validation@v6
 
       - name: Setup JDK
-        uses: actions/setup-java@v5
+        uses: actions/setup-java@v6
         with:
           distribution: 'zulu'
           java-version: 21
@@ -286,7 +286,7 @@ jobs:
       - uses: actions/checkout@v7
 
       - name: Setup JDK
-        uses: actions/setup-java@v5
+        uses: actions/setup-java@v6
         with:
           distribution: 'zulu'
           java-version: 21
@@ -314,7 +314,7 @@ jobs:
       - uses: actions/checkout@v7
 
       - name: Setup JDK
-        uses: actions/setup-java@v5
+        uses: actions/setup-java@v6
         with:
           distribution: 'zulu'
           java-version: 21
diff --git a/.github/workflows/close-issues.yml b/.github/workflows/close-issues.yml
index 70157239..2af76fd3 100644
--- a/.github/workflows/close-issues.yml
+++ b/.github/workflows/close-issues.yml
@@ -13,7 +13,7 @@ jobs:
       pull-requests: write
 
     steps:
-      - uses: actions/stale@v10
+      - uses: actions/stale@v11
         with:
           days-before-issue-stale: 21
           days-before-issue-close: 7
diff --git a/.github/workflows/publish-docs.yml b/.github/workflows/publish-docs.yml
index 71cc7972..1824b7c5 100644
--- a/.github/workflows/publish-docs.yml
+++ b/.github/workflows/publish-docs.yml
@@ -51,7 +51,7 @@ jobs:
         run: pip install -r pip-requirements.txt
 
       - name: Setup Java
-        uses: actions/setup-java@v5
+        uses: actions/setup-java@v6
         with:
           distribution: 'zulu'
           java-version: '21'
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 069acbd4..58378a2c 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -21,7 +21,7 @@ jobs:
         uses: gradle/actions/wrapper-validation@v6
 
       - name: Setup JDK
-        uses: actions/setup-java@v5
+        uses: actions/setup-java@v6
         with:
           distribution: 'zulu'
           java-version: 21
@@ -50,7 +50,7 @@ jobs:
         uses: gradle/actions/wrapper-validation@v6
 
       - name: Setup JDK
-        uses: actions/setup-java@v5
+        uses: actions/setup-java@v6
         with:
           distribution: 'zulu'
           java-version: 21
@@ -78,7 +78,7 @@ jobs:
         uses: gradle/actions/wrapper-validation@v6
 
       - name: Setup JDK
-        uses: actions/setup-java@v5
+        uses: actions/setup-java@v6
         with:
           distribution: 'zulu'
           java-version: 21
@@ -104,7 +104,7 @@ jobs:
       - uses: actions/checkout@v7
 
       - name: Setup JDK
-        uses: actions/setup-java@v5
+        uses: actions/setup-java@v6
         with:
           distribution: 'zulu'
           java-version: 21
diff --git a/devview-analytics/api/api.txt b/devview-analytics/api/api.txt
index 307afac9..2e7c6fa7 100644
--- a/devview-analytics/api/api.txt
+++ b/devview-analytics/api/api.txt
@@ -70,8 +70,8 @@ package com.worldline.devview.analytics.model {
   @androidx.compose.runtime.Immutable public sealed exhaustive interface AnalyticsLogCategory {
     method @InaccessibleFromKotlin public String getDisplayName();
     method @InaccessibleFromKotlin public androidx.compose.ui.graphics.vector.ImageVector getIcon();
-    property public abstract androidx.compose.ui.graphics.Color containerColor;
-    property public abstract androidx.compose.ui.graphics.Color contentColor;
+    property @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public abstract androidx.compose.ui.graphics.Color containerColor;
+    property @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public abstract androidx.compose.ui.graphics.Color contentColor;
     property public abstract String displayName;
     property public abstract androidx.compose.ui.graphics.vector.ImageVector icon;
   }
@@ -79,8 +79,8 @@ package com.worldline.devview.analytics.model {
   public static sealed exhaustive interface AnalyticsLogCategory.Action extends com.worldline.devview.analytics.model.AnalyticsLogCategory {
     method @InaccessibleFromKotlin public default String getDisplayName();
     method @InaccessibleFromKotlin public default androidx.compose.ui.graphics.vector.ImageVector getIcon();
-    property public default androidx.compose.ui.graphics.Color containerColor;
-    property public default androidx.compose.ui.graphics.Color contentColor;
+    property @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public default androidx.compose.ui.graphics.Color containerColor;
+    property @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public default androidx.compose.ui.graphics.Color contentColor;
     property public default String displayName;
     property public default androidx.compose.ui.graphics.vector.ImageVector icon;
   }
@@ -138,8 +138,8 @@ package com.worldline.devview.analytics.model {
   public static sealed exhaustive interface AnalyticsLogCategory.Custom extends com.worldline.devview.analytics.model.AnalyticsLogCategory {
     method @InaccessibleFromKotlin public default String getDisplayName();
     method @InaccessibleFromKotlin public default androidx.compose.ui.graphics.vector.ImageVector getIcon();
-    property public default androidx.compose.ui.graphics.Color containerColor;
-    property public default androidx.compose.ui.graphics.Color contentColor;
+    property @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public default androidx.compose.ui.graphics.Color containerColor;
+    property @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public default androidx.compose.ui.graphics.Color contentColor;
     property public default String displayName;
     property public default androidx.compose.ui.graphics.vector.ImageVector icon;
   }
@@ -157,8 +157,8 @@ package com.worldline.devview.analytics.model {
   public static sealed exhaustive interface AnalyticsLogCategory.Diagnostic extends com.worldline.devview.analytics.model.AnalyticsLogCategory {
     method @InaccessibleFromKotlin public default String getDisplayName();
     method @InaccessibleFromKotlin public default androidx.compose.ui.graphics.vector.ImageVector getIcon();
-    property public default androidx.compose.ui.graphics.Color containerColor;
-    property public default androidx.compose.ui.graphics.Color contentColor;
+    property @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public default androidx.compose.ui.graphics.Color containerColor;
+    property @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public default androidx.compose.ui.graphics.Color contentColor;
     property public default String displayName;
     property public default androidx.compose.ui.graphics.vector.ImageVector icon;
   }
@@ -186,8 +186,8 @@ package com.worldline.devview.analytics.model {
   public static sealed exhaustive interface AnalyticsLogCategory.Ecommerce extends com.worldline.devview.analytics.model.AnalyticsLogCategory {
     method @InaccessibleFromKotlin public default String getDisplayName();
     method @InaccessibleFromKotlin public default androidx.compose.ui.graphics.vector.ImageVector getIcon();
-    property public default androidx.compose.ui.graphics.Color containerColor;
-    property public default androidx.compose.ui.graphics.Color contentColor;
+    property @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public default androidx.compose.ui.graphics.Color containerColor;
+    property @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public default androidx.compose.ui.graphics.Color contentColor;
     property public default String displayName;
     property public default androidx.compose.ui.graphics.vector.ImageVector icon;
   }
@@ -245,8 +245,8 @@ package com.worldline.devview.analytics.model {
   public static sealed exhaustive interface AnalyticsLogCategory.Feature extends com.worldline.devview.analytics.model.AnalyticsLogCategory {
     method @InaccessibleFromKotlin public default String getDisplayName();
     method @InaccessibleFromKotlin public default androidx.compose.ui.graphics.vector.ImageVector getIcon();
-    property public default androidx.compose.ui.graphics.Color containerColor;
-    property public default androidx.compose.ui.graphics.Color contentColor;
+    property @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public default androidx.compose.ui.graphics.Color containerColor;
+    property @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public default androidx.compose.ui.graphics.Color contentColor;
     property public default String displayName;
     property public default androidx.compose.ui.graphics.vector.ImageVector icon;
   }
@@ -284,8 +284,8 @@ package com.worldline.devview.analytics.model {
   public static sealed exhaustive interface AnalyticsLogCategory.Media extends com.worldline.devview.analytics.model.AnalyticsLogCategory {
     method @InaccessibleFromKotlin public default String getDisplayName();
     method @InaccessibleFromKotlin public default androidx.compose.ui.graphics.vector.ImageVector getIcon();
-    property public default androidx.compose.ui.graphics.Color containerColor;
-    property public default androidx.compose.ui.graphics.Color contentColor;
+    property @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public default androidx.compose.ui.graphics.Color containerColor;
+    property @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public default androidx.compose.ui.graphics.Color contentColor;
     property public default String displayName;
     property public default androidx.compose.ui.graphics.vector.ImageVector icon;
   }
@@ -333,8 +333,8 @@ package com.worldline.devview.analytics.model {
   public static sealed exhaustive interface AnalyticsLogCategory.Performance extends com.worldline.devview.analytics.model.AnalyticsLogCategory {
     method @InaccessibleFromKotlin public default String getDisplayName();
     method @InaccessibleFromKotlin public default androidx.compose.ui.graphics.vector.ImageVector getIcon();
-    property public default androidx.compose.ui.graphics.Color containerColor;
-    property public default androidx.compose.ui.graphics.Color contentColor;
+    property @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public default androidx.compose.ui.graphics.Color containerColor;
+    property @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public default androidx.compose.ui.graphics.Color contentColor;
     property public default String displayName;
     property public default androidx.compose.ui.graphics.vector.ImageVector icon;
   }
@@ -382,8 +382,8 @@ package com.worldline.devview.analytics.model {
   public static sealed exhaustive interface AnalyticsLogCategory.Screen extends com.worldline.devview.analytics.model.AnalyticsLogCategory {
     method @InaccessibleFromKotlin public default String getDisplayName();
     method @InaccessibleFromKotlin public default androidx.compose.ui.graphics.vector.ImageVector getIcon();
-    property public default androidx.compose.ui.graphics.Color containerColor;
-    property public default androidx.compose.ui.graphics.Color contentColor;
+    property @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public default androidx.compose.ui.graphics.Color containerColor;
+    property @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public default androidx.compose.ui.graphics.Color contentColor;
     property public default String displayName;
     property public default androidx.compose.ui.graphics.vector.ImageVector icon;
   }
@@ -401,8 +401,8 @@ package com.worldline.devview.analytics.model {
   public static sealed exhaustive interface AnalyticsLogCategory.Search extends com.worldline.devview.analytics.model.AnalyticsLogCategory {
     method @InaccessibleFromKotlin public default String getDisplayName();
     method @InaccessibleFromKotlin public default androidx.compose.ui.graphics.vector.ImageVector getIcon();
-    property public default androidx.compose.ui.graphics.Color containerColor;
-    property public default androidx.compose.ui.graphics.Color contentColor;
+    property @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public default androidx.compose.ui.graphics.Color containerColor;
+    property @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public default androidx.compose.ui.graphics.Color contentColor;
     property public default String displayName;
     property public default androidx.compose.ui.graphics.vector.ImageVector icon;
   }
@@ -430,8 +430,8 @@ package com.worldline.devview.analytics.model {
   public static sealed exhaustive interface AnalyticsLogCategory.Session extends com.worldline.devview.analytics.model.AnalyticsLogCategory {
     method @InaccessibleFromKotlin public default String getDisplayName();
     method @InaccessibleFromKotlin public default androidx.compose.ui.graphics.vector.ImageVector getIcon();
-    property public default androidx.compose.ui.graphics.Color containerColor;
-    property public default androidx.compose.ui.graphics.Color contentColor;
+    property @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public default androidx.compose.ui.graphics.Color containerColor;
+    property @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public default androidx.compose.ui.graphics.Color contentColor;
     property public default String displayName;
     property public default androidx.compose.ui.graphics.vector.ImageVector icon;
   }
@@ -479,8 +479,8 @@ package com.worldline.devview.analytics.model {
   public static sealed exhaustive interface AnalyticsLogCategory.Social extends com.worldline.devview.analytics.model.AnalyticsLogCategory {
     method @InaccessibleFromKotlin public default String getDisplayName();
     method @InaccessibleFromKotlin public default androidx.compose.ui.graphics.vector.ImageVector getIcon();
-    property public default androidx.compose.ui.graphics.Color containerColor;
-    property public default androidx.compose.ui.graphics.Color contentColor;
+    property @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public default androidx.compose.ui.graphics.Color containerColor;
+    property @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public default androidx.compose.ui.graphics.Color contentColor;
     property public default String displayName;
     property public default androidx.compose.ui.graphics.vector.ImageVector icon;
   }
@@ -535,8 +535,8 @@ package com.worldline.devview.analytics.model {
   @androidx.compose.runtime.Immutable public sealed exhaustive interface HighlightedAnalyticsLog {
     method @InaccessibleFromKotlin public int getCount();
     method @InaccessibleFromKotlin public androidx.compose.ui.graphics.vector.ImageVector getIcon();
-    property public abstract androidx.compose.ui.graphics.Color containerColor;
-    property public abstract androidx.compose.ui.graphics.Color contentColor;
+    property @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public abstract androidx.compose.ui.graphics.Color containerColor;
+    property @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public abstract androidx.compose.ui.graphics.Color contentColor;
     property public abstract int count;
     property public abstract androidx.compose.ui.graphics.vector.ImageVector icon;
   }
@@ -547,8 +547,8 @@ package com.worldline.devview.analytics.model {
     method public com.worldline.devview.analytics.model.HighlightedAnalyticsLog.Total copy(optional int count);
     method @InaccessibleFromKotlin public int getCount();
     method @InaccessibleFromKotlin public androidx.compose.ui.graphics.vector.ImageVector getIcon();
-    property public androidx.compose.ui.graphics.Color containerColor;
-    property public androidx.compose.ui.graphics.Color contentColor;
+    property @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public androidx.compose.ui.graphics.Color containerColor;
+    property @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public androidx.compose.ui.graphics.Color contentColor;
     property public int count;
     property public androidx.compose.ui.graphics.vector.ImageVector icon;
   }
@@ -561,8 +561,8 @@ package com.worldline.devview.analytics.model {
     method @InaccessibleFromKotlin public int getCount();
     method @InaccessibleFromKotlin public androidx.compose.ui.graphics.vector.ImageVector getIcon();
     method @InaccessibleFromKotlin public com.worldline.devview.analytics.model.AnalyticsLogType getType();
-    property public androidx.compose.ui.graphics.Color containerColor;
-    property public androidx.compose.ui.graphics.Color contentColor;
+    property @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public androidx.compose.ui.graphics.Color containerColor;
+    property @androidx.compose.runtime.Composable @androidx.compose.runtime.ReadOnlyComposable public androidx.compose.ui.graphics.Color contentColor;
     property public int count;
     property public androidx.compose.ui.graphics.vector.ImageVector icon;
     property public com.worldline.devview.analytics.model.AnalyticsLogType type;
diff --git a/devview-consolelogger/api/api.txt b/devview-consolelogger/api/api.txt
index 30f8bf06..968be867 100644
--- a/devview-consolelogger/api/api.txt
+++ b/devview-consolelogger/api/api.txt
@@ -47,7 +47,7 @@ package com.worldline.devview.consolelogger {
   }
 
   public final class DevViewLogWriter extends co.touchlab.kermit.LogWriter {
-    method public void log(co.touchlab.kermit.Severity severity, String message, String tag, Throwable? throwable);
+    method public void log(co.touchlab.kermit.Severity severity, String message, String tag, optional Throwable? throwable);
     field public static final com.worldline.devview.consolelogger.DevViewLogWriter INSTANCE;
   }
 
diff --git a/gradle/build-logic/convention/src/main/kotlin/MetalavaConventionPlugin.kt b/gradle/build-logic/convention/src/main/kotlin/MetalavaConventionPlugin.kt
index a51362e3..54372b6d 100644
--- a/gradle/build-logic/convention/src/main/kotlin/MetalavaConventionPlugin.kt
+++ b/gradle/build-logic/convention/src/main/kotlin/MetalavaConventionPlugin.kt
@@ -24,7 +24,8 @@ class MetalavaConventionPlugin : Plugin<Project> {
                 it.startsWith("generateResourceAccessors") ||
                     it.startsWith("generateActualResourceCollectors") ||
                     it.startsWith("generateComposeResClass") ||
-                    it.startsWith("generateExpectResourceCollectors")
+                    it.startsWith("generateExpectResourceCollectors") ||
+                    (it.startsWith("ksp") && !it.contains("test", ignoreCase = true))
             })
         }
     }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index be02a18b..8ec21f3b 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,33 +1,33 @@
 [versions]
-agp = "9.3.0"
-androidTools = "32.3.0"
+agp = "9.4.1"
+androidTools = "32.4.1"
 androidx-activity-compose = "1.13.0"
 androidx-biometric = "1.4.0-alpha02"
-androidx-compose-bom = "2026.06.01"
+androidx-compose-bom = "2026.09.00"
 androidx-datastore = "1.2.1"
 androidx-lifecycle = "2.11.0"
 androidx-metrics = "1.0.0"
-androidx-navigation = "2.9.8"
-androidx-room = "2.8.4"
-androidx-sqlite = "2.7.0"
+androidx-navigation = "2.10.2"
+androidx-room = "2.8.5"
+androidx-sqlite = "2.7.1"
 androidx-test = "1.7.0"
-coil = "3.5.0"
-compose-screenshot = "0.0.1-alpha15" # Issue https://issuetracker.google.com/issues/422412664 -> Test on Mac
-detekt = "2.0.0-alpha.5"
+coil = "3.6.3"
+compose-screenshot = "0.0.1-alpha16" # Issue https://issuetracker.google.com/issues/422412664 -> Test on Mac
+detekt = "2.0.0-alpha.6"
 dokka = "2.2.0"
 jetbrains-idea-ext = "1.4.1"
 # kaml's repo is archived (0.104.0 is the final release) - pin exact, do not bump.
 kaml = "0.104.0"
-kermit = "2.1.0"
+kermit = "2.2.0"
 koin = "4.2.2"
-konsist = "0.17.3"
-kotest = "6.2.3"
-ksp = "2.3.10"
-ktor = "3.5.1"
+konsist = "0.18.1"
+kotest = "6.2.5"
+ksp = "2.3.12"
+ktor = "3.6.0"
 maven-publish = "0.37.0"
-metalava = "0.5.0"
+metalava = "0.5.1"
 mockk = "1.14.11"
-mrmans0n-detekt-compose-rules = "0.6.3"
+mrmans0n-detekt-compose-rules = "0.6.8"
 turbine = "1.2.1"
 
 # Kotlin only dependencies
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index a9db1155..2e7bb9fd 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.8.1-bin.zip
 networkTimeout=10000
 retries=0
 retryBackOffMs=500
diff --git a/pip-requirements.txt b/pip-requirements.txt
index 56ab5716..c6fc7894 100644
--- a/pip-requirements.txt
+++ b/pip-requirements.txt
@@ -1,2 +1,2 @@
-zensical==0.0.60
-git+https://github.com/squidfunk/mike.git@2d4ad799442f4592db8ad53b179bfb33db8c69ac
+zensical==0.0.70
+git+https://github.com/squidfunk/mike.git@2.2.0+zensical-0.1.0