diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 000000000..1f18169df
Binary files /dev/null and b/.DS_Store differ
diff --git a/.github/.DS_Store b/.github/.DS_Store
new file mode 100644
index 000000000..9b5152a1a
Binary files /dev/null and b/.github/.DS_Store differ
diff --git a/.github/images/.DS_Store b/.github/images/.DS_Store
new file mode 100644
index 000000000..5c1d5d0eb
Binary files /dev/null and b/.github/images/.DS_Store differ
diff --git a/cfg/buildprofiles.xml b/cfg/buildprofiles.xml
index 97eb688d7..72e5ce1d2 100644
--- a/cfg/buildprofiles.xml
+++ b/cfg/buildprofiles.xml
@@ -1,27 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<buildprofiles>
+<buildprofiles xsi:noNamespaceSchemaLocation="https://resources.jetbrains.com/writerside/1.0/build-profiles.xsd"
+               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <variables>
         <web-root>https://ktor.io</web-root>
-        <web-community-path>Developer Community:http://www.jetbrains.net/devnet/community/idea/kb</web-community-path>
         <download-page>https://ktor.io/create/</download-page>
-        <config-showDownloadButton>false</config-showDownloadButton>
+        <showDownloadButton>false</showDownloadButton>
         <enable-browser-edits>true</enable-browser-edits>
         <browser-edits-url>https://github.com/ktorio/ktor-documentation/edit/main/</browser-edits-url>
         <search-scope/>
         <fallback-url/>
-        <help-app-version>3</help-app-version>
-        <config-feedbackRequireEmail>false</config-feedbackRequireEmail>
-        <config-disqus-id>jetbrains</config-disqus-id>
-        <config-disqus-show>false</config-disqus-show>
-        <config-feedback-url>https://forms-service.jetbrains.com/feedback</config-feedback-url>
-        <config-feedback-enabled>true</config-feedback-enabled>
-        <config-feedback-widget>true</config-feedback-widget>
-        <config-versions-switcher>https://raw.githubusercontent.com/ktorio/ktor-documentation/main/help-versions.json</config-versions-switcher>
-        <config-webmaster>webmaster@jetbrains.com</config-webmaster>
-        <config-feedback-support>https://www.jetbrains.com/support/</config-feedback-support>
-        <config-sideblocks>true</config-sideblocks>
-        <config-productid>docs</config-productid>
-        <config-search-scopes-provider>https://data.services.jetbrains.com/search/</config-search-scopes-provider>
+        <feedbackRequireEmail>false</feedbackRequireEmail>
+        <feedback-url>https://forms-service.jetbrains.com/feedback</feedback-url>
+        <feedback-widget>true</feedback-widget>
+        <versions-switcher>https://raw.githubusercontent.com/ktorio/ktor-documentation/main/help-versions.json</versions-switcher>
+        <webmaster>webmaster@jetbrains.com</webmaster>
+        <feedback-support>https://www.jetbrains.com/support/</feedback-support>
+        <sideblocks>true</sideblocks>
+        <search-scopes-provider>https://data.services.jetbrains.com/search/</search-scopes-provider>
         <noindex-content status="deprecated">true</noindex-content>
         <noindex-content status="eap">true</noindex-content>
         <noindex-content status="release">false</noindex-content>
@@ -31,12 +26,10 @@
         <og-twitter>@JetBrainsKtor</og-twitter>
         <og-image>https://raw.githubusercontent.com/ktorio/ktor-documentation/main/preview.jpg</og-image>
 
-        <config-algolia-api-key>8c2683cac2d71d547b55183297abb506</config-algolia-api-key>
-        <config-algolia-id>OHIV241QET</config-algolia-id>
-        <config-algolia-index>prod_JETBRAINSCOM_HELP</config-algolia-index>
-        <config-algolia-product-id>docs</config-algolia-product-id>
-        <config-algloia-product-version>2.1.0</config-algloia-product-version>
-
+        <algolia-api-key>8c2683cac2d71d547b55183297abb506</algolia-api-key>
+        <algolia-id>OHIV241QET</algolia-id>
+        <algolia-index>prod_JETBRAINSCOM_HELP</algolia-index>
+        <config-algloia-product-version>3.0.0</config-algloia-product-version>
         <analytics-head-script-file>google-analytics-code.html</analytics-head-script-file>
         <analytics-body-html-file>google-analytics-noscript.html</analytics-body-html-file>
 
@@ -51,7 +44,7 @@
         <primary-color>iris</primary-color>
     </variables>
 
-    <build-profile product="ktor"/>
+    <build-profile instance="ktor"/>
 
     <footer>
         <copyright>2000-2024 JetBrains s.r.o.</copyright>
diff --git a/codeSnippets/gradle.properties b/codeSnippets/gradle.properties
index 2a2051c75..be7f3657b 100644
--- a/codeSnippets/gradle.properties
+++ b/codeSnippets/gradle.properties
@@ -5,8 +5,8 @@ kotlin.native.binary.memoryModel = experimental
 # gradle configuration
 org.gradle.configureondemand = false
 # versions
-kotlin_version = 2.0.0
-ktor_version = 2.3.12
+kotlin_version = 2.0.20
+ktor_version = 3.0.0
 kotlinx_coroutines_version = 1.9.0
 kotlinx_serialization_version = 1.7.2
 kotlin_css_version = 1.0.0-pre.721
diff --git a/codeSnippets/settings.gradle.kts b/codeSnippets/settings.gradle.kts
index 49d7492b0..7b64095e5 100644
--- a/codeSnippets/settings.gradle.kts
+++ b/codeSnippets/settings.gradle.kts
@@ -44,7 +44,6 @@ module("snippets", "html")
 module("snippets", "html-templates")
 module("snippets", "jackson")
 module("snippets", "client-json")
-module("snippets", "locations")
 module("snippets", "dropwizard-metrics")
 module("snippets", "upload-file")
 module("snippets", "download-file")
@@ -55,6 +54,7 @@ module("snippets", "session-cookie-server")
 module("snippets", "session-header-server")
 module("snippets", "static-files")
 module("snippets", "static-resources")
+module("snippets", "static-zip")
 module("snippets", "timeout")
 module("snippets", "autohead")
 module("snippets", "autoreload-engine-main")
@@ -108,6 +108,7 @@ module("snippets", "logging")
 module("snippets", "call-id")
 module("snippets", "cors")
 module("snippets", "compression")
+module("snippets", "client-bom-remover")
 module("snippets", "client-content-encoding")
 module("snippets", "client-caching")
 module("snippets", "client-custom-plugin")
@@ -155,6 +156,9 @@ module("snippets", "custom-plugin-authorization")
 module("snippets", "client-configure-request")
 module("snippets", "request-validation")
 module("snippets", "data-conversion")
+module("snippets", "client-sse")
+module("snippets", "server-sse")
+module("snippets", "client-call-id")
 module("snippets", "tutorial-server-routing-and-requests")
 module("snippets", "tutorial-server-restful-api")
 module("snippets", "tutorial-server-websockets")
diff --git a/codeSnippets/snippets/auth-basic-hash-table/build.gradle.kts b/codeSnippets/snippets/auth-basic-hash-table/build.gradle.kts
index a1e21997d..a7c841aa4 100644
--- a/codeSnippets/snippets/auth-basic-hash-table/build.gradle.kts
+++ b/codeSnippets/snippets/auth-basic-hash-table/build.gradle.kts
@@ -22,6 +22,6 @@ dependencies {
     implementation("io.ktor:ktor-server-netty:$ktor_version")
     implementation("io.ktor:ktor-server-auth:$ktor_version")
     implementation("ch.qos.logback:logback-classic:$logback_version")
-    testImplementation("io.ktor:ktor-server-test-host:$ktor_version")
+    testImplementation("io.ktor:ktor-server-test-host-jvm:$ktor_version")
     testImplementation("org.jetbrains.kotlin:kotlin-test")
 }
diff --git a/codeSnippets/snippets/auth-basic-hash-table/src/test/kotlin/com/example/ApplicationTest.kt b/codeSnippets/snippets/auth-basic-hash-table/src/test/kotlin/com/example/ApplicationTest.kt
index 79867ef96..5c29312b5 100644
--- a/codeSnippets/snippets/auth-basic-hash-table/src/test/kotlin/com/example/ApplicationTest.kt
+++ b/codeSnippets/snippets/auth-basic-hash-table/src/test/kotlin/com/example/ApplicationTest.kt
@@ -12,6 +12,9 @@ import kotlin.test.assertEquals
 class ApplicationTest {
     @Test
     fun testAuthRoute() = testApplication {
+        application {
+            main()
+        }
         val client = createClient {
             defaultRequest {
                 val credentials = Base64.getEncoder().encodeToString("admin:password".toByteArray())
diff --git a/codeSnippets/snippets/auth-basic/build.gradle.kts b/codeSnippets/snippets/auth-basic/build.gradle.kts
index 384577fb0..69361c3ce 100644
--- a/codeSnippets/snippets/auth-basic/build.gradle.kts
+++ b/codeSnippets/snippets/auth-basic/build.gradle.kts
@@ -21,6 +21,5 @@ dependencies {
     implementation("io.ktor:ktor-server-netty:$ktor_version")
     implementation("io.ktor:ktor-server-auth:$ktor_version")
     implementation("ch.qos.logback:logback-classic:$logback_version")
-    testImplementation("io.ktor:ktor-server-test-host:$ktor_version")
-    testImplementation("org.jetbrains.kotlin:kotlin-test")
-}
+    testImplementation("io.ktor:ktor-server-test-host-jvm:$ktor_version")
+    testImplementation("org.jetbrains.kotlin:kotlin-test")}
diff --git a/codeSnippets/snippets/auth-basic/src/test/kotlin/authbasic/ApplicationTest.kt b/codeSnippets/snippets/auth-basic/src/test/kotlin/authbasic/ApplicationTest.kt
index a88b00e5b..450cee837 100644
--- a/codeSnippets/snippets/auth-basic/src/test/kotlin/authbasic/ApplicationTest.kt
+++ b/codeSnippets/snippets/auth-basic/src/test/kotlin/authbasic/ApplicationTest.kt
@@ -12,6 +12,9 @@ import kotlin.test.assertEquals
 class ApplicationTest {
     @Test
     fun testAuthRoute() = testApplication {
+        application {
+            main()
+        }
         val client = createClient {
             defaultRequest {
                 val credentials = Base64.getEncoder().encodeToString("jetbrains:foobar".toByteArray())
diff --git a/codeSnippets/snippets/auth-bearer/build.gradle.kts b/codeSnippets/snippets/auth-bearer/build.gradle.kts
index a1e21997d..a7c841aa4 100644
--- a/codeSnippets/snippets/auth-bearer/build.gradle.kts
+++ b/codeSnippets/snippets/auth-bearer/build.gradle.kts
@@ -22,6 +22,6 @@ dependencies {
     implementation("io.ktor:ktor-server-netty:$ktor_version")
     implementation("io.ktor:ktor-server-auth:$ktor_version")
     implementation("ch.qos.logback:logback-classic:$logback_version")
-    testImplementation("io.ktor:ktor-server-test-host:$ktor_version")
+    testImplementation("io.ktor:ktor-server-test-host-jvm:$ktor_version")
     testImplementation("org.jetbrains.kotlin:kotlin-test")
 }
diff --git a/codeSnippets/snippets/auth-bearer/src/test/kotlin/com/example/ApplicationTest.kt b/codeSnippets/snippets/auth-bearer/src/test/kotlin/com/example/ApplicationTest.kt
index 4128c3762..6677b2082 100644
--- a/codeSnippets/snippets/auth-bearer/src/test/kotlin/com/example/ApplicationTest.kt
+++ b/codeSnippets/snippets/auth-bearer/src/test/kotlin/com/example/ApplicationTest.kt
@@ -9,6 +9,9 @@ import kotlin.test.*
 class ApplicationTest {
     @Test
     fun testAuthRoute() = testApplication {
+        application {
+            main()
+        }
         val response = client.get("/") {
             header(HttpHeaders.Authorization, "Bearer abc123")
         }
diff --git a/codeSnippets/snippets/auth-digest/build.gradle.kts b/codeSnippets/snippets/auth-digest/build.gradle.kts
index f39b4717d..339ddfa9d 100644
--- a/codeSnippets/snippets/auth-digest/build.gradle.kts
+++ b/codeSnippets/snippets/auth-digest/build.gradle.kts
@@ -22,7 +22,11 @@ dependencies {
     implementation("io.ktor:ktor-server-netty:$ktor_version")
     implementation("io.ktor:ktor-server-auth:$ktor_version")
     implementation("ch.qos.logback:logback-classic:$logback_version")
-    testImplementation("io.ktor:ktor-server-test-host:$ktor_version")
+    testImplementation("io.ktor:ktor-server-test-host-jvm:$ktor_version")
     testImplementation("org.jetbrains.kotlin:kotlin-test")
     testImplementation("io.ktor:ktor-client-auth:$ktor_version")
 }
+
+kotlin {
+    jvmToolchain(11)
+}
\ No newline at end of file
diff --git a/codeSnippets/snippets/auth-digest/src/test/kotlin/authdigest/ApplicationTest.kt b/codeSnippets/snippets/auth-digest/src/test/kotlin/authdigest/ApplicationTest.kt
index f435c41f1..ef4289964 100644
--- a/codeSnippets/snippets/auth-digest/src/test/kotlin/authdigest/ApplicationTest.kt
+++ b/codeSnippets/snippets/auth-digest/src/test/kotlin/authdigest/ApplicationTest.kt
@@ -10,6 +10,9 @@ import kotlin.test.*
 class ApplicationTest {
     @Test
     fun testAuthRoute() = testApplication {
+        application {
+            main()
+        }
         val client = createClient {
             install(Auth) {
                 digest {
diff --git a/codeSnippets/snippets/auth-form-html-dsl/build.gradle.kts b/codeSnippets/snippets/auth-form-html-dsl/build.gradle.kts
index 43ac7f244..42435abb5 100644
--- a/codeSnippets/snippets/auth-form-html-dsl/build.gradle.kts
+++ b/codeSnippets/snippets/auth-form-html-dsl/build.gradle.kts
@@ -23,6 +23,6 @@ dependencies {
     implementation("io.ktor:ktor-server-auth:$ktor_version")
     implementation("io.ktor:ktor-server-html-builder:$ktor_version")
     implementation("ch.qos.logback:logback-classic:$logback_version")
-    testImplementation("io.ktor:ktor-server-test-host:$ktor_version")
+    testImplementation("io.ktor:ktor-server-test-host-jvm:$ktor_version")
     testImplementation("org.jetbrains.kotlin:kotlin-test")
 }
diff --git a/codeSnippets/snippets/auth-form-html-dsl/src/test/kotlin/com/example/ApplicationTest.kt b/codeSnippets/snippets/auth-form-html-dsl/src/test/kotlin/com/example/ApplicationTest.kt
index 4d4ff498e..bc6ad4656 100644
--- a/codeSnippets/snippets/auth-form-html-dsl/src/test/kotlin/com/example/ApplicationTest.kt
+++ b/codeSnippets/snippets/auth-form-html-dsl/src/test/kotlin/com/example/ApplicationTest.kt
@@ -9,6 +9,9 @@ import kotlin.test.*
 class ApplicationTest {
     @Test
     fun testSuccessfulAuth() = testApplication {
+        application {
+            main()
+        }
         val loginResponse = client.post("/login") {
             header(HttpHeaders.ContentType, ContentType.Application.FormUrlEncoded.toString())
             setBody(listOf("username" to "jetbrains", "password" to "foobar").formUrlEncode())
@@ -18,6 +21,9 @@ class ApplicationTest {
 
     @Test
     fun testUnsuccessfulAuth() = testApplication {
+        application {
+            main()
+        }
         val loginResponse = client.post("/login") {
             header(HttpHeaders.ContentType, ContentType.Application.FormUrlEncoded.toString())
             setBody(listOf("username" to "jetbrains", "password" to "incorrect_pass").formUrlEncode())
@@ -27,6 +33,9 @@ class ApplicationTest {
 
     @Test
     fun testForm() = testApplication {
+        application {
+            main()
+        }
         val response = client.get("/login")
         assertEquals(
             """
diff --git a/codeSnippets/snippets/auth-form-session-nested/build.gradle.kts b/codeSnippets/snippets/auth-form-session-nested/build.gradle.kts
index 34d8bf7b9..7c2b294b3 100644
--- a/codeSnippets/snippets/auth-form-session-nested/build.gradle.kts
+++ b/codeSnippets/snippets/auth-form-session-nested/build.gradle.kts
@@ -5,6 +5,7 @@ val logback_version: String by project
 plugins {
     application
     kotlin("jvm")
+    kotlin("plugin.serialization").version("2.0.0")
 }
 
 application {
@@ -23,7 +24,8 @@ dependencies {
     implementation("io.ktor:ktor-server-auth:$ktor_version")
     implementation("io.ktor:ktor-server-sessions:$ktor_version")
     implementation("io.ktor:ktor-server-html-builder:$ktor_version")
+    implementation("io.ktor:ktor-serialization-kotlinx-json:$ktor_version")
     implementation("ch.qos.logback:logback-classic:$logback_version")
-    testImplementation("io.ktor:ktor-server-test-host:$ktor_version")
+    testImplementation("io.ktor:ktor-server-test-host-jvm:$ktor_version")
     testImplementation("org.jetbrains.kotlin:kotlin-test")
 }
diff --git a/codeSnippets/snippets/auth-form-session-nested/src/main/kotlin/com/example/Application.kt b/codeSnippets/snippets/auth-form-session-nested/src/main/kotlin/com/example/Application.kt
index 27350f3e8..b7d2f94bd 100644
--- a/codeSnippets/snippets/auth-form-session-nested/src/main/kotlin/com/example/Application.kt
+++ b/codeSnippets/snippets/auth-form-session-nested/src/main/kotlin/com/example/Application.kt
@@ -7,7 +7,9 @@ import io.ktor.server.response.*
 import io.ktor.server.routing.*
 import io.ktor.server.sessions.*
 import kotlinx.html.*
+import kotlinx.serialization.Serializable
 
+@Serializable
 data class UserSession(val name: String, val count: Int) : Principal
 
 fun Application.main() {
diff --git a/codeSnippets/snippets/auth-form-session-nested/src/test/kotlin/ApplicationTest.kt b/codeSnippets/snippets/auth-form-session-nested/src/test/kotlin/ApplicationTest.kt
index 58939c831..8d5db50b4 100644
--- a/codeSnippets/snippets/auth-form-session-nested/src/test/kotlin/ApplicationTest.kt
+++ b/codeSnippets/snippets/auth-form-session-nested/src/test/kotlin/ApplicationTest.kt
@@ -11,6 +11,9 @@ import kotlin.test.*
 class ApplicationTest {
     @Test
     fun testLoginProcess() = testApplication {
+        application {
+            main()
+        }
         val loginClient = createClient {
             install(HttpCookies)
         }
diff --git a/codeSnippets/snippets/auth-form-session/build.gradle.kts b/codeSnippets/snippets/auth-form-session/build.gradle.kts
index 34d8bf7b9..29ea20e0b 100644
--- a/codeSnippets/snippets/auth-form-session/build.gradle.kts
+++ b/codeSnippets/snippets/auth-form-session/build.gradle.kts
@@ -5,6 +5,7 @@ val logback_version: String by project
 plugins {
     application
     kotlin("jvm")
+    kotlin("plugin.serialization").version("2.0.0")
 }
 
 application {
@@ -23,7 +24,8 @@ dependencies {
     implementation("io.ktor:ktor-server-auth:$ktor_version")
     implementation("io.ktor:ktor-server-sessions:$ktor_version")
     implementation("io.ktor:ktor-server-html-builder:$ktor_version")
+    implementation("io.ktor:ktor-serialization-kotlinx-json:$ktor_version")
     implementation("ch.qos.logback:logback-classic:$logback_version")
-    testImplementation("io.ktor:ktor-server-test-host:$ktor_version")
-    testImplementation("org.jetbrains.kotlin:kotlin-test")
+    testImplementation("io.ktor:ktor-server-test-host-jvm:$ktor_version")
+    testImplementation("org.jetbrains.kotlin:kotlin-test-junit")
 }
diff --git a/codeSnippets/snippets/auth-form-session/src/main/kotlin/com/example/Application.kt b/codeSnippets/snippets/auth-form-session/src/main/kotlin/com/example/Application.kt
index 8d80457f7..a47bc62cb 100644
--- a/codeSnippets/snippets/auth-form-session/src/main/kotlin/com/example/Application.kt
+++ b/codeSnippets/snippets/auth-form-session/src/main/kotlin/com/example/Application.kt
@@ -7,7 +7,9 @@ import io.ktor.server.response.*
 import io.ktor.server.routing.*
 import io.ktor.server.sessions.*
 import kotlinx.html.*
+import kotlinx.serialization.Serializable
 
+@Serializable
 data class UserSession(val name: String, val count: Int) : Principal
 
 fun Application.main() {
diff --git a/codeSnippets/snippets/auth-form-session/src/test/kotlin/ApplicationTest.kt b/codeSnippets/snippets/auth-form-session/src/test/kotlin/ApplicationTest.kt
index cf51f6128..2f7ae323f 100644
--- a/codeSnippets/snippets/auth-form-session/src/test/kotlin/ApplicationTest.kt
+++ b/codeSnippets/snippets/auth-form-session/src/test/kotlin/ApplicationTest.kt
@@ -9,6 +9,9 @@ import kotlin.test.*
 class ApplicationTest {
     @Test
     fun testRequests() = testApplication {
+        application {
+            main()
+        }
         val client = createClient {
             install(HttpCookies)
         }
diff --git a/codeSnippets/snippets/auth-jwt-hs256/build.gradle.kts b/codeSnippets/snippets/auth-jwt-hs256/build.gradle.kts
index 691cee616..29897e813 100644
--- a/codeSnippets/snippets/auth-jwt-hs256/build.gradle.kts
+++ b/codeSnippets/snippets/auth-jwt-hs256/build.gradle.kts
@@ -27,7 +27,7 @@ dependencies {
     implementation("io.ktor:ktor-serialization-kotlinx-json:$ktor_version")
     implementation("io.ktor:ktor-server-config-yaml:$ktor_version")
     implementation("ch.qos.logback:logback-classic:$logback_version")
-    testImplementation("io.ktor:ktor-server-test-host:$ktor_version")
+    testImplementation("io.ktor:ktor-server-test-host-jvm:$ktor_version")
     testImplementation("org.jetbrains.kotlin:kotlin-test:$kotlin_version")
     testImplementation("io.ktor:ktor-client-content-negotiation:$ktor_version")
 }
diff --git a/codeSnippets/snippets/auth-jwt-hs256/src/main/kotlin/com/example/Application.kt b/codeSnippets/snippets/auth-jwt-hs256/src/main/kotlin/com/example/Application.kt
index 3795ada93..9272bef87 100644
--- a/codeSnippets/snippets/auth-jwt-hs256/src/main/kotlin/com/example/Application.kt
+++ b/codeSnippets/snippets/auth-jwt-hs256/src/main/kotlin/com/example/Application.kt
@@ -29,10 +29,10 @@ fun Application.main() {
         jwt("auth-jwt") {
             realm = myRealm
             verifier(JWT
-                .require(Algorithm.HMAC256(secret))
-                .withAudience(audience)
-                .withIssuer(issuer)
-                .build())
+                    .require(Algorithm.HMAC256(secret))
+                    .withAudience(audience)
+                    .withIssuer(issuer)
+                    .build())
             validate { credential ->
                 if (credential.payload.getClaim("username").asString() != "") {
                     JWTPrincipal(credential.payload)
diff --git a/codeSnippets/snippets/auth-jwt-hs256/src/main/resources/application.conf b/codeSnippets/snippets/auth-jwt-hs256/src/main/resources/application-custom.conf
similarity index 100%
rename from codeSnippets/snippets/auth-jwt-hs256/src/main/resources/application.conf
rename to codeSnippets/snippets/auth-jwt-hs256/src/main/resources/application-custom.conf
diff --git a/codeSnippets/snippets/auth-jwt-hs256/src/test/kotlin/com/example/ApplicationTest.kt b/codeSnippets/snippets/auth-jwt-hs256/src/test/kotlin/com/example/ApplicationTest.kt
index 56ef34598..e2bb0ce16 100644
--- a/codeSnippets/snippets/auth-jwt-hs256/src/test/kotlin/com/example/ApplicationTest.kt
+++ b/codeSnippets/snippets/auth-jwt-hs256/src/test/kotlin/com/example/ApplicationTest.kt
@@ -6,6 +6,7 @@ import io.ktor.client.request.*
 import io.ktor.client.statement.*
 import io.ktor.http.*
 import io.ktor.serialization.kotlinx.json.*
+import io.ktor.server.config.*
 import io.ktor.server.testing.*
 import kotlinx.serialization.*
 import kotlin.test.*
@@ -13,6 +14,9 @@ import kotlin.test.*
 class ApplicationTest {
     @Test
     fun testHello() = testApplication {
+        environment {
+            config = ApplicationConfig("application-custom.conf")
+        }
         val client = createClient {
             install(ContentNegotiation) {
                 json()
diff --git a/codeSnippets/snippets/auth-oauth-google/build.gradle.kts b/codeSnippets/snippets/auth-oauth-google/build.gradle.kts
index 243034f5f..233e2fd08 100644
--- a/codeSnippets/snippets/auth-oauth-google/build.gradle.kts
+++ b/codeSnippets/snippets/auth-oauth-google/build.gradle.kts
@@ -29,7 +29,7 @@ dependencies {
     implementation("io.ktor:ktor-client-content-negotiation:$ktor_version")
     implementation("io.ktor:ktor-serialization-kotlinx-json:$ktor_version")
     implementation("ch.qos.logback:logback-classic:$logback_version")
-    testImplementation("io.ktor:ktor-server-test-host:$ktor_version")
+    testImplementation("io.ktor:ktor-server-test-host-jvm:$ktor_version")
     testImplementation("org.jetbrains.kotlin:kotlin-test")
     testImplementation("io.ktor:ktor-server-content-negotiation:$ktor_version")
 }
diff --git a/codeSnippets/snippets/auth-oauth-google/src/main/kotlin/com/example/Application.kt b/codeSnippets/snippets/auth-oauth-google/src/main/kotlin/com/example/oauth/google/Application.kt
similarity index 99%
rename from codeSnippets/snippets/auth-oauth-google/src/main/kotlin/com/example/Application.kt
rename to codeSnippets/snippets/auth-oauth-google/src/main/kotlin/com/example/oauth/google/Application.kt
index a4ed83080..6efc4c0ee 100644
--- a/codeSnippets/snippets/auth-oauth-google/src/main/kotlin/com/example/Application.kt
+++ b/codeSnippets/snippets/auth-oauth-google/src/main/kotlin/com/example/oauth/google/Application.kt
@@ -1,4 +1,4 @@
-package com.example
+package com.example.oauth.google
 
 import io.ktor.client.*
 import io.ktor.client.call.*
@@ -125,6 +125,7 @@ private suspend fun getSession(
     return userSession
 }
 
+@Serializable
 data class UserSession(val state: String, val token: String)
 
 @Serializable
diff --git a/codeSnippets/snippets/auth-oauth-google/src/test/kotlin/ApplicationTest.kt b/codeSnippets/snippets/auth-oauth-google/src/test/kotlin/ApplicationTest.kt
index ad7704263..b0efefeb6 100644
--- a/codeSnippets/snippets/auth-oauth-google/src/test/kotlin/ApplicationTest.kt
+++ b/codeSnippets/snippets/auth-oauth-google/src/test/kotlin/ApplicationTest.kt
@@ -1,4 +1,4 @@
-package com.example
+package com.example.oauth.google
 
 import io.ktor.client.plugins.contentnegotiation.*
 import io.ktor.client.plugins.cookies.*
diff --git a/codeSnippets/snippets/autohead/build.gradle.kts b/codeSnippets/snippets/autohead/build.gradle.kts
index 27b3041fe..4bfce5da7 100644
--- a/codeSnippets/snippets/autohead/build.gradle.kts
+++ b/codeSnippets/snippets/autohead/build.gradle.kts
@@ -22,6 +22,6 @@ dependencies {
     implementation("io.ktor:ktor-server-netty:$ktor_version")
     implementation("io.ktor:ktor-server-auto-head-response:$ktor_version")
     implementation("ch.qos.logback:logback-classic:$logback_version")
-    testImplementation("io.ktor:ktor-server-test-host:$ktor_version")
+    testImplementation("io.ktor:ktor-server-test-host-jvm:$ktor_version")
     testImplementation("org.jetbrains.kotlin:kotlin-test:$kotlin_version")
 }
diff --git a/codeSnippets/snippets/autohead/src/test/kotlin/AuthHeadTest.kt b/codeSnippets/snippets/autohead/src/test/kotlin/AuthHeadTest.kt
index 94d3fac71..28764818b 100644
--- a/codeSnippets/snippets/autohead/src/test/kotlin/AuthHeadTest.kt
+++ b/codeSnippets/snippets/autohead/src/test/kotlin/AuthHeadTest.kt
@@ -8,6 +8,9 @@ import kotlin.test.*
 class AuthHeadTest {
     @Test
     fun respondsSuccessfullyForHeadRequest() = testApplication {
+        application {
+            main()
+        }
         val headResponse = client.head("/home")
         assertEquals(HttpStatusCode.OK, headResponse.status)
     }
diff --git a/codeSnippets/snippets/autoreload-engine-main/build.gradle.kts b/codeSnippets/snippets/autoreload-engine-main/build.gradle.kts
index f4aae2cd8..a3d0d1258 100644
--- a/codeSnippets/snippets/autoreload-engine-main/build.gradle.kts
+++ b/codeSnippets/snippets/autoreload-engine-main/build.gradle.kts
@@ -25,5 +25,5 @@ dependencies {
     implementation("io.ktor:ktor-server-config-yaml:$ktor_version")
     testImplementation("junit:junit:$junit_version")
     testImplementation("com.typesafe:config:1.4.3")
-    testImplementation("io.ktor:ktor-server-test-host:$ktor_version")
+    testImplementation("io.ktor:ktor-server-test-host-jvm:$ktor_version")
 }
diff --git a/codeSnippets/snippets/autoreload-engine-main/src/test/kotlin/AutoReloadTest.kt b/codeSnippets/snippets/autoreload-engine-main/src/test/kotlin/AutoReloadTest.kt
index e238c8880..4cbb1ab5f 100644
--- a/codeSnippets/snippets/autoreload-engine-main/src/test/kotlin/AutoReloadTest.kt
+++ b/codeSnippets/snippets/autoreload-engine-main/src/test/kotlin/AutoReloadTest.kt
@@ -10,6 +10,9 @@ import org.junit.Assert.*
 class AutoReloadTest {
     @Test
     fun testRoot() = testApplication {
+        application {
+            main()
+        }
         val response = client.get("/")
         assertEquals(HttpStatusCode.OK, response.status)
         assertEquals("Hello, world!", response.bodyAsText())
diff --git a/codeSnippets/snippets/aws-elastic-beanstalk/build.gradle.kts b/codeSnippets/snippets/aws-elastic-beanstalk/build.gradle.kts
index ea2326fe7..3624fca82 100644
--- a/codeSnippets/snippets/aws-elastic-beanstalk/build.gradle.kts
+++ b/codeSnippets/snippets/aws-elastic-beanstalk/build.gradle.kts
@@ -1,29 +1,26 @@
-val ktor_version: String by project
-val kotlin_version: String by project
 val logback_version: String by project
 
 plugins {
     application
     kotlin("jvm")
-    id("io.ktor.plugin") version "2.3.12"
+    id("io.ktor.plugin") version "3.0.0"
 }
 
 application {
     mainClass.set("io.ktor.server.netty.EngineMain")
 }
 
-version "1.0-SNAPSHOT"
+version = "1.0-SNAPSHOT"
 
 repositories {
     mavenCentral()
-    maven { url = uri("https://maven.pkg.jetbrains.space/public/p/ktor/eap") }
 }
 
 dependencies {
     implementation("org.jetbrains.kotlin:kotlin-stdlib")
-    implementation("io.ktor:ktor-server-core:$ktor_version")
-    implementation("io.ktor:ktor-server-netty:$ktor_version")
+    implementation("io.ktor:ktor-server-core-jvm")
+    implementation("io.ktor:ktor-server-netty-jvm")
     implementation("ch.qos.logback:logback-classic:$logback_version")
-    testImplementation("io.ktor:ktor-server-test-host:$ktor_version")
+    testImplementation("io.ktor:ktor-server-test-host-jvm")
     testImplementation("org.jetbrains.kotlin:kotlin-test")
 }
diff --git a/codeSnippets/snippets/aws-elastic-beanstalk/src/test/kotlin/com/example/ElasticBeanstalkTest.kt b/codeSnippets/snippets/aws-elastic-beanstalk/src/test/kotlin/com/example/ElasticBeanstalkTest.kt
index dc4fb1727..567d6a62d 100644
--- a/codeSnippets/snippets/aws-elastic-beanstalk/src/test/kotlin/com/example/ElasticBeanstalkTest.kt
+++ b/codeSnippets/snippets/aws-elastic-beanstalk/src/test/kotlin/com/example/ElasticBeanstalkTest.kt
@@ -9,6 +9,9 @@ import kotlin.test.*
 class ApplicationTest {
     @Test
     fun testRoot() = testApplication {
+        application {
+            module()
+        }
         val response = client.get("/")
         assertEquals(HttpStatusCode.OK, response.status)
         assertEquals("Hello, world!", response.bodyAsText())
diff --git a/codeSnippets/snippets/caching-headers/build.gradle.kts b/codeSnippets/snippets/caching-headers/build.gradle.kts
index e25dc3f6e..13fc4c45f 100644
--- a/codeSnippets/snippets/caching-headers/build.gradle.kts
+++ b/codeSnippets/snippets/caching-headers/build.gradle.kts
@@ -23,6 +23,6 @@ dependencies {
     implementation("io.ktor:ktor-server-caching-headers:$ktor_version")
     implementation("io.ktor:ktor-server-html-builder:$ktor_version")
     implementation("ch.qos.logback:logback-classic:$logback_version")
-    testImplementation("io.ktor:ktor-server-test-host:$ktor_version")
+    testImplementation("io.ktor:ktor-server-test-host-jvm:$ktor_version")
     testImplementation("org.jetbrains.kotlin:kotlin-test")
 }
diff --git a/codeSnippets/snippets/caching-headers/src/test/kotlin/ApplicationTest.kt b/codeSnippets/snippets/caching-headers/src/test/kotlin/ApplicationTest.kt
index 7de62cd71..af1153817 100644
--- a/codeSnippets/snippets/caching-headers/src/test/kotlin/ApplicationTest.kt
+++ b/codeSnippets/snippets/caching-headers/src/test/kotlin/ApplicationTest.kt
@@ -1,5 +1,6 @@
 package com.example
 
+import cachingheaders.module
 import io.ktor.client.request.*
 import io.ktor.http.*
 import io.ktor.server.testing.*
@@ -8,6 +9,9 @@ import kotlin.test.*
 class ApplicationTest {
     @Test
     fun testIndex() = testApplication {
+        application {
+            module()
+        }
         client.get("/index").let { response ->
             assertEquals("max-age=1800", response.cacheControl()[0].value)
         }
@@ -15,6 +19,9 @@ class ApplicationTest {
 
     @Test
     fun testAbout() = testApplication {
+        application {
+            module()
+        }
         client.get("/about").let { response ->
             assertEquals("max-age=60", response.cacheControl()[0].value)
         }
@@ -22,6 +29,9 @@ class ApplicationTest {
 
     @Test
     fun testProfile() = testApplication {
+        application {
+            module()
+        }
         client.get("/profile").let { response ->
             assertEquals("no-store", response.cacheControl()[0].value)
         }
diff --git a/codeSnippets/snippets/call-id/src/main/kotlin/com/example/Application.kt b/codeSnippets/snippets/call-id/src/main/kotlin/com/example/Application.kt
index e1240ff49..775928e87 100644
--- a/codeSnippets/snippets/call-id/src/main/kotlin/com/example/Application.kt
+++ b/codeSnippets/snippets/call-id/src/main/kotlin/com/example/Application.kt
@@ -3,7 +3,7 @@ package com.example
 import io.ktor.http.*
 import io.ktor.server.application.*
 import io.ktor.server.plugins.callid.*
-import io.ktor.server.plugins.callloging.*
+import io.ktor.server.plugins.calllogging.*
 import io.ktor.server.response.*
 import io.ktor.server.routing.*
 
diff --git a/codeSnippets/snippets/client-auth-digest/src/test/kotlin/com/example/ApplicationTest.kt b/codeSnippets/snippets/client-auth-digest/src/test/kotlin/com/example/digest/ApplicationTest.kt
similarity index 91%
rename from codeSnippets/snippets/client-auth-digest/src/test/kotlin/com/example/ApplicationTest.kt
rename to codeSnippets/snippets/client-auth-digest/src/test/kotlin/com/example/digest/ApplicationTest.kt
index 7cdc5b6a9..0744109ea 100644
--- a/codeSnippets/snippets/client-auth-digest/src/test/kotlin/com/example/ApplicationTest.kt
+++ b/codeSnippets/snippets/client-auth-digest/src/test/kotlin/com/example/digest/ApplicationTest.kt
@@ -1,4 +1,4 @@
-package com.example
+package com.example.digest
 
 import e2e.*
 import kotlinx.coroutines.*
diff --git a/codeSnippets/snippets/client-bom-remover/README.md b/codeSnippets/snippets/client-bom-remover/README.md
new file mode 100644
index 000000000..4fe997dc5
--- /dev/null
+++ b/codeSnippets/snippets/client-bom-remover/README.md
@@ -0,0 +1,13 @@
+# Client BOM Remover
+
+A sample Ktor project showing how to use the [BomRemover](https://ktor.io/docs/bom-remover.html) plugin.
+> This sample is a part of the [codeSnippets](../../README.md) Gradle project.
+
+## Running
+
+This sample uses the server from the [compression](../compression) example.
+To run this sample, execute the following command:
+
+```bash
+./gradlew :client-bom-remover:run
+```
diff --git a/codeSnippets/snippets/client-bom-remover/build.gradle.kts b/codeSnippets/snippets/client-bom-remover/build.gradle.kts
new file mode 100644
index 000000000..9370ee21e
--- /dev/null
+++ b/codeSnippets/snippets/client-bom-remover/build.gradle.kts
@@ -0,0 +1,29 @@
+val ktor_version: String by project
+val logback_version: String by project
+val junit_version: String by project
+val hamcrest_version: String by project
+
+plugins {
+    application
+    kotlin("jvm")
+}
+
+application {
+    mainClass.set("com.example.ApplicationKt")
+}
+
+repositories {
+    mavenCentral()
+    maven { url = uri("https://maven.pkg.jetbrains.space/public/p/ktor/eap") }
+}
+
+dependencies {
+    implementation("io.ktor:ktor-client-core:$ktor_version")
+    implementation("io.ktor:ktor-client-cio:$ktor_version")
+    implementation("io.ktor:ktor-client-bom-remover:$ktor_version")
+    implementation("ch.qos.logback:logback-classic:$logback_version")
+    implementation(project(":compression"))
+    implementation(project(":e2e"))
+    testImplementation("junit:junit:$junit_version")
+    testImplementation("org.hamcrest:hamcrest:$hamcrest_version")
+}
diff --git a/codeSnippets/snippets/client-bom-remover/src/main/kotlin/com/example/Application.kt b/codeSnippets/snippets/client-bom-remover/src/main/kotlin/com/example/Application.kt
new file mode 100644
index 000000000..229a0cb73
--- /dev/null
+++ b/codeSnippets/snippets/client-bom-remover/src/main/kotlin/com/example/Application.kt
@@ -0,0 +1,24 @@
+package com.example
+
+import compression.*
+import e2e.*
+import io.ktor.client.*
+import io.ktor.client.engine.cio.*
+import io.ktor.client.plugins.bomremover.*
+import io.ktor.client.request.*
+import io.ktor.client.statement.*
+import io.ktor.server.application.*
+import kotlinx.coroutines.*
+
+fun main() {
+    defaultServer(Application::module).start()
+    runBlocking {
+        val client = HttpClient(CIO) {
+            install(BOMRemover)
+        }
+        
+        val response  = client.get("http://0.0.0.0:8080/")
+        println("Body: ${response.bodyAsText()}")
+        client.close()
+    }
+}
diff --git a/codeSnippets/snippets/client-call-id/README.md b/codeSnippets/snippets/client-call-id/README.md
new file mode 100644
index 000000000..9e0ca37e5
--- /dev/null
+++ b/codeSnippets/snippets/client-call-id/README.md
@@ -0,0 +1,27 @@
+# Client call id
+
+A sample Ktor project showing how to use the [CallId](https://ktor.io/docs/client-call-id.html) client plugin.
+The project consists of two parts: an API service and a client.
+The API service utilizes the `callId` plugin on the server and configures it to retrieve a call ID from the request
+header or use a generated call ID.
+
+> This sample is a part of the [codeSnippets](../../README.md) Gradle project.
+
+## Running
+
+1. To start the API service, navigate to `CallIdService.kt` and click on the play button next to the `main()` function.
+
+2. Run the client sample by executing the following command:
+
+```bash
+./gradlew :client-call-id:run
+```
+
+The client makes 3 requests to the API and prints out information about the call ID.
+
+The expected output is:
+```
+Handling request `/call` from client with call.callId: call-id-client and X-RequestId: call-id-client
+Handling request `/call` from client with call.callId: call-id-client and X-RequestId: call-id-client
+Handling request `/call` from client with call.callId: call-id-client-2 and X-RequestId: call-id-client-2
+```
\ No newline at end of file
diff --git a/codeSnippets/snippets/client-call-id/build.gradle.kts b/codeSnippets/snippets/client-call-id/build.gradle.kts
new file mode 100644
index 000000000..6d1284b57
--- /dev/null
+++ b/codeSnippets/snippets/client-call-id/build.gradle.kts
@@ -0,0 +1,32 @@
+val ktor_version: String by project
+val logback_version: String by project
+val junit_version: String by project
+val hamcrest_version: String by project
+
+plugins {
+    application
+    kotlin("jvm")
+}
+
+application {
+    mainClass.set("com.example.ApplicationKt")
+}
+
+repositories {
+    mavenCentral()
+    maven { url = uri("https://maven.pkg.jetbrains.space/public/p/ktor/eap") }
+}
+
+dependencies {
+    implementation("io.ktor:ktor-client-core:$ktor_version")
+    implementation("io.ktor:ktor-client-cio:$ktor_version")
+    implementation("io.ktor:ktor-client-call-id:$ktor_version")
+    implementation("ch.qos.logback:logback-classic:$logback_version")
+    implementation("io.ktor:ktor-server-core:$ktor_version")
+    implementation("io.ktor:ktor-server-netty:$ktor_version")
+    implementation("io.ktor:ktor-server-call-logging:$ktor_version")
+    implementation("io.ktor:ktor-server-call-id:$ktor_version")
+    implementation(project(":e2e"))
+    testImplementation("junit:junit:$junit_version")
+    testImplementation("org.hamcrest:hamcrest:$hamcrest_version")
+}
diff --git a/codeSnippets/snippets/client-call-id/src/main/kotlin/com/example/Application.kt b/codeSnippets/snippets/client-call-id/src/main/kotlin/com/example/Application.kt
new file mode 100644
index 000000000..a3304235c
--- /dev/null
+++ b/codeSnippets/snippets/client-call-id/src/main/kotlin/com/example/Application.kt
@@ -0,0 +1,44 @@
+package com.example
+
+import io.ktor.client.*
+import io.ktor.client.engine.cio.*
+import io.ktor.client.request.*
+import io.ktor.client.statement.*
+import io.ktor.client.plugins.callid.*
+import io.ktor.http.*
+import kotlinx.coroutines.*
+
+suspend fun main() {
+    getRequestWithCallIdFromContext()
+    getRequestWithCustomCallId()
+}
+
+suspend fun getRequestWithCallIdFromContext() {
+    val client = HttpClient(CIO) {
+        install(CallId) {
+            generate { "call-id-client" }
+            addToHeader(HttpHeaders.XRequestId)
+        }
+    }
+    client.use {
+        val response: HttpResponse = client.get("http://0.0.0.0:8090/call")
+        println(response.bodyAsText())
+
+        val responseFromDoubleCall: HttpResponse = client.get("http://0.0.0.0:8090/double-call")
+        println(responseFromDoubleCall.bodyAsText())
+    }
+}
+
+suspend fun getRequestWithCustomCallId() {
+    val client = HttpClient(CIO) {
+        install(CallId) {
+            useCoroutineContext = false
+            generate { "call-id-client-2" }
+        }
+    }
+    client.use {
+        val response: HttpResponse = client.get("http://0.0.0.0:8090/call")
+        println(response.bodyAsText())
+
+    }
+}
diff --git a/codeSnippets/snippets/client-call-id/src/main/kotlin/com/example/CallIdService.kt b/codeSnippets/snippets/client-call-id/src/main/kotlin/com/example/CallIdService.kt
new file mode 100644
index 000000000..e44a898fa
--- /dev/null
+++ b/codeSnippets/snippets/client-call-id/src/main/kotlin/com/example/CallIdService.kt
@@ -0,0 +1,49 @@
+package com.example
+
+import io.ktor.client.*
+import io.ktor.client.engine.cio.*
+import io.ktor.client.request.*
+import io.ktor.client.statement.*
+import io.ktor.http.*
+import io.ktor.client.plugins.callid.CallId as ClientCallId
+import io.ktor.server.application.*
+import io.ktor.server.engine.*
+import io.ktor.server.netty.*
+import io.ktor.server.plugins.callid.*
+import io.ktor.server.response.*
+import io.ktor.server.routing.*
+
+fun main(args: Array<String>) {
+    embeddedServer(Netty, port = 8090, host = "0.0.0.0", module = Application::module)
+        .start(wait = true)
+}
+
+fun Application.module() {
+    val client = HttpClient(CIO) {
+        install(ClientCallId) {
+            intercept { request, callId ->
+                request.header(HttpHeaders.XRequestId, callId)
+            }
+        }
+    }
+    install(CallId) {
+        retrieveFromHeader(HttpHeaders.XRequestId)
+        generate { "call-id-server" }
+        replyToHeader(HttpHeaders.XRequestId)
+    }
+    routing {
+        get("/") {
+            call.respond("Hello World")
+        }
+        get("/double-call") {
+            val response = client.get("http://0.0.0.0:8090/call")
+            call.respond(response.bodyAsText())
+        }
+        get("/call") {
+            val callIdFromCall = call.callId
+            val callIdFromHeader = call.request.headers[HttpHeaders.XRequestId]
+            call.respond("Handling request `/call` from client with call.callId: $callIdFromCall and X-RequestId: $callIdFromHeader")
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/codeSnippets/snippets/client-content-encoding/src/main/kotlin/com/example/Application.kt b/codeSnippets/snippets/client-content-encoding/src/main/kotlin/com/example/Application.kt
index 50471b6b0..4e7d36a7a 100644
--- a/codeSnippets/snippets/client-content-encoding/src/main/kotlin/com/example/Application.kt
+++ b/codeSnippets/snippets/client-content-encoding/src/main/kotlin/com/example/Application.kt
@@ -7,7 +7,6 @@ import io.ktor.client.engine.cio.*
 import io.ktor.client.plugins.compression.*
 import io.ktor.client.request.*
 import io.ktor.client.statement.*
-import io.ktor.http.*
 import io.ktor.server.application.*
 import kotlinx.coroutines.*
 
@@ -22,7 +21,7 @@ fun main() {
         }
 
         val response: HttpResponse = client.get("http://0.0.0.0:8080/")
-        println("Content-Encoding: ${response.headers[HttpHeaders.ContentEncoding]}")
+        println("Content-Encoding: ${response.appliedDecoders}")
         println("Body: ${response.bodyAsText()}")
         client.close()
     }
diff --git a/codeSnippets/snippets/client-content-encoding/src/test/kotlin/com/example/ApplicationTest.kt b/codeSnippets/snippets/client-content-encoding/src/test/kotlin/com/example/ApplicationTest.kt
index 38b1b9038..b6c862a77 100644
--- a/codeSnippets/snippets/client-content-encoding/src/test/kotlin/com/example/ApplicationTest.kt
+++ b/codeSnippets/snippets/client-content-encoding/src/test/kotlin/com/example/ApplicationTest.kt
@@ -11,7 +11,7 @@ class ApplicationTest {
     fun outputContainsCompressionHeader() {
         val output = runGradleAppWaiting().inputStream.readString()
 
-        assertThat(output, containsString("Content-Encoding: deflate"))
+        assertThat(output, containsString("Content-Encoding: [deflate]"))
         assertThat(output, containsString("Body: Hello, world!"))
     }
 }
\ No newline at end of file
diff --git a/codeSnippets/snippets/client-engine-curl/build.gradle.kts b/codeSnippets/snippets/client-engine-curl/build.gradle.kts
index 0e28301c1..8eedb65c4 100644
--- a/codeSnippets/snippets/client-engine-curl/build.gradle.kts
+++ b/codeSnippets/snippets/client-engine-curl/build.gradle.kts
@@ -3,7 +3,6 @@ val kotlin_version: String by project
 val logback_version: String by project
 
 plugins {
-    application
     kotlin("multiplatform")
 }
 
diff --git a/codeSnippets/snippets/client-engine-js/README.md b/codeSnippets/snippets/client-engine-js/README.md
index 9b7daf591..42002e79c 100644
--- a/codeSnippets/snippets/client-engine-js/README.md
+++ b/codeSnippets/snippets/client-engine-js/README.md
@@ -1,6 +1,7 @@
 # Client - JavaScript engine
 
-A sample Ktor project showing how to use the [JavaScript](https://ktor.io/docs/http-client-engines.html#js) client engine.
+A sample Ktor project showing how to use the [JavaScript](https://ktor.io/docs/http-client-engines.html#js) client
+engine.
 > This sample is a part of the [codeSnippets](../../README.md) Gradle project.
 
 ## Running
@@ -16,7 +17,7 @@ Then, run [cors](../cors):
 Open another terminal tab and run this sample by executing the following command:
 
 ```bash
-./gradlew :client-engine-js:browserProductionRun --continuous
+./gradlew :client-engine-js:jsBrowserProductionRun --continuous
 ```
 
 On the opened page, click the button to make a request.
diff --git a/codeSnippets/snippets/client-engine-js/build.gradle.kts b/codeSnippets/snippets/client-engine-js/build.gradle.kts
index 5251dfe62..f5f2ef884 100644
--- a/codeSnippets/snippets/client-engine-js/build.gradle.kts
+++ b/codeSnippets/snippets/client-engine-js/build.gradle.kts
@@ -2,7 +2,7 @@ val ktor_version: String by project
 val kotlinx_html_version: String by project
 
 plugins {
-    kotlin("js")
+    kotlin("multiplatform")
     kotlin("plugin.serialization").version("2.0.0")
 }
 
@@ -12,14 +12,6 @@ repositories {
     maven("https://maven.pkg.jetbrains.space/public/p/ktor/eap")
 }
 
-dependencies {
-    implementation("org.jetbrains.kotlinx:kotlinx-html:$kotlinx_html_version")
-    implementation("io.ktor:ktor-client-core:$ktor_version")
-    implementation("io.ktor:ktor-client-js:$ktor_version")
-    implementation("io.ktor:ktor-client-content-negotiation:$ktor_version")
-    implementation("io.ktor:ktor-serialization-kotlinx-json:$ktor_version")
-}
-
 kotlin {
     js(IR) {
         binaries.executable()
@@ -31,4 +23,14 @@ kotlin {
             }
         }
     }
+    sourceSets {
+        val jsMain by getting {
+            dependencies {
+                implementation("org.jetbrains.kotlinx:kotlinx-html:$kotlinx_html_version")
+                implementation("io.ktor:ktor-client-core:$ktor_version")
+                implementation("io.ktor:ktor-client-js:$ktor_version")
+                implementation("io.ktor:ktor-client-content-negotiation:$ktor_version")
+                implementation("io.ktor:ktor-serialization-kotlinx-json:$ktor_version")            }
+        }
+    }
 }
diff --git a/codeSnippets/snippets/client-engine-js/src/main/kotlin/Client.kt b/codeSnippets/snippets/client-engine-js/src/jsMain/kotlin/Client.kt
similarity index 100%
rename from codeSnippets/snippets/client-engine-js/src/main/kotlin/Client.kt
rename to codeSnippets/snippets/client-engine-js/src/jsMain/kotlin/Client.kt
diff --git a/codeSnippets/snippets/client-engine-js/src/main/resources/index.html b/codeSnippets/snippets/client-engine-js/src/jsMain/resources/index.html
similarity index 100%
rename from codeSnippets/snippets/client-engine-js/src/main/resources/index.html
rename to codeSnippets/snippets/client-engine-js/src/jsMain/resources/index.html
diff --git a/codeSnippets/snippets/client-engine-winhttp/build.gradle.kts b/codeSnippets/snippets/client-engine-winhttp/build.gradle.kts
index 9ff947e29..6a03153e8 100644
--- a/codeSnippets/snippets/client-engine-winhttp/build.gradle.kts
+++ b/codeSnippets/snippets/client-engine-winhttp/build.gradle.kts
@@ -4,7 +4,7 @@ val logback_version: String by project
 
 plugins {
     application
-    kotlin("multiplatform")
+    kotlin("multiplatform") version "2.0.0"
 }
 
 repositories {
diff --git a/codeSnippets/snippets/client-sse/README.md b/codeSnippets/snippets/client-sse/README.md
new file mode 100644
index 000000000..7d6e9bba3
--- /dev/null
+++ b/codeSnippets/snippets/client-sse/README.md
@@ -0,0 +1,18 @@
+# Client SSE
+
+A sample Ktor project showing how to use [SSE](https://ktor.io/docs/client-sse.html) in a Ktor client.
+> This sample is a part of the [codeSnippets](../../README.md) Gradle project.
+
+## Running
+
+Before running this sample, start a [Ktor server](../server-sse) first:
+
+```bash
+./gradlew :server-sse:run
+```
+
+Then, open a separate tab and execute the following command to start the client application:
+
+```bash
+./gradlew :client-sse:run
+```
diff --git a/codeSnippets/snippets/client-sse/build.gradle.kts b/codeSnippets/snippets/client-sse/build.gradle.kts
new file mode 100644
index 000000000..fd4a430a5
--- /dev/null
+++ b/codeSnippets/snippets/client-sse/build.gradle.kts
@@ -0,0 +1,32 @@
+val ktor_version: String by project
+val logback_version: String by project
+val junit_version: String by project
+val hamcrest_version: String by project
+
+plugins {
+    application
+    kotlin("jvm")
+}
+
+application {
+    mainClass.set("com.example.ApplicationKt")
+}
+
+repositories {
+    mavenCentral()
+    maven { url = uri("https://maven.pkg.jetbrains.space/public/p/ktor/eap") }
+}
+
+tasks.named<JavaExec>("run") {
+    standardInput = System.`in`
+}
+
+dependencies {
+    implementation("io.ktor:ktor-client-core:$ktor_version")
+    implementation("io.ktor:ktor-client-cio:$ktor_version")
+    implementation("io.ktor:ktor-client-logging:$ktor_version")
+    implementation("ch.qos.logback:logback-classic:$logback_version")
+    testImplementation("junit:junit:$junit_version")
+    testImplementation("org.hamcrest:hamcrest:$hamcrest_version")
+    testImplementation(project(":e2e"))
+}
diff --git a/codeSnippets/snippets/client-sse/src/main/kotlin/com.example/Application.kt b/codeSnippets/snippets/client-sse/src/main/kotlin/com.example/Application.kt
new file mode 100644
index 000000000..d051909e8
--- /dev/null
+++ b/codeSnippets/snippets/client-sse/src/main/kotlin/com.example/Application.kt
@@ -0,0 +1,27 @@
+package com.example
+
+import io.ktor.client.*
+import io.ktor.client.plugins.sse.*
+import kotlinx.coroutines.*
+
+
+fun main() {
+
+    val client = HttpClient {
+        install(SSE) {
+            showCommentEvents()
+            showRetryEvents()
+        }
+    }
+    runBlocking {
+        client.sse(host = "0.0.0.0", port = 8080, path = "/events") {
+            while (true) {
+                incoming.collect { event ->
+                    println("Event from server:")
+                    println(event)
+                }
+            }
+        }
+    }
+    client.close()
+}
\ No newline at end of file
diff --git a/codeSnippets/snippets/client-websockets/src/main/kotlin/com/example/Application.kt b/codeSnippets/snippets/client-websockets/src/main/kotlin/com/example/Application.kt
index b9250099a..42b6f330e 100644
--- a/codeSnippets/snippets/client-websockets/src/main/kotlin/com/example/Application.kt
+++ b/codeSnippets/snippets/client-websockets/src/main/kotlin/com/example/Application.kt
@@ -11,7 +11,7 @@ import java.util.*
 fun main() {
     val client = HttpClient(CIO) {
         install(WebSockets) {
-            pingInterval = 20_000
+            pingIntervalMillis = 20_000
         }
     }
     runBlocking {
diff --git a/codeSnippets/snippets/compression/build.gradle.kts b/codeSnippets/snippets/compression/build.gradle.kts
index c7eb9ef23..366d51c13 100644
--- a/codeSnippets/snippets/compression/build.gradle.kts
+++ b/codeSnippets/snippets/compression/build.gradle.kts
@@ -22,6 +22,10 @@ dependencies {
     implementation("io.ktor:ktor-server-netty:$ktor_version")
     implementation("io.ktor:ktor-server-compression:$ktor_version")
     implementation("ch.qos.logback:logback-classic:$logback_version")
-    testImplementation("io.ktor:ktor-server-test-host:$ktor_version")
+    testImplementation("io.ktor:ktor-server-test-host-jvm:$ktor_version")
     testImplementation("org.jetbrains.kotlin:kotlin-test")
 }
+
+kotlin {
+    jvmToolchain(11)
+}
\ No newline at end of file
diff --git a/codeSnippets/snippets/compression/src/test/kotlin/compression/ApplicationTest.kt b/codeSnippets/snippets/compression/src/test/kotlin/compression/ApplicationTest.kt
index 2f34ef3f8..33131ff0e 100644
--- a/codeSnippets/snippets/compression/src/test/kotlin/compression/ApplicationTest.kt
+++ b/codeSnippets/snippets/compression/src/test/kotlin/compression/ApplicationTest.kt
@@ -8,6 +8,9 @@ import kotlin.test.*
 class ApplicationTest {
     @Test
     fun testRoot() = testApplication {
+        application {
+            module()
+        }
         val response = client.get("/") {
             header(HttpHeaders.AcceptEncoding, "gzip, deflate")
         }
diff --git a/codeSnippets/snippets/cors/build.gradle.kts b/codeSnippets/snippets/cors/build.gradle.kts
index a7047c150..23f94bf96 100644
--- a/codeSnippets/snippets/cors/build.gradle.kts
+++ b/codeSnippets/snippets/cors/build.gradle.kts
@@ -27,7 +27,7 @@ dependencies {
     implementation("io.ktor:ktor-serialization-kotlinx-json:$ktor_version")
     implementation("io.ktor:ktor-server-html-builder:$ktor_version")
     implementation("ch.qos.logback:logback-classic:$logback_version")
-    testImplementation("io.ktor:ktor-server-test-host:$ktor_version")
+    testImplementation("io.ktor:ktor-server-test-host-jvm:$ktor_version")
     testImplementation("io.ktor:ktor-client-content-negotiation:$ktor_version")
     testImplementation("org.jetbrains.kotlin:kotlin-test")
 }
diff --git a/codeSnippets/snippets/cors/src/main/kotlin/com/example/Application.kt b/codeSnippets/snippets/cors/src/main/kotlin/com/example/Application.kt
index 154d8c8f6..0391ae58e 100644
--- a/codeSnippets/snippets/cors/src/main/kotlin/com/example/Application.kt
+++ b/codeSnippets/snippets/cors/src/main/kotlin/com/example/Application.kt
@@ -21,17 +21,18 @@ import java.io.*
 data class Customer(val id: Int, val firstName: String, val lastName: String)
 
 fun main() {
-    val env = applicationEngineEnvironment {
-        envConfig()
+    val appProperties = serverConfig {
+        module {
+            backendModule()
+            frontendModule()
+        }
     }
-    embeddedServer(Netty, env).start(true)
+    embeddedServer(Netty, appProperties) {
+        envConfig()
+    }.start(true)
 }
 
-fun ApplicationEngineEnvironmentBuilder.envConfig() {
-    module {
-        backendModule()
-        frontendModule()
-    }
+fun ApplicationEngine.Configuration.envConfig() {
     connector {
         host = "0.0.0.0"
         port = 8080
@@ -78,10 +79,7 @@ fun Application.frontendModule() {
                     }
                 }
             }
-            static("static") {
-                staticRootFolder = File("files")
-                files("js")
-            }
+            staticFiles("static", File("files"), "js/script.js")
         }
     }
 }
diff --git a/codeSnippets/snippets/cors/src/test/kotlin/ApplicationTest.kt b/codeSnippets/snippets/cors/src/test/kotlin/ApplicationTest.kt
index 71d55e869..b4d2696c5 100644
--- a/codeSnippets/snippets/cors/src/test/kotlin/ApplicationTest.kt
+++ b/codeSnippets/snippets/cors/src/test/kotlin/ApplicationTest.kt
@@ -4,6 +4,8 @@ import io.ktor.client.request.*
 import io.ktor.client.statement.*
 import io.ktor.http.*
 import io.ktor.serialization.kotlinx.json.*
+import io.ktor.server.application.*
+import io.ktor.server.engine.*
 import io.ktor.server.testing.*
 import org.junit.Test
 import kotlin.test.*
@@ -11,24 +13,30 @@ import kotlin.test.*
 class ApplicationTest {
     @Test
     fun testFrontendPage(): Unit = testApplication {
-        environment {
+        engine {
             envConfig()
         }
-        client.get("/") {
+        serverConfig { module {
+                frontendModule()
+                backendModule()
+            }
+        }
+
+        val response = client.get("/"){
             host = "0.0.0.0"
             port = 8081
-        }.apply {
-            assertEquals(
-                """
-<!DOCTYPE html>
-<html>
-  <head>
-    <script src="/static/script.js"></script>
-  </head>
-  <body><button onclick="saveCustomer()">Make a CORS request to save a customer</button></body>
-</html>
-
-""".trimIndent(), bodyAsText())
         }
+        assertEquals(
+            """
+            <!DOCTYPE html>
+            <html>
+              <head>
+                <script src="/static/script.js"></script>
+              </head>
+              <body><button onclick="saveCustomer()">Make a CORS request to save a customer</button></body>
+            </html>
+            
+            """.trimIndent(), response.bodyAsText()
+        )
     }
 }
\ No newline at end of file
diff --git a/codeSnippets/snippets/css-dsl/build.gradle.kts b/codeSnippets/snippets/css-dsl/build.gradle.kts
index 11b692f80..9c926c5b2 100644
--- a/codeSnippets/snippets/css-dsl/build.gradle.kts
+++ b/codeSnippets/snippets/css-dsl/build.gradle.kts
@@ -24,6 +24,6 @@ dependencies {
     implementation("io.ktor:ktor-server-html-builder:$ktor_version")
     implementation("org.jetbrains.kotlin-wrappers:kotlin-css:$kotlin_css_version")
     implementation("ch.qos.logback:logback-classic:$logback_version")
-    testImplementation("io.ktor:ktor-server-test-host:$ktor_version")
+    testImplementation("io.ktor:ktor-server-test-host-jvm:$ktor_version")
     testImplementation("org.jetbrains.kotlin:kotlin-test")
 }
diff --git a/codeSnippets/snippets/css-dsl/src/test/kotlin/ApplicationTest.kt b/codeSnippets/snippets/css-dsl/src/test/kotlin/ApplicationTest.kt
index 76e999c98..229f1b02b 100644
--- a/codeSnippets/snippets/css-dsl/src/test/kotlin/ApplicationTest.kt
+++ b/codeSnippets/snippets/css-dsl/src/test/kotlin/ApplicationTest.kt
@@ -1,3 +1,5 @@
+package com.example
+
 import io.ktor.client.request.*
 import io.ktor.client.statement.*
 import io.ktor.server.testing.*
@@ -6,6 +8,9 @@ import kotlin.test.*
 class ApplicationTest {
     @Test
     fun testCssRoute() = testApplication {
+        application {
+            main()
+        }
         client.get("/styles.css").let {response ->
             assertEquals(
                 """
diff --git a/codeSnippets/snippets/custom-plugin-authorization/build.gradle.kts b/codeSnippets/snippets/custom-plugin-authorization/build.gradle.kts
index a1e21997d..a7c841aa4 100644
--- a/codeSnippets/snippets/custom-plugin-authorization/build.gradle.kts
+++ b/codeSnippets/snippets/custom-plugin-authorization/build.gradle.kts
@@ -22,6 +22,6 @@ dependencies {
     implementation("io.ktor:ktor-server-netty:$ktor_version")
     implementation("io.ktor:ktor-server-auth:$ktor_version")
     implementation("ch.qos.logback:logback-classic:$logback_version")
-    testImplementation("io.ktor:ktor-server-test-host:$ktor_version")
+    testImplementation("io.ktor:ktor-server-test-host-jvm:$ktor_version")
     testImplementation("org.jetbrains.kotlin:kotlin-test")
 }
diff --git a/codeSnippets/snippets/custom-plugin-authorization/src/test/kotlin/AuthorizationPluginTest.kt b/codeSnippets/snippets/custom-plugin-authorization/src/test/kotlin/AuthorizationPluginTest.kt
index 7b7c02bcf..356767566 100644
--- a/codeSnippets/snippets/custom-plugin-authorization/src/test/kotlin/AuthorizationPluginTest.kt
+++ b/codeSnippets/snippets/custom-plugin-authorization/src/test/kotlin/AuthorizationPluginTest.kt
@@ -12,6 +12,9 @@ import kotlin.test.assertEquals
 class ApplicationTest {
     @Test
     fun testAuthRoute() = testApplication {
+        application {
+            module()
+        }
         val client = createClient {
             defaultRequest {
                 val credentials = Base64.getEncoder().encodeToString("jetbrains:foobar".toByteArray())
diff --git a/codeSnippets/snippets/custom-plugin-base-api/build.gradle.kts b/codeSnippets/snippets/custom-plugin-base-api/build.gradle.kts
index ce61d2618..0f10ec14e 100644
--- a/codeSnippets/snippets/custom-plugin-base-api/build.gradle.kts
+++ b/codeSnippets/snippets/custom-plugin-base-api/build.gradle.kts
@@ -21,6 +21,6 @@ dependencies {
     implementation("io.ktor:ktor-server-core:$ktor_version")
     implementation("io.ktor:ktor-server-netty:$ktor_version")
     implementation("ch.qos.logback:logback-classic:$logback_version")
-    testImplementation("io.ktor:ktor-server-test-host:$ktor_version")
+    testImplementation("io.ktor:ktor-server-test-host-jvm:$ktor_version")
     testImplementation("org.jetbrains.kotlin:kotlin-test")
 }
diff --git a/codeSnippets/snippets/custom-plugin-base-api/src/test/kotlin/com/example/CustomHeaderTest.kt b/codeSnippets/snippets/custom-plugin-base-api/src/test/kotlin/com/example/CustomHeaderTest.kt
index d67f9cb05..309ad55c5 100644
--- a/codeSnippets/snippets/custom-plugin-base-api/src/test/kotlin/com/example/CustomHeaderTest.kt
+++ b/codeSnippets/snippets/custom-plugin-base-api/src/test/kotlin/com/example/CustomHeaderTest.kt
@@ -7,6 +7,9 @@ import kotlin.test.*
 class CustomHeaderTest {
     @Test
     fun testCustomHeader() = testApplication {
+        application {
+            main()
+        }
         val response = client.get("/")
         assertEquals("Hello, world!", response.headers["X-Custom-Header"])
     }
diff --git a/codeSnippets/snippets/custom-plugin-base-api/src/test/kotlin/com/example/DataTransformationTest.kt b/codeSnippets/snippets/custom-plugin-base-api/src/test/kotlin/com/example/DataTransformationTest.kt
index fabd5fb02..5ddc384a9 100644
--- a/codeSnippets/snippets/custom-plugin-base-api/src/test/kotlin/com/example/DataTransformationTest.kt
+++ b/codeSnippets/snippets/custom-plugin-base-api/src/test/kotlin/com/example/DataTransformationTest.kt
@@ -8,6 +8,9 @@ import kotlin.test.*
 class DataTransformationTest {
     @Test
     fun testTransformData() = testApplication {
+        application {
+            main()
+        }
         val response = client.post("/transform-data") {
             setBody("10")
         }
diff --git a/codeSnippets/snippets/custom-plugin/build.gradle.kts b/codeSnippets/snippets/custom-plugin/build.gradle.kts
index 9fee42fdc..46615f0ae 100644
--- a/codeSnippets/snippets/custom-plugin/build.gradle.kts
+++ b/codeSnippets/snippets/custom-plugin/build.gradle.kts
@@ -22,6 +22,6 @@ dependencies {
     implementation("io.ktor:ktor-server-netty:$ktor_version")
     implementation("io.ktor:ktor-server-config-yaml:$ktor_version")
     implementation("ch.qos.logback:logback-classic:$logback_version")
-    testImplementation("io.ktor:ktor-server-test-host:$ktor_version")
+    testImplementation("io.ktor:ktor-server-test-host-jvm:$ktor_version")
     testImplementation("org.jetbrains.kotlin:kotlin-test")
 }
diff --git a/codeSnippets/snippets/custom-plugin/src/test/kotlin/CustomHeaderPluginConfigurableTest.kt b/codeSnippets/snippets/custom-plugin/src/test/kotlin/CustomHeaderPluginConfigurableTest.kt
index e2148af3d..275540f0e 100644
--- a/codeSnippets/snippets/custom-plugin/src/test/kotlin/CustomHeaderPluginConfigurableTest.kt
+++ b/codeSnippets/snippets/custom-plugin/src/test/kotlin/CustomHeaderPluginConfigurableTest.kt
@@ -1,3 +1,5 @@
+package com.example
+
 import com.example.plugins.*
 import io.ktor.client.request.*
 import io.ktor.server.application.*
@@ -5,6 +7,7 @@ import io.ktor.server.testing.*
 import kotlin.test.*
 
 class CustomHeaderPluginConfigurableTest {
+    @Ignore
     @Test
     fun testRoot() = testApplication {
         application {
diff --git a/codeSnippets/snippets/custom-plugin/src/test/kotlin/CustomHeaderPluginTest.kt b/codeSnippets/snippets/custom-plugin/src/test/kotlin/CustomHeaderPluginTest.kt
index 118aae361..5efcda198 100644
--- a/codeSnippets/snippets/custom-plugin/src/test/kotlin/CustomHeaderPluginTest.kt
+++ b/codeSnippets/snippets/custom-plugin/src/test/kotlin/CustomHeaderPluginTest.kt
@@ -1,3 +1,5 @@
+package com.example
+
 import io.ktor.client.request.*
 import io.ktor.server.testing.*
 import kotlin.test.*
@@ -5,6 +7,9 @@ import kotlin.test.*
 class CustomHeaderPluginTest {
     @Test
     fun testRoot() = testApplication {
+        application {
+            module()
+        }
         val response = client.get("/")
         assertEquals("Hello, world!", response.headers["X-Custom-Header"].toString())
     }
diff --git a/codeSnippets/snippets/custom-plugin/src/test/kotlin/DataTransformationPluginTest.kt b/codeSnippets/snippets/custom-plugin/src/test/kotlin/DataTransformationPluginTest.kt
index 8b1e3660e..5fe42f4d7 100644
--- a/codeSnippets/snippets/custom-plugin/src/test/kotlin/DataTransformationPluginTest.kt
+++ b/codeSnippets/snippets/custom-plugin/src/test/kotlin/DataTransformationPluginTest.kt
@@ -1,3 +1,5 @@
+package com.example
+
 import io.ktor.client.request.*
 import io.ktor.client.statement.*
 import io.ktor.server.testing.*
@@ -6,6 +8,9 @@ import kotlin.test.*
 class DataTransformationPluginTest {
     @Test
     fun testTransformData() = testApplication {
+        application {
+            module()
+        }
         val response = client.post("/transform-data") {
             setBody("10")
         }
diff --git a/codeSnippets/snippets/data-conversion/README.md b/codeSnippets/snippets/data-conversion/README.md
index 67bf991da..e6f49332f 100644
--- a/codeSnippets/snippets/data-conversion/README.md
+++ b/codeSnippets/snippets/data-conversion/README.md
@@ -13,15 +13,10 @@ To run the service, execute the following command in a repository's root directo
 
 ## Test
 
-Open [get.http](get.http) and run a `GET` request by clicking on the `play` button in the intelliJ IDEA editor.
+1. Open [get.http](get.http).
+2. Run the `GET` request by clicking on the `play` button from the intelliJ IDEA editor.
 
-The first `GET` request calls the `/article` endpoint with parameter `article=a`. The expected response is:
-
-```
-The received article is A
-```
-
-The second `GET` request calls the `/date` endpoint with parameter `date=20170501`. The expected response is:
+The `GET` request calls the `/date` endpoint with parameter `date=20170501`. The expected response is:
 
 ```
 The date is 2017-05-01
diff --git a/codeSnippets/snippets/data-conversion/build.gradle.kts b/codeSnippets/snippets/data-conversion/build.gradle.kts
index 6830f4fe7..b878b8ad2 100644
--- a/codeSnippets/snippets/data-conversion/build.gradle.kts
+++ b/codeSnippets/snippets/data-conversion/build.gradle.kts
@@ -20,10 +20,9 @@ dependencies {
     implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version")
     implementation("io.ktor:ktor-server-core:$ktor_version")
     implementation("io.ktor:ktor-server-netty:$ktor_version")
-    implementation("io.ktor:ktor-server-locations:$ktor_version")
     implementation("io.ktor:ktor-server-data-conversion:$ktor_version")
     implementation("io.ktor:ktor-server-html-builder:$ktor_version")
     implementation("ch.qos.logback:logback-classic:$logback_version")
-    testImplementation("io.ktor:ktor-server-test-host:$ktor_version")
+    testImplementation("io.ktor:ktor-server-test-host-jvm:$ktor_version")
     testImplementation("org.jetbrains.kotlin:kotlin-test")
 }
diff --git a/codeSnippets/snippets/data-conversion/get.http b/codeSnippets/snippets/data-conversion/get.http
index 4838152ff..733410d80 100644
--- a/codeSnippets/snippets/data-conversion/get.http
+++ b/codeSnippets/snippets/data-conversion/get.http
@@ -1,6 +1,3 @@
-### GET request to "/article"
-GET http://localhost:8080/?article=a
-
 ### GET request to "/date"
 
 GET http://localhost:8080/date?date=20170501
diff --git a/codeSnippets/snippets/data-conversion/src/main/kotlin/dataconversion/Application.kt b/codeSnippets/snippets/data-conversion/src/main/kotlin/dataconversion/Application.kt
index c294b54eb..eee35e9d6 100644
--- a/codeSnippets/snippets/data-conversion/src/main/kotlin/dataconversion/Application.kt
+++ b/codeSnippets/snippets/data-conversion/src/main/kotlin/dataconversion/Application.kt
@@ -1,7 +1,6 @@
 package dataconversion
 
 import io.ktor.server.application.*
-import io.ktor.server.locations.*
 import io.ktor.server.plugins.dataconversion.*
 import io.ktor.server.response.*
 import io.ktor.server.routing.*
@@ -13,17 +12,9 @@ import java.time.format.SignStyle
 import java.time.temporal.ChronoField
 import java.util.*
 
-enum class ArticleEnum {
-    A, B, C
-}
-
-@Location("/")
-class LocationWithEnum(val article: ArticleEnum)
-
 fun main(args: Array<String>): Unit = io.ktor.server.netty.EngineMain.main(args)
 
 fun Application.module() {
-    install(Locations)
     install(DataConversion) {
         convert<LocalDate> { // this: DelegatingConversionService
             val formatter = DateTimeFormatterBuilder()
@@ -40,18 +31,9 @@ fun Application.module() {
                 listOf(SimpleDateFormat.getInstance().format(value))
             }
         }
-        convert<ArticleEnum> {
-            decode { values ->
-                ArticleEnum.entries.first { it.name.lowercase() in values }
-            }
-            encode { value -> listOf(value.name.lowercase()) }
-        }
     }
 
     routing {
-        get<LocationWithEnum> { data ->
-            call.respondText("The received article is ${data.article.name}")
-        }
         get("/date") {
             val encodedDate = application.conversionService.toValues(call.parameters["date"])
             val decodedDate = application.conversionService.fromValues(encodedDate, typeInfo<LocalDate>())
diff --git a/codeSnippets/snippets/data-conversion/src/test/kotlin/dataconversion/ApplicationTest.kt b/codeSnippets/snippets/data-conversion/src/test/kotlin/dataconversion/ApplicationTest.kt
index 3c9a42cd9..c97ad44ea 100644
--- a/codeSnippets/snippets/data-conversion/src/test/kotlin/dataconversion/ApplicationTest.kt
+++ b/codeSnippets/snippets/data-conversion/src/test/kotlin/dataconversion/ApplicationTest.kt
@@ -6,14 +6,11 @@ import io.ktor.server.testing.*
 import kotlin.test.*
 
 class ApplicationTest {
-    @Test
-    fun testArticleEnum() = testApplication {
-        val response = client.get("/?article=a")
-        assertEquals("The received article is A", response.bodyAsText())
-    }
-
     @Test
     fun testConvertedDate() = testApplication {
+        application {
+            module()
+        }
         val response = client.get("/date?date=20170501")
         assertEquals("The date is 2017-05-01", response.bodyAsText())
     }
diff --git a/codeSnippets/snippets/deployment-ktor-plugin/build.gradle.kts b/codeSnippets/snippets/deployment-ktor-plugin/build.gradle.kts
index e49a438f1..e2d8b2289 100644
--- a/codeSnippets/snippets/deployment-ktor-plugin/build.gradle.kts
+++ b/codeSnippets/snippets/deployment-ktor-plugin/build.gradle.kts
@@ -1,11 +1,10 @@
-val ktor_version: String by project
 val kotlin_version: String by project
 val logback_version: String by project
 
 plugins {
     application
     kotlin("jvm")
-    id("io.ktor.plugin") version "2.3.12"
+    id("io.ktor.plugin") version "3.0.0"
 }
 
 application {
@@ -19,10 +18,10 @@ repositories {
 
 dependencies {
     implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version")
-    implementation("io.ktor:ktor-server-core:$ktor_version")
-    implementation("io.ktor:ktor-server-cio:$ktor_version")
+    implementation("io.ktor:ktor-server-core-jvm")
+    implementation("io.ktor:ktor-server-cio-jvm")
     implementation("ch.qos.logback:logback-classic:$logback_version")
-    testImplementation("io.ktor:ktor-server-test-host:$ktor_version")
+    testImplementation("io.ktor:ktor-server-test-host-jvm")
     testImplementation("org.jetbrains.kotlin:kotlin-test")
 }
 
diff --git a/codeSnippets/snippets/double-receive/build.gradle.kts b/codeSnippets/snippets/double-receive/build.gradle.kts
index c5762433b..4ae0a755c 100644
--- a/codeSnippets/snippets/double-receive/build.gradle.kts
+++ b/codeSnippets/snippets/double-receive/build.gradle.kts
@@ -24,6 +24,6 @@ dependencies {
     implementation("io.ktor:ktor-server-double-receive:$ktor_version")
     implementation("io.ktor:ktor-server-call-logging:$ktor_version")
     implementation("ch.qos.logback:logback-classic:$logback_version")
-    testImplementation("io.ktor:ktor-server-test-host:$ktor_version")
+    testImplementation("io.ktor:ktor-server-test-host-jvm:$ktor_version")
     testImplementation("org.jetbrains.kotlin:kotlin-test")
 }
diff --git a/codeSnippets/snippets/double-receive/src/main/kotlin/com/example/Application.kt b/codeSnippets/snippets/double-receive/src/main/kotlin/com/example/Application.kt
index ff491967a..7e327f843 100644
--- a/codeSnippets/snippets/double-receive/src/main/kotlin/com/example/Application.kt
+++ b/codeSnippets/snippets/double-receive/src/main/kotlin/com/example/Application.kt
@@ -1,7 +1,7 @@
 package com.example
 
 import io.ktor.server.application.*
-import io.ktor.server.plugins.callloging.*
+import io.ktor.server.plugins.calllogging.*
 import io.ktor.server.plugins.doublereceive.*
 import io.ktor.server.request.*
 import io.ktor.server.response.*
diff --git a/codeSnippets/snippets/double-receive/src/test/kotlin/ApplicationTest.kt b/codeSnippets/snippets/double-receive/src/test/kotlin/ApplicationTest.kt
index 56b808642..cf95f5bdc 100644
--- a/codeSnippets/snippets/double-receive/src/test/kotlin/ApplicationTest.kt
+++ b/codeSnippets/snippets/double-receive/src/test/kotlin/ApplicationTest.kt
@@ -8,6 +8,9 @@ import kotlin.test.*
 class ApplicationTest {
     @Test
     fun testDoubleReceive() = testApplication {
+        application {
+            module()
+        }
         val response = client.post("/") {
             setBody("Hello, world!")
         }
diff --git a/codeSnippets/snippets/download-file/.DS_Store b/codeSnippets/snippets/download-file/.DS_Store
new file mode 100644
index 000000000..662eb20ba
Binary files /dev/null and b/codeSnippets/snippets/download-file/.DS_Store differ
diff --git a/codeSnippets/snippets/download-file/README.md b/codeSnippets/snippets/download-file/README.md
index e2ad3e404..1e6396059 100644
--- a/codeSnippets/snippets/download-file/README.md
+++ b/codeSnippets/snippets/download-file/README.md
@@ -1,13 +1,17 @@
 # Download a File
 
-A sample Ktor project showing how to send a file in a [response](https://ktor.io/docs/responses.html) using the `respondFile` function. The `Content-Disposition` header is added to a response to make a file downloadable.
+A sample Ktor project showing how to send a file in a [response](https://ktor.io/docs/responses.html) using
+the `respondFile` function. The `Content-Disposition` header is added to a response to make a file downloadable.
 > This sample is a part of the [codeSnippets](../../README.md) Gradle project.
 
 ## Running
+
 To download a file, follow the steps below:
-1. Open a terminal and run a sample:
+
+1. To start the application, execute the following command in the repository's root directory:
    ```bash
    ./gradlew :download-file:run
    ```
-1. Open the [http://localhost:8080/download](http://localhost:8080/download) page to download a sample file from a server.
-
+2. Navigate to [http://localhost:8080/download](http://localhost:8080/download) page to download a PNG file.
+3. Navigate to  [http://localhost:8080/downloadFromPath](http://localhost:8080/downloadFromPath) page to download a TXT
+   file.
diff --git a/codeSnippets/snippets/download-file/build.gradle.kts b/codeSnippets/snippets/download-file/build.gradle.kts
index d9275d0b4..93f6b52cf 100644
--- a/codeSnippets/snippets/download-file/build.gradle.kts
+++ b/codeSnippets/snippets/download-file/build.gradle.kts
@@ -24,6 +24,6 @@ dependencies {
     implementation("io.ktor:ktor-server-partial-content:$ktor_version")
     implementation("io.ktor:ktor-server-auto-head-response:$ktor_version")
     implementation("ch.qos.logback:logback-classic:$logback_version")
-    testImplementation("io.ktor:ktor-server-test-host:$ktor_version")
+    testImplementation("io.ktor:ktor-server-test-host-jvm:$ktor_version")
     testImplementation("junit:junit:$junit_version")
 }
diff --git a/codeSnippets/snippets/download-file/files/.DS_Store b/codeSnippets/snippets/download-file/files/.DS_Store
new file mode 100644
index 000000000..ecde3a535
Binary files /dev/null and b/codeSnippets/snippets/download-file/files/.DS_Store differ
diff --git a/codeSnippets/snippets/download-file/files/file.txt b/codeSnippets/snippets/download-file/files/file.txt
new file mode 100644
index 000000000..2d8748cee
--- /dev/null
+++ b/codeSnippets/snippets/download-file/files/file.txt
@@ -0,0 +1 @@
+Just a simple text file.
\ No newline at end of file
diff --git a/codeSnippets/snippets/download-file/src/main/kotlin/com/example/DownloadFile.kt b/codeSnippets/snippets/download-file/src/main/kotlin/com/example/DownloadFile.kt
index d59998a88..313f80f65 100644
--- a/codeSnippets/snippets/download-file/src/main/kotlin/com/example/DownloadFile.kt
+++ b/codeSnippets/snippets/download-file/src/main/kotlin/com/example/DownloadFile.kt
@@ -1,12 +1,14 @@
 package com.example
 
-import io.ktor.server.application.*
 import io.ktor.http.*
+import io.ktor.server.application.*
+import io.ktor.server.http.content.*
 import io.ktor.server.plugins.autohead.*
 import io.ktor.server.plugins.partialcontent.*
 import io.ktor.server.response.*
 import io.ktor.server.routing.*
 import java.io.File
+import java.nio.file.Path
 
 fun Application.main() {
     install(PartialContent)
@@ -21,5 +23,14 @@ fun Application.main() {
             )
             call.respondFile(file)
         }
+        get("/downloadFromPath") {
+            val filePath = Path.of("files/file.txt")
+            call.response.header(
+                HttpHeaders.ContentDisposition,
+                ContentDisposition.Attachment.withParameter(ContentDisposition.Parameters.FileName, "file.txt")
+                    .toString()
+            )
+            call.respond(LocalPathContent(filePath))
+        }
     }
 }
diff --git a/codeSnippets/snippets/download-file/src/test/kotlin/com/example/DownloadFileTest.kt b/codeSnippets/snippets/download-file/src/test/kotlin/com/example/DownloadFileTest.kt
index 56b2e5c1a..f8884ecdd 100644
--- a/codeSnippets/snippets/download-file/src/test/kotlin/com/example/DownloadFileTest.kt
+++ b/codeSnippets/snippets/download-file/src/test/kotlin/com/example/DownloadFileTest.kt
@@ -10,6 +10,9 @@ import org.junit.Assert.*
 class DownloadFileTest {
     @Test
     fun respondWithPNGFileAndContentDispositionHeader() = testApplication {
+        application {
+            main()
+        }
         val response = client.get("/download")
         val content = response.readBytes(4)
         assertPNG(content)
@@ -19,6 +22,15 @@ class DownloadFileTest {
         )
     }
 
+    @Test
+    fun respondWithTxtFileFromPath() = testApplication {
+        application {
+            main()
+        }
+        val response = client.get("/downloadFromPath")
+        assertEquals("Just a simple text file.", response.bodyAsText().trim())
+    }
+
     private fun assertPNG(array: ByteArray) {
         assertEquals((0x89).toByte(), array[0])
         assertEquals((0x50).toByte(), array[1])
diff --git a/codeSnippets/snippets/e2e/build.gradle.kts b/codeSnippets/snippets/e2e/build.gradle.kts
index e8abb2e03..aafbe5060 100644
--- a/codeSnippets/snippets/e2e/build.gradle.kts
+++ b/codeSnippets/snippets/e2e/build.gradle.kts
@@ -14,5 +14,8 @@ dependencies {
     implementation("junit:junit:$junit_version")
     api("io.ktor:ktor-server-core:$ktor_version")
     api("io.ktor:ktor-server-cio:$ktor_version")
-    api("io.ktor:ktor-server-host-common:$ktor_version")
+}
+
+kotlin {
+    jvmToolchain(11)
 }
diff --git a/codeSnippets/snippets/e2e/src/main/kotlin/e2e/WithTestServer.kt b/codeSnippets/snippets/e2e/src/main/kotlin/e2e/WithTestServer.kt
index f19da2e2f..f57f3df3b 100644
--- a/codeSnippets/snippets/e2e/src/main/kotlin/e2e/WithTestServer.kt
+++ b/codeSnippets/snippets/e2e/src/main/kotlin/e2e/WithTestServer.kt
@@ -1,11 +1,12 @@
 package e2e
 
+import io.ktor.server.cio.*
 import io.ktor.server.engine.*
 import org.junit.After
 import org.junit.Before
 
 abstract class WithTestServer {
-    protected abstract val server: ApplicationEngine
+    protected abstract val server: EmbeddedServer<CIOApplicationEngine,CIOApplicationEngine.Configuration>
 
     @Before
     fun startServer() {
diff --git a/codeSnippets/snippets/e2e/src/main/kotlin/e2e/server.kt b/codeSnippets/snippets/e2e/src/main/kotlin/e2e/server.kt
index 73edc45df..ffc26e76d 100644
--- a/codeSnippets/snippets/e2e/src/main/kotlin/e2e/server.kt
+++ b/codeSnippets/snippets/e2e/src/main/kotlin/e2e/server.kt
@@ -5,12 +5,9 @@ import io.ktor.server.cio.*
 import io.ktor.server.engine.*
 import org.slf4j.helpers.NOPLogger
 
-fun defaultServer(module: Application.() -> Unit) = embeddedServer(CIO, environment = applicationEngineEnvironment {
-    log = NOPLogger.NOP_LOGGER
-
-    connector {
-        port = 8080
-    }
-
-    module(module)
-})
\ No newline at end of file
+fun defaultServer(module: Application.() -> Unit) =
+    embeddedServer(CIO, applicationEnvironment { log = NOPLogger.NOP_LOGGER }, {
+        connector {
+            port = 8080
+        }
+    }, module = module)
\ No newline at end of file
diff --git a/codeSnippets/snippets/embedded-server-modules/build.gradle.kts b/codeSnippets/snippets/embedded-server-modules/build.gradle.kts
index 08b35169d..445ff54a4 100644
--- a/codeSnippets/snippets/embedded-server-modules/build.gradle.kts
+++ b/codeSnippets/snippets/embedded-server-modules/build.gradle.kts
@@ -21,6 +21,6 @@ dependencies {
     implementation("io.ktor:ktor-server-core:$ktor_version")
     implementation("io.ktor:ktor-server-netty:$ktor_version")
     implementation("ch.qos.logback:logback-classic:$logback_version")
-    testImplementation("io.ktor:ktor-server-test-host:$ktor_version")
+    testImplementation("io.ktor:ktor-server-test-host-jvm:$ktor_version")
     testImplementation("org.jetbrains.kotlin:kotlin-test")
 }
diff --git a/codeSnippets/snippets/embedded-server-multiple-connectors/build.gradle.kts b/codeSnippets/snippets/embedded-server-multiple-connectors/build.gradle.kts
index e9f0e3aa0..8c87f54ef 100644
--- a/codeSnippets/snippets/embedded-server-multiple-connectors/build.gradle.kts
+++ b/codeSnippets/snippets/embedded-server-multiple-connectors/build.gradle.kts
@@ -22,6 +22,6 @@ dependencies {
     implementation("io.ktor:ktor-server-core:$ktor_version")
     implementation("io.ktor:ktor-server-netty:$ktor_version")
     implementation("ch.qos.logback:logback-classic:$logback_version")
-    testImplementation("io.ktor:ktor-server-test-host:$ktor_version")
+    testImplementation("io.ktor:ktor-server-test-host-jvm:$ktor_version")
     testImplementation("org.jetbrains.kotlin:kotlin-test")
 }
diff --git a/codeSnippets/snippets/embedded-server-multiple-connectors/src/main/kotlin/com/example/Application.kt b/codeSnippets/snippets/embedded-server-multiple-connectors/src/main/kotlin/com/example/Application.kt
index 61bdae5b8..e1d6c2a69 100644
--- a/codeSnippets/snippets/embedded-server-multiple-connectors/src/main/kotlin/com/example/Application.kt
+++ b/codeSnippets/snippets/embedded-server-multiple-connectors/src/main/kotlin/com/example/Application.kt
@@ -7,16 +7,15 @@ import io.ktor.server.engine.*
 import io.ktor.server.netty.*
 
 fun main() {
-    val env = applicationEngineEnvironment {
-        envConfig()
+    val appProperties = serverConfig {
+        module { module() }
     }
-    embeddedServer(Netty, env).start(true)
+    embeddedServer(Netty, appProperties) {
+        envConfig()
+    }.start(true)
 }
 
-fun ApplicationEngineEnvironmentBuilder.envConfig() {
-    module {
-        module()
-    }
+fun ApplicationEngine.Configuration.envConfig() {
     connector {
         host = "0.0.0.0"
         port = 8080
diff --git a/codeSnippets/snippets/embedded-server-multiple-connectors/src/test/kotlin/ApplicationTest.kt b/codeSnippets/snippets/embedded-server-multiple-connectors/src/test/kotlin/ApplicationTest.kt
index cb8f22f4e..7a7022cbe 100644
--- a/codeSnippets/snippets/embedded-server-multiple-connectors/src/test/kotlin/ApplicationTest.kt
+++ b/codeSnippets/snippets/embedded-server-multiple-connectors/src/test/kotlin/ApplicationTest.kt
@@ -1,14 +1,20 @@
 import com.example.*
 import io.ktor.client.request.*
 import io.ktor.client.statement.*
+import io.ktor.server.application.*
+import io.ktor.server.engine.*
 import io.ktor.server.testing.*
 import org.junit.Test
+import java.util.Properties
 import kotlin.test.*
 
 class ApplicationTest {
     @Test
     fun testApi(): Unit = testApplication {
-        environment {
+        serverConfig {
+            module { module() }
+        }
+        engine {
             envConfig()
         }
         client.get("/") {
diff --git a/codeSnippets/snippets/engine-main-custom-environment/build.gradle.kts b/codeSnippets/snippets/engine-main-custom-environment/build.gradle.kts
index 93220dcb1..9a13e1f77 100644
--- a/codeSnippets/snippets/engine-main-custom-environment/build.gradle.kts
+++ b/codeSnippets/snippets/engine-main-custom-environment/build.gradle.kts
@@ -1,11 +1,10 @@
-val ktor_version: String by project
 val kotlin_version: String by project
 val logback_version: String by project
 
 plugins {
     application
     kotlin("jvm")
-    id("io.ktor.plugin") version "2.3.12"
+    id("io.ktor.plugin") version "3.0.0"
 }
 
 application {
@@ -19,10 +18,10 @@ repositories {
 
 dependencies {
     implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version")
-    implementation("io.ktor:ktor-server-core:$ktor_version")
-    implementation("io.ktor:ktor-server-netty:$ktor_version")
-    implementation("io.ktor:ktor-server-config-yaml:$ktor_version")
+    implementation("io.ktor:ktor-server-core-jvm")
+    implementation("io.ktor:ktor-server-netty-jvm")
+    implementation("io.ktor:ktor-server-config-yaml-jvm")
     implementation("ch.qos.logback:logback-classic:$logback_version")
-    testImplementation("io.ktor:ktor-server-test-host:$ktor_version")
+    testImplementation("io.ktor:ktor-server-test-host-jvm")
     testImplementation("org.jetbrains.kotlin:kotlin-test")
 }
diff --git a/codeSnippets/snippets/engine-main-modules/build.gradle.kts b/codeSnippets/snippets/engine-main-modules/build.gradle.kts
index 9fee42fdc..46615f0ae 100644
--- a/codeSnippets/snippets/engine-main-modules/build.gradle.kts
+++ b/codeSnippets/snippets/engine-main-modules/build.gradle.kts
@@ -22,6 +22,6 @@ dependencies {
     implementation("io.ktor:ktor-server-netty:$ktor_version")
     implementation("io.ktor:ktor-server-config-yaml:$ktor_version")
     implementation("ch.qos.logback:logback-classic:$logback_version")
-    testImplementation("io.ktor:ktor-server-test-host:$ktor_version")
+    testImplementation("io.ktor:ktor-server-test-host-jvm:$ktor_version")
     testImplementation("org.jetbrains.kotlin:kotlin-test")
 }
diff --git a/codeSnippets/snippets/engine-main-modules/src/test/kotlin/EngineMainTest.kt b/codeSnippets/snippets/engine-main-modules/src/test/kotlin/EngineMainTest.kt
index fa50b9f72..3859cdd37 100644
--- a/codeSnippets/snippets/engine-main-modules/src/test/kotlin/EngineMainTest.kt
+++ b/codeSnippets/snippets/engine-main-modules/src/test/kotlin/EngineMainTest.kt
@@ -4,23 +4,35 @@ import io.ktor.client.request.*
 import io.ktor.client.statement.*
 import io.ktor.http.*
 import io.ktor.server.testing.*
+import org.sample.module3
 import kotlin.test.*
 
 class ApplicationTest {
     @Test
     fun testModule1() = testApplication {
+        application {
+            module1()
+        }
         val response = client.get("/module1")
         assertEquals(HttpStatusCode.OK, response.status)
         assertEquals("Hello from 'module1'!", response.bodyAsText())
     }
+
     @Test
     fun testModule2() = testApplication {
+        application {
+            module2()
+        }
         val response = client.get("/module2")
         assertEquals(HttpStatusCode.OK, response.status)
         assertEquals("Hello from 'module2'!", response.bodyAsText())
     }
+
     @Test
     fun testModule3() = testApplication {
+        application {
+            module3()
+        }
         val response = client.get("/module3")
         assertEquals(HttpStatusCode.OK, response.status)
         assertEquals("Hello from 'module3'!", response.bodyAsText())
diff --git a/codeSnippets/snippets/engine-main-yaml/build.gradle.kts b/codeSnippets/snippets/engine-main-yaml/build.gradle.kts
index 9fee42fdc..46615f0ae 100644
--- a/codeSnippets/snippets/engine-main-yaml/build.gradle.kts
+++ b/codeSnippets/snippets/engine-main-yaml/build.gradle.kts
@@ -22,6 +22,6 @@ dependencies {
     implementation("io.ktor:ktor-server-netty:$ktor_version")
     implementation("io.ktor:ktor-server-config-yaml:$ktor_version")
     implementation("ch.qos.logback:logback-classic:$logback_version")
-    testImplementation("io.ktor:ktor-server-test-host:$ktor_version")
+    testImplementation("io.ktor:ktor-server-test-host-jvm:$ktor_version")
     testImplementation("org.jetbrains.kotlin:kotlin-test")
 }
diff --git a/codeSnippets/snippets/engine-main-yaml/src/test/kotlin/EngineMainTest.kt b/codeSnippets/snippets/engine-main-yaml/src/test/kotlin/EngineMainTest.kt
index dc4fb1727..567d6a62d 100644
--- a/codeSnippets/snippets/engine-main-yaml/src/test/kotlin/EngineMainTest.kt
+++ b/codeSnippets/snippets/engine-main-yaml/src/test/kotlin/EngineMainTest.kt
@@ -9,6 +9,9 @@ import kotlin.test.*
 class ApplicationTest {
     @Test
     fun testRoot() = testApplication {
+        application {
+            module()
+        }
         val response = client.get("/")
         assertEquals(HttpStatusCode.OK, response.status)
         assertEquals("Hello, world!", response.bodyAsText())
diff --git a/codeSnippets/snippets/engine-main/build.gradle.kts b/codeSnippets/snippets/engine-main/build.gradle.kts
index ce61d2618..0f10ec14e 100644
--- a/codeSnippets/snippets/engine-main/build.gradle.kts
+++ b/codeSnippets/snippets/engine-main/build.gradle.kts
@@ -21,6 +21,6 @@ dependencies {
     implementation("io.ktor:ktor-server-core:$ktor_version")
     implementation("io.ktor:ktor-server-netty:$ktor_version")
     implementation("ch.qos.logback:logback-classic:$logback_version")
-    testImplementation("io.ktor:ktor-server-test-host:$ktor_version")
+    testImplementation("io.ktor:ktor-server-test-host-jvm:$ktor_version")
     testImplementation("org.jetbrains.kotlin:kotlin-test")
 }
diff --git a/codeSnippets/snippets/engine-main/src/test/kotlin/EngineMainTest.kt b/codeSnippets/snippets/engine-main/src/test/kotlin/EngineMainTest.kt
index 4a1f667fa..58f8cbb93 100644
--- a/codeSnippets/snippets/engine-main/src/test/kotlin/EngineMainTest.kt
+++ b/codeSnippets/snippets/engine-main/src/test/kotlin/EngineMainTest.kt
@@ -10,18 +10,11 @@ import kotlin.test.*
 class ApplicationTest {
     @Test
     fun testRoot() = testApplication {
+        application {
+            module()
+        }
         val response = client.get("/")
         assertEquals(HttpStatusCode.OK, response.status)
         assertEquals("Hello, world!", response.bodyAsText())
     }
-
-    @Test
-    fun testRootLegacyApi() {
-        withTestApplication(Application::module) {
-            handleRequest(HttpMethod.Get, "/").apply {
-                assertEquals(HttpStatusCode.OK, response.status())
-                assertEquals("Hello, world!", response.content)
-            }
-        }
-    }
 }
diff --git a/codeSnippets/snippets/events/build.gradle.kts b/codeSnippets/snippets/events/build.gradle.kts
index ce61d2618..0f10ec14e 100644
--- a/codeSnippets/snippets/events/build.gradle.kts
+++ b/codeSnippets/snippets/events/build.gradle.kts
@@ -21,6 +21,6 @@ dependencies {
     implementation("io.ktor:ktor-server-core:$ktor_version")
     implementation("io.ktor:ktor-server-netty:$ktor_version")
     implementation("ch.qos.logback:logback-classic:$logback_version")
-    testImplementation("io.ktor:ktor-server-test-host:$ktor_version")
+    testImplementation("io.ktor:ktor-server-test-host-jvm:$ktor_version")
     testImplementation("org.jetbrains.kotlin:kotlin-test")
 }
diff --git a/codeSnippets/snippets/events/src/main/kotlin/com/example/Application.kt b/codeSnippets/snippets/events/src/main/kotlin/com/example/Application.kt
index 26155df11..08201895f 100644
--- a/codeSnippets/snippets/events/src/main/kotlin/com/example/Application.kt
+++ b/codeSnippets/snippets/events/src/main/kotlin/com/example/Application.kt
@@ -10,16 +10,16 @@ fun main(args: Array<String>): Unit = io.ktor.server.netty.EngineMain.main(args)
 
 fun Application.module() {
     install(ApplicationMonitoringPlugin)
-    environment.monitor.subscribe(ApplicationStarted) { application ->
+    monitor.subscribe(ApplicationStarted) { application ->
         application.environment.log.info("Server is started")
     }
-    environment.monitor.subscribe(ApplicationStopped) { application ->
+    monitor.subscribe(ApplicationStopped) { application ->
         application.environment.log.info("Server is stopped")
         // Release resources and unsubscribe from events
-        application.environment.monitor.unsubscribe(ApplicationStarted) {}
-        application.environment.monitor.unsubscribe(ApplicationStopped) {}
+        monitor.unsubscribe(ApplicationStarted) {}
+        monitor.unsubscribe(ApplicationStopped) {}
     }
-    environment.monitor.subscribe(NotFoundEvent) { call ->
+    monitor.subscribe(NotFoundEvent) { call ->
         log.info("No page was found for the URI: ${call.request.uri}")
     }
     routing {
diff --git a/codeSnippets/snippets/events/src/main/kotlin/com/example/plugins/ApplicationMonitoringPlugin.kt b/codeSnippets/snippets/events/src/main/kotlin/com/example/plugins/ApplicationMonitoringPlugin.kt
index 331df2a5e..48e8c1e2d 100644
--- a/codeSnippets/snippets/events/src/main/kotlin/com/example/plugins/ApplicationMonitoringPlugin.kt
+++ b/codeSnippets/snippets/events/src/main/kotlin/com/example/plugins/ApplicationMonitoringPlugin.kt
@@ -12,12 +12,12 @@ val ApplicationMonitoringPlugin = createApplicationPlugin(name = "ApplicationMon
     on(MonitoringEvent(ApplicationStopped)) { application ->
         application.log.info("Server is stopped")
         // Release resources and unsubscribe from events
-        application.environment.monitor.unsubscribe(ApplicationStarted) {}
-        application.environment.monitor.unsubscribe(ApplicationStopped) {}
+        application.monitor.unsubscribe(ApplicationStarted) {}
+        application.monitor.unsubscribe(ApplicationStopped) {}
     }
     on(ResponseSent) { call ->
         if (call.response.status() == HttpStatusCode.NotFound) {
-            this@createApplicationPlugin.application.environment.monitor.raise(NotFoundEvent, call)
+            this@createApplicationPlugin.application.monitor.raise(NotFoundEvent, call)
         }
     }
 }
diff --git a/codeSnippets/snippets/events/src/test/kotlin/com/example/ApplicationTest.kt b/codeSnippets/snippets/events/src/test/kotlin/com/example/ApplicationTest.kt
index dc4fb1727..567d6a62d 100644
--- a/codeSnippets/snippets/events/src/test/kotlin/com/example/ApplicationTest.kt
+++ b/codeSnippets/snippets/events/src/test/kotlin/com/example/ApplicationTest.kt
@@ -9,6 +9,9 @@ import kotlin.test.*
 class ApplicationTest {
     @Test
     fun testRoot() = testApplication {
+        application {
+            module()
+        }
         val response = client.get("/")
         assertEquals(HttpStatusCode.OK, response.status)
         assertEquals("Hello, world!", response.bodyAsText())
diff --git a/codeSnippets/snippets/forwarded-header/build.gradle.kts b/codeSnippets/snippets/forwarded-header/build.gradle.kts
index 63cfb79c4..ad10335c5 100644
--- a/codeSnippets/snippets/forwarded-header/build.gradle.kts
+++ b/codeSnippets/snippets/forwarded-header/build.gradle.kts
@@ -1,11 +1,10 @@
-val ktor_version: String by project
 val kotlin_version: String by project
 val logback_version: String by project
 
 plugins {
     application
     kotlin("jvm")
-    id("io.ktor.plugin") version "2.3.12"
+    id("io.ktor.plugin") version "3.0.0"
 }
 
 application {
@@ -19,10 +18,10 @@ repositories {
 
 dependencies {
     implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version")
-    implementation("io.ktor:ktor-server-core:$ktor_version")
-    implementation("io.ktor:ktor-server-netty:$ktor_version")
-    implementation("io.ktor:ktor-server-forwarded-header:$ktor_version")
+    implementation("io.ktor:ktor-server-core-jvm")
+    implementation("io.ktor:ktor-server-netty-jvm")
+    implementation("io.ktor:ktor-server-forwarded-header-jvm")
     implementation("ch.qos.logback:logback-classic:$logback_version")
-    testImplementation("io.ktor:ktor-server-test-host:$ktor_version")
+    testImplementation("io.ktor:ktor-server-test-host-jvm")
     testImplementation("org.jetbrains.kotlin:kotlin-test")
 }
diff --git a/codeSnippets/snippets/forwarded-header/src/test/kotlin/com/example/ApplicationTest.kt b/codeSnippets/snippets/forwarded-header/src/test/kotlin/com/example/ApplicationTest.kt
index 18d310fdb..c9882a5ae 100644
--- a/codeSnippets/snippets/forwarded-header/src/test/kotlin/com/example/ApplicationTest.kt
+++ b/codeSnippets/snippets/forwarded-header/src/test/kotlin/com/example/ApplicationTest.kt
@@ -8,6 +8,9 @@ import kotlin.test.*
 class ApplicationTest {
     @Test
     fun testXForwardedValue() = testApplication {
+        application {
+            module()
+        }
         client.get("/hello") {
             header("X-Forwarded-For", "10.0.0.123, proxy-1, proxy-2, proxy-3")
         }.apply {
diff --git a/codeSnippets/snippets/freemarker/build.gradle.kts b/codeSnippets/snippets/freemarker/build.gradle.kts
index d16f0ff34..2dfb4d2a7 100644
--- a/codeSnippets/snippets/freemarker/build.gradle.kts
+++ b/codeSnippets/snippets/freemarker/build.gradle.kts
@@ -25,5 +25,5 @@ dependencies {
     implementation("ch.qos.logback:logback-classic:$logback_version")
 
     testImplementation("junit:junit:$junit_version")
-    testImplementation("io.ktor:ktor-server-test-host:$ktor_version")
+    testImplementation("io.ktor:ktor-server-test-host-jvm:$ktor_version")
 }
diff --git a/codeSnippets/snippets/freemarker/src/test/kotlin/FreeMarkerTest.kt b/codeSnippets/snippets/freemarker/src/test/kotlin/FreeMarkerTest.kt
index 8358dd1b1..66fd6256a 100644
--- a/codeSnippets/snippets/freemarker/src/test/kotlin/FreeMarkerTest.kt
+++ b/codeSnippets/snippets/freemarker/src/test/kotlin/FreeMarkerTest.kt
@@ -1,3 +1,5 @@
+import com.example.main
+import com.example.module
 import io.ktor.client.call.*
 import io.ktor.client.request.*
 import io.ktor.server.testing.*
@@ -7,8 +9,12 @@ import org.junit.Assert.*
 class FreeMarkerTest {
     @Test
     fun test() = testApplication {
+        application {
+            module()
+        }
         val response: String = client.get("/index").body()
-        assertEquals("""
+        assertEquals(
+            """
             <html>
                 <body>
                     <h1>Hello, John!</h1>
diff --git a/codeSnippets/snippets/google-appengine-standard/build.gradle.kts b/codeSnippets/snippets/google-appengine-standard/build.gradle.kts
index 9a115b15d..586426422 100644
--- a/codeSnippets/snippets/google-appengine-standard/build.gradle.kts
+++ b/codeSnippets/snippets/google-appengine-standard/build.gradle.kts
@@ -35,6 +35,6 @@ dependencies {
     implementation("io.ktor:ktor-server-core:$ktor_version")
     implementation("io.ktor:ktor-server-netty:$ktor_version")
     implementation("com.google.cloud:google-cloud-logging-logback:$gce_logback_version")
-    testImplementation("io.ktor:ktor-server-test-host:$ktor_version")
+    testImplementation("io.ktor:ktor-server-test-host-jvm:$ktor_version")
     testImplementation("org.jetbrains.kotlin:kotlin-test")
 }
diff --git a/codeSnippets/snippets/google-appengine-standard/src/test/kotlin/com/example/GoogleAppEngineTest.kt b/codeSnippets/snippets/google-appengine-standard/src/test/kotlin/com/example/GoogleAppEngineTest.kt
index dc4fb1727..567d6a62d 100644
--- a/codeSnippets/snippets/google-appengine-standard/src/test/kotlin/com/example/GoogleAppEngineTest.kt
+++ b/codeSnippets/snippets/google-appengine-standard/src/test/kotlin/com/example/GoogleAppEngineTest.kt
@@ -9,6 +9,9 @@ import kotlin.test.*
 class ApplicationTest {
     @Test
     fun testRoot() = testApplication {
+        application {
+            module()
+        }
         val response = client.get("/")
         assertEquals(HttpStatusCode.OK, response.status)
         assertEquals("Hello, world!", response.bodyAsText())
diff --git a/codeSnippets/snippets/gson/build.gradle.kts b/codeSnippets/snippets/gson/build.gradle.kts
index 2f2272ee0..baa7721a1 100644
--- a/codeSnippets/snippets/gson/build.gradle.kts
+++ b/codeSnippets/snippets/gson/build.gradle.kts
@@ -26,6 +26,6 @@ dependencies {
     implementation("io.ktor:ktor-server-content-negotiation:$ktor_version")
     implementation("io.ktor:ktor-serialization-gson:$ktor_version")
     implementation("ch.qos.logback:logback-classic:$logback_version")
-    testImplementation("io.ktor:ktor-server-test-host:$ktor_version")
+    testImplementation("io.ktor:ktor-server-test-host-jvm:$ktor_version")
     testImplementation("org.jetbrains.kotlin:kotlin-test")
 }
diff --git a/codeSnippets/snippets/gson/src/main/kotlin/com/example/GsonApplication.kt b/codeSnippets/snippets/gson/src/main/kotlin/com/example/GsonApplication.kt
index a5090c4ea..4ea99a2ca 100644
--- a/codeSnippets/snippets/gson/src/main/kotlin/com/example/GsonApplication.kt
+++ b/codeSnippets/snippets/gson/src/main/kotlin/com/example/GsonApplication.kt
@@ -3,7 +3,7 @@ package com.example
 import io.ktor.http.*
 import io.ktor.serialization.gson.*
 import io.ktor.server.application.*
-import io.ktor.server.plugins.callloging.*
+import io.ktor.server.plugins.calllogging.*
 import io.ktor.server.plugins.compression.*
 import io.ktor.server.plugins.contentnegotiation.*
 import io.ktor.server.plugins.defaultheaders.*
diff --git a/codeSnippets/snippets/gson/src/test/kotlin/com/example/GsonAppTest.kt b/codeSnippets/snippets/gson/src/test/kotlin/com/example/GsonAppTest.kt
index 184ad0036..9858f1c3e 100644
--- a/codeSnippets/snippets/gson/src/test/kotlin/com/example/GsonAppTest.kt
+++ b/codeSnippets/snippets/gson/src/test/kotlin/com/example/GsonAppTest.kt
@@ -10,6 +10,9 @@ class GsonAppTest {
     @Ignore
     @Test
     fun testV1() = testApplication {
+        application {
+            main()
+        }
         val response = client.get("/v1")
         assertEquals(HttpStatusCode.OK, response.status)
         assertEquals(
diff --git a/codeSnippets/snippets/guice/build.gradle.kts b/codeSnippets/snippets/guice/build.gradle.kts
index dea614c7a..74587ce18 100644
--- a/codeSnippets/snippets/guice/build.gradle.kts
+++ b/codeSnippets/snippets/guice/build.gradle.kts
@@ -24,6 +24,6 @@ dependencies {
     implementation("io.ktor:ktor-server-html-builder:$ktor_version")
     implementation("ch.qos.logback:logback-classic:$logback_version")
     implementation("com.google.inject:guice:$guice_version")
-    testImplementation("io.ktor:ktor-server-test-host:$ktor_version")
+    testImplementation("io.ktor:ktor-server-test-host-jvm:$ktor_version")
     testImplementation("org.jetbrains.kotlin:kotlin-test")
 }
diff --git a/codeSnippets/snippets/guice/src/test/kotlin/com/example/GuiceApplicationTest.kt b/codeSnippets/snippets/guice/src/test/kotlin/com/example/GuiceApplicationTest.kt
index 9039e0125..672cd20a1 100644
--- a/codeSnippets/snippets/guice/src/test/kotlin/com/example/GuiceApplicationTest.kt
+++ b/codeSnippets/snippets/guice/src/test/kotlin/com/example/GuiceApplicationTest.kt
@@ -10,6 +10,9 @@ import kotlin.test.*
 class GuiceApplicationTest {
     @Test
     fun testRoot() = testApplication {
+        application {
+            main()
+        }
         val response = client.get("/")
         assertEquals(HttpStatusCode.OK, response.status)
         assertEquals(
diff --git a/codeSnippets/snippets/html-templates/build.gradle.kts b/codeSnippets/snippets/html-templates/build.gradle.kts
index 1ab51f02a..db26d64a6 100644
--- a/codeSnippets/snippets/html-templates/build.gradle.kts
+++ b/codeSnippets/snippets/html-templates/build.gradle.kts
@@ -22,6 +22,6 @@ dependencies {
     implementation("io.ktor:ktor-server-netty:$ktor_version")
     implementation("io.ktor:ktor-server-html-builder:$ktor_version")
     implementation("ch.qos.logback:logback-classic:$logback_version")
-    testImplementation("io.ktor:ktor-server-test-host:$ktor_version")
+    testImplementation("io.ktor:ktor-server-test-host-jvm:$ktor_version")
     testImplementation("org.jetbrains.kotlin:kotlin-test")
 }
diff --git a/codeSnippets/snippets/html-templates/src/test/kotlin/HtmlTest.kt b/codeSnippets/snippets/html-templates/src/test/kotlin/HtmlTest.kt
index 015cd499c..af146830b 100644
--- a/codeSnippets/snippets/html-templates/src/test/kotlin/HtmlTest.kt
+++ b/codeSnippets/snippets/html-templates/src/test/kotlin/HtmlTest.kt
@@ -9,6 +9,9 @@ import kotlin.test.*
 class HtmlTest {
     @Test
     fun testRoot() = testApplication {
+        application {
+            module()
+        }
         val response = client.get("/")
         assertEquals(
             """
diff --git a/codeSnippets/snippets/html/build.gradle.kts b/codeSnippets/snippets/html/build.gradle.kts
index 1ab51f02a..db26d64a6 100644
--- a/codeSnippets/snippets/html/build.gradle.kts
+++ b/codeSnippets/snippets/html/build.gradle.kts
@@ -22,6 +22,6 @@ dependencies {
     implementation("io.ktor:ktor-server-netty:$ktor_version")
     implementation("io.ktor:ktor-server-html-builder:$ktor_version")
     implementation("ch.qos.logback:logback-classic:$logback_version")
-    testImplementation("io.ktor:ktor-server-test-host:$ktor_version")
+    testImplementation("io.ktor:ktor-server-test-host-jvm:$ktor_version")
     testImplementation("org.jetbrains.kotlin:kotlin-test")
 }
diff --git a/codeSnippets/snippets/html/src/test/kotlin/HtmlTest.kt b/codeSnippets/snippets/html/src/test/kotlin/HtmlTest.kt
index a5ae88280..207fb036e 100644
--- a/codeSnippets/snippets/html/src/test/kotlin/HtmlTest.kt
+++ b/codeSnippets/snippets/html/src/test/kotlin/HtmlTest.kt
@@ -9,6 +9,9 @@ import kotlin.test.*
 class HtmlTest {
     @Test
     fun testRoot() = testApplication {
+        application {
+            module()
+        }
         val response = client.get("/")
         assertEquals(
             """
diff --git a/codeSnippets/snippets/http2-push/src/main/kotlin/com/example/Http2PushApplication.kt b/codeSnippets/snippets/http2-push/src/main/kotlin/com/example/Http2PushApplication.kt
index d42359bd0..485dc7bd1 100644
--- a/codeSnippets/snippets/http2-push/src/main/kotlin/com/example/Http2PushApplication.kt
+++ b/codeSnippets/snippets/http2-push/src/main/kotlin/com/example/Http2PushApplication.kt
@@ -4,7 +4,7 @@ import io.ktor.http.*
 import io.ktor.server.application.*
 import io.ktor.server.html.*
 import io.ktor.server.http.*
-import io.ktor.server.plugins.callloging.*
+import io.ktor.server.plugins.calllogging.*
 import io.ktor.server.plugins.defaultheaders.*
 import io.ktor.server.response.*
 import io.ktor.server.routing.*
diff --git a/codeSnippets/snippets/http2-push/src/main/kotlin/com/example/Main.kt b/codeSnippets/snippets/http2-push/src/main/kotlin/com/example/Main.kt
index bdf76fb69..89519bfba 100644
--- a/codeSnippets/snippets/http2-push/src/main/kotlin/com/example/Main.kt
+++ b/codeSnippets/snippets/http2-push/src/main/kotlin/com/example/Main.kt
@@ -13,5 +13,5 @@ fun main(args: Array<String>) {
         generateCertificate(file)
     }
     // run embedded server
-    embeddedServer(Netty, commandLineEnvironment(args)).start()
+    EmbeddedServer(CommandLineConfig(args).rootConfig, Netty).start()
 }
diff --git a/codeSnippets/snippets/jackson/build.gradle.kts b/codeSnippets/snippets/jackson/build.gradle.kts
index ece7bf4a0..4e7ed0de0 100644
--- a/codeSnippets/snippets/jackson/build.gradle.kts
+++ b/codeSnippets/snippets/jackson/build.gradle.kts
@@ -28,6 +28,6 @@ dependencies {
     implementation("io.ktor:ktor-serialization-jackson:$ktor_version")
     implementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version")
     implementation("ch.qos.logback:logback-classic:$logback_version")
-    testImplementation("io.ktor:ktor-server-test-host:$ktor_version")
+    testImplementation("io.ktor:ktor-server-test-host-jvm:$ktor_version")
     testImplementation("org.jetbrains.kotlin:kotlin-test")
 }
diff --git a/codeSnippets/snippets/jackson/src/main/kotlin/com/example/JacksonApplication.kt b/codeSnippets/snippets/jackson/src/main/kotlin/com/example/JacksonApplication.kt
index 4246097b9..452f51811 100644
--- a/codeSnippets/snippets/jackson/src/main/kotlin/com/example/JacksonApplication.kt
+++ b/codeSnippets/snippets/jackson/src/main/kotlin/com/example/JacksonApplication.kt
@@ -6,7 +6,7 @@ import com.fasterxml.jackson.datatype.jsr310.*
 import io.ktor.http.*
 import io.ktor.serialization.jackson.*
 import io.ktor.server.application.*
-import io.ktor.server.plugins.callloging.*
+import io.ktor.server.plugins.calllogging.*
 import io.ktor.server.plugins.compression.*
 import io.ktor.server.plugins.contentnegotiation.*
 import io.ktor.server.plugins.defaultheaders.*
diff --git a/codeSnippets/snippets/jackson/src/test/kotlin/com/example/JacksonApplicationTest.kt b/codeSnippets/snippets/jackson/src/test/kotlin/com/example/JacksonApplicationTest.kt
index 5b984f39a..fd59cb559 100644
--- a/codeSnippets/snippets/jackson/src/test/kotlin/com/example/JacksonApplicationTest.kt
+++ b/codeSnippets/snippets/jackson/src/test/kotlin/com/example/JacksonApplicationTest.kt
@@ -9,6 +9,9 @@ import kotlin.test.*
 class JacksonApplicationTest {
     @Test
     fun testV1() = testApplication {
+        application {
+            main()
+        }
         val response = client.get("/v1")
         assertEquals(HttpStatusCode.OK, response.status)
         assertEquals(
@@ -31,6 +34,9 @@ class JacksonApplicationTest {
 
     @Test
     fun testV1ItemKey() = testApplication {
+        application {
+            main()
+        }
         val response = client.get("/v1/item/B")
         assertEquals(HttpStatusCode.OK, response.status)
         assertEquals(
diff --git a/codeSnippets/snippets/jetty-war/build.gradle.kts b/codeSnippets/snippets/jetty-war/build.gradle.kts
index fa395d2d9..314385a73 100644
--- a/codeSnippets/snippets/jetty-war/build.gradle.kts
+++ b/codeSnippets/snippets/jetty-war/build.gradle.kts
@@ -25,7 +25,7 @@ dependencies {
     implementation("io.ktor:ktor-server-core:$ktor_version")
     implementation("io.ktor:ktor-server-servlet-jakarta:$ktor_version")
     implementation("ch.qos.logback:logback-classic:$logback_version")
-    testImplementation("io.ktor:ktor-server-test-host:$ktor_version")
+    testImplementation("io.ktor:ktor-server-test-host-jvm:$ktor_version")
     testImplementation("org.jetbrains.kotlin:kotlin-test")
 }
 
diff --git a/codeSnippets/snippets/jetty-war/src/test/kotlin/ApplicationTest.kt b/codeSnippets/snippets/jetty-war/src/test/kotlin/ApplicationTest.kt
index b4463316a..567d6a62d 100644
--- a/codeSnippets/snippets/jetty-war/src/test/kotlin/ApplicationTest.kt
+++ b/codeSnippets/snippets/jetty-war/src/test/kotlin/ApplicationTest.kt
@@ -1,3 +1,5 @@
+package com.example
+
 import io.ktor.client.request.*
 import io.ktor.client.statement.*
 import io.ktor.http.*
@@ -7,6 +9,9 @@ import kotlin.test.*
 class ApplicationTest {
     @Test
     fun testRoot() = testApplication {
+        application {
+            module()
+        }
         val response = client.get("/")
         assertEquals(HttpStatusCode.OK, response.status)
         assertEquals("Hello, world!", response.bodyAsText())
diff --git a/codeSnippets/snippets/json-kotlinx-method-override/build.gradle.kts b/codeSnippets/snippets/json-kotlinx-method-override/build.gradle.kts
index 9ea3800bc..dcd850a87 100644
--- a/codeSnippets/snippets/json-kotlinx-method-override/build.gradle.kts
+++ b/codeSnippets/snippets/json-kotlinx-method-override/build.gradle.kts
@@ -25,6 +25,6 @@ dependencies {
     implementation("io.ktor:ktor-serialization-kotlinx-json:$ktor_version")
     implementation("io.ktor:ktor-server-method-override:$ktor_version")
     implementation("ch.qos.logback:logback-classic:$logback_version")
-    testImplementation("io.ktor:ktor-server-test-host:$ktor_version")
+    testImplementation("io.ktor:ktor-server-test-host-jvm:$ktor_version")
     testImplementation("org.jetbrains.kotlin:kotlin-test-junit:$kotlin_version")
 }
diff --git a/codeSnippets/snippets/json-kotlinx-method-override/src/test/kotlin/ApplicationTest.kt b/codeSnippets/snippets/json-kotlinx-method-override/src/test/kotlin/ApplicationTest.kt
index aaf622ab6..aab489e20 100644
--- a/codeSnippets/snippets/json-kotlinx-method-override/src/test/kotlin/ApplicationTest.kt
+++ b/codeSnippets/snippets/json-kotlinx-method-override/src/test/kotlin/ApplicationTest.kt
@@ -8,6 +8,9 @@ import kotlin.test.*
 class CustomerTests {
     @Test
     fun testDeleteCustomer() = testApplication {
+        application {
+            main()
+        }
         val response = client.post("/customer/3") {
             header(HttpHeaders.XHttpMethodOverride, "DELETE")
         }
diff --git a/codeSnippets/snippets/json-kotlinx-openapi/build.gradle.kts b/codeSnippets/snippets/json-kotlinx-openapi/build.gradle.kts
index 7408028ed..85b8368ab 100644
--- a/codeSnippets/snippets/json-kotlinx-openapi/build.gradle.kts
+++ b/codeSnippets/snippets/json-kotlinx-openapi/build.gradle.kts
@@ -30,6 +30,6 @@ dependencies {
     implementation("io.ktor:ktor-client-content-negotiation:$ktor_version")
     implementation("io.swagger.codegen.v3:swagger-codegen-generators:$swagger_codegen_version")
     implementation("ch.qos.logback:logback-classic:$logback_version")
-    testImplementation("io.ktor:ktor-server-test-host:$ktor_version")
+    testImplementation("io.ktor:ktor-server-test-host-jvm:$ktor_version")
     testImplementation("org.jetbrains.kotlin:kotlin-test-junit:$kotlin_version")
 }
diff --git a/codeSnippets/snippets/json-kotlinx-openapi/src/test/kotlin/ApplicationTest.kt b/codeSnippets/snippets/json-kotlinx-openapi/src/test/kotlin/ApplicationTest.kt
index 737a906da..53ad13e6c 100644
--- a/codeSnippets/snippets/json-kotlinx-openapi/src/test/kotlin/ApplicationTest.kt
+++ b/codeSnippets/snippets/json-kotlinx-openapi/src/test/kotlin/ApplicationTest.kt
@@ -14,18 +14,27 @@ import kotlin.test.Test
 class CustomerTests {
     @Test
     fun testSwaggerUIStatus() = testApplication {
+        application {
+            main()
+        }
         val response = client.get("/swagger")
         assertEquals(HttpStatusCode.OK, response.status)
     }
 
     @Test
     fun testOpenApiStatus() = testApplication {
+        application {
+            main()
+        }
         val response = client.get("/openapi")
         assertEquals(HttpStatusCode.OK, response.status)
     }
 
     @Test
     fun testGetCustomer() = testApplication {
+        application {
+            main()
+        }
         val response = client.get("/customer/1")
         assertEquals(
             """
@@ -42,6 +51,9 @@ class CustomerTests {
 
     @Test
     fun testPostCustomer() = testApplication {
+        application {
+            main()
+        }
         val client = createClient {
             install(ContentNegotiation) {
                 json()
diff --git a/codeSnippets/snippets/json-kotlinx/build.gradle.kts b/codeSnippets/snippets/json-kotlinx/build.gradle.kts
index 55936788b..5b0235109 100644
--- a/codeSnippets/snippets/json-kotlinx/build.gradle.kts
+++ b/codeSnippets/snippets/json-kotlinx/build.gradle.kts
@@ -28,6 +28,6 @@ dependencies {
     implementation("io.ktor:ktor-serialization-kotlinx-protobuf:$ktor_version")
     implementation("io.ktor:ktor-client-content-negotiation:$ktor_version")
     implementation("ch.qos.logback:logback-classic:$logback_version")
-    testImplementation("io.ktor:ktor-server-test-host:$ktor_version")
+    testImplementation("io.ktor:ktor-server-test-host-jvm:$ktor_version")
     testImplementation("org.jetbrains.kotlin:kotlin-test-junit:$kotlin_version")
 }
diff --git a/codeSnippets/snippets/json-kotlinx/src/test/kotlin/jsonkotlinx/ApplicationTest.kt b/codeSnippets/snippets/json-kotlinx/src/test/kotlin/jsonkotlinx/ApplicationTest.kt
index 81e4fd990..1e4be836c 100644
--- a/codeSnippets/snippets/json-kotlinx/src/test/kotlin/jsonkotlinx/ApplicationTest.kt
+++ b/codeSnippets/snippets/json-kotlinx/src/test/kotlin/jsonkotlinx/ApplicationTest.kt
@@ -5,15 +5,15 @@ import io.ktor.client.request.*
 import io.ktor.client.statement.*
 import io.ktor.http.*
 import io.ktor.serialization.kotlinx.json.*
-import io.ktor.server.application.*
 import io.ktor.server.testing.*
-import kotlinx.serialization.*
-import kotlinx.serialization.json.*
 import kotlin.test.*
 
 class CustomerTests {
     @Test
     fun testGetCustomer() = testApplication {
+        application {
+            main()
+        }
         val response = client.get("/customer/1")
         assertEquals(
             """
@@ -30,6 +30,9 @@ class CustomerTests {
 
     @Test
     fun testPostCustomer() = testApplication {
+        application {
+            main()
+        }
         val client = createClient {
             install(ContentNegotiation) {
                 json()
@@ -42,15 +45,4 @@ class CustomerTests {
         assertEquals("Customer stored correctly", response.bodyAsText())
         assertEquals(HttpStatusCode.Created, response.status)
     }
-
-    @Test
-    fun testPostCustomerLegacyApi() = withTestApplication(Application::main) {
-        with(handleRequest(HttpMethod.Post, "/customer"){
-            addHeader(HttpHeaders.ContentType, ContentType.Application.Json.toString())
-            setBody(Json.encodeToString(Customer(3, "Jet", "Brains")))
-        }) {
-            assertEquals("Customer stored correctly", response.content)
-            assertEquals(HttpStatusCode.Created, response.status())
-        }
-    }
 }
diff --git a/codeSnippets/snippets/jte/build.gradle.kts b/codeSnippets/snippets/jte/build.gradle.kts
index 992054a8c..1f7c26b53 100644
--- a/codeSnippets/snippets/jte/build.gradle.kts
+++ b/codeSnippets/snippets/jte/build.gradle.kts
@@ -24,6 +24,6 @@ dependencies {
     implementation("io.ktor:ktor-server-jte:$ktor_version")
     implementation("gg.jte:jte-kotlin:$jte_version")
     implementation("ch.qos.logback:logback-classic:$logback_version")
-    testImplementation("io.ktor:ktor-server-test-host:$ktor_version")
+    testImplementation("io.ktor:ktor-server-test-host-jvm:$ktor_version")
     testImplementation("org.jetbrains.kotlin:kotlin-test")
 }
diff --git a/codeSnippets/snippets/jte/src/test/kotlin/JteTest.kt b/codeSnippets/snippets/jte/src/test/kotlin/JteTest.kt
index 6f77e2374..2a3e621eb 100644
--- a/codeSnippets/snippets/jte/src/test/kotlin/JteTest.kt
+++ b/codeSnippets/snippets/jte/src/test/kotlin/JteTest.kt
@@ -1,3 +1,5 @@
+import com.example.main
+import com.example.module
 import io.ktor.client.request.*
 import io.ktor.client.statement.*
 import io.ktor.server.testing.*
@@ -11,8 +13,12 @@ class ApplicationTest {
     @Ignore
     @Test
     fun testRoot() = testApplication {
+        application {
+            module()
+        }
         val response = client.get("/index")
-        assertEquals("""
+        assertEquals(
+            """
             <html>
                 <body>
                     <h1>Hello, John!</h1>
diff --git a/codeSnippets/snippets/legacy-interactive-website/build.gradle.kts b/codeSnippets/snippets/legacy-interactive-website/build.gradle.kts
index 5e475baa1..70905b51d 100644
--- a/codeSnippets/snippets/legacy-interactive-website/build.gradle.kts
+++ b/codeSnippets/snippets/legacy-interactive-website/build.gradle.kts
@@ -1,11 +1,10 @@
-val ktor_version: String by project
 val kotlin_version: String by project
 val logback_version: String by project
 
 plugins {
     application
     kotlin("jvm")
-    id("io.ktor.plugin") version "2.3.12"
+    id("io.ktor.plugin") version "3.0.0"
 }
 
 application {
@@ -18,10 +17,10 @@ repositories {
 }
 
 dependencies {
-    implementation("io.ktor:ktor-server-core:$ktor_version")
-    implementation("io.ktor:ktor-server-netty:$ktor_version")
-    implementation("io.ktor:ktor-server-freemarker:$ktor_version")
+    implementation("io.ktor:ktor-server-core-jvm")
+    implementation("io.ktor:ktor-server-netty-jvm")
+    implementation("io.ktor:ktor-server-freemarker-jvm")
     implementation("ch.qos.logback:logback-classic:$logback_version")
-    testImplementation("io.ktor:ktor-server-test-host:$ktor_version")
+    testImplementation("io.ktor:ktor-server-test-host-jvm")
     testImplementation("org.jetbrains.kotlin:kotlin-test-junit:$kotlin_version")
 }
\ No newline at end of file
diff --git a/codeSnippets/snippets/locations/src/main/kotlin/com/example/LocationsApplication.kt b/codeSnippets/snippets/locations/src/main/kotlin/com/example/LocationsApplication.kt
deleted file mode 100644
index c6c826c9a..000000000
--- a/codeSnippets/snippets/locations/src/main/kotlin/com/example/LocationsApplication.kt
+++ /dev/null
@@ -1,60 +0,0 @@
-package com.example
-
-import io.ktor.server.application.*
-import io.ktor.server.html.*
-import io.ktor.server.locations.*
-import io.ktor.server.plugins.callloging.*
-import io.ktor.server.plugins.defaultheaders.*
-import io.ktor.server.routing.*
-import kotlinx.html.*
-import java.util.*
-
-@Location("/") class index()
-@Location("/number") class number(val value: Int)
-
-fun Application.main() {
-    install(DefaultHeaders)
-    install(CallLogging)
-    install(Locations)
-    routing {
-        get<index> {
-            call.respondHtml {
-                head {
-                    title { +"Ktor: locations" }
-                }
-                body {
-                    p {
-                        +"Hello from Ktor locations sample application"
-                    }
-                    h1 {
-                        +"Choose a Number"
-                    }
-                    ul {
-                        val rnd = Random()
-                        (0..5).forEach {
-                            li {
-                                val number = number(rnd.nextInt(1000))
-                                a(href = locations.href(number)) {
-                                    +"Number #${number.value}"
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        get<number> { number ->
-            call.respondHtml {
-                head {
-                    title { +"Ktor: locations" }
-                }
-                body {
-                    h1 {
-                        +"Number is ${number.value}"
-                    }
-                }
-            }
-        }
-    }
-}
diff --git a/codeSnippets/snippets/logging/src/main/kotlin/com/example/Application.kt b/codeSnippets/snippets/logging/src/main/kotlin/com/example/Application.kt
index 785094ab0..c3fb2477c 100644
--- a/codeSnippets/snippets/logging/src/main/kotlin/com/example/Application.kt
+++ b/codeSnippets/snippets/logging/src/main/kotlin/com/example/Application.kt
@@ -1,7 +1,7 @@
 package com.example
 
 import io.ktor.server.application.*
-import io.ktor.server.plugins.callloging.*
+import io.ktor.server.plugins.calllogging.*
 import io.ktor.server.request.*
 import io.ktor.server.response.*
 import io.ktor.server.routing.*
diff --git a/codeSnippets/snippets/micrometer-metrics/build.gradle.kts b/codeSnippets/snippets/micrometer-metrics/build.gradle.kts
index 88163e59e..60591cc98 100644
--- a/codeSnippets/snippets/micrometer-metrics/build.gradle.kts
+++ b/codeSnippets/snippets/micrometer-metrics/build.gradle.kts
@@ -24,6 +24,6 @@ dependencies {
     implementation("io.ktor:ktor-server-metrics-micrometer:$ktor_version")
     implementation("ch.qos.logback:logback-classic:$logback_version")
     implementation("io.micrometer:micrometer-registry-prometheus:$prometheus_version")
-    testImplementation("io.ktor:ktor-server-test-host:$ktor_version")
+    testImplementation("io.ktor:ktor-server-test-host-jvm:$ktor_version")
     testImplementation("org.jetbrains.kotlin:kotlin-test")
 }
diff --git a/codeSnippets/snippets/micrometer-metrics/src/test/kotlin/ApplicationTest.kt b/codeSnippets/snippets/micrometer-metrics/src/test/kotlin/ApplicationTest.kt
index fe6a70603..f3e91cacf 100644
--- a/codeSnippets/snippets/micrometer-metrics/src/test/kotlin/ApplicationTest.kt
+++ b/codeSnippets/snippets/micrometer-metrics/src/test/kotlin/ApplicationTest.kt
@@ -1,3 +1,5 @@
+package com.example
+
 import io.ktor.client.request.*
 import io.ktor.client.statement.*
 import io.ktor.http.*
@@ -7,6 +9,9 @@ import kotlin.test.*
 class ApplicationTest {
     @Test
     fun testMetrics() = testApplication {
+        application {
+            module()
+        }
         client.get("/metrics").let { response ->
             assertEquals(HttpStatusCode.OK, response.status)
             assertTrue {
diff --git a/codeSnippets/snippets/migrating-express-ktor/1_hello/README.md b/codeSnippets/snippets/migrating-express-ktor/1_hello/README.md
new file mode 100644
index 000000000..e6f8ee6f2
--- /dev/null
+++ b/codeSnippets/snippets/migrating-express-ktor/1_hello/README.md
@@ -0,0 +1,24 @@
+# Hello World
+
+An application that accepts `GET` requests and responds with predefined plain text.
+
+>The application is used to demonstrate the content described in the [Hello World chapter](https://ktor.io/docs/migration-from-express-js.html#hello)
+>from the "Migrating from Express to Ktor" article.
+
+## Build
+
+To build the application, run the following command from the project's root directory:
+
+```shell
+./gradlew build
+```
+
+## Run
+
+To run the application, run the following command from the project's root directory:
+
+```shell
+./gradlew run
+```
+
+The application will be running at [http://0.0.0.0:8080](http://0.0.0.0:8080)
\ No newline at end of file
diff --git a/codeSnippets/snippets/migrating-express-ktor/1_hello/build.gradle.kts b/codeSnippets/snippets/migrating-express-ktor/1_hello/build.gradle.kts
index 96ab4867c..2a08593dc 100644
--- a/codeSnippets/snippets/migrating-express-ktor/1_hello/build.gradle.kts
+++ b/codeSnippets/snippets/migrating-express-ktor/1_hello/build.gradle.kts
@@ -4,7 +4,7 @@ val logback_version: String by project
 
 plugins {
     application
-    kotlin("jvm") version "1.8.0"
+    kotlin("jvm") version "2.0.0"
 }
 
 group = "com.example"
@@ -24,6 +24,6 @@ dependencies {
     implementation("io.ktor:ktor-server-core-jvm:$ktor_version")
     implementation("io.ktor:ktor-server-netty-jvm:$ktor_version")
     implementation("ch.qos.logback:logback-classic:$logback_version")
-    testImplementation("io.ktor:ktor-server-tests-jvm:$ktor_version")
+    testImplementation("io.ktor:ktor-server-test-host-jvm:$ktor_version")
     testImplementation("org.jetbrains.kotlin:kotlin-test-junit:$kotlin_version")
 }
\ No newline at end of file
diff --git a/codeSnippets/snippets/migrating-express-ktor/1_hello/src/test/kotlin/com/example/ApplicationTest.kt b/codeSnippets/snippets/migrating-express-ktor/1_hello/src/test/kotlin/com/example/ApplicationTest.kt
deleted file mode 100644
index 2bd765f57..000000000
--- a/codeSnippets/snippets/migrating-express-ktor/1_hello/src/test/kotlin/com/example/ApplicationTest.kt
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.example
-
-import io.ktor.server.routing.*
-import io.ktor.http.*
-import io.ktor.server.application.*
-import io.ktor.server.response.*
-import io.ktor.server.request.*
-import io.ktor.client.request.*
-import io.ktor.client.statement.*
-import kotlin.test.*
-import io.ktor.server.testing.*
-import com.example.plugins.*
-
-class ApplicationTest {
-    @Test
-    fun testRoot() = testApplication {
-        application {
-            configureRouting()
-        }
-        client.get("/").apply {
-            assertEquals(HttpStatusCode.OK, status)
-            assertEquals("Hello World!", bodyAsText())
-        }
-    }
-}
\ No newline at end of file
diff --git a/codeSnippets/snippets/migrating-express-ktor/1_hello_config/build.gradle.kts b/codeSnippets/snippets/migrating-express-ktor/1_hello_config/build.gradle.kts
index 326c9fc61..7b1422437 100644
--- a/codeSnippets/snippets/migrating-express-ktor/1_hello_config/build.gradle.kts
+++ b/codeSnippets/snippets/migrating-express-ktor/1_hello_config/build.gradle.kts
@@ -4,7 +4,7 @@ val logback_version: String by project
 
 plugins {
     application
-    kotlin("jvm") version "1.8.0"
+    kotlin("jvm") version "2.0.0"
 }
 
 application {
@@ -22,6 +22,6 @@ dependencies {
     implementation("io.ktor:ktor-server-core-jvm:$ktor_version")
     implementation("io.ktor:ktor-server-netty-jvm:$ktor_version")
     implementation("ch.qos.logback:logback-classic:$logback_version")
-    testImplementation("io.ktor:ktor-server-tests-jvm:$ktor_version")
+    testImplementation("io.ktor:ktor-server-test-host-jvm:$ktor_version")
     testImplementation("org.jetbrains.kotlin:kotlin-test-junit:$kotlin_version")
 }
\ No newline at end of file
diff --git a/codeSnippets/snippets/migrating-express-ktor/2_static/README.md b/codeSnippets/snippets/migrating-express-ktor/2_static/README.md
new file mode 100644
index 000000000..66cd3f2c2
--- /dev/null
+++ b/codeSnippets/snippets/migrating-express-ktor/2_static/README.md
@@ -0,0 +1,24 @@
+# Serving static content
+
+An application that serves static files such as images, CSS files, and JavaScript files.
+
+>The application is used to demonstrate the content described in the [Serving static content chapter](https://ktor.io/docs/migration-from-express-js.html#static)
+>from the "Migrating from Express to Ktor" article.
+
+## Build
+
+To build the application, run the following command from the project's root directory:
+
+```shell
+./gradlew build
+```
+
+## Run
+
+To run the application, run the following command from the project's root directory:
+
+```shell
+./gradlew run
+```
+
+The application will be running at [http://0.0.0.0:8080](http://0.0.0.0:8080)
\ No newline at end of file
diff --git a/codeSnippets/snippets/migrating-express-ktor/2_static/build.gradle.kts b/codeSnippets/snippets/migrating-express-ktor/2_static/build.gradle.kts
index 326c9fc61..7b1422437 100644
--- a/codeSnippets/snippets/migrating-express-ktor/2_static/build.gradle.kts
+++ b/codeSnippets/snippets/migrating-express-ktor/2_static/build.gradle.kts
@@ -4,7 +4,7 @@ val logback_version: String by project
 
 plugins {
     application
-    kotlin("jvm") version "1.8.0"
+    kotlin("jvm") version "2.0.0"
 }
 
 application {
@@ -22,6 +22,6 @@ dependencies {
     implementation("io.ktor:ktor-server-core-jvm:$ktor_version")
     implementation("io.ktor:ktor-server-netty-jvm:$ktor_version")
     implementation("ch.qos.logback:logback-classic:$logback_version")
-    testImplementation("io.ktor:ktor-server-tests-jvm:$ktor_version")
+    testImplementation("io.ktor:ktor-server-test-host-jvm:$ktor_version")
     testImplementation("org.jetbrains.kotlin:kotlin-test-junit:$kotlin_version")
 }
\ No newline at end of file
diff --git a/codeSnippets/snippets/migrating-express-ktor/2_static/src/main/kotlin/com/example/Application.kt b/codeSnippets/snippets/migrating-express-ktor/2_static/src/main/kotlin/com/example/Application.kt
index 1128c0469..ee597cbad 100644
--- a/codeSnippets/snippets/migrating-express-ktor/2_static/src/main/kotlin/com/example/Application.kt
+++ b/codeSnippets/snippets/migrating-express-ktor/2_static/src/main/kotlin/com/example/Application.kt
@@ -10,10 +10,6 @@ fun main(args: Array<String>): Unit =
 
 fun Application.module() {
     routing {
-        static("/") {
-            staticRootFolder = File("public")
-            files(".")
-            default("index.html")
-        }
+        staticFiles("", File("public"), "index.html")
     }
-}
+}
\ No newline at end of file
diff --git a/codeSnippets/snippets/migrating-express-ktor/3_router/README.md b/codeSnippets/snippets/migrating-express-ktor/3_router/README.md
new file mode 100644
index 000000000..f9f086364
--- /dev/null
+++ b/codeSnippets/snippets/migrating-express-ktor/3_router/README.md
@@ -0,0 +1,28 @@
+# Routing
+
+An application that handles `GET` and `POST` requests made to the `/` path.
+
+>The application is used to demonstrate the content described in the [Routing chapter](https://ktor.io/docs/migration-from-express-js.html#routing)
+>from the "Migrating from Express to Ktor" article.
+
+## Build
+
+To build the application, run the following command from the project's root directory:
+
+```shell
+./gradlew build
+```
+
+## Run
+
+To run the application, run the following command from the project's root directory:
+
+```shell
+./gradlew run
+```
+
+The application will be running at [http://0.0.0.0:8080](http://0.0.0.0:8080)
+
+## Test
+
+Use the [request.http](request.http) file to manually test the HTTP endpoints directly from the IDE.
\ No newline at end of file
diff --git a/codeSnippets/snippets/migrating-express-ktor/3_router/build.gradle.kts b/codeSnippets/snippets/migrating-express-ktor/3_router/build.gradle.kts
index 326c9fc61..7b1422437 100644
--- a/codeSnippets/snippets/migrating-express-ktor/3_router/build.gradle.kts
+++ b/codeSnippets/snippets/migrating-express-ktor/3_router/build.gradle.kts
@@ -4,7 +4,7 @@ val logback_version: String by project
 
 plugins {
     application
-    kotlin("jvm") version "1.8.0"
+    kotlin("jvm") version "2.0.0"
 }
 
 application {
@@ -22,6 +22,6 @@ dependencies {
     implementation("io.ktor:ktor-server-core-jvm:$ktor_version")
     implementation("io.ktor:ktor-server-netty-jvm:$ktor_version")
     implementation("ch.qos.logback:logback-classic:$logback_version")
-    testImplementation("io.ktor:ktor-server-tests-jvm:$ktor_version")
+    testImplementation("io.ktor:ktor-server-test-host-jvm:$ktor_version")
     testImplementation("org.jetbrains.kotlin:kotlin-test-junit:$kotlin_version")
 }
\ No newline at end of file
diff --git a/codeSnippets/snippets/migrating-express-ktor/3_router/request.http b/codeSnippets/snippets/migrating-express-ktor/3_router/request.http
index 29bbc8308..11e5370f9 100644
--- a/codeSnippets/snippets/migrating-express-ktor/3_router/request.http
+++ b/codeSnippets/snippets/migrating-express-ktor/3_router/request.http
@@ -1,16 +1,32 @@
 GET http://0.0.0.0:8080/book
 Content-Type: text/plain
 
+Get a random book
+
 ###
 
 POST http://0.0.0.0:8080/book
 Content-Type: text/plain
 
-Hello, world!
+Add a book
 
 ###
 
 PUT http://0.0.0.0:8080/book
 Content-Type: text/plain
 
-Hello, world!
+Update a book
+
+###
+
+GET http://0.0.0.0:8080/birds
+Content-Type: text/plain
+
+Birds home page
+
+###
+
+GET http://0.0.0.0:8080/birds/about
+Content-Type: text/plain
+
+About birds
diff --git a/codeSnippets/snippets/migrating-express-ktor/3_router/src/main/kotlin/com/example/routes/Birds.kt b/codeSnippets/snippets/migrating-express-ktor/3_router/src/main/kotlin/com/example/routes/Birds.kt
index f3ae940cc..70627c6f8 100644
--- a/codeSnippets/snippets/migrating-express-ktor/3_router/src/main/kotlin/com/example/routes/Birds.kt
+++ b/codeSnippets/snippets/migrating-express-ktor/3_router/src/main/kotlin/com/example/routes/Birds.kt
@@ -1,10 +1,9 @@
 package com.example.routes
 
-import io.ktor.server.application.*
 import io.ktor.server.response.*
 import io.ktor.server.routing.*
 
-fun Route.birdsRoutes() {
+fun Routing.birdsRoutes() {
     route("/birds") {
         get {
             call.respondText("Birds home page")
@@ -13,4 +12,4 @@ fun Route.birdsRoutes() {
             call.respondText("About birds")
         }
     }
-}
+}
\ No newline at end of file
diff --git a/codeSnippets/snippets/migrating-express-ktor/4_parameters/README.md b/codeSnippets/snippets/migrating-express-ktor/4_parameters/README.md
new file mode 100644
index 000000000..513b3c4d0
--- /dev/null
+++ b/codeSnippets/snippets/migrating-express-ktor/4_parameters/README.md
@@ -0,0 +1,24 @@
+# Route and query parameters
+
+An application that shows how to access route and query parameters.
+
+>The application is used to demonstrate the content described in the [Route and query parameters chapter](https://ktor.io/docs/migration-from-express-js.html#route-query-param)
+>from the "Migrating from Express to Ktor" article.
+
+## Build
+
+To build the application, run the following command from the project's root directory:
+
+```shell
+./gradlew build
+```
+
+## Run
+
+To run the application, run the following command from the project's root directory:
+
+```shell
+./gradlew run
+```
+
+The application will be running at [http://0.0.0.0:8080](http://0.0.0.0:8080)
\ No newline at end of file
diff --git a/codeSnippets/snippets/migrating-express-ktor/4_parameters/build.gradle.kts b/codeSnippets/snippets/migrating-express-ktor/4_parameters/build.gradle.kts
index 326c9fc61..7b1422437 100644
--- a/codeSnippets/snippets/migrating-express-ktor/4_parameters/build.gradle.kts
+++ b/codeSnippets/snippets/migrating-express-ktor/4_parameters/build.gradle.kts
@@ -4,7 +4,7 @@ val logback_version: String by project
 
 plugins {
     application
-    kotlin("jvm") version "1.8.0"
+    kotlin("jvm") version "2.0.0"
 }
 
 application {
@@ -22,6 +22,6 @@ dependencies {
     implementation("io.ktor:ktor-server-core-jvm:$ktor_version")
     implementation("io.ktor:ktor-server-netty-jvm:$ktor_version")
     implementation("ch.qos.logback:logback-classic:$logback_version")
-    testImplementation("io.ktor:ktor-server-tests-jvm:$ktor_version")
+    testImplementation("io.ktor:ktor-server-test-host-jvm:$ktor_version")
     testImplementation("org.jetbrains.kotlin:kotlin-test-junit:$kotlin_version")
 }
\ No newline at end of file
diff --git a/codeSnippets/snippets/migrating-express-ktor/5_send_response/README.md b/codeSnippets/snippets/migrating-express-ktor/5_send_response/README.md
new file mode 100644
index 000000000..b75f94406
--- /dev/null
+++ b/codeSnippets/snippets/migrating-express-ktor/5_send_response/README.md
@@ -0,0 +1,32 @@
+# Sending responses
+
+An application that shows how to access route and query parameters.
+
+>The application is used to demonstrate the content described in the [Sending responses chapter](https://ktor.io/docs/migration-from-express-js.html#send-json)
+>from the "Migrating from Express to Ktor" article.
+
+## Build
+
+To build the application, run the following command from the project's root directory:
+
+```shell
+./gradlew build
+```
+
+## Run
+
+To run the application, run the following command from the project's root directory:
+
+```shell
+./gradlew run
+```
+The application will be running at [http://0.0.0.0:8080](http://0.0.0.0:8080)
+
+## Test
+
+Test the application by navigating to the following URLs:
+
+- [http://0.0.0.0:8080/old](http://0.0.0.0:8080/old) redirects to `/moved`.
+- [http://0.0.0.0:8080/json](http://0.0.0.0:8080/json) returns data displayed in a JSON format.
+- [http://0.0.0.0:8080/file](http://0.0.0.0:8080/file) returns a file.
+- [http://0.0.0.0:8080/file-attachment](http://0.0.0.0:8080/file-attachment) downloads a file.
diff --git a/codeSnippets/snippets/migrating-express-ktor/5_send_response/build.gradle.kts b/codeSnippets/snippets/migrating-express-ktor/5_send_response/build.gradle.kts
index e73340fcb..3c068ddf4 100644
--- a/codeSnippets/snippets/migrating-express-ktor/5_send_response/build.gradle.kts
+++ b/codeSnippets/snippets/migrating-express-ktor/5_send_response/build.gradle.kts
@@ -4,7 +4,7 @@ val logback_version: String by project
 
 plugins {
     application
-    kotlin("jvm")
+    kotlin("jvm") version "2.0.0"
     kotlin("plugin.serialization").version("2.0.0")
 }
 
@@ -25,6 +25,6 @@ dependencies {
     implementation("ch.qos.logback:logback-classic:$logback_version")
     implementation("io.ktor:ktor-server-content-negotiation:$ktor_version")
     implementation("io.ktor:ktor-serialization-kotlinx-json:$ktor_version")
-    testImplementation("io.ktor:ktor-server-tests-jvm:$ktor_version")
+    testImplementation("io.ktor:ktor-server-test-host-jvm:$ktor_version")
     testImplementation("org.jetbrains.kotlin:kotlin-test-junit:$kotlin_version")
 }
\ No newline at end of file
diff --git a/codeSnippets/snippets/migrating-express-ktor/6_templates/README.md b/codeSnippets/snippets/migrating-express-ktor/6_templates/README.md
new file mode 100644
index 000000000..d33c392b7
--- /dev/null
+++ b/codeSnippets/snippets/migrating-express-ktor/6_templates/README.md
@@ -0,0 +1,24 @@
+# Templates
+
+An application that responds with a FreeMarker template.
+
+>The application is used to demonstrate the content described in the [Templates chapter](https://ktor.io/docs/migration-from-express-js.html#templates)
+>from the "Migrating from Express to Ktor" article.
+
+## Build
+
+To build the application, run the following command from the project's root directory:
+
+```shell
+./gradlew build
+```
+
+## Run
+
+To run the application, run the following command from the project's root directory:
+
+```shell
+./gradlew run
+```
+
+The application will be running at [http://0.0.0.0:8080](http://0.0.0.0:8080)
\ No newline at end of file
diff --git a/codeSnippets/snippets/migrating-express-ktor/6_templates/build.gradle.kts b/codeSnippets/snippets/migrating-express-ktor/6_templates/build.gradle.kts
index 7f4fa0681..500568f5f 100644
--- a/codeSnippets/snippets/migrating-express-ktor/6_templates/build.gradle.kts
+++ b/codeSnippets/snippets/migrating-express-ktor/6_templates/build.gradle.kts
@@ -4,7 +4,7 @@ val logback_version: String by project
 
 plugins {
     application
-    kotlin("jvm") version "1.8.0"
+    kotlin("jvm") version "2.0.0"
 }
 
 application {
@@ -23,6 +23,6 @@ dependencies {
     implementation("io.ktor:ktor-server-netty-jvm:$ktor_version")
     implementation("io.ktor:ktor-server-freemarker:$ktor_version")
     implementation("ch.qos.logback:logback-classic:$logback_version")
-    testImplementation("io.ktor:ktor-server-tests-jvm:$ktor_version")
+    testImplementation("io.ktor:ktor-server-test-host-jvm:$ktor_version")
     testImplementation("org.jetbrains.kotlin:kotlin-test-junit:$kotlin_version")
 }
\ No newline at end of file
diff --git a/codeSnippets/snippets/migrating-express-ktor/7_receive_request/README.md b/codeSnippets/snippets/migrating-express-ktor/7_receive_request/README.md
new file mode 100644
index 000000000..03d78c961
--- /dev/null
+++ b/codeSnippets/snippets/migrating-express-ktor/7_receive_request/README.md
@@ -0,0 +1,28 @@
+# Receiving requests
+
+An application that receives request bodies in different formats.
+
+>The application is used to demonstrate the content described in the [Receiving requests chapter](https://ktor.io/docs/migration-from-express-js.html#receive-request)
+>from the "Migrating from Express to Ktor" article.
+
+## Build
+
+To build the application, run the following command from the project's root directory:
+
+```shell
+./gradlew build
+```
+
+## Run
+
+To run the application, run the following command from the project's root directory:
+
+```shell
+./gradlew run
+```
+
+The application will be running at [http://0.0.0.0:8080](http://0.0.0.0:8080)
+
+## Test
+
+Use the [post.http](post.http) file to manually test the `HTTP` endpoints directly from the IDE.
\ No newline at end of file
diff --git a/codeSnippets/snippets/migrating-express-ktor/7_receive_request/build.gradle.kts b/codeSnippets/snippets/migrating-express-ktor/7_receive_request/build.gradle.kts
index 44057faa9..9889ca1ab 100644
--- a/codeSnippets/snippets/migrating-express-ktor/7_receive_request/build.gradle.kts
+++ b/codeSnippets/snippets/migrating-express-ktor/7_receive_request/build.gradle.kts
@@ -25,6 +25,6 @@ dependencies {
     implementation("io.ktor:ktor-server-content-negotiation:$ktor_version")
     implementation("io.ktor:ktor-serialization-kotlinx-json:$ktor_version")
     implementation("ch.qos.logback:logback-classic:$logback_version")
-    testImplementation("io.ktor:ktor-server-tests-jvm:$ktor_version")
+    testImplementation("io.ktor:ktor-server-test-host-jvm:$ktor_version")
     testImplementation("org.jetbrains.kotlin:kotlin-test-junit:$kotlin_version")
 }
\ No newline at end of file
diff --git a/codeSnippets/snippets/migrating-express-ktor/7_receive_request/src/main/kotlin/com/example/Application.kt b/codeSnippets/snippets/migrating-express-ktor/7_receive_request/src/main/kotlin/com/example/Application.kt
index 73d38680e..59ad22168 100644
--- a/codeSnippets/snippets/migrating-express-ktor/7_receive_request/src/main/kotlin/com/example/Application.kt
+++ b/codeSnippets/snippets/migrating-express-ktor/7_receive_request/src/main/kotlin/com/example/Application.kt
@@ -9,6 +9,7 @@ import io.ktor.server.response.*
 import io.ktor.server.routing.*
 import io.ktor.util.cio.*
 import io.ktor.utils.io.*
+import kotlinx.io.readByteArray
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.*
 import java.io.*
@@ -57,12 +58,13 @@ fun Application.module() {
 
                     is PartData.FileItem -> {
                         fileName = part.originalFileName as String
-                        var fileBytes = part.streamProvider().readBytes()
+                        val fileBytes = part.provider().readRemaining().readByteArray()
                         File("uploads/$fileName").writeBytes(fileBytes)
                     }
 
                     else -> {}
                 }
+                part.dispose()
             }
             call.respondText("$fileDescription is uploaded to 'uploads/$fileName'")
         }
diff --git a/codeSnippets/snippets/migrating-express-ktor/8_middleware/README.md b/codeSnippets/snippets/migrating-express-ktor/8_middleware/README.md
new file mode 100644
index 000000000..e0c5c10dc
--- /dev/null
+++ b/codeSnippets/snippets/migrating-express-ktor/8_middleware/README.md
@@ -0,0 +1,24 @@
+# Creating middleware
+
+An application that extends the server functionality by implementing request logging as a custom plugin.
+
+>The application is used to demonstrate the content described in the [Creating middleware chapter](https://ktor.io/docs/migration-from-express-js.html#middleware)
+>from the "Migrating from Express to Ktor" article.
+
+## Build
+
+To build the application, run the following command from the project's root directory:
+
+```shell
+./gradlew build
+```
+
+## Run
+
+To run the application, run the following command from the project's root directory:
+
+```shell
+./gradlew run
+```
+
+The application will be running at [http://0.0.0.0:8080](http://0.0.0.0:8080)
\ No newline at end of file
diff --git a/codeSnippets/snippets/migrating-express-ktor/8_middleware/build.gradle.kts b/codeSnippets/snippets/migrating-express-ktor/8_middleware/build.gradle.kts
index 326c9fc61..7b1422437 100644
--- a/codeSnippets/snippets/migrating-express-ktor/8_middleware/build.gradle.kts
+++ b/codeSnippets/snippets/migrating-express-ktor/8_middleware/build.gradle.kts
@@ -4,7 +4,7 @@ val logback_version: String by project
 
 plugins {
     application
-    kotlin("jvm") version "1.8.0"
+    kotlin("jvm") version "2.0.0"
 }
 
 application {
@@ -22,6 +22,6 @@ dependencies {
     implementation("io.ktor:ktor-server-core-jvm:$ktor_version")
     implementation("io.ktor:ktor-server-netty-jvm:$ktor_version")
     implementation("ch.qos.logback:logback-classic:$logback_version")
-    testImplementation("io.ktor:ktor-server-tests-jvm:$ktor_version")
+    testImplementation("io.ktor:ktor-server-test-host-jvm:$ktor_version")
     testImplementation("org.jetbrains.kotlin:kotlin-test-junit:$kotlin_version")
 }
\ No newline at end of file
diff --git a/codeSnippets/snippets/migrating-express-ktor/README.md b/codeSnippets/snippets/migrating-express-ktor/README.md
index ab4a053fd..2f10f5343 100644
--- a/codeSnippets/snippets/migrating-express-ktor/README.md
+++ b/codeSnippets/snippets/migrating-express-ktor/README.md
@@ -1,3 +1,19 @@
 # Migrating from Express to Ktor (Ktor project)
 
 The Ktor project that complements the [Migrating from Express to Ktor](https://ktor.io/docs/express-js.html) guide.
+
+# Build 
+
+To build all projects, run the following command from the project's root directory:
+
+```shell
+./gradlew build
+```
+
+# Run
+
+The project consists of 8 subprojects you can run individually, by using the project name and the `run` Gradle command.
+```shell
+./gradlew :1_hello:run
+```
+For further instructions, refer to each project's `README.md` file.
\ No newline at end of file
diff --git a/codeSnippets/snippets/migrating-express-ktor/gradle.properties b/codeSnippets/snippets/migrating-express-ktor/gradle.properties
index 8b4ba2c79..8cac7c876 100644
--- a/codeSnippets/snippets/migrating-express-ktor/gradle.properties
+++ b/codeSnippets/snippets/migrating-express-ktor/gradle.properties
@@ -1,4 +1,4 @@
-ktor_version=2.3.12
+ktor_version=3.0.0
 kotlin_version=2.0.0
 logback_version=1.5.6
 kotlin.code.style=official
diff --git a/codeSnippets/snippets/mustache/build.gradle.kts b/codeSnippets/snippets/mustache/build.gradle.kts
index 64e27b594..acf6b080b 100644
--- a/codeSnippets/snippets/mustache/build.gradle.kts
+++ b/codeSnippets/snippets/mustache/build.gradle.kts
@@ -22,6 +22,6 @@ dependencies {
     implementation("io.ktor:ktor-server-netty:$ktor_version")
     implementation("io.ktor:ktor-server-mustache:$ktor_version")
     implementation("ch.qos.logback:logback-classic:$logback_version")
-    testImplementation("io.ktor:ktor-server-test-host:$ktor_version")
+    testImplementation("io.ktor:ktor-server-test-host-jvm:$ktor_version")
     testImplementation("org.jetbrains.kotlin:kotlin-test")
 }
diff --git a/codeSnippets/snippets/mustache/src/test/kotlin/ApplicationTest.kt b/codeSnippets/snippets/mustache/src/test/kotlin/ApplicationTest.kt
index bf8ee3e31..7fa49776b 100644
--- a/codeSnippets/snippets/mustache/src/test/kotlin/ApplicationTest.kt
+++ b/codeSnippets/snippets/mustache/src/test/kotlin/ApplicationTest.kt
@@ -1,3 +1,5 @@
+package com.example
+
 import io.ktor.client.call.*
 import io.ktor.client.request.*
 import io.ktor.server.testing.*
@@ -7,8 +9,12 @@ import org.junit.Assert.*
 class ApplicationTest {
     @Test
     fun test() = testApplication {
+        application {
+            module()
+        }
         val response: String = client.get("/index").body()
-        assertEquals("""
+        assertEquals(
+            """
 <html>
     <body>
         <h1>Hello, John</h1>
diff --git a/codeSnippets/snippets/pebble/build.gradle.kts b/codeSnippets/snippets/pebble/build.gradle.kts
index 7aa83bc57..3c639a399 100644
--- a/codeSnippets/snippets/pebble/build.gradle.kts
+++ b/codeSnippets/snippets/pebble/build.gradle.kts
@@ -22,6 +22,6 @@ dependencies {
     implementation("io.ktor:ktor-server-netty:$ktor_version")
     implementation("io.ktor:ktor-server-pebble:$ktor_version")
     implementation("ch.qos.logback:logback-classic:$logback_version")
-    testImplementation("io.ktor:ktor-server-test-host:$ktor_version")
+    testImplementation("io.ktor:ktor-server-test-host-jvm:$ktor_version")
     testImplementation("org.jetbrains.kotlin:kotlin-test")
 }
diff --git a/codeSnippets/snippets/pebble/src/test/kotlin/ApplicationTest.kt b/codeSnippets/snippets/pebble/src/test/kotlin/ApplicationTest.kt
index bf8ee3e31..7fa49776b 100644
--- a/codeSnippets/snippets/pebble/src/test/kotlin/ApplicationTest.kt
+++ b/codeSnippets/snippets/pebble/src/test/kotlin/ApplicationTest.kt
@@ -1,3 +1,5 @@
+package com.example
+
 import io.ktor.client.call.*
 import io.ktor.client.request.*
 import io.ktor.server.testing.*
@@ -7,8 +9,12 @@ import org.junit.Assert.*
 class ApplicationTest {
     @Test
     fun test() = testApplication {
+        application {
+            module()
+        }
         val response: String = client.get("/index").body()
-        assertEquals("""
+        assertEquals(
+            """
 <html>
     <body>
         <h1>Hello, John</h1>
diff --git a/codeSnippets/snippets/post-form-parameters/build.gradle.kts b/codeSnippets/snippets/post-form-parameters/build.gradle.kts
index 1ab51f02a..db26d64a6 100644
--- a/codeSnippets/snippets/post-form-parameters/build.gradle.kts
+++ b/codeSnippets/snippets/post-form-parameters/build.gradle.kts
@@ -22,6 +22,6 @@ dependencies {
     implementation("io.ktor:ktor-server-netty:$ktor_version")
     implementation("io.ktor:ktor-server-html-builder:$ktor_version")
     implementation("ch.qos.logback:logback-classic:$logback_version")
-    testImplementation("io.ktor:ktor-server-test-host:$ktor_version")
+    testImplementation("io.ktor:ktor-server-test-host-jvm:$ktor_version")
     testImplementation("org.jetbrains.kotlin:kotlin-test")
 }
diff --git a/codeSnippets/snippets/post-form-parameters/src/test/kotlin/formparameters/ApplicationTest.kt b/codeSnippets/snippets/post-form-parameters/src/test/kotlin/formparameters/ApplicationTest.kt
index 019adc501..afaeb3fcf 100644
--- a/codeSnippets/snippets/post-form-parameters/src/test/kotlin/formparameters/ApplicationTest.kt
+++ b/codeSnippets/snippets/post-form-parameters/src/test/kotlin/formparameters/ApplicationTest.kt
@@ -3,27 +3,19 @@ package formparameters
 import io.ktor.client.request.*
 import io.ktor.client.statement.*
 import io.ktor.http.*
-import io.ktor.server.application.*
 import io.ktor.server.testing.*
 import kotlin.test.*
 
 class ApplicationTest {
     @Test
     fun testPost() = testApplication {
+        application {
+            main()
+        }
         val response = client.post("/signup") {
             header(HttpHeaders.ContentType, ContentType.Application.FormUrlEncoded.toString())
             setBody(listOf("username" to "JetBrains", "email" to "example@jetbrains.com", "password" to "foobar", "confirmation" to "foobar").formUrlEncode())
         }
         assertEquals("The 'JetBrains' account is created", response.bodyAsText())
     }
-
-    @Test
-    fun testPostLegacyApi() = withTestApplication(Application::main) {
-        with(handleRequest(HttpMethod.Post, "/signup"){
-            addHeader(HttpHeaders.ContentType, ContentType.Application.FormUrlEncoded.toString())
-            setBody(listOf("username" to "JetBrains", "email" to "example@jetbrains.com", "password" to "foobar", "confirmation" to "foobar").formUrlEncode())
-        }) {
-            assertEquals("The 'JetBrains' account is created", response.content)
-        }
-    }
 }
diff --git a/codeSnippets/snippets/post-raw-data/build.gradle.kts b/codeSnippets/snippets/post-raw-data/build.gradle.kts
index ce61d2618..0f10ec14e 100644
--- a/codeSnippets/snippets/post-raw-data/build.gradle.kts
+++ b/codeSnippets/snippets/post-raw-data/build.gradle.kts
@@ -21,6 +21,6 @@ dependencies {
     implementation("io.ktor:ktor-server-core:$ktor_version")
     implementation("io.ktor:ktor-server-netty:$ktor_version")
     implementation("ch.qos.logback:logback-classic:$logback_version")
-    testImplementation("io.ktor:ktor-server-test-host:$ktor_version")
+    testImplementation("io.ktor:ktor-server-test-host-jvm:$ktor_version")
     testImplementation("org.jetbrains.kotlin:kotlin-test")
 }
diff --git a/codeSnippets/snippets/post-raw-data/src/test/kotlin/com/example/ApplicationTest.kt b/codeSnippets/snippets/post-raw-data/src/test/kotlin/com/example/ApplicationTest.kt
index c2407299e..271678114 100644
--- a/codeSnippets/snippets/post-raw-data/src/test/kotlin/com/example/ApplicationTest.kt
+++ b/codeSnippets/snippets/post-raw-data/src/test/kotlin/com/example/ApplicationTest.kt
@@ -4,7 +4,6 @@ import io.ktor.client.request.*
 import io.ktor.client.statement.*
 import io.ktor.http.*
 import io.ktor.server.testing.*
-import io.ktor.util.cio.*
 import org.junit.After
 import java.io.*
 import kotlin.test.*
@@ -12,6 +11,9 @@ import kotlin.test.*
 class ApplicationTest {
     @Test
     fun testPost() = testApplication {
+        application {
+            main()
+        }
         val response = client.post("/text") {
             header(HttpHeaders.ContentType, ContentType.Text.Plain)
             setBody("Hello, world!")
@@ -21,6 +23,9 @@ class ApplicationTest {
 
     @Test
     fun testPostByteArray() = testApplication {
+        application {
+            main()
+        }
         val response = client.post("/bytes") {
             header(HttpHeaders.ContentType, ContentType.Text.Plain)
             setBody("Hello, world!")
@@ -30,6 +35,9 @@ class ApplicationTest {
 
     @Test
     fun testPostChannel() = testApplication {
+        application {
+            main()
+        }
         val response = client.post("/channel") {
             header(HttpHeaders.ContentType, ContentType.Text.Plain)
             setBody("Hello, world!")
@@ -39,8 +47,11 @@ class ApplicationTest {
 
     @Test
     fun testUploadBinary() = testApplication {
+        application {
+            main()
+        }
         val response = client.post("/upload") {
-            setBody(File("ktor_logo.png").readChannel())
+            setBody(File("ktor_logo.png").readBytes())
         }
         assertEquals("A file is uploaded", response.bodyAsText())
     }
diff --git a/codeSnippets/snippets/proguard/build.gradle.kts b/codeSnippets/snippets/proguard/build.gradle.kts
index af97a8728..d9c5efb4b 100644
--- a/codeSnippets/snippets/proguard/build.gradle.kts
+++ b/codeSnippets/snippets/proguard/build.gradle.kts
@@ -2,7 +2,6 @@ import java.nio.file.Files
 import java.nio.file.NoSuchFileException
 import java.nio.file.Paths
 
-val ktor_version: String by project
 val kotlin_version: String by project
 val logback_version: String by project
 
@@ -18,7 +17,7 @@ buildscript {
 plugins {
     application
     kotlin("jvm")
-    id("io.ktor.plugin") version "2.3.12"
+    id("io.ktor.plugin") version "3.0.0"
 }
 
 application {
@@ -32,8 +31,8 @@ repositories {
 
 dependencies {
     implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version")
-    implementation("io.ktor:ktor-server-core:$ktor_version")
-    implementation("io.ktor:ktor-server-netty:$ktor_version")
+    implementation("io.ktor:ktor-server-core-jvm")
+    implementation("io.ktor:ktor-server-netty-jvm")
     implementation("ch.qos.logback:logback-classic:$logback_version")
 }
 
diff --git a/codeSnippets/snippets/rate-limit/build.gradle.kts b/codeSnippets/snippets/rate-limit/build.gradle.kts
index a4e69d827..c7d2e71e3 100644
--- a/codeSnippets/snippets/rate-limit/build.gradle.kts
+++ b/codeSnippets/snippets/rate-limit/build.gradle.kts
@@ -23,6 +23,6 @@ dependencies {
     implementation("io.ktor:ktor-server-rate-limit:$ktor_version")
     implementation("io.ktor:ktor-server-status-pages:$ktor_version")
     implementation("ch.qos.logback:logback-classic:$logback_version")
-    testImplementation("io.ktor:ktor-server-test-host:$ktor_version")
+    testImplementation("io.ktor:ktor-server-test-host-jvm:$ktor_version")
     testImplementation("org.jetbrains.kotlin:kotlin-test")
 }
diff --git a/codeSnippets/snippets/rate-limit/src/test/kotlin/ApplicationTest.kt b/codeSnippets/snippets/rate-limit/src/test/kotlin/ApplicationTest.kt
index 16d2e847d..52acdfbe9 100644
--- a/codeSnippets/snippets/rate-limit/src/test/kotlin/ApplicationTest.kt
+++ b/codeSnippets/snippets/rate-limit/src/test/kotlin/ApplicationTest.kt
@@ -8,6 +8,9 @@ import kotlin.test.*
 class ApplicationTest {
     @Test
     fun testRateLimits() = testApplication {
+        application {
+            module()
+        }
         repeat(5) {
             client.get("/").let {
                 assertEquals(HttpStatusCode.OK, it.status)
diff --git a/codeSnippets/snippets/request-validation/build.gradle.kts b/codeSnippets/snippets/request-validation/build.gradle.kts
index a2210787e..5747e23bb 100644
--- a/codeSnippets/snippets/request-validation/build.gradle.kts
+++ b/codeSnippets/snippets/request-validation/build.gradle.kts
@@ -26,7 +26,7 @@ dependencies {
     implementation("io.ktor:ktor-server-content-negotiation:$ktor_version")
     implementation("io.ktor:ktor-serialization-kotlinx-json:$ktor_version")
     implementation("ch.qos.logback:logback-classic:$logback_version")
-    testImplementation("io.ktor:ktor-server-test-host:$ktor_version")
+    testImplementation("io.ktor:ktor-server-test-host-jvm:$ktor_version")
     testImplementation("io.ktor:ktor-client-content-negotiation:$ktor_version")
     testImplementation("org.jetbrains.kotlin:kotlin-test")
 }
diff --git a/codeSnippets/snippets/request-validation/src/test/kotlin/ApplicationTest.kt b/codeSnippets/snippets/request-validation/src/test/kotlin/ApplicationTest.kt
index c26149b36..63bc38535 100644
--- a/codeSnippets/snippets/request-validation/src/test/kotlin/ApplicationTest.kt
+++ b/codeSnippets/snippets/request-validation/src/test/kotlin/ApplicationTest.kt
@@ -10,7 +10,10 @@ import kotlin.test.*
 
 class ApplicationTest {
     @Test
-    fun testStringValidation () = testApplication {
+    fun testStringValidation() = testApplication {
+        application {
+            module()
+        }
         val response = client.post("/text") {
             contentType(ContentType.Text.Plain)
             setBody("Some text")
@@ -21,6 +24,9 @@ class ApplicationTest {
 
     @Test
     fun testJsonValidation() = testApplication {
+        application {
+            module()
+        }
         val client = createClient {
             install(ContentNegotiation) {
                 json()
@@ -35,7 +41,10 @@ class ApplicationTest {
     }
 
     @Test
-    fun testByteArrayValidation () = testApplication {
+    fun testByteArrayValidation() = testApplication {
+        application {
+            module()
+        }
         val response = client.post("/array") {
             contentType(ContentType.Text.Plain)
             setBody("-1")
diff --git a/codeSnippets/snippets/resource-routing/build.gradle.kts b/codeSnippets/snippets/resource-routing/build.gradle.kts
index 1e6e4daaa..9e8d98bc7 100644
--- a/codeSnippets/snippets/resource-routing/build.gradle.kts
+++ b/codeSnippets/snippets/resource-routing/build.gradle.kts
@@ -24,6 +24,6 @@ dependencies {
     implementation("io.ktor:ktor-server-resources:$ktor_version")
     implementation("io.ktor:ktor-server-html-builder:$ktor_version")
     implementation("ch.qos.logback:logback-classic:$logback_version")
-    testImplementation("io.ktor:ktor-server-test-host:$ktor_version")
+    testImplementation("io.ktor:ktor-server-test-host-jvm:$ktor_version")
     testImplementation("org.jetbrains.kotlin:kotlin-test")
 }
diff --git a/codeSnippets/snippets/resource-routing/src/test/kotlin/resourcerouting/ApplicationTest.kt b/codeSnippets/snippets/resource-routing/src/test/kotlin/resourcerouting/ApplicationTest.kt
index 0dcc1906a..365820d6c 100644
--- a/codeSnippets/snippets/resource-routing/src/test/kotlin/resourcerouting/ApplicationTest.kt
+++ b/codeSnippets/snippets/resource-routing/src/test/kotlin/resourcerouting/ApplicationTest.kt
@@ -10,18 +10,27 @@ import kotlin.test.*
 class ApplicationTest {
     @Test
     fun testGetAllArticles() = testApplication {
+        application {
+            module()
+        }
         val response = client.get("/articles?sort=old")
         assertEquals("List of articles sorted starting from old", response.bodyAsText())
     }
 
     @Test
     fun testGetArticle() = testApplication {
+        application {
+            module()
+        }
         val response = client.get("/articles/12")
         assertEquals("An article with id 12", response.bodyAsText())
     }
 
     @Test
     fun testPostArticle() = testApplication {
+        application {
+            module()
+        }
         val response = client.post("/articles")
         assertEquals(HttpStatusCode.Created, response.status)
         assertEquals("An article is saved", response.bodyAsText())
@@ -30,6 +39,7 @@ class ApplicationTest {
     @Test
     fun testHrefGenerationFromResource() = testApplication {
         application {
+            module()
             assertEquals("/articles?sort=new", href(Articles()))
             assertEquals("/articles?sort=old", href(Articles(sort = "old")))
             assertEquals("/articles", href(Articles(sort = null)))
diff --git a/codeSnippets/snippets/server-sse/README.md b/codeSnippets/snippets/server-sse/README.md
new file mode 100644
index 000000000..5b88cd7ea
--- /dev/null
+++ b/codeSnippets/snippets/server-sse/README.md
@@ -0,0 +1,19 @@
+# Server SSE
+
+A sample Ktor project showing how to create a server using [SSE](https://ktor.io/docs/sse_server.html).
+> This sample is a part of the [codeSnippets](../../README.md) Gradle project.
+
+## Running
+
+To run a sample, execute the following command in a repository's root directory:
+```bash
+./gradlew :server-sse:run
+```
+
+Then, you can test the server using an [SSE client](../client-sse/README.md).
+
+To start the SSE client, open a separate tab and execute the following command:
+
+```bash
+./gradlew :client-sse:run
+```
diff --git a/codeSnippets/snippets/locations/build.gradle.kts b/codeSnippets/snippets/server-sse/build.gradle.kts
similarity index 69%
rename from codeSnippets/snippets/locations/build.gradle.kts
rename to codeSnippets/snippets/server-sse/build.gradle.kts
index 39306010d..f77c64696 100644
--- a/codeSnippets/snippets/locations/build.gradle.kts
+++ b/codeSnippets/snippets/server-sse/build.gradle.kts
@@ -20,9 +20,8 @@ dependencies {
     implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version")
     implementation("io.ktor:ktor-server-core:$ktor_version")
     implementation("io.ktor:ktor-server-netty:$ktor_version")
-    implementation("io.ktor:ktor-server-default-headers:$ktor_version")
-    implementation("io.ktor:ktor-server-call-logging:$ktor_version")
-    implementation("io.ktor:ktor-server-html-builder:$ktor_version")
-    implementation("io.ktor:ktor-server-locations:$ktor_version")
+    implementation("io.ktor:ktor-server-sse:$ktor_version")
     implementation("ch.qos.logback:logback-classic:$logback_version")
+    testImplementation("io.ktor:ktor-server-test-host-jvm:$ktor_version")
+    testImplementation("org.jetbrains.kotlin:kotlin-test")
 }
diff --git a/codeSnippets/snippets/server-sse/src/main/kotlin/com/example/Application.kt b/codeSnippets/snippets/server-sse/src/main/kotlin/com/example/Application.kt
new file mode 100644
index 000000000..f1a7a40c0
--- /dev/null
+++ b/codeSnippets/snippets/server-sse/src/main/kotlin/com/example/Application.kt
@@ -0,0 +1,22 @@
+package com.example
+
+import io.ktor.server.application.*
+import io.ktor.server.routing.*
+import io.ktor.server.sse.*
+import io.ktor.sse.*
+import kotlinx.coroutines.*
+
+fun main(args: Array<String>): Unit = io.ktor.server.netty.EngineMain.main(args)
+
+fun Application.module() {
+    install(SSE)
+
+    routing {
+        sse("/events") {
+            repeat(6) {
+                send(ServerSentEvent("this is SSE #$it"))
+                delay(1000)
+            }
+        }
+    }
+}
diff --git a/codeSnippets/snippets/server-sse/src/main/resources/application.conf b/codeSnippets/snippets/server-sse/src/main/resources/application.conf
new file mode 100644
index 000000000..2d8cb23be
--- /dev/null
+++ b/codeSnippets/snippets/server-sse/src/main/resources/application.conf
@@ -0,0 +1,8 @@
+ktor {
+    deployment {
+        port = 8080
+    }
+    application {
+        modules = [ com.example.ApplicationKt.module ]
+    }
+}
\ No newline at end of file
diff --git a/codeSnippets/snippets/server-sse/src/main/resources/logback.xml b/codeSnippets/snippets/server-sse/src/main/resources/logback.xml
new file mode 100644
index 000000000..05f2549ee
--- /dev/null
+++ b/codeSnippets/snippets/server-sse/src/main/resources/logback.xml
@@ -0,0 +1,12 @@
+<configuration>
+<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+    <encoder>
+        <pattern>%d{YYYY-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+    </encoder>
+</appender>
+<root level="trace">
+    <appender-ref ref="STDOUT"/>
+</root>
+<logger name="org.eclipse.jetty" level="INFO"/>
+<logger name="io.netty" level="INFO"/>
+</configuration>
\ No newline at end of file
diff --git a/codeSnippets/snippets/server-websockets-serialization/build.gradle.kts b/codeSnippets/snippets/server-websockets-serialization/build.gradle.kts
index ad0db809b..c377aba6e 100644
--- a/codeSnippets/snippets/server-websockets-serialization/build.gradle.kts
+++ b/codeSnippets/snippets/server-websockets-serialization/build.gradle.kts
@@ -27,6 +27,6 @@ dependencies {
     implementation("io.ktor:ktor-serialization-kotlinx-cbor:$ktor_version")
     implementation("io.ktor:ktor-serialization-kotlinx-protobuf:$ktor_version")
     implementation("ch.qos.logback:logback-classic:$logback_version")
-    testImplementation("io.ktor:ktor-server-test-host:$ktor_version")
+    testImplementation("io.ktor:ktor-server-test-host-jvm:$ktor_version")
     testImplementation("org.jetbrains.kotlin:kotlin-test")
 }
diff --git a/codeSnippets/snippets/server-websockets-sharedflow/build.gradle.kts b/codeSnippets/snippets/server-websockets-sharedflow/build.gradle.kts
index 41edfdfd4..2ab7ddea5 100644
--- a/codeSnippets/snippets/server-websockets-sharedflow/build.gradle.kts
+++ b/codeSnippets/snippets/server-websockets-sharedflow/build.gradle.kts
@@ -5,7 +5,7 @@ val logback_version: String by project
 plugins {
     application
     kotlin("jvm")
-    id("io.ktor.plugin") version "2.3.12"
+    id("io.ktor.plugin") version "3.0.0"
     kotlin("plugin.serialization").version("2.0.0")
 }
 
@@ -24,6 +24,6 @@ dependencies {
     implementation("io.ktor:ktor-server-netty-jvm")
     implementation("io.ktor:ktor-serialization-kotlinx-json:$ktor_version")
     implementation("ch.qos.logback:logback-classic:$logback_version")
-    testImplementation("io.ktor:ktor-server-tests-jvm")
+    testImplementation("io.ktor:ktor-server-test-host-jvm")
     testImplementation("org.jetbrains.kotlin:kotlin-test-junit:$kotlin_version")
 }
\ No newline at end of file
diff --git a/codeSnippets/snippets/server-websockets-sharedflow/src/main/kotlin/com/example/plugins/Sockets.kt b/codeSnippets/snippets/server-websockets-sharedflow/src/main/kotlin/com/example/plugins/Sockets.kt
index e81a4ddd8..0500b5392 100644
--- a/codeSnippets/snippets/server-websockets-sharedflow/src/main/kotlin/com/example/plugins/Sockets.kt
+++ b/codeSnippets/snippets/server-websockets-sharedflow/src/main/kotlin/com/example/plugins/Sockets.kt
@@ -10,12 +10,12 @@ import kotlinx.coroutines.channels.consumeEach
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.asSharedFlow
 import kotlinx.coroutines.launch
-import java.time.*
+import kotlin.time.Duration.Companion.seconds
 
 fun Application.configureSockets() {
     install(WebSockets) {
-        pingPeriod = Duration.ofSeconds(15)
-        timeout = Duration.ofSeconds(15)
+        pingPeriod = 15.seconds
+        timeout = 15.seconds
         maxFrameSize = Long.MAX_VALUE
         masking = false
     }
diff --git a/codeSnippets/snippets/server-websockets-sharedflow/src/test/kotlin/com/example/ApplicationTest.kt b/codeSnippets/snippets/server-websockets-sharedflow/src/test/kotlin/com/example/ApplicationTest.kt
index 5df4d8982..c3f58c993 100644
--- a/codeSnippets/snippets/server-websockets-sharedflow/src/test/kotlin/com/example/ApplicationTest.kt
+++ b/codeSnippets/snippets/server-websockets-sharedflow/src/test/kotlin/com/example/ApplicationTest.kt
@@ -12,6 +12,9 @@ class ApplicationTest {
     @Test
     fun testConversation() {
         testApplication {
+            application {
+                module()
+            }
             coroutineScope {
                 val client1 = createClient {
                     install(WebSockets)
diff --git a/codeSnippets/snippets/server-websockets/build.gradle.kts b/codeSnippets/snippets/server-websockets/build.gradle.kts
index e09cc27a3..1f0ee5053 100644
--- a/codeSnippets/snippets/server-websockets/build.gradle.kts
+++ b/codeSnippets/snippets/server-websockets/build.gradle.kts
@@ -22,6 +22,6 @@ dependencies {
     implementation("io.ktor:ktor-server-netty:$ktor_version")
     implementation("io.ktor:ktor-server-websockets:$ktor_version")
     implementation("ch.qos.logback:logback-classic:$logback_version")
-    testImplementation("io.ktor:ktor-server-test-host:$ktor_version")
+    testImplementation("io.ktor:ktor-server-test-host-jvm:$ktor_version")
     testImplementation("org.jetbrains.kotlin:kotlin-test")
 }
diff --git a/codeSnippets/snippets/server-websockets/src/main/kotlin/com/example/Application.kt b/codeSnippets/snippets/server-websockets/src/main/kotlin/com/example/Application.kt
index 82e670829..d4ec45e1b 100644
--- a/codeSnippets/snippets/server-websockets/src/main/kotlin/com/example/Application.kt
+++ b/codeSnippets/snippets/server-websockets/src/main/kotlin/com/example/Application.kt
@@ -5,14 +5,14 @@ import io.ktor.server.response.*
 import io.ktor.server.routing.*
 import io.ktor.server.websocket.*
 import io.ktor.websocket.*
-import java.time.*
+import kotlin.time.Duration.Companion.seconds
 
 fun main(args: Array<String>): Unit = io.ktor.server.netty.EngineMain.main(args)
 
 fun Application.module() {
     install(WebSockets) {
-        pingPeriod = Duration.ofSeconds(15)
-        timeout = Duration.ofSeconds(15)
+        pingPeriod = 15.seconds
+        timeout = 15.seconds
         maxFrameSize = Long.MAX_VALUE
         masking = false
     }
diff --git a/codeSnippets/snippets/server-websockets/src/test/kotlin/com/example/ModuleTest.kt b/codeSnippets/snippets/server-websockets/src/test/kotlin/com/example/ModuleTest.kt
index 685532d5a..0d914da71 100644
--- a/codeSnippets/snippets/server-websockets/src/test/kotlin/com/example/ModuleTest.kt
+++ b/codeSnippets/snippets/server-websockets/src/test/kotlin/com/example/ModuleTest.kt
@@ -1,7 +1,6 @@
 package com.example
 
 import io.ktor.client.plugins.websocket.*
-import io.ktor.server.application.*
 import io.ktor.websocket.*
 import io.ktor.server.testing.*
 import kotlin.test.*
@@ -10,6 +9,9 @@ class ModuleTest {
     @Test
     fun testConversation() {
         testApplication {
+            application {
+                module()
+            }
             val client = createClient {
                 install(WebSockets)
             }
@@ -24,18 +26,4 @@ class ModuleTest {
             }
         }
     }
-
-    @Test
-    fun testConversationLegacyApi() {
-        withTestApplication(Application::module) {
-            handleWebSocketConversation("/echo") { incoming, outgoing ->
-                val greetingText = (incoming.receive() as Frame.Text).readText()
-                assertEquals("Please enter your name", greetingText)
-
-                outgoing.send(Frame.Text("JetBrains"))
-                val responseText = (incoming.receive() as Frame.Text).readText()
-                assertEquals("Hi, JetBrains!", responseText)
-            }
-        }
-    }
 }
\ No newline at end of file
diff --git a/codeSnippets/snippets/session-cookie-client/build.gradle.kts b/codeSnippets/snippets/session-cookie-client/build.gradle.kts
index 9855840c5..2baa8bb00 100644
--- a/codeSnippets/snippets/session-cookie-client/build.gradle.kts
+++ b/codeSnippets/snippets/session-cookie-client/build.gradle.kts
@@ -5,6 +5,7 @@ val logback_version: String by project
 plugins {
     application
     kotlin("jvm")
+    kotlin("plugin.serialization").version("2.0.0")
 }
 
 application {
@@ -21,7 +22,8 @@ dependencies {
     implementation("io.ktor:ktor-server-core:$ktor_version")
     implementation("io.ktor:ktor-server-netty:$ktor_version")
     implementation("io.ktor:ktor-server-sessions:$ktor_version")
+    implementation("io.ktor:ktor-serialization-kotlinx-json:$ktor_version")
     implementation("ch.qos.logback:logback-classic:$logback_version")
-    testImplementation("io.ktor:ktor-server-test-host:$ktor_version")
+    testImplementation("io.ktor:ktor-server-test-host-jvm:$ktor_version")
     testImplementation("org.jetbrains.kotlin:kotlin-test")
 }
diff --git a/codeSnippets/snippets/session-cookie-client/src/main/kotlin/cookieclient/Application.kt b/codeSnippets/snippets/session-cookie-client/src/main/kotlin/cookieclient/Application.kt
index 8f24d4811..8349b3863 100644
--- a/codeSnippets/snippets/session-cookie-client/src/main/kotlin/cookieclient/Application.kt
+++ b/codeSnippets/snippets/session-cookie-client/src/main/kotlin/cookieclient/Application.kt
@@ -5,7 +5,9 @@ import io.ktor.server.response.*
 import io.ktor.server.routing.*
 import io.ktor.server.sessions.*
 import io.ktor.util.*
+import kotlinx.serialization.Serializable
 
+@Serializable
 data class UserSession(val id: String, val count: Int)
 
 fun Application.main() {
diff --git a/codeSnippets/snippets/session-cookie-client/src/test/kotlin/cookieclient/ApplicationTest.kt b/codeSnippets/snippets/session-cookie-client/src/test/kotlin/cookieclient/ApplicationTest.kt
index 17802f1dd..269a33625 100644
--- a/codeSnippets/snippets/session-cookie-client/src/test/kotlin/cookieclient/ApplicationTest.kt
+++ b/codeSnippets/snippets/session-cookie-client/src/test/kotlin/cookieclient/ApplicationTest.kt
@@ -3,14 +3,15 @@ package cookieclient
 import io.ktor.client.plugins.cookies.*
 import io.ktor.client.request.*
 import io.ktor.client.statement.*
-import io.ktor.http.*
-import io.ktor.server.application.*
 import io.ktor.server.testing.*
 import kotlin.test.*
 
 class ApplicationTest {
     @Test
     fun testRequests() = testApplication {
+        application {
+            main()
+        }
         val client = createClient {
             install(HttpCookies)
         }
@@ -25,23 +26,4 @@ class ApplicationTest {
         val logoutResponse = client.get("/logout")
         assertEquals("Session doesn't exist or is expired.", logoutResponse.bodyAsText())
     }
-
-    @Test
-    fun testRequestsLegacyApi() = withTestApplication(Application::main) {
-        fun doRequestAndCheckResponse(path: String, expected: String) {
-            handleRequest(HttpMethod.Get, path).apply {
-                assertEquals(expected, response.content)
-            }
-        }
-
-        cookiesSession {
-            handleRequest(HttpMethod.Get, "/login") {}.apply {}
-            doRequestAndCheckResponse("/user", "Session ID is 123abc. Reload count is 0.")
-            doRequestAndCheckResponse("/user", "Session ID is 123abc. Reload count is 1.")
-            doRequestAndCheckResponse("/user", "Session ID is 123abc. Reload count is 2.")
-
-            handleRequest(HttpMethod.Get, "/logout").apply {}
-            doRequestAndCheckResponse("/user", "Session doesn't exist or is expired.")
-        }
-    }
 }
diff --git a/codeSnippets/snippets/session-cookie-server/build.gradle.kts b/codeSnippets/snippets/session-cookie-server/build.gradle.kts
index 9855840c5..2baa8bb00 100644
--- a/codeSnippets/snippets/session-cookie-server/build.gradle.kts
+++ b/codeSnippets/snippets/session-cookie-server/build.gradle.kts
@@ -5,6 +5,7 @@ val logback_version: String by project
 plugins {
     application
     kotlin("jvm")
+    kotlin("plugin.serialization").version("2.0.0")
 }
 
 application {
@@ -21,7 +22,8 @@ dependencies {
     implementation("io.ktor:ktor-server-core:$ktor_version")
     implementation("io.ktor:ktor-server-netty:$ktor_version")
     implementation("io.ktor:ktor-server-sessions:$ktor_version")
+    implementation("io.ktor:ktor-serialization-kotlinx-json:$ktor_version")
     implementation("ch.qos.logback:logback-classic:$logback_version")
-    testImplementation("io.ktor:ktor-server-test-host:$ktor_version")
+    testImplementation("io.ktor:ktor-server-test-host-jvm:$ktor_version")
     testImplementation("org.jetbrains.kotlin:kotlin-test")
 }
diff --git a/codeSnippets/snippets/session-cookie-server/src/main/kotlin/com/example/Application.kt b/codeSnippets/snippets/session-cookie-server/src/main/kotlin/com/example/Application.kt
index 651ffe0bd..e8fe0415a 100644
--- a/codeSnippets/snippets/session-cookie-server/src/main/kotlin/com/example/Application.kt
+++ b/codeSnippets/snippets/session-cookie-server/src/main/kotlin/com/example/Application.kt
@@ -5,7 +5,9 @@ import io.ktor.server.response.*
 import io.ktor.server.routing.*
 import io.ktor.server.sessions.*
 import io.ktor.util.*
+import kotlinx.serialization.Serializable
 
+@Serializable
 data class CartSession(val userID: String, val productIDs: MutableList<Int>)
 
 fun Application.main() {
diff --git a/codeSnippets/snippets/session-cookie-server/src/test/kotlin/ApplicationTest.kt b/codeSnippets/snippets/session-cookie-server/src/test/kotlin/ApplicationTest.kt
index e3abf5ce7..656aa6695 100644
--- a/codeSnippets/snippets/session-cookie-server/src/test/kotlin/ApplicationTest.kt
+++ b/codeSnippets/snippets/session-cookie-server/src/test/kotlin/ApplicationTest.kt
@@ -9,6 +9,9 @@ import kotlin.test.*
 class ApplicationTest {
     @Test
     fun testRequests() = testApplication {
+        application {
+            main()
+        }
         val client = createClient {
             install(HttpCookies)
         }
diff --git a/codeSnippets/snippets/session-header-server/build.gradle.kts b/codeSnippets/snippets/session-header-server/build.gradle.kts
index 9855840c5..2baa8bb00 100644
--- a/codeSnippets/snippets/session-header-server/build.gradle.kts
+++ b/codeSnippets/snippets/session-header-server/build.gradle.kts
@@ -5,6 +5,7 @@ val logback_version: String by project
 plugins {
     application
     kotlin("jvm")
+    kotlin("plugin.serialization").version("2.0.0")
 }
 
 application {
@@ -21,7 +22,8 @@ dependencies {
     implementation("io.ktor:ktor-server-core:$ktor_version")
     implementation("io.ktor:ktor-server-netty:$ktor_version")
     implementation("io.ktor:ktor-server-sessions:$ktor_version")
+    implementation("io.ktor:ktor-serialization-kotlinx-json:$ktor_version")
     implementation("ch.qos.logback:logback-classic:$logback_version")
-    testImplementation("io.ktor:ktor-server-test-host:$ktor_version")
+    testImplementation("io.ktor:ktor-server-test-host-jvm:$ktor_version")
     testImplementation("org.jetbrains.kotlin:kotlin-test")
 }
diff --git a/codeSnippets/snippets/session-header-server/src/main/kotlin/com/example/Application.kt b/codeSnippets/snippets/session-header-server/src/main/kotlin/com/example/Application.kt
index ab44b4c05..0d8df4de3 100644
--- a/codeSnippets/snippets/session-header-server/src/main/kotlin/com/example/Application.kt
+++ b/codeSnippets/snippets/session-header-server/src/main/kotlin/com/example/Application.kt
@@ -5,8 +5,10 @@ import io.ktor.server.response.*
 import io.ktor.server.routing.*
 import io.ktor.server.sessions.*
 import io.ktor.util.*
+import kotlinx.serialization.Serializable
 import java.io.*
 
+@Serializable
 data class CartSession(val userID: String, val productIDs: MutableList<Int>)
 
 fun Application.main() {
diff --git a/codeSnippets/snippets/session-header-server/src/test/kotlin/ApplicationTest.kt b/codeSnippets/snippets/session-header-server/src/test/kotlin/ApplicationTest.kt
index 4e40e255c..3ab3f5af9 100644
--- a/codeSnippets/snippets/session-header-server/src/test/kotlin/ApplicationTest.kt
+++ b/codeSnippets/snippets/session-header-server/src/test/kotlin/ApplicationTest.kt
@@ -9,6 +9,9 @@ import kotlin.test.*
 class ApplicationTest {
     @Test
     fun testRequests() = testApplication {
+        application {
+            main()
+        }
         val client = createClient {
             install(HttpCookies)
         }
diff --git a/codeSnippets/snippets/shutdown-url/build.gradle.kts b/codeSnippets/snippets/shutdown-url/build.gradle.kts
index 9fee42fdc..46615f0ae 100644
--- a/codeSnippets/snippets/shutdown-url/build.gradle.kts
+++ b/codeSnippets/snippets/shutdown-url/build.gradle.kts
@@ -22,6 +22,6 @@ dependencies {
     implementation("io.ktor:ktor-server-netty:$ktor_version")
     implementation("io.ktor:ktor-server-config-yaml:$ktor_version")
     implementation("ch.qos.logback:logback-classic:$logback_version")
-    testImplementation("io.ktor:ktor-server-test-host:$ktor_version")
+    testImplementation("io.ktor:ktor-server-test-host-jvm:$ktor_version")
     testImplementation("org.jetbrains.kotlin:kotlin-test")
 }
diff --git a/codeSnippets/snippets/simulate-slow-server/build.gradle.kts b/codeSnippets/snippets/simulate-slow-server/build.gradle.kts
index ce61d2618..0f10ec14e 100644
--- a/codeSnippets/snippets/simulate-slow-server/build.gradle.kts
+++ b/codeSnippets/snippets/simulate-slow-server/build.gradle.kts
@@ -21,6 +21,6 @@ dependencies {
     implementation("io.ktor:ktor-server-core:$ktor_version")
     implementation("io.ktor:ktor-server-netty:$ktor_version")
     implementation("ch.qos.logback:logback-classic:$logback_version")
-    testImplementation("io.ktor:ktor-server-test-host:$ktor_version")
+    testImplementation("io.ktor:ktor-server-test-host-jvm:$ktor_version")
     testImplementation("org.jetbrains.kotlin:kotlin-test")
 }
diff --git a/codeSnippets/snippets/simulate-slow-server/src/test/kotlin/slowserver/ApplicationTest.kt b/codeSnippets/snippets/simulate-slow-server/src/test/kotlin/slowserver/ApplicationTest.kt
index 8552d7744..c5e3091ab 100644
--- a/codeSnippets/snippets/simulate-slow-server/src/test/kotlin/slowserver/ApplicationTest.kt
+++ b/codeSnippets/snippets/simulate-slow-server/src/test/kotlin/slowserver/ApplicationTest.kt
@@ -9,6 +9,9 @@ import kotlin.test.*
 class ApplicationTest {
     @Test
     fun testPath1() = testApplication {
+        application {
+            main()
+        }
         val requestTime = LocalTime.now()
         client.get("/path1")
         val responseTime = LocalTime.now()
diff --git a/codeSnippets/snippets/single-page-application/build.gradle.kts b/codeSnippets/snippets/single-page-application/build.gradle.kts
index ce61d2618..0f10ec14e 100644
--- a/codeSnippets/snippets/single-page-application/build.gradle.kts
+++ b/codeSnippets/snippets/single-page-application/build.gradle.kts
@@ -21,6 +21,6 @@ dependencies {
     implementation("io.ktor:ktor-server-core:$ktor_version")
     implementation("io.ktor:ktor-server-netty:$ktor_version")
     implementation("ch.qos.logback:logback-classic:$logback_version")
-    testImplementation("io.ktor:ktor-server-test-host:$ktor_version")
+    testImplementation("io.ktor:ktor-server-test-host-jvm:$ktor_version")
     testImplementation("org.jetbrains.kotlin:kotlin-test")
 }
diff --git a/codeSnippets/snippets/single-page-application/src/test/kotlin/ApplicationTest.kt b/codeSnippets/snippets/single-page-application/src/test/kotlin/ApplicationTest.kt
index 805845d3f..1ef23b222 100644
--- a/codeSnippets/snippets/single-page-application/src/test/kotlin/ApplicationTest.kt
+++ b/codeSnippets/snippets/single-page-application/src/test/kotlin/ApplicationTest.kt
@@ -9,6 +9,9 @@ import kotlin.test.*
 class ApplicationTest {
     @Test
     fun testRoot() = testApplication {
+        application {
+            module()
+        }
         val response = client.get("/")
         assertEquals(
             """
diff --git a/codeSnippets/snippets/sockets-client-tls/src/main/kotlin/com/example/Application.kt b/codeSnippets/snippets/sockets-client-tls/src/main/kotlin/com/example/Application.kt
index 975777655..ca58b8acf 100644
--- a/codeSnippets/snippets/sockets-client-tls/src/main/kotlin/com/example/Application.kt
+++ b/codeSnippets/snippets/sockets-client-tls/src/main/kotlin/com/example/Application.kt
@@ -4,8 +4,8 @@ import io.ktor.network.selector.*
 import io.ktor.network.sockets.*
 import io.ktor.network.tls.*
 import io.ktor.utils.io.*
-import io.ktor.utils.io.core.*
 import kotlinx.coroutines.*
+import kotlinx.io.readByteArray
 import java.security.cert.*
 import javax.net.ssl.*
 
@@ -23,6 +23,6 @@ fun main() {
         val EOL = "\r\n"
         sendChannel.writeStringUtf8("GET / HTTP/1.1${EOL}Host: youtrack.jetbrains.com${EOL}Connection: close${EOL}${EOL}")
         sendChannel.flush()
-        println(socket.openReadChannel().readRemaining().readBytes().toString(Charsets.UTF_8))
+        println(socket.openReadChannel().readRemaining().readByteArray().toString(Charsets.UTF_8))
     }
 }
diff --git a/codeSnippets/snippets/ssl-embedded-server/src/main/kotlin/com/example/Application.kt b/codeSnippets/snippets/ssl-embedded-server/src/main/kotlin/com/example/Application.kt
index f99e1dbed..ddde4508b 100644
--- a/codeSnippets/snippets/ssl-embedded-server/src/main/kotlin/com/example/Application.kt
+++ b/codeSnippets/snippets/ssl-embedded-server/src/main/kotlin/com/example/Application.kt
@@ -8,8 +8,16 @@ import io.ktor.server.response.*
 import io.ktor.server.routing.*
 import org.slf4j.*
 import java.io.*
+import java.security.KeyStore
 
 fun main() {
+    embeddedServer(Netty, applicationEnvironment { log = LoggerFactory.getLogger("ktor.application") }, {
+        envConfig()
+    }, module = Application::module).start(wait = true)
+}
+
+private fun ApplicationEngine.Configuration.envConfig() {
+
     val keyStoreFile = File("build/keystore.jks")
     val keyStore = buildKeyStore {
         certificate("sampleAlias") {
@@ -19,23 +27,17 @@ fun main() {
     }
     keyStore.saveToFile(keyStoreFile, "123456")
 
-    val environment = applicationEngineEnvironment {
-        log = LoggerFactory.getLogger("ktor.application")
-        connector {
-            port = 8080
-        }
-        sslConnector(
-            keyStore = keyStore,
-            keyAlias = "sampleAlias",
-            keyStorePassword = { "123456".toCharArray() },
-            privateKeyPassword = { "foobar".toCharArray() }) {
-            port = 8443
-            keyStorePath = keyStoreFile
-        }
-        module(Application::module)
+    connector {
+        port = 8080
+    }
+    sslConnector(
+        keyStore = keyStore,
+        keyAlias = "sampleAlias",
+        keyStorePassword = { "123456".toCharArray() },
+        privateKeyPassword = { "foobar".toCharArray() }) {
+        port = 8443
+        keyStorePath = keyStoreFile
     }
-
-    embeddedServer(Netty, environment).start(wait = true)
 }
 
 fun Application.module() {
diff --git a/codeSnippets/snippets/ssl-engine-main-hsts/build.gradle.kts b/codeSnippets/snippets/ssl-engine-main-hsts/build.gradle.kts
index 629102681..87cddcf6f 100644
--- a/codeSnippets/snippets/ssl-engine-main-hsts/build.gradle.kts
+++ b/codeSnippets/snippets/ssl-engine-main-hsts/build.gradle.kts
@@ -25,6 +25,6 @@ dependencies {
     implementation("io.ktor:ktor-server-forwarded-header:$ktor_version")
     implementation("io.ktor:ktor-server-hsts:$ktor_version")
     implementation("ch.qos.logback:logback-classic:$logback_version")
-    testImplementation("io.ktor:ktor-server-test-host:$ktor_version")
+    testImplementation("io.ktor:ktor-server-test-host-jvm:$ktor_version")
     testImplementation("org.jetbrains.kotlin:kotlin-test")
 }
diff --git a/codeSnippets/snippets/ssl-engine-main-redirect/build.gradle.kts b/codeSnippets/snippets/ssl-engine-main-redirect/build.gradle.kts
index 629102681..87cddcf6f 100644
--- a/codeSnippets/snippets/ssl-engine-main-redirect/build.gradle.kts
+++ b/codeSnippets/snippets/ssl-engine-main-redirect/build.gradle.kts
@@ -25,6 +25,6 @@ dependencies {
     implementation("io.ktor:ktor-server-forwarded-header:$ktor_version")
     implementation("io.ktor:ktor-server-hsts:$ktor_version")
     implementation("ch.qos.logback:logback-classic:$logback_version")
-    testImplementation("io.ktor:ktor-server-test-host:$ktor_version")
+    testImplementation("io.ktor:ktor-server-test-host-jvm:$ktor_version")
     testImplementation("org.jetbrains.kotlin:kotlin-test")
 }
diff --git a/codeSnippets/snippets/ssl-engine-main-redirect/src/test/kotlin/ApplicationTest.kt b/codeSnippets/snippets/ssl-engine-main-redirect/src/test/kotlin/ApplicationTest.kt
index 111247a08..81b596c45 100644
--- a/codeSnippets/snippets/ssl-engine-main-redirect/src/test/kotlin/ApplicationTest.kt
+++ b/codeSnippets/snippets/ssl-engine-main-redirect/src/test/kotlin/ApplicationTest.kt
@@ -10,6 +10,9 @@ import kotlin.test.assertEquals
 class ApplicationTest {
     @Test
     fun testRedirectHttps() = testApplication {
+        application {
+            module()
+        }
         val response = client.get("/") {
             url { protocol = URLProtocol.HTTPS }
         }
diff --git a/codeSnippets/snippets/ssl-engine-main/build.gradle.kts b/codeSnippets/snippets/ssl-engine-main/build.gradle.kts
index d3b105e28..50e4b5b4c 100644
--- a/codeSnippets/snippets/ssl-engine-main/build.gradle.kts
+++ b/codeSnippets/snippets/ssl-engine-main/build.gradle.kts
@@ -23,6 +23,6 @@ dependencies {
     implementation("io.ktor:ktor-server-netty:$ktor_version")
     implementation("io.ktor:ktor-server-config-yaml:$ktor_version")
     implementation("ch.qos.logback:logback-classic:$logback_version")
-    testImplementation("io.ktor:ktor-server-test-host:$ktor_version")
+    testImplementation("io.ktor:ktor-server-test-host-jvm:$ktor_version")
     testImplementation("org.jetbrains.kotlin:kotlin-test")
 }
diff --git a/codeSnippets/snippets/ssl-engine-main/src/test/kotlin/ApplicationTest.kt b/codeSnippets/snippets/ssl-engine-main/src/test/kotlin/ApplicationTest.kt
index 86b7a2135..7ae936397 100644
--- a/codeSnippets/snippets/ssl-engine-main/src/test/kotlin/ApplicationTest.kt
+++ b/codeSnippets/snippets/ssl-engine-main/src/test/kotlin/ApplicationTest.kt
@@ -9,6 +9,9 @@ import kotlin.test.*
 class ApplicationTest {
     @Test
     fun testRoot() = testApplication {
+        application {
+            module()
+        }
         val response = client.get("/") {
             url {
                 protocol = URLProtocol.HTTPS
diff --git a/codeSnippets/snippets/static-files/README.md b/codeSnippets/snippets/static-files/README.md
index 4510fe16f..4a8be0b39 100644
--- a/codeSnippets/snippets/static-files/README.md
+++ b/codeSnippets/snippets/static-files/README.md
@@ -10,5 +10,9 @@ To run this sample, execute the following command in a repository's root directo
 ```bash
 ./gradlew :static-files:run
 ```
- 
-Then, navigate to [http://localhost:8080/](http://localhost:8080/) to see the sample home page.  
+
+Then, navigate to the following pages:
+
+- [http://localhost:8080/resources](http://localhost:8080/resources) to see the default behaviour of `staticFiles`.
+- [http://localhost:8080/](http://localhost:8080/) to see the sample home page.
+- [http://localhost:8080/files](http://localhost:8080/) to see the default text file served as HTML. 
diff --git a/codeSnippets/snippets/static-files/build.gradle.kts b/codeSnippets/snippets/static-files/build.gradle.kts
index ce61d2618..0f10ec14e 100644
--- a/codeSnippets/snippets/static-files/build.gradle.kts
+++ b/codeSnippets/snippets/static-files/build.gradle.kts
@@ -21,6 +21,6 @@ dependencies {
     implementation("io.ktor:ktor-server-core:$ktor_version")
     implementation("io.ktor:ktor-server-netty:$ktor_version")
     implementation("ch.qos.logback:logback-classic:$logback_version")
-    testImplementation("io.ktor:ktor-server-test-host:$ktor_version")
+    testImplementation("io.ktor:ktor-server-test-host-jvm:$ktor_version")
     testImplementation("org.jetbrains.kotlin:kotlin-test")
 }
diff --git a/codeSnippets/snippets/static-files/src/main/kotlin/com/example/Application.kt b/codeSnippets/snippets/static-files/src/main/kotlin/com/example/Application.kt
index 3500cede2..9303420f6 100644
--- a/codeSnippets/snippets/static-files/src/main/kotlin/com/example/Application.kt
+++ b/codeSnippets/snippets/static-files/src/main/kotlin/com/example/Application.kt
@@ -1,5 +1,6 @@
 package com.example
 
+import io.ktor.http.*
 import io.ktor.server.application.*
 import io.ktor.server.http.content.*
 import io.ktor.server.routing.*
@@ -7,9 +8,33 @@ import java.io.*
 
 fun Application.module() {
     routing {
+        staticFiles("/resources", File("files"))
         staticFiles("/", File("files")) {
             default("index.html")
-            preCompressed(CompressedFileType.GZIP)
+            preCompressed(CompressedFileType.BROTLI, CompressedFileType.GZIP)
+            modify { file, call ->
+                call.response.headers.append(HttpHeaders.ETag, file.name.toString())
+            }
+        }
+        staticFiles("/files", File("textFiles")) {
+            default("html-file.txt")
+            exclude { file -> file.path.contains("excluded") }
+            contentType { file ->
+                when (file.name) {
+                    "html-file.txt" -> ContentType.Text.Html
+                    else -> null
+                }
+            }
+            cacheControl { file ->
+                when (file.name) {
+                    "file.txt" -> listOf(Immutable, CacheControl.MaxAge(10000))
+                    else -> emptyList()
+                }
+            }
         }
     }
 }
+
+object Immutable : CacheControl(null) {
+    override fun toString(): String = "immutable"
+}
\ No newline at end of file
diff --git a/codeSnippets/snippets/static-files/src/test/kotlin/ApplicationTest.kt b/codeSnippets/snippets/static-files/src/test/kotlin/ApplicationTest.kt
index 77b571f68..135909d81 100644
--- a/codeSnippets/snippets/static-files/src/test/kotlin/ApplicationTest.kt
+++ b/codeSnippets/snippets/static-files/src/test/kotlin/ApplicationTest.kt
@@ -9,6 +9,9 @@ import kotlin.test.*
 class ApplicationTest {
     @Test
     fun testRoot() = testApplication {
+        application {
+            module()
+        }
         val response = client.get("/")
         assertEquals(
             """
diff --git a/codeSnippets/snippets/static-files/textFiles/file.txt b/codeSnippets/snippets/static-files/textFiles/file.txt
new file mode 100644
index 000000000..d93e1dff8
--- /dev/null
+++ b/codeSnippets/snippets/static-files/textFiles/file.txt
@@ -0,0 +1 @@
+Contents of "file.txt".
\ No newline at end of file
diff --git a/codeSnippets/snippets/static-files/textFiles/file2.txt b/codeSnippets/snippets/static-files/textFiles/file2.txt
new file mode 100644
index 000000000..a3cd666b7
--- /dev/null
+++ b/codeSnippets/snippets/static-files/textFiles/file2.txt
@@ -0,0 +1 @@
+Contents of "file2.txt".
\ No newline at end of file
diff --git a/codeSnippets/snippets/static-files/textFiles/html-file.txt b/codeSnippets/snippets/static-files/textFiles/html-file.txt
new file mode 100644
index 000000000..2b99f64e2
--- /dev/null
+++ b/codeSnippets/snippets/static-files/textFiles/html-file.txt
@@ -0,0 +1,4 @@
+<div>
+<h1>HTML file</h1>
+<p>Contents of "html-file.txt"</p>
+</div>
\ No newline at end of file
diff --git a/codeSnippets/snippets/static-files/textFiles/nested/file3.txt b/codeSnippets/snippets/static-files/textFiles/nested/file3.txt
new file mode 100644
index 000000000..5620aeca8
--- /dev/null
+++ b/codeSnippets/snippets/static-files/textFiles/nested/file3.txt
@@ -0,0 +1 @@
+Contents of nested "file3.txt".
\ No newline at end of file
diff --git a/codeSnippets/snippets/static-resources/.DS_Store b/codeSnippets/snippets/static-resources/.DS_Store
new file mode 100644
index 000000000..fd3ce36ad
Binary files /dev/null and b/codeSnippets/snippets/static-resources/.DS_Store differ
diff --git a/codeSnippets/snippets/static-resources/README.md b/codeSnippets/snippets/static-resources/README.md
index 58209cd34..35f4493ec 100644
--- a/codeSnippets/snippets/static-resources/README.md
+++ b/codeSnippets/snippets/static-resources/README.md
@@ -10,5 +10,9 @@ To run this sample, execute the following command in a repository's root directo
 ```bash
 ./gradlew :static-resources:run
 ```
- 
-Then, navigate to [http://localhost:8080/](http://localhost:8080/) to see the sample home page.  
+
+Then, navigate to the following pages:
+- [http://localhost:8080/](http://localhost:8080/) to see the sample home page with additional configuration.
+- [http://localhost:8080/resources](http://localhost:8080/resources) to see the default behaviour of `staticResources`.
+- [http://localhost:8080/custom](http://localhost:8080/custom) to see the custom index file.
+
diff --git a/codeSnippets/snippets/static-resources/build.gradle.kts b/codeSnippets/snippets/static-resources/build.gradle.kts
index ce61d2618..0f10ec14e 100644
--- a/codeSnippets/snippets/static-resources/build.gradle.kts
+++ b/codeSnippets/snippets/static-resources/build.gradle.kts
@@ -21,6 +21,6 @@ dependencies {
     implementation("io.ktor:ktor-server-core:$ktor_version")
     implementation("io.ktor:ktor-server-netty:$ktor_version")
     implementation("ch.qos.logback:logback-classic:$logback_version")
-    testImplementation("io.ktor:ktor-server-test-host:$ktor_version")
+    testImplementation("io.ktor:ktor-server-test-host-jvm:$ktor_version")
     testImplementation("org.jetbrains.kotlin:kotlin-test")
 }
diff --git a/codeSnippets/snippets/static-resources/src/main/.DS_Store b/codeSnippets/snippets/static-resources/src/main/.DS_Store
new file mode 100644
index 000000000..1e901b505
Binary files /dev/null and b/codeSnippets/snippets/static-resources/src/main/.DS_Store differ
diff --git a/codeSnippets/snippets/static-resources/src/main/kotlin/com/example/Application.kt b/codeSnippets/snippets/static-resources/src/main/kotlin/com/example/Application.kt
index 0a9ba3320..972328982 100644
--- a/codeSnippets/snippets/static-resources/src/main/kotlin/com/example/Application.kt
+++ b/codeSnippets/snippets/static-resources/src/main/kotlin/com/example/Application.kt
@@ -3,14 +3,16 @@ package com.example
 import io.ktor.server.application.*
 import io.ktor.server.http.content.*
 import io.ktor.server.routing.*
-import java.io.File
-
 
 fun Application.module() {
     routing {
-        staticResources("/", "static") {
-            default("index.html")
+        staticResources("/resources", "static")
+        staticResources("/custom", "static", index = "custom_index.html")
+        staticResources("/", "static"){
+            extensions("html", "htm")
+            enableAutoHeadResponse()
             preCompressed(CompressedFileType.GZIP)
+            exclude { url -> url.path.contains("excluded") }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/codeSnippets/snippets/static-resources/src/main/resources/.DS_Store b/codeSnippets/snippets/static-resources/src/main/resources/.DS_Store
new file mode 100644
index 000000000..cddefc5c3
Binary files /dev/null and b/codeSnippets/snippets/static-resources/src/main/resources/.DS_Store differ
diff --git a/codeSnippets/snippets/static-resources/src/main/resources/static/.DS_Store b/codeSnippets/snippets/static-resources/src/main/resources/static/.DS_Store
new file mode 100644
index 000000000..4da14568e
Binary files /dev/null and b/codeSnippets/snippets/static-resources/src/main/resources/static/.DS_Store differ
diff --git a/codeSnippets/snippets/static-resources/src/main/resources/static/custom_index.html b/codeSnippets/snippets/static-resources/src/main/resources/static/custom_index.html
new file mode 100644
index 000000000..3b2187b2b
--- /dev/null
+++ b/codeSnippets/snippets/static-resources/src/main/resources/static/custom_index.html
@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>Static page</title>
+    <link rel="stylesheet" href="css/styles.css">
+    <script src="js/script.js"></script>
+</head>
+<body>
+<img src="ktor_logo.png" alt="ktor logo">
+<h1>Static page with custom index</h1>
+<p>Welcome to my static page with custom index!</p>
+<button type="button" onclick="message('Hello, world!')">Click Me!</button>
+</body>
+</html>
\ No newline at end of file
diff --git a/codeSnippets/snippets/static-resources/src/main/resources/static/html-file.txt b/codeSnippets/snippets/static-resources/src/main/resources/static/html-file.txt
new file mode 100644
index 000000000..2b99f64e2
--- /dev/null
+++ b/codeSnippets/snippets/static-resources/src/main/resources/static/html-file.txt
@@ -0,0 +1,4 @@
+<div>
+<h1>HTML file</h1>
+<p>Contents of "html-file.txt"</p>
+</div>
\ No newline at end of file
diff --git a/codeSnippets/snippets/static-resources/src/test/kotlin/ApplicationTest.kt b/codeSnippets/snippets/static-resources/src/test/kotlin/ApplicationTest.kt
index 77b571f68..135909d81 100644
--- a/codeSnippets/snippets/static-resources/src/test/kotlin/ApplicationTest.kt
+++ b/codeSnippets/snippets/static-resources/src/test/kotlin/ApplicationTest.kt
@@ -9,6 +9,9 @@ import kotlin.test.*
 class ApplicationTest {
     @Test
     fun testRoot() = testApplication {
+        application {
+            module()
+        }
         val response = client.get("/")
         assertEquals(
             """
diff --git a/codeSnippets/snippets/static-zip/.DS_Store b/codeSnippets/snippets/static-zip/.DS_Store
new file mode 100644
index 000000000..ea6e51984
Binary files /dev/null and b/codeSnippets/snippets/static-zip/.DS_Store differ
diff --git a/codeSnippets/snippets/locations/README.md b/codeSnippets/snippets/static-zip/README.md
similarity index 53%
rename from codeSnippets/snippets/locations/README.md
rename to codeSnippets/snippets/static-zip/README.md
index c356ad82f..d57d740ff 100644
--- a/codeSnippets/snippets/locations/README.md
+++ b/codeSnippets/snippets/static-zip/README.md
@@ -1,6 +1,6 @@
-# Locations
+# Static resources
 
-A sample Ktor project demonstrating an _experimental_ [Locations](https://ktor.io/docs/locations.html) plugin.
+A sample Ktor project demonstrating how to serve [static content](https://ktor.io/docs/serving-static-content.html).
 > This sample is a part of the [codeSnippets](../../README.md) Gradle project.
 
 ## Running
@@ -8,7 +8,7 @@ A sample Ktor project demonstrating an _experimental_ [Locations](https://ktor.i
 To run this sample, execute the following command in a repository's root directory:
 
 ```bash
-./gradlew :locations:run
+./gradlew :static-zip:run
 ```
- 
-Then, navigate to [http://localhost:8080/](http://localhost:8080/) to see the sample home page. 
+
+Then, navigate to [http://localhost:8080/](http://localhost:8080/) to see the sample home page served from a ZIP file.
\ No newline at end of file
diff --git a/codeSnippets/snippets/static-zip/build.gradle.kts b/codeSnippets/snippets/static-zip/build.gradle.kts
new file mode 100644
index 000000000..0f10ec14e
--- /dev/null
+++ b/codeSnippets/snippets/static-zip/build.gradle.kts
@@ -0,0 +1,26 @@
+val ktor_version: String by project
+val kotlin_version: String by project
+val logback_version: String by project
+
+plugins {
+    application
+    kotlin("jvm")
+}
+
+application {
+    mainClass.set("io.ktor.server.netty.EngineMain")
+}
+
+repositories {
+    mavenCentral()
+    maven { url = uri("https://maven.pkg.jetbrains.space/public/p/ktor/eap") }
+}
+
+dependencies {
+    implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version")
+    implementation("io.ktor:ktor-server-core:$ktor_version")
+    implementation("io.ktor:ktor-server-netty:$ktor_version")
+    implementation("ch.qos.logback:logback-classic:$logback_version")
+    testImplementation("io.ktor:ktor-server-test-host-jvm:$ktor_version")
+    testImplementation("org.jetbrains.kotlin:kotlin-test")
+}
diff --git a/codeSnippets/snippets/static-zip/files/.DS_Store b/codeSnippets/snippets/static-zip/files/.DS_Store
new file mode 100644
index 000000000..2be4083cf
Binary files /dev/null and b/codeSnippets/snippets/static-zip/files/.DS_Store differ
diff --git a/codeSnippets/snippets/static-zip/files/text-files.zip b/codeSnippets/snippets/static-zip/files/text-files.zip
new file mode 100644
index 000000000..bc132363b
Binary files /dev/null and b/codeSnippets/snippets/static-zip/files/text-files.zip differ
diff --git a/codeSnippets/snippets/static-zip/src/main/kotlin/com/example/Application.kt b/codeSnippets/snippets/static-zip/src/main/kotlin/com/example/Application.kt
new file mode 100644
index 000000000..7cfe3b900
--- /dev/null
+++ b/codeSnippets/snippets/static-zip/src/main/kotlin/com/example/Application.kt
@@ -0,0 +1,25 @@
+package com.example
+
+import io.ktor.http.*
+import io.ktor.server.application.*
+import io.ktor.server.http.content.*
+import io.ktor.server.routing.*
+import java.nio.file.Paths
+
+fun Application.module() {
+    routing {
+        /*
+        staticZip("/", "", Paths.get("files/text-files.zip"))
+        */
+        staticZip("/", "", Paths.get("files/text-files.zip")) {
+            default("file.txt")
+            modify { path, call ->
+                call.response.headers.append(HttpHeaders.ETag, path.fileName.toString())
+            }
+        }
+    }
+}
+
+object Immutable : CacheControl(null) {
+    override fun toString(): String = "immutable"
+}
\ No newline at end of file
diff --git a/codeSnippets/snippets/locations/src/main/resources/application.conf b/codeSnippets/snippets/static-zip/src/main/resources/application.conf
similarity index 55%
rename from codeSnippets/snippets/locations/src/main/resources/application.conf
rename to codeSnippets/snippets/static-zip/src/main/resources/application.conf
index 18461ad81..2f2143918 100644
--- a/codeSnippets/snippets/locations/src/main/resources/application.conf
+++ b/codeSnippets/snippets/static-zip/src/main/resources/application.conf
@@ -4,6 +4,6 @@ ktor {
     }
 
     application {
-        modules = [ com.example.LocationsApplicationKt.main ]
+        modules = [ com.example.ApplicationKt.module ]
     }
 }
diff --git a/codeSnippets/snippets/locations/src/main/resources/logback.xml b/codeSnippets/snippets/static-zip/src/main/resources/logback.xml
similarity index 100%
rename from codeSnippets/snippets/locations/src/main/resources/logback.xml
rename to codeSnippets/snippets/static-zip/src/main/resources/logback.xml
diff --git a/codeSnippets/snippets/static-zip/src/test/kotlin/ApplicationTest.kt b/codeSnippets/snippets/static-zip/src/test/kotlin/ApplicationTest.kt
new file mode 100644
index 000000000..048059609
--- /dev/null
+++ b/codeSnippets/snippets/static-zip/src/test/kotlin/ApplicationTest.kt
@@ -0,0 +1,18 @@
+package com.example
+
+import io.ktor.client.request.*
+import io.ktor.client.statement.*
+import io.ktor.http.*
+import io.ktor.server.testing.*
+import kotlin.test.*
+
+class ApplicationTest {
+    @Test
+    fun testFiles() = testApplication {
+        application {
+            module()
+        }
+        val response = client.get("/files")
+        assertEquals(HttpStatusCode.OK, response.status)
+    }
+}
diff --git a/codeSnippets/snippets/status-pages/build.gradle.kts b/codeSnippets/snippets/status-pages/build.gradle.kts
index a68f6b1f8..cc77d51c3 100644
--- a/codeSnippets/snippets/status-pages/build.gradle.kts
+++ b/codeSnippets/snippets/status-pages/build.gradle.kts
@@ -22,6 +22,6 @@ dependencies {
     implementation("io.ktor:ktor-server-netty:$ktor_version")
     implementation("io.ktor:ktor-server-status-pages:$ktor_version")
     implementation("ch.qos.logback:logback-classic:$logback_version")
-    testImplementation("io.ktor:ktor-server-test-host:$ktor_version")
+    testImplementation("io.ktor:ktor-server-test-host-jvm:$ktor_version")
     testImplementation("org.jetbrains.kotlin:kotlin-test")
 }
diff --git a/codeSnippets/snippets/status-pages/src/test/kotlin/EngineMainTest.kt b/codeSnippets/snippets/status-pages/src/test/kotlin/EngineMainTest.kt
index 8342af1d3..25ce283c6 100644
--- a/codeSnippets/snippets/status-pages/src/test/kotlin/EngineMainTest.kt
+++ b/codeSnippets/snippets/status-pages/src/test/kotlin/EngineMainTest.kt
@@ -9,24 +9,39 @@ import kotlin.test.*
 class ApplicationTest {
     @Test
     fun testRoot() = testApplication {
+        application {
+            module()
+        }
         val response = client.get("/")
         assertEquals(HttpStatusCode.OK, response.status)
         assertEquals("Hello, world!", response.bodyAsText())
     }
+
     @Test
     fun testInternalError() = testApplication {
+        application {
+            module()
+        }
         val response = client.get("/internal-error")
         assertEquals(HttpStatusCode.InternalServerError, response.status)
         assertEquals("500: java.lang.Exception: Internal Server Error", response.bodyAsText())
     }
+
     @Test
     fun testMissingPage() = testApplication {
+        application {
+            module()
+        }
         val response = client.get("/missing-page")
         assertEquals(HttpStatusCode.NotFound, response.status)
         assertEquals("404: Page Not Found", response.bodyAsText())
     }
+
     @Test
     fun testPaymentRequired() = testApplication {
+        application {
+            module()
+        }
         val response = client.get("/payment-error")
         assertEquals(HttpStatusCode.PaymentRequired, response.status)
         assertEquals(
diff --git a/codeSnippets/snippets/thymeleaf-auto-reload/build.gradle.kts b/codeSnippets/snippets/thymeleaf-auto-reload/build.gradle.kts
index d476f3598..bd4ed402f 100644
--- a/codeSnippets/snippets/thymeleaf-auto-reload/build.gradle.kts
+++ b/codeSnippets/snippets/thymeleaf-auto-reload/build.gradle.kts
@@ -22,6 +22,6 @@ dependencies {
     implementation("io.ktor:ktor-server-netty:$ktor_version")
     implementation("io.ktor:ktor-server-thymeleaf:$ktor_version")
     implementation("ch.qos.logback:logback-classic:$logback_version")
-    testImplementation("io.ktor:ktor-server-test-host:$ktor_version")
+    testImplementation("io.ktor:ktor-server-test-host-jvm:$ktor_version")
     testImplementation("org.jetbrains.kotlin:kotlin-test")
 }
diff --git a/codeSnippets/snippets/thymeleaf-auto-reload/src/test/kotlin/ApplicationTest.kt b/codeSnippets/snippets/thymeleaf-auto-reload/src/test/kotlin/ApplicationTest.kt
index bf8ee3e31..732043703 100644
--- a/codeSnippets/snippets/thymeleaf-auto-reload/src/test/kotlin/ApplicationTest.kt
+++ b/codeSnippets/snippets/thymeleaf-auto-reload/src/test/kotlin/ApplicationTest.kt
@@ -1,3 +1,5 @@
+package com.example
+
 import io.ktor.client.call.*
 import io.ktor.client.request.*
 import io.ktor.server.testing.*
@@ -7,6 +9,9 @@ import org.junit.Assert.*
 class ApplicationTest {
     @Test
     fun test() = testApplication {
+        application {
+            module()
+        }
         val response: String = client.get("/index").body()
         assertEquals("""
 <html>
diff --git a/codeSnippets/snippets/thymeleaf/build.gradle.kts b/codeSnippets/snippets/thymeleaf/build.gradle.kts
index d476f3598..bd4ed402f 100644
--- a/codeSnippets/snippets/thymeleaf/build.gradle.kts
+++ b/codeSnippets/snippets/thymeleaf/build.gradle.kts
@@ -22,6 +22,6 @@ dependencies {
     implementation("io.ktor:ktor-server-netty:$ktor_version")
     implementation("io.ktor:ktor-server-thymeleaf:$ktor_version")
     implementation("ch.qos.logback:logback-classic:$logback_version")
-    testImplementation("io.ktor:ktor-server-test-host:$ktor_version")
+    testImplementation("io.ktor:ktor-server-test-host-jvm:$ktor_version")
     testImplementation("org.jetbrains.kotlin:kotlin-test")
 }
diff --git a/codeSnippets/snippets/thymeleaf/src/test/kotlin/ApplicationTest.kt b/codeSnippets/snippets/thymeleaf/src/test/kotlin/ApplicationTest.kt
index bf8ee3e31..732043703 100644
--- a/codeSnippets/snippets/thymeleaf/src/test/kotlin/ApplicationTest.kt
+++ b/codeSnippets/snippets/thymeleaf/src/test/kotlin/ApplicationTest.kt
@@ -1,3 +1,5 @@
+package com.example
+
 import io.ktor.client.call.*
 import io.ktor.client.request.*
 import io.ktor.server.testing.*
@@ -7,6 +9,9 @@ import org.junit.Assert.*
 class ApplicationTest {
     @Test
     fun test() = testApplication {
+        application {
+            module()
+        }
         val response: String = client.get("/index").body()
         assertEquals("""
 <html>
diff --git a/codeSnippets/snippets/timeout/build.gradle.kts b/codeSnippets/snippets/timeout/build.gradle.kts
index fc4ff3304..060994eb0 100644
--- a/codeSnippets/snippets/timeout/build.gradle.kts
+++ b/codeSnippets/snippets/timeout/build.gradle.kts
@@ -21,7 +21,6 @@ dependencies {
     implementation("io.ktor:ktor-server-core:$ktor_version")
     implementation("io.ktor:ktor-server-netty:$ktor_version")
     implementation("io.ktor:ktor-server-html-builder:$ktor_version")
-    implementation("io.ktor:ktor-server-locations:$ktor_version")
     implementation("io.ktor:ktor-server-auth-ldap:$ktor_version")
     implementation("io.ktor:ktor-server-auth:$ktor_version")
     implementation("io.ktor:ktor-server-auth-jwt:$ktor_version")
@@ -29,6 +28,6 @@ dependencies {
     implementation("io.ktor:ktor-client-apache:$ktor_version")
     implementation("ch.qos.logback:logback-classic:$logback_version")
     testImplementation("io.ktor:ktor-client-mock-jvm:$ktor_version")
-    testImplementation("io.ktor:ktor-server-test-host:$ktor_version")
+    testImplementation("io.ktor:ktor-server-test-host-jvm:$ktor_version")
 }
 
diff --git a/codeSnippets/snippets/tomcat-war/build.gradle.kts b/codeSnippets/snippets/tomcat-war/build.gradle.kts
index f1d254874..e87acdfbb 100644
--- a/codeSnippets/snippets/tomcat-war/build.gradle.kts
+++ b/codeSnippets/snippets/tomcat-war/build.gradle.kts
@@ -23,7 +23,7 @@ repositories {
 dependencies {
     implementation("io.ktor:ktor-server-servlet-jakarta:$ktor_version")
     implementation("org.slf4j:slf4j-jdk14:$slf4j_version")
-    testImplementation("io.ktor:ktor-server-test-host:$ktor_version")
+    testImplementation("io.ktor:ktor-server-test-host-jvm:$ktor_version")
     testImplementation("org.jetbrains.kotlin:kotlin-test")
 }
 
diff --git a/codeSnippets/snippets/tomcat-war/src/test/kotlin/ApplicationTest.kt b/codeSnippets/snippets/tomcat-war/src/test/kotlin/ApplicationTest.kt
index b4463316a..567d6a62d 100644
--- a/codeSnippets/snippets/tomcat-war/src/test/kotlin/ApplicationTest.kt
+++ b/codeSnippets/snippets/tomcat-war/src/test/kotlin/ApplicationTest.kt
@@ -1,3 +1,5 @@
+package com.example
+
 import io.ktor.client.request.*
 import io.ktor.client.statement.*
 import io.ktor.http.*
@@ -7,6 +9,9 @@ import kotlin.test.*
 class ApplicationTest {
     @Test
     fun testRoot() = testApplication {
+        application {
+            module()
+        }
         val response = client.get("/")
         assertEquals(HttpStatusCode.OK, response.status)
         assertEquals("Hello, world!", response.bodyAsText())
diff --git a/codeSnippets/snippets/tutorial-client-kmm/gradle/libs.versions.toml b/codeSnippets/snippets/tutorial-client-kmm/gradle/libs.versions.toml
index f619a945f..ea15b66cb 100644
--- a/codeSnippets/snippets/tutorial-client-kmm/gradle/libs.versions.toml
+++ b/codeSnippets/snippets/tutorial-client-kmm/gradle/libs.versions.toml
@@ -2,7 +2,7 @@
 agp = "8.3.1"
 kotlin = "2.0.0"
 coroutines = "1.9.0"
-ktor = "2.3.12"
+ktor = "3.0.0"
 compose = "1.6.8"
 compose-compiler = "1.5.4"
 compose-material3 = "1.2.1"
diff --git a/codeSnippets/snippets/tutorial-server-db-integration/build.gradle.kts b/codeSnippets/snippets/tutorial-server-db-integration/build.gradle.kts
index 8d6155ea9..d962bcd7a 100644
--- a/codeSnippets/snippets/tutorial-server-db-integration/build.gradle.kts
+++ b/codeSnippets/snippets/tutorial-server-db-integration/build.gradle.kts
@@ -8,7 +8,7 @@ val exposed_version: String by project
 plugins {
     application
     kotlin("jvm")
-    id("io.ktor.plugin") version "2.3.12"
+    id("io.ktor.plugin") version "3.0.0"
     id("org.jetbrains.kotlin.plugin.serialization") version "2.0.0"
 }
 
diff --git a/codeSnippets/snippets/tutorial-server-db-integration/src/test/kotlin/com/example/ApplicationTest.kt b/codeSnippets/snippets/tutorial-server-db-integration/src/test/kotlin/com/example/ApplicationTest.kt
index 1011b2d3b..44a430bb5 100644
--- a/codeSnippets/snippets/tutorial-server-db-integration/src/test/kotlin/com/example/ApplicationTest.kt
+++ b/codeSnippets/snippets/tutorial-server-db-integration/src/test/kotlin/com/example/ApplicationTest.kt
@@ -63,7 +63,6 @@ class ApplicationTest {
         }
         application {
             val repository = FakeTaskRepository()
-
             configureSerialization(repository)
             configureRouting()
         }
@@ -82,6 +81,7 @@ class ApplicationTest {
             configureSerialization(repository)
             configureRouting()
         }
+
         val client = createClient {
             install(ContentNegotiation) {
                 json()
diff --git a/codeSnippets/snippets/tutorial-server-docker-compose/build.gradle.kts b/codeSnippets/snippets/tutorial-server-docker-compose/build.gradle.kts
index a91f75d7d..9c028ddec 100644
--- a/codeSnippets/snippets/tutorial-server-docker-compose/build.gradle.kts
+++ b/codeSnippets/snippets/tutorial-server-docker-compose/build.gradle.kts
@@ -8,7 +8,7 @@ val h2_version: String by project
 plugins {
     application
     kotlin("jvm")
-    id("io.ktor.plugin") version "2.3.12"
+    id("io.ktor.plugin") version "3.0.0"
     id("org.jetbrains.kotlin.plugin.serialization") version "2.0.0"
 }
 
@@ -39,7 +39,7 @@ dependencies {
     implementation("io.ktor:ktor-server-netty-jvm")
     implementation("ch.qos.logback:logback-classic:$logback_version")
     implementation("io.ktor:ktor-server-config-yaml:$ktor_version")
-    testImplementation("io.ktor:ktor-server-tests-jvm")
+    testImplementation("io.ktor:ktor-server-test-host-jvm")
     testImplementation("io.ktor:ktor-client-content-negotiation-jvm:$ktor_version")
     testImplementation("org.jetbrains.kotlin:kotlin-test-junit:$kotlin_version")
 }
diff --git a/codeSnippets/snippets/tutorial-server-get-started-maven/pom.xml b/codeSnippets/snippets/tutorial-server-get-started-maven/pom.xml
index ad9d36db6..38ede64dd 100644
--- a/codeSnippets/snippets/tutorial-server-get-started-maven/pom.xml
+++ b/codeSnippets/snippets/tutorial-server-get-started-maven/pom.xml
@@ -8,7 +8,7 @@
     <name>tutorial-server-get-started-maven</name>
     <description>tutorial-server-get-started-maven</description>
     <properties>
-        <ktor_version>2.3.11</ktor_version>
+        <ktor_version>3.0.0-beta-1</ktor_version>
         <kotlin.code.style>official</kotlin.code.style>
         <kotlin_version>1.9.22</kotlin_version>
         <logback_version>1.5.6</logback_version>
@@ -27,7 +27,7 @@
         </dependency>
         <dependency>
             <groupId>io.ktor</groupId>
-            <artifactId>ktor-server-netty-jvm</artifactId>
+            <artifactId>ktor-server-netty</artifactId>
             <version>${ktor_version}</version>
         </dependency>
         <dependency>
diff --git a/codeSnippets/snippets/tutorial-server-get-started/build.gradle.kts b/codeSnippets/snippets/tutorial-server-get-started/build.gradle.kts
index 1ad4ca720..0a6075972 100644
--- a/codeSnippets/snippets/tutorial-server-get-started/build.gradle.kts
+++ b/codeSnippets/snippets/tutorial-server-get-started/build.gradle.kts
@@ -5,7 +5,7 @@ val logback_version: String by project
 plugins {
     application
     kotlin("jvm")
-    id("io.ktor.plugin") version "2.3.12"
+    id("io.ktor.plugin") version "3.0.0"
 }
 
 application {
@@ -23,6 +23,6 @@ dependencies {
     implementation("io.ktor:ktor-server-netty-jvm")
     implementation("ch.qos.logback:logback-classic:$logback_version")
     implementation("io.ktor:ktor-server-config-yaml:$ktor_version")
-    testImplementation("io.ktor:ktor-server-tests-jvm")
+    testImplementation("io.ktor:ktor-server-test-host-jvm:$ktor_version")
     testImplementation("org.jetbrains.kotlin:kotlin-test-junit:$kotlin_version")
-}
+}
\ No newline at end of file
diff --git a/codeSnippets/snippets/tutorial-server-get-started/src/test/kotlin/com/example/ApplicationTest.kt b/codeSnippets/snippets/tutorial-server-get-started/src/test/kotlin/com/example/ApplicationTest.kt
index e6f034d05..016bab576 100644
--- a/codeSnippets/snippets/tutorial-server-get-started/src/test/kotlin/com/example/ApplicationTest.kt
+++ b/codeSnippets/snippets/tutorial-server-get-started/src/test/kotlin/com/example/ApplicationTest.kt
@@ -10,6 +10,9 @@ import org.junit.Test
 class ApplicationTest {
     @Test
     fun testRoot() = testApplication {
+        application {
+            module()
+        }
         val response = client.get("/")
 
         assertEquals(HttpStatusCode.OK, response.status)
diff --git a/codeSnippets/snippets/tutorial-server-restful-api/build.gradle.kts b/codeSnippets/snippets/tutorial-server-restful-api/build.gradle.kts
index 34b3eb9c9..bbe9c8389 100644
--- a/codeSnippets/snippets/tutorial-server-restful-api/build.gradle.kts
+++ b/codeSnippets/snippets/tutorial-server-restful-api/build.gradle.kts
@@ -5,8 +5,8 @@ val logback_version: String by project
 plugins {
     application
     kotlin("jvm")
-    id("io.ktor.plugin") version "2.3.12"
-    id("org.jetbrains.kotlin.plugin.serialization") version "1.9.22"
+    id("io.ktor.plugin") version "3.0.0"
+    id("org.jetbrains.kotlin.plugin.serialization") version "2.0.0"
 }
 
 application {
@@ -27,7 +27,7 @@ dependencies {
     implementation("ch.qos.logback:logback-classic:$logback_version")
     implementation("io.ktor:ktor-server-config-yaml:$ktor_version")
     testImplementation("io.ktor:ktor-client-content-negotiation:$ktor_version")
-    testImplementation("io.ktor:ktor-server-tests-jvm")
+    testImplementation("io.ktor:ktor-server-test-host-jvm")
     testImplementation("org.jetbrains.kotlin:kotlin-test-junit:$kotlin_version")
     testImplementation("com.jayway.jsonpath:json-path:2.9.0")
 }
diff --git a/codeSnippets/snippets/tutorial-server-restful-api/src/test/kotlin/com/example/ApplicationJsonPathTest.kt b/codeSnippets/snippets/tutorial-server-restful-api/src/test/kotlin/com/example/ApplicationJsonPathTest.kt
index e7ce90991..bd5c6ce98 100644
--- a/codeSnippets/snippets/tutorial-server-restful-api/src/test/kotlin/com/example/ApplicationJsonPathTest.kt
+++ b/codeSnippets/snippets/tutorial-server-restful-api/src/test/kotlin/com/example/ApplicationJsonPathTest.kt
@@ -14,6 +14,9 @@ import kotlin.test.*
 class ApplicationJsonPathTest {
     @Test
     fun tasksCanBeFound() = testApplication {
+        application {
+            module()
+        }
         val jsonDoc = client.getAsJsonPath("/tasks")
 
         val result: List<String> = jsonDoc.read("$[*].name")
@@ -24,6 +27,9 @@ class ApplicationJsonPathTest {
 
     @Test
     fun tasksCanBeFoundByPriority() = testApplication {
+        application {
+            module()
+        }
         val priority = Priority.Medium
         val jsonDoc = client.getAsJsonPath("/tasks/byPriority/$priority")
 
diff --git a/codeSnippets/snippets/tutorial-server-restful-api/src/test/kotlin/com/example/ApplicationTest.kt b/codeSnippets/snippets/tutorial-server-restful-api/src/test/kotlin/com/example/ApplicationTest.kt
index 9c0fcf235..8e131cbdc 100644
--- a/codeSnippets/snippets/tutorial-server-restful-api/src/test/kotlin/com/example/ApplicationTest.kt
+++ b/codeSnippets/snippets/tutorial-server-restful-api/src/test/kotlin/com/example/ApplicationTest.kt
@@ -13,6 +13,9 @@ import kotlin.test.*
 class ApplicationTest {
     @Test
     fun tasksCanBeFoundByPriority() = testApplication {
+        application {
+            module()
+        }
         val client = createClient {
             install(ContentNegotiation) {
                 json()
@@ -31,6 +34,9 @@ class ApplicationTest {
 
     @Test
     fun invalidPriorityProduces400() = testApplication {
+        application {
+            module()
+        }
         val response = client.get("/tasks/byPriority/Invalid")
         assertEquals(HttpStatusCode.BadRequest, response.status)
     }
@@ -38,12 +44,18 @@ class ApplicationTest {
 
     @Test
     fun unusedPriorityProduces404() = testApplication {
+        application {
+            module()
+        }
         val response = client.get("/tasks/byPriority/Vital")
         assertEquals(HttpStatusCode.NotFound, response.status)
     }
 
     @Test
     fun newTasksCanBeAdded() = testApplication {
+        application {
+            module()
+        }
         val client = createClient {
             install(ContentNegotiation) {
                 json()
diff --git a/codeSnippets/snippets/tutorial-server-routing-and-requests/build.gradle.kts b/codeSnippets/snippets/tutorial-server-routing-and-requests/build.gradle.kts
index bf27557d9..25e9ffccc 100644
--- a/codeSnippets/snippets/tutorial-server-routing-and-requests/build.gradle.kts
+++ b/codeSnippets/snippets/tutorial-server-routing-and-requests/build.gradle.kts
@@ -5,7 +5,7 @@ val logback_version: String by project
 plugins {
     application
     kotlin("jvm")
-    id("io.ktor.plugin") version "2.3.12"
+    id("io.ktor.plugin") version "3.0.0"
 }
 
 application {
@@ -22,6 +22,6 @@ dependencies {
     implementation("io.ktor:ktor-server-netty-jvm")
     implementation("ch.qos.logback:logback-classic:$logback_version")
     implementation("io.ktor:ktor-server-config-yaml:$ktor_version")
-    testImplementation("io.ktor:ktor-server-tests-jvm")
+    testImplementation("io.ktor:ktor-server-test-host-jvm")
     testImplementation("org.jetbrains.kotlin:kotlin-test-junit:$kotlin_version")
 }
diff --git a/codeSnippets/snippets/tutorial-server-routing-and-requests/src/test/kotlin/ApplicationTest.kt b/codeSnippets/snippets/tutorial-server-routing-and-requests/src/test/kotlin/ApplicationTest.kt
index fd20eed6d..db06604fb 100644
--- a/codeSnippets/snippets/tutorial-server-routing-and-requests/src/test/kotlin/ApplicationTest.kt
+++ b/codeSnippets/snippets/tutorial-server-routing-and-requests/src/test/kotlin/ApplicationTest.kt
@@ -16,36 +16,30 @@ class ApplicationTest {
             module()
         }
 
-
         val response = client.get("/tasks/byPriority/Medium")
         val body = response.bodyAsText()
 
-
         assertEquals(HttpStatusCode.OK, response.status)
         assertContains(body, "Mow the lawn")
         assertContains(body, "Paint the fence")
     }
 
-
     @Test
     fun invalidPriorityProduces400() = testApplication {
         application {
             module()
         }
 
-
         val response = client.get("/tasks/byPriority/Invalid")
         assertEquals(HttpStatusCode.BadRequest, response.status)
     }
 
-
     @Test
     fun unusedPriorityProduces404() = testApplication {
         application {
             module()
         }
 
-
         val response = client.get("/tasks/byPriority/Vital")
         assertEquals(HttpStatusCode.NotFound, response.status)
     }
@@ -56,7 +50,6 @@ class ApplicationTest {
             module()
         }
 
-
         val response1 = client.post("/tasks") {
             header(
                 HttpHeaders.ContentType,
@@ -72,14 +65,11 @@ class ApplicationTest {
         }
         assertEquals(HttpStatusCode.NoContent, response1.status)
 
-
         val response2 = client.get("/tasks")
         assertEquals(HttpStatusCode.OK, response2.status)
         val body = response2.bodyAsText()
 
-
         assertContains(body, "swimming")
         assertContains(body, "Go to the beach")
     }
-
 }
diff --git a/codeSnippets/snippets/tutorial-server-web-application/build.gradle.kts b/codeSnippets/snippets/tutorial-server-web-application/build.gradle.kts
index 4ad8d221b..85bdde9c8 100644
--- a/codeSnippets/snippets/tutorial-server-web-application/build.gradle.kts
+++ b/codeSnippets/snippets/tutorial-server-web-application/build.gradle.kts
@@ -5,7 +5,7 @@ val logback_version: String by project
 plugins {
     application
     kotlin("jvm")
-    id("io.ktor.plugin") version "2.3.12"
+    id("io.ktor.plugin") version "3.0.0"
 }
 
 application {
diff --git a/codeSnippets/snippets/tutorial-server-websockets/build.gradle.kts b/codeSnippets/snippets/tutorial-server-websockets/build.gradle.kts
index 184929981..78299ac46 100644
--- a/codeSnippets/snippets/tutorial-server-websockets/build.gradle.kts
+++ b/codeSnippets/snippets/tutorial-server-websockets/build.gradle.kts
@@ -4,7 +4,7 @@ val logback_version: String by project
 
 plugins {
     kotlin("jvm")
-    id("io.ktor.plugin") version "2.3.12"
+    id("io.ktor.plugin") version "3.0.0"
     id("org.jetbrains.kotlin.plugin.serialization") version "2.0.0"
 }
 
@@ -30,7 +30,7 @@ dependencies {
     implementation("io.ktor:ktor-serialization-kotlinx-json-jvm")
     implementation("io.ktor:ktor-server-netty-jvm")
     implementation("ch.qos.logback:logback-classic:$logback_version")
-    testImplementation("io.ktor:ktor-server-tests-jvm")
+    testImplementation("io.ktor:ktor-server-test-host-jvm")
     testImplementation("org.jetbrains.kotlin:kotlin-test-junit:$kotlin_version")
     testImplementation("io.ktor:ktor-client-content-negotiation-jvm:$ktor_version")
 }
diff --git a/codeSnippets/snippets/tutorial-server-websockets/src/main/kotlin/com/example/plugins/Sockets.kt b/codeSnippets/snippets/tutorial-server-websockets/src/main/kotlin/com/example/plugins/Sockets.kt
index 3e4c6632b..749eab65f 100644
--- a/codeSnippets/snippets/tutorial-server-websockets/src/main/kotlin/com/example/plugins/Sockets.kt
+++ b/codeSnippets/snippets/tutorial-server-websockets/src/main/kotlin/com/example/plugins/Sockets.kt
@@ -9,15 +9,15 @@ import kotlinx.coroutines.delay
 import kotlinx.serialization.json.Json
 import model.Task
 import model.TaskRepository
-import java.time.Duration
 import java.util.*
 import kotlin.collections.ArrayList
+import kotlin.time.Duration.Companion.seconds
 
 fun Application.configureSockets() {
     install(WebSockets) {
         contentConverter = KotlinxWebsocketSerializationConverter(Json)
-        pingPeriod = Duration.ofSeconds(15)
-        timeout = Duration.ofSeconds(15)
+        pingPeriod = 15.seconds
+        timeout = 15.seconds
         maxFrameSize = Long.MAX_VALUE
         masking = false
     }
diff --git a/codeSnippets/snippets/tutorial-website-static/build.gradle.kts b/codeSnippets/snippets/tutorial-website-static/build.gradle.kts
index e54c85021..9fcdcb583 100644
--- a/codeSnippets/snippets/tutorial-website-static/build.gradle.kts
+++ b/codeSnippets/snippets/tutorial-website-static/build.gradle.kts
@@ -5,7 +5,7 @@ val logback_version: String by project
 plugins {
     application
     kotlin("jvm")
-    id("io.ktor.plugin") version "2.3.12"
+    id("io.ktor.plugin") version "3.0.0"
 }
 
 application {
@@ -22,6 +22,6 @@ dependencies {
     implementation("io.ktor:ktor-server-freemarker-jvm")
     implementation("io.ktor:ktor-server-netty-jvm")
     implementation("ch.qos.logback:logback-classic:$logback_version")
-    testImplementation("io.ktor:ktor-server-tests-jvm")
+    testImplementation("io.ktor:ktor-server-test-host-jvm")
     testImplementation("org.jetbrains.kotlin:kotlin-test-junit:$kotlin_version")
 }
\ No newline at end of file
diff --git a/codeSnippets/snippets/tutorial-website-static/src/test/kotlin/com/example/ApplicationTest.kt b/codeSnippets/snippets/tutorial-website-static/src/test/kotlin/com/example/ApplicationTest.kt
index cbb845be2..d45995b02 100644
--- a/codeSnippets/snippets/tutorial-website-static/src/test/kotlin/com/example/ApplicationTest.kt
+++ b/codeSnippets/snippets/tutorial-website-static/src/test/kotlin/com/example/ApplicationTest.kt
@@ -9,6 +9,9 @@ import kotlin.test.*
 class ApplicationTest {
     @Test
     fun testStatic() = testApplication {
+        application {
+            module()
+        }
         val response = client.get("/static/aboutme.html")
         assertEquals(HttpStatusCode.OK, response.status)
         assertEquals(
diff --git a/codeSnippets/snippets/upload-file/build.gradle.kts b/codeSnippets/snippets/upload-file/build.gradle.kts
index 1ab51f02a..db26d64a6 100644
--- a/codeSnippets/snippets/upload-file/build.gradle.kts
+++ b/codeSnippets/snippets/upload-file/build.gradle.kts
@@ -22,6 +22,6 @@ dependencies {
     implementation("io.ktor:ktor-server-netty:$ktor_version")
     implementation("io.ktor:ktor-server-html-builder:$ktor_version")
     implementation("ch.qos.logback:logback-classic:$logback_version")
-    testImplementation("io.ktor:ktor-server-test-host:$ktor_version")
+    testImplementation("io.ktor:ktor-server-test-host-jvm:$ktor_version")
     testImplementation("org.jetbrains.kotlin:kotlin-test")
 }
diff --git a/codeSnippets/snippets/upload-file/src/main/kotlin/uploadfile/UploadFile.kt b/codeSnippets/snippets/upload-file/src/main/kotlin/uploadfile/UploadFile.kt
index 96e01ed2c..65e5a3e91 100644
--- a/codeSnippets/snippets/upload-file/src/main/kotlin/uploadfile/UploadFile.kt
+++ b/codeSnippets/snippets/upload-file/src/main/kotlin/uploadfile/UploadFile.kt
@@ -5,6 +5,8 @@ import io.ktor.http.content.*
 import io.ktor.server.request.*
 import io.ktor.server.response.*
 import io.ktor.server.routing.*
+import io.ktor.utils.io.*
+import kotlinx.io.readByteArray
 import java.io.File
 
 fun Application.main() {
@@ -23,7 +25,7 @@ fun Application.main() {
 
                     is PartData.FileItem -> {
                         fileName = part.originalFileName as String
-                        val fileBytes = part.streamProvider().readBytes()
+                        val fileBytes = part.provider().readRemaining().readByteArray()
                         File("uploads/$fileName").writeBytes(fileBytes)
                     }
 
diff --git a/codeSnippets/snippets/upload-file/src/test/kotlin/uploadfile/UploadFileTest.kt b/codeSnippets/snippets/upload-file/src/test/kotlin/uploadfile/UploadFileTest.kt
index be4c6f827..6583992dc 100644
--- a/codeSnippets/snippets/upload-file/src/test/kotlin/uploadfile/UploadFileTest.kt
+++ b/codeSnippets/snippets/upload-file/src/test/kotlin/uploadfile/UploadFileTest.kt
@@ -4,10 +4,7 @@ import io.ktor.client.request.*
 import io.ktor.client.request.forms.*
 import io.ktor.client.statement.*
 import io.ktor.http.*
-import io.ktor.http.content.*
-import io.ktor.server.application.*
 import io.ktor.server.testing.*
-import io.ktor.utils.io.streams.*
 import org.junit.*
 import java.io.*
 import kotlin.test.*
@@ -16,13 +13,16 @@ import kotlin.test.Test
 class ApplicationTest {
     @Test
     fun testUpload() = testApplication {
+        application {
+            main()
+        }
         val boundary = "WebAppBoundary"
         val response = client.post("/upload") {
             setBody(
                 MultiPartFormDataContent(
                     formData {
                         append("description", "Ktor logo")
-                        append("image", File("ktor_logo.png").readBytes(), Headers.build {
+                        append("image", File("ktor_logo.png").readBytes().toString(), Headers.build {
                             append(HttpHeaders.ContentType, "image/png")
                             append(HttpHeaders.ContentDisposition, "filename=\"ktor_logo.png\"")
                         })
@@ -32,34 +32,7 @@ class ApplicationTest {
                 )
             )
         }
-        assertEquals("Ktor logo is uploaded to 'uploads/ktor_logo.png'", response.bodyAsText())
-    }
-
-    @Test
-    fun testUploadLegacyApi() = withTestApplication(Application::main) {
-        with(handleRequest(HttpMethod.Post, "/upload"){
-            val boundary = "WebAppBoundary"
-            val fileBytes = File("ktor_logo.png").readBytes()
-
-            addHeader(HttpHeaders.ContentType, ContentType.MultiPart.FormData.withParameter("boundary", boundary).toString())
-            setBody(boundary, listOf(
-                PartData.FormItem("Ktor logo", { }, headersOf(
-                    HttpHeaders.ContentDisposition,
-                    ContentDisposition.Inline
-                        .withParameter(ContentDisposition.Parameters.Name, "description")
-                        .toString()
-                )),
-                PartData.FileItem({ fileBytes.inputStream().asInput() }, {}, headersOf(
-                    HttpHeaders.ContentDisposition,
-                    ContentDisposition.File
-                        .withParameter(ContentDisposition.Parameters.Name, "image")
-                        .withParameter(ContentDisposition.Parameters.FileName, "ktor_logo.png")
-                        .toString()
-                ))
-            ))
-        }) {
-            assertEquals("Ktor logo is uploaded to 'uploads/ktor_logo.png'", response.content)
-        }
+        assertEquals("Ktor logo is uploaded to 'uploads/ktor_logo.png'", response.bodyAsText(Charsets.UTF_8))
     }
 
     @After
diff --git a/codeSnippets/snippets/velocity/build.gradle.kts b/codeSnippets/snippets/velocity/build.gradle.kts
index 95918b3d3..c6f147547 100644
--- a/codeSnippets/snippets/velocity/build.gradle.kts
+++ b/codeSnippets/snippets/velocity/build.gradle.kts
@@ -22,6 +22,6 @@ dependencies {
     implementation("io.ktor:ktor-server-netty:$ktor_version")
     implementation("io.ktor:ktor-server-velocity:$ktor_version")
     implementation("ch.qos.logback:logback-classic:$logback_version")
-    testImplementation("io.ktor:ktor-server-test-host:$ktor_version")
+    testImplementation("io.ktor:ktor-server-test-host-jvm:$ktor_version")
     testImplementation("org.jetbrains.kotlin:kotlin-test")
 }
diff --git a/codeSnippets/snippets/velocity/src/test/kotlin/ApplicationTest.kt b/codeSnippets/snippets/velocity/src/test/kotlin/ApplicationTest.kt
index bf8ee3e31..454f8ff76 100644
--- a/codeSnippets/snippets/velocity/src/test/kotlin/ApplicationTest.kt
+++ b/codeSnippets/snippets/velocity/src/test/kotlin/ApplicationTest.kt
@@ -1,3 +1,4 @@
+import com.example.module
 import io.ktor.client.call.*
 import io.ktor.client.request.*
 import io.ktor.server.testing.*
@@ -7,6 +8,9 @@ import org.junit.Assert.*
 class ApplicationTest {
     @Test
     fun test() = testApplication {
+        application {
+            module()
+        }
         val response: String = client.get("/index").body()
         assertEquals("""
 <html>
diff --git a/codeSnippets/snippets/webjars/build.gradle.kts b/codeSnippets/snippets/webjars/build.gradle.kts
index fc36f687f..801f3159a 100644
--- a/codeSnippets/snippets/webjars/build.gradle.kts
+++ b/codeSnippets/snippets/webjars/build.gradle.kts
@@ -24,6 +24,6 @@ dependencies {
     implementation("io.ktor:ktor-server-webjars:$ktor_version")
     implementation("org.webjars:bootstrap:$bootstrap_version")
     implementation("ch.qos.logback:logback-classic:$logback_version")
-    testImplementation("io.ktor:ktor-server-test-host:$ktor_version")
+    testImplementation("io.ktor:ktor-server-test-host-jvm:$ktor_version")
     testImplementation("org.jetbrains.kotlin:kotlin-test")
 }
diff --git a/codeSnippets/snippets/webjars/src/test/kotlin/EngineMainTest.kt b/codeSnippets/snippets/webjars/src/test/kotlin/EngineMainTest.kt
index 927bf4cb4..957cb6520 100644
--- a/codeSnippets/snippets/webjars/src/test/kotlin/EngineMainTest.kt
+++ b/codeSnippets/snippets/webjars/src/test/kotlin/EngineMainTest.kt
@@ -8,6 +8,9 @@ import kotlin.test.*
 class ApplicationTest {
     @Test
     fun testIndex() = testApplication {
+        application {
+            module()
+        }
         val response = client.get("/static/index.html")
         assertEquals(HttpStatusCode.OK, response.status)
     }
diff --git a/help-versions.json b/help-versions.json
index 4c70d64cd..6ee9f371a 100644
--- a/help-versions.json
+++ b/help-versions.json
@@ -6,12 +6,12 @@
   },
   {
     "version": "2.3.12",
-    "url": "/docs/",
+    "url": "/docs/2.3.12/",
     "isCurrent": false
   },
   {
-    "version": "3.0.0-rc-1",
-    "url": "/docs/eap/",
+    "version": "3.0.0",
+    "url": "/docs/",
     "isCurrent": true
   }
 ]
diff --git a/images/.DS_Store b/images/.DS_Store
new file mode 100644
index 000000000..297c3a1ba
Binary files /dev/null and b/images/.DS_Store differ
diff --git a/ktor.tree b/ktor.tree
index 2e121f7ff..6de61483f 100644
--- a/ktor.tree
+++ b/ktor.tree
@@ -65,9 +65,7 @@
                 <toc-element topic="server-routing.md"
                              accepts-web-file-names="routing.html,tracing-routes.html,resolution-algorithms.html,routing-in-ktor.html"/>
                 <toc-element topic="server-resources.md"
-                             accepts-web-file-names="type-safe-routing.html"/>
-                <toc-element topic="server-locations.md"
-                             accepts-web-file-names="features-locations.html,locations.html"/>
+                             accepts-web-file-names="type-safe-routing.html, features-locations.html,locations.html, server-locations.html"/>
                 <toc-element topic="server-application-structure.md"
                              accepts-web-file-names="structure.html,structuring-applications.html"/>
                 <toc-element topic="server-autoheadresponse.md"
@@ -188,6 +186,7 @@
                 <toc-element topic="server-websocket-extensions.md"
                              accepts-web-file-names="websocket-extensions-api.html"/>
             </toc-element>
+            <toc-element topic="sse_server.md"/>
 
             <toc-element topic="server-sockets.md"
                          accepts-web-file-names="servers-raw-sockets.html"/>
@@ -315,6 +314,7 @@
                          accepts-web-file-names="http-cookies.html"/>
             <toc-element topic="client-content-encoding.md"
                          accepts-web-file-names="content-encoding.html"/>
+            <toc-element topic="bom-remover.md"/>
             <toc-element topic="client-caching.md"/>
             <toc-element topic="client-text-and-charsets.md"
                          accepts-web-file-names="http-plain-text.html"/>
@@ -322,11 +322,15 @@
                          accepts-web-file-names="timeout.html"/>
             <toc-element topic="client-logging.md"
                          accepts-web-file-names="features-logging.html"/>
-            <toc-element topic="client-websockets.md"
+            <toc-element topic="client-websockets.topic"
                          accepts-web-file-names="websocket-client.html,http-client-features-websockets.html,clients-websockets.html">
                 <toc-element topic="client-websocket-serialization.md"
                              accepts-web-file-names="websocket-client-serialization.html"/>
             </toc-element>
+            <toc-element topic="sse_client.md"/>
+            <toc-element toc-title="Monitoring">
+                <toc-element topic="client_call_id.md"/>
+            </toc-element>
             <toc-element topic="client-custom-plugins.md"/>
         </toc-element>
 
@@ -345,6 +349,7 @@
                      accepts-web-file-names="migrating-2.html"/>
         <toc-element topic="migration-to-22x.md"
                      accepts-web-file-names="migrating-2-2.html"/>
+        <toc-element topic="migrating-3.md"/>
     </toc-element>
 
     <toc-element toc-title="Migrating from other frameworks">
@@ -359,15 +364,15 @@
     </toc-element>
     <toc-element hidden="true" accepts-web-file-names="generator.html"
                  target-for-accept-web-file-names="https://start.ktor.io/"/>
-    <toc-element hidden="true" accepts-web-file-names-ref="samples"
+    <toc-element hidden="true" toc-title="samples" accepts-web-file-names-ref="samples"
                  target-for-accept-web-file-names="https://ktor.io/learn/"/>
-    <toc-element hidden="true"
+    <toc-element hidden="true" toc-title="bug-report"
                  accepts-web-file-names="bug-report.html"
                  target-for-accept-web-file-names="https://ktor.io/support/"/>
-    <toc-element hidden="true"
+    <toc-element hidden="true" toc-title="code-style"
                  accepts-web-file-names="code-style.html"
                  target-for-accept-web-file-names="https://github.com/ktorio/ktor/blob/main/CONTRIBUTING.md#style-guides"/>
-    <toc-element hidden="true"
+    <toc-element hidden="true" toc-title="build-from-source"
                  accepts-web-file-names="build-from-source.html"
                  target-for-accept-web-file-names="https://github.com/ktorio/ktor/blob/main/CONTRIBUTING.md#building-the-project"/>
 </instance-profile>
\ No newline at end of file
diff --git a/project.ihp b/project.ihp
index 0df8853b5..025794704 100644
--- a/project.ihp
+++ b/project.ihp
@@ -14,7 +14,7 @@
     <categories src="c.list"/>
     <instance src="ktor.tree"
               web-path="/docs/"
-              version="2.3.12"
+              version="3.0.0"
               id="docs"
               keymaps-mode="none"/>
 
diff --git a/templates/.DS_Store b/templates/.DS_Store
new file mode 100644
index 000000000..28c0d2811
Binary files /dev/null and b/templates/.DS_Store differ
diff --git a/topics/bom-remover.md b/topics/bom-remover.md
new file mode 100644
index 000000000..2a31db7d8
--- /dev/null
+++ b/topics/bom-remover.md
@@ -0,0 +1,55 @@
+[//]: # (title: BOM remover)
+
+<var name="artifact_name" value="ktor-client-bom-remover"/>
+
+<tldr>
+<p>
+<b>Required dependencies</b>: <code>io.ktor:%artifact_name%</code>
+</p>
+<var name="example_name" value="client-bom-remover"/>
+<include from="lib.topic" element-id="download_example"/>
+</tldr>
+
+<link-summary>
+The BOMRemover plugin allows you to remove Byte Order Mark (BOM) from the response body.
+</link-summary>
+
+[Byte Order Mark (BOM)](https://en.wikipedia.org/wiki/Byte_order_mark) is a character encoded in a Unicode file or
+stream. The main purpose of BOM is to signal the text's stream encoding and the byte order of 16-bit and 32-bit
+encodings.
+
+In some cases, it is necessary to remove BOM from the response body. For example, in the UTF-8 encoding, the
+presence of BOM is optional, and it may cause problems when it's read by software
+that does not know how to handle the BOM.
+
+The Ktor client provides
+the [BOMRemover](https://api.ktor.io/ktor-client/ktor-client-plugins/ktor-client-bom-remover/io.ktor.client.plugins.bomremover/index.html)
+plugin that removes BOM from the response body in the UTF-8, UTF-16 (BE), UTF-16 (LE), UTF-32 (BE) and UTF-32 (LE)
+encodings.
+
+> Note that when removing the BOM, Ktor does not change the `Content-Length` header, which retains the
+length of the initial response.
+>
+{style="note"}
+
+## Add dependencies {id="add_dependencies"}
+
+To use `BOMRemover`, you need to include the `%artifact_name%` artifact in the build script:
+
+<include from="lib.topic" element-id="add_ktor_artifact"/>
+<include from="lib.topic" element-id="add_ktor_client_artifact_tip"/>
+
+## Install BOMRemover {id="install_plugin"}
+
+To install `BOMRemover`, pass it to the `install` function inside
+a [client configuration block](client-create-and-configure.md#configure-client):
+
+```kotlin
+import io.ktor.client.*
+import io.ktor.client.engine.cio.*
+import io.ktor.client.plugins.compression.*
+//...
+val client = HttpClient(CIO) {
+    install(BOMRemover)
+}
+```
diff --git a/topics/client-content-encoding.md b/topics/client-content-encoding.md
index 49cb45535..2f2e4da6d 100644
--- a/topics/client-content-encoding.md
+++ b/topics/client-content-encoding.md
@@ -14,11 +14,11 @@
 The ContentEncoding plugin allows you to enable specified compression algorithms (such as 'gzip' and 'deflate') and configure their settings.
 </link-summary>
 
-The Ktor client provides
-the [ContentEncoding](https://api.ktor.io/ktor-client/ktor-client-plugins/ktor-client-encoding/io.ktor.client.plugins.compression/-content-encoding)
-plugin that allows you to enable specified compression algorithms (such as `gzip` and `deflate`) and configure their
-settings. This plugin serves two primary purposes:
+The Ktor client provides the [ContentEncoding](https://api.ktor.io/ktor-client/ktor-client-plugins/ktor-client-encoding/io.ktor.client.plugins.compression/-content-encoding) 
+plugin that allows you to enable specified compression algorithms (such as `gzip` and `deflate`) and configure their settings. 
+This plugin serves three primary purposes:
 * Sets the `Accept-Encoding` header with the specified quality value.
+* Optionally encodes request body.
 * Decodes [content received from a server](client-responses.md#body) to obtain the original payload.
 
 
@@ -45,6 +45,22 @@ The [example](https://github.com/ktorio/ktor-documentation/tree/%ktor_version%/c
 
 ```kotlin
 ```
-{src="snippets/client-content-encoding/src/main/kotlin/com/example/Application.kt" include-lines="17-22"}
+{src="snippets/client-content-encoding/src/main/kotlin/com/example/Application.kt" include-lines="16-21"}
 
 If required, you can implement the `ContentEncoder` interface to create a custom encoder and pass it to the `customEncoder` function.
+
+## Encode request body {id="encode_request_body"}
+To encode the request body, use the `compress()` function inside the [HttpRequestBuilder](https://api.ktor.io/ktor-client/ktor-client-core/io.ktor.client.request/-http-request-builder/index.html) block.
+```kotlin
+import io.ktor.client.*
+import io.ktor.client.engine.cio.*
+import io.ktor.client.plugins.compression.*
+//...
+val client = HttpClient(CIO) {
+    install(ContentEncoding)
+}
+client.post("/upload") {
+    compress("gzip")
+    setBody(someLongBody)
+}
+```
diff --git a/topics/client-create-multiplatform-application.md b/topics/client-create-multiplatform-application.md
index 531d05f2a..63e3402b0 100644
--- a/topics/client-create-multiplatform-application.md
+++ b/topics/client-create-multiplatform-application.md
@@ -108,7 +108,7 @@ To add the dependencies, open the `shared/build.gradle.kts` file and follow the
 
 To use coroutines in [Android code](#android-activity), you need to add `kotlinx.coroutines` to your project:
 
-1. Open the `gradle/libs.versions.toml` file and specify the kotlinx version and libraries:
+1. Open the `gradle/libs.versions.toml` file and specify the coroutines version and libraries:
 
     ```kotlin
     ```
diff --git a/topics/client-create-websocket-chat.md b/topics/client-create-websocket-chat.md
index 09c1b2ad7..dc9e1a1f4 100644
--- a/topics/client-create-websocket-chat.md
+++ b/topics/client-create-websocket-chat.md
@@ -6,7 +6,7 @@
 <var name="example_name" value="tutorial-websockets-client"/>
 <include from="lib.topic" element-id="download_example"/>
 <p>
-<b>Used plugins</b>: <a href="client-websockets.md">WebSockets</a>
+<b>Used plugins</b>: <a href="client-websockets.topic">WebSockets</a>
 </p>
 </tldr>
 
@@ -15,7 +15,7 @@ Learn how to create a client chat application that uses WebSockets.
 </link-summary>
 
 In this section, you will learn how to create a Ktor client chat application that
-uses [WebSockets](client-websockets.md). The application will allow users to join a common chat server, send messages to
+uses [WebSockets](client-websockets.topic). The application will allow users to join a common chat server, send messages to
 users, and read messages from users in the terminal.
 
 ## Prerequisites {id="prerequisites"}
diff --git a/topics/client-engines.md b/topics/client-engines.md
index 9cf0f3c1d..ff1683375 100644
--- a/topics/client-engines.md
+++ b/topics/client-engines.md
@@ -47,7 +47,7 @@ _* To use the CIO engine on older Android versions, you need to enable [Java 8 A
 
 ### Limitations {id="limitations"}
 
-The table below shows whether a specific engine supports HTTP/2 and [WebSockets](client-websockets.md):
+The table below shows whether a specific engine supports HTTP/2 and [WebSockets](client-websockets.topic):
 
 | Engine  | HTTP/2             | WebSockets |
 |---------|--------------------|------------|
diff --git a/topics/client-websocket-serialization.md b/topics/client-websocket-serialization.md
index 14f69eba2..d4d5d823a 100644
--- a/topics/client-websocket-serialization.md
+++ b/topics/client-websocket-serialization.md
@@ -20,7 +20,7 @@ Similar to the [ContentNegotiation](client-serialization.md) plugin, WebSockets
 <tabs group="json-libraries">
 <tab title="kotlinx.serialization" group-key="kotlinx">
 
-To register the JSON serializer in the WebSockets [configuration](client-websockets.md#install_plugin), create a `KotlinxWebsocketSerializationConverter` instance with the `Json` parameter and assign this instance to the `contentConverter` property:
+To register the JSON serializer in the WebSockets [configuration](client-websockets.topic#install_plugin), create a `KotlinxWebsocketSerializationConverter` instance with the `Json` parameter and assign this instance to the `contentConverter` property:
 
 ```kotlin
 import io.ktor.serialization.kotlinx.*
@@ -65,7 +65,7 @@ install(WebSockets) {
 
 ### XML serializer {id="register_xml"}
 
-To register the XML serializer in the WebSockets [configuration](client-websockets.md#install_plugin), create a `KotlinxWebsocketSerializationConverter` instance with the `XML` parameter and assign this instance to the `contentConverter` property:
+To register the XML serializer in the WebSockets [configuration](client-websockets.topic#install_plugin), create a `KotlinxWebsocketSerializationConverter` instance with the `XML` parameter and assign this instance to the `contentConverter` property:
 
 ```kotlin
 import nl.adaptivity.xmlutil.serialization.*
@@ -76,7 +76,7 @@ install(WebSockets) {
 ```
 
 ### CBOR serializer {id="register_cbor"}
-To register the CBOR serializer in the WebSockets [configuration](client-websockets.md#install_plugin), create a `KotlinxWebsocketSerializationConverter` instance with the `Cbor` parameter and assign this instance to the `contentConverter` property:
+To register the CBOR serializer in the WebSockets [configuration](client-websockets.topic#install_plugin), create a `KotlinxWebsocketSerializationConverter` instance with the `Cbor` parameter and assign this instance to the `contentConverter` property:
 
 ```kotlin
 import io.ktor.serialization.kotlinx.cbor.*
@@ -87,7 +87,7 @@ install(WebSockets) {
 ```
 
 ### ProtoBuf serializer {id="register_protobuf"}
-To register the ProtoBuf serializer in the WebSockets [configuration](client-websockets.md#install_plugin), create a `KotlinxWebsocketSerializationConverter` instance with the `ProtoBuf` parameter and assign this instance to the `contentConverter` property:
+To register the ProtoBuf serializer in the WebSockets [configuration](client-websockets.topic#install_plugin), create a `KotlinxWebsocketSerializationConverter` instance with the `ProtoBuf` parameter and assign this instance to the `contentConverter` property:
 
 ```kotlin
 import io.ktor.serialization.kotlinx.protobuf.*
@@ -131,6 +131,6 @@ To receive and convert a content of a text frame, call the `receiveDeserialized`
 ```
 {src="snippets/client-websockets-serialization/src/main/kotlin/com/example/Application.kt" include-lines="22-25"}
 
-To receive deserialized frames from the [incoming](client-websockets.md#api-overview) channel, use the [WebsocketContentConverter.deserialize](https://api.ktor.io/ktor-shared/ktor-serialization/io.ktor.serialization/-websocket-content-converter/deserialize.html) function. `WebsocketContentConverter` is available via the `DefaultClientWebSocketSession.converter` property.
+To receive deserialized frames from the [incoming](client-websockets.topic#incoming) channel, use the [WebsocketContentConverter.deserialize](https://api.ktor.io/ktor-shared/ktor-serialization/io.ktor.serialization/-websocket-content-converter/deserialize.html) function. `WebsocketContentConverter` is available via the `DefaultClientWebSocketSession.converter` property.
 
 > You can find the full example here: [client-websockets-serialization](https://github.com/ktorio/ktor-documentation/tree/%ktor_version%/codeSnippets/snippets/client-websockets-serialization).
diff --git a/topics/client-websockets.md b/topics/client-websockets.md
deleted file mode 100644
index 0d8b14327..000000000
--- a/topics/client-websockets.md
+++ /dev/null
@@ -1,133 +0,0 @@
-[//]: # (title: WebSockets)
-
-<show-structure for="chapter" depth="2"/>
-
-<var name="example_name" value="client-websockets"/>
-<var name="artifact_name" value="ktor-client-websockets"/>
-
-<tldr>
-<p>
-<b>Required dependencies</b>: <code>io.ktor:ktor-client-websockets</code>
-</p>
-<include from="lib.topic" element-id="download_example"/>
-</tldr>
-
-<link-summary>
-The Websockets plugin allows you to create a multi-way communication session between a server and a client.
-</link-summary>
-
-<include from="server-websockets.md" element-id="websockets-description"></include>
-
-The Websockets plugin for the client allows you to handle a WebSocket session for exchanging messages with a server.
-
-
-> Not all engines support WebSockets. For an overview of the supported engines, refer
-to [](client-engines.md#limitations).
->
-{style="note"}
-
-
-> To learn about WebSocket support on the server-side, see [](server-websockets.md).
-
-## Add dependencies {id="add_dependencies"}
-
-To use `WebSockets`, you need to include the `%artifact_name%` artifact in the build script:
-
-<include from="lib.topic" element-id="add_ktor_artifact"/>
-<include from="lib.topic" element-id="add_ktor_client_artifact_tip"/>
-
-## Install WebSockets {id="install_plugin"}
-
-To install the `WebSockets` plugin, pass it to the `install` function inside
-a [client configuration block](client-create-and-configure.md#configure-client):
-
-```kotlin
-import io.ktor.client.*
-import io.ktor.client.engine.cio.*
-import io.ktor.client.plugins.websocket.*
-//...
-val client = HttpClient(CIO) {
-    install(WebSockets)
-}
-```
-
-## Configure WebSockets {id="configure_plugin"}
-
-Optionally, you can configure the plugin inside the `install` block by passing the supported properties of
-the [WebSockets.Config](https://api.ktor.io/ktor-client/ktor-client-core/io.ktor.client.plugins.websocket/-web-sockets/-config/index.html).
-
-* Use the `maxFrameSize` property to set a maximum Frame that could be received or sent.
-* Use the `contentConverter` property to set a converter for serialization/deserialization.
-
-```kotlin
-```
-
-{src="snippets/client-websockets/src/main/kotlin/com/example/Application.kt" include-lines="12-16"}
-
-* Use the `pingPeriod` property to specify the duration between pings.
-
-The `pingPeriod` property is not applicable for the OkHttp engine.
-To set the ping interval for OkHttp, you can use the [engine configuration](client-engines.md#okhttp):
-
-```kotlin
-import io.ktor.client.engine.okhttp.OkHttp
-
-val client = HttpClient(OkHttp) {
-    engine {
-        preconfigured = OkHttpClient.Builder()
-            .pingInterval(20, TimeUnit.SECONDS)
-            .build()
-    }
-}
-```
-
-## Handle a WebSockets session {id="handle-session"}
-
-### API overview {id="api-overview"}
-
-A client's WebSocket session is represented by
-the [DefaultClientWebSocketSession](https://api.ktor.io/ktor-shared/ktor-websockets/io.ktor.websocket/-default-web-socket-session/index.html)
-interface. This interface exposes the API that allows you to send/receive WebSocket frames and close a
-session. `HttpClient` allows you to get access to a WebSocket session in one of the following ways:
-
-- The [webSocket()](https://api.ktor.io/ktor-client/ktor-client-core/io.ktor.client.plugins.websocket/web-socket.html)
-  function accepts `DefaultClientWebSocketSession` as a block argument.
-  ```kotlin
-     runBlocking {
-         client.webSocket(method = HttpMethod.Get, host = "127.0.0.1", port = 8080, path = "/echo") {
-             // this: DefaultClientWebSocketSession
-         }
-     }
-  ```
--
-The [webSocketSession()](https://api.ktor.io/ktor-client/ktor-client-core/io.ktor.client.plugins.websocket/web-socket-session.html)
-function returns the `DefaultClientWebSocketSession` instance and allows you to access a session outside
-the `runBlocking` or `launch` scope.
-
-Within the function block, you define the handler for the specified path. The following functions and properties are
-available within the block:
-
-* Use the `send()` function to send text content to the server.
-* Use the `incoming` and `outgoing` properties to access the channels for receiving and sending WebSocket frames. A
-  frame is represented by the `Frame` class.
-* Use the `close()` function to send a close frame with the specified reason.
-
-When handling a session, you can check a frame type, for example:
-
-* `Frame.Text` is a text frame. For this frame type, you can read its content using `Frame.Text.readText()`.
-* `Frame.Binary` is a binary frame. For this type, you can read its content using `Frame.Binary.readBytes()`.
-* `Frame.Close` is a closing frame. You can call `Frame.Close.readReason()` to get a close reason for the current
-  session.
-
-### Example {id="example"}
-
-The example below creates the `echo` WebSocket endpoint and shows how to send and receive a message to and from a
-server.
-
-```kotlin
-```
-
-{src="snippets/client-websockets/src/main/kotlin/com/example/Application.kt" include-symbol="main"}
-
-For the full example,
-see [client-websockets](https://github.com/ktorio/ktor-documentation/tree/%ktor_version%/codeSnippets/snippets/client-websockets).
diff --git a/topics/client-websockets.topic b/topics/client-websockets.topic
new file mode 100644
index 000000000..b217a63c1
--- /dev/null
+++ b/topics/client-websockets.topic
@@ -0,0 +1,196 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE topic SYSTEM "https://resources.jetbrains.com/writerside/1.0/xhtml-entities.dtd">
+<topic xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="https://resources.jetbrains.com/writerside/1.0/topic.v2.xsd"
+       id="client-websockets" title="WebSockets">
+
+    <show-structure for="chapter" depth="3"/>
+    <var name="example_name" value="client-websockets"/>
+    <var name="artifact_name" value="ktor-client-websockets"/>
+    <tldr>
+        <p>
+            <b>Required dependencies</b>: <code>io.ktor:ktor-client-websockets</code>
+        </p>
+        <include from="lib.topic" element-id="download_example"/>
+    </tldr>
+    <link-summary>
+        The Websockets plugin allows you to create a multi-way communication session between a server and a client.
+    </link-summary>
+    <include from="server-websockets.md" element-id="websockets-description"/>
+    <p>The Websockets plugin for the client allows you to handle a WebSocket session for exchanging messages with a
+        server.</p>
+    <note>
+        <p>Not all engines support WebSockets. For an overview of the supported engines, refer
+            to <a href="client-engines.md" anchor="limitations"/>.</p>
+    </note>
+    <tip>
+        <p>To learn about WebSocket support on the server-side, see <a href="server-websockets.md"/>.</p>
+    </tip>
+    <chapter title="Add dependencies" id="add_dependencies">
+        <p>To use <code>WebSockets</code>, you need to include the <code>%artifact_name%</code> artifact in the build
+            script:</p>
+        <include from="lib.topic" element-id="add_ktor_artifact"/>
+        <include from="lib.topic" element-id="add_ktor_client_artifact_tip"/>
+    </chapter>
+    <chapter title="Install WebSockets" id="install_plugin">
+        <p>To install the <code>WebSockets</code> plugin, pass it to the <code>install</code> function inside
+            a <a href="client-create-and-configure.md" anchor="configure-client">client configuration block</a>:</p>
+
+        <code-block lang="kotlin">
+            import io.ktor.client.*
+            import io.ktor.client.engine.cio.*
+            import io.ktor.client.plugins.websocket.*
+
+            //...
+            val client = HttpClient(CIO) {
+                install(WebSockets)
+            }
+        </code-block>
+    </chapter>
+    <chapter title="Configuration" id="configure_plugin">
+        <p>Optionally, you can configure the plugin inside the <code>install</code> block by passing the supported
+            properties of
+            the
+            <a href="https://api.ktor.io/ktor-client/ktor-client-core/io.ktor.client.plugins.websocket/-web-sockets/-config/index.html">WebSockets.Config</a>.
+        </p>
+        <deflist>
+            <def id="maxFrameSize">
+                <title><code>maxFrameSize</code></title>
+                Set a maximum <code>Frame</code> size that could be received or sent.
+            </def>
+            <def id="contentConverter">
+                <title><code>contentConverter</code></title>
+                Set a converter for serialization/deserialization.
+            </def>
+            <def id="pingIntervalMillis">
+                <title><code>pingIntervalMillis</code></title>
+                Specify the duration between pings in a <code>Long</code> format.
+            </def>
+            <def id="pingInterval">
+                <title><code>pingInterval</code></title>
+                Specify the duration between pings in a <code>Duration</code> format.
+            </def>
+        </deflist>
+        <warning>
+            <p>The <code>pingInterval</code> and <code>pingIntervalMillis</code> properties are not applicable for the
+                OkHttp engine. To set the ping interval for OkHttp, you can use the
+                <a href="client-engines.md" anchor="okhttp">engine configuration</a>:
+            </p>
+            <code-block lang="kotlin">
+                import io.ktor.client.engine.okhttp.OkHttp
+
+                val client = HttpClient(OkHttp) {
+                    engine {
+                        preconfigured = OkHttpClient.Builder()
+                            .pingInterval(20, TimeUnit.SECONDS)
+                            .build()
+                    }
+                }
+            </code-block>
+        </warning>
+        <p>
+            In the following example, the WebSockets plugin is configured with a ping interval of 20 seconds
+            (<code>20_000</code> milliseconds) to automatically send ping frames and keep the WebSocket
+            connection alive:
+        </p>
+        <code-block lang="kotlin" src="snippets/client-websockets/src/main/kotlin/com/example/Application.kt"
+                    include-lines="12-16"/>
+    </chapter>
+    <chapter title="Working with WebSocket sessions" id="working-wtih-session">
+        <p>A client's WebSocket session is represented by
+            the
+            <a href="https://api.ktor.io/ktor-shared/ktor-websockets/io.ktor.websocket/-default-web-socket-session/index.html">DefaultClientWebSocketSession</a>
+            interface. This interface exposes the API that allows you to send and receive WebSocket frames, and close a
+            session.
+        </p>
+        <chapter title="Access a WebSocket session" id="access-session">
+            <p>
+                <code>HttpClient</code> provides two primary ways to access a WebSocket session:
+            </p>
+            <list>
+                <li>
+                    <p>The <a
+                            href="https://api.ktor.io/ktor-client/ktor-client-core/io.ktor.client.plugins.websocket/web-socket.html">webSocket()</a>
+                        function accepts <code>DefaultClientWebSocketSession</code> as a block argument.</p>
+
+                    <code-block lang="kotlin">
+                        runBlocking {
+                            client.webSocket(
+                                method = HttpMethod.Get,
+                                host = "127.0.0.1",
+                                port = 8080,
+                                path = "/echo"
+                            ) {
+                                // this: DefaultClientWebSocketSession
+                            }
+                        }
+                    </code-block>
+                </li>
+                <li>
+                    The <a
+                        href="https://api.ktor.io/ktor-client/ktor-client-core/io.ktor.client.plugins.websocket/web-socket-session.html">webSocketSession()</a>
+                    function returns the <code>DefaultClientWebSocketSession</code> instance and allows you to access a
+                    session outside
+                    the <code>runBlocking</code> or <code>launch</code> scope.
+                </li>
+            </list>
+        </chapter>
+
+        <chapter title="Handle WebSocket sessions" id="handle-session">
+            <p>Within the function block, you define the handler for the specified path. The following functions and
+                properties are available within the block:</p>
+            <deflist>
+                <def id="send">
+                    <title><code>send()</code></title>
+                    Use the <code>send()</code> function to send text content to the server.
+                </def>
+                <def id="outgoing">
+                    <title><code>outgoing</code></title>
+                    Use the <code>outgoing</code> property to access the channels for sending WebSocket frames. A
+                    frame is represented by the <code>Frame</code> class.
+                </def>
+                <def id="incoming">
+                    <title><code>incoming</code></title>
+                    Use the <code>incoming</code> property to access the channels for receiving WebSocket frames. A
+                    frame is represented by the <code>Frame</code> class.
+                </def>
+                <def id="close">
+                    <title><code>close()</code></title>
+                    Use the <code>close()</code> function to send a close frame with the specified reason.
+                </def>
+            </deflist>
+        </chapter>
+
+        <chapter title="Frame types" id="frame-types">
+            <p>
+                You can inspect the type of WebSocket frame and handle it accordingly. Some common frame types are:
+            </p>
+            <list>
+                <li><code>Frame.Text</code> represents a text frame. Use
+                    <code>Frame.Text.readText()</code> to read its content.
+                </li>
+                <li><code>Frame.Binary</code> represents a binary frame. Use <code>Frame.Binary.readBytes()</code>
+                    to read its content.
+                </li>
+                <li><code>Frame.Close</code> represents a closing frame. Use <code>Frame.Close.readReason()</code>
+                    to get the reason for the session's closure.
+                </li>
+            </list>
+        </chapter>
+
+        <chapter title="Example" id="example">
+            <p>The example below creates the <code>echo</code> WebSocket endpoint and shows how to send and receive a
+                message to and from a
+                server.</p>
+
+            <code-block lang="kotlin" src="snippets/client-websockets/src/main/kotlin/com/example/Application.kt"
+                        include-symbol="main">
+            </code-block>
+            <p>For the full example,
+                see
+                <a href="https://github.com/ktorio/ktor-documentation/tree/%ktor_version%/codeSnippets/snippets/client-websockets">client-websockets</a>.
+            </p>
+        </chapter>
+    </chapter>
+
+</topic>
\ No newline at end of file
diff --git a/topics/client_call_id.md b/topics/client_call_id.md
new file mode 100644
index 000000000..429a16166
--- /dev/null
+++ b/topics/client_call_id.md
@@ -0,0 +1,112 @@
+[//]: # (title: CallId)
+
+<show-structure for="chapter" depth="2"/>
+
+<var name="artifact_name" value="ktor-client-call-id"/>
+<var name="package_name" value="io.ktor.client.plugins.callid"/>
+<var name="plugin_name" value="CallId"/>
+
+<tldr>
+<p>
+<b>Required dependencies</b>: <code>io.ktor:%artifact_name%</code>
+</p>
+<var name="example_name" value="client-call-id"/>
+<include from="lib.topic" element-id="download_example"/>
+</tldr>
+
+<link-summary>
+The %plugin_name% client plugin allows you to trace client requests by using unique call IDs.
+</link-summary>
+
+The %plugin_name% plugin allows you to trace client requests end-to-end by using unique call IDs. It is particularly
+useful in microservice architectures to keep track of calls, regardless of how many services a request goes through.
+
+A calling scope might already have a call ID in its coroutine context. By default, the plugin uses the current context
+to retrieve a call ID and adds it to the context of the specific call using the `HttpHeaders.XRequestId` header.
+
+Additionally, if a scope comes without a call ID, you can [configure the plugin](#configure) to generate and apply a new
+call ID.
+
+## Add dependencies {id="add_dependencies"}
+
+<include from="lib.topic" element-id="add_ktor_artifact_intro"/>
+<include from="lib.topic" element-id="add_ktor_artifact"/>
+
+## Install %plugin_name% {id="install_plugin"}
+
+<include from="lib.topic" element-id="install_plugin"/>
+
+## Configure %plugin_name% {id="configure"}
+
+The %plugin_name% plugin configuration, provided by the [CallIdConfig]() class, allows you to generate a call ID and add
+it to the call context.
+
+### Generate a call ID
+
+Generate a call ID for a specific request in one of the following ways:
+
+* The `useCoroutineContext` property, enabled by default, adds a generator that uses the current `CoroutineContext` to
+  retrieve a call ID. To disable this functionality, set `useCoroutineContext` to `false`:
+
+ ```kotlin
+ ```
+
+{src="snippets/client-call-id/src/main/kotlin/com/example/Application.kt" include-lines="34-35,37"}
+
+> In a Ktor server, use the [CallId plugin](server-call-id.md) to add a call ID to the `CoroutineContext`.
+
+* The `generate()` function allows you to generate a call ID for an outgoing request. If it fails to generate a call ID,
+  it returns `null`.
+
+ ```kotlin
+ ```
+
+{src="snippets/client-call-id/src/main/kotlin/com/example/Application.kt" include-lines="34,36-37"}
+
+You can use multiple methods to generate a call ID. In this way, the first non-null value will be applied.
+
+### Add a call ID
+
+After you retrieve a call ID, you have the following options available to add it to the request:
+
+* The `intercept()` function allows you to add a call ID to the request by using the [CallIdInterceptor]().
+
+ ```kotlin
+ ```
+
+{src="snippets/client-call-id/src/main/kotlin/com/example/CallIdService.kt" include-lines="23-27"}
+
+* The `addToHeader()` function adds a call ID to a specified header. It takes a header as a parameter, which defaults
+  to `HttpHeaders.XRequestId`.
+
+ ```kotlin
+ ```
+
+{src="snippets/client-call-id/src/main/kotlin/com/example/Application.kt" include-lines="18,20-21"}
+
+## Example
+
+In the following example, the `%plugin_name%` plugin for the Ktor client is configured to generate a new call ID and add
+it to the header:
+
+ ```kotlin
+ ```
+
+{src="snippets/client-call-id/src/main/kotlin/com/example/Application.kt" include-lines="17-22"}
+
+The plugin uses the coroutine context to get a call ID and utilizes the `generate()` function to generate a new one. The
+first non-null call ID is then applied to the request header using the `addToHeader()` function.
+
+In a Ktor server, the call ID can then be retrieved from the header using the [retrieve](server-call-id.md#retrieve) functions
+from the [CallId plugin for the server](server-call-id.md).
+
+ ```kotlin
+ ```
+
+{src="snippets/client-call-id/src/main/kotlin/com/example/CallIdService.kt" include-lines="29-30,33"}
+
+In this way the Ktor server retrieves the ID of the specified header of the request and applies it to the `callId`
+property of the call.
+
+For the full example,
+see [client-call-id](https://github.com/ktorio/ktor-documentation/tree/%ktor_version%/codeSnippets/snippets/client-call-id)
\ No newline at end of file
diff --git a/topics/db-connection-pooling-caching.md b/topics/db-connection-pooling-caching.md
index ccb776a62..28562330e 100644
--- a/topics/db-connection-pooling-caching.md
+++ b/topics/db-connection-pooling-caching.md
@@ -29,7 +29,7 @@ Then, open `build.gradle.kts` and add the following dependencies:
 
 ```kotlin
 ```
-{src="snippets/tutorial-website-interactive-persistence-advanced/build.gradle.kts" include-lines="6-7,23-24,32-33,37"}
+{src="snippets/tutorial-website-interactive-persistence-advanced/build.gradle.kts" include-lines="5-6,22-23,31-32,36"}
 
 Click the **Load Gradle Changes** icon in the top right corner of the `build.gradle.kts` file to install newly added dependencies.
 
diff --git a/topics/db-persistence.md b/topics/db-persistence.md
index 9840586f3..e732e4ceb 100644
--- a/topics/db-persistence.md
+++ b/topics/db-persistence.md
@@ -31,7 +31,7 @@ Then, open `build.gradle.kts` and add the following dependencies:
 
 ```kotlin
 ```
-{src="snippets/tutorial-website-interactive-persistence/build.gradle.kts" include-lines="3-4,21-22,26-29,33"}
+{src="snippets/tutorial-website-interactive-persistence/build.gradle.kts" include-lines="2-3,20-21,25-28,32"}
 
 Click the **Load Gradle Changes** icon in the top right corner of the `build.gradle.kts` file to install newly added dependencies.
 
diff --git a/topics/docker.md b/topics/docker.md
index 1a3b98e94..fa602a12d 100644
--- a/topics/docker.md
+++ b/topics/docker.md
@@ -90,7 +90,7 @@ The `jreVersion` property specifies the JRE version to use in the image:
 ```kotlin
 ```
 
-{src="snippets/deployment-ktor-plugin/build.gradle.kts" include-lines="29,34-35,53-54"}
+{src="snippets/deployment-ktor-plugin/build.gradle.kts" include-lines="28,33-34,52-53"}
 
 ### Image name and tag {id="name-tag"}
 
@@ -99,7 +99,7 @@ If you need to customize the image name and tag, use the `localImageName` and `i
 ```kotlin
 ```
 
-{src="snippets/deployment-ktor-plugin/build.gradle.kts" include-lines="29,34,36-37,53-54"}
+{src="snippets/deployment-ktor-plugin/build.gradle.kts" include-lines="28,33,35-36,52-53"}
 
 ### Port mapping {id="port-mapping"}
 
@@ -113,7 +113,7 @@ The example below shows how to map the `8080` container port to the `80` Docker
 ```kotlin
 ```
 
-{src="snippets/deployment-ktor-plugin/build.gradle.kts" include-lines="29,34,38-44,53-54"}
+{src="snippets/deployment-ktor-plugin/build.gradle.kts" include-lines="28,33,37-43,52-53"}
 
 In this case, you can access the server on `http://0.0.0.0:80`.
 
@@ -132,7 +132,7 @@ The example below shows how to configure the Docker Hub registry:
 ```kotlin
 ```
 
-{src="snippets/deployment-ktor-plugin/build.gradle.kts" include-lines="29,34,46-54"}
+{src="snippets/deployment-ktor-plugin/build.gradle.kts" include-lines="28,33,45-53"}
 
 Note that the Docker Hub name and password are fetched from the environment variables, so you need to set these values
 before running the `publishImage` task:
diff --git a/topics/elastic-beanstalk.md b/topics/elastic-beanstalk.md
index e302f8c9f..a45a1d52e 100644
--- a/topics/elastic-beanstalk.md
+++ b/topics/elastic-beanstalk.md
@@ -52,12 +52,12 @@ First, you need to specify a port used to listen for incoming requests. Elastic
 This tutorial shows how to deploy the application to Elastic Beanstalk using a [fat JAR](server-fatjar.md). To generate fat JARs, you need to apply the Ktor plugin. Open the `build.gradle.kts` file and add the plugin to the `plugins` block:
 ```groovy
 ```
-{src="snippets/aws-elastic-beanstalk/build.gradle.kts" include-lines="5,8-9"}
+{src="snippets/aws-elastic-beanstalk/build.gradle.kts" include-lines="3,6-7"}
 
 Then, make sure that the [main application class](server-dependencies.topic#create-entry-point) is configured:
 ```kotlin
 ```
-{src="snippets/aws-elastic-beanstalk/build.gradle.kts" include-lines="11-13"}
+{src="snippets/aws-elastic-beanstalk/build.gradle.kts" include-lines="9-11"}
 
 
 ## Build a Fat JAR {id="build"}
diff --git a/topics/migrating-3.md b/topics/migrating-3.md
new file mode 100644
index 000000000..be0d62f5a
--- /dev/null
+++ b/topics/migrating-3.md
@@ -0,0 +1,376 @@
+[//]: # (title: Migrating from 2.2.x to 3.0.x)
+
+<show-structure for="chapter" depth="3"/>
+
+This guide provides instructions on how to migrate your Ktor application from the 2.2.x version to 3.0.x.
+
+## Ktor Server {id="server"}
+
+### `ApplicationEngine`, `ApplicationEnvironment`, and `Application`
+
+Several design changes have been introduced to improve configurability and provide a more defined
+separation between the `ApplicationEngine`, `ApplicationEnvironment` and `Application` instances.
+
+Before v3.0.0, `ApplicationEngine` managed `ApplicationEnvironment`, which in turn managed `Application`.
+
+In the current design, however, `Application` is responsible for creating, owning, and initiating
+both `ApplicationEngine` and `ApplicationEnvironment`.
+
+This restructuring comes with the following set of breaking changes:
+
+- [`ApplicationEngineEnvironmentBuilder` and `applicationEngineEnvironment` classes are renamed](#renamed-classes).
+- [`start()` and `stop()` methods are removed from `ApplicationEngineEnvironment`](#ApplicationEnvironment).
+- [Introduction of `ServerConfigBuilder`](#ServerConfigBuilder).
+- [`embeddedServer()` returns`EmbeddedServer`](#EmbeddedServer) instead of `ApplicationEngine`.
+
+These changes will impact existing code that relies on the previous model.
+
+#### Renamed classes {id="renamed-classes"}
+
+| Package                   | 2.x.x                                 | 3.0.x                           |
+|---------------------------|---------------------------------------|---------------------------------|
+| `io.ktor:ktor-server-core` | `ApplicationEngineEnvironmentBuilder` | `ApplicationEnvironmentBuilder` |
+| `io.ktor:ktor-server-core` | `applicationEngineEnvironment`        | `applicationEnvironment`        |
+
+#### `start()` and `stop()` methods are removed from `ApplicationEngineEnvironment` {id="ApplicationEnvironment"}
+
+With the merge of `AplicationEngineEnvironment`
+to [`ApplicationEnvironment`](https://api.ktor.io/older/3.0.0-beta-1/ktor-server/ktor-server-core/io.ktor.server.application/-application-environment/index.html),
+the `start()` and `stop()` methods are now
+only accessible
+through [`ApplicationEngine`](https://api.ktor.io/older/3.0.0-beta-1/ktor-server/ktor-server-core/io.ktor.server.engine/-application-engine/index.html).
+
+| 2.x.x                                                 | 3.0.x                                |
+|-------------------------------------------------------|--------------------------------------|
+| `ApplicationEngineEnvironment.start()`                | `ApplicationEngine.start()`          |
+| `ApplicationEngineEnvironment.stop()`                 | `ApplicationEngine.stop()`           |
+
+Additionally, in the following table you can see the list of removed properties
+and their current corresponding ownership:
+
+| 2.x.x                                           | 3.0.x                                        |
+|-------------------------------------------------|----------------------------------------------|
+| `ApplicationEngineEnvironment.connectors`       | `ApplciationEngine.Configuration.connectors` |
+| `ApplicationEnvironment.developmentMode`        | `Application.developmentMode`                |
+| `ApplicationEnvironment.monitor`                | `Application.monitor`                        |
+| `ApplicationEnvironment.parentCoroutineContext` | `Application.parentCoroutineContext`         |
+| `ApplicationEnvironment.rootPath`               | `Application.rootPath`                       |
+
+The ownership changes can be illustrated through the following example:
+
+<compare first-title="2.2.x" second-title="3.0.x">
+
+```kotlin
+import io.ktor.server.application.*
+import io.ktor.server.cio.*
+import io.ktor.server.engine.*
+import org.slf4j.helpers.NOPLogger
+
+fun defaultServer(module: Application.() -> Unit) =
+  embeddedServer(CIO,
+    environment = applicationEngineEnvironment {
+      log = NOPLogger.NOP_LOGGER
+      connector { 
+          port = 8080
+      }
+      module(module)
+    }
+  )
+```
+
+{validate="false" noinject}
+
+```kotlin
+import io.ktor.server.application.*
+import io.ktor.server.cio.*
+import io.ktor.server.engine.*
+import org.slf4j.helpers.NOPLogger
+
+fun defaultServer(module: Application.() -> Unit) =
+  embeddedServer(CIO,
+    environment = applicationEnvironment { log = NOPLogger.NOP_LOGGER },
+    configure = {
+      connector {
+          port = 8080
+      }
+    },
+    module
+  )
+```
+
+</compare>
+
+#### Introduction of `ServerConfigBuilder` {id="ServerConfigBuilder"}
+
+A new
+entity,[`ServerConfigBuilder`](https://api.ktor.io/ktor-server/ktor-server-core/io.ktor.server.application/-server-config-builder/index.html),
+has been introduced for configuring server properties and replaces the previous configration mechanism of `ApplicationPropertiesBuilder`.
+`ServerConfigBuilder` is used to build instances of the
+[`ServerConfig`](https://api.ktor.io/ktor-server/ktor-server-core/io.ktor.server.application/-server-config/index.html)
+class, which now holds modules, paths, and environment details previously managed by `ApplicationProperties`.
+
+Additionally, in the `embeddedServer()` function, the `applicationProperties` attribute has been renamed to `rootConfig`
+to reflect this new configuration approach.
+
+| Package                    | 2.x.x                          | 3.0.x                 |
+|----------------------------|--------------------------------|-----------------------|
+| `io.ktor:ktor-server-core` | `ApplicationProperties`        | `ServerConfig`        |
+| `io.ktor:ktor-server-core` | `ApplciationPropertiesBuilder` | `ServerConfigBuilder` |
+
+#### Introduction of `EmbeddedServer` {id="EmbeddedServer"}
+
+The
+class [`EmbeddedServer`](https://api.ktor.io/older/3.0.0-beta-1/ktor-server/ktor-server-core/io.ktor.server.engine/-embedded-server/index.html)
+is introduced and used to replace `ApplicationEngine` as a return type of the `embeddedServer()`
+function.
+
+For more details about the model change,
+see [issue KTOR-3857 on YouTrack](https://youtrack.jetbrains.com/issue/KTOR-3857/Environment-Engine-Application-Design).
+
+### Testing
+
+##### `withTestApplication` and `withApplication` have been removed
+
+The `withTestApplication` and `withApplication` functions, [previously deprecated in the
+`2.0.0` release](migration-to-20x.md#testing-api), have now been removed from the `ktor-server-test-host` package.
+
+Instead, use the `testApplication` function with the existing [Ktor client](client-create-and-configure.md)
+instance to make requests to your server and verify the results.
+
+In the test below, the `handleRequest` function is replaced with the `client.get` request:
+
+<compare first-title="1.x.x" second-title="3.0.x">
+
+```kotlin
+```
+{src="https://raw.githubusercontent.com/ktorio/ktor-documentation/refs/heads/2.3.12/codeSnippets/snippets/engine-main/src/test/kotlin/EngineMainTest.kt"
+include-lines="18-26"}
+
+```kotlin
+```
+{src="https://raw.githubusercontent.com/ktorio/ktor-documentation/refs/heads/2.3.12/codeSnippets/snippets/engine-main/src/test/kotlin/EngineMainTest.kt"
+include-lines="11-16"}
+
+</compare>
+
+For more information, see [](server-testing.md).
+
+#### `TestApplication` module loading {id="test-module-loading"}
+
+`TestApplication` no longer automatically loads modules from a configuration file (
+e.g. `application.conf`). Instead, you must [explicitly load your modules](#explicit-module-loading) within the
+`testApplication` function or [load the configuration file](#configure-env) manually.
+
+##### Explicit module loading {id="explicit-module-loading"}
+
+To explicitly load modules, use the `application` function within `testApplication`. This approach allows you to
+manually specify which modules to load, providing greater control over your test setup.
+
+<compare first-title="2.2.x" second-title="3.0.x">
+
+```kotlin
+import io.ktor.client.request.*
+import io.ktor.client.statement.*
+import io.ktor.http.*
+import io.ktor.server.testing.*
+import kotlin.test.*
+
+
+class ApplicationTest {
+  @Test
+  fun testRoot() = testApplication {
+    client.get("/").apply {
+      assertEquals(HttpStatusCode.OK, status)
+      assertEquals("Hello World!", bodyAsText())
+    }
+  }
+}
+```
+{validate="false" noinject}
+
+```kotlin
+import com.example.plugins.*
+import io.ktor.client.request.*
+import io.ktor.client.statement.*
+import io.ktor.http.*
+import io.ktor.server.testing.*
+import kotlin.test.*
+
+
+class ApplicationTest {
+  @Test
+  fun testRoot() = testApplication {
+    application {
+      configureRouting()
+    }
+    client.get("/").apply {
+      assertEquals(HttpStatusCode.OK, status)
+      assertEquals("Hello World!", bodyAsText())
+    }
+  }
+}
+
+```
+{validate="false" noinject}
+
+
+</compare>
+
+##### Load modules from a configuration file {id="configure-env"}
+
+If you want to load modules from a configuration file, use the `environment` function to specify the configuration
+file for your test.
+
+```kotlin
+```
+{src="snippets/auth-oauth-google/src/test/kotlin/ApplicationTest.kt" include-lines="17-21,51"}
+
+For more information on configuring the test application, see the [](server-testing.md) section.
+
+### `CallLogging` plugin package has been renamed
+
+The [`CallLogging`](https://api.ktor.io/ktor-server/ktor-server-plugins/ktor-server-call-logging/io.ktor.server.plugins.calllogging/index.html)
+plugin package has been renamed due to a typo.
+
+| 2.x.x                               | 3.0.x                                |
+|-------------------------------------|--------------------------------------|
+| `io.ktor.server.plugins.callloging` | `io.ktor.server.plugins.calllogging` |
+
+
+### `ktor-server-host-common` module has been removed
+
+Due to `Application` requiring knowledge of `ApplicationEngine`, the contents of `ktor-server-host-common` module have
+been merged into `ktor-server-core`, namely
+the [`io.ktor.server.engine`](https://api.ktor.io/older/3.0.0-beta-1/ktor-server/ktor-server-core/io.ktor.server.engine/index.html)
+package.
+
+Ensure that your dependencies are updated accordingly. In most cases, you can simply remove
+the `ktor-server-host-common` dependency.
+
+### `Locations` plugin has been removed
+
+The `Locations` plugin for the Ktor server has been removed. To create type-safe routing, use
+the [Resources plugin](server-resources.md) instead. This requires the following changes:
+
+* Replace the `io.ktor:ktor-server-locations` artifact with `io.ktor:ktor-server-resources`.
+
+* The `Resources` plugin depends on the Kotlin
+  serialization plugin. To add the serialization plugin, see the
+  [kotlinx.serialization setup](https://github.com/Kotlin/kotlinx.serialization#setup).
+
+* Update the plugin import from `io.ktor.server.locations.*` to `io.ktor.server.resources.*`.
+
+* Additionally, import the `Resource` module from `io.ktor.resources`.
+
+The following example shows how to implement these changes:
+
+<compare first-title="2.2.x" second-title="3.0.x">
+
+```kotlin
+import io.ktor.server.locations.*
+
+@Location("/articles")
+class article(val value: Int)
+
+fun Application.module() {
+    install(Locations)
+    routing {
+        get<article> {
+            // Get all articles ...
+            call.respondText("List of articles")
+        }
+    }
+}
+```
+
+```kotlin
+import io.ktor.resources.Resource
+import io.ktor.server.resources.*
+
+@Resource("/articles")
+class Articles(val value: Int)
+
+fun Application.module() {
+    install(Resources)
+    routing {
+        get<Articles> {
+            // Get all articles ...
+            call.respondText("List of articles")
+        }
+    }
+}
+```
+
+</compare>
+
+For more information on working with `Resources`, refer to [](server-resources.md).
+
+### Replacement of `java.time` in WebSockets configuration
+
+The [WebSockets](server-websockets.md) plugin configuration has been updated to use
+Kotlin’s [Duration](https://kotlinlang.org/api/latest/jvm/stdlib/kotlin.time/-duration/) for the `pingPeriod` and
+`timeout` properties. This replaces the previous use of `java.time.Duration` for a more
+idiomatic Kotlin experience.
+
+To migrate existing code to the new format, use the extension functions and properties from the `kotlin.time.Duration`
+class to construct durations. In the following example, `Duration.ofSeconds()` is replaced with Kotlin’s `seconds`
+extension:
+
+<compare first-title="2.x.x" second-title="3.0.x">
+
+<code-block lang="kotlin" show-white-spaces="true">
+<![CDATA[
+  import java.time.Duration
+  
+  install(WebSockets) {
+    pingPeriod = Duration.ofSeconds(15)
+    timeout = Duration.ofSeconds(15)
+    //..
+  }
+]]>
+</code-block>
+
+<code-block lang="kotlin" show-white-spaces="true">
+<![CDATA[
+import kotlin.time.Duration.Companion.seconds
+
+install(WebSockets) {
+  pingPeriod = 15.seconds
+  timeout = 15.seconds
+  //..
+}]]>
+</code-block>
+</compare>
+
+You can use similar Kotlin duration extensions (`minutes`, `hours`, etc.) as needed for other duration configurations.
+For more information, see the [Duration](https://kotlinlang.org/api/latest/jvm/stdlib/kotlin.time/-duration/)
+documentation.
+
+### Session encryption method update
+
+The encryption method offered by the `Sessions` plugin has been updated to enhance
+security.
+
+Specifically, the `SessionTransportTransformerEncrypt` method, which previously derived the MAC from the decrypted
+session value, now computes it from the encrypted value.
+
+To ensure compatibility with existing sessions, Ktor has introduced the `backwardCompatibleRead` property. For current
+configurations, include the property in the constructor
+of `SessionTransportTransformerEncrypt`:
+
+```kotlin
+install(Sessions) {
+  cookie<UserSession>("user_session") {
+    // ...
+    transform(
+      SessionTransportTransformerEncrypt(
+        secretEncryptKey, // your encrypt key here
+        secretSignKey, // your sign key here
+        backwardCompatibleRead = true
+      )
+    )
+  }
+}
+```
+
+For more information on session encryption in Ktor, see [](server-sessions.md#sign_encrypt_session).
\ No newline at end of file
diff --git a/topics/migration-from-express-js.topic b/topics/migration-from-express-js.topic
index f356ac944..b092ba70c 100644
--- a/topics/migration-from-express-js.topic
+++ b/topics/migration-from-express-js.topic
@@ -10,26 +10,19 @@
 
     <link-summary>This guide shows how to create, run, and test a simple Ktor application.</link-summary>
 
+    <tldr>
+        <p>
+            <b>Code examples</b>:
+            <a href="https://github.com/ktorio/ktor-documentation/tree/%ktor_version%/codeSnippets/snippets/migrating-express">migrating-express</a>
+            <a href="https://github.com/ktorio/ktor-documentation/tree/%ktor_version%/codeSnippets/snippets/migrating-express-ktor">migrating-express-ktor</a>
+        </p>
+    </tldr>
     <p>
         In this guide, we'll take a look at how to migrate an Express application to Ktor in basic scenarios:
-        from generating an application and writing your first application to creating middleware for extending application functionality.
+        from generating an application and writing your first application to creating middleware for extending
+        application functionality.
     </p>
 
-    <tip>
-        <p>
-            The sample projects used in this guide are available here:
-        </p>
-        <list>
-            <li>
-                <a href="https://github.com/ktorio/ktor-documentation/tree/%ktor_version%/codeSnippets/snippets/migrating-express">Express</a>
-            </li>
-            <li>
-                <a href="https://github.com/ktorio/ktor-documentation/tree/%ktor_version%/codeSnippets/snippets/migrating-express-ktor">Ktor</a>
-            </li>
-        </list>
-    </tip>
-
-
     <chapter title="Generate an app" id="generate">
         <table style="header-column">
             <tr>
@@ -75,7 +68,8 @@
                                 <a href="https://github.com/ktorio/ktor-cli">Native Command Line Tool</a> (beta)
                             </p>
                             <p>
-                                To create a new Ktor project, you need to pass a project name to the <code>ktor generate</code> command:
+                                To create a new Ktor project, you need to pass a project name to the <code>ktor
+                                generate</code> command:
                             </p>
                             <code-block lang="shell">
                                 ktor generate ktor-sample
@@ -94,7 +88,8 @@
 
     <chapter title="Hello world" id="hello">
         <p>
-            In this section, we'll look at how to create the simplest server application that accepts <code>GET</code> requests and responds with predefined plain text.
+            In this section, we'll look at how to create the simplest server application that accepts <code>GET</code>
+            requests and responds with predefined plain text.
         </p>
 
         <table style="header-column">
@@ -105,13 +100,14 @@
                 <td>
                     <p>
                         The example below shows the Express application that starts a server and listens on port
-                        <control>3000</control> for connections.
+                        <control>3000</control>
+                        for connections.
                     </p>
                     <code-block lang="javascript" src="snippets/migrating-express/1_hello/app.js"/>
                     <p>
-                        <emphasis>
-                            <a href="https://github.com/ktorio/ktor-documentation/tree/%ktor_version%/codeSnippets/snippets/migrating-express/1_hello/app.js">View sample on GitHub</a>
-                        </emphasis>
+                        For the full example, see the
+                        <a href="https://github.com/ktorio/ktor-documentation/tree/%ktor_version%/codeSnippets/snippets/migrating-express/1_hello/app.js">1_hello</a>
+                        project.
                     </p>
                 </td>
             </tr>
@@ -121,24 +117,34 @@
                 </td>
                 <td>
                     <p>
-                        In Ktor, you can use the <a href="server-create-and-configure.topic" anchor="embedded-server">embeddedServer</a> function to configure server parameters in code and quickly run an application.
+                        In Ktor, you can use the <a href="server-create-and-configure.topic" anchor="embedded-server">embeddedServer</a>
+                        function to configure server parameters in code and quickly run an application.
                     </p>
-                    <code-block lang="kotlin" src="snippets/migrating-express-ktor/1_hello/src/main/kotlin/com/example/Application.kt" include-lines="3-17"/>
+                    <code-block lang="kotlin"
+                                src="snippets/migrating-express-ktor/1_hello/src/main/kotlin/com/example/Application.kt"
+                                include-lines="3-17"/>
                     <p>
-                        <emphasis>
-                            <a href="https://github.com/ktorio/ktor-documentation/tree/%ktor_version%/codeSnippets/snippets/migrating-express-ktor/1_hello/src/main/kotlin/com/example/Application.kt">View sample on GitHub</a>
-                        </emphasis>
+                        For the full example, see the
+                        <a href="https://github.com/ktorio/ktor-documentation/tree/%ktor_version%/codeSnippets/snippets/migrating-express-ktor/1_hello/src/main/kotlin/com/example/Application.kt">1_hello</a>
+                        project.
                     </p>
                     <p>
-                        You can also specify server settings in an <a href="server-create-and-configure.topic" anchor="engine-main">external configuration file</a> that uses the HOCON or YAML format.
+                        You can also specify server settings in an <a href="server-create-and-configure.topic"
+                                                                      anchor="engine-main">external configuration
+                        file</a> that uses the HOCON or YAML format.
                     </p>
                 </td>
             </tr>
         </table>
 
         <p>
-            Note that the Express application above adds the <control>Date</control>,
-            <control>X-Powered-By</control>, and <control>ETag</control> response headers that might look as follows:
+            Note that the Express application above adds the
+            <control>Date</control>
+            ,
+            <control>X-Powered-By</control>
+            , and
+            <control>ETag</control>
+            response headers that might look as follows:
         </p>
         <code-block>
             Date: Fri, 05 Aug 2022 06:30:48 GMT
@@ -146,10 +152,15 @@
             ETag: W/"c-Lve95gjOVATpfV8EL5X4nxwjKHE"
         </code-block>
         <p>
-            To add the default <control>Server</control> and <control>Date</control> headers into each response in Ktor,
+            To add the default
+            <control>Server</control>
+            and
+            <control>Date</control>
+            headers into each response in Ktor,
             you need to install the <a href="server-default-headers.md">DefaultHeaders</a> plugin.
             The <a href="server-conditional-headers.md">ConditionalHeaders</a> plugin can be used to configure the
-            <control>Etag</control> response header.
+            <control>Etag</control>
+            response header.
         </p>
     </chapter>
 
@@ -158,7 +169,11 @@
         <p>
             In this section, we'll see how to serve static files such as images, CSS files,
             and JavaScript files in Express and Ktor.
-            Suppose we have the <path>public</path> folder with the main <path>index.html</path> page
+            Suppose we have the
+            <path>public</path>
+            folder with the main
+            <path>index.html</path>
+            page
             and a set of linked assets.
         </p>
         <code-block>
@@ -178,13 +193,15 @@
                 </td>
                 <td>
                     <p>
-                        In Express, pass the folder name to the <control>express.static</control> function.
+                        In Express, pass the folder name to the
+                        <control>express.static</control>
+                        function.
                     </p>
                     <code-block lang="javascript" src="snippets/migrating-express/2_static/app.js"/>
                     <p>
-                        <emphasis>
-                            <a href="https://github.com/ktorio/ktor-documentation/tree/%ktor_version%/codeSnippets/snippets/migrating-express/2_static/app.js">View sample on GitHub</a>
-                        </emphasis>
+                        For the full example, see the
+                        <a href="https://github.com/ktorio/ktor-documentation/tree/%ktor_version%/codeSnippets/snippets/migrating-express/2_static/app.js">2_static</a>
+                        project.
                     </p>
                 </td>
             </tr>
@@ -194,16 +211,23 @@
                 </td>
                 <td>
                     <p>
-                        In Ktor, use the <a href="server-static-content.md">static</a> function to map any
-                        request made to the <path>/</path> path to the <path>public</path> physical folder. 
-                        The <code>files(".")</code> function enables serving all files from the
-                        <path>public</path> folder recursively.
+                        In Ktor, use the <a href="server-static-content.md" anchor="folders"><code>staticFiles()</code></a>
+                        function to map any request made to the
+                        <path>/</path>
+                        path to the
+                        <path>public</path>
+                        physical folder.
+                        This function enables serving all files from the
+                        <path>public</path>
+                        folder recursively.
                     </p>
-                    <code-block lang="javascript" src="snippets/migrating-express-ktor/2_static/src/main/kotlin/com/example/Application.kt" include-lines="3-19"/>
+                    <code-block lang="kotlin"
+                                src="snippets/migrating-express-ktor/2_static/src/main/kotlin/com/example/Application.kt"
+                                include-lines="3-15"/>
                     <p>
-                        <emphasis>
-                            <a href="https://github.com/ktorio/ktor-documentation/tree/%ktor_version%/codeSnippets/snippets/migrating-express-ktor/2_static/src/main/kotlin/com/example/Application.kt">View sample on GitHub</a>
-                        </emphasis>
+                        For the full example, see the <a
+                            href="https://github.com/ktorio/ktor-documentation/tree/%ktor_version%/codeSnippets/snippets/migrating-express-ktor/2_static/src/main/kotlin/com/example/Application.kt">2_static</a>
+                        project.
                     </p>
                 </td>
             </tr>
@@ -223,17 +247,22 @@
         <list>
             <li>
                 <p>
-                    <control>Accept-Ranges</control>: <a href="server-partial-content.md">PartialContent</a>
+                    <control>Accept-Ranges</control>
+                    : <a href="server-partial-content.md">PartialContent</a>
                 </p>
             </li>
             <li>
                 <p>
-                    <control>Cache-Control</control>: <a href="server-caching-headers.md">CachingHeaders</a>
+                    <control>Cache-Control</control>
+                    : <a href="server-caching-headers.md">CachingHeaders</a>
                 </p>
             </li>
             <li>
                 <p>
-                    <control>ETag</control> and <control>Last-Modified</control>:
+                    <control>ETag</control>
+                    and
+                    <control>Last-Modified</control>
+                    :
                     <a href="server-conditional-headers.md">ConditionalHeaders</a>
                 </p>
             </li>
@@ -244,9 +273,12 @@
     <chapter title="Routing" id="routing">
         <p>
             <a href="server-routing.md">Routing</a> allows handling incoming requests made to a particular endpoint,
-            which is defined by a specific HTTP request method (<code>GET</code>, <code>POST</code>, and so on) and a path.
+            which is defined by a specific HTTP request method (<code>GET</code>, <code>POST</code>, and so on) and a
+            path.
             The examples below show how to handle <code>GET</code> and
-            <code>POST</code> requests made to the <path>/</path> path.
+            <code>POST</code> requests made to the
+            <path>/</path>
+            path.
         </p>
         <table style="header-column">
             <tr>
@@ -254,11 +286,12 @@
                     <control>Express</control>
                 </td>
                 <td>
-                    <code-block lang="javascript" src="snippets/migrating-express/3_router/app.js" include-lines="7-13"/>
+                    <code-block lang="javascript" src="snippets/migrating-express/3_router/app.js"
+                                include-lines="7-13"/>
                     <p>
-                        <emphasis>
-                            <a href="https://github.com/ktorio/ktor-documentation/tree/%ktor_version%/codeSnippets/snippets/migrating-express/3_router/app.js">View sample on GitHub</a>
-                        </emphasis>
+                        For the full example, see the
+                        <a href="https://github.com/ktorio/ktor-documentation/tree/%ktor_version%/codeSnippets/snippets/migrating-express/3_router/app.js">3_router</a>
+                        project.
                     </p>
                 </td>
             </tr>
@@ -267,17 +300,20 @@
                     <control>Ktor</control>
                 </td>
                 <td>
-                    <code-block lang="kotlin" src="snippets/migrating-express-ktor/3_router/src/main/kotlin/com/example/Application.kt" include-lines="12,14-19,36"/>
+                    <code-block lang="kotlin"
+                                src="snippets/migrating-express-ktor/3_router/src/main/kotlin/com/example/Application.kt"
+                                include-lines="12,14-19,36"/>
                     <tip>
                         <p>
-                            See <a anchor="receive-request"/> to learn how to receive request bodies for <code>POST</code>, <code>PUT</code>, or
+                            See <a anchor="receive-request"/> to learn how to receive request bodies for
+                            <code>POST</code>, <code>PUT</code>, or
                             <code>PATCH</code> requests.
                         </p>
                     </tip>
                     <p>
-                        <emphasis>
-                            <a href="https://github.com/ktorio/ktor-documentation/tree/%ktor_version%/codeSnippets/snippets/migrating-express-ktor/3_router/src/main/kotlin/com/example/Application.kt">View sample on GitHub</a>
-                        </emphasis>
+                        For the full example, see the
+                        <a href="https://github.com/ktorio/ktor-documentation/tree/%ktor_version%/codeSnippets/snippets/migrating-express-ktor/3_router/src/main/kotlin/com/example/Application.kt">3_router</a>
+                        project.
                     </p>
                 </td>
             </tr>
@@ -298,11 +334,12 @@
                         In Express, you can create chainable route handlers for a route path by using
                         <code>app.route()</code>.
                     </p>
-                    <code-block lang="javascript" src="snippets/migrating-express/3_router/app.js" include-lines="16-25"/>
+                    <code-block lang="javascript" src="snippets/migrating-express/3_router/app.js"
+                                include-lines="16-25"/>
                     <p>
-                        <emphasis>
-                            <a href="https://github.com/ktorio/ktor-documentation/tree/%ktor_version%/codeSnippets/snippets/migrating-express/3_router/app.js">View sample on GitHub</a>
-                        </emphasis>
+                        For the full example, see the
+                        <a href="https://github.com/ktorio/ktor-documentation/tree/%ktor_version%/codeSnippets/snippets/migrating-express/3_router/app.js">3_router</a>
+                        project.
                     </p>
                 </td>
             </tr>
@@ -315,11 +352,13 @@
                         Ktor provides a <code>route</code> function,
                         whereby you define the path and then place the verbs for that path as nested functions.
                     </p>
-                    <code-block lang="kotlin" src="snippets/migrating-express-ktor/3_router/src/main/kotlin/com/example/Application.kt" include-lines="12,22-32,36"/>
+                    <code-block lang="kotlin"
+                                src="snippets/migrating-express-ktor/3_router/src/main/kotlin/com/example/Application.kt"
+                                include-lines="12,22-32,36"/>
                     <p>
-                        <emphasis>
-                            <a href="https://github.com/ktorio/ktor-documentation/tree/%ktor_version%/codeSnippets/snippets/migrating-express-ktor/3_router/src/main/kotlin/com/example/Application.kt">View sample on GitHub</a>
-                        </emphasis>
+                        For the full example, see the
+                        <a href="https://github.com/ktorio/ktor-documentation/tree/%ktor_version%/codeSnippets/snippets/migrating-express-ktor/3_router/src/main/kotlin/com/example/Application.kt">3_router</a>
+                        project.
                     </p>
                 </td>
             </tr>
@@ -336,21 +375,26 @@
                 <td>
                     <p>
                         Express provides the <code>express.Router</code> class to create mountable route handlers.
-                        Suppose we have the <path>birds.js</path> router file in the application's directory.
-                        This router module can be loaded in the application as shown in <path>app.js</path>:
+                        Suppose we have the
+                        <path>birds.js</path>
+                        router file in the application's directory.
+                        This router module can be loaded in the application as shown in
+                        <path>app.js</path>
+                        :
                     </p>
                     <tabs>
                         <tab title="birds.js">
                             <code-block lang="javascript" src="snippets/migrating-express/3_router/birds.js"/>
                         </tab>
                         <tab title="app.js">
-                            <code-block lang="javascript" src="snippets/migrating-express/3_router/app.js" include-lines="1-5,28-32"/>
+                            <code-block lang="javascript" src="snippets/migrating-express/3_router/app.js"
+                                        include-lines="1-5,28-32"/>
                         </tab>
                     </tabs>
                     <p>
-                        <emphasis>
-                            <a href="https://github.com/ktorio/ktor-documentation/tree/%ktor_version%/codeSnippets/snippets/migrating-express/3_router/app.js">View sample on GitHub</a>
-                        </emphasis>
+                        For the full example, see the
+                        <a href="https://github.com/ktorio/ktor-documentation/tree/%ktor_version%/codeSnippets/snippets/migrating-express/3_router/app.js">3_router</a>
+                        project.
                     </p>
                 </td>
             </tr>
@@ -360,24 +404,32 @@
                 </td>
                 <td>
                     <p>
-                        In Ktor, a common pattern is to use extension functions on the <code>Route</code> type
+                        In Ktor, a common pattern is to use extension functions on the <code>Routing</code> type
                         to define the actual routes.
-                        The sample below (<path>Birds.kt</path>) defines the <code>birdsRoutes</code> extension function.
-                        You can include corresponding routes in the application (<path>Application.kt</path>)
+                        The sample below (
+                        <path>Birds.kt</path>
+                        ) defines the <code>birdsRoutes</code> extension function.
+                        You can include corresponding routes in the application (
+                        <path>Application.kt</path>
+                        )
                         by calling this function inside the <code>routing</code> block:
                     </p>
                     <tabs>
-                        <tab title="Birds.kt">
-                            <code-block lang="kotlin" src="snippets/migrating-express-ktor/3_router/src/main/kotlin/com/example/routes/Birds.kt" include-lines="3-16"/>
+                        <tab title="Birds.kt" id="birds-kt">
+                            <code-block lang="kotlin"
+                                        src="snippets/migrating-express-ktor/3_router/src/main/kotlin/com/example/routes/Birds.kt"
+                                        include-lines="3-15"/>
                         </tab>
-                        <tab title="Application.kt">
-                            <code-block lang="kotlin" src="snippets/migrating-express-ktor/3_router/src/main/kotlin/com/example/Application.kt" include-lines="3-12,35-37"/>
+                        <tab title="Application.kt" id="application-kt">
+                            <code-block lang="kotlin"
+                                        src="snippets/migrating-express-ktor/3_router/src/main/kotlin/com/example/Application.kt"
+                                        include-lines="3-12,35-37"/>
                         </tab>
                     </tabs>
                     <p>
-                        <emphasis>
-                            <a href="https://github.com/ktorio/ktor-documentation/tree/%ktor_version%/codeSnippets/snippets/migrating-express-ktor/3_router/src/main/kotlin/com/example/Application.kt">View sample on GitHub</a>
-                        </emphasis>
+                        For the full example, see the
+                        <a href="https://github.com/ktorio/ktor-documentation/tree/%ktor_version%/codeSnippets/snippets/migrating-express-ktor/3_router/src/main/kotlin/com/example/Application.kt">3_router</a>
+                        project.
                     </p>
                 </td>
             </tr>
@@ -394,7 +446,8 @@
             This section will show us how to access route and query parameters.
         </p>
         <p>
-            A route (or path) parameter is a named URL segment used to capture the value specified at its position in the URL.
+            A route (or path) parameter is a named URL segment used to capture the value specified at its position in
+            the URL.
         </p>
         <table style="header-column">
             <tr>
@@ -405,13 +458,18 @@
                     <p>
                         To access route parameters in Express, you can use <code>Request.params</code>.
                         For example, <code>req.parameters["login"]</code> in the code snippet below will
-                        return <emphasis>admin</emphasis> for the <path>/user/admin</path> path:
+                        return
+                        <emphasis>admin</emphasis>
+                        for the
+                        <path>/user/admin</path>
+                        path:
                     </p>
-                    <code-block lang="javascript" src="snippets/migrating-express/4_parameters/app.js" include-lines="6-12"/>
+                    <code-block lang="javascript" src="snippets/migrating-express/4_parameters/app.js"
+                                include-lines="6-12"/>
                     <p>
-                        <emphasis>
-                            <a href="https://github.com/ktorio/ktor-documentation/tree/%ktor_version%/codeSnippets/snippets/migrating-express/4_parameters/app.js">View sample on GitHub</a>
-                        </emphasis>
+                        For the full example, see the
+                        <a href="https://github.com/ktorio/ktor-documentation/tree/%ktor_version%/codeSnippets/snippets/migrating-express/4_parameters/app.js">4_parameters</a>
+                        project.
                     </p>
                 </td>
             </tr>
@@ -424,11 +482,13 @@
                         In Ktor, route parameters are defined using the <code>{param}</code> syntax.
                         You can use <code>call.parameters</code> to access route parameters in route handlers:
                     </p>
-                    <code-block lang="kotlin" src="snippets/migrating-express-ktor/4_parameters/src/main/kotlin/com/example/Application.kt" include-lines="11-18,24"/>
+                    <code-block lang="kotlin"
+                                src="snippets/migrating-express-ktor/4_parameters/src/main/kotlin/com/example/Application.kt"
+                                include-lines="11-18,24"/>
                     <p>
-                        <emphasis>
-                            <a href="https://github.com/ktorio/ktor-documentation/tree/%ktor_version%/codeSnippets/snippets/migrating-express-ktor/4_parameters/src/main/kotlin/com/example/Application.kt">View sample on GitHub</a>
-                        </emphasis>
+                        For the full example, see the
+                        <a href="https://github.com/ktorio/ktor-documentation/tree/%ktor_version%/codeSnippets/snippets/migrating-express-ktor/4_parameters/src/main/kotlin/com/example/Application.kt">4_parameters</a>
+                        project.
                     </p>
                 </td>
             </tr>
@@ -447,13 +507,18 @@
                     <p>
                         To access route parameters in Express, you can use <code>Request.params</code>.
                         For example, <code>req.parameters["login"]</code> in the code snippet below will
-                        return <emphasis>admin</emphasis> for the <path>/user/admin</path> path:
+                        return
+                        <emphasis>admin</emphasis>
+                        for the
+                        <path>/user/admin</path>
+                        path:
                     </p>
-                    <code-block lang="javascript" src="snippets/migrating-express/4_parameters/app.js" include-lines="14-18"/>
+                    <code-block lang="javascript" src="snippets/migrating-express/4_parameters/app.js"
+                                include-lines="14-18"/>
                     <p>
-                        <emphasis>
-                            <a href="https://github.com/ktorio/ktor-documentation/tree/%ktor_version%/codeSnippets/snippets/migrating-express/4_parameters/app.js">View sample on GitHub</a>
-                        </emphasis>
+                        For the full example, see the
+                        <a href="https://github.com/ktorio/ktor-documentation/tree/%ktor_version%/codeSnippets/snippets/migrating-express/4_parameters/app.js">4_parameters</a>
+                        project.
                     </p>
                 </td>
             </tr>
@@ -466,11 +531,13 @@
                         In Ktor, route parameters are defined using the <code>{param}</code> syntax.
                         You can use <code>call.parameters</code> to access route parameters in route handlers:
                     </p>
-                    <code-block lang="kotlin" src="snippets/migrating-express-ktor/4_parameters/src/main/kotlin/com/example/Application.kt" include-lines="11,19-24"/>
+                    <code-block lang="kotlin"
+                                src="snippets/migrating-express-ktor/4_parameters/src/main/kotlin/com/example/Application.kt"
+                                include-lines="11,19-24"/>
                     <p>
-                        <emphasis>
-                            <a href="https://github.com/ktorio/ktor-documentation/tree/%ktor_version%/codeSnippets/snippets/migrating-express-ktor/4_parameters/src/main/kotlin/com/example/Application.kt">View sample on GitHub</a>
-                        </emphasis>
+                        For the full example, see the
+                        <a href="https://github.com/ktorio/ktor-documentation/tree/%ktor_version%/codeSnippets/snippets/migrating-express-ktor/4_parameters/src/main/kotlin/com/example/Application.kt">4_parameters</a>
+                        project.
                     </p>
                 </td>
             </tr>
@@ -478,7 +545,6 @@
     </chapter>
 
 
-
     <chapter title="Sending responses" id="send-response">
         <p>
             In the previous sections, we've already seen how to respond with plain text content.
@@ -496,11 +562,12 @@
                             To send a JSON response with the appropriate content type in Express,
                             call the <code>res.json</code> function:
                         </p>
-                        <code-block lang="javascript" src="snippets/migrating-express/5_send_response/app.js" include-lines="6-9"/>
+                        <code-block lang="javascript" src="snippets/migrating-express/5_send_response/app.js"
+                                    include-lines="6-9"/>
                         <p>
-                            <emphasis>
-                                <a href="https://github.com/ktorio/ktor-documentation/tree/%ktor_version%/codeSnippets/snippets/migrating-express/5_send_response/app.js">View sample on GitHub</a>
-                            </emphasis>
+                            For the full example, see the
+                            <a href="https://github.com/ktorio/ktor-documentation/tree/%ktor_version%/codeSnippets/snippets/migrating-express/5_send_response/app.js">5_send_response</a>
+                            project.
                         </p>
                     </td>
                 </tr>
@@ -510,22 +577,30 @@
                     </td>
                     <td>
                         <p>
-                            In Ktor, you need to install the <a href="server-serialization.md">ContentNegotiation</a> plugin and
+                            In Ktor, you need to install the <a href="server-serialization.md">ContentNegotiation</a>
+                            plugin and
                             configure the JSON serializer:
                         </p>
-                        <code-block lang="kotlin" src="snippets/migrating-express-ktor/5_send_response/src/main/kotlin/com/example/Application.kt" include-lines="19-21"/>
+                        <code-block lang="kotlin"
+                                    src="snippets/migrating-express-ktor/5_send_response/src/main/kotlin/com/example/Application.kt"
+                                    include-lines="19-21"/>
                         <p>
-                            To serialize data into JSON, you need to create a data class with the <code>@Serializable</code> annotation:
+                            To serialize data into JSON, you need to create a data class with the
+                            <code>@Serializable</code> annotation:
                         </p>
-                        <code-block lang="kotlin" src="snippets/migrating-express-ktor/5_send_response/src/main/kotlin/com/example/Application.kt" include-lines="15-16"/>
+                        <code-block lang="kotlin"
+                                    src="snippets/migrating-express-ktor/5_send_response/src/main/kotlin/com/example/Application.kt"
+                                    include-lines="15-16"/>
                         <p>
                             Then, you can use <code>call.respond</code> to send an object of this class in a response:
                         </p>
-                        <code-block lang="kotlin" src="snippets/migrating-express-ktor/5_send_response/src/main/kotlin/com/example/Application.kt" include-lines="23-25"/>
+                        <code-block lang="kotlin"
+                                    src="snippets/migrating-express-ktor/5_send_response/src/main/kotlin/com/example/Application.kt"
+                                    include-lines="23-25"/>
                         <p>
-                            <emphasis>
-                                <a href="https://github.com/ktorio/ktor-documentation/tree/%ktor_version%/codeSnippets/snippets/migrating-express-ktor/5_send_response/src/main/kotlin/com/example/Application.kt">View sample on GitHub</a>
-                            </emphasis>
+                            For the full example, see the
+                            <a href="https://github.com/ktorio/ktor-documentation/tree/%ktor_version%/codeSnippets/snippets/migrating-express-ktor/5_send_response/src/main/kotlin/com/example/Application.kt">5_send_response</a>
+                            project.
                         </p>
                     </td>
                 </tr>
@@ -542,11 +617,12 @@
                         <p>
                             To respond with a file in Express, use <code>res.sendFile</code>:
                         </p>
-                        <code-block lang="javascript" src="snippets/migrating-express/5_send_response/app.js" include-lines="2,10-13"/>
+                        <code-block lang="javascript" src="snippets/migrating-express/5_send_response/app.js"
+                                    include-lines="2,10-13"/>
                         <p>
-                            <emphasis>
-                                <a href="https://github.com/ktorio/ktor-documentation/tree/%ktor_version%/codeSnippets/snippets/migrating-express/5_send_response/app.js">View sample on GitHub</a>
-                            </emphasis>
+                            For the full example, see the
+                            <a href="https://github.com/ktorio/ktor-documentation/tree/%ktor_version%/codeSnippets/snippets/migrating-express/5_send_response/app.js">5_send_response</a>
+                            project.
                         </p>
                     </td>
                 </tr>
@@ -558,21 +634,27 @@
                         <p>
                             Ktor provides the <code>call.respondFile</code> function for sending files to the client:
                         </p>
-                        <code-block lang="kotlin" src="snippets/migrating-express-ktor/5_send_response/src/main/kotlin/com/example/Application.kt" include-lines="26-29"/>
+                        <code-block lang="kotlin"
+                                    src="snippets/migrating-express-ktor/5_send_response/src/main/kotlin/com/example/Application.kt"
+                                    include-lines="26-29"/>
                         <p>
-                            <emphasis>
-                                <a href="https://github.com/ktorio/ktor-documentation/tree/%ktor_version%/codeSnippets/snippets/migrating-express-ktor/5_send_response/src/main/kotlin/com/example/Application.kt">View sample on GitHub</a>
-                            </emphasis>
+                            For the full example, see the
+                            <a href="https://github.com/ktorio/ktor-documentation/tree/%ktor_version%/codeSnippets/snippets/migrating-express-ktor/5_send_response/src/main/kotlin/com/example/Application.kt">5_send_response</a>
+                            project.
                         </p>
                     </td>
                 </tr>
             </table>
 
             <p>
-                The Express application adds the <control>Accept-Ranges</control> HTTP response header
+                The Express application adds the
+                <control>Accept-Ranges</control>
+                HTTP response header
                 when responding with a file.
-                The server uses this header for advertising its support for partial requests from the client for file downloads.
-                In Ktor, you need to install the <a href="server-partial-content.md">PartialContent</a> plugin to support partial requests.
+                The server uses this header for advertising its support for partial requests from the client for file
+                downloads.
+                In Ktor, you need to install the <a href="server-partial-content.md">PartialContent</a> plugin to
+                support partial requests.
             </p>
         </chapter>
 
@@ -586,11 +668,12 @@
                         <p>
                             The <code>res.download</code> function transfers the specified file as an attachment:
                         </p>
-                        <code-block lang="javascript" src="snippets/migrating-express/5_send_response/app.js" include-lines="15-17"/>
+                        <code-block lang="javascript" src="snippets/migrating-express/5_send_response/app.js"
+                                    include-lines="15-17"/>
                         <p>
-                            <emphasis>
-                                <a href="https://github.com/ktorio/ktor-documentation/tree/%ktor_version%/codeSnippets/snippets/migrating-express/5_send_response/app.js">View sample on GitHub</a>
-                            </emphasis>
+                            For the full example, see the
+                            <a href="https://github.com/ktorio/ktor-documentation/tree/%ktor_version%/codeSnippets/snippets/migrating-express/5_send_response/app.js">5_send_response</a>
+                            project.
                         </p>
                     </td>
                 </tr>
@@ -601,13 +684,16 @@
                     <td>
                         <p>
                             In Ktor, you need to configure the
-                            <control>Content-Disposition</control> header manually to transfer the file as the attachment:
+                            <control>Content-Disposition</control>
+                            header manually to transfer the file as the attachment:
                         </p>
-                        <code-block lang="kotlin" src="snippets/migrating-express-ktor/5_send_response/src/main/kotlin/com/example/Application.kt" include-lines="30-38"/>
+                        <code-block lang="kotlin"
+                                    src="snippets/migrating-express-ktor/5_send_response/src/main/kotlin/com/example/Application.kt"
+                                    include-lines="30-38"/>
                         <p>
-                            <emphasis>
-                                <a href="https://github.com/ktorio/ktor-documentation/tree/%ktor_version%/codeSnippets/snippets/migrating-express-ktor/5_send_response/src/main/kotlin/com/example/Application.kt">View sample on GitHub</a>
-                            </emphasis>
+                            For the full example, see the
+                            <a href="https://github.com/ktorio/ktor-documentation/tree/%ktor_version%/codeSnippets/snippets/migrating-express-ktor/5_send_response/src/main/kotlin/com/example/Application.kt">5_send_response</a>
+                            project.
                         </p>
                     </td>
                 </tr>
@@ -624,11 +710,12 @@
                         <p>
                             To generate a redirection response in Express, call the <code>redirect</code> function:
                         </p>
-                        <code-block lang="javascript" src="snippets/migrating-express/5_send_response/app.js" include-lines="19-25"/>
+                        <code-block lang="javascript" src="snippets/migrating-express/5_send_response/app.js"
+                                    include-lines="19-25"/>
                         <p>
-                            <emphasis>
-                                <a href="https://github.com/ktorio/ktor-documentation/tree/%ktor_version%/codeSnippets/snippets/migrating-express/5_send_response/app.js">View sample on GitHub</a>
-                            </emphasis>
+                            For the full example, see the
+                            <a href="https://github.com/ktorio/ktor-documentation/tree/%ktor_version%/codeSnippets/snippets/migrating-express/5_send_response/app.js">5_send_response</a>
+                            project.
                         </p>
                     </td>
                 </tr>
@@ -640,11 +727,13 @@
                         <p>
                             In Ktor, use <code>respondRedirect</code> to send a redirection response:
                         </p>
-                        <code-block lang="kotlin" src="snippets/migrating-express-ktor/5_send_response/src/main/kotlin/com/example/Application.kt" include-lines="39-44"/>
+                        <code-block lang="kotlin"
+                                    src="snippets/migrating-express-ktor/5_send_response/src/main/kotlin/com/example/Application.kt"
+                                    include-lines="39-44"/>
                         <p>
-                            <emphasis>
-                                <a href="https://github.com/ktorio/ktor-documentation/tree/%ktor_version%/codeSnippets/snippets/migrating-express-ktor/5_send_response/src/main/kotlin/com/example/Application.kt">View sample on GitHub</a>
-                            </emphasis>
+                            For the full example, see the
+                            <a href="https://github.com/ktorio/ktor-documentation/tree/%ktor_version%/codeSnippets/snippets/migrating-express-ktor/5_send_response/src/main/kotlin/com/example/Application.kt">5_send_response</a>
+                            project.
                         </p>
                     </td>
                 </tr>
@@ -664,17 +753,20 @@
                 </td>
                 <td>
                     <p>
-                        Suppose we have the following Pug template in the <path>views</path> folder:
+                        Suppose we have the following Pug template in the
+                        <path>views</path>
+                        folder:
                     </p>
                     <code-block src="snippets/migrating-express/6_templates/views/index.pug"/>
                     <p>
                         To respond with this template, call <code>res.render</code>:
                     </p>
-                    <code-block lang="javascript" src="snippets/migrating-express/6_templates/app.js" include-lines="5-10"/>
+                    <code-block lang="javascript" src="snippets/migrating-express/6_templates/app.js"
+                                include-lines="5-10"/>
                     <p>
-                        <emphasis>
-                            <a href="https://github.com/ktorio/ktor-documentation/tree/%ktor_version%/codeSnippets/snippets/migrating-express/6_templates/app.js">View sample on GitHub</a>
-                        </emphasis>
+                        For the full example, see the
+                        <a href="https://github.com/ktorio/ktor-documentation/tree/%ktor_version%/codeSnippets/snippets/migrating-express/6_templates/app.js">6_templates</a>
+                        project.
                     </p>
                 </td>
             </tr>
@@ -690,11 +782,13 @@
                         install and configure the <code>FreeMarker</code> plugin and
                         then send a template using <code>call.respond</code>:
                     </p>
-                    <code-block lang="kotlin" src="snippets/migrating-express-ktor/6_templates/src/main/kotlin/com/example/Application.kt" include-lines="11-23"/>
+                    <code-block lang="kotlin"
+                                src="snippets/migrating-express-ktor/6_templates/src/main/kotlin/com/example/Application.kt"
+                                include-lines="11-23"/>
                     <p>
-                        <emphasis>
-                            <a href="https://github.com/ktorio/ktor-documentation/tree/%ktor_version%/codeSnippets/snippets/migrating-express-ktor/6_templates/src/main/kotlin/com/example/Application.kt">View sample on GitHub</a>
-                        </emphasis>
+                        For the full example, see the
+                        <a href="https://github.com/ktorio/ktor-documentation/tree/%ktor_version%/codeSnippets/snippets/migrating-express-ktor/6_templates/src/main/kotlin/com/example/Application.kt">6_templates</a>
+                        project.
                     </p>
                 </td>
             </tr>
@@ -702,7 +796,6 @@
     </chapter>
 
 
-
     <chapter title="Receiving requests" id="receive-request">
         <p>
             This section will show how to receive request bodies in different formats.
@@ -724,17 +817,19 @@
                         <p>
                             To parse an incoming request body in Express, you need to add <code>body-parser</code>:
                         </p>
-                        <code-block lang="javascript" src="snippets/migrating-express/7_receive_request/app.js" include-lines="2"/>
+                        <code-block lang="javascript" src="snippets/migrating-express/7_receive_request/app.js"
+                                    include-lines="2"/>
                         <p>
                             In the <code>post</code> handler,
                             you need to pass the text parser (<code>bodyParser.text</code>).
                             A request body will be available under the <code>req.body</code> property:
                         </p>
-                        <code-block lang="javascript" src="snippets/migrating-express/7_receive_request/app.js" include-lines="8-11"/>
+                        <code-block lang="javascript" src="snippets/migrating-express/7_receive_request/app.js"
+                                    include-lines="8-11"/>
                         <p>
-                            <emphasis>
-                                <a href="https://github.com/ktorio/ktor-documentation/tree/%ktor_version%/codeSnippets/snippets/migrating-express/7_receive_request/app.js">View sample on GitHub</a>
-                            </emphasis>
+                            For the full example, see the
+                            <a href="https://github.com/ktorio/ktor-documentation/tree/%ktor_version%/codeSnippets/snippets/migrating-express/7_receive_request/app.js">7_receive_request</a>
+                            project.
                         </p>
                     </td>
                 </tr>
@@ -746,11 +841,13 @@
                         <p>
                             In Ktor, you can receive a body as a text using <code>call.receiveText</code>:
                         </p>
-                        <code-block lang="kotlin" src="snippets/migrating-express-ktor/7_receive_request/src/main/kotlin/com/example/Application.kt" include-lines="30-33"/>
+                        <code-block lang="kotlin"
+                                    src="snippets/migrating-express-ktor/7_receive_request/src/main/kotlin/com/example/Application.kt"
+                                    include-lines="30-33"/>
                         <p>
-                            <emphasis>
-                                <a href="https://github.com/ktorio/ktor-documentation/tree/%ktor_version%/codeSnippets/snippets/migrating-express-ktor/7_receive_request/src/main/kotlin/com/example/Application.kt">View sample on GitHub</a>
-                            </emphasis>
+                            For the full example, see the
+                            <a href="https://github.com/ktorio/ktor-documentation/tree/%ktor_version%/codeSnippets/snippets/migrating-express-ktor/7_receive_request/src/main/kotlin/com/example/Application.kt">7_receive_request</a>
+                            project.
                         </p>
                     </td>
                 </tr>
@@ -774,11 +871,12 @@
                         <p>
                             To receive JSON in Express, use <code>bodyParser.json</code>:
                         </p>
-                        <code-block lang="javascript" src="snippets/migrating-express/7_receive_request/app.js" include-lines="2,12-16"/>
+                        <code-block lang="javascript" src="snippets/migrating-express/7_receive_request/app.js"
+                                    include-lines="2,12-16"/>
                         <p>
-                            <emphasis>
-                                <a href="https://github.com/ktorio/ktor-documentation/tree/%ktor_version%/codeSnippets/snippets/migrating-express/7_receive_request/app.js">View sample on GitHub</a>
-                            </emphasis>
+                            For the full example, see the
+                            <a href="https://github.com/ktorio/ktor-documentation/tree/%ktor_version%/codeSnippets/snippets/migrating-express/7_receive_request/app.js">7_receive_request</a>
+                            project.
                         </p>
                     </td>
                 </tr>
@@ -788,22 +886,29 @@
                     </td>
                     <td>
                         <p>
-                            In Ktor, you need to install the <a href="server-serialization.md">ContentNegotiation</a> plugin
+                            In Ktor, you need to install the <a href="server-serialization.md">ContentNegotiation</a>
+                            plugin
                             and configure the <code>Json</code> serializer:
                         </p>
-                        <code-block lang="kotlin" src="snippets/migrating-express-ktor/7_receive_request/src/main/kotlin/com/example/Application.kt" include-lines="23-28"/>
+                        <code-block lang="kotlin"
+                                    src="snippets/migrating-express-ktor/7_receive_request/src/main/kotlin/com/example/Application.kt"
+                                    include-lines="23-28"/>
                         <p>
                             To deserialize received data into an object, you need to create a data class:
                         </p>
-                        <code-block lang="kotlin" src="snippets/migrating-express-ktor/7_receive_request/src/main/kotlin/com/example/Application.kt" include-lines="19-20"/>
+                        <code-block lang="kotlin"
+                                    src="snippets/migrating-express-ktor/7_receive_request/src/main/kotlin/com/example/Application.kt"
+                                    include-lines="19-20"/>
                         <p>
                             Then, use the <code>receive</code> method that accepts this data class as a parameter:
                         </p>
-                        <code-block lang="kotlin" src="snippets/migrating-express-ktor/7_receive_request/src/main/kotlin/com/example/Application.kt" include-lines="34-37"/>
+                        <code-block lang="kotlin"
+                                    src="snippets/migrating-express-ktor/7_receive_request/src/main/kotlin/com/example/Application.kt"
+                                    include-lines="34-37"/>
                         <p>
-                            <emphasis>
-                                <a href="https://github.com/ktorio/ktor-documentation/tree/%ktor_version%/codeSnippets/snippets/migrating-express-ktor/7_receive_request/src/main/kotlin/com/example/Application.kt">View sample on GitHub</a>
-                            </emphasis>
+                            For the full example, see the
+                            <a href="https://github.com/ktorio/ktor-documentation/tree/%ktor_version%/codeSnippets/snippets/migrating-express-ktor/7_receive_request/src/main/kotlin/com/example/Application.kt">7_receive_request</a>
+                            project.
                         </p>
                     </td>
                 </tr>
@@ -814,7 +919,8 @@
         <chapter title="URL-encoded" id="receive-url-encoded">
             <p>
                 Now let's see how to receive form data sent using the
-                <control>application/x-www-form-urlencoded</control> type.
+                <control>application/x-www-form-urlencoded</control>
+                type.
                 The code snippet below shows a sample <code>POST</code> request with form data:
             </p>
             <code-block lang="http" src="snippets/migrating-express/7_receive_request/post.http" include-lines="19-22"/>
@@ -828,11 +934,12 @@
                             As for plain text and JSON, Express requires <code>body-parser</code>.
                             You need to set the parser type to <code>bodyParser.urlencoded</code>:
                         </p>
-                        <code-block lang="javascript" src="snippets/migrating-express/7_receive_request/app.js" include-lines="2,17-21"/>
+                        <code-block lang="javascript" src="snippets/migrating-express/7_receive_request/app.js"
+                                    include-lines="2,17-21"/>
                         <p>
-                            <emphasis>
-                                <a href="https://github.com/ktorio/ktor-documentation/tree/%ktor_version%/codeSnippets/snippets/migrating-express/7_receive_request/app.js">View sample on GitHub</a>
-                            </emphasis>
+                            For the full example, see the
+                            <a href="https://github.com/ktorio/ktor-documentation/tree/%ktor_version%/codeSnippets/snippets/migrating-express/7_receive_request/app.js">7_receive_request</a>
+                            project.
                         </p>
                     </td>
                 </tr>
@@ -844,11 +951,13 @@
                         <p>
                             In Ktor, use the <code>call.receiveParameters</code> function:
                         </p>
-                        <code-block lang="kotlin" src="snippets/migrating-express-ktor/7_receive_request/src/main/kotlin/com/example/Application.kt" include-lines="38-42"/>
+                        <code-block lang="kotlin"
+                                    src="snippets/migrating-express-ktor/7_receive_request/src/main/kotlin/com/example/Application.kt"
+                                    include-lines="38-42"/>
                         <p>
-                            <emphasis>
-                                <a href="https://github.com/ktorio/ktor-documentation/tree/%ktor_version%/codeSnippets/snippets/migrating-express-ktor/7_receive_request/src/main/kotlin/com/example/Application.kt">View sample on GitHub</a>
-                            </emphasis>
+                            For the full example, see the
+                            <a href="https://github.com/ktorio/ktor-documentation/tree/%ktor_version%/codeSnippets/snippets/migrating-express-ktor/7_receive_request/src/main/kotlin/com/example/Application.kt">7_receive_request</a>
+                            project.
                         </p>
                     </td>
                 </tr>
@@ -860,7 +969,8 @@
             <p>
                 The next use case is handling binary data.
                 The request below sends a PNG image with the
-                <control>application/octet-stream</control> to the server:
+                <control>application/octet-stream</control>
+                to the server:
             </p>
             <code-block lang="http" src="snippets/migrating-express/7_receive_request/post.http" include-lines="26-29"/>
             <table style="header-column">
@@ -872,11 +982,12 @@
                         <p>
                             To handle binary data in Express, set the parser type to <code>raw</code>:
                         </p>
-                        <code-block lang="javascript" src="snippets/migrating-express/7_receive_request/app.js" include-lines="2-3,22-27"/>
+                        <code-block lang="javascript" src="snippets/migrating-express/7_receive_request/app.js"
+                                    include-lines="2-3,22-27"/>
                         <p>
-                            <emphasis>
-                                <a href="https://github.com/ktorio/ktor-documentation/tree/%ktor_version%/codeSnippets/snippets/migrating-express/7_receive_request/app.js">View sample on GitHub</a>
-                            </emphasis>
+                            For the full example, see the
+                            <a href="https://github.com/ktorio/ktor-documentation/tree/%ktor_version%/codeSnippets/snippets/migrating-express/7_receive_request/app.js">7_receive_request</a>
+                            project.
                         </p>
                     </td>
                 </tr>
@@ -889,11 +1000,14 @@
                             Ktor provides <code>ByteReadChannel</code> and <code>ByteWriteChannel</code>
                             for asynchronous reading/writing sequences of bytes:
                         </p>
-                        <code-block lang="kotlin" src="snippets/migrating-express-ktor/7_receive_request/src/main/kotlin/com/example/Application.kt" include-lines="43-47"/>
+                        <code-block lang="kotlin"
+                                    src="snippets/migrating-express-ktor/7_receive_request/src/main/kotlin/com/example/Application.kt"
+                                    include-lines="43-47"/>
                         <p>
-                            <emphasis>
-                                <a href="https://github.com/ktorio/ktor-documentation/tree/%ktor_version%/codeSnippets/snippets/migrating-express-ktor/7_receive_request/src/main/kotlin/com/example/Application.kt">View sample on GitHub</a>
-                            </emphasis>
+                            For the full example, see the
+                            <a href="https://github.com/ktorio/ktor-documentation/tree/%ktor_version%/codeSnippets/snippets/migrating-express-ktor/7_receive_request/src/main/kotlin/com/example/Application.kt">7_receive
+                                request</a>
+                            project.
                         </p>
                     </td>
                 </tr>
@@ -903,9 +1017,12 @@
 
         <chapter title="Multipart" id="receive-multipart">
             <p>
-                In the final section, let's look at how to handle <emphasis>multipart</emphasis> bodies.
+                In the final section, let's look at how to handle
+                <emphasis>multipart</emphasis>
+                bodies.
                 The <code>POST</code> request below sends a PNG image with a description using the
-                <control>multipart/form-data</control> type:
+                <control>multipart/form-data</control>
+                type:
             </p>
             <code-block lang="http" src="snippets/migrating-express/7_receive_request/post.http" include-lines="33-46"/>
             <table style="header-column">
@@ -916,13 +1033,16 @@
                     <td>
                         <p>
                             Express requires a separate module to parse multipart data.
-                            In the example below, <control>multer</control> is used to upload a file to the server:
+                            In the example below,
+                            <control>multer</control>
+                            is used to upload a file to the server:
                         </p>
-                        <code-block lang="javascript" src="snippets/migrating-express/7_receive_request/app.js" include-lines="4,28-40"/>
+                        <code-block lang="javascript" src="snippets/migrating-express/7_receive_request/app.js"
+                                    include-lines="4,28-40"/>
                         <p>
-                            <emphasis>
-                                <a href="https://github.com/ktorio/ktor-documentation/tree/%ktor_version%/codeSnippets/snippets/migrating-express/7_receive_request/app.js">View sample on GitHub</a>
-                            </emphasis>
+                            For the full example, see the
+                            <a href="https://github.com/ktorio/ktor-documentation/tree/%ktor_version%/codeSnippets/snippets/migrating-express/7_receive_request/app.js">7_receive_request</a>
+                            project.
                         </p>
                     </td>
                 </tr>
@@ -934,13 +1054,16 @@
                         <p>
                             In Ktor, if you need to receive a file sent as a part of a multipart request,
                             call the <code>receiveMultipart</code> function and then loop over each part as required.
-                            In the example below, <code>PartData.FileItem</code> is used to receive a file as a byte stream:
+                            In the example below, <code>PartData.FileItem</code> is used to receive a file as a byte
+                            stream:
                         </p>
-                        <code-block lang="kotlin" src="snippets/migrating-express-ktor/7_receive_request/src/main/kotlin/com/example/Application.kt" include-lines="48-68"/>
+                        <code-block lang="kotlin"
+                                    src="snippets/migrating-express-ktor/7_receive_request/src/main/kotlin/com/example/Application.kt"
+                                    include-lines="48-68"/>
                         <p>
-                            <emphasis>
-                                <a href="https://github.com/ktorio/ktor-documentation/tree/%ktor_version%/codeSnippets/snippets/migrating-express-ktor/7_receive_request/src/main/kotlin/com/example/Application.kt">View sample on GitHub</a>
-                            </emphasis>
+                            For the full example, see the
+                            <a href="https://github.com/ktorio/ktor-documentation/tree/%ktor_version%/codeSnippets/snippets/migrating-express-ktor/7_receive_request/src/main/kotlin/com/example/Application.kt">7_receive_request</a>
+                            project.
                         </p>
                     </td>
                 </tr>
@@ -949,10 +1072,10 @@
     </chapter>
 
 
-
     <chapter title="Creating middleware" id="middleware">
         <p>
-            The final thing we'll look at is how to create middleware that allows you to extend the server functionality.
+            The final thing we'll look at is how to create middleware that allows you to extend the server
+            functionality.
             The examples below show how to implement request logging using Express and Ktor.
         </p>
         <table style="header-column">
@@ -964,11 +1087,12 @@
                     <p>
                         In Express, middleware is a function bound to the application using <code>app.use</code>:
                     </p>
-                    <code-block lang="javascript" src="snippets/migrating-express/8_middleware/app.js" include-lines="1-13"/>
+                    <code-block lang="javascript" src="snippets/migrating-express/8_middleware/app.js"
+                                include-lines="1-13"/>
                     <p>
-                        <emphasis>
-                            <a href="https://github.com/ktorio/ktor-documentation/tree/%ktor_version%/codeSnippets/snippets/migrating-express/8_middleware/app.js">View sample on GitHub</a>
-                        </emphasis>
+                        For the full example, see the
+                        <a href="https://github.com/ktorio/ktor-documentation/tree/%ktor_version%/codeSnippets/snippets/migrating-express/8_middleware/app.js">8_middleware</a>
+                        project.
                     </p>
                 </td>
             </tr>
@@ -982,11 +1106,13 @@
                         using <a href="server-custom-plugins.md">custom plugins</a>.
                         The code example below shows how to handle <code>onCall</code> to implement request logging:
                     </p>
-                    <code-block lang="kotlin" src="snippets/migrating-express-ktor/8_middleware/src/main/kotlin/com/example/Application.kt" include-lines="23-29"/>
+                    <code-block lang="kotlin"
+                                src="snippets/migrating-express-ktor/8_middleware/src/main/kotlin/com/example/Application.kt"
+                                include-lines="23-29"/>
                     <p>
-                        <emphasis>
-                            <a href="https://github.com/ktorio/ktor-documentation/tree/%ktor_version%/codeSnippets/snippets/migrating-express-ktor/8_middleware/src/main/kotlin/com/example/Application.kt">View sample on GitHub</a>
-                        </emphasis>
+                        For the full example, see the
+                        <a href="https://github.com/ktorio/ktor-documentation/tree/%ktor_version%/codeSnippets/snippets/migrating-express-ktor/8_middleware/src/main/kotlin/com/example/Application.kt">8_middleware</a>
+                        project.
                     </p>
                 </td>
             </tr>
@@ -1000,8 +1126,9 @@
             For most of these functionalities, Ktor provides dedicated plugins
             that can be installed in the application and configured as required.
             To continue your journey with Ktor,
-            visit the <control><a href="https://ktor.io/learn/">Learn page</a></control>,
-            which provides a set of step-by-step guides and ready-to-use samples.
+            visit the
+            <control><a href="https://ktor.io/learn/">Learn page</a></control>
+            ,which provides a set of step-by-step guides and ready-to-use samples.
         </p>
     </chapter>
 </topic>
diff --git a/topics/migration-to-20x.md b/topics/migration-to-20x.md
index 952e9a710..5d3922464 100644
--- a/topics/migration-to-20x.md
+++ b/topics/migration-to-20x.md
@@ -12,7 +12,7 @@ This means that you need to update [dependencies](#server-package-dependencies)
 #### Dependencies {id="server-package-dependencies"}
 | Subsystem                                           |               1.6.x               |                                                                                2.0.0 |
 |:----------------------------------------------------|:---------------------------------:|-------------------------------------------------------------------------------------:|
-| [Locations](server-locations.md)                    |     `io.ktor:ktor-locations`      |                                                      `io.ktor:ktor-server-locations` |
+| [Locations](https://ktor.io/docs/server-locations.html)                    |     `io.ktor:ktor-locations`      |                                                      `io.ktor:ktor-server-locations` |
 | [Webjars](server-webjars.md)                        |      `io.ktor:ktor-webjars`       |                                                        `io.ktor:ktor-server-webjars` |
 | [AutoHeadResponse](server-autoheadresponse.md)      |    `io.ktor:ktor-server-core`     |                                             `io.ktor:ktor-server-auto-head-response` |
 | [StatusPages](server-status-pages.md)               |    `io.ktor:ktor-server-core`     |                                                   `io.ktor:ktor-server-status-pages` |
@@ -62,7 +62,7 @@ This means that you need to update [dependencies](#server-package-dependencies)
 | [Requests](server-requests.md)                      |      `import io.ktor.request.*`       |                    `import io.ktor.server.request.*` |
 | [Responses](server-responses.md)                    |      `import io.ktor.response.*`      |                   `import io.ktor.server.response.*` |
 | [Plugins](#feature-plugin)                          |      `import io.ktor.features.*`      |                    `import io.ktor.server.plugins.*` |
-| [Locations](server-locations.md)                    |     `import io.ktor.locations.*`      |                  `import io.ktor.server.locations.*` |
+| [Locations](https://ktor.io/docs/server-locations.html)                    |     `import io.ktor.locations.*`      |                  `import io.ktor.server.locations.*` |
 | [Static content](server-static-content.md)          |    `import io.ktor.http.content.*`    |               `import io.ktor.server.http.content.*` |
 | [HTML DSL](server-html-dsl.md)                      |        `import io.ktor.html.*`        |                       `import io.ktor.server.html.*` |
 | [FreeMarker](server-freemarker.md)                  |     `import io.ktor.freemarker.*`     |                 `import io.ktor.server.freemarker.*` |
@@ -197,14 +197,16 @@ In the test below, the `handleRequest` function is replaced with the `client.get
 
 ```kotlin
 ```
-{src="snippets/engine-main/src/test/kotlin/EngineMainTest.kt" include-lines="18-26"}
+{src="https://raw.githubusercontent.com/ktorio/ktor-documentation/refs/heads/2.3.12/codeSnippets/snippets/engine-main/src/test/kotlin/EngineMainTest.kt"
+include-lines="18-26"}
 
 </tab>
 <tab title="2.0.0" group-key="2_0">
 
 ```kotlin
 ```
-{src="snippets/engine-main/src/test/kotlin/EngineMainTest.kt" include-lines="11-16"}
+{src="https://raw.githubusercontent.com/ktorio/ktor-documentation/refs/heads/2.3.12/codeSnippets/snippets/engine-main/src/test/kotlin/EngineMainTest.kt"
+include-lines="11-16"}
 
 </tab>
 </tabs>
@@ -219,14 +221,16 @@ In the test below, the `handleRequest` function is replaced with the `client.pos
 
 ```kotlin
 ```
-{src="snippets/post-form-parameters/src/test/kotlin/formparameters/ApplicationTest.kt" include-lines="20-28"}
+{src="https://raw.githubusercontent.com/ktorio/ktor-documentation/refs/heads/2.3.12/codeSnippets/snippets/post-form-parameters/src/test/kotlin/formparameters/ApplicationTest.kt"
+include-lines="20-28"}
 
 </tab>
 <tab title="2.0.0" group-key="2_0">
 
 ```kotlin
 ```
-{src="snippets/post-form-parameters/src/test/kotlin/formparameters/ApplicationTest.kt" include-lines="11-18"}
+{src="https://raw.githubusercontent.com/ktorio/ktor-documentation/refs/heads/2.3.12/codeSnippets/snippets/post-form-parameters/src/test/kotlin/formparameters/ApplicationTest.kt"
+include-lines="11-18"}
 
 </tab>
 </tabs>
@@ -242,14 +246,14 @@ To build `multipart/form-data` in v2.0.0, you need to pass `MultiPartFormDataCon
 
 ```kotlin
 ```
-{src="snippets/upload-file/src/test/kotlin/uploadfile/UploadFileTest.kt" include-lines="38-63"}
+{src="https://raw.githubusercontent.com/ktorio/ktor-documentation/refs/heads/2.3.12/codeSnippets/snippets/upload-file/src/test/kotlin/uploadfile/UploadFileTest.kt" include-lines="38-63"}
 
 </tab>
 <tab title="2.0.0" group-key="2_0">
 
 ```kotlin
 ```
-{src="snippets/upload-file/src/test/kotlin/uploadfile/UploadFileTest.kt" include-lines="17-36"}
+{src="https://raw.githubusercontent.com/ktorio/ktor-documentation/refs/heads/2.3.12/codeSnippets/snippets/upload-file/src/test/kotlin/uploadfile/UploadFileTest.kt" include-lines="17-36"}
 
 </tab>
 </tabs>
@@ -266,14 +270,16 @@ With v2.0.0, you need to create a new client instance and install the [ContentNe
 
 ```kotlin
 ```
-{src="snippets/json-kotlinx/src/test/kotlin/jsonkotlinx/ApplicationTest.kt" include-lines="46-55"}
+{src="https://raw.githubusercontent.com/ktorio/ktor-documentation/refs/heads/2.3.12/codeSnippets/snippets/json-kotlinx/src/test/kotlin/jsonkotlinx/ApplicationTest.kt"
+include-lines="46-55"}
 
 </tab>
 <tab title="2.0.0" group-key="2_0">
 
 ```kotlin
 ```
-{src="snippets/json-kotlinx/src/test/kotlin/jsonkotlinx/ApplicationTest.kt" include-lines="31-44"}
+{src="https://raw.githubusercontent.com/ktorio/ktor-documentation/refs/heads/2.3.12/codeSnippets/snippets/json-kotlinx/src/test/kotlin/jsonkotlinx/ApplicationTest.kt"
+include-lines="31-44"}
 
 </tab>
 </tabs>
@@ -288,35 +294,37 @@ In v1.6.x, `cookiesSession` is used to preserve cookies between requests when te
 
 ```kotlin
 ```
-{src="snippets/session-cookie-client/src/test/kotlin/cookieclient/ApplicationTest.kt" include-lines="29-46"}
+{src="https://raw.githubusercontent.com/ktorio/ktor-documentation/refs/heads/2.3.12/codeSnippets/snippets/session-cookie-client/src/test/kotlin/cookieclient/ApplicationTest.kt" include-lines="29-46"}
 
 </tab>
 <tab title="2.0.0" group-key="2_0">
 
 ```kotlin
 ```
-{src="snippets/session-cookie-client/src/test/kotlin/cookieclient/ApplicationTest.kt" include-lines="12-27"}
+{src="https://raw.githubusercontent.com/ktorio/ktor-documentation/refs/heads/2.3.12/codeSnippets/snippets/session-cookie-client/src/test/kotlin/cookieclient/ApplicationTest.kt" include-lines="12-27"}
 
 </tab>
 </tabs>
 
 #### WebSockets {id="testing-ws"}
 
-In the old API, `handleWebSocketConversation` is used to test [WebSocket conversations](server-websockets.md). With v2.0.0, you can test WebSocket conversations by using the [WebSockets](client-websockets.md) plugin provided by the client:
+In the old API, `handleWebSocketConversation` is used to test [WebSocket conversations](server-websockets.md). With v2.0.0, you can test WebSocket conversations by using the [WebSockets](client-websockets.topic) plugin provided by the client:
 
 <tabs group="ktor_versions">
 <tab title="1.6.x" group-key="1_6">
 
 ```kotlin
 ```
-{src="snippets/server-websockets/src/test/kotlin/com/example/ModuleTest.kt" include-lines="28-40"}
+{src="https://raw.githubusercontent.com/ktorio/ktor-documentation/refs/heads/2.3.12/codeSnippets/snippets/server-websockets/src/test/kotlin/com/example/ModuleTest.kt"
+include-lines="28-40"}
 
 </tab>
 <tab title="2.0.0" group-key="2_0">
 
 ```kotlin
 ```
-{src="snippets/server-websockets/src/test/kotlin/com/example/ModuleTest.kt" include-lines="10-26"}
+{src="https://raw.githubusercontent.com/ktorio/ktor-documentation/refs/heads/2.3.12/codeSnippets/snippets/server-websockets/src/test/kotlin/com/example/ModuleTest.kt"
+include-lines="10-26"}
 
 </tab>
 </tabs>
@@ -813,7 +821,7 @@ import io.ktor.client.plugins.auth.providers.*
 </tr>
 
 <tr>
-<td><a href="client-websockets.md">WebSockets</a></td>
+<td><a href="client-websockets.topic">WebSockets</a></td>
 <td><code>import io.ktor.client.features.websocket.*</code></td>
 <td><code>import io.ktor.client.plugins.websocket.*</code></td>
 </tr>
diff --git a/topics/releases.md b/topics/releases.md
index 3a6460813..f28e0b740 100644
--- a/topics/releases.md
+++ b/topics/releases.md
@@ -33,6 +33,20 @@ The following table lists details of the latest Ktor releases.
 
 <table>
 <tr><td>Version</td><td>Release Date</td><td>Highlights</td></tr>
+<tr><td>3.0.0</td><td>October 9, 2024</td><td><p>
+A major release containing improvements and bug fixes, including added support for Android Native targets.
+For more information on breaking changes, see <a href="https://ktor.io/docs/migrating-3.html">the migration guide</a>.
+</p>
+<var name="version" value="3.0.0"/>
+<include from="lib.topic" element-id="release_details_link"/>
+</td></tr>
+<tr><td>3.0.0-rc-2</td><td>October 2, 2024</td><td><p>
+A major release candidate containing various improvements with breaking changes, bug fixes, and features, such as
+multiplatform support for XML.
+</p>
+<var name="version" value="3.0.0-rc-2"/>
+<include from="lib.topic" element-id="release_details_link"/>
+</td></tr>
 <tr><td>3.0.0-rc-1</td><td>September 9, 2024</td><td><p>
 A major release candidate containing significant improvements and bug fixes. This update enhances backward compatibility
 and features extended <code>staticZip</code> support.
diff --git a/topics/server-auth.md b/topics/server-auth.md
index 5364caadc..b17feb22c 100644
--- a/topics/server-auth.md
+++ b/topics/server-auth.md
@@ -193,7 +193,7 @@ If you use [session authentication](server-session-auth.md), a principal might b
 
 ```kotlin
 ```
-{src="snippets/auth-form-session/src/main/kotlin/com/example/Application.kt" include-lines="75-77,80-81"}
+{src="snippets/auth-form-session/src/main/kotlin/com/example/Application.kt" include-lines="77-79,82-83"}
 
 In the case of [nested authentication providers](#authenticate-route), 
 you can pass a [provider name](#provider-name) to `call.principal` to get a principal for the desired provider.
@@ -201,7 +201,7 @@ In the example below, the _auth-session_ value is passed to get a principal for
 
 ```kotlin
 ```
-{src="snippets/auth-form-session-nested/src/main/kotlin/com/example/Application.kt" include-lines="85,91-93,95-97"}
+{src="snippets/auth-form-session-nested/src/main/kotlin/com/example/Application.kt" include-lines="87,93-95,97-99"}
 
 
 
diff --git a/topics/server-call-id.md b/topics/server-call-id.md
index f40006e1d..eb96b3b9d 100644
--- a/topics/server-call-id.md
+++ b/topics/server-call-id.md
@@ -15,6 +15,10 @@
 <include from="lib.topic" element-id="native_server_supported"/>
 </tldr>
 
+<link-summary>
+The %plugin_name% server plugin allows you to trace client requests by using unique call IDs.
+</link-summary>
+
 The [%plugin_name%](https://api.ktor.io/ktor-server/ktor-server-plugins/ktor-server-call-id/io.ktor.server.plugins.callid/-call-id.html) plugin allows you to trace client requests end-to-end by using unique request IDs or call IDs. Typically, working with a call ID in Ktor might look as follows:
 1. First, you need to obtain a call ID for a specific request in one of the following ways:
    * A reverse proxy (such as Nginx) or cloud provider (such as [Heroku](heroku.md)) might add a call ID in a specific header, for example, `X-Request-Id`. In this case, Ktor allows you to [retrieve](#retrieve) a call ID.
diff --git a/topics/server-call-logging.md b/topics/server-call-logging.md
index cd88d2450..6cde0a067 100644
--- a/topics/server-call-logging.md
+++ b/topics/server-call-logging.md
@@ -3,7 +3,7 @@
 <show-structure for="chapter" depth="2"/>
 
 <var name="plugin_name" value="CallLogging"/>
-<var name="package_name" value="io.ktor.server.plugins.callloging"/>
+<var name="package_name" value="io.ktor.server.plugins.calllogging"/>
 <var name="artifact_name" value="ktor-server-call-logging"/>
 
 <tldr>
@@ -15,48 +15,63 @@
 <include from="lib.topic" element-id="native_server_not_supported"/>
 </tldr>
 
-Ktor provides the capability to log application events using the [SLF4J](http://www.slf4j.org/) library. You can learn about general logging configuration from the [](server-logging.md) topic.
+Ktor provides the capability to log application events using the [SLF4J](http://www.slf4j.org/) library. You can learn
+about general logging configuration from the [](server-logging.md) topic.
 
 The `%plugin_name%` plugin allows you to log incoming client requests.
 
-
 ## Add dependencies {id="add_dependencies"}
 
 <include from="lib.topic" element-id="add_ktor_artifact_intro"/>
 <include from="lib.topic" element-id="add_ktor_artifact"/>
 
-
 ## Install %plugin_name% {id="install_plugin"}
 
 <include from="lib.topic" element-id="install_plugin"/>
 
-
 ## Configure logging settings {id="configure"}
-You can configure `%plugin_name%` in multiple ways: specify a logging level, filter requests based on a specified condition, customize log messages, and so on. You can see the available configuration settings at [CallLoggingConfig](https://api.ktor.io/ktor-server/ktor-server-plugins/ktor-server-call-logging/io.ktor.server.plugins.callloging/-call-logging-config/index.html).
+
+You can configure `%plugin_name%` in multiple ways: specify a logging level, filter requests based on a specified
+condition, customize log messages, and so on. You can see the available configuration settings
+at [CallLoggingConfig](https://api.ktor.io/ktor-server/ktor-server-plugins/ktor-server-call-logging/io.ktor.server.plugins.calllogging/-call-logging-config/index.html).
+
 ### Set the logging level {id="logging_level"}
+
 By default, Ktor uses the `Level.INFO` logging level. To change it, use the `level` property:
+
 ```kotlin
 ```
+
 {src="snippets/logging/src/main/kotlin/com/example/Application.kt" include-lines="14-15,25"}
 
 ### Filter log requests {id="filter"}
-The `filter` property allows you to add conditions for filtering requests. In the example below, only requests made to `/api/v1` get into a log:
+
+The `filter` property allows you to add conditions for filtering requests. In the example below, only requests made
+to `/api/v1` get into a log:
+
 ```kotlin
 ```
+
 {src="snippets/logging/src/main/kotlin/com/example/Application.kt" include-lines="14,16-18,25"}
 
 ### Customize a log message format {id="format"}
-By using the `format` function, you can put any data related to a request/response into a log. The example below shows how to log a response status, a request HTTP method, and the `User-Agent` header value for each request.
+
+By using the `format` function, you can put any data related to a request/response into a log. The example below shows
+how to log a response status, a request HTTP method, and the `User-Agent` header value for each request.
 
 ```kotlin
 ```
-{src="snippets/logging/src/main/kotlin/com/example/Application.kt" include-lines="14,19-25"}
 
-You can find the full example here: [logging](https://github.com/ktorio/ktor-documentation/tree/%ktor_version%/codeSnippets/snippets/logging).
+{src="snippets/logging/src/main/kotlin/com/example/Application.kt" include-lines="14,19-25"}
 
+You can find the full example
+here: [logging](https://github.com/ktorio/ktor-documentation/tree/%ktor_version%/codeSnippets/snippets/logging).
 
 ### Put call parameters in MDC {id="mdc"}
-The `%plugin_name%` plugin supports MDC (Mapped Diagnostic Context). You can put a desired context value with the specified name to MDC using the `mdc` function. For example, in the code snippet below, a `name` query parameter is added to MDC:
+
+The `%plugin_name%` plugin supports MDC (Mapped Diagnostic Context). You can put a desired context value with the
+specified name to MDC using the `mdc` function. For example, in the code snippet below, a `name` query parameter is
+added to MDC:
 
 ```kotlin
 install(CallLogging) {
@@ -65,7 +80,9 @@ install(CallLogging) {
     }
 }
 ```
+
 You can access the added value during an `ApplicationCall` lifetime:
+
 ```kotlin
 import org.slf4j.MDC
 // ...
diff --git a/topics/server-compression.md b/topics/server-compression.md
index 04df8fdff..832bcdc5e 100644
--- a/topics/server-compression.md
+++ b/topics/server-compression.md
@@ -17,10 +17,20 @@
 
 Ktor provides the capability to compress [outgoing content](server-responses.md) by using the [Compression](https://api.ktor.io/ktor-server/ktor-server-plugins/ktor-server-compression/io.ktor.server.plugins.compression/-compression.html) plugin. You can use different compression algorithms, including `gzip` and `deflate`, 
 specify the required conditions for compressing data (such as a content type or response size), or even compress data based on specific request parameters.
+Ktor provides the capability to compress response body and decompress request body
+by using
+the [Compression](https://api.ktor.io/ktor-server/ktor-server-plugins/ktor-server-compression/io.ktor.server.plugins.compression/-compression.html)
+plugin.
+You can use different compression algorithms, including `gzip` and `deflate`,
+specify the required conditions for compressing data (such as a content type or response size),
+or even compress data based on specific request parameters.
+
+> Note that the `%plugin_name%` plugin does not currently support `SSE` responses.
+>
+{style="warning"}
 
 > To learn how to serve pre-compressed static files in Ktor, see [](server-static-content.md#precompressed).
 
-
 ## Add dependencies {id="add_dependencies"}
 
 <include from="lib.topic" element-id="add_ktor_artifact_intro"/>
@@ -30,21 +40,28 @@ specify the required conditions for compressing data (such as a content type or
 
 <include from="lib.topic" element-id="install_plugin"/>
 
-This enables the `gzip`, `deflate`, and `identity` encoders on a server. In the next chapter, we'll see how to enable only specific encoders and configure conditions for compressing data.
-
+This enables the `gzip`, `deflate`, and `identity` encoders on a server.
+In the next chapter, we'll see how to enable only specific encoders and configure conditions for compressing data.
+Note that every added encoder will be used to decompress request body if needed.
 
 ## Configure compression settings {id="configure"}
-You can configure compression in multiple ways: enable only specific encoders, specify their priorities, compress only specific content types, and so on.
+
+You can configure compression in multiple ways: enable only specific encoders, specify their priorities, compress only
+specific content types, and so on.
 
 ### Add specific encoders {id="add_specific_encoders"}
+
 To enable only specific encoders, call the corresponding extension functions, for example:
+
 ```kotlin
 install(Compression) {
     gzip()
     deflate()
 }
 ```
+
 You can specify the priority for each compression algorithm by establishing the `priority` property:
+
 ```kotlin
 install(Compression) {
     gzip {
@@ -55,19 +72,32 @@ install(Compression) {
     }
 }
 ```
-In the example above, `deflate` has a higher priority value and takes precedence over `gzip`. Note that the server first looks at the [quality](https://developer.mozilla.org/en-US/docs/Glossary/Quality_Values) values within the [Accept-Encoding](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Accept-Encoding) header and then takes into account the specified priorities.
+
+In the example above, `deflate` has a higher priority value and takes precedence over `gzip`. Note that the server first
+looks at the [quality](https://developer.mozilla.org/en-US/docs/Glossary/Quality_Values) values within
+the [Accept-Encoding](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Accept-Encoding) header and then takes
+into account the specified priorities.
 
 ### Configure content type {id="configure_content_type"}
-By default, Ktor doesn't compress specific content types, such as `audio`, `video`, `image`, and `text/event-stream`. 
-You can choose the content types to compress by calling `matchContentType` or exclude the desired media types from compression by using `excludeContentType`. The code snippet below shows how to compress JavaScript code using `gzip` and all text subtypes using `deflate`:
+
+By default, Ktor doesn't compress specific content types, such as `audio`, `video`, `image`, and `text/event-stream`.
+You can choose the content types to compress by calling `matchContentType` or exclude the desired media types from
+compression by using `excludeContentType`. The code snippet below shows how to compress JavaScript code using `gzip` and
+all text subtypes using `deflate`:
+
 ```kotlin
 ```
+
 {src="snippets/compression/src/main/kotlin/compression/Application.kt" include-lines="12-13,15-19,21-25"}
 
-You can find the full example here: [compression](https://github.com/ktorio/ktor-documentation/tree/%ktor_version%/codeSnippets/snippets/compression).
+You can find the full example
+here: [compression](https://github.com/ktorio/ktor-documentation/tree/%ktor_version%/codeSnippets/snippets/compression).
 
 ### Configure response size {id="configure_response_size"}
-The `%plugin_name%` plugin allows you to disable compression for responses whose size doesn't exceed the specified value. To do this, pass the desired value (in bytes) to the `minimumSize` function:
+
+The `%plugin_name%` plugin allows you to disable compression for responses whose size doesn't exceed the specified
+value. To do this, pass the desired value (in bytes) to the `minimumSize` function:
+
 ```kotlin
     install(Compression) {
         deflate {
@@ -78,7 +108,10 @@ The `%plugin_name%` plugin allows you to disable compression for responses whose
 ```
 
 ### Specify custom conditions {id="specify_custom_conditions"}
-If necessary, you can provide a custom condition using the `condition` function and compress data depending on the specific request parameters. The code snippet below shows how to compress requests for the specified URI:
+
+If necessary, you can provide a custom condition using the `condition` function and compress data depending on the
+specific request parameters. The code snippet below shows how to compress requests for the specified URI:
+
 ```kotlin
 install(Compression) {
     gzip {
@@ -89,9 +122,12 @@ install(Compression) {
 }
 ```
 
-
 ## HTTPS security {id="security"}
-HTTPS with the enabled compression is vulnerable to the [BREACH](https://en.wikipedia.org/wiki/BREACH) attack. You can use various ways to mitigate this attack. For example, you can disable compression whenever the referrer header indicates a cross-site request. In Ktor, this can be done by checking the referrer header value:
+
+HTTPS with the enabled compression is vulnerable to the [BREACH](https://en.wikipedia.org/wiki/BREACH) attack. You can
+use various ways to mitigate this attack. For example, you can disable compression whenever the referrer header
+indicates a cross-site request. In Ktor, this can be done by checking the referrer header value:
+
 ```kotlin
 install(Compression) {
     gzip {
@@ -103,8 +139,9 @@ install(Compression) {
 ```
 
 ## Implement custom encoder {id="custom_encoder"}
+
 If necessary, you can provide your own encoder by implementing
-the [CompressionEncoder](https://api.ktor.io/ktor-server/ktor-server-plugins/ktor-server-compression/io.ktor.server.plugins.compression/-compression-encoder)
+the [ContentEncoder](https://api.ktor.io/ktor-utils/ktor-server-compression/io.ktor.util/-content-encoder)
 interface.
 See [GzipEncoder](https://github.com/ktorio/ktor/blob/b5b59ca3ae61601e6175f334e6a1252609638e61/ktor-server/ktor-server-plugins/ktor-server-compression/jvm/src/io/ktor/server/plugins/compression/Encoders.kt#L41)
 as an example of implementation.
diff --git a/topics/server-configuration-code.topic b/topics/server-configuration-code.topic
index 92cfee2d3..9be23c726 100644
--- a/topics/server-configuration-code.topic
+++ b/topics/server-configuration-code.topic
@@ -13,13 +13,19 @@
     </link-summary>
 
     <p>
-        Ktor allows you to configure various server parameters, such as a host address and port, <a href="server-modules.md">modules</a> to load, and so on.
-        The configuration depends on the way you used to create a server - <a href="server-create-and-configure.topic">embeddedServer or EngineMain</a>.
+        Ktor allows you to configure various server parameters, such as a host address and port, <a
+            href="server-modules.md">modules</a> to load, and so on.
+        The configuration depends on the way you used to create a server - <a href="server-create-and-configure.topic">embeddedServer
+        or EngineMain</a>.
     </p>
     <p>
         For <code>embeddedServer</code>, you can configure server parameters in code by passing the required parameters to the <code>embeddedServer</code> function.
-        The <a href="https://api.ktor.io/ktor-server/ktor-server-host-common/io.ktor.server.engine/embedded-server.html">embeddedServer</a> function accepts different parameters for configuring a server, including a <a href="server-engines.md">server engine</a>, a host and port to listen, and so on.
-        In this section, we'll take a look at several examples of running <code>embeddedServer</code> with different setting.
+        The <a
+            href="https://api.ktor.io/older/3.0.0-beta-1/ktor-server/ktor-server-core/io.ktor.server.engine/embedded-server.html">embeddedServer</a>
+        function accepts different parameters for configuring a server, including a <a href="server-engines.md">server
+        engine</a>, a host and port to listen, and so on.
+        In this section, we'll take a look at several examples of running <code>embeddedServer</code> with different
+        setting.
     </p>
 
 
@@ -33,13 +39,18 @@
         </code-block>
         <p>
             Note that you can set the <code>port</code> parameter to <code>0</code> to run the server on a random port.
-            The <code>embeddedServer</code> function returns an engine instance, so you can get a port value in code using the <a href="https://api.ktor.io/ktor-server/ktor-server-host-common/io.ktor.server.engine/-application-engine/resolved-connectors.html">ApplicationEngine.resolvedConnectors</a> function.
+            The <code>embeddedServer</code> function returns an engine instance, so you can get a port value in code
+            using the <a
+                href="https://api.ktor.io/older/3.0.0-beta-1/ktor-server/ktor-server-core/io.ktor.server.engine/-application-engine/resolved-connectors.html">ApplicationEngine.resolvedConnectors</a>
+            function.
         </p>
     </chapter>
 
     <chapter title="Engine configuration" id="embedded-engine">
         <p>
-            In the example below, we've added the <code>configure</code> parameter for configuring setting specific for a selected engine. You can learn more about configuring engines from <a href="server-engines.md" anchor="configure-engine"/>.
+            In the example below, we've added the <code>configure</code> parameter for configuring setting specific for
+            a selected engine. You can learn more about configuring engines from <a href="server-engines.md"
+                                                                                    anchor="configure-engine"/>.
         </p>
         <code-block
                 lang="kotlin"
@@ -50,15 +61,19 @@
     <chapter title="Custom environment" id="embedded-custom">
         <p>
             The example below shows how to run a server with multiple connector endpoints
-            using a custom environment represented by the <a href="https://api.ktor.io/ktor-server/ktor-server-host-common/io.ktor.server.engine/-application-engine-environment/index.html">ApplicationEngineEnvironment</a> interface.
+            using a custom configuration represented by the <a
+                href="https://api.ktor.io/older/3.0.0-beta-1/ktor-server/ktor-server-core/io.ktor.server.engine/-application-engine/-configuration/index.html">ApplicationEngine</a>
+            interface.
         </p>
         <code-block
                 lang="kotlin"
-                src="snippets/embedded-server-multiple-connectors/src/main/kotlin/com/example/Application.kt" include-lines="3-28">
+                src="snippets/embedded-server-multiple-connectors/src/main/kotlin/com/example/Application.kt"
+                include-lines="3-28">
         </code-block>
 
         <p>
-            You can find the full example here: <a href="https://github.com/ktorio/ktor-documentation/tree/%ktor_version%/codeSnippets/snippets/embedded-server-multiple-connectors">embedded-server-multiple-connectors</a>.
+            For the complete example, see <a
+                href="https://github.com/ktorio/ktor-documentation/tree/%ktor_version%/codeSnippets/snippets/embedded-server-multiple-connectors">embedded-server-multiple-connectors</a>.
         </p>
 
         <tip>
@@ -69,7 +84,4 @@
     </chapter>
 
 
-
-
-
 </topic>
\ No newline at end of file
diff --git a/topics/server-configuration-file.topic b/topics/server-configuration-file.topic
index 444d09679..843cf4989 100644
--- a/topics/server-configuration-file.topic
+++ b/topics/server-configuration-file.topic
@@ -120,7 +120,7 @@
             <tabs group="config">
                 <tab title="application.conf" group-key="hocon">
                     <code-block
-                            src="snippets/auth-jwt-hs256/src/main/resources/application.conf"/>
+                            src="snippets/auth-jwt-hs256/src/main/resources/application-custom.conf"/>
                 </tab>
                 <tab title="application.yaml" group-key="yaml">
                     <code-block
diff --git a/topics/server-cors.md b/topics/server-cors.md
index 3c0660608..7ce4f8f08 100644
--- a/topics/server-cors.md
+++ b/topics/server-cors.md
@@ -15,7 +15,10 @@
 <include from="lib.topic" element-id="native_server_supported"/>
 </tldr>
 
-If your server is supposed to handle [cross-origin requests](https://developer.mozilla.org/en-US/docs/Web/HTTP/CORS), you need to install and configure the [CORS](https://api.ktor.io/ktor-server/ktor-server-plugins/ktor-server-cors/io.ktor.server.plugins.cors.routing/-c-o-r-s.html) Ktor plugin. This plugin allows you to configure allowed hosts, HTTP methods, headers set by the client, and so on.
+If your server is supposed to handle [cross-origin requests](https://developer.mozilla.org/en-US/docs/Web/HTTP/CORS),
+you need to install and configure
+the [CORS](https://api.ktor.io/ktor-server/ktor-server-plugins/ktor-server-cors/io.ktor.server.plugins.cors.routing/-c-o-r-s.html)
+Ktor plugin. This plugin allows you to configure allowed hosts, HTTP methods, headers set by the client, and so on.
 
 ## Add dependencies {id="add_dependencies"}
 
@@ -27,32 +30,42 @@ If your server is supposed to handle [cross-origin requests](https://developer.m
 <include from="lib.topic" element-id="install_plugin"/>
 <include from="lib.topic" element-id="install_plugin_route"/>
 
-> If you install the `CORS` plugin to a specific route, you need to add the `options` [handler](server-routing.md#define_route) to this route. This allows Ktor to respond correctly to a CORS preflight request.
-
+> If you install the `CORS` plugin to a specific route, you need to add
+the `options` [handler](server-routing.md#define_route) to this route. This allows Ktor to respond correctly to a CORS
+preflight request.
 
 ## Configure CORS {id="configure"}
 
-CORS-specific configuration settings are exposed by the [CORSConfig](https://api.ktor.io/ktor-server/ktor-server-plugins/ktor-server-cors/io.ktor.server.plugins.cors/-c-o-r-s-config/index.html) class. Let's see how to configure these settings.
+CORS-specific configuration settings are exposed by
+the [CORSConfig](https://api.ktor.io/ktor-server/ktor-server-plugins/ktor-server-cors/io.ktor.server.plugins.cors/-c-o-r-s-config/index.html)
+class. Let's see how to configure these settings.
 
 ### Overview {id="overview"}
 
-Suppose you have a server listening on the `8080` port, with the `/customer` [route](server-routing.md) responding with [JSON](server-serialization.md#send_data) data. A code snippet below shows a sample request made using the Fetch API from the client working on another port to make this request cross-origin:
+Suppose you have a server listening on the `8080` port, with the `/customer` [route](server-routing.md) responding
+with [JSON](server-serialization.md#send_data) data. A code snippet below shows a sample request made using the Fetch API from
+the client working on another port to make this request cross-origin:
 
 ```javascript
 ```
-{src="snippets/cors/files/js/script.js" initial-collapse-state="collapsed" collapsed-title="fetch('http://0.0.0.0:8080/customer')"}
+
+{src="snippets/cors/files/js/script.js" initial-collapse-state="collapsed" collapsed-title="
+fetch('http://0.0.0.0:8080/customer')"}
 
 To allow such a request on the backend side, you need to configure the `CORS` plugin as follows:
 
 ```kotlin
 ```
-{src="snippets/cors/src/main/kotlin/com/example/Application.kt" include-lines="46-49"}
 
-You can find the full example here: [cors](https://github.com/ktorio/ktor-documentation/tree/%ktor_version%/codeSnippets/snippets/cors).
+{src="snippets/cors/src/main/kotlin/com/example/Application.kt" include-lines="47-50"}
 
+You can find the full example
+here: [cors](https://github.com/ktorio/ktor-documentation/tree/%ktor_version%/codeSnippets/snippets/cors).
 
 ### Hosts {id="hosts"}
-To specify the allowed host that can make cross-origin requests, use the `allowHost` function. Apart from the hostname, you can specify a port number, a list of subdomains, or the supported HTTP schemes.
+
+To specify the allowed host that can make cross-origin requests, use the `allowHost` function. Apart from the hostname,
+you can specify a port number, a list of subdomains, or the supported HTTP schemes.
 
 ```kotlin
 install(CORS) {
@@ -71,10 +84,10 @@ install(CORS) {
 }
 ```
 
-
 ### HTTP methods {id="methods"}
 
-By default, the `%plugin_name%` plugin allows the `GET`, `POST` and `HEAD` HTTP methods. To add additional methods, use the `allowMethod` function.
+By default, the `%plugin_name%` plugin allows the `GET`, `POST` and `HEAD` HTTP methods. To add additional methods, use
+the `allowMethod` function.
 
 ```kotlin
 install(CORS) {
@@ -85,15 +98,16 @@ install(CORS) {
 }
 ```
 
-
 ### Allow headers {id="headers"}
 
 By default, the `%plugin_name%` plugin allows the following client headers managed by `Access-Control-Allow-Headers`:
+
 * `Accept`
 * `Accept-Language`
 * `Content-Language`
 
 To allow additional headers, use the `allowHeader` function.
+
 ```kotlin
 install(CORS) {
     allowHeader(HttpHeaders.ContentType)
@@ -101,7 +115,8 @@ install(CORS) {
 }
 ```
 
-To allow custom headers, use the `allowHeaders` or `allowHeadersPrefixed` functions. For instance, the code snippet below shows how to allow headers prefixed with `custom-`.
+To allow custom headers, use the `allowHeaders` or `allowHeadersPrefixed` functions. For instance, the code snippet
+below shows how to allow headers prefixed with `custom-`.
 
 ```kotlin
 install(CORS) {
@@ -109,11 +124,14 @@ install(CORS) {
 }
 ```
 
-> Note that `allowHeaders` or `allowHeadersPrefixed` require setting the [allowNonSimpleContentTypes](https://api.ktor.io/ktor-server/ktor-server-plugins/ktor-server-cors/io.ktor.server.plugins.cors/-c-o-r-s-config/allow-non-simple-content-types.html) property to `true` for non-simple content types.
-
+> Note that `allowHeaders` or `allowHeadersPrefixed` require setting
+the [allowNonSimpleContentTypes](https://api.ktor.io/ktor-server/ktor-server-plugins/ktor-server-cors/io.ktor.server.plugins.cors/-c-o-r-s-config/allow-non-simple-content-types.html)
+property to `true` for non-simple content types.
 
 ### Expose headers {id="expose-headers"}
-The `Access-Control-Expose-Headers` header adds the specified headers to the allowlist that JavaScript in browsers can access.
+
+The `Access-Control-Expose-Headers` header adds the specified headers to the allowlist that JavaScript in browsers can
+access.
 To configure such headers, use the `exposeHeader` function.
 
 ```kotlin
@@ -126,7 +144,9 @@ install(CORS) {
 
 ### Credentials {id="credentials"}
 
-By default, browsers don't send credential information (such as cookies or authentication information) with cross-origin requests. To allow passing this information, set the `Access-Control-Allow-Credentials` response header to `true` using the `allowCredentials` property.
+By default, browsers don't send credential information (such as cookies or authentication information) with cross-origin
+requests. To allow passing this information, set the `Access-Control-Allow-Credentials` response header to `true` using
+the `allowCredentials` property.
 
 ```kotlin
 install(CORS) {
@@ -134,11 +154,11 @@ install(CORS) {
 }
 ```
 
-
-
 ### Miscellaneous {id="misc"}
 
-The `%plugin_name%` plugin also allows you to specify other CORS-related settings. For example, you can use `maxAgeInSeconds` to specify how long the response to the preflight request can be cached without sending another preflight request.
+The `%plugin_name%` plugin also allows you to specify other CORS-related settings. For example, you can
+use `maxAgeInSeconds` to specify how long the response to the preflight request can be cached without sending another
+preflight request.
 
 ```kotlin
 install(CORS) {
@@ -146,4 +166,5 @@ install(CORS) {
 }
 ```
 
-You can learn about other configuration options from [CORSConfig](https://api.ktor.io/ktor-server/ktor-server-plugins/ktor-server-cors/io.ktor.server.plugins.cors/-c-o-r-s-config/index.html).
\ No newline at end of file
+You can learn about other configuration options
+from [CORSConfig](https://api.ktor.io/ktor-server/ktor-server-plugins/ktor-server-cors/io.ktor.server.plugins.cors/-c-o-r-s-config/index.html).
\ No newline at end of file
diff --git a/topics/server-create-a-new-project.topic b/topics/server-create-a-new-project.topic
index 633ff8e04..7a85a9694 100644
--- a/topics/server-create-a-new-project.topic
+++ b/topics/server-create-a-new-project.topic
@@ -953,7 +953,7 @@
                             implementation("io.ktor:ktor-server-core-jvm:$ktor_version")
                             implementation("io.ktor:ktor-server-netty-jvm:$ktor_version")
                             implementation("ch.qos.logback:logback-classic:$logback_version")
-                            testImplementation("io.ktor:ktor-server-tests-jvm:$ktor_version")
+                            testImplementation("io.ktor:ktor-server-test-host-jvm:$ktor_version")
                             testImplementation("org.jetbrains.kotlin:kotlin-test-junit:$kotlin_version")
                         }
                     </code-block>
diff --git a/topics/server-create-restful-apis.topic b/topics/server-create-restful-apis.topic
index 64ac1d73e..13dde5a4c 100644
--- a/topics/server-create-restful-apis.topic
+++ b/topics/server-create-restful-apis.topic
@@ -738,7 +738,7 @@
                     val ktor_version: String by project
 
                     //...
-                    testImplementation("io.ktor:ktor-server-test-host:$ktor_version")
+                    testImplementation("io.ktor:ktor-server-test-host-jvm:$ktor_version")
                     testImplementation("io.ktor:ktor-client-content-negotiation:$ktor_version")
                 </code-block>
             </step>
diff --git a/topics/server-custom-plugins.md b/topics/server-custom-plugins.md
index 898ddf73d..fdcfde6ed 100644
--- a/topics/server-custom-plugins.md
+++ b/topics/server-custom-plugins.md
@@ -11,24 +11,32 @@
 Learn how to create your own custom plugins.
 </link-summary>
 
-Starting with v2.0.0, Ktor provides a new API for creating custom [plugins](server-plugins.md). In general, this API doesn't require an understanding of internal Ktor concepts, such as pipelines, phases, and so on. Instead, you have access to different stages of [handling requests and responses](#call-handling) using the `onCall`, `onCallReceive`, and `onCallRespond` handlers.
-
-> The API described in this topic is in effect for v2.0.0 and higher. For the old versions, you can use the [base API](server-custom-plugins-base-api.md).
+Starting with v2.0.0, Ktor provides a new API for creating custom [plugins](server-plugins.md). In general, this API doesn't
+require an understanding of internal Ktor concepts, such as pipelines, phases, and so on. Instead, you have access to
+different stages of [handling requests and responses](#call-handling) using the `onCall`, `onCallReceive`,
+and `onCallRespond` handlers.
 
+> The API described in this topic is in effect for v2.0.0 and higher. For the old versions, you can use
+the [base API](server-custom-plugins-base-api.md).
 
 ## Create and install your first plugin {id="first-plugin"}
 
-In this section, we'll demonstrate how to create and install your first plugin. 
+In this section, we'll demonstrate how to create and install your first plugin.
 You can use an application created in the [](server-create-a-new-project.topic) tutorial as a starting project.
 
-1. To create a plugin, call the [createApplicationPlugin](https://api.ktor.io/ktor-server/ktor-server-core/io.ktor.server.application/create-application-plugin.html) function and pass a plugin name:
+1. To create a plugin, call
+   the [createApplicationPlugin](https://api.ktor.io/ktor-server/ktor-server-core/io.ktor.server.application/create-application-plugin.html)
+   function and pass a plugin name:
    ```kotlin
    ```
    {src="snippets/custom-plugin/src/main/kotlin/com/example/plugins/SimplePlugin.kt" include-lines="3-7"}
-   
+
    This function returns the `ApplicationPlugin` instance that will be used in the next step to install a plugin.
-   > There is also the [createRouteScopedPlugin](https://api.ktor.io/ktor-server/ktor-server-core/io.ktor.server.application/create-route-scoped-plugin.html) function allowing you to create plugins that can be [installed to a specific route](server-plugins.md#install-route).
-2. To [install a plugin](server-plugins.md#install), pass the created `ApplicationPlugin` instance to the `install` function in the application's initialization code:
+   > There is also
+   the [createRouteScopedPlugin](https://api.ktor.io/ktor-server/ktor-server-core/io.ktor.server.application/create-route-scoped-plugin.html)
+   function allowing you to create plugins that can be [installed to a specific route](server-plugins.md#install-route).
+2. To [install a plugin](server-plugins.md#install), pass the created `ApplicationPlugin` instance to the `install` function in
+   the application's initialization code:
    ```kotlin
    ```
    {src="snippets/custom-plugin/src/main/kotlin/com/example/Application.kt" include-lines="11-12,32"}
@@ -38,40 +46,50 @@ You can use an application created in the [](server-create-a-new-project.topic)
    SimplePlugin is installed!
    2021-10-14 14:54:08.900 [main] INFO  Application - Responding at http://0.0.0.0:8080
    ```
-   
-   
-You can find the full example here: [SimplePlugin.kt](https://github.com/ktorio/ktor-documentation/blob/%ktor_version%/codeSnippets/snippets/custom-plugin/src/main/kotlin/com/example/plugins/SimplePlugin.kt). In the following sections, we'll look at how to handle calls on different stages and provide a plugin configuration.
+
+You can find the full example
+here: [SimplePlugin.kt](https://github.com/ktorio/ktor-documentation/blob/%ktor_version%/codeSnippets/snippets/custom-plugin/src/main/kotlin/com/example/plugins/SimplePlugin.kt).
+In the following sections, we'll look at how to handle calls on different stages and provide a plugin configuration.
 
 ## Handle calls {id="call-handling"}
 
-In your custom plugin, you can [handle requests](server-requests.md) and [responses](server-responses.md) by using a set of handlers that provide access to different stages of a call:
+In your custom plugin, you can [handle requests](server-requests.md) and [responses](server-responses.md) by using a set
+of handlers that provide access to different stages of a call:
 
-* [onCall](#on-call) allows you to get request/response information, modify response parameters (for instance, append custom headers), and so on.
+* [onCall](#on-call) allows you to get request/response information, modify response parameters (for instance, append
+  custom headers), and so on.
 * [onCallReceive](#on-call-receive) allows you to obtain and transform data received from the client.
 * [onCallRespond](#on-call-respond) allows you to transform data before sending it to the client.
-* [on(...)](#other) allows you to invoke specific hooks that might be useful to handle other stages of a call or exceptions that happened during a call.
+* [on(...)](#other) allows you to invoke specific hooks that might be useful to handle other stages of a call or
+  exceptions that happened during a call.
 * If required, you can share a [call state](#call-state) between different handlers using `call.attributes`.
 
 ### onCall {id="on-call"}
 
-The `onCall` handler accepts the `ApplicationCall` as a lambda argument. This allows you to access request/response information and modify response parameters (for instance, [append custom headers](#custom-header)). If you need to transform a request/response body, use [onCallReceive](#on-call-receive)/[onCallRespond](#on-call-respond).
+The `onCall` handler accepts the `ApplicationCall` as a lambda argument. This allows you to access request/response
+information and modify response parameters (for instance, [append custom headers](#custom-header)). If you need to
+transform a request/response body, use [onCallReceive](#on-call-receive)/[onCallRespond](#on-call-respond).
 
 #### Example 1: Request logging {id="request-logging"}
 
 The example below shows how to use `onCall` to create a custom plugin for logging incoming requests:
+
 ```kotlin
 ```
+
 {src="snippets/custom-plugin/src/main/kotlin/com/example/plugins/RequestLoggingPlugin.kt" include-lines="6-12"}
 
 If you install this plugin, the application will show requested URLs in a console, for example:
+
 ```Bash
 Request URL: http://0.0.0.0:8080/
 Request URL: http://0.0.0.0:8080/index
 ```
 
-
 #### Example 2: Custom header {id="custom-header"}
+
 This example demonstrates how to create a plugin that appends a custom header to each response:
+
 ```kotlin
 val CustomHeaderPlugin = createApplicationPlugin(name = "CustomHeaderPlugin") {
     onCall { call ->
@@ -81,70 +99,92 @@ val CustomHeaderPlugin = createApplicationPlugin(name = "CustomHeaderPlugin") {
 ```
 
 As a result, a custom header will be added to all responses:
+
 ```HTTP
 HTTP/1.1 200 OK
 X-Custom-Header: Hello, world!
 ```
-   
-Note that a custom header name and value in this plugin are hardcoded. You can make this plugin more flexible by providing a [configuration](#plugin-configuration) for passing the required custom header name/value.
+
+Note that a custom header name and value in this plugin are hardcoded. You can make this plugin more flexible by
+providing a [configuration](#plugin-configuration) for passing the required custom header name/value.
 
 ### onCallReceive {id="on-call-receive"}
 
-The `onCallReceive` handler provides the `transformBody` function and allows you to transform data received from the client. Suppose the client makes a sample `POST` request that contains `10` as `text/plain` in its body:
+The `onCallReceive` handler provides the `transformBody` function and allows you to transform data received from the
+client. Suppose the client makes a sample `POST` request that contains `10` as `text/plain` in its body:
 
 ```HTTP
 ```
+
 {src="snippets/custom-plugin/post.http"}
 
-To [receive this body](server-requests.md#objects) as an integer value, you need to create a route handler for `POST` requests and call `call.receive` with the `Int` parameter:
+To [receive this body](server-requests.md#objects) as an integer value, you need to create a route handler for `POST`
+requests and call `call.receive` with the `Int` parameter:
 
 ```kotlin
 ```
+
 {src="snippets/custom-plugin/src/main/kotlin/com/example/Application.kt" include-lines="27-28,30"}
 
-Now let's create a plugin that receives a body as an integer value and adds `1` to it. To do this, we need to handle `transformBody` inside `onCallReceive` as follows:
+Now let's create a plugin that receives a body as an integer value and adds `1` to it. To do this, we need to
+handle `transformBody` inside `onCallReceive` as follows:
 
 ```kotlin
 ```
+
 {src="snippets/custom-plugin/src/main/kotlin/com/example/plugins/DataTransformationPlugin.kt" include-lines="6-16,27"}
 
 `transformBody` in the code snippet above works as follows:
 
-1. `TransformBodyContext` is a [lambda receiver](https://kotlinlang.org/docs/scope-functions.html#context-object-this-or-it) that contains type information about the current request. In the example above, the `TransformBodyContext.requestedType` property is used to check the requested data type.
-2. `data` is a lambda argument that allows you to receive a request body as [ByteReadChannel](https://api.ktor.io/ktor-io/io.ktor.utils.io/-byte-read-channel/index.html) and convert it to the required type. In the example above, `ByteReadChannel.readUTF8Line` is used to read a request body. 
+1. `TransformBodyContext` is
+   a [lambda receiver](https://kotlinlang.org/docs/scope-functions.html#context-object-this-or-it) that contains type
+   information about the current request. In the example above, the `TransformBodyContext.requestedType` property is
+   used to check the requested data type.
+2. `data` is a lambda argument that allows you to receive a request body
+   as [ByteReadChannel](https://api.ktor.io/ktor-io/io.ktor.utils.io/-byte-read-channel/index.html) and convert it to
+   the required type. In the example above, `ByteReadChannel.readUTF8Line` is used to read a request body.
 3. Finally, you need to transform and return data. In our example, `1` is added to the received integer value.
 
-You can find the full example here: [DataTransformationPlugin.kt](https://github.com/ktorio/ktor-documentation/blob/%ktor_version%/codeSnippets/snippets/custom-plugin/src/main/kotlin/com/example/plugins/DataTransformationPlugin.kt).
-
+You can find the full example
+here: [DataTransformationPlugin.kt](https://github.com/ktorio/ktor-documentation/blob/%ktor_version%/codeSnippets/snippets/custom-plugin/src/main/kotlin/com/example/plugins/DataTransformationPlugin.kt).
 
 ### onCallRespond {id="on-call-respond"}
 
-`onCallRespond` also provides the `transformBody` handler and allows you to transform data to be sent to the client. This handler is executed when the `call.respond` function is invoked in a route handler. Let's continue with the example from [onCallReceive](#on-call-receive) where an integer value is received in a `POST` request handler:
+`onCallRespond` also provides the `transformBody` handler and allows you to transform data to be sent to the client.
+This handler is executed when the `call.respond` function is invoked in a route handler. Let's continue with the example
+from [onCallReceive](#on-call-receive) where an integer value is received in a `POST` request handler:
 
 ```kotlin
 ```
+
 {src="snippets/custom-plugin/src/main/kotlin/com/example/Application.kt" include-lines="27-30"}
 
-Calling `call.respond` invokes `onCallRespond`, which in turn allows you to transform data to be sent to the client. For example, the code snippet below shows how to add `1` to the initial value:
+Calling `call.respond` invokes `onCallRespond`, which in turn allows you to transform data to be sent to the client. For
+example, the code snippet below shows how to add `1` to the initial value:
 
 ```kotlin
 ```
-{src="snippets/custom-plugin/src/main/kotlin/com/example/plugins/DataTransformationPlugin.kt" include-lines="18-26"}
 
-You can find the full example here: [DataTransformationPlugin.kt](https://github.com/ktorio/ktor-documentation/blob/%ktor_version%/codeSnippets/snippets/custom-plugin/src/main/kotlin/com/example/plugins/DataTransformationPlugin.kt).
+{src="snippets/custom-plugin/src/main/kotlin/com/example/plugins/DataTransformationPlugin.kt" include-lines="18-26"}
 
+You can find the full example
+here: [DataTransformationPlugin.kt](https://github.com/ktorio/ktor-documentation/blob/%ktor_version%/codeSnippets/snippets/custom-plugin/src/main/kotlin/com/example/plugins/DataTransformationPlugin.kt).
 
 ### Other useful handlers {id="other"}
 
-Apart from the `onCall`, `onCallReceive`, and `onCallRespond` handlers, Ktor provides a set of specific hooks that might be useful to handle other stages of a call.
+Apart from the `onCall`, `onCallReceive`, and `onCallRespond` handlers, Ktor provides a set of specific hooks that might
+be useful to handle other stages of a call.
 You can handle these hooks using the `on` handler that accepts a `Hook` as a parameter.
 These hooks include:
 
 - `CallSetup` is invoked as a first step in processing a call.
-- `ResponseBodyReadyForSend` is invoked when a response body comes through all transformations and is ready to be sent. 
+- `ResponseBodyReadyForSend` is invoked when a response body comes through all transformations and is ready to be sent.
 - `ResponseSent` is invoked when a response is successfully sent to a client.
 - `CallFailed` is invoked when a call fails with an exception.
-- [AuthenticationChecked](https://api.ktor.io/ktor-server/ktor-server-plugins/ktor-server-auth/io.ktor.server.auth/-authentication-checked/index.html) is executed after [authentication](server-auth.md) credentials are checked. The following example shows how to use this hook to implement authorization: [custom-plugin-authorization](https://github.com/ktorio/ktor-documentation/blob/%ktor_version%/codeSnippets/snippets/custom-plugin-authorization).
+- [AuthenticationChecked](https://api.ktor.io/ktor-server/ktor-server-plugins/ktor-server-auth/io.ktor.server.auth/-authentication-checked/index.html)
+  is executed after [authentication](server-auth.md) credentials are checked. The following example shows how to use
+  this hook to implement
+  authorization: [custom-plugin-authorization](https://github.com/ktorio/ktor-documentation/blob/%ktor_version%/codeSnippets/snippets/custom-plugin-authorization).
 
 The example below shows how to handle `CallSetup`:
 
@@ -154,17 +194,20 @@ on(CallSetup) { call->
 }
 ```
 
-> There is also the `MonitoringEvent` hook that allows you to [handle application events](#handle-app-events), such as application startup or shutdown.
-
-
+> There is also the `MonitoringEvent` hook that allows you to [handle application events](#handle-app-events), such as
+application startup or shutdown.
 
 ### Share call state {id="call-state"}
 
-Custom plugins allow you to share any value related to a call, so you can access this value inside any handler processing this call. This value is stored as an attribute with a unique key in the `call.attributes` collection. The example below demonstrates how to use attributes to calculate the time between receiving a request and reading a body:
+Custom plugins allow you to share any value related to a call, so you can access this value inside any handler
+processing this call. This value is stored as an attribute with a unique key in the `call.attributes` collection. The
+example below demonstrates how to use attributes to calculate the time between receiving a request and reading a body:
 
 ```kotlin
 ```
-{src="snippets/custom-plugin/src/main/kotlin/com/example/plugins/DataTransformationBenchmarkPlugin.kt" include-lines="6-18"}
+
+{src="snippets/custom-plugin/src/main/kotlin/com/example/plugins/DataTransformationBenchmarkPlugin.kt"
+include-lines="6-18"}
 
 If you make a `POST` request, the plugin prints a delay in a console:
 
@@ -173,14 +216,15 @@ Request URL: http://localhost:8080/transform-data
 Read body delay (ms): 52
 ```
 
-You can find the full example here: [DataTransformationBenchmarkPlugin.kt](https://github.com/ktorio/ktor-documentation/blob/%ktor_version%/codeSnippets/snippets/custom-plugin/src/main/kotlin/com/example/plugins/DataTransformationBenchmarkPlugin.kt).
+You can find the full example
+here: [DataTransformationBenchmarkPlugin.kt](https://github.com/ktorio/ktor-documentation/blob/%ktor_version%/codeSnippets/snippets/custom-plugin/src/main/kotlin/com/example/plugins/DataTransformationBenchmarkPlugin.kt).
 
 > You can also access call attributes in a [route handler](server-requests.md#request_information).
 
-
 ## Handle application events {id="handle-app-events"}
 
-The [on](#other) handler provides the ability to use the `MonitoringEvent` hook to handle events related to an application's lifecycle.
+The [on](#other) handler provides the ability to use the `MonitoringEvent` hook to handle events related to an
+application's lifecycle.
 For example, you can pass the following [predefined events](server-events.md#predefined-events) to the `on` handler:
 
 - `ApplicationStarting`
@@ -193,14 +237,16 @@ The code snippet below shows how to handle application shutdown using `Applicati
 
 ```kotlin
 ```
+
 {src="snippets/events/src/main/kotlin/com/example/plugins/ApplicationMonitoringPlugin.kt" lines="12-13,17"}
 
 This might be useful to release application resources.
 
-
 ## Provide plugin configuration {id="plugin-configuration"}
 
-The [Custom header](#custom-header) example demonstrates how to create a plugin that appends a predefined custom header to each response. Let's make this plugin more useful and provide a configuration for passing the required custom header name/value. 
+The [Custom header](#custom-header) example demonstrates how to create a plugin that appends a predefined custom header
+to each response. Let's make this plugin more useful and provide a configuration for passing the required custom header
+name/value.
 
 1. First, you need to define a configuration class:
 
@@ -222,8 +268,8 @@ The [Custom header](#custom-header) example demonstrates how to create a plugin
    ```
    {src="snippets/custom-plugin/src/main/kotlin/com/example/Application.kt" include-lines="15-18"}
 
-> You can find the full example here: [CustomHeaderPlugin.kt](https://github.com/ktorio/ktor-documentation/blob/%ktor_version%/codeSnippets/snippets/custom-plugin/src/main/kotlin/com/example/plugins/CustomHeaderPlugin.kt).
-
+> You can find the full example
+here: [CustomHeaderPlugin.kt](https://github.com/ktorio/ktor-documentation/blob/%ktor_version%/codeSnippets/snippets/custom-plugin/src/main/kotlin/com/example/plugins/CustomHeaderPlugin.kt).
 
 ### Configuration in a file {id="configuration-file"}
 
@@ -234,18 +280,18 @@ Let's see how to achieve this for `CustomHeaderPlugin`:
 
    <tabs group="config">
    <tab title="application.conf" group-key="hocon">
-   
+
    ```shell
    ```
    {src="snippets/custom-plugin/src/main/resources/application.conf" include-lines="10-15"}
-   
+
    </tab>
    <tab title="application.yaml" group-key="yaml">
-   
+
    ```yaml
    ```
    {src="snippets/custom-plugin/src/main/resources/application.yaml" include-lines="8-11"}
-   
+
    </tab>
    </tabs>
 
@@ -256,22 +302,27 @@ Let's see how to achieve this for `CustomHeaderPlugin`:
 
    ```kotlin
    ```
-   {src="snippets/custom-plugin/src/main/kotlin/com/example/plugins/CustomHeaderPluginConfigurable.kt" include-lines="20-23"}
+   {src="snippets/custom-plugin/src/main/kotlin/com/example/plugins/CustomHeaderPluginConfigurable.kt"
+   include-lines="20-23"}
 
-3. Finally, assign the `http.custom_header` value to the `configurationPath` parameter of the `createApplicationPlugin` function:
+3. Finally, assign the `http.custom_header` value to the `configurationPath` parameter of the `createApplicationPlugin`
+   function:
 
    ```kotlin
    ```
-   {src="snippets/custom-plugin/src/main/kotlin/com/example/plugins/CustomHeaderPluginConfigurable.kt" include-lines="6-18"}
-
-> You can find the full example here: [CustomHeaderPluginConfigurable.kt](https://github.com/ktorio/ktor-documentation/blob/%ktor_version%/codeSnippets/snippets/custom-plugin/src/main/kotlin/com/example/plugins/CustomHeaderPluginConfigurable.kt).
-
+   {src="snippets/custom-plugin/src/main/kotlin/com/example/plugins/CustomHeaderPluginConfigurable.kt"
+   include-lines="6-18"}
 
+> You can find the full example
+here: [CustomHeaderPluginConfigurable.kt](https://github.com/ktorio/ktor-documentation/blob/%ktor_version%/codeSnippets/snippets/custom-plugin/src/main/kotlin/com/example/plugins/CustomHeaderPluginConfigurable.kt).
 
 ## Access application settings {id="app-settings"}
+
 ### Configuration {id="config"}
 
-You can access your server configuration using the `applicationConfig` property, which returns the [ApplicationConfig](https://api.ktor.io/ktor-server/ktor-server-core/io.ktor.server.config/-application-config/index.html) instance. The example below shows how to get a host and port used by the server:
+You can access your server configuration using the `applicationConfig` property, which returns
+the [ApplicationConfig](https://api.ktor.io/ktor-server/ktor-server-core/io.ktor.server.config/-application-config/index.html)
+instance. The example below shows how to get a host and port used by the server:
 
 ```kotlin
 val SimplePlugin = createApplicationPlugin(name = "SimplePlugin") {
@@ -283,7 +334,8 @@ val SimplePlugin = createApplicationPlugin(name = "SimplePlugin") {
 
 ### Environment {id="environment"}
 
-To access the application's environment, use the `environment` property. For example, this property allows you to determine whether the [development mode](server-development-mode.topic) is enabled:
+To access the application's environment, use the `environment` property. For example, this property allows you to
+determine whether the [development mode](server-development-mode.topic) is enabled:
 
 ```kotlin
 val SimplePlugin = createApplicationPlugin(name = "SimplePlugin") {
@@ -296,14 +348,12 @@ val SimplePlugin = createApplicationPlugin(name = "SimplePlugin") {
 }
 ```
 
-
-
-
 ## Miscellaneous {id="misc"}
 
 ### Store plugin state {id="plugin-state"}
 
-To store a plugin's state, you can capture any value from handler lambda. Note that it is recommended to make all state values thread safe by using concurrent data structures and atomic data types:
+To store a plugin's state, you can capture any value from handler lambda. Note that it is recommended to make all state
+values thread safe by using concurrent data structures and atomic data types:
 
 ```kotlin
 val SimplePlugin = createApplicationPlugin(name = "SimplePlugin") {
@@ -319,18 +369,21 @@ val SimplePlugin = createApplicationPlugin(name = "SimplePlugin") {
 
 ### Databases {id="databases"}
 
-
 * Can I use a custom plugin with suspendable databases?
-   
-   Yes. All the handlers are suspending functions, so you can perform any suspendable database operations inside your plugin. But don't forget to deallocate resources for specific calls (for example, by using [on(ResponseSent)](#other)).
+
+  Yes. All the handlers are suspending functions, so you can perform any suspendable database operations inside your
+  plugin. But don't forget to deallocate resources for specific calls (for example, by
+  using [on(ResponseSent)](#other)).
 
 * How to use a custom plugin with blocking databases?
-   
-   As Ktor uses coroutines and suspending functions, making a request to a blocking database can be dangerous because a coroutine that performs a blocking call can be blocked and then suspended forever. To prevent this, you need to create a separate [CoroutineContext](https://kotlinlang.org/docs/coroutine-context-and-dispatchers.html):
+
+  As Ktor uses coroutines and suspending functions, making a request to a blocking database can be dangerous because a
+  coroutine that performs a blocking call can be blocked and then suspended forever. To prevent this, you need to create
+  a separate [CoroutineContext](https://kotlinlang.org/docs/coroutine-context-and-dispatchers.html):
    ```kotlin
    val databaseContext = newSingleThreadContext("DatabaseThread")
    ```
-   Then, once your context is created, wrap each call to your database into `withContext` call:
+  Then, once your context is created, wrap each call to your database into `withContext` call:
    ```kotlin
    onCall {
        withContext(databaseContext) {
diff --git a/topics/server-data-conversion.md b/topics/server-data-conversion.md
index c7f809af0..afdec36be 100644
--- a/topics/server-data-conversion.md
+++ b/topics/server-data-conversion.md
@@ -22,13 +22,6 @@ allows you to serialize and deserialize a list of values. By default, Ktor handl
 [DefaultConversionService](https://api.ktor.io/ktor-utils/io.ktor.util.converters/-default-conversion-service/index.html).
 You can extend this service to handle additional types by installing and configuring the `%plugin_name%` plugin.
 
-If you are using the [Locations plugin](server-locations.md) and want to support
-custom types in the `Location` class parameters, you can utilize the `%plugin_name%` plugin to handle those types.
-
-> Note that the `Locations` plugin is experimental and will be removed in the future. For type-safe routing, we suggest
-> to use the [Resources](server-resources.md) plugin instead,
-> which supports serialization under the hood.
-
 ## Add dependencies {id="add_dependencies"}
 
 <include from="lib.topic" element-id="add_ktor_artifact_intro"/>
@@ -90,27 +83,14 @@ When the `decode` function is called, the service will format the date as a `Loc
 ```kotlin
 ```
 
-{src="snippets/data-conversion/src/main/kotlin/dataconversion/Application.kt" include-lines="27-42,49"}
+{src="snippets/data-conversion/src/main/kotlin/dataconversion/Application.kt" include-lines="18-34"}
 
 The conversion service can then be called manually to retrieve the encoded and decoded values:
 
 ```kotlin
 ```
 
-{src="snippets/data-conversion/src/main/kotlin/dataconversion/Application.kt" include-lines="56-57"}
-
-### Customize enum serialization with Locations
-
-Another potential use case is to customize how a specific `enum` is serialized.
-By default, enums are serialized and deserialized using their `name` attribute in a case-sensitive fashion.
-But you can, for example, serialize them as lower case and deserialize
-them as case-insensitive, as seen in the following example:
-
-```kotlin
-```
-
-{src="snippets/data-conversion/src/main/kotlin/dataconversion/Application.kt"
-include-lines="16-22,25-27,43-49,51-54,61"}
+{src="snippets/data-conversion/src/main/kotlin/dataconversion/Application.kt" include-lines="38-39"}
 
 For the full example,
 see [%example_name%](https://github.com/ktorio/ktor-documentation/tree/%ktor_version%/codeSnippets/snippets/%example_name%)
\ No newline at end of file
diff --git a/topics/server-default-headers.md b/topics/server-default-headers.md
index 3db1e1a1b..621f618e6 100644
--- a/topics/server-default-headers.md
+++ b/topics/server-default-headers.md
@@ -11,7 +11,7 @@
 <p>
 <b>Required dependencies</b>: <code>io.ktor:%artifact_name%</code>
 </p>
-<include from="lib.topic" element-id="native_server_not_supported"/>
+<include from="lib.topic" element-id="native_server_supported"/>
 </tldr>
 
 The [%plugin_name%](%plugin_api_link%) plugin adds the standard `Server` and `Date` headers into each response. Moreover, you can provide additional default headers and override the `Server` header.
diff --git a/topics/server-engines.md b/topics/server-engines.md
index 1d3987d4a..38111d753 100644
--- a/topics/server-engines.md
+++ b/topics/server-engines.md
@@ -25,9 +25,11 @@ The table below lists engines supported by Ktor, along with the supported platfo
 | `CIO` (Coroutine-based I/O)             | JVM, [Native](server-native.md), [GraalVM](graalvm.md) | ✖️     |
 | [ServletApplicationEngine](server-war.md) | JVM                                                  | ✅      |
 
-
 ## Add dependencies {id="dependencies"}
-Before using the desired engine, you need to add the corresponding dependency to your [build script](server-dependencies.topic):
+
+Before using the desired engine, you need to add the corresponding dependency to
+your [build script](server-dependencies.topic):
+
 * `ktor-server-netty`
 * `ktor-server-jetty`
 * `ktor-server-tomcat`
@@ -38,32 +40,42 @@ Below are examples of adding a dependency for Netty:
 <var name="artifact_name" value="ktor-server-netty"/>
 <include from="lib.topic" element-id="add_ktor_artifact"/>
 
-
 ## Choose how to create a server {id="choose-create-server"}
-A Ktor server application can be [created and run in two ways](server-create-and-configure.topic#embedded): using the [embeddedServer](#embeddedServer) to quickly pass server parameters in code, or using [EngineMain](#EngineMain) to load the configuration from the external `application.conf` or `application.yaml` file.
+A Ktor server application can be [created and run in two ways](server-create-and-configure.topic#embedded): using
+the [embeddedServer](#embeddedServer) to quickly pass server parameters in code, or using [EngineMain](#EngineMain) to
+load the configuration from the external `application.conf` or `application.yaml` file.
 
 ### embeddedServer {id="embeddedServer"}
 
-The [embeddedServer](https://api.ktor.io/ktor-server/ktor-server-core/io.ktor.server.engine/-embedded-server/index.html) function accepts an engine factory used to create an engine of a specific type. In the example below, we pass the [Netty](https://api.ktor.io/ktor-server/ktor-server-netty/io.ktor.server.netty/-netty/index.html) factory to run a server with the Netty engine and listen on the `8080` port:
+The [embeddedServer](https://api.ktor.io/ktor-server/ktor-server-core/io.ktor.server.engine/embedded-server.html)
+function accepts an engine factory used to create an engine of a specific type. In the example below, we pass
+the [Netty](https://api.ktor.io/ktor-server/ktor-server-netty/io.ktor.server.netty/-netty/index.html) factory to run a
+server with the Netty engine and listen on the `8080` port:
 
 ```kotlin
 ```
+
 {src="snippets/embedded-server/src/main/kotlin/com/example/Application.kt"}
 
 ### EngineMain {id="EngineMain"}
+
 `EngineMain` represents an engine for running a server. You can use the following engines:
+
 * `io.ktor.server.netty.EngineMain`
 * `io.ktor.server.jetty.EngineMain`
 * `io.ktor.server.tomcat.EngineMain`
 * `io.ktor.server.cio.EngineMain`
 
-The `EngineMain.main` function is used to start a server with the selected engine and loads the [application module](server-modules.md) specified in the external [configuration file](server-configuration-file.topic). In the example below, we start a server from the application's `main` function:
+The `EngineMain.main` function is used to start a server with the selected engine and loads
+the [application module](server-modules.md) specified in the external [configuration file](server-configuration-file.topic). In the
+example below, we start a server from the application's `main` function:
 
 <tabs>
 <tab title="Application.kt">
 
 ```kotlin
 ```
+
 {src="snippets/engine-main/src/main/kotlin/com/example/Application.kt"}
 
 </tab>
@@ -72,6 +84,7 @@ The `EngineMain.main` function is used to start a server with the selected engin
 
 ```shell
 ```
+
 {src="snippets/engine-main/src/main/resources/application.conf"}
 
 </tab>
@@ -80,6 +93,7 @@ The `EngineMain.main` function is used to start a server with the selected engin
 
 ```yaml
 ```
+
 {src="snippets/engine-main-yaml/src/main/resources/application.yaml"}
 
 </tab>
@@ -87,7 +101,8 @@ The `EngineMain.main` function is used to start a server with the selected engin
 
 
 
-If you need to start a server using a build system task, you need to configure the required `EngineMain` as the main class:
+If you need to start a server using a build system task, you need to configure the required `EngineMain` as the main
+class:
 
 <tabs group="languages" id="main-class-set-engine-main">
 <tab title="Gradle (Kotlin)" group-key="kotlin">
@@ -117,24 +132,29 @@ mainClassName = "io.ktor.server.netty.EngineMain"
 </tab>
 </tabs>
 
-
 ## Configure an engine {id="configure-engine"}
 
 In this section, we'll take a look at how to specify various engine-specific options.
 
 ### In code {id="embedded-server-configure"}
 
-The `embeddedServer` function allows you to pass engine-specific options using the `configure` optional parameter. This parameter includes options common for all engines and exposed by the [ApplicationEngine.Configuration](https://api.ktor.io/ktor-server/ktor-server-core/io.ktor.server.engine/-application-engine/-configuration/index.html) class.
+The `embeddedServer` function allows you to pass engine-specific options using the `configure` optional parameter. This
+parameter includes options common for all engines and exposed by
+the [ApplicationEngine.Configuration](https://api.ktor.io/ktor-server/ktor-server-core/io.ktor.server.engine/-application-engine/-configuration/index.html)
+class.
 
 ```kotlin
 ```
+
 {src="snippets/_misc/EmbeddedServerConfigureEngine.kt"}
 
 In addition to these options, you can configure additional engine-specific properties.
 
 #### Netty {id="netty-code"}
 
-Netty-specific options are exposed by the [NettyApplicationEngine.Configuration](https://api.ktor.io/ktor-server/ktor-server-netty/io.ktor.server.netty/-netty-application-engine/-configuration/index.html) class.
+Netty-specific options are exposed by
+the [NettyApplicationEngine.Configuration](https://api.ktor.io/ktor-server/ktor-server-netty/io.ktor.server.netty/-netty-application-engine/-configuration/index.html)
+class.
 
 ```kotlin
 import io.ktor.server.engine.*
@@ -156,8 +176,16 @@ fun main() {
 
 #### Jetty {id="jetty-code"}
 
-If you use Jetty as the engine, you can configure the Jetty server inside the [configureServer](https://api.ktor.io/ktor-server/ktor-server-jetty/io.ktor.server.jetty/-jetty-application-engine-base/-configuration/configure-server.html) block, which provides access to a
-[Server](https://www.eclipse.org/jetty/javadoc/jetty-11/org/eclipse/jetty/server/Server.html) instance.
+Jetty-specific options are exposed by
+the [JettyApplicationEngineBase.Configuration](https://api.ktor.io/ktor-server/ktor-server-jetty/io.ktor.server.jetty/-jetty-application-engine-base/-configuration/index.html)
+class.
+
+You can configure the Jetty server inside
+the [configureServer](https://api.ktor.io/ktor-server/ktor-server-jetty/io.ktor.server.jetty/-jetty-application-engine-base/-configuration/configure-server.html)
+block, which provides access to
+a [Server](https://www.eclipse.org/jetty/javadoc/jetty-11/org/eclipse/jetty/server/Server.html) instance.
+
+Use the `idleTimeout` property to specify the duration of time a connection can be idle before it gets closed.
 
 ```kotlin
 import io.ktor.server.engine.*
@@ -168,6 +196,7 @@ fun main() {
         configureServer = { // this: Server ->
             // ...
         }
+        idleTimeout = 30.seconds
     }) {
         // ...
     }.start(true)
@@ -176,7 +205,9 @@ fun main() {
 
 #### CIO {id="cio-code"}
 
-CIO-specific options are exposed by the [CIOApplicationEngine.Configuration](https://api.ktor.io/ktor-server/ktor-server-cio/io.ktor.server.cio/-c-i-o-application-engine/-configuration/index.html) class.
+CIO-specific options are exposed by
+the [CIOApplicationEngine.Configuration](https://api.ktor.io/ktor-server/ktor-server-cio/io.ktor.server.cio/-c-i-o-application-engine/-configuration/index.html)
+class.
 
 ```kotlin
 import io.ktor.server.engine.*
@@ -193,7 +224,9 @@ fun main() {
 
 #### Tomcat {id="tomcat-code"}
 
-If you use Tomcat as the engine, you can configure it using the [configureTomcat](https://api.ktor.io/ktor-server/ktor-server-tomcat/io.ktor.server.tomcat/-tomcat-application-engine/-configuration/configure-tomcat.html) property, which provides access to a
+If you use Tomcat as the engine, you can configure it using
+the [configureTomcat](https://api.ktor.io/ktor-server/ktor-server-tomcat/io.ktor.server.tomcat/-tomcat-application-engine/-configuration/configure-tomcat.html)
+property, which provides access to a
 [Tomcat](https://tomcat.apache.org/tomcat-9.0-doc/api/org/apache/catalina/startup/Tomcat.html) instance.
 
 ```kotlin
@@ -211,11 +244,10 @@ fun main() {
 }
 ```
 
-
-
 ### In a configuration file {id="engine-main-configure"}
 
-If you use `EngineMain`, you can specify options common for all engines in a [configuration file](server-configuration-file.topic) within the `ktor.deployment` group.
+If you use `EngineMain`, you can specify options common for all engines in
+a [configuration file](server-configuration-file.topic) within the `ktor.deployment` group.
 
 <tabs group="config">
 <tab title="application.conf" group-key="hocon">
@@ -248,7 +280,6 @@ ktor:
 </tab>
 </tabs>
 
-
 #### Netty {id="netty-file"}
 
 You can also configure Netty-specific options in a configuration file within the `ktor.deployment` group:
diff --git a/topics/server-events.md b/topics/server-events.md
index 37ee2b3cf..c60a63f8a 100644
--- a/topics/server-events.md
+++ b/topics/server-events.md
@@ -8,23 +8,29 @@
 </tldr>
 
 Ktor provides the ability to monitor your server application by using events.
-You can handle predefined events related to an application's lifecycle (application starting, stopping, etc.), or you can use custom events to handle specific cases. You can also handle events for custom plugins using the [MonitoringEvent](server-custom-plugins.md#handle-app-events) hook.
-
-
+You can handle predefined events related to an application's lifecycle (application starting, stopping, etc.), or you
+can use custom events to handle specific cases. You can also handle events for custom plugins using
+the [MonitoringEvent](server-custom-plugins.md#handle-app-events) hook.
 
 ## Event definition {id="event-definition"}
 
-Each event is represented by the [EventDefinition](https://api.ktor.io/ktor-shared/ktor-events/io.ktor.events/-event-definition/index.html) class instance. This class has a `T` type parameter specifying the type of value passed to the event. This value can be accessed in the [event handler](#handle-events-application) as a lambda argument. For example, most of the [predefined events](#predefined-events) accept `Application` as a parameter allowing you to access application properties inside the event handler.
+Each event is represented by
+the [EventDefinition](https://api.ktor.io/ktor-shared/ktor-events/io.ktor.events/-event-definition/index.html) class
+instance. This class has a `T` type parameter specifying the type of value passed to the event. This value can be
+accessed in the [event handler](#handle-events-application) as a lambda argument. For example, most of
+the [predefined events](#predefined-events) accept `Application` as a parameter allowing you to access application
+properties inside the event handler.
 
 For a [custom event](#custom-events), you can pass a type parameter required for this event.
 The code snippet below shows how to create a custom `NotFoundEvent` that accepts the `ApplicationCall` instance.
 
 ```kotlin
 ```
-{src="snippets/events/src/main/kotlin/com/example/plugins/ApplicationMonitoringPlugin.kt" include-lines="25"}
 
-The [](#custom-events) section shows how to raise this event in a custom plugin when a server returns the `404 Not Found` status code for a resource.
+{src="snippets/events/src/main/kotlin/com/example/plugins/ApplicationMonitoringPlugin.kt" include-lines="25"}
 
+The [](#custom-events) section shows how to raise this event in a custom plugin when a server returns
+the `404 Not Found` status code for a resource.
 
 ### Predefined application events {id="predefined-events"}
 
@@ -39,70 +45,79 @@ Ktor provides the following predefined events related to an application's lifecy
 
 For example, you can subscribe to the `ApplicationStopped` event to release application resources.
 
-
 ## Handle events in an application {id="handle-events-application"}
 
-To handle events for the specified `Application` instance, use the `Application.environment.monitor` property.
-This property provides access to the [Events](https://api.ktor.io/ktor-shared/ktor-events/io.ktor.events/-events/index.html) instance that exposes the following functions allowing you to handle application events:
+To handle events for the specified `Application` instance, use the `monitor` property.
+This property provides access to
+the [Events](https://api.ktor.io/ktor-shared/ktor-events/io.ktor.events/-events/index.html) instance that exposes the
+following functions allowing you to handle application events:
+
 - `subscribe`: subscribes to an event specified by [EventDefinition](#event-definition).
 - `unsubscribe`: unsubscribes from an event specified by [EventDefinition](#event-definition).
 - `raise`: raises an event specified by [EventDefinition](#event-definition) with the specified value.
-   > The [](#custom-events) section shows how to raise custom events.
+  > The [](#custom-events) section shows how to raise custom events.
 
-The `subscribe` / `unsubscribe` functions accept the `EventDefinition` instance with the `T` value as a lambda argument. The example below shows how to subscribe to the `ApplicationStarted` event and [log](server-logging.md) a message in the event handler:
+The `subscribe` / `unsubscribe` functions accept the `EventDefinition` instance with the `T` value as a lambda argument.
+The example below shows how to subscribe to the `ApplicationStarted` event and [log](server-logging.md) a message in the event
+handler:
 
 ```kotlin
 ```
+
 {src="snippets/events/src/main/kotlin/com/example/Application.kt" include-lines="11,13-15,30"}
 
 In this example, you can see how to handle the `ApplicationStopped` event:
 
 ```kotlin
 ```
-{src="snippets/events/src/main/kotlin/com/example/Application.kt" include-lines="11,16-21,30"}
-
-You can find the full example here: [events](https://github.com/ktorio/ktor-documentation/tree/%ktor_version%/codeSnippets/snippets/events).
-
 
+{src="snippets/events/src/main/kotlin/com/example/Application.kt" include-lines="11,16-21,30"}
 
+For the full example, see [events](https://github.com/ktorio/ktor-documentation/tree/%ktor_version%/codeSnippets/snippets/events).
 
 ## Handle events in a custom plugin {id="handle-events-plugin"}
 
-You can handle events in [custom plugins](server-custom-plugins.md#handle-app-events) using the `MonitoringEvent` hook. 
-The example below shows how to create the `ApplicationMonitoringPlugin` plugin and handle the `ApplicationStarted` and `ApplicationStopped` events:
+You can handle events in [custom plugins](server-custom-plugins.md#handle-app-events) using the `MonitoringEvent` hook.
+The example below shows how to create the `ApplicationMonitoringPlugin` plugin and handle the `ApplicationStarted`
+and `ApplicationStopped` events:
 
 ```kotlin
 ```
-{src="snippets/events/src/main/kotlin/com/example/plugins/ApplicationMonitoringPlugin.kt" include-lines="3-17,23"}
 
-You can find the full example here: [events](https://github.com/ktorio/ktor-documentation/tree/%ktor_version%/codeSnippets/snippets/events).
+{src="snippets/events/src/main/kotlin/com/example/plugins/ApplicationMonitoringPlugin.kt" include-lines="3-17,23"}
 
+You can find the full example
+here: [events](https://github.com/ktorio/ktor-documentation/tree/%ktor_version%/codeSnippets/snippets/events).
 
 ## Custom events {id="custom-events"}
 
-In this section, we'll take a look at how to create a custom event raised when a server returns the `404 Not Found` status code for a resource. 
+In this section, we'll take a look at how to create a custom event raised when a server returns the `404 Not Found`
+status code for a resource.
 
 1. First, you need to create the [event definition](#event-definition).
-   The code snippet below shows how to create a custom `NotFoundEvent` event that accepts `ApplicationCall` as a parameter.
-   
+   The code snippet below shows how to create a custom `NotFoundEvent` event that accepts `ApplicationCall` as a
+   parameter.
+
    ```kotlin
    ```
    {src="snippets/events/src/main/kotlin/com/example/plugins/ApplicationMonitoringPlugin.kt" include-lines="25"}
-2. To raise the event, call the `Events.raise` function. The sample below shows how to handle the `ResponseSent` [hook](server-custom-plugins.md#other) to raise the newly created event if the status code for a call is `404`.
-   
+2. To raise the event, call the `Events.raise` function. The sample below shows how to handle
+   the `ResponseSent` [hook](server-custom-plugins.md#other) to raise the newly created event if the status code for a call
+   is `404`.
+
    ```kotlin
    ```
    {src="snippets/events/src/main/kotlin/com/example/plugins/ApplicationMonitoringPlugin.kt" include-lines="3-8,18-23"}
-3. To handle the created event in the Application, [install](server-plugins.md#install) the plugin ...
-   
+3. To handle the created event in the Application, [install](server-plugins.md#install) the plugin:
+
    ```kotlin
    ```
    {src="snippets/events/src/main/kotlin/com/example/Application.kt" include-lines="11-12,30"}
-   
-   ... and subscribe to the event using `Events.subscribe`:
-   
+
+4. Then, subscribe to the event using `Events.subscribe`:
+
    ```kotlin
    ```
-   {src="snippets/events/src/main/kotlin/com/example/Application.kt" include-lines="11,22-24,30"}
+   {src="snippets/events/src/main/kotlin/com/example/Application.kt" include-lines="11-12,22-24,30"}
 
-You can find the full example here: [events](https://github.com/ktorio/ktor-documentation/tree/%ktor_version%/codeSnippets/snippets/events).
+For the full exmaple, see [events](https://github.com/ktorio/ktor-documentation/tree/%ktor_version%/codeSnippets/snippets/events).
diff --git a/topics/server-fatjar.md b/topics/server-fatjar.md
index bafd5ac0e..39c66ee69 100644
--- a/topics/server-fatjar.md
+++ b/topics/server-fatjar.md
@@ -14,17 +14,17 @@ To build a fat JAR, you need to configure the Ktor plugin first:
 1. Open the `build.gradle.kts` file and add the plugin to the `plugins` block:
    ```kotlin
    ```
-   {src="snippets/deployment-ktor-plugin/build.gradle.kts" include-lines="5,8-9"}
+   {src="snippets/deployment-ktor-plugin/build.gradle.kts" include-lines="4,7-8"}
 
 2. Make sure the [main application class](server-dependencies.topic#create-entry-point) is configured:
    ```kotlin
    ```
-   {src="snippets/deployment-ktor-plugin/build.gradle.kts" include-lines="11-13"}
+   {src="snippets/deployment-ktor-plugin/build.gradle.kts" include-lines="10-12"}
 
 3. Optionally, you can  configure the name of the fat JAR to be generated using the `ktor.fatJar` extension:
    ```kotlin
    ```
-   {src="snippets/deployment-ktor-plugin/build.gradle.kts" include-lines="29-32,54"}
+   {src="snippets/deployment-ktor-plugin/build.gradle.kts" include-lines="28-31,53"}
 
 
 ## Build and run a fat JAR {id="build"}
diff --git a/topics/server-jwt.md b/topics/server-jwt.md
index 980f12356..26612741e 100644
--- a/topics/server-jwt.md
+++ b/topics/server-jwt.md
@@ -113,7 +113,7 @@ To configure JWT-related settings, you can create a custom `jwt` group in a [con
 
 ```
 ```
-{style="block" src="snippets/auth-jwt-hs256/src/main/resources/application.conf" include-lines="11-16"}
+{style="block" src="snippets/auth-jwt-hs256/src/main/resources/application-custom.conf" include-lines="11-16"}
 
 </tab>
 <tab title="RS256" group-key="rs256">
diff --git a/topics/server-locations.md b/topics/server-locations.md
deleted file mode 100644
index 97b7226a0..000000000
--- a/topics/server-locations.md
+++ /dev/null
@@ -1,138 +0,0 @@
-[//]: # (title: Locations)
-
-<var name="plugin_name" value="Locations"/>
-<var name="package_name" value="io.ktor.server.locations"/>
-<var name="artifact_name" value="ktor-server-locations"/>
-
-<tldr>
-<p>
-<b>Required dependencies</b>: <code>io.ktor:%artifact_name%</code>
-</p>
-<var name="example_name" value="locations"/>
-<include from="lib.topic" element-id="download_example"/>
-<include from="lib.topic" element-id="native_server_not_supported"/>
-</tldr>
-
-
-Ktor provides a mechanism to create routes in a typed way, for both:
-constructing URLs and reading the parameters.
-
-> In v2.0.0, the `Locations` plugin is deprecated. Use the [Resources](server-resources.md) plugin instead.
->
-{type="note"}
-
-
-## Add dependencies {id="add_dependencies"}
-
-<include from="lib.topic" element-id="add_ktor_artifact_intro"/>
-<include from="lib.topic" element-id="add_ktor_artifact"/>
-
-
-## Install Locations {id="install_plugin"}
-
-<include from="lib.topic" element-id="install_plugin"/>
-
-
-## Define route classes
-{id="route-classes"}
-
-For each typed route you want to handle, you need to create a class (usually a data class)
-containing the parameters that you want to handle.
-
-The parameters must be of any type supported by the [Data Conversion](server-data-conversion.md) plugin.
-By default, you can use `Int`, `Long`, `Float`, `Double`, `Boolean`, `String`, enums and `Iterable` as parameters.
-
-### URL parameters
-{id="parameters-url"}
-
-That class must be annotated with `@Location` specifying
-a path to match with placeholders between curly brackets `{` and `}`. For example: `{propertyName}`.
-The names between the curly braces must match the properties of the class.
-
-```kotlin
-@Location("/list/{name}/page/{page}")
-data class Listing(val name: String, val page: Int)
-```
-
-* Will match: `/list/movies/page/10`
-* Will construct: `Listing(name = "movies", page = 10)`
-
-### GET parameters
-{id="parameters-get"}
-
-If you provide additional class properties that are not part of the path of the `@Location`,
-those parameters will be obtained from the GET's query string or POST parameters:
-
-```kotlin
-@Location("/list/{name}")
-data class Listing(val name: String, val page: Int, val count: Int)
-```
-
-* Will match: `/list/movies?page=10&count=20`
-* Will construct: `Listing(name = "movies", page = 10, count = 20)`
-
-## Define route handlers
-{id="route-handlers"}
-
-Once you have [defined the classes](#route-classes) annotated with `@Location`,
-this plugin artifact exposes new typed methods for defining route handlers:
-`get`, `options`, `header`, `post`, `put`, `delete` and `patch`.
-
-```kotlin
-routing {
-    get<Listing> { listing ->
-        call.respondText("Listing ${listing.name}, page ${listing.page}")
-    }
-}
-```
-
->Some of these generic methods with one type parameter, defined in the `io.ktor.server.locations`, have the same name as other methods defined in the `io.ktor.routing` package. If you import the `routing` package before the `locations` one, the IDE might suggest you generalize those methods instead of importing the right package. You can manually add `import io.ktor.server.locations.*` if that happens to you.
-> Remember, this API is experimental. This issue is already [reported at GitHub](https://github.com/ktorio/ktor/issues/368).
->
-{type="note"}
-
-## Build URLs
-{id="building-urls"}
-
-You can construct URLs to your routes by calling `application.locations.href` with
-an instance of a class annotated with `@Location`:
-
-```kotlin
-val path = application.locations.href(Listing(name = "movies", page = 10, count = 20))
-```
-
-So for this class, `path` would be `"/list/movies?page=10&count=20""`.
-
-```kotlin
-@Location("/list/{name}") data class Listing(val name: String, val page: Int, val count: Int)
-```
-
-If you construct the URLs like this, and you decide to change the format of the URL,
-you will just have to update the `@Location` path, which is really convenient.
-
-## Subroutes with parameters
-{id="subroutes"}
-
-You have to create classes referencing to another class annotated with `@Location` like this, and register them normally:
-
-```kotlin
-routing {
-    get<Type.Edit> { typeEdit -> // /type/{name}/edit
-        // ...
-    }
-    get<Type.List> { typeList -> // /type/{name}/list/{page}
-        // ...
-    }
-}
-```
- 
-To obtain parameters defined in the superior locations, you just have to include
-those property names in your classes for the internal routes. For example:
-
-```kotlin
-@Location("/type/{name}") data class Type(val name: String) {
-	// In these classes we have to include the `name` property matching the parent.
-	@Location("/edit") data class Edit(val parent: Type)
-	@Location("/list/{page}") data class List(val parent: Type, val page: Int)
-}
-```
\ No newline at end of file
diff --git a/topics/server-oauth.md b/topics/server-oauth.md
index c0907fda8..5db0f9bf1 100644
--- a/topics/server-oauth.md
+++ b/topics/server-oauth.md
@@ -37,7 +37,7 @@ request the resource.
 ```kotlin
 ```
 
-{src="snippets/auth-oauth-google/src/main/kotlin/com/example/Application.kt" include-lines="14,25-29,101,128"}
+{src="snippets/auth-oauth-google/src/main/kotlin/com/example/oauth/google/Application.kt" include-lines="14,25-29,101,128-129"}
 
 ## OAuth authorization flow {id="flow"}
 
@@ -76,7 +76,7 @@ For example, to install an `oauth` provider with the name "auth-oauth-google" it
 ```kotlin
 ```
 
-{src="snippets/auth-oauth-google/src/main/kotlin/com/example/Application.kt" include-lines="9-10,25-26,31-33,54-55,101"}
+{src="snippets/auth-oauth-google/src/main/kotlin/com/example/oauth/google/Application.kt" include-lines="9-10,25-26,31-33,54-55,101"}
 
 ## Configure OAuth {id="configure-oauth"}
 
@@ -110,7 +110,7 @@ JSON serializer is required to deserialize received JSON data [after a request t
 ```kotlin
 ```
 
-{src="snippets/auth-oauth-google/src/main/kotlin/com/example/Application.kt" include-lines="20-24"}
+{src="snippets/auth-oauth-google/src/main/kotlin/com/example/oauth/google/Application.kt" include-lines="20-24"}
 
 The client instance is passed to the `main` [module function](server-modules.md) to have the capability to create a separate
 client instance in a server [test](server-testing.md).
@@ -118,7 +118,7 @@ client instance in a server [test](server-testing.md).
 ```kotlin
 ```
 
-{src="snippets/auth-oauth-google/src/main/kotlin/com/example/Application.kt" include-lines="26,101"}
+{src="snippets/auth-oauth-google/src/main/kotlin/com/example/oauth/google/Application.kt" include-lines="26,101"}
 
 ### Step 2: Configure the OAuth provider {id="configure-oauth-provider"}
 
@@ -127,7 +127,7 @@ The code snippet below shows how to create and configure the `oauth` provider wi
 ```kotlin
 ```
 
-{src="snippets/auth-oauth-google/src/main/kotlin/com/example/Application.kt" include-lines="30-54"}
+{src="snippets/auth-oauth-google/src/main/kotlin/com/example/oauth/google/Application.kt" include-lines="30-54"}
 
 * The `urlProvider` specifies a [redirect route](#redirect-route) that will be invoked when authorization is completed.
   > Make sure that this route is added to a list of [**Authorised redirect URIs**](#authorization-credentials).
@@ -148,7 +148,7 @@ in [providerLookup](#configure-oauth-provider).
 ```kotlin
 ```
 
-{src="snippets/auth-oauth-google/src/main/kotlin/com/example/Application.kt" include-lines="56-60,76,100"}
+{src="snippets/auth-oauth-google/src/main/kotlin/com/example/oauth/google/Application.kt" include-lines="56-60,76,100"}
 
 A user will see the authorization page with the level of permissions required for a Ktor application. These permissions
 depend on `defaultScopes` specified in [providerLookup](#configure-oauth-provider).
@@ -166,7 +166,7 @@ returned by the OAuth server.
 ```kotlin
 ```
 
-{src="snippets/auth-oauth-google/src/main/kotlin/com/example/Application.kt" include-lines="56-76,100"}
+{src="snippets/auth-oauth-google/src/main/kotlin/com/example/oauth/google/Application.kt" include-lines="56-76,100"}
 
 In this example, the following actions are performed after receiving a token:
 
@@ -185,14 +185,14 @@ Create a new function called `getPersonalGreeting` which will make the request a
 ```kotlin
 ```
 
-{src="snippets/auth-oauth-google/src/main/kotlin/com/example/Application.kt" include-lines="103-110"}
+{src="snippets/auth-oauth-google/src/main/kotlin/com/example/oauth/google/Application.kt" include-lines="103-110"}
 
 Then, you can call the function within a `get` route to retrieve a user's information:
 
 ```kotlin
 ```
 
-{src="snippets/auth-oauth-google/src/main/kotlin/com/example/Application.kt" include-lines="93-99"}
+{src="snippets/auth-oauth-google/src/main/kotlin/com/example/oauth/google/Application.kt" include-lines="93-99"}
 
 For the complete runnable example,
 see [auth-oauth-google](https://github.com/ktorio/ktor-documentation/tree/%ktor_version%/codeSnippets/snippets/auth-oauth-google). 
diff --git a/topics/server-packaging.md b/topics/server-packaging.md
index 6e4a118bd..2c04d3e93 100644
--- a/topics/server-packaging.md
+++ b/topics/server-packaging.md
@@ -16,12 +16,12 @@ To create the application distribution, you need to apply the Ktor plugin first:
 1. Open the `build.gradle.kts` file and add the plugin to the `plugins` block:
    ```kotlin
    ```
-   {src="snippets/deployment-ktor-plugin/build.gradle.kts" include-lines="5,8-9"}
+   {src="snippets/deployment-ktor-plugin/build.gradle.kts" include-lines="4,7-8"}
 
 2. Make sure the [main application class](server-dependencies.topic#create-entry-point) is configured:
    ```kotlin
    ```
-   {src="snippets/deployment-ktor-plugin/build.gradle.kts" include-lines="11-13"}
+   {src="snippets/deployment-ktor-plugin/build.gradle.kts" include-lines="10-12"}
 
 
 ## Package the application {id="package"}
diff --git a/topics/server-responses.md b/topics/server-responses.md
index 46c07d21a..4c84fb0ad 100644
--- a/topics/server-responses.md
+++ b/topics/server-responses.md
@@ -56,18 +56,31 @@ To enable serialization of data objects in Ktor, you need to install the [Conten
 
 You can find the full example here: [json-kotlinx](https://github.com/ktorio/ktor-documentation/tree/%ktor_version%/codeSnippets/snippets/json-kotlinx).
 
+[//]: # (TODO: Check link for LocalPathFile)
 
 ### File {id="file"}
-To respond to a client with a content of a file, use the [call.respondFile](https://api.ktor.io/ktor-server/ktor-server-core/io.ktor.server.response/respond-file.html) function. A code sample below shows how to send a specified file in a response and make this file downloadable by adding the `Content-Disposition` [header](#headers):
+
+To respond to a client with a content of a file, you have two options:
+
+- For `File` resources, use
+  the [call.respondFile](https://api.ktor.io/ktor-server/ktor-server-core/io.ktor.server.response/respond-file.html)
+  function.
+- For `Path` resources, use the `call.respond()` function with
+  the [LocalPathContent](https://api.ktor.io/ktor-server/ktor-server-core/io.ktor.server.http.content/-local-path-content/index.html)
+  class.
+
+A code sample below shows how to send a specified file in a response and make this file downloadable by adding the `Content-Disposition` [header](#headers):
+
 ```kotlin
 ```
-{src="snippets/download-file/src/main/kotlin/com/example/DownloadFile.kt" include-lines="3-25"}
+{src="snippets/download-file/src/main/kotlin/com/example/DownloadFile.kt" include-lines="3-35"}
 
 Note that this sample has two plugins installed:
 - [PartialContent](server-partial-content.md) enables the server to respond to requests with the `Range` header and send only a portion of content.
 - [AutoHeadResponse](server-autoheadresponse.md) provides the ability to automatically respond to `HEAD` request for every route that has a `GET` defined. This allows the client application to determine the file size by reading the `Content-Length` header value.
 
-To learn how to run the sample, see [download-file](https://github.com/ktorio/ktor-documentation/tree/%ktor_version%/codeSnippets/snippets/download-file).
+For the full code sample,
+see [download-file](https://github.com/ktorio/ktor-documentation/tree/%ktor_version%/codeSnippets/snippets/download-file).
 
 
 ### Raw payload {id="raw"}
diff --git a/topics/server-session-auth.md b/topics/server-session-auth.md
index 17d8ad5f1..b3291a071 100644
--- a/topics/server-session-auth.md
+++ b/topics/server-session-auth.md
@@ -64,14 +64,14 @@ First, you need to create a data class for storing session data. Note that this
 
 ```kotlin
 ```
-{src="snippets/auth-form-session/src/main/kotlin/com/example/Application.kt" include-lines="11"}
+{src="snippets/auth-form-session/src/main/kotlin/com/example/Application.kt" include-lines="12-13"}
 
 ### Step 2: Install and configure a session {id="install-session"}
 After creating a data class, you need to install and configure the `Sessions` plugin. A code snippet below shows how to install and configure a cookie session with the specified cookie path and expiration time.
 
 ```kotlin
 ```
-{src="snippets/auth-form-session/src/main/kotlin/com/example/Application.kt" include-lines="14-19"}
+{src="snippets/auth-form-session/src/main/kotlin/com/example/Application.kt" include-lines="17-21"}
 
 You can learn more about configuring sessions from [](server-sessions.md#configuration_overview).
 
@@ -84,7 +84,7 @@ The `session` authentication provider exposes its settings via the [SessionAuthe
 
 ```kotlin
 ```
-{src="snippets/auth-form-session/src/main/kotlin/com/example/Application.kt" include-lines="20,32-44"}
+{src="snippets/auth-form-session/src/main/kotlin/com/example/Application.kt" include-lines="22,34-46"}
 
 
 ### Step 4: Save user data in a session {id="save-session"}
@@ -95,7 +95,7 @@ For more information on how to define it, please refer to the [Form-based authen
 
 ```kotlin
 ```
-{src="snippets/auth-form-session/src/main/kotlin/com/example/Application.kt" include-lines="67-73"}
+{src="snippets/auth-form-session/src/main/kotlin/com/example/Application.kt" include-lines="69-75"}
 
 ### Step 5: Protect specific resources {id="authenticate-route"}
 
@@ -103,6 +103,6 @@ After configuring the `session` provider, you can protect specific resources in
 
 ```kotlin
 ```
-{src="snippets/auth-form-session/src/main/kotlin/com/example/Application.kt" include-lines="75-81"}
+{src="snippets/auth-form-session/src/main/kotlin/com/example/Application.kt" include-lines="77-83"}
 
 You can find the full example here: [auth-form-session](https://github.com/ktorio/ktor-documentation/tree/%ktor_version%/codeSnippets/snippets/auth-form-session).
diff --git a/topics/server-sessions.md b/topics/server-sessions.md
index 6bc6af031..4c58f1479 100644
--- a/topics/server-sessions.md
+++ b/topics/server-sessions.md
@@ -57,7 +57,7 @@ For example, the `UserSession` class below will be used to store the session ID
 
 ```kotlin
 ```
-{src="snippets/session-cookie-client/src/main/kotlin/cookieclient/Application.kt" include-lines="9"}
+{src="snippets/session-cookie-client/src/main/kotlin/cookieclient/Application.kt" include-lines="10-11"}
 
 You need to create several data classes if you are going to use several sessions.
 
@@ -76,7 +76,7 @@ In the example above, session data will be passed to the client using the `user_
 
 ```kotlin
 ```
-{src="snippets/session-cookie-client/src/main/kotlin/cookieclient/Application.kt" include-lines="12,15-17,19-20"}
+{src="snippets/session-cookie-client/src/main/kotlin/cookieclient/Application.kt" include-lines="14,17-19,21-22"}
 
 If the required attribute is not exposed explicitly, use the `extensions` property. For example, you can pass the `SameSite`attribute in the following way:
 ```kotlin
@@ -134,7 +134,7 @@ Ktor allows you to store session data [on the server](#client_server) and pass o
 
 ```kotlin
 ```
-{src="snippets/session-cookie-server/src/main/kotlin/com/example/Application.kt" include-lines="14,17"}
+{src="snippets/session-cookie-server/src/main/kotlin/com/example/Application.kt" include-lines="16,19"}
 
 You can find the full example here: [session-cookie-server](https://github.com/ktorio/ktor-documentation/tree/%ktor_version%/codeSnippets/snippets/session-cookie-server).
 
@@ -145,7 +145,7 @@ You can find the full example here: [session-cookie-server](https://github.com/k
 [directorySessionStorage](https://api.ktor.io/ktor-server/ktor-server-plugins/ktor-server-sessions/io.ktor.server.sessions/directory-session-storage.html) can be used to store a session's data in a file under the specified directory. For example, to store session data in a file under the `build/.sessions` directory, create the `directorySessionStorage` in this way:
 ```kotlin
 ```
-{src="snippets/session-header-server/src/main/kotlin/com/example/Application.kt" include-lines="15,17"}
+{src="snippets/session-header-server/src/main/kotlin/com/example/Application.kt" include-lines="17,19"}
 
 You can find the full example here: [session-header-server](https://github.com/ktorio/ktor-documentation/tree/%ktor_version%/codeSnippets/snippets/session-header-server).
 
@@ -171,7 +171,7 @@ To sign a session, pass a sign key to the `SessionTransportTransformerMessageAut
 
 ```kotlin
 ```
-{src="snippets/session-cookie-server/src/main/kotlin/com/example/Application.kt" include-lines="12-18"}
+{src="snippets/session-cookie-server/src/main/kotlin/com/example/Application.kt" include-lines="14-20"}
 
 `SessionTransportTransformerMessageAuthentication` uses `HmacSHA256` as the default authentication algorithm, which can be changed. 
 
@@ -182,7 +182,14 @@ To sign and encrypt a session, pass a sign/encrypt keys to the `SessionTransport
 
 ```kotlin
 ```
-{src="snippets/session-cookie-client/src/main/kotlin/cookieclient/Application.kt" include-lines="12-20"}
+
+{src="snippets/session-cookie-client/src/main/kotlin/cookieclient/Application.kt" include-lines="14-22"}
+
+> Note that the [encryption method has been updated](migrating-3.md#session-encryption-method-update) in Ktor
+> version `3.0.0`. If you are migrating from an earlier version, use the `backwardCompatibleRead` property in the
+> constructor of `SessionTransportTransformerEncrypt` to ensure compatibility with existing sessions.
+>
+{style="note"}
 
 By default, `SessionTransportTransformerEncrypt` uses the `AES` and `HmacSHA256` algorithms, which can be changed. 
 
@@ -197,25 +204,25 @@ To set the session content for a specific [route](server-routing.md), use the `c
 
 ```kotlin
 ```
-{src="snippets/session-cookie-client/src/main/kotlin/cookieclient/Application.kt" include-lines="22-25"}
+{src="snippets/session-cookie-client/src/main/kotlin/cookieclient/Application.kt" include-lines="24-27"}
 
 To get the session content, you can call `get` receiving one of the registered session types as type parameter:
 
 ```kotlin
 ```
-{src="snippets/session-cookie-client/src/main/kotlin/cookieclient/Application.kt" include-lines="27-28,35"}
+{src="snippets/session-cookie-client/src/main/kotlin/cookieclient/Application.kt" include-lines="29-31,37"}
 
 To modify a session, for example, to increment a counter, you need to call the `copy` method of the data class:
 
 ```kotlin
 ```
-{src="snippets/session-cookie-client/src/main/kotlin/cookieclient/Application.kt" include-lines="27-35"}
+{src="snippets/session-cookie-client/src/main/kotlin/cookieclient/Application.kt" include-lines="29-37"}
 
 When you need to clear a session for any reason (for example, when a user logs out), call the `clear` function:
 
 ```kotlin
 ```
-{src="snippets/session-cookie-client/src/main/kotlin/cookieclient/Application.kt" include-lines="37-40"}
+{src="snippets/session-cookie-client/src/main/kotlin/cookieclient/Application.kt" include-lines="39-42"}
 
 You can find the full example here: [session-cookie-client](https://github.com/ktorio/ktor-documentation/tree/%ktor_version%/codeSnippets/snippets/session-cookie-client).
 
diff --git a/topics/server-shutdown-url.md b/topics/server-shutdown-url.md
index fab65f845..9f680f67e 100644
--- a/topics/server-shutdown-url.md
+++ b/topics/server-shutdown-url.md
@@ -5,22 +5,24 @@
 <include from="lib.topic" element-id="download_example"/>
 </tldr>
 
-The [ShutDownUrl](https://api.ktor.io/ktor-server/ktor-server-host-common/io.ktor.server.engine/-shut-down-url/index.html) plugin allows you to configure a URL used to shut down the server. 
-There are two ways to enable this plugin: 
+The [ShutDownUrl](https://api.ktor.io/ktor-server/ktor-server-core/io.ktor.server.engine/-shut-down-url/index.html)
+plugin allows you to configure a URL used to shut down the server.
+There are two ways to enable this plugin:
+
 - In a [configuration file](#config-file).
 - By [installing the plugin](#install).
 
-
-
 ## Configure shutdown URL in a configuration file {id="config-file"}
 
-You can configure a shutdown URL in a [configuration file](server-configuration-file.topic) using the [ktor.deployment.shutdown.url](server-configuration-file.topic#predefined-properties) property.
+You can configure a shutdown URL in a [configuration file](server-configuration-file.topic) using
+the [ktor.deployment.shutdown.url](server-configuration-file.topic#predefined-properties) property.
 
 <tabs group="config">
 <tab title="application.conf" group-key="hocon">
 
 ```shell
 ```
+
 {src="snippets/shutdown-url/src/main/resources/application.conf" include-lines="1-2,4-5,9"}
 
 </tab>
@@ -28,19 +30,21 @@ You can configure a shutdown URL in a [configuration file](server-configuration-
 
 ```yaml
 ```
+
 {src="snippets/shutdown-url/src/main/resources/_application.yaml" include-lines="1-2,4-5"}
 
 </tab>
 </tabs>
 
-
 ## Configure shutdown URL by installing the plugin {id="install"}
 
-To [install](server-plugins.md#install) and configure shutdown URL in code, pass `ShutDownUrl.ApplicationCallPlugin` to the `install` function and use the `shutDownUrl` property:
+To [install](server-plugins.md#install) and configure shutdown URL in code, pass `ShutDownUrl.ApplicationCallPlugin` to
+the `install` function and use the `shutDownUrl` property:
 
 ```kotlin
 ```
-{src="snippets/shutdown-url/src/main/kotlin/com/example/Application.kt" include-lines="11-14"}
 
+{src="snippets/shutdown-url/src/main/kotlin/com/example/Application.kt" include-lines="11-14"}
 
-You can find the full example here: [shutdown-url](https://github.com/ktorio/ktor-documentation/tree/%ktor_version%/codeSnippets/snippets/shutdown-url).
\ No newline at end of file
+For the full example,
+see [shutdown-url](https://github.com/ktorio/ktor-documentation/tree/%ktor_version%/codeSnippets/snippets/shutdown-url).
\ No newline at end of file
diff --git a/topics/server-ssl.md b/topics/server-ssl.md
index 2ae34044f..7bfaf8975 100644
--- a/topics/server-ssl.md
+++ b/topics/server-ssl.md
@@ -13,20 +13,27 @@
 </p>
 </tldr>
 
-In most cases, your Ktor services are placed behind a reverse proxy such as Nginx or Apache. 
+In most cases, your Ktor services are placed behind a reverse proxy such as Nginx or Apache.
 This means that a reverse proxy server handles security concerns, including SSL.
 
 If necessary, you can configure Ktor to serve SSL directly by providing a path to a certificate.
-Ktor uses [Java KeyStore (JKS)](https://docs.oracle.com/javase/8/docs/api/java/security/KeyStore.html) as a storage facility for certificates.
-You can use [keytool](https://docs.oracle.com/javase/8/docs/technotes/tools/unix/keytool.html) to convert and manage certificates stored in KeyStore.
-This might be useful if you need to convert a PEM certificate issued by a certificate authority to the JKS format supported by Ktor.
+Ktor uses [Java KeyStore (JKS)](https://docs.oracle.com/javase/8/docs/api/java/security/KeyStore.html) as a storage
+facility for certificates.
+You can use [keytool](https://docs.oracle.com/javase/8/docs/technotes/tools/unix/keytool.html) to convert and manage
+certificates stored in KeyStore.
+This might be useful if you need to convert a PEM certificate issued by a certificate authority to the JKS format
+supported by Ktor.
 
 > You can use _Let's Encrypt_ to get a free certificate to serve `https://` and `wss://` requests with Ktor.
 
 ## Generate a self-signed certificate {id="self-signed"}
+
 ### Generate a certificate in code {id="self-signed-code"}
 
-Ktor provides the ability to generate self-signed certificates for testing purposes by calling the [buildKeyStore](https://api.ktor.io/ktor-network/ktor-network-tls/ktor-network-tls-certificates/io.ktor.network.tls.certificates/build-key-store.html) function, which returns a [KeyStore](https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/security/KeyStore.html) instance. 
+Ktor provides the ability to generate self-signed certificates for testing purposes by calling
+the [buildKeyStore](https://api.ktor.io/ktor-network/ktor-network-tls/ktor-network-tls-certificates/io.ktor.network.tls.certificates/build-key-store.html)
+function, which returns
+a [KeyStore](https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/security/KeyStore.html) instance.
 To use this function, you need to add the `ktor-network-tls-certificates` artifact in the build script:
 
 <var name="artifact_name" value="ktor-network-tls-certificates"/>
@@ -36,14 +43,17 @@ The code snippet below shows how to generate a certificate and save it to a keys
 
 ```kotlin
 ```
-{src="snippets/ssl-embedded-server/src/main/kotlin/com/example/Application.kt" include-lines="3,10-20,39"}
 
-Since Ktor requires a certificate when it starts, you have to create a certificate before starting the server. 
-You can find the full example here: [ssl-embedded-server](https://github.com/ktorio/ktor-documentation/tree/%ktor_version%/codeSnippets/snippets/ssl-embedded-server).
+{src="snippets/ssl-embedded-server/src/main/kotlin/com/example/Application.kt" include-lines="19-28,41"}
+
+Since Ktor requires a certificate when it starts, you have to create a certificate before starting the server.
+You can find the full example
+here: [ssl-embedded-server](https://github.com/ktorio/ktor-documentation/tree/%ktor_version%/codeSnippets/snippets/ssl-embedded-server).
 
 ### Generate a certificate using keytool {id="self-signed-keytool"}
 
-You can use [keytool](https://docs.oracle.com/javase/8/docs/technotes/tools/unix/keytool.html) to generate a self-singed certificate:
+You can use [keytool](https://docs.oracle.com/javase/8/docs/technotes/tools/unix/keytool.html) to generate a self-singed
+certificate:
 
 ```Bash
 keytool -keystore keystore.jks -alias sampleAlias -genkeypair -keyalg RSA -keysize 4096 -validity 3 -dname 'CN=localhost, OU=ktor, O=ktor, L=Unspecified, ST=Unspecified, C=US'
@@ -53,9 +63,11 @@ After executing this command, `keytool` suggests you specify a keystore password
 
 ## Convert PEM certificates to JKS {id="convert-certificate"}
 
-If your certificate authority issues certificates in a PEM format, you need to convert it to the JKS format before [configuring SSL in Ktor](#configure-ssl-ktor).
-You can use `openssl` and `keytool` utilities to do this. 
-For example, if you have a private key in the `key.pem` file and a public certificate in `cert.pem`, a conversion process might look as follows:
+If your certificate authority issues certificates in a PEM format, you need to convert it to the JKS format
+before [configuring SSL in Ktor](#configure-ssl-ktor).
+You can use `openssl` and `keytool` utilities to do this.
+For example, if you have a private key in the `key.pem` file and a public certificate in `cert.pem`, a conversion
+process might look as follows:
 
 1. Convert PEM into the PKCS12 format using `openssl` by using the following command:
    ```Bash
@@ -70,30 +82,33 @@ For example, if you have a private key in the `key.pem` file and a public certif
    You will be prompted to enter a password for the `keystore.p12` file and a new password for `keystore.jks`.
    The `keystore.jks` will be generated.
 
-
 ## Configure SSL in Ktor {id="configure-ssl-ktor"}
-Specifying SSL settings in Ktor depends on the way used to [configure a Ktor server](server-create-and-configure.topic): by using a configuration file or in code using the `embeddedServer` function.
+
+Specifying SSL settings in Ktor depends on the way used to [configure a Ktor server](server-create-and-configure.topic):
+by using a configuration file or in code using the `embeddedServer` function.
 
 ### Configuration file {id="config-file"}
 
-If your server is configured in the `application.conf` or `application.yaml` [configuration file](server-configuration-file.topic), you can enable SSL using the following [properties](server-configuration-file.topic#predefined-properties):
+If your server is configured in the `application.conf`
+or `application.yaml` [configuration file](server-configuration-file.topic), you can enable SSL using the
+following [properties](server-configuration-file.topic#predefined-properties):
 
 1. Specify the SSL port using the `ktor.deployment.sslPort` property:
 
    <tabs group="config">
    <tab title="application.conf" group-key="hocon">
-   
+
    ```shell
    ```
    {style="block" src="snippets/ssl-engine-main/src/main/resources/application.conf" include-lines="1-2,4-5,18"}
-   
+
    </tab>
    <tab title="application.yaml" group-key="yaml">
-   
+
    ```yaml
    ```
    {style="block" src="snippets/ssl-engine-main/src/main/resources/_application.yaml" include-lines="1-2,4"}
-   
+
    </tab>
    </tabs>
 
@@ -101,29 +116,37 @@ If your server is configured in the `application.conf` or `application.yaml` [co
 
    <tabs group="config">
    <tab title="application.conf" group-key="hocon">
-   
+
    ```shell
    ```
    {style="block" src="snippets/ssl-engine-main/src/main/resources/application.conf" include-lines="1,10-18"}
-   
+
    </tab>
    <tab title="application.yaml" group-key="yaml">
-   
+
    ```yaml
    ```
    {style="block" src="snippets/ssl-engine-main/src/main/resources/_application.yaml" include-lines="1,9-14"}
-   
+
    </tab>
    </tabs>
 
-
-You can find the full example here: [ssl-engine-main](https://github.com/ktorio/ktor-documentation/tree/%ktor_version%/codeSnippets/snippets/ssl-engine-main).
+For the full example,
+see [ssl-engine-main](https://github.com/ktorio/ktor-documentation/tree/%ktor_version%/codeSnippets/snippets/ssl-engine-main).
 
 ### embeddedServer {id="embedded-server"}
 
-If you use the `embeddedServer` function to run your server, you need to pass a [custom environment](server-configuration-code.topic#embedded-custom) and provide SSL settings there using [sslConnector](https://api.ktor.io/ktor-server/ktor-server-host-common/io.ktor.server.engine/ssl-connector.html):
+If you use the `embeddedServer` function to run your server, you need to configure
+a [custom environment](server-configuration-code.topic#embedded-custom) in
+the [ApplicationEngine.Configuration](https://api.ktor.io/ktor-server/ktor-server-core/io.ktor.server.engine/-application-engine/-configuration/index.html)
+and provide
+SSL settings there
+using [sslConnector](https://api.ktor.io/ktor-server/ktor-server-core/io.ktor.server.engine/ssl-connector.html):
+
 ```kotlin
 ```
-{src="snippets/ssl-embedded-server/src/main/kotlin/com/example/Application.kt" include-lines="3-39"}
 
-You can find the full example here: [ssl-embedded-server](https://github.com/ktorio/ktor-documentation/tree/%ktor_version%/codeSnippets/snippets/ssl-embedded-server).
+{src="snippets/ssl-embedded-server/src/main/kotlin/com/example/Application.kt" include-lines="3-41"}
+
+For the full example,
+see [ssl-embedded-server](https://github.com/ktorio/ktor-documentation/tree/%ktor_version%/codeSnippets/snippets/ssl-embedded-server).
diff --git a/topics/server-static-content.md b/topics/server-static-content.md
index 8d4146f8a..b85583836 100644
--- a/topics/server-static-content.md
+++ b/topics/server-static-content.md
@@ -5,7 +5,8 @@
 <tldr>
 <p><b>Code examples</b>:
 <a href="https://github.com/ktorio/ktor-documentation/tree/%ktor_version%/codeSnippets/snippets/static-files">static-files</a>,
-<a href="https://github.com/ktorio/ktor-documentation/tree/%ktor_version%/codeSnippets/snippets/static-resources">static-resources</a>
+<a href="https://github.com/ktorio/ktor-documentation/tree/%ktor_version%/codeSnippets/snippets/static-resources">static-resources</a>,
+<a href="https://github.com/ktorio/ktor-documentation/tree/%ktor_version%/codeSnippets/snippets/static-zip">static-zip</a>
 </p>
 </tldr>
 
@@ -13,331 +14,171 @@
 Learn how to serve static content, such as stylesheets, scripts, images, and so on.
 </link-summary>
 
-Whether we're creating a website or an HTTP endpoint, many applications need to serve files (such as stylesheets, scripts, images, etc.). 
-While it is certainly possible with Ktor to load the contents of a file and [send it in response](server-responses.md) to a request, given this is such a common functionality, Ktor simplifies the entire process for us with the static [1](https://api.ktor.io/ktor-server/ktor-server-core/io.ktor.server.http.content/static-files.html) and [2](https://api.ktor.io/ktor-server/ktor-server-core/io.ktor.server.http.content/static-resources.html) plugins.
+Whether you're creating a website or an HTTP endpoint, your application will likely need to serve files, such as
+stylesheets, scripts, or images.
+While it is certainly possible with Ktor to load the contents of a file and [send it in a response](server-responses.md)
+to a client, Ktor simplifies this process by providing additional functions for serving static content.
 
-The first step is to define where we want the content to be served from:
+With Ktor, you can serve content from [folders](#folders),[ZIP files](#zipped)
+, and [embedded application resources](#resources).
 
-* [Folders](#folders) - describes how to serve static files from a local filesystem. In this case, relative paths are resolved using the current working directory.
-* [Embedded application resources](#resources) - describes how to serve static files from the classpath.
+## Folders {id="folders"}
 
+To serve static files from a local filesystem, use the `staticFiles()` function. In this case, relative paths are
+resolved using the current working directory.
 
-## Folders {id="folders"}
+ ```kotlin
+ ```
 
-```kotlin
-routing {
-    staticFiles("/static", File("files"))
-}
-```
-This maps any request to `/static` to the `files` physical folder in a current working directory.
-In this case, Ktor recursively serves up any file from `files` as long as a URL path and physical filename match.
+{src="snippets/static-files/src/main/kotlin/com/example/Application.kt" include-lines="10-11,35"}
 
-## Serving resources {id="resources"}
+In the example above, any request from `/resources` is mapped to the `files` physical folder in the current working
+directory.
+Ktor recursively serves up any file from `files` as long as a URL path and a physical filename match.
 
-```kotlin
-routing {
-    staticResources("/static", "assets")
-}
-```
-This maps any request to `/static` to the `assets` package in application resources.
-In this case, Ktor recursively serves up any file from `assets` package as long as a URL path and path to resource match.
+For the full example,
+see [static-files](https://github.com/ktorio/ktor-documentation/tree/%ktor_version%/codeSnippets/snippets/static-files).
 
+## ZIP files {id="zipped"}
 
-### Additional configuration {id="configuration"}
+To serve static content from a ZIP file, Ktor provides the `staticZip()` function.
 
-Ktor provides more configurations to static files and resources.
+ ```kotlin
+ ```
 
-#### Define an index file {id="index"}
+{src="snippets/static-zip/src/main/kotlin/com/example/Application.kt" include-lines="10,12,20"}
 
-We can also define the default file to be loaded when the directory is requested.
-By default, index file name is `index.html`, you can set custom one using `index` parameter:
+Similarly to serving folders, the above function maps any request from the root URL `/` directly to the contents of the
+zip file specified.
 
-<tabs>
-<tab title="Folder">
+For the full example,
+see [static-zip](https://github.com/ktorio/ktor-documentation/tree/%ktor_version%/codeSnippets/snippets/static-zip).
 
-```kotlin
-routing {
-    staticFiles("/static", File("files"), index = "my_index.html")
-}
-```
+## Resources {id="resources"}
 
-</tab>
-<tab title="Resource">
+To serve content from the classpath, use the `staticResources()` function.
 
 ```kotlin
-routing {
-    staticResources("/static", "assets", index = "my_index.html")
-}
 ```
 
-</tab>
-</tabs>
+{src="snippets/static-resources/src/main/kotlin/com/example/Application.kt" include-lines="8,9,17"}
 
-In this case, for requests to `/static/path/to/dir` a Ktor server serves `files/path/to/dir/my_index.html` for files and `assets/path/to/dir/my_index.html` for resources.
+This maps any request from `/resources` to the `static` package in application resources.
+In this case, Ktor recursively serves up any file from the `static` package as long as a URL path and a path to resource
+match.
 
-#### Pre-compressed files {id="precompressed"}
-Ability to serve pre-compressed files and avoid using [dynamic compression](server-compression.md).
+For the full example,
+see [static-resources](https://github.com/ktorio/ktor-documentation/tree/%ktor_version%/codeSnippets/snippets/static-resources).
 
-<tabs>
-<tab title="Folder">
+## Additional configuration {id="configuration"}
 
-```kotlin
-routing {
-    staticFiles("/static", File("files")) {
-        preCompressed(CompressedFileType.BROTLI, CompressedFileType.GZIP)
-    }
-}
-```
+Ktor provides more configurations to static files and resources.
+
+### Index file {id="index"}
 
-</tab>
-<tab title="Resource">
+If a file with the name `index.html` exists, Ktor will serve it by default when the directory
+is requested. You can set a custom index file using the `index` parameter:
 
 ```kotlin
-routing {
-    staticResources("/static", "assets") {
-        preCompressed(CompressedFileType.BROTLI, CompressedFileType.GZIP)
-    }
-}
 ```
 
-</tab>
-</tabs>
-
-In this example, for a request made to `/static/script.js`, Ktor can serve `js/script.js.br` or `js/script.js.gz`.
-
-#### HEAD requests {id="autohead"}
-Ability to automatically responds to a `HEAD` request for every path inside static route that has a `GET` defined.
+{src="snippets/static-resources/src/main/kotlin/com/example/Application.kt" include-lines="10"}
 
-<tabs>
-<tab title="Folder">
+In this case, when `/custom` is requested, Ktor serves `/custom_index.html`.
 
-```kotlin
-routing {
-    staticFiles("/static", File("files")) {
-        enableAutoHeadResponse()
-    }
-}
-```
+### Pre-compressed files {id="precompressed"}
 
-</tab>
-<tab title="Resource">
+Ktor provides the ability to serve pre-compressed files and avoid using [dynamic compression](server-compression.md).
+To use this functionality, define the `preCompressed()` function inside a block statement:
 
 ```kotlin
-routing {
-    staticResources("/static", "assets") {
-        enableAutoHeadResponse()
-    }
-}
 ```
 
-</tab>
-</tabs>
-
-#### Default file {id="default-file"}
-Ability to reply with default file for any request inside static route, that has no corresponding file
+{src="snippets/static-files/src/main/kotlin/com/example/Application.kt" include-lines="12,14,18"}
 
-<tabs>
-<tab title="Folder">
+In this example, for a request made to `/js/script.js`, Ktor can serve `/js/script.js.br` or `/js/script.js.gz`.
 
-```kotlin
-routing {
-    staticFiles("/static", File("files")) {
-        default("/path/to/default/file")
-    }
-}
-```
+### HEAD requests {id="autohead"}
 
-</tab>
-<tab title="Resource">
+The `enableAutoHeadResponse()` function allows you to automatically respond to a `HEAD` request for every path inside a
+static route that has a `GET` defined.
 
 ```kotlin
-routing {
-    staticResources("/static", "assets") {
-        default("/path/to/default/file")
-    }
-}
 ```
 
-</tab>
-</tabs>
+{src="snippets/static-resources/src/main/kotlin/com/example/Application.kt" include-lines="11,13,16"}
 
-#### Content type {id="content-type"}
-By default, Ktor tries to guess value of `Content-Type` header from a file extension.
+### Default file response {id="default-file"}
 
-<tabs>
-<tab title="Folder">
+The `default()` function provides the ability to reply with a file for any request inside static route that has no
+corresponding file.
 
 ```kotlin
-routing {
-    staticFiles("/static", File("files")) {
-        contentType { file ->
-            when (file.name) {
-                "index.txt" -> ContentType.Text.Html
-                else -> null
-            }
-        }
-    }
-}
 ```
 
-</tab>
-<tab title="Resource">
+{src="snippets/static-files/src/main/kotlin/com/example/Application.kt" include-lines="12-13,18"}
 
-```kotlin
-routing {
-    staticResources("/static", "assets") {
-        contentType { url ->
-            when (url.file) {
-                "index.txt" -> ContentType.Text.Html
-                else -> null
-            }
-        }
-    }
-}
-```
-
-</tab>
-</tabs>
+In this example when the client requests a resource that doesn't exist, the `index.html` file will
+be served as a response.
 
-In this example, response for file `index.txt` will have `Content-Type: text/html` header and apply default behaviour for every other file.
+### Content type {id="content-type"}
 
-#### Caching headers {id="caching"}
-Ktor can add [Caching headers](server-caching-headers.md) for static files.
-
-<tabs>
-<tab title="Folder">
+By default, Ktor tries to guess value of the `Content-Type` header from the file extension. You can use
+the `contentType()` function to set the `Content-Type` header explicitly.
 
 ```kotlin
-routing {
-    staticFiles("/static", File("files")) {
-        cacheControl { file ->
-            when (file.name) {
-                "index.txt" -> listOf(Immutable, CacheControl.MaxAge(10000))
-                else -> emptyList()
-            }
-        }   
-    }
-}
 ```
 
-</tab>
-<tab title="Resource">
-
-```kotlin
-routing {
-    staticResources("/static", "assets") {
-        cacheControl { url ->
-            when (url.file) {
-                "index.txt" -> listOf(Immutable, CacheControl.MaxAge(10000))
-                else -> emptyList()
-            }
-        }   
-    }
-}
-```
+{src="snippets/static-files/src/main/kotlin/com/example/Application.kt" include-lines="19,22-27,34"}
 
-</tab>
-</tabs>
+In this example, the response for file `html-file.txt` will have `Content-Type: text/html` header and for every other
+file default behaviour will be applied.
 
-#### Excluding files {id="exclude"}
-Ktor can exclude some files and respond with 403 Forbidden status code when such files are requested.
+### Caching {id="caching"}
 
-<tabs>
-<tab title="Folder">
+The `cacheControl()` function allows you to configure the `Cache-Control` header for HTTP caching.
 
 ```kotlin
-routing {
-    staticFiles("/static", File("files")) {
-        exclude { file -> file.path.contains("secret_file") }
-    }
-}
 ```
 
-</tab>
-<tab title="Resource">
-
-```kotlin
-routing {
-    staticResources("/static", "assets") {
-        exclude { url -> url.path.contains("secret_file") }
-    }
-}
-```
+{src="snippets/static-files/src/main/kotlin/com/example/Application.kt" include-lines="9-10,19,28-36,38-40"}
 
-</tab>
-</tabs>
+> For more information on caching in Ktor, see [Caching headers](server-caching-headers.md).
+>
+{style="tip"}
 
-#### File extensions fallbacks {id="extensions"}
-When a requested file is not found, Ktor can add the given extensions to the file name and search for it. 
+### Excluded files {id="exclude"}
 
-<tabs>
-<tab title="Folder">
+The `exclude()` function allows you to exclude files from being served. When excluded files are requested by the client,
+the server will respond with a `403 Forbidden` status code.
 
 ```kotlin
-routing {
-    staticFiles("/static", File("files")) {
-        extensions("html", "htm")
-    }
-}
 ```
 
-</tab>
-<tab title="Resource">
+{src="snippets/static-files/src/main/kotlin/com/example/Application.kt" include-lines="19,21,34"}
+
+### File extensions fallbacks {id="extensions"}
+
+When a requested file is not found, Ktor can add the given extensions to the file name and search for it.
 
 ```kotlin
-routing {
-    staticResources("/static", "assets") {  
-        extensions("html", "htm")
-    }
-}
 ```
 
-</tab>
-</tabs>
+{src="snippets/static-resources/src/main/kotlin/com/example/Application.kt" include-lines="11,12,16"}
 
-In this example, when `/static/index` is requested, ktor will serve `index.html` content.
+In this example, when `/index` is requested, Ktor will search for `/index.html` and serve the found content.
 
-#### Custom modifications {id="modify"}
-Ktor can apply custom modification to a resulting response.
+### Custom modifications {id="modify"}
 
-<tabs>
-<tab title="Folder">
+The `modify()` function allows you to apply custom modification to a resulting response.
 
 ```kotlin
-routing {
-    staticFiles("/static", File("files")) {
-        modify { file, call ->
-            call.response.headers.append(HttpHeaders.ETag, calculateEtag(file))
-        }
-    }
-}
 ```
 
-</tab>
-<tab title="Resource">
-
-```kotlin
-routing {
-    staticResources("/static", "assets") {
-        modify { url, call ->
-            call.response.headers.append(HttpHeaders.ETag, calculateEtag(file))
-        }
-    }
-}
-```
-
-</tab>
-</tabs>
+{src="snippets/static-files/src/main/kotlin/com/example/Application.kt" include-lines="12,15-18"}
 
 ## Handle errors {id="errors"}
 
-If the requested content is not found, Ktor will automatically respond with a `404 Not Found` HTTP status code. For more information about personalizing error handling, see [Status Pages](server-status-pages.md).
- 
-
-## Examples {id="examples"}
-
-You can find the full examples here:
-
-- [static-files](https://github.com/ktorio/ktor-documentation/tree/%ktor_version%/codeSnippets/snippets/static-files)
-- [static-resources](https://github.com/ktorio/ktor-documentation/tree/%ktor_version%/codeSnippets/snippets/static-resources)
+If the requested content is not found, Ktor will automatically respond with a `404 Not Found` HTTP status code.
 
+To learn how to configure error handling, see [Status Pages](server-status-pages.md).
diff --git a/topics/server-testing.md b/topics/server-testing.md
index f19883ea6..acb79a3d2 100644
--- a/topics/server-testing.md
+++ b/topics/server-testing.md
@@ -47,7 +47,7 @@ The code below demonstrates how to test the most simple Ktor application that ac
 
 ```kotlin
 ```
-{src="snippets/engine-main/src/test/kotlin/EngineMainTest.kt" include-lines="3-16,27"}
+{src="snippets/engine-main/src/test/kotlin/EngineMainTest.kt"}
 
 </tab>
 
@@ -55,7 +55,7 @@ The code below demonstrates how to test the most simple Ktor application that ac
 
 ```kotlin
 ```
-{src="snippets/engine-main/src/main/kotlin/com/example/Application.kt" include-lines="3-15"}
+{src="snippets/engine-main/src/main/kotlin/com/example/Application.kt"}
 
 </tab>
 </tabs>
@@ -78,24 +78,28 @@ A configuration of test applications might include the following steps:
 > This might be useful if you need to test your application's [lifecycle events](server-events.md#predefined-events).
 
 #### Add application modules {id="add-modules"}
-To test an application, its [modules](server-modules.md) should be loaded to `testApplication`.
-Loading modules to `testApplication` depends on the way used to [create a server](server-create-and-configure.topic): by using a [configuration file](server-configuration-file.topic) or in code using the `embeddedServer` function.
 
-##### Add modules automatically {id="auto"}
+To test an application, its [modules](server-modules.md) should be loaded to `testApplication`. To do that, you must either [explicitly
+load your modules](#explicit-module-loading) or [configure the environment](#configure-env) to load them from a configuration file.
 
-If you have the `application.conf` or `application.yaml` configuration file in the `resources` folder, `testApplication` loads all modules and properties specified in the configuration file automatically. To disable the automatic loading of specific modules, you need to:
+##### Explicit loading of modules {id="explicit-module-loading"}
 
-1. Provide a [custom configuration file](#environment) for tests.
-2. Use the [ktor.application.modules](server-configuration-file.topic#configuration-file-overview) configuration property to specify modules to load.
+To add modules to a test application manually, use the `application` function:
 
-
-##### Add modules manually {id="manual"}
-If you use `embeddedServer`, you can add modules to a test application manually using the `application` function:
 ```kotlin
 ```
-{src="snippets/embedded-server-modules/src/test/kotlin/EmbeddedServerTest.kt" include-lines="11-15,19"}
+{src="snippets/embedded-server-modules/src/test/kotlin/EmbeddedServerTest.kt" include-symbol="testModule1"}
 
+#### Load modules from a configuration file {id="configure-env"}
 
+If you want to load modules from a configuration file, use the `environment` function to specify the configuration
+file for your test:
+
+```kotlin
+```
+{src="snippets/auth-oauth-google/src/test/kotlin/ApplicationTest.kt" include-lines="17-21,51"}
+
+This method is useful when you need to mimic different environments or use custom configuration settings during testing.
 
 > You can also access the `Application` instance inside the `application` block.
 
@@ -103,7 +107,7 @@ If you use `embeddedServer`, you can add modules to a test application manually
 
 You can add routes to your test application using the `routing` function.
 This might be convenient for the following use-cases:
-- Instead of [adding modules](#manual) to a test application, you can add [specific routes](server-routing.md#route_extension_function) that should be tested. 
+- Instead of [adding modules](#add-modules) to a test application, you can add [specific routes](server-routing.md#route_extension_function) that should be tested. 
 - You can add routes required only in a test application. The example below shows how to add the `/login-test` endpoint used to initialize a user [session](server-sessions.md) in tests:
    ```kotlin
    ```
@@ -114,7 +118,8 @@ This might be convenient for the following use-cases:
 #### Customize environment {id="environment"}
 
 To build a custom environment for a test application, use the `environment` function.
-For example, to use a custom configuration for tests, you can create a custom configuration file in the `test/resources` folder and load it using the `config` property:
+For example, to use a custom configuration for tests, you can create a configuration file in the `test/resources`
+folder and load it using the `config` property:
 
 ```kotlin
 ```
@@ -148,7 +153,7 @@ The `testApplication` provides access to an HTTP client with default configurati
 If you need to customize the client and install additional plugins, you can use the `createClient` function. For example, to [send JSON data](#json-data) in a test POST/PUT request, you can install the [ContentNegotiation](client-serialization.md) plugin:
 ```kotlin
 ```
-{src="snippets/json-kotlinx/src/test/kotlin/jsonkotlinx/ApplicationTest.kt" include-lines="32-37,44"}
+{src="snippets/json-kotlinx/src/test/kotlin/jsonkotlinx/ApplicationTest.kt" include-lines="31-40,48"}
 
 
 ### Step 3: Make a request {id="make-request"}
@@ -157,7 +162,7 @@ To test your application, use the [configured client](#configure-client) to make
 
 ```kotlin
 ```
-{src="snippets/json-kotlinx/src/test/kotlin/jsonkotlinx/ApplicationTest.kt" include-lines="32-41,44"}
+{src="snippets/json-kotlinx/src/test/kotlin/jsonkotlinx/ApplicationTest.kt" include-lines="31-44,48"}
 
 
 
@@ -167,10 +172,7 @@ After receiving a [response](#make-request), you can verify the results by makin
 
 ```kotlin
 ```
-{src="snippets/json-kotlinx/src/test/kotlin/jsonkotlinx/ApplicationTest.kt" include-lines="32-44"}
-
-
-
+{src="snippets/json-kotlinx/src/test/kotlin/jsonkotlinx/ApplicationTest.kt" include-lines="31-48"}
 
 
 ## Test POST/PUT requests {id="test-post-put"}
@@ -189,7 +191,7 @@ A test below from the [post-form-parameters](https://github.com/ktorio/ktor-docu
 
 ```kotlin
 ```
-{src="snippets/post-form-parameters/src/test/kotlin/formparameters/ApplicationTest.kt" include-lines="3-18,29"}
+{src="snippets/post-form-parameters/src/test/kotlin/formparameters/ApplicationTest.kt"}
 
 </tab>
 
@@ -212,7 +214,7 @@ The code below demonstrates how to build `multipart/form-data` and test file upl
 
 ```kotlin
 ```
-{src="snippets/upload-file/src/test/kotlin/uploadfile/UploadFileTest.kt" include-lines="3-36,69"}
+{src="snippets/upload-file/src/test/kotlin/uploadfile/UploadFileTest.kt"}
 
 </tab>
 
@@ -220,7 +222,7 @@ The code below demonstrates how to build `multipart/form-data` and test file upl
 
 ```kotlin
 ```
-{src="snippets/upload-file/src/main/kotlin/uploadfile/UploadFile.kt" include-lines="3-38"}
+{src="snippets/upload-file/src/main/kotlin/uploadfile/UploadFile.kt"}
 
 </tab>
 </tabs>
@@ -235,7 +237,7 @@ To send JSON data in a test POST/PUT request, you need to create a new client an
 
 ```kotlin
 ```
-{src="snippets/json-kotlinx/src/test/kotlin/jsonkotlinx/ApplicationTest.kt" include-lines="3-14,31-44,56"}
+{src="snippets/json-kotlinx/src/test/kotlin/jsonkotlinx/ApplicationTest.kt" include-lines="3-11,31-48"}
 
 </tab>
 
@@ -260,7 +262,7 @@ If you need to preserve cookies between requests when testing, you need to creat
 
 ```kotlin
 ```
-{src="snippets/session-cookie-client/src/test/kotlin/cookieclient/ApplicationTest.kt" include-lines="3-27,47"}
+{src="snippets/session-cookie-client/src/test/kotlin/cookieclient/ApplicationTest.kt"}
 
 </tab>
 
@@ -280,22 +282,18 @@ If you need to test an [HTTPS endpoint](server-ssl.md), change the protocol used
 
 ```kotlin
 ```
-{src="snippets/ssl-engine-main/src/test/kotlin/ApplicationTest.kt" include-lines="10-18"}
+{src="snippets/ssl-engine-main/src/test/kotlin/ApplicationTest.kt" include-lines="3-22"}
 
 You can find the full example here: [ssl-engine-main](https://github.com/ktorio/ktor-documentation/tree/%ktor_version%/codeSnippets/snippets/ssl-engine-main).
 
 
 ## Test WebSockets {id="testing-ws"}
 
-You can test [WebSocket conversations](server-websockets.md) by using the [WebSockets](client-websockets.md) plugin provided by the client:
+You can test [WebSocket conversations](server-websockets.md) by using the [WebSockets](client-websockets.topic) plugin provided by the client:
 
 ```kotlin
 ```
-{src="snippets/server-websockets/src/test/kotlin/com/example/ModuleTest.kt" include-lines="3-26,41"}
-
-
-
-
+{src="snippets/server-websockets/src/test/kotlin/com/example/ModuleTest.kt"}
 
 
 ## End-to-end testing with HttpClient {id="end-to-end"}
diff --git a/topics/server-websockets.md b/topics/server-websockets.md
index f5c2129f4..45de6ee7b 100644
--- a/topics/server-websockets.md
+++ b/topics/server-websockets.md
@@ -36,7 +36,12 @@ Ktor allows you to:
 * Add WebSocket extensions. For example, you can use the [Deflate](server-websocket-deflate.md) extension or
   implement a [custom extension](server-websocket-extensions.md).
 
-> To learn about WebSocket support on the client-side, see [](client-websockets.md).
+> To learn about WebSocket support on the client-side, see the [WebSockets client plugin](client-websockets.topic).
+
+> For one-way communication sessions, consider using [Server-Sent Events (SSE)](sse_server.md). SSE is
+particularly useful in cases where the server needs to send event-based updates to a client.
+>
+{style="note"}
 
 ## Add dependencies {id="add_dependencies"}
 
diff --git a/topics/sse_client.md b/topics/sse_client.md
new file mode 100644
index 000000000..b36959f6a
--- /dev/null
+++ b/topics/sse_client.md
@@ -0,0 +1,116 @@
+[//]: # (title: Server-Sent Events)
+
+<show-structure for="chapter" depth="2"/>
+
+<tldr>
+<var name="example_name" value="client-sse"/>
+<include from="lib.topic" element-id="download_example"/>
+</tldr>
+
+<link-summary>
+The SSE plugin allows a client to receive event-based updates from a server over an HTTP connection.
+</link-summary>
+
+<include from="sse_server.md" element-id="sse-description" />
+
+
+> To learn more about the SSE plugin for server-side support, see the [SSE server plugin](sse_server.md).
+
+## Add dependencies {id="add_dependencies"}
+
+`SSE` only requires the [ktor-client-core](client-dependencies.md) artifact and doesn't need any specific dependencies.
+
+## Install SSE {id="install_plugin"}
+
+To install the `SSE` plugin, pass it to the `install` function inside
+a [client configuration block](client-create-and-configure.md#configure-client):
+
+```kotlin
+import io.ktor.client.*
+import io.ktor.client.engine.cio.*
+import io.ktor.client.plugins.sse.*
+
+//...
+val client = HttpClient(CIO) {
+    install(SSE)
+}
+```
+
+## Configure the SSE plugin {id="configure"}
+
+[//]: # (TODO: Add link for SSEConfig)
+Optionally, you can configure the plugin inside the `install` block by passing the supported properties of
+the [SSEConfig]() class.
+
+[//]: # (TODO: Check and update the status of reconnection before release)
+
+* Use the `reconnectionTime` property to specify a reconnection time. If the connection to the server is lost, the
+  client will wait for the specified time before attempting to reconnect.
+
+> Note that reconnection is currently not supported.
+> To learn more, see [](client-engines.md#configure).
+>
+{style="note"}
+
+* Use the `showCommentEvents()` function to add events consisting only of comments in the incoming flow.
+* Use the `showRetryEvents()` function to add events consisting only of the retry field in the incoming flow.
+
+```kotlin
+```
+
+{src="snippets/client-sse/src/main/kotlin/com.example/Application.kt" include-lines="10-15"}
+
+## Handle an SSE session {id="handle-session"}
+
+### API overview {id="api-overview"}
+
+[//]: # (TODO: Add API links)
+
+A client's SSE session is represented by the [DefaultClientSSESession]() interface.
+This interface exposes the API that allows you to receive SSE events from a server.
+
+The `HttpClient` allows you to get access to an SSE session in one of the following ways:
+
+* The [sse()]() function creates the SSE session and allows you to act on it.
+* The [sseSession()]() function allows you to open an SSE session.
+
+The following parameters are available to both functions. To specify the URL endpoint, choose from two options:
+
+* Use the `urlString` parameter to specify the whole URL as a string.
+* Use the `schema`, `host`, `port`, and `path` parameters to specify the protocol scheme, domain name, port number and
+  path name
+  respectively.
+
+```kotlin
+   runBlocking {
+      client.sse(host = "127.0.0.1", port = 8080, path = "/events") {
+           // this: ClientSSESession
+       }
+   }
+```
+
+Optionally, use the following parameters to configure the connection:
+
+* Use the `reconnectionTime` parameter to specify a reconnection time.
+* Use the `showCommentEvents` parameter to specify whether to show events consisting only of comments in the
+  incoming flow.
+* Use the `showRetryEvents` parameter to specify whether to show events consisting only of the retry field in the
+  incoming flow.
+
+Within the lambda argument, you have access to the `ClientSSESession` context. Use the `incoming` property to
+access the
+channel for receiving events.
+
+### Example {id="example"}
+
+The example below creates a new SSE session with the `events` endpoint,
+reads events through the `incoming` property and prints the received `ServerSentEvent`.
+
+```kotlin
+```
+
+{src="snippets/client-sse/src/main/kotlin/com.example/Application.kt" include-symbol="main"}
+
+For the full example,
+see [client-sse](https://github.com/ktorio/ktor-documentation/tree/%ktor_version%/codeSnippets/snippets/client-sse).
+
diff --git a/topics/sse_server.md b/topics/sse_server.md
new file mode 100644
index 000000000..ec450223c
--- /dev/null
+++ b/topics/sse_server.md
@@ -0,0 +1,105 @@
+[//]: # (title: Server-Sent Events)
+
+<show-structure for="chapter" depth="2"/>
+
+<var name="plugin_name" value="SSE"/>
+<var name="example_name" value="server-sse"/>
+<var name="package_name" value="io.ktor.server.sse"/>
+<var name="artifact_name" value="ktor-server-sse"/>
+
+<tldr>
+<p>
+<b>Required dependencies</b>: <code>io.ktor:%artifact_name%</code>
+</p>
+<include from="lib.topic" element-id="download_example"/>
+</tldr>
+
+<link-summary>
+The SSE plugin allows a server to send event-based updates to a client over an HTTP connection.
+</link-summary>
+
+<snippet id="sse-description">
+
+Server-Sent Events (SSE) is a technology that allows a server to continuously push events to a client over an HTTP
+connection.
+It's particularly useful in cases where the server needs to send event-based updates without requiring the client to
+repeatedly poll the server.
+
+The SSE plugins supported by Ktor provide a straightforward method for creating a one-way connection between the server
+and the client.
+
+</snippet>
+
+> To learn more about the SSE plugin for client-side support, see the [SSE client plugin](sse_client.md).
+
+> For multi-way communication, consider using [WebSockets](server-websockets.md). They provide a full-duplex communication
+> between the server and the client using the Websocket protocol.
+>
+{style="note"}
+
+## Limitations
+
+Ktor does not provide support for data compression of SSE responses.
+If you use the [Compression](server-compression.md) plugin, it will skip compression for SSE responses by default.
+
+## Add dependencies {id="add_dependencies"}
+
+<include from="lib.topic" element-id="add_ktor_artifact_intro"/>
+<include from="lib.topic" element-id="add_ktor_artifact"/>
+
+## Install SSE {id="install_plugin"}
+
+<include from="lib.topic" element-id="install_plugin"/>
+
+## Handle SSE sessions {id="handle-sessions"}
+
+### API overview {id="api-overview"}
+
+Once you have installed the `SSE` plugin, you can add a route to handle an SSE session.
+To do that, call the `sse()` function inside the [routing](server-routing.md#define_route) block:
+
+```kotlin
+routing { 
+    sse("/events") {
+        //send events to clients
+    }
+}
+```
+
+It is also possible to define an SSE route without specifying a path:
+
+```kotlin
+routing {
+    sse {
+        //send events to clients
+    }
+}
+```
+
+Within the `sse` block, you define the handler for the specified path, represented by the [ServerSSESession]() class.
+The following functions and properties are available within the block:
+
+* Use the `send()` function to create and send a `ServerSentEvent` to the client.
+* Use the `call` property to access the associated received `ApplicationCall` that originated the session.
+* Use the `close()` function to close the session and terminate the connection with the client. The `close()` method is
+  called automatically when all `send()` operations are completed.
+
+> It's important to note that closing the session using the `close()` function does not send a termination event to the
+client.
+> If you wish to send a specific event to signify the end of the SSE stream before closing the session, you can use
+the `send()` function for it.
+>
+{style="note"}
+
+### Example: Handle a single session {id="handle-single-session"}
+
+The example below creates an SSE session with the `events` endpoint which sends 6 separate events over a single SSE
+channel with a delay of 1000ms.
+
+```kotlin
+```
+
+{src="snippets/server-sse/src/main/kotlin/com/example/Application.kt" include-lines="14-21"}
+
+For the full example,
+see [server-sse](https://github.com/ktorio/ktor-documentation/tree/%ktor_version%/codeSnippets/snippets/server-sse).
diff --git a/topics/tutorial-first-steps-with-kotlin-rpc.topic b/topics/tutorial-first-steps-with-kotlin-rpc.topic
index b9194b2b1..512fa13ed 100644
--- a/topics/tutorial-first-steps-with-kotlin-rpc.topic
+++ b/topics/tutorial-first-steps-with-kotlin-rpc.topic
@@ -246,7 +246,7 @@
             </tip>
             <p>
                 Next, you create an instance of the Ktor client in the standard way. <code>kotlinx.rpc</code> uses
-                the <a href="client-websockets.md">WebSockets</a> plugin under the hood to transfer information. You
+                the <a href="client-websockets.topic">WebSockets</a> plugin under the hood to transfer information. You
                 only need to ensure that it is loaded by using the <code>installRPC()</code> function:
             </p>
             <code-block lang="kotlin"
diff --git a/topics/welcome.topic b/topics/welcome.topic
index 7843329f7..6afec4d52 100644
--- a/topics/welcome.topic
+++ b/topics/welcome.topic
@@ -62,6 +62,7 @@
                     <a href="server-auth.md"/>
                     <a href="server-sessions.md"/>
                     <a href="server-websockets.md"/>
+                    <a href="sse_server.md"/>
                     <a href="server-swagger-ui.md"/> / <a href="server-openapi.md"/>
                     <a href="server-custom-plugins.md"/>
                 </group>
@@ -118,8 +119,10 @@
                     <a href="client-auth.md"/>
                     <a href="client-cookies.md"/>
                     <a href="client-content-encoding.md"/>
+                    <a href="bom-remover.md"/>
                     <a href="client-caching.md"/>
-                    <a href="client-websockets.md"/>
+                    <a href="client-websockets.topic"/>
+                    <a href="sse_client.md"/>
                     <a href="client-custom-plugins.md"/>
                 </group>
                 <group>
diff --git a/v.list b/v.list
index 085c65815..115c3ce18 100644
--- a/v.list
+++ b/v.list
@@ -4,8 +4,8 @@
 
 <vars>
 
-    <var name="ktor_version" value="2.3.12"/>
-    <var name="kotlin_version" value="2.0.0"/>
+    <var name="ktor_version" value="3.0.0"/>
+    <var name="kotlin_version" value="2.0.20"/>
     <var name="coroutines_version" value="1.9.0"/>
     <var name="kotlin_css_version" value="1.0.0-pre.625"/>
     <var name="logback_version" value="1.5.6"/>