diff --git a/components/build.gradle.kts b/components/build.gradle.kts
index 6dbdb19eab..73d20416c1 100644
--- a/components/build.gradle.kts
+++ b/components/build.gradle.kts
@@ -10,7 +10,7 @@ buildscript {
     dependencies {
         classpath("org.jetbrains.compose:compose-gradle-plugin:$composeVersion")
         // __KOTLIN_COMPOSE_VERSION__
-        classpath(kotlin("gradle-plugin", version = "1.5.30"))
+        classpath(kotlin("gradle-plugin", version = "1.5.31"))
     }
 }
 
diff --git a/compose/frameworks/support b/compose/frameworks/support
index 9501a4c85e..bb90d0b5e1 160000
--- a/compose/frameworks/support
+++ b/compose/frameworks/support
@@ -1 +1 @@
-Subproject commit 9501a4c85e764994f9e4c342f86ea09bae9d920c
+Subproject commit bb90d0b5e1422c0b0c9700466a0f609aee8bb3a5
diff --git a/compose/golden b/compose/golden
index fe65d473dd..132f234996 160000
--- a/compose/golden
+++ b/compose/golden
@@ -1 +1 @@
-Subproject commit fe65d473dd24ed2aabe700f2cc2c982e356b0ebf
+Subproject commit 132f23499631f5536f1c47c649285f587535ef29
diff --git a/gradle-plugins/compose/src/test/kotlin/org/jetbrains/compose/test/TestKotlinVersion.kt b/gradle-plugins/compose/src/test/kotlin/org/jetbrains/compose/test/TestKotlinVersion.kt
index b7b8ae01ef..11a92b536b 100644
--- a/gradle-plugins/compose/src/test/kotlin/org/jetbrains/compose/test/TestKotlinVersion.kt
+++ b/gradle-plugins/compose/src/test/kotlin/org/jetbrains/compose/test/TestKotlinVersion.kt
@@ -8,6 +8,6 @@ package org.jetbrains.compose.test
 @Suppress("EnumEntryName")
 enum class TestKotlinVersion(val versionString: String) {
     // __KOTLIN_COMPOSE_VERSION__
-    Default("1.5.30"),
+    Default("1.5.31"),
     V1_5_20("1.5.20")
 }
\ No newline at end of file
diff --git a/gradle-plugins/compose/src/test/test-projects/application/jvm/src/main/kotlin/main.kt b/gradle-plugins/compose/src/test/test-projects/application/jvm/src/main/kotlin/main.kt
index f3f7e65f9e..6b688cf95e 100644
--- a/gradle-plugins/compose/src/test/test-projects/application/jvm/src/main/kotlin/main.kt
+++ b/gradle-plugins/compose/src/test/test-projects/application/jvm/src/main/kotlin/main.kt
@@ -1,10 +1,10 @@
-import androidx.compose.desktop.Window
 import androidx.compose.material.Text
 import androidx.compose.material.Button
 import androidx.compose.material.MaterialTheme
+import androidx.compose.ui.window.singleWindowApplication
 import androidx.compose.runtime.*
 
-fun main() = Window {
+fun main() = singleWindowApplication {
     val scope = rememberCoroutineScope()
     var text by remember { mutableStateOf("Hello, World!") }
 
diff --git a/templates/multiplatform-template/build.gradle.kts b/templates/multiplatform-template/build.gradle.kts
index 5dc286906f..633ab9cc6b 100644
--- a/templates/multiplatform-template/build.gradle.kts
+++ b/templates/multiplatform-template/build.gradle.kts
@@ -12,7 +12,7 @@ buildscript {
         classpath("org.jetbrains.compose:compose-gradle-plugin:$composeVersion")
         classpath("com.android.tools.build:gradle:4.1.3")
         // __KOTLIN_COMPOSE_VERSION__
-        classpath(kotlin("gradle-plugin", version = "1.5.30"))
+        classpath(kotlin("gradle-plugin", version = "1.5.31"))
     }
 }
 
diff --git a/templates/web-template/build.gradle.kts b/templates/web-template/build.gradle.kts
index 5718590f65..8a8c61fad5 100644
--- a/templates/web-template/build.gradle.kts
+++ b/templates/web-template/build.gradle.kts
@@ -3,7 +3,7 @@ import org.jetbrains.compose.desktop.application.dsl.TargetFormat
 
 plugins {
     // __KOTLIN_COMPOSE_VERSION__
-    kotlin("multiplatform") version "1.5.30"
+    kotlin("multiplatform") version "1.5.31"
     // __LATEST_COMPOSE_RELEASE_VERSION__
     id("org.jetbrains.compose") version ("1.0.0-alpha4-build328")
 }