diff --git a/.gitignore b/.gitignore
index b5ae735e..59d49cc3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ allure-results/
 
 !.idea/codeStyles/*
 !.idea/dictionaries/*
+.intellijPlatform/
\ No newline at end of file
diff --git a/build.gradle.kts b/build.gradle.kts
index f47cff79..a28f1ea4 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,18 +1,21 @@
 @file:Suppress("UnstableApiUsage")
 
 import java.lang.System.getenv
-import org.jetbrains.packagesearch.gradle.getStringOrNull
-import org.jetbrains.packagesearch.gradle.pkgsSpace
 
 plugins {
-    `version-catalog`
-    `maven-publish`
-    `build-config`
+    alias(packageSearchCatalog.plugins.shadow) apply false
+    alias(packageSearchCatalog.plugins.dokka) apply false
+    alias(packageSearchCatalog.plugins.kotlin.jvm) apply false
+    alias(packageSearchCatalog.plugins.kotlin.plugin.serialization) apply false
+    alias(packageSearchCatalog.plugins.kotlin.plugin.compose) apply false
+    alias(packageSearchCatalog.plugins.compose.desktop) apply false
+    alias(packageSearchCatalog.plugins.kotlinter) apply false
 }
 
 allprojects {
     group = "org.jetbrains.packagesearch"
-    val baseVersion = "242.99999-SNAPSHOT"
+    val baseVersion = "242-SNAPSHOT"
+
     version = when (val ref = getenv("GITHUB_REF")) {
         null -> baseVersion
         else -> when {
@@ -20,40 +23,4 @@ allprojects {
             else -> baseVersion
         }
     }
-
-    repositories {
-        google()
-        mavenCentral()
-        maven("https://repo.gradle.org/gradle/libs-releases")
-        maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
-        maven("https://packages.jetbrains.team/maven/p/kpm/public")
-        maven("https://www.jetbrains.com/intellij-repository/snapshots")
-        maven("https://cache-redirector.jetbrains.com/intellij-dependencies")
-        maven("https://packages.jetbrains.team/maven/p/ij/intellij-sdk-nightly") {
-            credentials {
-                username = getenv("SPACE_INTELLIJ_NIGHTLIES_USERNAME")
-                    ?: project.extra.getStringOrNull("space.intellij.username")
-                password = getenv("SPACE_INTELLIJ_NIGHTLIES_TOKEN")
-                    ?: project.extra.getStringOrNull("space.intellij.password")
-            }
-        }
-    }
 }
-
-catalog {
-    versionCatalog {
-        from(files("packagesearch.versions.toml"))
-    }
-}
-
-publishing {
-    repositories {
-        pkgsSpace(project)
-    }
-    publications {
-        create<MavenPublication>("versionCatalog") {
-            from(components["versionCatalog"])
-            artifactId = "packagesearch-version-catalog"
-        }
-    }
-}
\ No newline at end of file
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index e76929b0..8a454bac 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -2,33 +2,13 @@
 
 plugins {
     `kotlin-dsl`
-    kotlin("plugin.serialization") version packageSearchCatalog.versions.kotlin.get()
 }
 
 group = "org.jetbrains.packagesearch"
 version = "1.0.0-SNAPSHOT"
 
-gradlePlugin {
-    plugins {
-        create("packagesearch") {
-            id = "build-config"
-            displayName = "Package Search Build Configurations"
-            implementationClass = "org.jetbrains.packagesearch.gradle.PackageSearchPlugin"
-            description = "Package Search Build Configurations"
-        }
-    }
-}
-
 dependencies {
-    implementation(packageSearchCatalog.kotlin.gradle.plugin)
-    implementation(packageSearchCatalog.gradle.intellij.platform.plugin)
-    implementation(packageSearchCatalog.dokka.gradle.plugin)
-    implementation(packageSearchCatalog.foojay.resolver.gradle.plugin)
-    implementation(packageSearchCatalog.detekt.gradle.plugin)
-    implementation(packageSearchCatalog.kotlinter.gradle.plugin)
-    implementation(packageSearchCatalog.shadow.gradle.plugin)
-    implementation(packageSearchCatalog.kotlinx.serialization.json)
-    implementation(packageSearchCatalog.poet.kotlin)
-    implementation(packageSearchCatalog.xmlutils.serialization)
-    implementation(packageSearchCatalog.flexmark)
+    implementation(libs.poet.kotlin)
+    implementation(libs.flexmark)
+    implementation(libs.gradle.intellij.platform.plugin)
 }
diff --git a/buildSrc/settings.gradle.kts b/buildSrc/settings.gradle.kts
index f58b0d92..37633504 100644
--- a/buildSrc/settings.gradle.kts
+++ b/buildSrc/settings.gradle.kts
@@ -8,7 +8,7 @@ dependencyResolutionManagement {
         gradlePluginPortal()
     }
     versionCatalogs {
-        create("packageSearchCatalog") {
+        create("libs") {
             from(files("../packagesearch.versions.toml"))
         }
     }
diff --git a/buildSrc/src/main/kotlin/Utils.kt b/buildSrc/src/main/kotlin/Utils.kt
index 3f23f571..6325fef9 100644
--- a/buildSrc/src/main/kotlin/Utils.kt
+++ b/buildSrc/src/main/kotlin/Utils.kt
@@ -1,6 +1,29 @@
+import java.io.File
+import org.gradle.api.plugins.ExtraPropertiesExtension
 import org.gradle.api.provider.Provider
+import org.gradle.api.tasks.Sync
+import org.gradle.api.tasks.TaskProvider
+import org.gradle.kotlin.dsl.DependencyHandlerScope
 import org.gradle.kotlin.dsl.PluginDependenciesSpecScope
+import org.gradle.kotlin.dsl.getByType
+import org.gradle.kotlin.dsl.version
 import org.gradle.plugin.use.PluginDependency
+import org.jetbrains.intellij.platform.gradle.extensions.IntelliJPlatformDependenciesExtension
 
 fun PluginDependenciesSpecScope.id(plugin: Provider<PluginDependency>) =
-    id(plugin.get().pluginId)
\ No newline at end of file
+    id(plugin.get().pluginId)
+
+const val PACKAGE_SEARCH_PLUGIN_ID = "com.jetbrains.packagesearch.intellij-plugin"
+const val INTELLIJ_VERSION = "243.18137.10"
+
+fun String.containsAny(toDelete: List<String>) =
+    toDelete.any { it in this }
+
+
+val JAR_NAMES_TO_REMOVE = listOf(
+    "kotlin-stdlib",
+    "slf4j",
+    "kotlin-reflect",
+    "kotlinx-coroutines",
+    "logback",
+)
diff --git a/buildSrc/src/main/kotlin/org/jetbrains/packagesearch/gradle/Application.kt b/buildSrc/src/main/kotlin/org/jetbrains/packagesearch/gradle/Application.kt
deleted file mode 100644
index 707a4eb2..00000000
--- a/buildSrc/src/main/kotlin/org/jetbrains/packagesearch/gradle/Application.kt
+++ /dev/null
@@ -1,86 +0,0 @@
-@file:Suppress("unused")
-
-package org.jetbrains.packagesearch.gradle
-
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
-import nl.adaptivity.xmlutil.serialization.XmlSerialName
-import nl.adaptivity.xmlutil.serialization.XmlValue
-
-@Serializable
-@XmlSerialName("application")
-data class Application(
-    val components: List<Component>,
-) {
-    object Laf {
-        val newUiStrings = listOf("ExperimentalDark", "ExperimentalLight")
-
-        val DARK = Application(
-            listOf(
-                Component(
-                    name = "LafManager",
-                    autodetect = "true",
-                    laf = Laf(
-                        className = "com.intellij.ide.ui.laf.darcula.DarculaLaf",
-                        themeId = "ExperimentalDark"
-                    )
-                )
-            )
-        )
-        val LIGHT = Application(
-            listOf(
-                Component(
-                    name = "LafManager",
-                    autodetect = "true",
-                    laf = Laf(
-                        className = "com.intellij.ide.ui.laf.IntelliJLaf",
-                        themeId = "ExperimentalLight"
-                    )
-                )
-            )
-        )
-    }
-}
-
-@Serializable
-@XmlSerialName("component")
-data class Component(
-    val name: String,
-    val autodetect: String? = null,
-    val options: List<Option>? = null,
-    val entries: List<Entry>? = null,
-    val laf: Laf? = null,
-)
-
-@Serializable
-@XmlSerialName("option")
-data class Option(val name: String, val value: String)
-
-@Serializable
-@XmlSerialName("entry")
-data class Entry(val key: String, val value: String)
-
-@Serializable
-@XmlSerialName("laf")
-data class Laf(
-    @SerialName("class-name") val className: String,
-    val themeId: String? = null,
-)
-
-val CDATA_PREFIX = "<![CDATA["
-val CDATA_SUFFIX = "]]>"
-
-@Serializable
-@XmlSerialName("application")
-data class LogSettings(
-    val components: List<DebugComponent>,
-)
-
-@Serializable
-@XmlSerialName("component")
-data class DebugComponent(val name: String, @XmlValue val content: String)
-
-@Serializable
-data class DebugLog(val categories: List<Category>)
-@Serializable
-data class Category(val category: String, val level: String)
\ No newline at end of file
diff --git a/buildSrc/src/main/kotlin/org/jetbrains/packagesearch/gradle/ConfigureGradleIntellijPlugin.kt b/buildSrc/src/main/kotlin/org/jetbrains/packagesearch/gradle/ConfigureGradleIntellijPlugin.kt
deleted file mode 100644
index 8cd2a37e..00000000
--- a/buildSrc/src/main/kotlin/org/jetbrains/packagesearch/gradle/ConfigureGradleIntellijPlugin.kt
+++ /dev/null
@@ -1,40 +0,0 @@
-@file:Suppress("UnstableApiUsage")
-
-package org.jetbrains.packagesearch.gradle
-
-import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
-import org.gradle.api.Project
-import org.gradle.kotlin.dsl.assign
-import org.gradle.kotlin.dsl.invoke
-import org.gradle.kotlin.dsl.named
-import org.jetbrains.intellij.IntelliJPluginExtension
-import org.jetbrains.intellij.tasks.PrepareSandboxTask
-
-fun Project.configureGradleIntellijPlugin(packageSearchExtension: PackageSearchExtension) {
-    val isCI = System.getenv("CI") != null
-
-    plugins.withId("org.jetbrains.intellij") {
-        extensions.withType<IntelliJPluginExtension> {
-            version = "242.16677-EAP-CANDIDATE-SNAPSHOT"
-            instrumentCode = false
-            downloadSources = !isCI
-        }
-        tasks {
-            val shadowJar = named<ShadowJar>("shadowJar") {
-                exclude {
-                    it.name.containsAny(packageSearchExtension.librariesToDelete.get())
-                            && !it.name.containsAny(packageSearchExtension.librariesToKeep.get())
-                }
-                exclude { it.name == "module-info.class" }
-                exclude { it.name.endsWith("kotlin_module") }
-            }
-            named<PrepareSandboxTask>("prepareSandbox") {
-                pluginJar = shadowJar.flatMap { it.archiveFile }
-                runtimeClasspathFiles = objects.fileCollection()
-            }
-            named("runIde") {
-                onlyIf { packageSearchExtension.isRunIdeEnabled.get() }
-            }
-        }
-    }
-}
diff --git a/buildSrc/src/main/kotlin/org/jetbrains/packagesearch/gradle/ConfigureJavaPlugin.kt b/buildSrc/src/main/kotlin/org/jetbrains/packagesearch/gradle/ConfigureJavaPlugin.kt
deleted file mode 100644
index caecb9c9..00000000
--- a/buildSrc/src/main/kotlin/org/jetbrains/packagesearch/gradle/ConfigureJavaPlugin.kt
+++ /dev/null
@@ -1,19 +0,0 @@
-@file:Suppress("UnstableApiUsage")
-
-package org.jetbrains.packagesearch.gradle
-
-import org.gradle.api.Project
-import org.gradle.api.plugins.JavaPluginExtension
-import org.gradle.kotlin.dsl.assign
-
-fun Project.configureJavaPlugin(extension: PackageSearchExtension.JavaToolchain) {
-    plugins.withId("org.gradle.java") {
-        extensions.withType<JavaPluginExtension> {
-            toolchain {
-                languageVersion = extension.languageVersion
-                vendor = extension.vendor
-            }
-        }
-
-    }
-}
\ No newline at end of file
diff --git a/buildSrc/src/main/kotlin/org/jetbrains/packagesearch/gradle/ConfigureKotlinJvmPlugin.kt b/buildSrc/src/main/kotlin/org/jetbrains/packagesearch/gradle/ConfigureKotlinJvmPlugin.kt
deleted file mode 100644
index 67c29f59..00000000
--- a/buildSrc/src/main/kotlin/org/jetbrains/packagesearch/gradle/ConfigureKotlinJvmPlugin.kt
+++ /dev/null
@@ -1,27 +0,0 @@
-@file:Suppress("UnstableApiUsage")
-
-package org.jetbrains.packagesearch.gradle
-
-import org.gradle.api.Project
-import org.gradle.api.tasks.testing.Test
-import org.gradle.kotlin.dsl.assign
-import org.gradle.kotlin.dsl.invoke
-import org.gradle.kotlin.dsl.withType
-import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile
-
-fun Project.configureKotlinJvmPlugin(packageSearchExtension: PackageSearchExtension) {
-    plugins.withId("org.jetbrains.kotlin.jvm") {
-        tasks {
-            withType<KotlinJvmCompile> {
-                compilerOptions {
-                    jvmTarget = packageSearchExtension.jvmTarget
-                    freeCompilerArgs.addAll(packageSearchExtension.optIns.map { it.map { "-opt-in=$it" } })
-                    freeCompilerArgs.add("-Xcontext-receivers")
-                }
-            }
-            withType<Test> {
-                useJUnitPlatform()
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/buildSrc/src/main/kotlin/org/jetbrains/packagesearch/gradle/ConfigureLinting.kt b/buildSrc/src/main/kotlin/org/jetbrains/packagesearch/gradle/ConfigureLinting.kt
deleted file mode 100644
index 266de1e1..00000000
--- a/buildSrc/src/main/kotlin/org/jetbrains/packagesearch/gradle/ConfigureLinting.kt
+++ /dev/null
@@ -1,47 +0,0 @@
-package org.jetbrains.packagesearch.gradle
-
-import io.gitlab.arturbosch.detekt.extensions.DetektExtension
-import org.gradle.api.Project
-import org.gradle.api.tasks.Sync
-import org.gradle.kotlin.dsl.getValue
-import org.gradle.kotlin.dsl.provideDelegate
-import org.gradle.kotlin.dsl.registering
-import org.jmailen.gradle.kotlinter.KotlinterExtension
-import java.net.URL
-
-val currentJarPath: URL
-    get() = PackageSearchExtension::class.java
-        .protectionDomain
-        .codeSource
-        .location
-
-fun Project.configureLinting(extension: PackageSearchExtension) {
-    plugins.withId("io.gitlab.arturbosch.detekt") {
-        val generateDetektConfigFile by tasks.registering(Sync::class) {
-            group = "detekt"
-            from(zipTree(currentJarPath)) {
-                include { it.name == "detekt.yml" }
-            }
-            into(layout.buildDirectory.dir("detekt"))
-        }
-        extensions.withType<DetektExtension> {
-            toolVersion = "1.20.0"
-            autoCorrect = !isCi
-            afterEvaluate {
-                if (extension.detektFile.isPresent)
-                    config.from(extension.detektFile.asFile.get().absolutePath)
-                else config.builtBy(generateDetektConfigFile)
-            }
-            buildUponDefaultConfig = true
-        }
-    }
-    plugins.withId("") {
-        extensions.withType<KotlinterExtension> {
-            reporters = arrayOf("html", "checkstyle", "plain")
-        }
-    }
-}
-
-val isCi
-    get() = System.getenv("CI") != null || System.getenv("CONTINUOUS_INTEGRATION") != null
-
diff --git a/buildSrc/src/main/kotlin/org/jetbrains/packagesearch/gradle/ConfigurePublishPlugin.kt b/buildSrc/src/main/kotlin/org/jetbrains/packagesearch/gradle/ConfigurePublishPlugin.kt
deleted file mode 100644
index 68b28692..00000000
--- a/buildSrc/src/main/kotlin/org/jetbrains/packagesearch/gradle/ConfigurePublishPlugin.kt
+++ /dev/null
@@ -1,204 +0,0 @@
-@file:Suppress("UnstableApiUsage")
-
-package org.jetbrains.packagesearch.gradle
-
-import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
-import java.util.Locale
-import org.gradle.api.Project
-import org.gradle.api.artifacts.dsl.RepositoryHandler
-import org.gradle.api.attributes.Bundling
-import org.gradle.api.attributes.Category
-import org.gradle.api.attributes.DocsType
-import org.gradle.api.component.ComponentWithVariants
-import org.gradle.api.component.SoftwareComponent
-import org.gradle.api.component.SoftwareComponentFactory
-import org.gradle.api.file.DuplicatesStrategy
-import org.gradle.api.internal.component.SoftwareComponentInternal
-import org.gradle.api.plugins.ExtraPropertiesExtension
-import org.gradle.api.plugins.internal. DefaultAdhocSoftwareComponent
-import org.gradle.api.publish.PublishingExtension
-import org.gradle.api.publish.maven.MavenPublication
-import org.gradle.api.publish.maven.tasks.PublishToMavenRepository
-import org.gradle.api.tasks.SourceSetContainer
-import org.gradle.jvm.tasks.Jar
-import org.gradle.kotlin.dsl.assign
-import org.gradle.kotlin.dsl.extra
-import org.gradle.kotlin.dsl.get
-import org.gradle.kotlin.dsl.getValue
-import org.gradle.kotlin.dsl.getting
-import org.gradle.kotlin.dsl.named
-import org.gradle.kotlin.dsl.provideDelegate
-import org.gradle.kotlin.dsl.register
-import org.gradle.kotlin.dsl.registering
-import org.gradle.kotlin.dsl.the
-import org.gradle.kotlin.dsl.withType
-import org.jetbrains.dokka.gradle.DokkaTask
-import org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension
-import org.jetbrains.kotlin.util.suffixIfNot
-
-fun Project.configurePublishPlugin(
-    publicationExtension: PackageSearchExtension.Publication,
-    softwareComponentFactory: SoftwareComponentFactory,
-) {
-    plugins.withId("org.gradle.maven-publish") {
-        plugins.withId("org.gradle.java-base") {
-            val sourcesJar by tasks.registering(Jar::class) {
-                from(project.the<SourceSetContainer>().named("main").map { it.allSource })
-                plugins.withId("org.jetbrains.kotlin.jvm") {
-                    from(project.the<KotlinJvmProjectExtension>().sourceSets["main"].kotlin)
-                }
-                duplicatesStrategy = DuplicatesStrategy.INCLUDE
-                archiveClassifier = "sources"
-                destinationDirectory = layout.buildDirectory.dir("artifacts")
-            }
-            tasks.named<ShadowJar>("shadowJar") {
-                archiveClassifier = null
-                destinationDirectory = layout.buildDirectory.dir("artifacts/shadow")
-            }
-            val sourcesConfiguration = configurations.register("sourceElements") {
-                isCanBeConsumed = true
-                isCanBeResolved = true
-                isCanBeDeclared = true
-                attributes {
-                    attribute(Category.CATEGORY_ATTRIBUTE, objects.named(Category.DOCUMENTATION))
-                    attribute(Bundling.BUNDLING_ATTRIBUTE, objects.named(Bundling.EXTERNAL))
-                    attribute(DocsType.DOCS_TYPE_ATTRIBUTE, objects.named(DocsType.SOURCES))
-                }
-                outgoing {
-                    artifact(sourcesJar)
-                }
-            }
-            val shadowSourcesJar by tasks.registering(Jar::class) {
-                dependsOn(sourcesConfiguration, sourcesJar)
-                from(sourcesConfiguration.map { it.resolvedConfiguration.files.map { zipTree(it) } })
-                from(sourcesJar.flatMap { it.archiveFile }.map { zipTree(it) })
-                duplicatesStrategy = DuplicatesStrategy.INCLUDE
-                archiveClassifier = "sources"
-                destinationDirectory = layout.buildDirectory.dir("artifacts/shadow")
-            }
-            val shadowSourcesConfiguration = configurations.register("shadowSourcesElements") {
-                isCanBeConsumed = false
-                isCanBeResolved = false
-                isCanBeDeclared = false
-                attributes {
-                    attribute(Category.CATEGORY_ATTRIBUTE, objects.named(Category.DOCUMENTATION))
-                    attribute(Bundling.BUNDLING_ATTRIBUTE, objects.named(Bundling.SHADOWED))
-                    attribute(DocsType.DOCS_TYPE_ATTRIBUTE, objects.named(DocsType.SOURCES))
-                }
-                outgoing {
-                    artifact(shadowSourcesJar)
-                }
-            }
-            val java: DefaultAdhocSoftwareComponent by components
-            val sourcesComponent = softwareComponentFactory.adhoc("sources")
-            sourcesComponent.addVariantsFromConfiguration(sourcesConfiguration.get()) {
-                mapToMavenScope("runtime")
-            }
-            val shadowComponent = softwareComponentFactory.adhoc("shadow")
-            val shadowRuntimeElements by configurations.getting
-            shadowComponent.addVariantsFromConfiguration(shadowRuntimeElements) {
-                mapToMavenScope("runtime")
-            }
-            shadowComponent.addVariantsFromConfiguration(shadowSourcesConfiguration.get()) {
-                mapToMavenScope("runtime")
-            }
-            java.addVariantsFromConfiguration(sourcesConfiguration.get()) {
-                mapToMavenScope("runtime")
-            }
-            val rootComponent =
-                object : ComponentWithVariants, SoftwareComponentInternal by java {
-                    override fun getUsages() = java.usages
-                        .filter { it.name != "shadowRuntimeElements" }
-                        .toSet()
-
-                    override fun getVariants(): Set<SoftwareComponent> =
-                        if (publicationExtension.publishShadow.get()) setOf(shadowComponent) else emptySet()
-                }
-            extensions.withType<PublishingExtension> {
-                repositories {
-                    pkgsSpace(project)
-                    maven {
-                        name = "test"
-                        setUrl(rootProject.layout.buildDirectory.dir("maven"))
-                    }
-                }
-                publications {
-                    val publicationName = project.name
-                        .replace(Regex(""""-([\w\W])""")) { it.groupValues[1].uppercase(Locale.getDefault()) }
-                    afterEvaluate {
-                        if (publicationExtension.publishShadow.get()) {
-                            register<MavenPublication>(publicationName + "Shadow") {
-                                from(shadowComponent)
-                                afterEvaluate {
-                                    groupId = publicationExtension.groupId.get()
-                                    artifactId = publicationExtension.artifactId.get() + "-shadow"
-                                    version = evaluateSpaceVersion(publicationExtension)
-                                    afterEvaluate {
-                                        groupId = publicationExtension.groupId.get()
-                                        artifactId = publicationExtension.artifactId.get() + "-shadow"
-                                        version = evaluateSpaceVersion(publicationExtension)
-                                        pom {
-                                            publicationExtension.pomAction.get().invoke(this)
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                    }
-
-                    register<MavenPublication>(publicationName) {
-                        plugins.withId("org.jetbrains.dokka") {
-                            val dokkaHtml = tasks.named<DokkaTask>("dokkaHtml")
-                            val javadocJar by tasks.registering(Jar::class) {
-                                from(dokkaHtml)
-                                archiveClassifier = "javadoc"
-                                destinationDirectory = layout.buildDirectory.dir("artifacts")
-                            }
-                            artifact(javadocJar)
-                        }
-                        from(rootComponent)
-                        afterEvaluate {
-                            groupId = publicationExtension.groupId.get()
-                            artifactId = publicationExtension.artifactId.get()
-                            version = evaluateSpaceVersion(publicationExtension)
-                            pom {
-                                publicationExtension.pomAction.get().invoke(this)
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-    tasks.withType<PublishToMavenRepository> {
-        onlyIf { publicationExtension.isEnabled.get() }
-    }
-}
-
-
-fun evaluateSpaceVersion(publicationExtension: PackageSearchExtension.Publication): String {
-    val IS_SNAPSHOT: String? = System.getenv("IS_SNAPSHOT")
-    val PUBLICATION_VERSION: String? = System.getenv("PUBLICATION_VERSION")
-    return when {
-        IS_SNAPSHOT == "true" -> publicationExtension.version.get().suffixIfNot("-SNAPSHOT")
-        PUBLICATION_VERSION != null -> PUBLICATION_VERSION
-        else -> publicationExtension.version.get()
-    }
-}
-
-fun RepositoryHandler.pkgsSpace(project: Project) {
-    maven {
-        name = "Space"
-        setUrl("https://packages.jetbrains.team/maven/p/kpm/public")
-        credentials {
-            username = System.getenv("SPACE_PACKAGE_SEARCH_USERNAME")
-                ?: project.extra.getStringOrNull("space.username")
-            password = System.getenv("SPACE_PACKAGE_SEARCH_TOKEN")
-                ?: project.extra.getStringOrNull("space.password")
-        }
-    }
-}
-
-fun ExtraPropertiesExtension.getStringOrNull(key: String) =
-    runCatching { get(key)?.toString() }.getOrNull()
-
diff --git a/buildSrc/src/main/kotlin/org/jetbrains/packagesearch/gradle/PackageSearchExtension.kt b/buildSrc/src/main/kotlin/org/jetbrains/packagesearch/gradle/PackageSearchExtension.kt
deleted file mode 100644
index 145fa5f2..00000000
--- a/buildSrc/src/main/kotlin/org/jetbrains/packagesearch/gradle/PackageSearchExtension.kt
+++ /dev/null
@@ -1,84 +0,0 @@
-@file:Suppress("UnstableApiUsage")
-
-package org.jetbrains.packagesearch.gradle
-
-import org.gradle.api.Project
-import org.gradle.api.model.ObjectFactory
-import org.gradle.api.plugins.ExtensionAware
-import org.gradle.api.publish.maven.MavenPom
-import org.gradle.jvm.toolchain.JavaLanguageVersion
-import org.gradle.jvm.toolchain.JvmVendorSpec
-import org.gradle.kotlin.dsl.assign
-import org.gradle.kotlin.dsl.listProperty
-import org.gradle.kotlin.dsl.property
-import org.jetbrains.kotlin.gradle.dsl.JvmTarget
-
-abstract class PackageSearchExtension(project: Project) : ExtensionAware {
-
-    abstract class Publication(project: Project) : ExtensionAware {
-
-        val isEnabled = project.objects.property<Boolean>()
-            .convention(false)
-
-        val publishShadow = project.objects.property<Boolean>()
-            .convention(true)
-
-        val artifactId = project.objects.property<String>()
-            .convention(project.name)
-        val groupId = project.objects.property<String>()
-            .convention(project.group.toString())
-        val version = project.objects.property<String>()
-            .convention(project.provider { project.version.toString() })
-
-        internal val pomAction = project.objects
-            .property<MavenPom.() -> Unit>()
-            .convention {  }
-
-        fun pom(action: MavenPom.() -> Unit) {
-            pomAction = action
-        }
-    }
-
-    abstract class JavaToolchain(objectFactory: ObjectFactory) : ExtensionAware {
-        val languageVersion = objectFactory.property<JavaLanguageVersion>()
-            .convention(JavaLanguageVersion.of(17))
-        val vendor = objectFactory.property<JvmVendorSpec>()
-            .convention(JvmVendorSpec.AZUL)
-    }
-
-    val jvmTarget = project.objects.property<JvmTarget>()
-        .convention(JvmTarget.JVM_17)
-
-    val optIns = project.objects.listProperty<String>()
-        .apply {
-            set(
-                listOf(
-                    "kotlinx.serialization.ExperimentalSerializationApi",
-                    "kotlinx.serialization.InternalSerializationApi",
-                    "kotlinx.coroutines.ExperimentalCoroutinesApi",
-                    "com.jetbrains.packagesearch.plugin.core.utils.PKGSInternalAPI",
-                    "kotlinx.coroutines.FlowPreview",
-                    "kotlin.contracts.ExperimentalContracts"
-                )
-            )
-        }
-
-    val librariesToDelete = project.objects.listProperty<String>()
-        .apply {
-            addAll(
-                "kotlin-stdlib",
-                "slf4j",
-                "kotlin-reflect",
-                "kotlinx-coroutines",
-                "logback",
-            )
-        }
-
-    val librariesToKeep = project.objects.listProperty<String>()
-
-    val detektFile = project.objects.fileProperty()
-
-    val isRunIdeEnabled = project.objects.property<Boolean>()
-        .convention(false)
-
-}
diff --git a/buildSrc/src/main/kotlin/org/jetbrains/packagesearch/gradle/PackageSearchPlugin.kt b/buildSrc/src/main/kotlin/org/jetbrains/packagesearch/gradle/PackageSearchPlugin.kt
deleted file mode 100644
index 6f811192..00000000
--- a/buildSrc/src/main/kotlin/org/jetbrains/packagesearch/gradle/PackageSearchPlugin.kt
+++ /dev/null
@@ -1,35 +0,0 @@
-@file:Suppress("UnstableApiUsage")
-
-package org.jetbrains.packagesearch.gradle
-
-import com.github.jengelman.gradle.plugins.shadow.ShadowPlugin
-import javax.inject.Inject
-import org.gradle.api.Plugin
-import org.gradle.api.Project
-import org.gradle.api.component.SoftwareComponentFactory
-import org.gradle.kotlin.dsl.apply
-import org.gradle.kotlin.dsl.create
-import org.gradle.kotlin.dsl.provideDelegate
-
-class PackageSearchPlugin @Inject constructor(
-    private val softwareComponentFactory: SoftwareComponentFactory,
-) : Plugin<Project> {
-    override fun apply(target: Project): Unit = with(target) {
-        apply<ShadowPlugin>()
-        val packageSearchExtension =
-            extensions.create<PackageSearchExtension>("packagesearch", project)
-        val packageSearchPublicationExtension =
-            packageSearchExtension.extensions
-                .create<PackageSearchExtension.Publication>("publication", project)
-        val packageSearchJavaExtension =
-            packageSearchExtension.extensions
-                .create<PackageSearchExtension.JavaToolchain>("java", project.objects)
-        configureJavaPlugin(packageSearchJavaExtension)
-        configureKotlinJvmPlugin(packageSearchExtension)
-        configureGradleIntellijPlugin(packageSearchExtension)
-        configurePublishPlugin(packageSearchPublicationExtension, softwareComponentFactory)
-        configureLinting(packageSearchExtension)
-    }
-
-}
-
diff --git a/buildSrc/src/main/kotlin/org/jetbrains/packagesearch/gradle/Utils.kt b/buildSrc/src/main/kotlin/org/jetbrains/packagesearch/gradle/Utils.kt
deleted file mode 100644
index caba41ef..00000000
--- a/buildSrc/src/main/kotlin/org/jetbrains/packagesearch/gradle/Utils.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-package org.jetbrains.packagesearch.gradle
-
-import org.gradle.api.plugins.ExtensionContainer
-import org.gradle.kotlin.dsl.findByType
-
-fun String.containsAny(toDelete: List<String>) =
-    toDelete.any { it in this }
-
-inline fun <reified T : Any> ExtensionContainer.withType(function: T.() -> Unit) =
-    findByType<T>()?.apply(function)
\ No newline at end of file
diff --git a/buildSrc/src/main/kotlin/org/jetbrains/packagesearch/gradle/patchIntelliJRegistryFile.kt b/buildSrc/src/main/kotlin/org/jetbrains/packagesearch/gradle/patchIntelliJRegistryFile.kt
deleted file mode 100644
index 634dd694..00000000
--- a/buildSrc/src/main/kotlin/org/jetbrains/packagesearch/gradle/patchIntelliJRegistryFile.kt
+++ /dev/null
@@ -1,131 +0,0 @@
-package org.jetbrains.packagesearch.gradle
-
-import java.io.File
-import java.nio.file.Paths
-import kotlinx.serialization.decodeFromString
-import kotlinx.serialization.encodeToString
-import kotlinx.serialization.json.Json
-import nl.adaptivity.xmlutil.serialization.XML
-import org.gradle.api.tasks.TaskProvider
-import org.jetbrains.intellij.tasks.PrepareSandboxTask
-
-fun File.patchTextRegistryFile() {
-    val registry = runCatching { readLines() }.getOrNull()
-        ?: emptyList()
-
-    val indexOfExperimentalUi = registry.indexOf("ide.experimental.ui")
-    val newRegistry = if (indexOfExperimentalUi >= 0) {
-        registry.mapIndexed { index, value ->
-            if (index == indexOfExperimentalUi + 1) "true" else value
-        }
-    } else {
-        registry + listOf("ide.experimental.ui", "true")
-    }
-    writeText(newRegistry.joinToString("\n"))
-}
-
-val xml = XML {
-    indentString = "  "
-    defaultPolicy {
-        ignoreUnknownChildren()
-    }
-}
-
-fun File.patchLafFile() {
-    val lafSettings = runCatching {
-        xml.decodeFromString<Application>(readText())
-    }.getOrNull()
-
-    val currentTheme = lafSettings?.components
-        ?.firstOrNull()
-        ?.laf
-        ?.themeId
-
-    if (currentTheme in Application.Laf.newUiStrings) return
-    writeText(xml.encodeToString(Application.Laf.DARK))
-}
-
-fun File.patchSettingsFile() {
-    val settings = runCatching {
-        xml.decodeFromString<Application>(readText())
-    }.getOrNull()
-
-    val defaultOptions = listOf(
-        Option("showTipsOnStartup", "false"),
-        Option("confirmExit", "false")
-    )
-    val options =
-        settings?.components?.find { it.name == "GeneralSettings" }
-            ?.options
-            ?.filterNot { it.name !in defaultOptions.map { it.name } }
-            ?: defaultOptions
-
-    val defaultRegistryEntries = listOf(
-        Entry("ide.experimental.ui", "true"),
-        Entry("packagesearch.plugin.debug.logging", "true"),
-    )
-    val registry = settings?.components?.find { it.name == "Registry" }
-        ?.entries
-        ?.filter { it.key !in defaultRegistryEntries.map { it.key } }
-        ?.let { it + defaultRegistryEntries }
-        ?: defaultRegistryEntries
-
-    writeText(
-        xml.encodeToString(
-            Application(
-                listOf(
-                    Component("GeneralSettings", options = options),
-                    Component("Registry", entries = registry)
-                )
-            )
-        )
-    )
-}
-
-fun File.patchLogFile(pluginId: String) {
-    val debugLog = kotlin.runCatching { xml.decodeFromString<LogSettings>(readText()) }
-        .getOrNull()
-
-    val packageSearchCategory = Category("#" + pluginId, "TRACE")
-    val debugLogCategories = debugLog?.components?.find { it.name == "Log.Categories" }
-        ?.content
-        ?.removePrefix(CDATA_PREFIX)
-        ?.removeSuffix(CDATA_SUFFIX)
-        ?.let { Json.decodeFromString<DebugLog>(it) }
-        ?.categories
-        ?.filter { it.category != pluginId }
-        ?.let { it + packageSearchCategory }
-        ?: listOf(packageSearchCategory)
-
-    val encodedXml = xml.encodeToString(
-        LogSettings(
-            listOf(
-                DebugComponent(
-                    name = "Logs.Categories",
-                    content = CDATA_PREFIX + Json.encodeToString(DebugLog(debugLogCategories)) + CDATA_SUFFIX
-                )
-            )
-        )
-    )
-    writeText(
-        encodedXml
-            .replace("&lt;", "<")
-            .replace("&gt;", ">")
-    )
-}
-
-val TaskProvider<PrepareSandboxTask>.registryTextFile
-    get() = flatMap { it.configDir }
-        .map { Paths.get(it).resolve("early-access-registry.txt").toFile() }
-
-val TaskProvider<PrepareSandboxTask>.lafFile
-    get() = flatMap { it.configDir }
-        .map { Paths.get(it).resolve("options/laf.xml").toFile() }
-
-val TaskProvider<PrepareSandboxTask>.settingsFile
-    get() = flatMap { it.configDir }
-        .map { Paths.get(it).resolve("options/ide.general.xml").toFile() }
-
-val TaskProvider<PrepareSandboxTask>.logCategoriesFile
-    get() = flatMap { it.configDir }
-        .map { Paths.get(it).resolve("options/log-categories.xml").toFile() }
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index 81fee73e..77dc732d 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,7 +1,4 @@
 kotlin.code.style=official
 org.gradle.jvmargs=-Xmx10g
-kotlin.native.ignoreDisabledTargets=true
-org.gradle.java.installations.auto-detect=false
-kotlin.incremental.useClasspathSnapshot=false
 org.gradle.parallel=true
-pkgsPluginId=com.jetbrains.packagesearch.intellij-plugin
\ No newline at end of file
+org.jetbrains.intellij.platform.downloadSources=true
\ No newline at end of file
diff --git a/kmp-modifier/build.gradle.kts b/kmp-modifier/build.gradle.kts
index 055ea162..06a5df1f 100644
--- a/kmp-modifier/build.gradle.kts
+++ b/kmp-modifier/build.gradle.kts
@@ -1,31 +1,27 @@
 @file:Suppress("UnstableApiUsage")
 
 plugins {
-    id(packageSearchCatalog.plugins.kotlin.jvm)
-    id(packageSearchCatalog.plugins.idea.gradle.plugin)
-    id(packageSearchCatalog.plugins.dokka)
+    alias(packageSearchCatalog.plugins.kotlin.jvm)
+    id(packageSearchCatalog.plugins.idea.gradle.plugin.base)
+    alias(packageSearchCatalog.plugins.dokka)
     alias(packageSearchCatalog.plugins.kotlin.plugin.serialization)
-    `build-config`
     `maven-publish`
 }
+
 dependencies {
+
+    intellijPlatform {
+        intellijIdeaCommunity(INTELLIJ_VERSION)
+        bundledPlugins(
+            "org.jetbrains.kotlin",
+            "org.jetbrains.plugins.gradle",
+            "org.jetbrains.idea.gradle.dsl"
+        )
+    }
+
+
     api(packageSearchCatalog.kotlinx.serialization.protobuf)
     testImplementation(kotlin("test-junit5"))
     testRuntimeOnly(packageSearchCatalog.junit4.base)
     testRuntimeOnly(packageSearchCatalog.junit.vintage.engine)
 }
-
-packagesearch {
-    publication {
-        isEnabled = true
-        artifactId = "kmp-dependency-modifier"
-    }
-}
-
-intellij {
-    plugins.addAll(
-        "org.jetbrains.kotlin",
-        "org.jetbrains.plugins.gradle",
-        "org.jetbrains.idea.gradle.dsl"
-    )
-}
\ No newline at end of file
diff --git a/kmp-modifier/src/main/kotlin/com/intellij/packageSearch/mppDependencyUpdater/dsl/KotlinDslProvider.kt b/kmp-modifier/src/main/kotlin/com/intellij/packageSearch/mppDependencyUpdater/dsl/KotlinDslProvider.kt
index 86c2b357..bfb0b4ec 100644
--- a/kmp-modifier/src/main/kotlin/com/intellij/packageSearch/mppDependencyUpdater/dsl/KotlinDslProvider.kt
+++ b/kmp-modifier/src/main/kotlin/com/intellij/packageSearch/mppDependencyUpdater/dsl/KotlinDslProvider.kt
@@ -3,37 +3,40 @@ package com.intellij.packageSearch.mppDependencyUpdater.dsl
 
 import com.android.tools.idea.gradle.dsl.api.GradleBuildModel
 import com.android.tools.idea.gradle.dsl.api.util.GradleDslModel
-import com.android.tools.idea.gradle.dsl.model.GradleBlockModelMap
+import com.android.tools.idea.gradle.dsl.model.BlockModelBuilder
+import com.android.tools.idea.gradle.dsl.model.BlockModelProvider
+import com.android.tools.idea.gradle.dsl.parser.GradleDslNameConverter
 import com.android.tools.idea.gradle.dsl.parser.elements.GradlePropertiesDslElement
 import com.android.tools.idea.gradle.dsl.parser.files.GradleDslFile
 import com.android.tools.idea.gradle.dsl.parser.semantics.PropertiesElementDescription
 import com.intellij.packageSearch.mppDependencyUpdater.dsl.elements.KotlinDslElement
 import com.intellij.packageSearch.mppDependencyUpdater.dsl.models.KotlinDslModel
 
-class KotlinDslProvider : GradleBlockModelMap.BlockModelProvider<GradleBuildModel, GradleDslFile> {
+class KotlinDslProvider : BlockModelProvider<GradleBuildModel, GradleDslFile> {
   private val KOTLIN_ELEMENTS = mapOf(
     "kotlin" to KotlinDslElement.KOTLIN
   )
 
-  private val KOTLIN_MODELS = listOf<GradleBlockModelMap.BlockModelBuilder<*, GradleDslFile>>(
+  private val KOTLIN_MODELS = listOf<BlockModelBuilder<*, GradleDslFile>>(
     KotlinDslModel::class.java from {
       KotlinDslModel(it.ensurePropertyElement(KotlinDslElement.KOTLIN))
     },
   )
 
-  override fun getParentClass() = GradleBuildModel::class.java
+  override val parentClass: Class<GradleBuildModel>
+    get() = GradleBuildModel::class.java
+  override val parentDslClass: Class<GradleDslFile>
+    get() = GradleDslFile::class.java
 
-  override fun availableModels(): List<GradleBlockModelMap.BlockModelBuilder<*, GradleDslFile>> {
-    return KOTLIN_MODELS
-  }
+  override fun availableModels(kind: GradleDslNameConverter.Kind): List<BlockModelBuilder<*, GradleDslFile>> =
+    KOTLIN_MODELS
 
-  override fun elementsMap(): Map<String, PropertiesElementDescription<*>> {
-    return KOTLIN_ELEMENTS
-  }
+  override fun elementsMap(kind: GradleDslNameConverter.Kind): Map<String, PropertiesElementDescription<*>> =
+    KOTLIN_ELEMENTS
 }
 
-private infix fun <M, P> Class<M>.from(action: (P) -> M): GradleBlockModelMap.BlockModelBuilder<M, P> where M : GradleDslModel, P : GradlePropertiesDslElement {
-  return object : GradleBlockModelMap.BlockModelBuilder<M, P> {
+private infix fun <M, P> Class<M>.from(action: (P) -> M): BlockModelBuilder<M, P> where M : GradleDslModel, P : GradlePropertiesDslElement {
+  return object : BlockModelBuilder<M, P> {
     override fun modelClass() = this@from
     override fun create(p: P): M = action(p)
   }
diff --git a/kmp-modifier/src/main/kotlin/com/intellij/packageSearch/mppDependencyUpdater/dsl/elements/CommonMainSourceSetElement.kt b/kmp-modifier/src/main/kotlin/com/intellij/packageSearch/mppDependencyUpdater/dsl/elements/CommonMainSourceSetElement.kt
index bb5d1ec5..8e9c0213 100644
--- a/kmp-modifier/src/main/kotlin/com/intellij/packageSearch/mppDependencyUpdater/dsl/elements/CommonMainSourceSetElement.kt
+++ b/kmp-modifier/src/main/kotlin/com/intellij/packageSearch/mppDependencyUpdater/dsl/elements/CommonMainSourceSetElement.kt
@@ -1,5 +1,6 @@
 package com.intellij.packageSearch.mppDependencyUpdater.dsl.elements
 
+import com.android.tools.idea.gradle.dsl.parser.GradleDslNameConverter
 import com.android.tools.idea.gradle.dsl.parser.elements.GradleDslBlockElement
 import com.android.tools.idea.gradle.dsl.parser.elements.GradleDslElement
 import com.android.tools.idea.gradle.dsl.parser.elements.GradleNameElement
@@ -29,7 +30,6 @@ class CommonMainSourceSetElement(
     "dependencies" to SourceSetDependenciesElement.DEPENDENCIES as PropertiesElementDescription<GradlePropertiesDslElement>,
   ).let { ImmutableMap.copyOf(it) }
 
-  override fun getChildPropertiesElementsDescriptionMap(): ImmutableMap<String, PropertiesElementDescription<GradlePropertiesDslElement>> {
-    return CHILD_PROPERTIES_ELEMENTS_MAP
-  }
+  override fun getChildPropertiesElementsDescriptionMap(kind: GradleDslNameConverter.Kind?) =
+    CHILD_PROPERTIES_ELEMENTS_MAP
 }
\ No newline at end of file
diff --git a/kmp-modifier/src/main/kotlin/com/intellij/packageSearch/mppDependencyUpdater/dsl/elements/CommonTestSourceSetElement.kt b/kmp-modifier/src/main/kotlin/com/intellij/packageSearch/mppDependencyUpdater/dsl/elements/CommonTestSourceSetElement.kt
index 3fb860a9..c19e185a 100644
--- a/kmp-modifier/src/main/kotlin/com/intellij/packageSearch/mppDependencyUpdater/dsl/elements/CommonTestSourceSetElement.kt
+++ b/kmp-modifier/src/main/kotlin/com/intellij/packageSearch/mppDependencyUpdater/dsl/elements/CommonTestSourceSetElement.kt
@@ -1,5 +1,6 @@
 package com.intellij.packageSearch.mppDependencyUpdater.dsl.elements
 
+import com.android.tools.idea.gradle.dsl.parser.GradleDslNameConverter
 import com.android.tools.idea.gradle.dsl.parser.elements.GradleDslBlockElement
 import com.android.tools.idea.gradle.dsl.parser.elements.GradleDslElement
 import com.android.tools.idea.gradle.dsl.parser.elements.GradleNameElement
@@ -29,7 +30,6 @@ class CommonTestSourceSetElement(
     "dependencies" to SourceSetDependenciesElement.DEPENDENCIES as PropertiesElementDescription<GradlePropertiesDslElement>,
   ).let { ImmutableMap.copyOf(it) }
 
-  override fun getChildPropertiesElementsDescriptionMap(): ImmutableMap<String, PropertiesElementDescription<GradlePropertiesDslElement>> {
-    return CHILD_PROPERTIES_ELEMENTS_MAP
-  }
+  override fun getChildPropertiesElementsDescriptionMap(kind: GradleDslNameConverter.Kind?) =
+    CHILD_PROPERTIES_ELEMENTS_MAP
 }
\ No newline at end of file
diff --git a/kmp-modifier/src/main/kotlin/com/intellij/packageSearch/mppDependencyUpdater/dsl/elements/CreatingDslElement.kt b/kmp-modifier/src/main/kotlin/com/intellij/packageSearch/mppDependencyUpdater/dsl/elements/CreatingDslElement.kt
index 1794b39f..b3a5f982 100644
--- a/kmp-modifier/src/main/kotlin/com/intellij/packageSearch/mppDependencyUpdater/dsl/elements/CreatingDslElement.kt
+++ b/kmp-modifier/src/main/kotlin/com/intellij/packageSearch/mppDependencyUpdater/dsl/elements/CreatingDslElement.kt
@@ -1,5 +1,6 @@
 package com.intellij.packageSearch.mppDependencyUpdater.dsl.elements
 
+import com.android.tools.idea.gradle.dsl.parser.GradleDslNameConverter
 import com.android.tools.idea.gradle.dsl.parser.elements.GradleDslElement
 import com.android.tools.idea.gradle.dsl.parser.elements.GradleNameElement
 import com.android.tools.idea.gradle.dsl.parser.elements.GradlePropertiesDslElement
@@ -28,7 +29,6 @@ class CreatingDslElement(
     "dependencies" to SourceSetDependenciesElement.DEPENDENCIES as PropertiesElementDescription<GradlePropertiesDslElement>,
   ).let { ImmutableMap.copyOf(it) }
 
-  override fun getChildPropertiesElementsDescriptionMap(): ImmutableMap<String, PropertiesElementDescription<GradlePropertiesDslElement>> {
-    return CHILD_PROPERTIES_ELEMENTS_MAP
-  }
+  override fun getChildPropertiesElementsDescriptionMap(kind: GradleDslNameConverter.Kind?) =
+    CHILD_PROPERTIES_ELEMENTS_MAP
 }
\ No newline at end of file
diff --git a/kmp-modifier/src/main/kotlin/com/intellij/packageSearch/mppDependencyUpdater/dsl/elements/GettingDslElement.kt b/kmp-modifier/src/main/kotlin/com/intellij/packageSearch/mppDependencyUpdater/dsl/elements/GettingDslElement.kt
index ca811735..7a026185 100644
--- a/kmp-modifier/src/main/kotlin/com/intellij/packageSearch/mppDependencyUpdater/dsl/elements/GettingDslElement.kt
+++ b/kmp-modifier/src/main/kotlin/com/intellij/packageSearch/mppDependencyUpdater/dsl/elements/GettingDslElement.kt
@@ -1,6 +1,7 @@
 // Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 package com.intellij.packageSearch.mppDependencyUpdater.dsl.elements
 
+import com.android.tools.idea.gradle.dsl.parser.GradleDslNameConverter
 import com.android.tools.idea.gradle.dsl.parser.elements.GradleDslElement
 import com.android.tools.idea.gradle.dsl.parser.elements.GradleNameElement
 import com.android.tools.idea.gradle.dsl.parser.elements.GradlePropertiesDslElement
@@ -29,7 +30,6 @@ class GettingDslElement(
     "dependencies" to SourceSetDependenciesElement.DEPENDENCIES as PropertiesElementDescription<GradlePropertiesDslElement>,
   ).let { ImmutableMap.copyOf(it) }
 
-  override fun getChildPropertiesElementsDescriptionMap(): ImmutableMap<String, PropertiesElementDescription<GradlePropertiesDslElement>> {
-    return CHILD_PROPERTIES_ELEMENTS_MAP
-  }
+  override fun getChildPropertiesElementsDescriptionMap(kind: GradleDslNameConverter.Kind?) =
+    CHILD_PROPERTIES_ELEMENTS_MAP
 }
\ No newline at end of file
diff --git a/kmp-modifier/src/main/kotlin/com/intellij/packageSearch/mppDependencyUpdater/dsl/elements/KotlinDslElement.kt b/kmp-modifier/src/main/kotlin/com/intellij/packageSearch/mppDependencyUpdater/dsl/elements/KotlinDslElement.kt
index 88ebd003..b50253c1 100644
--- a/kmp-modifier/src/main/kotlin/com/intellij/packageSearch/mppDependencyUpdater/dsl/elements/KotlinDslElement.kt
+++ b/kmp-modifier/src/main/kotlin/com/intellij/packageSearch/mppDependencyUpdater/dsl/elements/KotlinDslElement.kt
@@ -1,6 +1,7 @@
 // Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 package com.intellij.packageSearch.mppDependencyUpdater.dsl.elements
 
+import com.android.tools.idea.gradle.dsl.parser.GradleDslNameConverter
 import com.android.tools.idea.gradle.dsl.parser.elements.GradleDslBlockElement
 import com.android.tools.idea.gradle.dsl.parser.elements.GradleDslElement
 import com.android.tools.idea.gradle.dsl.parser.elements.GradleNameElement
@@ -28,7 +29,6 @@ class KotlinDslElement(
     "sourceSets" to SourceSetsElement.SOURCE_SETS as PropertiesElementDescription<GradlePropertiesDslElement>,
   ).let { ImmutableMap.copyOf(it) }
 
-  override fun getChildPropertiesElementsDescriptionMap(): ImmutableMap<String, PropertiesElementDescription<GradlePropertiesDslElement>> {
-    return CHILD_PROPERTIES_ELEMENTS_MAP
-  }
+  override fun getChildPropertiesElementsDescriptionMap(kind: GradleDslNameConverter.Kind?) =
+    CHILD_PROPERTIES_ELEMENTS_MAP
 }
\ No newline at end of file
diff --git a/kmp-modifier/src/main/kotlin/com/intellij/packageSearch/mppDependencyUpdater/dsl/elements/SourceSetsElement.kt b/kmp-modifier/src/main/kotlin/com/intellij/packageSearch/mppDependencyUpdater/dsl/elements/SourceSetsElement.kt
index 6f676a77..5dc5ff04 100644
--- a/kmp-modifier/src/main/kotlin/com/intellij/packageSearch/mppDependencyUpdater/dsl/elements/SourceSetsElement.kt
+++ b/kmp-modifier/src/main/kotlin/com/intellij/packageSearch/mppDependencyUpdater/dsl/elements/SourceSetsElement.kt
@@ -1,6 +1,7 @@
 // Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 package com.intellij.packageSearch.mppDependencyUpdater.dsl.elements
 
+import com.android.tools.idea.gradle.dsl.parser.GradleDslNameConverter
 import com.android.tools.idea.gradle.dsl.parser.elements.GradleDslBlockElement
 import com.android.tools.idea.gradle.dsl.parser.elements.GradleDslElement
 import com.android.tools.idea.gradle.dsl.parser.elements.GradleNameElement
@@ -29,9 +30,8 @@ class SourceSetsElement(
     "commonTest" to CommonTestSourceSetElement.COMMON_TEST as PropertiesElementDescription<GradlePropertiesDslElement>,
   ).let { ImmutableMap.copyOf(it) }
 
-  override fun getChildPropertiesElementsDescriptionMap(): ImmutableMap<String, PropertiesElementDescription<GradlePropertiesDslElement>> {
-    return CHILD_PROPERTIES_ELEMENTS_MAP
-  }
+  override fun getChildPropertiesElementsDescriptionMap(kind: GradleDslNameConverter.Kind?) =
+    CHILD_PROPERTIES_ELEMENTS_MAP
 
   override fun getDescription(): PropertiesElementDescription<SourceSetsElement> = SOURCE_SETS
 
diff --git a/kmp-modifier/src/main/kotlin/com/intellij/packageSearch/mppDependencyUpdater/dsl/models/SourceSetModel.kt b/kmp-modifier/src/main/kotlin/com/intellij/packageSearch/mppDependencyUpdater/dsl/models/SourceSetModel.kt
index 56c9066a..537599e4 100644
--- a/kmp-modifier/src/main/kotlin/com/intellij/packageSearch/mppDependencyUpdater/dsl/models/SourceSetModel.kt
+++ b/kmp-modifier/src/main/kotlin/com/intellij/packageSearch/mppDependencyUpdater/dsl/models/SourceSetModel.kt
@@ -3,7 +3,7 @@ package com.intellij.packageSearch.mppDependencyUpdater.dsl.models
 
 import com.android.tools.idea.gradle.dsl.api.dependencies.DependenciesModel
 import com.android.tools.idea.gradle.dsl.api.util.PsiElementHolder
-import com.android.tools.idea.gradle.dsl.model.dependencies.DeclarativeDependenciesModelImpl
+import com.android.tools.idea.gradle.dsl.model.dependencies.ScriptDependenciesModelImpl
 import com.android.tools.idea.gradle.dsl.parser.elements.GradleNameElement
 import com.intellij.psi.PsiElement
 import com.intellij.packageSearch.mppDependencyUpdater.dsl.elements.SourceSetDependenciesElement
@@ -20,7 +20,7 @@ class SourceSetModel(
 
   fun dependencies(): DependenciesModel? = dslElement.dependencies()?.let {
     when (it) {
-      is SourceSetDependenciesElement -> DeclarativeDependenciesModelImpl(it)
+      is SourceSetDependenciesElement -> ScriptDependenciesModelImpl(it)
       else -> error("unexpected dependencies element: $it, unable to cast as DependenciesModel")
     }
   }
@@ -28,6 +28,6 @@ class SourceSetModel(
   fun addDependenciesBlock(): DependenciesModel {
     val depsElement = SourceSetDependenciesElement(dslElement, GradleNameElement.create("dependencies"))
     dslElement.setNewElement(depsElement)
-    return DeclarativeDependenciesModelImpl(depsElement)
+    return ScriptDependenciesModelImpl(depsElement)
   }
 }
\ No newline at end of file
diff --git a/packagesearch.versions.toml b/packagesearch.versions.toml
index 062d589d..9b137c82 100644
--- a/packagesearch.versions.toml
+++ b/packagesearch.versions.toml
@@ -12,10 +12,11 @@ gradlePublishPlugin = "1.1.0"
 ideStarter = "LATEST-EAP-SNAPSHOT"
 idea = "2024.2"
 ideaGradlePlugin = "1.17.3"
+newIdeaGradlePlugin = "2.1.0"
 jewel = "0.19.6"
 junit = "5.10.2"
 junit4 = "4.13.2"
-kotlin = "1.9.24"
+kotlin = "2.0.20"
 kotlinPoet = "1.15.2"
 kotlinterGradlePlugin = "3.12.0"
 kotlinxDatetime = "0.5.0"
@@ -40,7 +41,7 @@ detekt-formatting = { module = "io.gitlab.arturbosch.detekt:detekt-formatting",
 dokka-gradle-plugin = { module = "org.jetbrains.dokka:dokka-gradle-plugin", version.ref = "dokka" }
 flexmark = { module = "com.vladsch.flexmark:flexmark-all", version.ref = "flexmark" }
 foojay-resolver-gradle-plugin = { module = "org.gradle.toolchains:foojay-resolver", version.ref = "foojay" }
-gradle-intellij-platform-plugin = { module = "org.jetbrains.intellij.plugins:gradle-intellij-plugin", version.ref = "ideaGradlePlugin" }
+gradle-intellij-platform-plugin = { module = "org.jetbrains.intellij.platform:intellij-platform-gradle-plugin", version.ref = "newIdeaGradlePlugin" }
 ide-starter-junit5 = { module = "com.jetbrains.intellij.tools:ide-starter-junit5", version.ref = "ideStarter" }
 ide-starter-squashed = { module = "com.jetbrains.intellij.tools:ide-starter-squashed", version.ref = "ideStarter" }
 ij-platform-core-ui = { module = "com.jetbrains.intellij.platform:core-ui", version.ref = "idea" }
@@ -92,7 +93,7 @@ xmlutils-serialization = { module = "io.github.pdvrieze.xmlutil:serialization",
 detekt-gradle-plugin = { module = "io.gitlab.arturbosch.detekt:detekt-gradle-plugin", version.ref = "detekt" }
 kotlin-gradle-plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
 kotlinter-gradle-plugin = { module = "org.jmailen.gradle:kotlinter-gradle", version.ref = "kotlinterGradlePlugin" }
-shadow-gradle-plugin = { module = "com.github.johnrengelman:shadow", version = "8.1.1" }
+shadow-gradle-plugin = { module = "com.gradleup.shadow:shadow-gradle-plugin", version = "8.3.3" }
 
 [bundles]
 idea = ["ij-platform-ide-core", "ij-platform-ide-impl", "ij-platform-core-ui"]
@@ -103,8 +104,13 @@ detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detekt" }
 dokka = { id = "org.jetbrains.dokka", version.ref = "dokka" }
 foojay-resolver = { id = "org.gradle.toolchains.foojay-resolver-convention", version.ref = "foojay" }
 gradle-publish-plugin = { id = "com.gradle.plugin-publish", version.ref = "gradlePublishPlugin" }
-idea-gradle-plugin = { id = "org.jetbrains.intellij", version.ref = "ideaGradlePlugin" }
+idea-gradle-plugin = { id = "org.jetbrains.intellij.platform", version.ref = "newIdeaGradlePlugin" }
+idea-gradle-plugin-platform = { id = "org.jetbrains.intellij.platform", version.ref = "newIdeaGradlePlugin" }
+idea-gradle-plugin-module = { id = "org.jetbrains.intellij.platform.module", version.ref = "newIdeaGradlePlugin" }
+idea-gradle-plugin-base = { id = "org.jetbrains.intellij.platform.base", version.ref = "newIdeaGradlePlugin" }
 kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
 kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
 kotlin-plugin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
+kotlin-plugin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
 kotlinter = { id = "org.jmailen.kotlinter", version.ref = "kotlinterGradlePlugin" }
+shadow = { id = "com.gradleup.shadow", version = "8.3.3" }
diff --git a/plugin/build.gradle.kts b/plugin/build.gradle.kts
index e9f7f275..c48b4b82 100644
--- a/plugin/build.gradle.kts
+++ b/plugin/build.gradle.kts
@@ -4,56 +4,22 @@ import com.vladsch.flexmark.html.HtmlRenderer
 import com.vladsch.flexmark.parser.Parser
 import java.lang.System.getenv
 import kotlin.math.max
-import org.jetbrains.intellij.tasks.PublishPluginTask
-import org.jetbrains.kotlin.util.prefixIfNot
-import org.jetbrains.kotlin.util.suffixIfNot
-import org.jetbrains.packagesearch.gradle.lafFile
-import org.jetbrains.packagesearch.gradle.logCategoriesFile
-import org.jetbrains.packagesearch.gradle.patchLafFile
-import org.jetbrains.packagesearch.gradle.patchLogFile
-import org.jetbrains.packagesearch.gradle.patchSettingsFile
-import org.jetbrains.packagesearch.gradle.patchTextRegistryFile
-import org.jetbrains.packagesearch.gradle.registryTextFile
-import org.jetbrains.packagesearch.gradle.settingsFile
-
-
-repositories {
-    maven {
-        url = uri("https://maven.pkg.jetbrains.space/public/p/ktor/eap")
-        name = "Ktor EAP"
-    }
-}
+import org.jetbrains.intellij.platform.gradle.tasks.PublishPluginTask
+
+
 plugins {
-    id(packageSearchCatalog.plugins.kotlin.jvm)
-    id(packageSearchCatalog.plugins.idea.gradle.plugin)
-    id(packageSearchCatalog.plugins.dokka)
+    alias(packageSearchCatalog.plugins.kotlin.jvm)
+    id(packageSearchCatalog.plugins.idea.gradle.plugin.platform)
+    alias(packageSearchCatalog.plugins.dokka)
     alias(packageSearchCatalog.plugins.compose.desktop)
+    alias(packageSearchCatalog.plugins.kotlin.plugin.compose)
     alias(packageSearchCatalog.plugins.kotlin.plugin.serialization)
-    `build-config`
+    alias(packageSearchCatalog.plugins.shadow)
     `maven-publish`
 }
 
-packagesearch {
-    publication {
-        isEnabled = true
-        artifactId = "packagesearch-plugin"
-    }
-    optIns.addAll(
-        "androidx.compose.ui.ExperimentalComposeUiApi",
-        "org.jetbrains.compose.splitpane.ExperimentalSplitPaneApi",
-        "org.jetbrains.jewel.ExperimentalJewelApi",
-        "androidx.compose.foundation.ExperimentalFoundationApi",
-        "kotlin.io.encoding.ExperimentalEncodingApi",
-        "kotlin.ExperimentalStdlibApi",
-        "kotlin.io.path.ExperimentalPathApi",
-        "org.jetbrains.jewel.foundation.ExperimentalJewelApi"
-    )
-    isRunIdeEnabled = true
-}
-
-intellij {
-    plugins.add("org.jetbrains.idea.reposearch")
-    plugins.add("com.jetbrains.performancePlugin")
+intellijPlatform {
+    instrumentCode = false
 }
 
 val tooling: Configuration by configurations.creating {
@@ -61,6 +27,15 @@ val tooling: Configuration by configurations.creating {
 }
 
 dependencies {
+
+    intellijPlatform {
+        intellijIdeaCommunity(INTELLIJ_VERSION)
+        bundledPlugins(
+            "org.jetbrains.idea.reposearch",
+            "com.jetbrains.performancePlugin"
+        )
+    }
+
     implementation(compose.desktop.linux_arm64)
     implementation(compose.desktop.linux_x64)
     implementation(compose.desktop.macos_arm64)
@@ -80,13 +55,6 @@ dependencies {
     implementation(projects.plugin.maven)
     implementation(projects.plugin.utils)
 
-    sourceElements(projects.plugin.core)
-    sourceElements(projects.plugin.gradle)
-    sourceElements(projects.plugin.gradle.base)
-    sourceElements(projects.plugin.gradle.kmp)
-    sourceElements(projects.plugin.maven)
-    sourceElements(projects.plugin.utils)
-
     tooling(projects.plugin.gradle.tooling)
 
     testImplementation(kotlin("test-junit5"))
@@ -100,27 +68,10 @@ dependencies {
     testRuntimeOnly(packageSearchCatalog.junit.jupiter.engine)
 }
 
-val pkgsPluginId: String by project
-
 tasks {
-    val patchIdeSettings by registering {
-        dependsOn(prepareSandbox)
-        doLast {
-            prepareSandbox.registryTextFile.get()
-                .patchTextRegistryFile()
-            prepareSandbox.lafFile.get()
-                .patchLafFile()
-            prepareSandbox.settingsFile.get()
-                .patchSettingsFile()
-            prepareSandbox.logCategoriesFile.get()
-                .patchLogFile(pkgsPluginId)
-        }
-    }
-    runIde {
-        dependsOn(patchIdeSettings)
-    }
     prepareSandbox {
-        runtimeClasspathFiles = tooling
+        runtimeClasspath = tooling
+        pluginJar = shadowJar.flatMap { it.archiveFile }
     }
 
     val runNumber = getenv("RUN_NUMBER")?.toInt() ?: 0
@@ -129,16 +80,20 @@ tasks {
     val versionString = project.version.toString()
 
     patchPluginXml {
-        pluginId = pkgsPluginId
+        pluginId = PACKAGE_SEARCH_PLUGIN_ID
         version = versionString.replace("-SNAPSHOT", ".$snapshotMinorVersion")
         changeNotes = getenv("CHANGE_NOTES")
             ?.let { Parser.builder().build().parse(it) }
             ?.let { HtmlRenderer.builder().build().render(it) }
-            ?.prefixIfNot("<![CDATA[")
-            ?.suffixIfNot("]]>")
 
     }
 
+    shadowJar {
+        exclude { it.name.containsAny(JAR_NAMES_TO_REMOVE) }
+        exclude { it.name == "module-info.class" }
+        exclude { it.name.endsWith("kotlin_module") }
+    }
+
     val buildShadowPlugin by registering(Zip::class) {
         group = "intellij"
         from(shadowJar) {
@@ -147,7 +102,7 @@ tasks {
         from(tooling) {
             rename { "gradle-tooling.jar" }
         }
-        into("$pkgsPluginId/lib")
+        into("$PACKAGE_SEARCH_PLUGIN_ID/lib")
         archiveFileName = "packageSearch-${project.version}.zip"
             .replace("-SNAPSHOT", ".$snapshotMinorVersion")
         destinationDirectory = layout.buildDirectory.dir("distributions")
@@ -159,7 +114,7 @@ tasks {
 
     test {
         dependsOn(buildShadowPlugin)
-        environment("PKGS_PLUGIN_ID", pkgsPluginId)
+        environment("PKGS_PLUGIN_ID", PACKAGE_SEARCH_PLUGIN_ID)
         environment("PKGS_TEST_DATA_OUTPUT_DIR", testDataDirectoryPath.get())
         environment("KMP", true)
         val pluginArtifactDirectoryPath = buildShadowPlugin.get()
@@ -180,9 +135,9 @@ tasks {
     }
 
     register<PublishPluginTask>("publishSnapshotPluginToTBE") {
+        ideServices = true
         group = "publishing"
-        distributionFile = buildShadowPlugin.flatMap { it.archiveFile }
-        toolboxEnterprise = true
+        archiveFile = buildShadowPlugin.flatMap { it.archiveFile }
         host = "https://tbe.labs.jb.gg/"
         token = project.properties["toolboxEnterpriseToken"]?.toString()
             ?: getenv("TOOLBOX_ENTERPRISE_TOKEN")
@@ -190,9 +145,9 @@ tasks {
     }
 
     register<PublishPluginTask>("publishReleasePluginToTBE") {
+        ideServices = true
         group = "publishing"
-        distributionFile = buildShadowPlugin.flatMap { it.archiveFile }
-        toolboxEnterprise = true
+        archiveFile = buildShadowPlugin.flatMap { it.archiveFile }
         host = "https://tbe.labs.jb.gg/"
         token = project.properties["toolboxEnterpriseToken"]?.toString()
             ?: getenv("TOOLBOX_ENTERPRISE_TOKEN")
@@ -201,9 +156,10 @@ tasks {
 
     register<PublishPluginTask>("publishPluginToMarketplace") {
         group = "publishing"
-        distributionFile = buildShadowPlugin.flatMap { it.archiveFile }
+        archiveFile = buildShadowPlugin.flatMap { it.archiveFile }
         token = project.properties["marketplaceToken"]?.toString()
             ?: getenv("MARKETPLACE_TOKEN")
     }
 
 }
+
diff --git a/plugin/core/build.gradle.kts b/plugin/core/build.gradle.kts
index 6ed35199..7eec23fb 100644
--- a/plugin/core/build.gradle.kts
+++ b/plugin/core/build.gradle.kts
@@ -4,22 +4,17 @@ import org.jetbrains.packagesearch.gradle.GeneratePackageSearchObject
 
 
 plugins {
-    id(packageSearchCatalog.plugins.kotlin.jvm)
-    id(packageSearchCatalog.plugins.dokka)
-    id(packageSearchCatalog.plugins.idea.gradle.plugin)
+    alias(packageSearchCatalog.plugins.kotlin.jvm)
+    alias(packageSearchCatalog.plugins.dokka)
     alias(packageSearchCatalog.plugins.kotlin.plugin.serialization)
-    `build-config`
+    id(packageSearchCatalog.plugins.idea.gradle.plugin.base)
     `maven-publish`
 }
 
-packagesearch {
-    publication {
-        isEnabled = true
-        artifactId = "packagesearch-plugin-core"
-    }
-}
-
 dependencies {
+    intellijPlatform {
+        intellijIdeaCommunity(INTELLIJ_VERSION)
+    }
     api(packageSearchCatalog.potassium.nitrite) {
         exclude(group = "com.fasterxml.jackson")
         exclude(group = "com.fasterxml.jackson.core")
@@ -43,25 +38,17 @@ kotlin.sourceSets.main {
     kotlin.srcDirs(generatedDir)
 }
 
-val pkgsPluginId: String by project
-
 tasks {
     withType<Test> {
         environment("DB_PATH", layout.buildDirectory.file("tests/cache.db").get().asFile.absolutePath)
     }
     val generatePluginDataSources by registering(GeneratePackageSearchObject::class) {
         group = "generate"
-        pluginId = pkgsPluginId
+        pluginId = PACKAGE_SEARCH_PLUGIN_ID
         outputDir = generatedDir
         packageName = "com.jetbrains.packagesearch.plugin.core"
         databaseVersion = 3
     }
-    sourcesJar {
-        dependsOn(generatePluginDataSources)
-    }
-    dokkaHtml {
-        dependsOn(generatePluginDataSources)
-    }
     compileKotlin {
         dependsOn(generatePluginDataSources)
     }
diff --git a/plugin/core/src/main/kotlin/com/jetbrains/packagesearch/plugin/core/data/PackageSearchDependencyManager.kt b/plugin/core/src/main/kotlin/com/jetbrains/packagesearch/plugin/core/data/PackageSearchDependencyManager.kt
index 0290b071..b1188bcc 100644
--- a/plugin/core/src/main/kotlin/com/jetbrains/packagesearch/plugin/core/data/PackageSearchDependencyManager.kt
+++ b/plugin/core/src/main/kotlin/com/jetbrains/packagesearch/plugin/core/data/PackageSearchDependencyManager.kt
@@ -5,18 +5,24 @@ import org.jetbrains.packagesearch.api.v3.ApiRepository
 
 interface PackageSearchDependencyManager {
 
-    context(EditModuleContext)
     fun updateDependency(
+        context: EditModuleContext,
         declaredPackage: PackageSearchDeclaredPackage,
         newVersion: String?,
         newScope: String?
     )
 
-    context(EditModuleContext)
-    fun addDependency(apiPackage: ApiPackage, selectedVersion: String, selectedScope: String?)
+    fun addDependency(
+        context: EditModuleContext,
+        apiPackage: ApiPackage,
+        selectedVersion: String,
+        selectedScope: String?,
+    )
 
-    context(EditModuleContext)
-    fun removeDependency(declaredPackage: PackageSearchDeclaredPackage)
+    fun removeDependency(
+        context: EditModuleContext,
+        declaredPackage: PackageSearchDeclaredPackage
+    )
 
 }
 
@@ -25,8 +31,15 @@ interface EditModuleContext {
 }
 
 interface PackageSearchModuleEditor {
-    suspend fun editModule(action: context(EditModuleContext) () -> Unit)
+    suspend fun editModule(action: EditModuleContext.() -> Unit)
 
-    context(EditModuleContext) fun addRepository(repository: ApiRepository)
-    context(EditModuleContext)  fun removeRepository(repository: PackageSearchDeclaredRepository)
+    fun addRepository(
+        context: EditModuleContext,
+        repository: ApiRepository
+    )
+
+    fun removeRepository(
+        context: EditModuleContext,
+        repository: PackageSearchDeclaredRepository
+    )
 }
\ No newline at end of file
diff --git a/plugin/core/src/main/kotlin/com/jetbrains/packagesearch/plugin/core/extensions/PackageSearchModuleProvider.kt b/plugin/core/src/main/kotlin/com/jetbrains/packagesearch/plugin/core/extensions/PackageSearchModuleProvider.kt
index 72a15653..0c92364b 100644
--- a/plugin/core/src/main/kotlin/com/jetbrains/packagesearch/plugin/core/extensions/PackageSearchModuleProvider.kt
+++ b/plugin/core/src/main/kotlin/com/jetbrains/packagesearch/plugin/core/extensions/PackageSearchModuleProvider.kt
@@ -7,8 +7,7 @@ import kotlinx.coroutines.flow.Flow
 
 interface PackageSearchModuleProvider {
 
-    context(PackageSearchModuleBuilderContext)
-    fun provideModule(nativeModule: Module): Flow<PackageSearchModule?>
+    fun provideModule(context: PackageSearchModuleBuilderContext, nativeModule: Module): Flow<PackageSearchModule?>
 
     fun getSyncStateFlow(project: Project): Flow<Boolean>
 
diff --git a/plugin/core/src/main/kotlin/com/jetbrains/packagesearch/plugin/core/services/PackageSearchProjectCachesService.kt b/plugin/core/src/main/kotlin/com/jetbrains/packagesearch/plugin/core/services/PackageSearchProjectCachesService.kt
index 920e1ba3..7644d4d6 100644
--- a/plugin/core/src/main/kotlin/com/jetbrains/packagesearch/plugin/core/services/PackageSearchProjectCachesService.kt
+++ b/plugin/core/src/main/kotlin/com/jetbrains/packagesearch/plugin/core/services/PackageSearchProjectCachesService.kt
@@ -1,3 +1,5 @@
+@file:OptIn(PKGSInternalAPI::class)
+
 package com.jetbrains.packagesearch.plugin.core.services
 
 import com.intellij.openapi.Disposable
diff --git a/plugin/core/src/main/kotlin/com/jetbrains/packagesearch/plugin/core/utils/Utils.kt b/plugin/core/src/main/kotlin/com/jetbrains/packagesearch/plugin/core/utils/Utils.kt
index 120e42ce..0c419520 100644
--- a/plugin/core/src/main/kotlin/com/jetbrains/packagesearch/plugin/core/utils/Utils.kt
+++ b/plugin/core/src/main/kotlin/com/jetbrains/packagesearch/plugin/core/utils/Utils.kt
@@ -1,4 +1,5 @@
 @file:Suppress("UnstableApiUsage")
+@file:OptIn(ExperimentalContracts::class, ExperimentalContracts::class)
 
 package com.jetbrains.packagesearch.plugin.core.utils
 
@@ -42,8 +43,8 @@ import com.jetbrains.packagesearch.plugin.core.data.PackageSearchDeclaredPackage
 import com.jetbrains.packagesearch.plugin.core.services.PackageSearchProjectCachesService
 import java.nio.file.Files
 import java.nio.file.Path
+import kotlin.contracts.ExperimentalContracts
 import kotlin.contracts.contract
-import kotlin.coroutines.cancellation.CancellationException
 import kotlin.io.path.createDirectories
 import kotlinx.coroutines.channels.ProducerScope
 import kotlinx.coroutines.channels.awaitClose
diff --git a/plugin/gradle/base/build.gradle.kts b/plugin/gradle/base/build.gradle.kts
index 3590968d..3d72a505 100644
--- a/plugin/gradle/base/build.gradle.kts
+++ b/plugin/gradle/base/build.gradle.kts
@@ -1,30 +1,21 @@
 @file:Suppress("UnstableApiUsage")
 
 plugins {
-    id(packageSearchCatalog.plugins.kotlin.jvm)
-    id(packageSearchCatalog.plugins.idea.gradle.plugin)
-    id(packageSearchCatalog.plugins.dokka)
+    alias(packageSearchCatalog.plugins.kotlin.jvm)
+    id(packageSearchCatalog.plugins.idea.gradle.plugin.base)
+    alias(packageSearchCatalog.plugins.dokka)
     alias(packageSearchCatalog.plugins.kotlin.plugin.serialization)
-    `build-config`
     `maven-publish`
 }
 
-packagesearch {
-    publication {
-        isEnabled = true
-        artifactId = "packagesearch-plugin-gradle-base"
-    }
-}
-
-intellij {
-    plugins.addAll(
-        "org.jetbrains.kotlin",
-        "org.jetbrains.plugins.gradle",
-        "org.jetbrains.idea.gradle.dsl"
-    )
-}
-
 dependencies {
+    intellijPlatform {
+        intellijIdeaCommunity(INTELLIJ_VERSION)
+        bundledPlugins(
+            "org.jetbrains.kotlin",
+            "org.jetbrains.plugins.gradle",
+            "org.jetbrains.idea.gradle.dsl"
+        )
+    }
     api(projects.plugin.gradle)
-    sourceElements(projects.plugin.gradle)
-}
\ No newline at end of file
+}
diff --git a/plugin/gradle/base/src/main/kotlin/com/jetbrains/packagesearch/plugin/gradle/GradleModuleProvider.kt b/plugin/gradle/base/src/main/kotlin/com/jetbrains/packagesearch/plugin/gradle/GradleModuleProvider.kt
index c469e65d..1f99d295 100644
--- a/plugin/gradle/base/src/main/kotlin/com/jetbrains/packagesearch/plugin/gradle/GradleModuleProvider.kt
+++ b/plugin/gradle/base/src/main/kotlin/com/jetbrains/packagesearch/plugin/gradle/GradleModuleProvider.kt
@@ -10,21 +10,22 @@ import com.jetbrains.packagesearch.plugin.gradle.utils.getDeclaredDependencies
 import com.jetbrains.packagesearch.plugin.gradle.utils.toGradle
 import kotlinx.coroutines.flow.FlowCollector
 import org.jetbrains.packagesearch.api.v3.ApiMavenRepository
+import org.jetbrains.packagesearch.api.v3.http.PackageSearchEndpointPaths.knownRepositories
 import org.jetbrains.packagesearch.api.v3.search.androidPackages
 import org.jetbrains.packagesearch.api.v3.search.buildPackageTypes
 import org.jetbrains.packagesearch.api.v3.search.jvmGradlePackages
 
 class GradleModuleProvider : AbstractGradleModuleProvider() {
 
-    context(PackageSearchModuleBuilderContext)
     override suspend fun FlowCollector<PackageSearchModule?>.transform(
+        context: PackageSearchModuleBuilderContext,
         module: Module,
         model: PackageSearchGradleModel,
     ) {
         if (!PackageSearch.isKMPEnabled || !model.isKotlinMultiplatformApplied) {
             val availableKnownRepositories =
                 model.declaredRepositories.toSet().let { availableGradleRepositories ->
-                    knownRepositories.filterValues {
+                    context.knownRepositories.filterValues {
                         it is ApiMavenRepository && it.alternateUrls.intersect(availableGradleRepositories).isNotEmpty()
                     }
                 }
@@ -33,7 +34,7 @@ class GradleModuleProvider : AbstractGradleModuleProvider() {
                 .filter { it.canBeDeclared }
                 .map { it.name }
             val declaredDependencies = model.buildFilePath
-                ?.let { module.getDeclaredDependencies(it) }
+                ?.let { module.getDeclaredDependencies(context, it) }
                 ?: emptyList()
             val packageSearchGradleModule = PackageSearchGradleModule(
                 name = model.projectName,
@@ -43,7 +44,7 @@ class GradleModuleProvider : AbstractGradleModuleProvider() {
                     projectDir = model.projectDir,
                 ),
                 buildFilePath = model.buildFilePath,
-                declaredRepositories = model.declaredRepositories.toGradle(),
+                declaredRepositories = model.declaredRepositories.toGradle(context),
                 declaredDependencies = declaredDependencies,
                 availableKnownRepositories = availableKnownRepositories,
                 packageSearchModel = model,
diff --git a/plugin/gradle/base/src/main/kotlin/com/jetbrains/packagesearch/plugin/gradle/GradleUtils.kt b/plugin/gradle/base/src/main/kotlin/com/jetbrains/packagesearch/plugin/gradle/GradleUtils.kt
index 6fced368..637f126d 100644
--- a/plugin/gradle/base/src/main/kotlin/com/jetbrains/packagesearch/plugin/gradle/GradleUtils.kt
+++ b/plugin/gradle/base/src/main/kotlin/com/jetbrains/packagesearch/plugin/gradle/GradleUtils.kt
@@ -9,14 +9,12 @@ import com.jetbrains.packagesearch.plugin.core.data.PackageSearchDeclaredReposit
 import kotlin.contracts.contract
 
 
-context(EditModuleContext)
-internal fun validateContextType(): DependencyModifierService {
+internal fun EditModuleContext.validateContextType(): DependencyModifierService {
     require(data is DependencyModifierService) {
         "Context must be EditMavenModuleContext"
     }
     return data as DependencyModifierService
 }
 
-context(EditModuleContext)
-val modifier
+val EditModuleContext.modifier
     get() = validateContextType()
\ No newline at end of file
diff --git a/plugin/gradle/base/src/main/kotlin/com/jetbrains/packagesearch/plugin/gradle/PackageSearchGradleModule.kt b/plugin/gradle/base/src/main/kotlin/com/jetbrains/packagesearch/plugin/gradle/PackageSearchGradleModule.kt
index 2142a41e..3f27f343 100644
--- a/plugin/gradle/base/src/main/kotlin/com/jetbrains/packagesearch/plugin/gradle/PackageSearchGradleModule.kt
+++ b/plugin/gradle/base/src/main/kotlin/com/jetbrains/packagesearch/plugin/gradle/PackageSearchGradleModule.kt
@@ -63,8 +63,8 @@ data class PackageSearchGradleModule(
         }
     }
 
-    context(EditModuleContext)
     override fun updateDependency(
+        context: EditModuleContext,
         declaredPackage: PackageSearchDeclaredPackage,
         newVersion: String?,
         newScope: String?,
@@ -76,15 +76,15 @@ data class PackageSearchGradleModule(
                 .copy(version = newVersion ?: oldDescriptor.coordinates.version),
             scope = newScope ?: oldDescriptor.scope,
         )
-        modifier.updateDependency(
+        context.modifier.updateDependency(
             module = nativeModule,
             oldDescriptor = oldDescriptor,
             newDescriptor = newDescriptor,
         )
     }
 
-    context(EditModuleContext)
     override fun addDependency(
+        context: EditModuleContext,
         apiPackage: ApiPackage,
         selectedVersion: String,
         selectedScope: String?,
@@ -106,7 +106,7 @@ data class PackageSearchGradleModule(
             return
         }
 
-        modifier.addDependency(
+        context.modifier.addDependency(
             module = nativeModule,
             descriptor = UnifiedDependency(
                 groupId = apiPackage.groupId,
@@ -117,28 +117,34 @@ data class PackageSearchGradleModule(
         )
     }
 
-    context(EditModuleContext)
-    override fun removeDependency(declaredPackage: PackageSearchDeclaredPackage) {
+    override fun removeDependency(
+        context: EditModuleContext,
+        declaredPackage: PackageSearchDeclaredPackage,
+    ) {
         validateMavenDeclaredPackageType(declaredPackage)
-        modifier.removeDependency(
+        context.modifier.removeDependency(
             module = nativeModule,
             descriptor = declaredPackage.toUnifiedDependency(),
         )
     }
 
-    context(EditModuleContext)
-    override fun addRepository(repository: ApiRepository) {
+    override fun addRepository(
+        context: EditModuleContext,
+        repository: ApiRepository
+    ) {
         validateRepositoryType(repository)
-        modifier.addRepository(
+        context.modifier.addRepository(
             module = nativeModule,
             repository = repository.toUnifiedRepository(),
         )
     }
 
-    context(EditModuleContext)
-    override fun removeRepository(repository: PackageSearchDeclaredRepository) {
+    override fun removeRepository(
+        context: EditModuleContext,
+        repository: PackageSearchDeclaredRepository,
+    ) {
         validateRepositoryType(repository)
-        modifier.deleteRepository(
+        context.modifier.deleteRepository(
             module = nativeModule,
             repository = repository.toUnifiedRepository(),
         )
diff --git a/plugin/gradle/build.gradle.kts b/plugin/gradle/build.gradle.kts
index fc3e627b..dd90a917 100644
--- a/plugin/gradle/build.gradle.kts
+++ b/plugin/gradle/build.gradle.kts
@@ -1,33 +1,28 @@
 @file:Suppress("UnstableApiUsage")
 
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+
+
 plugins {
-    id(packageSearchCatalog.plugins.kotlin.jvm)
-    id(packageSearchCatalog.plugins.idea.gradle.plugin)
-    id(packageSearchCatalog.plugins.dokka)
+    alias(packageSearchCatalog.plugins.kotlin.jvm)
+    id(packageSearchCatalog.plugins.idea.gradle.plugin.base)
+    alias(packageSearchCatalog.plugins.dokka)
     alias(packageSearchCatalog.plugins.kotlin.plugin.serialization)
-    `build-config`
     `maven-publish`
 }
 
-packagesearch {
-    publication {
-        isEnabled = true
-        artifactId = "packagesearch-plugin-gradle-core"
-    }
-}
+dependencies {
 
-intellij {
-    plugins.addAll(
-        "org.jetbrains.kotlin",
-        "org.jetbrains.plugins.gradle",
-        "org.jetbrains.idea.gradle.dsl"
-    )
-}
+    intellijPlatform {
+        intellijIdeaCommunity(INTELLIJ_VERSION)
+        bundledPlugins(
+            "org.jetbrains.kotlin",
+            "org.jetbrains.plugins.gradle",
+            "org.jetbrains.idea.gradle.dsl"
+        )
+    }
 
-dependencies {
     compileOnly(projects.plugin.gradle.tooling)
-    sourceElements(projects.plugin.gradle.tooling)
     api(projects.plugin.core)
-    sourceElements(projects.plugin.core)
     api(packageSearchCatalog.kotlinx.serialization.core)
 }
diff --git a/plugin/gradle/kmp/build.gradle.kts b/plugin/gradle/kmp/build.gradle.kts
index a74d4569..1e5c65d1 100644
--- a/plugin/gradle/kmp/build.gradle.kts
+++ b/plugin/gradle/kmp/build.gradle.kts
@@ -1,31 +1,23 @@
 @file:Suppress("UnstableApiUsage")
 
 plugins {
-    id(packageSearchCatalog.plugins.kotlin.jvm)
-    id(packageSearchCatalog.plugins.idea.gradle.plugin)
-    id(packageSearchCatalog.plugins.dokka)
+    alias(packageSearchCatalog.plugins.kotlin.jvm)
+    id(packageSearchCatalog.plugins.idea.gradle.plugin.base)
+    alias(packageSearchCatalog.plugins.dokka)
     alias(packageSearchCatalog.plugins.kotlin.plugin.serialization)
-    `build-config`
     `maven-publish`
 }
 
-packagesearch {
-    publication {
-        isEnabled = true
-        artifactId = "packagesearch-plugin-kmp"
-    }
-}
+dependencies {
 
-intellij {
-    plugins.addAll(
-        "org.jetbrains.plugins.gradle",
-        "org.jetbrains.idea.gradle.dsl"
-    )
-}
+    intellijPlatform {
+        intellijIdeaCommunity(INTELLIJ_VERSION)
+        bundledPlugins(
+            "org.jetbrains.plugins.gradle",
+            "org.jetbrains.idea.gradle.dsl"
+        )
+    }
 
-dependencies {
     api(projects.plugin.gradle)
     api(projects.kmpModifier)
-    sourceElements(projects.plugin.gradle)
-    sourceElements(projects.kmpModifier)
-}
\ No newline at end of file
+}
diff --git a/plugin/gradle/kmp/src/main/kotlin/com/jetbrains/packagesearch/plugin/gradle/KMPUtils.kt b/plugin/gradle/kmp/src/main/kotlin/com/jetbrains/packagesearch/plugin/gradle/KMPUtils.kt
index 7fa74d83..e02d1abd 100644
--- a/plugin/gradle/kmp/src/main/kotlin/com/jetbrains/packagesearch/plugin/gradle/KMPUtils.kt
+++ b/plugin/gradle/kmp/src/main/kotlin/com/jetbrains/packagesearch/plugin/gradle/KMPUtils.kt
@@ -1,3 +1,5 @@
+@file:OptIn(ExperimentalContracts::class)
+
 package com.jetbrains.packagesearch.plugin.gradle
 
 import com.intellij.openapi.Disposable
@@ -24,6 +26,7 @@ import com.jetbrains.packagesearch.plugin.gradle.utils.getDeclaredDependencies
 import com.jetbrains.packagesearch.plugin.gradle.utils.toGradleDependencyModel
 import java.nio.file.Path
 import korlibs.crypto.sha512
+import kotlin.contracts.ExperimentalContracts
 import kotlin.contracts.contract
 import kotlin.io.path.absolutePathString
 import kotlinx.coroutines.Dispatchers
@@ -122,15 +125,13 @@ internal fun validateKMPDeclaredPackageType(declaredPackage: PackageSearchDeclar
     }
 }
 
-context(EditModuleContext)
-internal fun validateContextType(): EditKMPModuleContextData {
+internal fun EditModuleContext.validate(): EditKMPModuleContextData {
     require(data is EditKMPModuleContextData) { "Context is not a KMP context" }
     return data as EditKMPModuleContextData
 }
 
-context(EditModuleContext)
-val kmpData
-    get() = validateContextType()
+val EditModuleContext.kmpData
+    get() = validate()
 
 fun PackageSearchKotlinMultiplatformDeclaredDependency.Maven.toMPPDependency() =
     MppDependency.Maven(
@@ -141,8 +142,8 @@ fun PackageSearchKotlinMultiplatformDeclaredDependency.Maven.toMPPDependency() =
     )
 
 
-context(PackageSearchModuleBuilderContext)
 suspend fun Module.getKMPVariants(
+    context: PackageSearchModuleBuilderContext,
     compilationModel: Map<String, Set<MppCompilationInfoModel.Compilation>>,
     buildFilePath: Path?,
     availableScopes: List<String>,
@@ -150,7 +151,7 @@ suspend fun Module.getKMPVariants(
     if (buildFilePath == null) return@coroutineScope emptyList()
 
     val dependenciesBlockVariant = async {
-        val declaredDependencies = getDeclaredDependencies(buildFilePath)
+        val declaredDependencies = getDeclaredDependencies(context, buildFilePath)
         PackageSearchKotlinMultiplatformVariant.DependenciesBlock(
             declaredDependencies = declaredDependencies.asKmpVariantDependencies(),
             compatiblePackageTypes = buildPackageTypes {
@@ -180,7 +181,7 @@ suspend fun Module.getKMPVariants(
         .distinct()
         .map { it.packageId }
 
-    val dependencyInfo = getPackageInfoByIdHashes(packageIds.map { ApiPackage.hashPackageId(it) }.toSet())
+    val dependencyInfo = context.getPackageInfoByIdHashes(packageIds.map { ApiPackage.hashPackageId(it) }.toSet())
 
     val declaredSourceSetDependencies =
         rawDeclaredSourceSetDependencies
@@ -251,8 +252,9 @@ class GradleKMPCacheService(project: Project) : Disposable {
     override fun dispose() = kmpDependencyRepository.close()
 }
 
-context(PackageSearchModuleBuilderContext)
-private suspend fun Module.getDependenciesBySourceSet(buildFilePath: Path): Map<String, List<GradleDependencyModel>> {
+private suspend fun Module.getDependenciesBySourceSet(
+    buildFilePath: Path
+): Map<String, List<GradleDependencyModel>> {
     val vf = buildFilePath.refreshAndFindVirtualFile() ?: return emptyMap()
 
     val buildFileHash = vf.contentsToByteArray().sha512().hex
diff --git a/plugin/gradle/kmp/src/main/kotlin/com/jetbrains/packagesearch/plugin/gradle/KotlinMultiplatformModuleProvider.kt b/plugin/gradle/kmp/src/main/kotlin/com/jetbrains/packagesearch/plugin/gradle/KotlinMultiplatformModuleProvider.kt
index 94ed1327..6e5ef624 100644
--- a/plugin/gradle/kmp/src/main/kotlin/com/jetbrains/packagesearch/plugin/gradle/KotlinMultiplatformModuleProvider.kt
+++ b/plugin/gradle/kmp/src/main/kotlin/com/jetbrains/packagesearch/plugin/gradle/KotlinMultiplatformModuleProvider.kt
@@ -9,18 +9,20 @@ import com.jetbrains.packagesearch.plugin.core.data.PackageSearchModule
 import com.jetbrains.packagesearch.plugin.core.extensions.PackageSearchModuleBuilderContext
 import com.jetbrains.packagesearch.plugin.gradle.utils.toGradle
 import kotlinx.coroutines.flow.FlowCollector
+import org.jetbrains.packagesearch.api.v3.http.PackageSearchEndpointPaths.knownRepositories
 
 class KotlinMultiplatformModuleProvider : AbstractGradleModuleProvider() {
 
-    context(PackageSearchModuleBuilderContext)
     override suspend fun FlowCollector<PackageSearchModule?>.transform(
+        context: PackageSearchModuleBuilderContext,
         module: Module,
         model: PackageSearchGradleModel,
     ) {
         if (PackageSearch.isKMPEnabled && model.isKotlinMultiplatformApplied && !model.isAmperApplied)
-            MppCompilationInfoProvider.sourceSetsMap(project, model.projectDir)
+            MppCompilationInfoProvider.sourceSetsMap(context.project, model.projectDir)
                 .collect { compilationModel ->
                     val variants = module.getKMPVariants(
+                        context = context,
                         compilationModel = compilationModel,
                         buildFilePath = model.buildFilePath,
                         availableScopes = model.configurations
@@ -35,10 +37,10 @@ class KotlinMultiplatformModuleProvider : AbstractGradleModuleProvider() {
                             projectDir = model.projectDir,
                         ),
                         buildFilePath = model.buildFilePath,
-                        declaredRepositories = model.declaredRepositories.toGradle(),
+                        declaredRepositories = model.declaredRepositories.toGradle(context),
                         variants = variants,
                         packageSearchModel = model,
-                        availableKnownRepositories = knownRepositories,
+                        availableKnownRepositories = context.knownRepositories,
                         nativeModule = module
                     )
                     emit(pkgsModule)
diff --git a/plugin/gradle/kmp/src/main/kotlin/com/jetbrains/packagesearch/plugin/gradle/PackageSearchKotlinMultiplatformModule.kt b/plugin/gradle/kmp/src/main/kotlin/com/jetbrains/packagesearch/plugin/gradle/PackageSearchKotlinMultiplatformModule.kt
index 4618e345..9622610d 100644
--- a/plugin/gradle/kmp/src/main/kotlin/com/jetbrains/packagesearch/plugin/gradle/PackageSearchKotlinMultiplatformModule.kt
+++ b/plugin/gradle/kmp/src/main/kotlin/com/jetbrains/packagesearch/plugin/gradle/PackageSearchKotlinMultiplatformModule.kt
@@ -65,20 +65,18 @@ data class PackageSearchKotlinMultiplatformModule(
             ?.let { MppDependencyModifier.updateDependencies(nativeModule, it) }
     }
 
-    context(EditModuleContext)
-    override fun addRepository(repository: ApiRepository) {
+    override fun addRepository(context: EditModuleContext, repository: ApiRepository) {
         validateRepositoryType(repository)
-        kmpData.modifier.addRepository(
+        context.kmpData.modifier.addRepository(
             module = nativeModule,
             repository = repository.toUnifiedRepository()
         )
     }
 
-    context(EditModuleContext)
-    override fun removeRepository(repository: PackageSearchDeclaredRepository) {
-        validateContextType()
+    override fun removeRepository(context: EditModuleContext, repository: PackageSearchDeclaredRepository) {
+        context.validate()
         validateRepositoryType(repository)
-        kmpData.modifier.deleteRepository(
+        context.kmpData.modifier.deleteRepository(
             module = nativeModule,
             repository = repository.toUnifiedRepository()
         )
diff --git a/plugin/gradle/kmp/src/main/kotlin/com/jetbrains/packagesearch/plugin/gradle/PackageSearchKotlinMultiplatformVariant.kt b/plugin/gradle/kmp/src/main/kotlin/com/jetbrains/packagesearch/plugin/gradle/PackageSearchKotlinMultiplatformVariant.kt
index ffa47dfa..5fe822ca 100644
--- a/plugin/gradle/kmp/src/main/kotlin/com/jetbrains/packagesearch/plugin/gradle/PackageSearchKotlinMultiplatformVariant.kt
+++ b/plugin/gradle/kmp/src/main/kotlin/com/jetbrains/packagesearch/plugin/gradle/PackageSearchKotlinMultiplatformVariant.kt
@@ -71,8 +71,8 @@ sealed interface PackageSearchKotlinMultiplatformVariant : PackageSearchModuleVa
             }
         }
 
-        context(EditModuleContext)
         override fun updateDependency(
+            context: EditModuleContext,
             declaredPackage: PackageSearchDeclaredPackage,
             newVersion: String?,
             newScope: String?,
@@ -87,7 +87,7 @@ sealed interface PackageSearchKotlinMultiplatformVariant : PackageSearchModuleVa
                         version = newVersion ?: declaredPackage.declaredVersion.toString(),
                         configuration = newScope ?: declaredPackage.configuration,
                     )
-                    kmpData.update(
+                    context.kmpData.update(
                         sourceSet = name,
                         oldDescriptor = oldDescriptor,
                         newDescriptor = newDescriptor,
@@ -97,13 +97,13 @@ sealed interface PackageSearchKotlinMultiplatformVariant : PackageSearchModuleVa
             }
         }
 
-        context(EditModuleContext)
         override fun addDependency(
+            context: EditModuleContext,
             apiPackage: ApiPackage,
             selectedVersion: String,
             selectedScope: String?,
         ) {
-            validateContextType()
+            context.validate()
             when (apiPackage) {
                 is ApiMavenPackage -> {
                     val newDescriptor = MppDependency.Maven(
@@ -112,7 +112,7 @@ sealed interface PackageSearchKotlinMultiplatformVariant : PackageSearchModuleVa
                         version = selectedVersion,
                         configuration = selectedScope ?: defaultScope
                     )
-                    kmpData.install(
+                    context.kmpData.install(
                         sourceSet = name,
                         descriptor = newDescriptor
                     )
@@ -120,16 +120,15 @@ sealed interface PackageSearchKotlinMultiplatformVariant : PackageSearchModuleVa
             }
         }
 
-        context(EditModuleContext)
-        override fun removeDependency(declaredPackage: PackageSearchDeclaredPackage) {
-            validateContextType()
+        override fun removeDependency(context: EditModuleContext, declaredPackage: PackageSearchDeclaredPackage) {
+            context.validate()
             validateKMPDeclaredPackageType(declaredPackage)
             when (declaredPackage) {
                 is PackageSearchKotlinMultiplatformDeclaredDependency.Cocoapods -> TODO()
                 is Npm -> TODO()
                 is Maven -> {
                     val oldDescriptor = declaredPackage.toMPPDependency()
-                    kmpData.remove(
+                    context.kmpData.remove(
                         sourceSet = name,
                         descriptor = oldDescriptor
                     )
@@ -167,13 +166,13 @@ sealed interface PackageSearchKotlinMultiplatformVariant : PackageSearchModuleVa
             else -> false
         }
 
-        context(EditModuleContext)
         override fun updateDependency(
+            context: EditModuleContext,
             declaredPackage: PackageSearchDeclaredPackage,
             newVersion: String?,
             newScope: String?,
         ) {
-            validateContextType()
+            context.validate()
             validateMavenDeclaredPackageType(declaredPackage)
             val oldDescriptor = declaredPackage.toUnifiedDependency()
             val newDescriptor = oldDescriptor.copy(
@@ -182,23 +181,23 @@ sealed interface PackageSearchKotlinMultiplatformVariant : PackageSearchModuleVa
                 ),
                 scope = newScope ?: declaredPackage.declaredScope ?: defaultScope,
             )
-            kmpData.modifier.updateDependency(
-                module = kmpData.nativeModule,
+            context.kmpData.modifier.updateDependency(
+                module = context.kmpData.nativeModule,
                 oldDescriptor = oldDescriptor,
                 newDescriptor = newDescriptor
             )
         }
 
-        context(EditModuleContext)
         override fun addDependency(
+            context: EditModuleContext,
             apiPackage: ApiPackage,
             selectedVersion: String,
             selectedScope: String?,
         ) {
-            validateContextType()
+            context.validate()
             validateMavenPackageType(apiPackage)
-            kmpData.modifier.addDependency(
-                module = kmpData.nativeModule,
+            context.kmpData.modifier.addDependency(
+                module = context.kmpData.nativeModule,
                 descriptor = UnifiedDependency(
                     groupId = apiPackage.groupId,
                     artifactId = apiPackage.artifactId,
@@ -208,12 +207,12 @@ sealed interface PackageSearchKotlinMultiplatformVariant : PackageSearchModuleVa
             )
         }
 
-        context(EditModuleContext)
-        override fun removeDependency(declaredPackage: PackageSearchDeclaredPackage) {
-            validateContextType()
+
+        override fun removeDependency(context: EditModuleContext, declaredPackage: PackageSearchDeclaredPackage) {
+            context.validate()
             validateMavenDeclaredPackageType(declaredPackage)
-            kmpData.modifier.removeDependency(
-                module = kmpData.nativeModule,
+            context.kmpData.modifier.removeDependency(
+                module = context.kmpData.nativeModule,
                 descriptor = declaredPackage.toUnifiedDependency()
             )
         }
@@ -251,8 +250,9 @@ sealed interface PackageSearchKotlinMultiplatformVariant : PackageSearchModuleVa
             is ApiMavenPackage -> false
         }
 
-        context(EditModuleContext)
+
         override fun updateDependency(
+            context: EditModuleContext,
             declaredPackage: PackageSearchDeclaredPackage,
             newVersion: String?,
             newScope: String?,
@@ -260,8 +260,8 @@ sealed interface PackageSearchKotlinMultiplatformVariant : PackageSearchModuleVa
             TODO("Not yet implemented")
         }
 
-        context(EditModuleContext)
         override fun addDependency(
+            context: EditModuleContext,
             apiPackage: ApiPackage,
             selectedVersion: String,
             selectedScope: String?,
@@ -269,8 +269,10 @@ sealed interface PackageSearchKotlinMultiplatformVariant : PackageSearchModuleVa
             TODO("Not yet implemented")
         }
 
-        context(EditModuleContext)
-        override fun removeDependency(declaredPackage: PackageSearchDeclaredPackage) {
+        override fun removeDependency(
+            context: EditModuleContext,
+            declaredPackage: PackageSearchDeclaredPackage,
+        ) {
             TODO("Not yet implemented")
         }
     }
diff --git a/plugin/gradle/src/main/kotlin/com/jetbrains/packagesearch/plugin/gradle/GradleModuleTransformer.kt b/plugin/gradle/src/main/kotlin/com/jetbrains/packagesearch/plugin/gradle/GradleModuleTransformer.kt
index 0050fef3..0eec7f11 100644
--- a/plugin/gradle/src/main/kotlin/com/jetbrains/packagesearch/plugin/gradle/GradleModuleTransformer.kt
+++ b/plugin/gradle/src/main/kotlin/com/jetbrains/packagesearch/plugin/gradle/GradleModuleTransformer.kt
@@ -45,11 +45,11 @@ typealias BaseGradleModuleProvider = AbstractGradleModuleProvider
 
 abstract class AbstractGradleModuleProvider : PackageSearchModuleProvider {
 
-    context(PackageSearchModuleBuilderContext)
     override fun provideModule(
+        context: PackageSearchModuleBuilderContext,
         nativeModule: NativeModule,
     ): Flow<PackageSearchModule?> =
-        merge(project.smartModeFlow, project.isProjectImportingFlow, project.initializeProjectFlow)
+        merge(context.project.smartModeFlow, context.project.isProjectImportingFlow, context.project.initializeProjectFlow)
             .filter { nativeModule.isGradle }
             .mapNotNull {
                 findGradleModuleData(nativeModule)
@@ -62,11 +62,11 @@ abstract class AbstractGradleModuleProvider : PackageSearchModuleProvider {
                     .onStart { emit(model) }
             }
             .transformLatest { model ->
-                transform(nativeModule, model)
+                transform(context, nativeModule, model)
             }
 
-    context(PackageSearchModuleBuilderContext)
     abstract suspend fun FlowCollector<PackageSearchModule?>.transform(
+        context: PackageSearchModuleBuilderContext,
         module: Module,
         model: PackageSearchGradleModel,
     )
diff --git a/plugin/gradle/src/main/kotlin/com/jetbrains/packagesearch/plugin/gradle/utils/GradleUtils.kt b/plugin/gradle/src/main/kotlin/com/jetbrains/packagesearch/plugin/gradle/utils/GradleUtils.kt
index 4dda6029..d5428a9a 100644
--- a/plugin/gradle/src/main/kotlin/com/jetbrains/packagesearch/plugin/gradle/utils/GradleUtils.kt
+++ b/plugin/gradle/src/main/kotlin/com/jetbrains/packagesearch/plugin/gradle/utils/GradleUtils.kt
@@ -1,4 +1,5 @@
 @file:Suppress("UnstableApiUsage")
+@file:OptIn(ExperimentalContracts::class)
 
 package com.jetbrains.packagesearch.plugin.gradle.utils
 
@@ -29,6 +30,7 @@ import com.jetbrains.packagesearch.plugin.gradle.packageId
 import java.nio.file.Path
 import java.nio.file.Paths
 import korlibs.crypto.sha512
+import kotlin.contracts.ExperimentalContracts
 import kotlin.contracts.contract
 import kotlin.io.path.absolutePathString
 import kotlinx.coroutines.Dispatchers
@@ -93,8 +95,7 @@ data class GradleDependencyModelCacheEntry(
     val dependencies: List<GradleDependencyModel>,
 )
 
-context(PackageSearchModuleBuilderContext)
-suspend fun retrieveGradleDependencyModel(nativeModule: Module, buildFile: Path): List<GradleDependencyModel> {
+suspend fun PackageSearchModuleBuilderContext.retrieveGradleDependencyModel(nativeModule: Module, buildFile: Path): List<GradleDependencyModel> {
     val vf = buildFile.refreshAndFindVirtualFile() ?: return emptyList()
 
     val buildFileSha = vf.contentsToByteArray().sha512().hex
@@ -139,16 +140,18 @@ class GradleCacheService(project: Project) : Disposable {
     override fun dispose() = dependencyRepository.close()
 }
 
-context(PackageSearchModuleBuilderContext)
-suspend fun Module.getDeclaredDependencies(buildFile: Path): List<PackageSearchGradleDeclaredPackage> {
-    val declaredDependencies = retrieveGradleDependencyModel(this, buildFile)
+suspend fun Module.getDeclaredDependencies(
+    context: PackageSearchModuleBuilderContext,
+    buildFile: Path
+): List<PackageSearchGradleDeclaredPackage> {
+    val declaredDependencies = context.retrieveGradleDependencyModel(this, buildFile)
 
     val distinctIds = declaredDependencies
         .asSequence()
         .map { it.packageId }
         .distinct()
 
-    val remoteInfo = getPackageInfoByIdHashes(distinctIds.map { ApiPackage.hashPackageId(it) }.toSet())
+    val remoteInfo = context.getPackageInfoByIdHashes(distinctIds.map { ApiPackage.hashPackageId(it) }.toSet())
 
     return declaredDependencies
         .map { declaredDependency ->
@@ -172,12 +175,11 @@ internal val Project.initializeProjectFlow
         emit(Unit)
     }
 
-context(PackageSearchModuleBuilderContext)
-fun List<PackageSearchGradleModel.DeclaredRepository>.toGradle() =
+fun List<PackageSearchGradleModel.DeclaredRepository>.toGradle(context: PackageSearchModuleBuilderContext) =
     map {
         PackageSearchGradleDeclaredRepository(
             url = it.url,
-            remoteInfo = knownRepositories.values
+            remoteInfo = context.knownRepositories.values
                 .firstOrNull { remote -> remote.url == it.url } as? ApiMavenRepository,
             name = it.name,
         )
diff --git a/plugin/gradle/tooling/build.gradle.kts b/plugin/gradle/tooling/build.gradle.kts
index 399398af..566aecfe 100644
--- a/plugin/gradle/tooling/build.gradle.kts
+++ b/plugin/gradle/tooling/build.gradle.kts
@@ -2,22 +2,21 @@
 
 plugins {
     java
-    id(packageSearchCatalog.plugins.idea.gradle.plugin)
-    `build-config`
+    id(packageSearchCatalog.plugins.idea.gradle.plugin.base)
     `maven-publish`
 }
 
-packagesearch {
-    publication {
-        isEnabled = true
-        publishShadow = false
-        artifactId = "packagesearch-plugin-gradle-tooling"
-    }
-    java {
+java {
+    toolchain {
         languageVersion = JavaLanguageVersion.of(8)
     }
+    targetCompatibility = JavaVersion.VERSION_1_8
+    sourceCompatibility = JavaVersion.VERSION_1_8
 }
 
-intellij {
-    plugins.add("org.jetbrains.plugins.gradle")
-}
+dependencies {
+    intellijPlatform {
+        intellijIdeaCommunity(INTELLIJ_VERSION)
+        bundledPlugin("org.jetbrains.plugins.gradle")
+    }
+}
\ No newline at end of file
diff --git a/plugin/jps/build.gradle.kts b/plugin/jps/build.gradle.kts
index 6c19f49b..29b08d1b 100644
--- a/plugin/jps/build.gradle.kts
+++ b/plugin/jps/build.gradle.kts
@@ -1,9 +1,9 @@
 @file:Suppress("UnstableApiUsage")
 
 plugins {
-    id(packageSearchCatalog.plugins.kotlin.jvm)
-    id(packageSearchCatalog.plugins.idea.gradle.plugin)
-    id(packageSearchCatalog.plugins.dokka)
+    alias(packageSearchCatalog.plugins.kotlin.jvm)
+    alias(packageSearchCatalog.plugins.idea.gradle.plugin)
+    alias(packageSearchCatalog.plugins.dokka)
     alias(packageSearchCatalog.plugins.kotlin.plugin.serialization)
     `build-config`
     `maven-publish`
diff --git a/plugin/maven/build.gradle.kts b/plugin/maven/build.gradle.kts
index 77b6e7d2..8342df8b 100644
--- a/plugin/maven/build.gradle.kts
+++ b/plugin/maven/build.gradle.kts
@@ -1,27 +1,21 @@
 @file:Suppress("UnstableApiUsage")
 
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+
+
 plugins {
-    id(packageSearchCatalog.plugins.kotlin.jvm)
-    id(packageSearchCatalog.plugins.idea.gradle.plugin)
-    id(packageSearchCatalog.plugins.dokka)
+    alias(packageSearchCatalog.plugins.kotlin.jvm)
+    id(packageSearchCatalog.plugins.idea.gradle.plugin.base)
+    alias(packageSearchCatalog.plugins.dokka)
     alias(packageSearchCatalog.plugins.kotlin.plugin.serialization)
-    `build-config`
     `maven-publish`
 }
 
-packagesearch {
-    publication {
-        isEnabled = true
-        artifactId = "packagesearch-plugin-maven"
-    }
-}
-
-intellij {
-    plugins.add("org.jetbrains.idea.maven")
-}
-
 dependencies {
+    intellijPlatform {
+        intellijIdeaCommunity(INTELLIJ_VERSION)
+        bundledPlugin("org.jetbrains.idea.maven")
+    }
     api(projects.plugin.core)
-    sourceElements(projects.plugin.core)
-    implementation(packageSearchCatalog.packagesearch.build.systems.models)
-}
\ No newline at end of file
+    api(packageSearchCatalog.packagesearch.build.systems.models)
+}
diff --git a/plugin/maven/src/main/kotlin/com/jetbrains/packagesearch/plugin/maven/MavenModuleProvider.kt b/plugin/maven/src/main/kotlin/com/jetbrains/packagesearch/plugin/maven/MavenModuleProvider.kt
index be97df87..aeecb9fc 100644
--- a/plugin/maven/src/main/kotlin/com/jetbrains/packagesearch/plugin/maven/MavenModuleProvider.kt
+++ b/plugin/maven/src/main/kotlin/com/jetbrains/packagesearch/plugin/maven/MavenModuleProvider.kt
@@ -20,16 +20,18 @@ import com.intellij.openapi.module.Module as NativeModule
 
 class MavenModuleProvider : PackageSearchModuleProvider {
 
-    context(PackageSearchModuleBuilderContext)
-    override fun provideModule(nativeModule: NativeModule): Flow<PackageSearchModule?> = when {
+    override fun provideModule(
+        context: PackageSearchModuleBuilderContext,
+        nativeModule: NativeModule,
+    ): Flow<PackageSearchModule?> = when {
         nativeModule.isSourceSet -> emptyFlow()
-        else -> project.smartModeFlow.take(1).flatMapLatest {
-            when (val mavenProject = project.findMavenProjectFor(nativeModule)) {
+        else -> context.project.smartModeFlow.take(1).flatMapLatest {
+            when (val mavenProject = context.project.findMavenProjectFor(nativeModule)) {
                 null -> emptyFlow()
                 else -> when (val mavenProjectPath = mavenProject.file.toNioPathOrNull()) {
                     null -> emptyFlow()
-                    else -> getModuleChangesFlow(mavenProjectPath)
-                        .map { nativeModule.toPackageSearch(mavenProject) }
+                    else -> getModuleChangesFlow(context, mavenProjectPath)
+                        .map { nativeModule.toPackageSearch(context, mavenProject) }
                 }
             }
         }
diff --git a/plugin/maven/src/main/kotlin/com/jetbrains/packagesearch/plugin/maven/MavenUtils.kt b/plugin/maven/src/main/kotlin/com/jetbrains/packagesearch/plugin/maven/MavenUtils.kt
index 940b4eb8..d34302ef 100644
--- a/plugin/maven/src/main/kotlin/com/jetbrains/packagesearch/plugin/maven/MavenUtils.kt
+++ b/plugin/maven/src/main/kotlin/com/jetbrains/packagesearch/plugin/maven/MavenUtils.kt
@@ -1,4 +1,5 @@
 @file:Suppress("UnstableApiUsage")
+@file:OptIn(ExperimentalContracts::class)
 
 package com.jetbrains.packagesearch.plugin.maven
 
@@ -28,6 +29,7 @@ import com.jetbrains.packagesearch.plugin.core.utils.watchExternalFileChanges
 import java.io.File
 import java.nio.file.Path
 import java.nio.file.Paths
+import kotlin.contracts.ExperimentalContracts
 import kotlin.contracts.contract
 import kotlin.io.path.Path
 import kotlin.io.path.name
@@ -75,11 +77,10 @@ val Project.mavenImportFlow
         }
     }
 
-context(ProjectContext)
-fun getModuleChangesFlow(pomPath: Path): Flow<Unit> = merge(
+fun getModuleChangesFlow(context: ProjectContext, pomPath: Path): Flow<Unit> = merge(
     watchExternalFileChanges(mavenSettingsFilePath),
-    project.mavenImportFlow,
-    project.smartModeFlow.mapUnit(),
+    context.project.mavenImportFlow,
+    context.project.smartModeFlow.mapUnit(),
     filesChangedEventFlow
         .map { it.mapNotNull { it.file?.toNioPathOrNull() } }
         .filter { it.any { it.isSameFileAsSafe(pomPath) } }
@@ -102,11 +103,11 @@ private fun buildMavenParentHierarchy(pomFile: File): String {
     return parentHierarchy.suffixIfNot(":") + projectName
 }
 
-context(PackageSearchModuleBuilderContext)
 suspend fun Module.toPackageSearch(
+    context: PackageSearchModuleBuilderContext,
     mavenProject: MavenProject,
 ): PackageSearchMavenModule {
-    val declaredDependencies = getDeclaredDependencies()
+    val declaredDependencies = getDeclaredDependencies(context)
     val pomPath = Path(mavenProject.file.path)
     return PackageSearchMavenModule(
         name = mavenProject.mavenId.artifactId ?: mavenProject.name ?: pomPath.parent.name,
@@ -116,7 +117,7 @@ suspend fun Module.toPackageSearch(
             projectDir = pomPath.parent,
         ),
         buildFilePath = pomPath,
-        declaredRepositories = getDeclaredRepositories(),
+        declaredRepositories = getDeclaredRepositories(context),
         declaredDependencies = declaredDependencies,
         availableScopes = commonScopes.plus(declaredDependencies.mapNotNull { it.declaredScope }).distinct(),
         compatiblePackageTypes = buildPackageTypes {
@@ -126,20 +127,18 @@ suspend fun Module.toPackageSearch(
     )
 }
 
-context(PackageSearchModuleBuilderContext)
-private suspend fun Module.getDeclaredRepositories() =
+private suspend fun Module.getDeclaredRepositories(context: PackageSearchModuleBuilderContext) =
     readAction { DependencyModifierService.getInstance(project).declaredRepositories(this) }
         .mapNotNull { unifiedRepository ->
             PackageSearchDeclaredMavenRepository(
                 url = unifiedRepository.url ?: return@mapNotNull null,
-                remoteInfo = knownRepositories.values.firstOrNull { it.url == unifiedRepository.url } as? ApiMavenRepository,
+                remoteInfo = context.knownRepositories.values.firstOrNull { it.url == unifiedRepository.url } as? ApiMavenRepository,
                 name = unifiedRepository.name,
                 id = unifiedRepository.id ?: return@mapNotNull null,
             )
         }
 
-context(PackageSearchModuleBuilderContext)
-suspend fun Module.getDeclaredDependencies(): List<PackageSearchDeclaredMavenPackage> {
+suspend fun Module.getDeclaredDependencies(context: PackageSearchModuleBuilderContext): List<PackageSearchDeclaredMavenPackage> {
     val declaredDependencies = readAction {
         MavenProjectsManager.getInstance(project)
             .findProject(this@getDeclaredDependencies)
@@ -169,7 +168,7 @@ suspend fun Module.getDeclaredDependencies(): List<PackageSearchDeclaredMavenPac
         .map { it.packageId }
         .distinct()
 
-    val remoteInfo = getPackageInfoByIdHashes(distinctIds.map { ApiPackage.hashPackageId(it) }.toSet())
+    val remoteInfo = context.getPackageInfoByIdHashes(distinctIds.map { ApiPackage.hashPackageId(it) }.toSet())
 
     return declaredDependencies
         .associateBy { it.packageId }
@@ -187,17 +186,16 @@ suspend fun Module.getDeclaredDependencies(): List<PackageSearchDeclaredMavenPac
         }
 }
 
-context(EditModuleContext)
-fun validateContextType(): MavenDependencyModificator {
+
+fun EditModuleContext.validate(): MavenDependencyModificator {
     require(data is MavenDependencyModificator) {
         "Context must be EditMavenModuleContext"
     }
     return data as MavenDependencyModificator
 }
 
-context(EditModuleContext)
-val modificator
-    get() = validateContextType()
+val EditModuleContext.modificator
+    get() = validate()
 
 fun validateRepositoryType(repository: PackageSearchDeclaredRepository) {
     contract {
diff --git a/plugin/maven/src/main/kotlin/com/jetbrains/packagesearch/plugin/maven/PackageSearchMavenModule.kt b/plugin/maven/src/main/kotlin/com/jetbrains/packagesearch/plugin/maven/PackageSearchMavenModule.kt
index 38c144e6..1a8920d0 100644
--- a/plugin/maven/src/main/kotlin/com/jetbrains/packagesearch/plugin/maven/PackageSearchMavenModule.kt
+++ b/plugin/maven/src/main/kotlin/com/jetbrains/packagesearch/plugin/maven/PackageSearchMavenModule.kt
@@ -43,12 +43,12 @@ data class PackageSearchMavenModule(
     override val icon
         get() = Icons.MAVEN
 
-    override suspend fun editModule(action: context(EditModuleContext) () -> Unit) {
+    override suspend fun editModule(action: EditModuleContext.() -> Unit) {
         writeAction { action(EditMavenModuleContext(MavenDependencyModificator(nativeModule.project))) }
     }
 
-    context(EditModuleContext)
     override fun updateDependency(
+        context: EditModuleContext,
         declaredPackage: PackageSearchDeclaredPackage,
         newVersion: String?,
         newScope: String?,
@@ -61,21 +61,21 @@ data class PackageSearchMavenModule(
                 .copy(version = newVersion ?: oldDescriptor.coordinates.version),
             scope = newScope
         )
-        modificator.updateDependency(
+        context.modificator.updateDependency(
             module = nativeModule,
             oldDescriptor = oldDescriptor,
             newDescriptor = newDescriptor
         )
     }
 
-    context(EditModuleContext)
     override fun addDependency(
+        context: EditModuleContext,
         apiPackage: ApiPackage,
         selectedVersion: String,
         selectedScope: String?,
     ) {
         validateMavenPackageType(apiPackage)
-        modificator.addDependency(
+        context.modificator.addDependency(
             module = nativeModule,
             descriptor = UnifiedDependency(
                 groupId = apiPackage.groupId,
@@ -86,30 +86,36 @@ data class PackageSearchMavenModule(
         )
     }
 
-    context(EditModuleContext)
-    override fun removeDependency(declaredPackage: PackageSearchDeclaredPackage) {
+    override fun removeDependency(
+        context: EditModuleContext,
+        declaredPackage: PackageSearchDeclaredPackage,
+    ) {
         validateMavenDeclaredPackageType(declaredPackage)
-        modificator.removeDependency(
+        context.modificator.removeDependency(
             module = nativeModule,
             descriptor = declaredPackage.toUnifiedDependency()
         )
     }
 
-    context(EditModuleContext)
-    override fun addRepository(repository: ApiRepository) {
+    override fun addRepository(
+        context: EditModuleContext,
+        repository: ApiRepository,
+    ) {
         validateRepositoryType(repository)
         if (repository.url !in CommonRepositories.entries.flatMap { it.urls }) {
-            modificator.addRepository(
+            context.modificator.addRepository(
                 module = nativeModule,
                 repository = repository.toUnifiedRepository()
             )
         }
     }
 
-    context(EditModuleContext)
-    override fun removeRepository(repository: PackageSearchDeclaredRepository) {
+    override fun removeRepository(
+        context: EditModuleContext,
+        repository: PackageSearchDeclaredRepository,
+    ) {
         validateRepositoryType(repository)
-        modificator.deleteRepository(
+        context.modificator.deleteRepository(
             module = nativeModule,
             repository = repository.toUnifiedRepository()
         )
diff --git a/plugin/src/main/kotlin/com/jetbrains/packagesearch/plugin/inspections/PackageUpdateInspection.kt b/plugin/src/main/kotlin/com/jetbrains/packagesearch/plugin/inspections/PackageUpdateInspection.kt
index 9d6e9356..7a35c158 100644
--- a/plugin/src/main/kotlin/com/jetbrains/packagesearch/plugin/inspections/PackageUpdateInspection.kt
+++ b/plugin/src/main/kotlin/com/jetbrains/packagesearch/plugin/inspections/PackageUpdateInspection.kt
@@ -61,18 +61,17 @@ abstract class PackageSearchInspection : LocalInspectionTool() {
 
         val problemsHolder = ProblemsHolder(manager, file, isOnTheFly)
 
-        with(file.project.PackageSearchProjectService) {
-            problemsHolder.checkFile(
-                file = file,
-                module = module
-            )
-        }
+        problemsHolder.checkFile(
+            context = file.project.PackageSearchProjectService,
+            file = file,
+            module = module
+        )
 
         return problemsHolder.resultsArray
     }
 
-    context(PackageSearchKnownRepositoriesContext)
     abstract fun ProblemsHolder.checkFile(
+        context: PackageSearchKnownRepositoriesContext,
         file: PsiFile,
         module: PackageSearchModule,
     )
@@ -102,8 +101,8 @@ class PackageUpdateInspection : PackageSearchInspection() {
         )
     }
 
-    context(PackageSearchKnownRepositoriesContext)
     override fun ProblemsHolder.checkFile(
+        context: PackageSearchKnownRepositoriesContext,
         file: PsiFile,
         module: PackageSearchModule,
     ) {
@@ -160,9 +159,10 @@ class PackageUpdateInspection : PackageSearchInspection() {
                         ),
                         priority = HIGH
                     ) {
-                        coroutineScope.launch {
+                        context.coroutineScope.launch {
                             module.editModule {
                                 manager.updateDependency(
+                                    context = this,
                                     declaredPackage = dependency,
                                     newVersion = targetVersion.normalized.versionName,
                                     newScope = dependency.declaredScope
@@ -171,7 +171,7 @@ class PackageUpdateInspection : PackageSearchInspection() {
                                     targetVersion.repositoryIds
                                         .firstNotNullOfOrNull { project.PackageSearchProjectService.knownRepositories[it] }
                                         ?.takeIf { it.url !in module.declaredRepositories.map { it.url } }
-                                        ?.let { module.addRepository(it) }
+                                        ?.let { module.addRepository(this, it) }
                                 }
                             }
                         }
diff --git a/plugin/src/main/kotlin/com/jetbrains/packagesearch/plugin/services/PackageSearchApplicationCachesService.kt b/plugin/src/main/kotlin/com/jetbrains/packagesearch/plugin/services/PackageSearchApplicationCachesService.kt
index 709a19d5..df3ae225 100644
--- a/plugin/src/main/kotlin/com/jetbrains/packagesearch/plugin/services/PackageSearchApplicationCachesService.kt
+++ b/plugin/src/main/kotlin/com/jetbrains/packagesearch/plugin/services/PackageSearchApplicationCachesService.kt
@@ -1,4 +1,5 @@
 @file:Suppress("UnstableApiUsage")
+@file:OptIn(PKGSInternalAPI::class)
 
 package com.jetbrains.packagesearch.plugin.services
 
diff --git a/plugin/src/main/kotlin/com/jetbrains/packagesearch/plugin/services/PackageSearchProjectService.kt b/plugin/src/main/kotlin/com/jetbrains/packagesearch/plugin/services/PackageSearchProjectService.kt
index 02eb49ed..5f4a7c1c 100644
--- a/plugin/src/main/kotlin/com/jetbrains/packagesearch/plugin/services/PackageSearchProjectService.kt
+++ b/plugin/src/main/kotlin/com/jetbrains/packagesearch/plugin/services/PackageSearchProjectService.kt
@@ -99,7 +99,7 @@ class PackageSearchProjectService(
             transformerExtensions.flatMap { transformer ->
                 nativeModules.map { module ->
                     with(context) {
-                        transformer.provideModule(module).startWithNull()
+                        transformer.provideModule(context, module).startWithNull()
                     }
                 }
             }
diff --git a/plugin/src/main/kotlin/com/jetbrains/packagesearch/plugin/ui/bridge/Components.kt b/plugin/src/main/kotlin/com/jetbrains/packagesearch/plugin/ui/bridge/Components.kt
index 792b0b6f..fc4e1a0d 100644
--- a/plugin/src/main/kotlin/com/jetbrains/packagesearch/plugin/ui/bridge/Components.kt
+++ b/plugin/src/main/kotlin/com/jetbrains/packagesearch/plugin/ui/bridge/Components.kt
@@ -1,5 +1,8 @@
+@file:OptIn(ExperimentalFoundationApi::class)
+
 package com.jetbrains.packagesearch.plugin.ui.bridge
 
+import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxHeight
diff --git a/plugin/src/main/kotlin/com/jetbrains/packagesearch/plugin/ui/model/infopanel/InfoPanelViewModel.kt b/plugin/src/main/kotlin/com/jetbrains/packagesearch/plugin/ui/model/infopanel/InfoPanelViewModel.kt
index c50aa3eb..ff160f96 100644
--- a/plugin/src/main/kotlin/com/jetbrains/packagesearch/plugin/ui/model/infopanel/InfoPanelViewModel.kt
+++ b/plugin/src/main/kotlin/com/jetbrains/packagesearch/plugin/ui/model/infopanel/InfoPanelViewModel.kt
@@ -49,20 +49,18 @@ class InfoPanelViewModel(
         when (event) {
             is InfoPanelContentEvent.Package -> {
                 val isLoading = event.packageListId in packageLoadingState
-                with(project.PackageSearchProjectService) {
-                    when (event) {
-                        is InfoPanelContentEvent.Package.Declared.Base ->
-                            event.asPanelContent(onlyStable, isLoading)
+                when (event) {
+                    is InfoPanelContentEvent.Package.Declared.Base ->
+                        event.asPanelContent(project.PackageSearchProjectService, onlyStable, isLoading)
 
-                        is InfoPanelContentEvent.Package.Declared.WithVariant ->
-                            event.asPanelContent(onlyStable, isLoading)
+                    is InfoPanelContentEvent.Package.Declared.WithVariant ->
+                        event.asPanelContent(project.PackageSearchProjectService, onlyStable, isLoading)
 
-                        is InfoPanelContentEvent.Package.Remote.Base ->
-                            event.asPanelContent(onlyStable,isLoading)
+                    is InfoPanelContentEvent.Package.Remote.Base ->
+                        event.asPanelContent(project.PackageSearchProjectService, onlyStable, isLoading)
 
-                        is InfoPanelContentEvent.Package.Remote.WithVariants ->
-                            event.asPanelContent(onlyStable,isLoading)
-                    }
+                    is InfoPanelContentEvent.Package.Remote.WithVariants ->
+                        event.asPanelContent(project.PackageSearchProjectService, onlyStable, isLoading)
                 }
             }
 
@@ -90,7 +88,7 @@ class InfoPanelViewModel(
             tabs.map { it.map { it.tabTitleData } },
             activeTabTitleMutableStateFlow
         ) { tabTitles, activeTabTitle ->
-            if (activeTabTitle !in tabTitles.map{it.tabTitle}) tabTitles.firstOrNull()?.tabTitle else activeTabTitle
+            if (activeTabTitle !in tabTitles.map { it.tabTitle }) tabTitles.firstOrNull()?.tabTitle else activeTabTitle
         }
             .mapNotNull { it }
             .onEach { activeTabTitleMutableStateFlow.emit(it) }
diff --git a/plugin/src/main/kotlin/com/jetbrains/packagesearch/plugin/ui/model/infopanel/asPanelContent.kt b/plugin/src/main/kotlin/com/jetbrains/packagesearch/plugin/ui/model/infopanel/asPanelContent.kt
index 246e4851..199cfa4e 100644
--- a/plugin/src/main/kotlin/com/jetbrains/packagesearch/plugin/ui/model/infopanel/asPanelContent.kt
+++ b/plugin/src/main/kotlin/com/jetbrains/packagesearch/plugin/ui/model/infopanel/asPanelContent.kt
@@ -10,16 +10,16 @@ import com.jetbrains.packagesearch.plugin.core.utils.parseAttributesFromRawStrin
 import com.jetbrains.packagesearch.plugin.ui.model.getLatestVersion
 import org.jetbrains.packagesearch.api.v3.ApiMavenPackage
 import org.jetbrains.packagesearch.api.v3.ApiPackage
+import org.jetbrains.packagesearch.api.v3.http.PackageSearchEndpointPaths.knownRepositories
 
-context(PackageSearchKnownRepositoriesContext)
-fun ApiPackage.repositories() =
+fun ApiPackage.repositories(context: PackageSearchKnownRepositoriesContext) =
     versions.latest
         .repositoryIds
-        .mapNotNull { knownRepositories[it] }
+        .mapNotNull { context.knownRepositories[it] }
         .map { InfoPanelContent.PackageInfo.Repository(it.name, it.url) }
 
-context(PackageSearchKnownRepositoriesContext)
 internal fun InfoPanelContentEvent.Package.Declared.Base.asPanelContent(
+    context: PackageSearchKnownRepositoriesContext,
     onlyStable: Boolean,
     isLoading: Boolean,
 ) = buildList {
@@ -39,7 +39,7 @@ internal fun InfoPanelContentEvent.Package.Declared.Base.asPanelContent(
                 ?.sanitizeDescription(),
             scm = declaredPackage.remoteInfo?.scm?.asInfoPanelScm(),
             readmeUrl = declaredPackage.remoteInfo?.scm?.readme?.htmlUrl ?: declaredPackage.remoteInfo?.scm?.readmeUrl,
-            repositories = declaredPackage.remoteInfo?.repositories() ?: emptyList(),
+            repositories = declaredPackage.remoteInfo?.repositories(context) ?: emptyList(),
             latestVersion = declaredPackage.getLatestVersion(onlyStable)?.versionName,
             declaredVersion = declaredPackage.declaredVersion
                 ?.versionName
@@ -66,7 +66,7 @@ internal val PackageSearchDeclaredPackage.typeInfo: InfoPanelContent.PackageInfo
         return InfoPanelContent.PackageInfo.Type(
             name = when (remoteInfo) {
                 is ApiMavenPackage -> message("packagesearch.configuration.maven.title")
-                null -> when (icon) {
+                else -> when (icon) {
                     IconProvider.Icons.MAVEN -> message("packagesearch.configuration.maven.title")
                     IconProvider.Icons.NPM -> message("packagesearch.configuration.npm.title")
                     IconProvider.Icons.COCOAPODS -> message("packagesearch.configuration.cocoapods.title")
@@ -93,8 +93,8 @@ private fun String.sanitizeDescription() =
         .joinToString("\n") { it.trimStart() }
 
 
-context(PackageSearchKnownRepositoriesContext)
 internal fun InfoPanelContentEvent.Package.Declared.WithVariant.asPanelContent(
+    context: PackageSearchKnownRepositoriesContext,
     onlyStable: Boolean,
     isLoading: Boolean,
 ) = buildList {
@@ -114,7 +114,7 @@ internal fun InfoPanelContentEvent.Package.Declared.WithVariant.asPanelContent(
                 ?.sanitizeDescription(),
             scm = declaredPackage.remoteInfo?.scm?.asInfoPanelScm(),
             readmeUrl = declaredPackage.remoteInfo?.scm?.readme?.htmlUrl ?: declaredPackage.remoteInfo?.scm?.readmeUrl,
-            repositories = declaredPackage.remoteInfo?.repositories() ?: emptyList(),
+            repositories = declaredPackage.remoteInfo?.repositories(context) ?: emptyList(),
             latestVersion = declaredPackage.getLatestVersion(onlyStable)?.versionName,
             declaredVersion = declaredPackage.declaredVersion
                 ?.versionName
@@ -138,8 +138,8 @@ internal fun InfoPanelContentEvent.Package.Declared.WithVariant.asPanelContent(
     addAttributesFromNames(declaredPackage.listKMPAttributesNames(onlyStable))
 }
 
-context(PackageSearchKnownRepositoriesContext)
 internal fun InfoPanelContentEvent.Package.Remote.WithVariants.asPanelContent(
+    context: PackageSearchKnownRepositoriesContext,
     onlyStable: Boolean,
     isLoading: Boolean,
 ) = buildList {
@@ -159,7 +159,7 @@ internal fun InfoPanelContentEvent.Package.Remote.WithVariants.asPanelContent(
             readmeUrl = apiPackage.scm?.readme?.htmlUrl ?: apiPackage.scm?.readmeUrl,
             primaryVariant = primaryVariantName,
             additionalVariants = compatibleVariantNames.sorted() - primaryVariantName,
-            repositories = apiPackage.repositories(),
+            repositories = apiPackage.repositories(context),
             isLoading = isLoading,
             isInstalledInPrimaryVariant = module.variants.getValue(primaryVariantName).declaredDependencies
                 .any { it.id == apiPackage.id }
@@ -167,8 +167,8 @@ internal fun InfoPanelContentEvent.Package.Remote.WithVariants.asPanelContent(
     addAttributesFromNames(apiPackage.listKMPAttributesNames(onlyStable))
 }
 
-context(PackageSearchKnownRepositoriesContext)
 internal fun InfoPanelContentEvent.Package.Remote.Base.asPanelContent(
+    context: PackageSearchKnownRepositoriesContext,
     onlyStable: Boolean,
     isLoading: Boolean,
 ) = buildList {
@@ -186,7 +186,7 @@ internal fun InfoPanelContentEvent.Package.Remote.Base.asPanelContent(
             description = apiPackage.description?.sanitizeDescription(),
             scm = apiPackage.scm?.asInfoPanelScm(),
             readmeUrl = apiPackage.scm?.readme?.htmlUrl ?: apiPackage.scm?.readmeUrl,
-            repositories = apiPackage.repositories(),
+            repositories = apiPackage.repositories(context),
             isLoading = isLoading
         )
     )
diff --git a/plugin/src/main/kotlin/com/jetbrains/packagesearch/plugin/ui/model/packageslist/PackageListViewModel.kt b/plugin/src/main/kotlin/com/jetbrains/packagesearch/plugin/ui/model/packageslist/PackageListViewModel.kt
index c688307a..6333bdff 100644
--- a/plugin/src/main/kotlin/com/jetbrains/packagesearch/plugin/ui/model/packageslist/PackageListViewModel.kt
+++ b/plugin/src/main/kotlin/com/jetbrains/packagesearch/plugin/ui/model/packageslist/PackageListViewModel.kt
@@ -418,8 +418,9 @@ class PackageListViewModel(
             )
         )
         editor.editModule {
-            editor.addRepositoryIfNeeded(newVersion, module.declaredRepositories)
+            editor.addRepositoryIfNeeded(this, newVersion, module.declaredRepositories)
             manager.updateDependency(
+                context = this,
                 declaredPackage = dependency,
                 newVersion = newVersion.normalized.versionName,
                 newScope = dependency.declaredScope
@@ -443,7 +444,7 @@ class PackageListViewModel(
                             targetModule = module
                         )
                     )
-                    module.removeDependency(declaredPackage)
+                    module.removeDependency(this, declaredPackage)
                 }
 
                 is PackageSearchModule.WithVariants -> {
@@ -462,7 +463,7 @@ class PackageListViewModel(
                             targetModule = module
                         )
                     )
-                    variant.removeDependency(declaredPackage)
+                    variant.removeDependency(this, declaredPackage)
                 }
             }
         }
@@ -530,16 +531,17 @@ class PackageListViewModel(
 
             else -> apiPackage.versions.latest
         }
-        updater.addRepositoryIfNeeded(selectedVersion, installedRepositories)
+        updater.addRepositoryIfNeeded(this, selectedVersion, installedRepositories)
         manager.addDependency(
+            context = this,
             apiPackage = apiPackage,
             selectedVersion = selectedVersion.normalized.versionName,
             selectedScope = scope
         )
     }
 
-    context(EditModuleContext)
     private fun PackageSearchModuleEditor.addRepositoryIfNeeded(
+        context: EditModuleContext,
         selectedVersion: ApiPackageVersion,
         installedRepositories: List<PackageSearchDeclaredRepository>,
     ) {
@@ -549,7 +551,7 @@ class PackageListViewModel(
                     .firstNotNullOfOrNull { project.PackageSearchProjectService.knownRepositories[it] }
 
             if (apiRepository != null && apiRepository.url !in installedRepositories.map { it.url }) {
-                addRepository(apiRepository)
+                addRepository(context, apiRepository)
             }
         }
     }
@@ -612,6 +614,7 @@ class PackageListViewModel(
                             )
                         )
                         manager.updateDependency(
+                            context = this,
                             declaredPackage = dependency,
                             newVersion = dependency.declaredVersion?.versionName,
                             newScope = event.scope
@@ -633,9 +636,10 @@ class PackageListViewModel(
                                 ?.repositoryIds
                                 ?.firstNotNullOfOrNull { project.PackageSearchProjectService.knownRepositories[it] }
                                 ?.takeIf { it.url !in module.declaredRepositories.map { it.url } }
-                                ?.let { editor.addRepository(it) }
+                                ?.let { editor.addRepository(this, it) }
                         }
                         manager.updateDependency(
+                            context = this,
                             declaredPackage = dependency,
                             newVersion = event.version,
                             newScope = dependency.declaredScope
@@ -711,7 +715,7 @@ class PackageListViewModel(
         val newVariant = module.variants[event.selectedVariantName]
             ?: return
         module.editModule {
-            variant.removeDependency(declaredPackage)
+            variant.removeDependency(this, declaredPackage)
 //            newVariant.addDependency(
 //                apiPackage = declaredPackage,
 //                selectedVersion = declaredPackage.declaredVersion?.versionName,
@@ -744,6 +748,7 @@ class PackageListViewModel(
                                     else -> it.remoteInfo?.versions?.latest
                                 }
                                 module.updateDependency(
+                                    context = this,
                                     declaredPackage = it,
                                     newVersion = version?.normalized?.versionName ?: it.declaredVersion?.versionName,
                                     newScope = it.declaredScope
@@ -754,7 +759,7 @@ class PackageListViewModel(
                             }
                             .toSet()
                         if (repositoriesToAdd.isNotEmpty() && project.PackageSearchSettingsService.installRepositoryIfNeededFlow.value) {
-                            repositoriesToAdd.forEach { module.addRepository(it) }
+                            repositoriesToAdd.forEach { module.addRepository(this, it) }
                         }
                     }
                 }
@@ -785,6 +790,7 @@ class PackageListViewModel(
                         packagesToUpdate
                             .forEach { (variant, declaredPackage) ->
                                 variant.updateDependency(
+                                    context = this,
                                     declaredPackage = declaredPackage,
                                     newVersion = declaredPackage.getLatestVersion(onlyStable)?.versionName,
                                     newScope = declaredPackage.declaredScope
diff --git a/plugin/src/main/kotlin/com/jetbrains/packagesearch/plugin/ui/panels/packages/PackageSearchPackageList.kt b/plugin/src/main/kotlin/com/jetbrains/packagesearch/plugin/ui/panels/packages/PackageSearchPackageList.kt
index eca531fd..972a41b1 100644
--- a/plugin/src/main/kotlin/com/jetbrains/packagesearch/plugin/ui/panels/packages/PackageSearchPackageList.kt
+++ b/plugin/src/main/kotlin/com/jetbrains/packagesearch/plugin/ui/panels/packages/PackageSearchPackageList.kt
@@ -1,5 +1,8 @@
+@file:OptIn(ExperimentalFoundationApi::class)
+
 package com.jetbrains.packagesearch.plugin.ui.panels.packages
 
+import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.background
 import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.layout.Arrangement
diff --git a/plugin/src/main/kotlin/com/jetbrains/packagesearch/plugin/ui/panels/packages/items/PackageGroupHeader.kt b/plugin/src/main/kotlin/com/jetbrains/packagesearch/plugin/ui/panels/packages/items/PackageGroupHeader.kt
index 8c255aef..ef48d03f 100644
--- a/plugin/src/main/kotlin/com/jetbrains/packagesearch/plugin/ui/panels/packages/items/PackageGroupHeader.kt
+++ b/plugin/src/main/kotlin/com/jetbrains/packagesearch/plugin/ui/panels/packages/items/PackageGroupHeader.kt
@@ -1,5 +1,8 @@
+@file:OptIn(ExperimentalFoundationApi::class)
+
 package com.jetbrains.packagesearch.plugin.ui.panels.packages.items
 
+import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Arrangement.SpaceBetween
diff --git a/plugin/src/main/kotlin/com/jetbrains/packagesearch/plugin/ui/panels/tree/PackageSearchModulesTree.kt b/plugin/src/main/kotlin/com/jetbrains/packagesearch/plugin/ui/panels/tree/PackageSearchModulesTree.kt
index f8f3d80b..262bd474 100644
--- a/plugin/src/main/kotlin/com/jetbrains/packagesearch/plugin/ui/panels/tree/PackageSearchModulesTree.kt
+++ b/plugin/src/main/kotlin/com/jetbrains/packagesearch/plugin/ui/panels/tree/PackageSearchModulesTree.kt
@@ -1,6 +1,9 @@
+@file:OptIn(ExperimentalFoundationApi::class)
+
 package com.jetbrains.packagesearch.plugin.ui.panels.tree
 
 import androidx.compose.animation.Crossfade
+import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
diff --git a/plugin/utils/build.gradle.kts b/plugin/utils/build.gradle.kts
index b675dfc9..34f9e60c 100644
--- a/plugin/utils/build.gradle.kts
+++ b/plugin/utils/build.gradle.kts
@@ -1,52 +1,18 @@
 @file:Suppress("UnstableApiUsage")
 
-import com.vladsch.flexmark.html.HtmlRenderer
-import com.vladsch.flexmark.parser.Parser
 import java.lang.System.getenv
 import kotlin.math.max
-import org.jetbrains.intellij.tasks.PublishPluginTask
 import org.jetbrains.kotlin.util.prefixIfNot
 import org.jetbrains.kotlin.util.suffixIfNot
-import org.jetbrains.packagesearch.gradle.lafFile
-import org.jetbrains.packagesearch.gradle.logCategoriesFile
-import org.jetbrains.packagesearch.gradle.patchLafFile
-import org.jetbrains.packagesearch.gradle.patchLogFile
-import org.jetbrains.packagesearch.gradle.patchSettingsFile
-import org.jetbrains.packagesearch.gradle.patchTextRegistryFile
-import org.jetbrains.packagesearch.gradle.registryTextFile
-import org.jetbrains.packagesearch.gradle.settingsFile
 
 
 plugins {
-    id(packageSearchCatalog.plugins.kotlin.jvm)
-    id(packageSearchCatalog.plugins.dokka)
+    alias(packageSearchCatalog.plugins.kotlin.jvm)
+    alias(packageSearchCatalog.plugins.dokka)
     alias(packageSearchCatalog.plugins.kotlin.plugin.serialization)
-    `build-config`
     `maven-publish`
 }
 
-packagesearch {
-    publication {
-        isEnabled = true
-        artifactId = "packagesearch-plugin"
-    }
-    optIns.addAll(
-        "androidx.compose.ui.ExperimentalComposeUiApi",
-        "org.jetbrains.compose.splitpane.ExperimentalSplitPaneApi",
-        "org.jetbrains.jewel.ExperimentalJewelApi",
-        "androidx.compose.foundation.ExperimentalFoundationApi",
-        "kotlin.io.encoding.ExperimentalEncodingApi",
-        "kotlin.ExperimentalStdlibApi",
-        "kotlin.io.path.ExperimentalPathApi",
-        "org.jetbrains.jewel.foundation.ExperimentalJewelApi"
-    )
-    isRunIdeEnabled = true
-}
-
-val tooling: Configuration by configurations.creating {
-    isCanBeResolved = true
-}
-
 dependencies {
     api(packageSearchCatalog.kotlinx.serialization.core)
     api(packageSearchCatalog.packagesearch.api.client)
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 54c2b46e..53d0ffd7 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -1,10 +1,15 @@
 @file:Suppress("UnstableApiUsage")
 
+import java.lang.System.getenv
+import org.jetbrains.intellij.platform.gradle.extensions.intellijPlatform
+
+
 rootProject.name = "packagesearch-intellij-plugin"
 
 plugins {
     id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
     id("com.gradle.enterprise") version "3.14.1"
+    id("org.jetbrains.intellij.platform.settings") version "2.1.0"
 }
 
 enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
@@ -15,6 +20,24 @@ dependencyResolutionManagement {
             from(files("packagesearch.versions.toml"))
         }
     }
+    repositoriesMode = RepositoriesMode.FAIL_ON_PROJECT_REPOS
+    repositories {
+        mavenCentral()
+        google()
+        maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
+        maven("https://packages.jetbrains.team/maven/p/kpm/public")
+        maven("https://packages.jetbrains.team/maven/p/ij/intellij-sdk-nightly") {
+            credentials {
+                username = getenv("SPACE_INTELLIJ_NIGHTLIES_USERNAME")
+                    ?: settings.extra.getStringOrNull("space.intellij.username")
+                password = getenv("SPACE_INTELLIJ_NIGHTLIES_TOKEN")
+                    ?: settings.extra.getStringOrNull("space.intellij.password")
+            }
+        }
+        intellijPlatform {
+            defaultRepositories()
+        }
+    }
 }
 
 include(
@@ -52,3 +75,9 @@ gradleEnterprise {
         }
     }
 }
+
+fun ExtraPropertiesExtension.getStringOrNull(name: String): String? =
+    when {
+        has(name) -> get(name) as? String
+        else -> null
+    }
\ No newline at end of file