diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index ae07e9d..9e59610 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,12 +1,12 @@
-# GitHub Actions Workflow created for testing and preparing the plugin release in following steps:
-# - validate Gradle Wrapper,
-# - run 'test' and 'verifyPlugin' tasks,
-# - run Qodana inspections,
-# - run 'buildPlugin' task and prepare artifact for the further tests,
-# - run 'runPluginVerifier' task,
-# - create a draft release.
+# GitHub Actions Workflow is created for testing and preparing the plugin release in the following steps:
+# - Validate Gradle Wrapper.
+# - Run 'test' and 'verifyPlugin' tasks.
+# - Run Qodana inspections.
+# - Run the 'buildPlugin' task and prepare artifact for further tests.
+# - Run the 'runPluginVerifier' task.
+# - Create a draft release.
 #
-# Workflow is triggered on push and pull_request events.
+# The workflow is triggered on push and pull_request events.
 #
 # GitHub Actions reference: https://help.github.com/en/actions
 #
@@ -14,41 +14,49 @@
 
 name: Build
 on:
-    # Trigger the workflow on pushes to only the 'main' branch (this avoids duplicate checks being run e.g. for dependabot pull requests)
+    # Trigger the workflow on pushes to only the 'main' branch (this avoids duplicate checks being run e.g., for dependabot pull requests)
     push:
-        branches: [main]
+        branches: [ main, develop ]
     # Trigger the workflow on any pull request
     pull_request:
 
+concurrency:
+    group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+    cancel-in-progress: true
+
 jobs:
-    
-    # Run Gradle Wrapper Validation Action to verify the wrapper's checksum
-    # Run verifyPlugin, IntelliJ Plugin Verifier, and test Gradle tasks
-    # Build plugin and provide the artifact for the next workflow jobs
+
+    # Prepare environment and build the plugin
     build:
         name: Build
         runs-on: ubuntu-latest
         outputs:
             version: ${{ steps.properties.outputs.version }}
             changelog: ${{ steps.properties.outputs.changelog }}
+            pluginVerifierHomeDir: ${{ steps.properties.outputs.pluginVerifierHomeDir }}
         steps:
-            
+
             # Check out current repository
             - name: Fetch Sources
-              uses: actions/checkout@v2.4.0
-            
+              uses: actions/checkout@v4
+
             # Validate wrapper
             - name: Gradle Wrapper Validation
-              uses: gradle/wrapper-validation-action@v1.0.4
-            
-            # Setup Java 11 environment for the next steps
+              uses: gradle/wrapper-validation-action@v2
+
+            # Set up Java environment for the next steps
             - name: Setup Java
-              uses: actions/setup-java@v2
+              uses: actions/setup-java@v4
               with:
                   distribution: zulu
-                  java-version: 11
-                  cache: gradle
-            
+                  java-version: 17
+
+            # Setup Gradle
+            - name: Setup Gradle
+              uses: gradle/actions/setup-gradle@v3
+              with:
+                  gradle-home-cache-cleanup: true
+
             # Set environment variables
             - name: Export Properties
               id: properties
@@ -56,53 +64,21 @@ jobs:
               run: |
                   PROPERTIES="$(./gradlew properties --console=plain -q)"
                   VERSION="$(echo "$PROPERTIES" | grep "^version:" | cut -f2- -d ' ')"
-                  NAME="$(echo "$PROPERTIES" | grep "^pluginName:" | cut -f2- -d ' ')"
                   CHANGELOG="$(./gradlew getChangelog --unreleased --no-header --console=plain -q)"
-                  CHANGELOG="${CHANGELOG//'%'/'%25'}"
-                  CHANGELOG="${CHANGELOG//$'\n'/'%0A'}"
-                  CHANGELOG="${CHANGELOG//$'\r'/'%0D'}"
                   
-                  echo "::set-output name=version::$VERSION"
-                  echo "::set-output name=name::$NAME"
-                  echo "::set-output name=changelog::$CHANGELOG"
-                  echo "::set-output name=pluginVerifierHomeDir::~/.pluginVerifier"
+                  echo "version=$VERSION" >> $GITHUB_OUTPUT
+                  echo "pluginVerifierHomeDir=~/.pluginVerifier" >> $GITHUB_OUTPUT
+                  
+                  echo "changelog<<EOF" >> $GITHUB_OUTPUT
+                  echo "$CHANGELOG" >> $GITHUB_OUTPUT
+                  echo "EOF" >> $GITHUB_OUTPUT
                   
                   ./gradlew listProductsReleases # prepare list of IDEs for Plugin Verifier
-            
-            # Run tests
-            - name: Run Tests
-              run: ./gradlew test
-            
-            # Collect Tests Result of failed tests
-            - name: Collect Tests Result
-              if: ${{ failure() }}
-              uses: actions/upload-artifact@v2
-              with:
-                  name: tests-result
-                  path: ${{ github.workspace }}/build/reports/tests
-            
-            #      # Cache Plugin Verifier IDEs
-            #      - name: Setup Plugin Verifier IDEs Cache
-            #        uses: actions/cache@v2.1.7
-            #        with:
-            #          path: ${{ steps.properties.outputs.pluginVerifierHomeDir }}/ides
-            #          key: plugin-verifier-${{ hashFiles('build/listProductsReleases.txt') }}
-            #
-            #      # Run Verify Plugin task and IntelliJ Plugin Verifier tool
-            #      - name: Run Plugin Verification tasks
-            #        run: ./gradlew runPluginVerifier -Pplugin.verifier.home.dir=${{ steps.properties.outputs.pluginVerifierHomeDir }}
-            #
-            #      # Collect Plugin Verifier Result
-            #      - name: Collect Plugin Verifier Result
-            #        if: ${{ always() }}
-            #        uses: actions/upload-artifact@v2
-            #        with:
-            #          name: pluginVerifier-result
-            #          path: ${{ github.workspace }}/build/reports/pluginVerifier
-            
-            # TODO: temp needed because verifier disabled
-            - run: ./gradlew buildPlugin
-            
+
+            # Build plugin
+            - name: Build plugin
+              run: ./gradlew buildPlugin
+
             # Prepare plugin archive content for creating artifact
             - name: Prepare Plugin Artifact
               id: artifact
@@ -112,29 +88,81 @@ jobs:
                   FILENAME=`ls *.zip`
                   unzip "$FILENAME" -d content
                   
-                  echo "::set-output name=filename::${FILENAME:0:-4}"
-            
+                  echo "filename=${FILENAME:0:-4}" >> $GITHUB_OUTPUT
+
             # Store already-built plugin as an artifact for downloading
             - name: Upload artifact
-              uses: actions/upload-artifact@v2.2.4
+              uses: actions/upload-artifact@v4
               with:
                   name: ${{ steps.artifact.outputs.filename }}
                   path: ./build/distributions/content/*/*
-    
+
+    # Run plugin structure verification along with IntelliJ Plugin Verifier
+    verify:
+        name: Verify plugin
+        needs: [ build ]
+        runs-on: ubuntu-latest
+        steps:
+
+            # Free GitHub Actions Environment Disk Space
+            - name: Maximize Build Space
+              uses: jlumbroso/free-disk-space@main
+              with:
+                  tool-cache: false
+                  large-packages: false
+
+            # Check out current repository
+            - name: Fetch Sources
+              uses: actions/checkout@v4
+
+            # Set up Java environment for the next steps
+            - name: Setup Java
+              uses: actions/setup-java@v4
+              with:
+                  distribution: zulu
+                  java-version: 17
+
+            # Setup Gradle
+            - name: Setup Gradle
+              uses: gradle/actions/setup-gradle@v3
+              with:
+                  gradle-home-cache-cleanup: true
+
+            # Cache Plugin Verifier IDEs
+            - name: Setup Plugin Verifier IDEs Cache
+              uses: actions/cache@v4
+              with:
+                  path: ${{ needs.build.outputs.pluginVerifierHomeDir }}/ides
+                  key: plugin-verifier-${{ hashFiles('build/listProductsReleases.txt') }}
+
+            # Run Verify Plugin task and IntelliJ Plugin Verifier tool
+            - name: Run Plugin Verification tasks
+              run: ./gradlew runPluginVerifier -Dplugin.verifier.home.dir=${{ needs.build.outputs.pluginVerifierHomeDir }}
+
+            # Collect Plugin Verifier Result
+            - name: Collect Plugin Verifier Result
+              if: ${{ always() }}
+              uses: actions/upload-artifact@v4
+              with:
+                  name: pluginVerifier-result
+                  path: ${{ github.workspace }}/build/reports/pluginVerifier
+
     # Prepare a draft release for GitHub Releases page for the manual verification
     # If accepted and published, release workflow would be triggered
     releaseDraft:
-        name: Release Draft
+        name: Release draft
         if: github.event_name != 'pull_request'
-        needs: build
+        needs: [ build, test, inspectCode, verify ]
         runs-on: ubuntu-latest
+        permissions:
+            contents: write
         steps:
-            
+
             # Check out current repository
             - name: Fetch Sources
-              uses: actions/checkout@v2.4.0
-            
-            # Remove old release drafts by using the curl request for the available releases with draft flag
+              uses: actions/checkout@v4
+
+            # Remove old release drafts by using the curl request for the available releases with a draft flag
             - name: Remove Old Release Drafts
               env:
                   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -142,13 +170,13 @@ jobs:
                   gh api repos/{owner}/{repo}/releases \
                     --jq '.[] | select(.draft == true) | .id' \
                     | xargs -I '{}' gh api -X DELETE repos/{owner}/{repo}/releases/{}
-            
-            # Create new release draft - which is not publicly visible and requires manual acceptance
+
+            # Create a new release draft which is not publicly visible and requires manual acceptance
             - name: Create Release Draft
               env:
                   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
               run: |
-                  gh release create v${{ needs.build.outputs.version }} \
+                  gh release create "v${{ needs.build.outputs.version }}" \
                     --draft \
                     --title "v${{ needs.build.outputs.version }}" \
                     --notes "$(cat << 'EOM'
diff --git a/.run/Run IDE with Plugin.run.xml b/.run/Run Plugin.run.xml
similarity index 90%
rename from .run/Run IDE with Plugin.run.xml
rename to .run/Run Plugin.run.xml
index ddd22ad..d15ff68 100644
--- a/.run/Run IDE with Plugin.run.xml	
+++ b/.run/Run Plugin.run.xml	
@@ -5,7 +5,7 @@
       <option name="executionName" />
       <option name="externalProjectPath" value="$PROJECT_DIR$" />
       <option name="externalSystemIdString" value="GRADLE" />
-      <option name="scriptParameters" value="--stacktrace" />
+      <option name="scriptParameters" value="" />
       <option name="taskDescriptions">
         <list />
       </option>
@@ -19,7 +19,6 @@
     <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
     <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
     <DebugAllEnabled>false</DebugAllEnabled>
-    <RunAsTest>false</RunAsTest>
     <method v="2" />
   </configuration>
 </component>
\ No newline at end of file
diff --git a/.run/Run Qodana.run.xml b/.run/Run Qodana.run.xml
deleted file mode 100644
index 17b041a..0000000
--- a/.run/Run Qodana.run.xml	
+++ /dev/null
@@ -1,26 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-    <configuration default="false" name="Run Qodana" type="GradleRunConfiguration" factoryName="Gradle">
-        <ExternalSystemSettings>
-            <option name="env">
-                <map>
-                    <entry key="QODANA_SHOW_REPORT" value="true" />
-                </map>
-            </option>
-            <option name="executionName" />
-            <option name="externalProjectPath" value="$PROJECT_DIR$" />
-            <option name="externalSystemIdString" value="GRADLE" />
-            <option name="scriptParameters" value="cleanInspections runInspections" />
-            <option name="taskDescriptions">
-                <list />
-            </option>
-            <option name="taskNames">
-                <list />
-            </option>
-            <option name="vmOptions" />
-        </ExternalSystemSettings>
-        <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
-        <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
-        <DebugAllEnabled>false</DebugAllEnabled>
-        <method v="2" />
-    </configuration>
-</component>
\ No newline at end of file
diff --git a/.run/Run Plugin Tests.run.xml b/.run/Run Tests.run.xml
similarity index 92%
rename from .run/Run Plugin Tests.run.xml
rename to .run/Run Tests.run.xml
index 9dc888c..f281bdc 100644
--- a/.run/Run Plugin Tests.run.xml	
+++ b/.run/Run Tests.run.xml	
@@ -11,7 +11,7 @@
       </option>
       <option name="taskNames">
         <list>
-          <option value="test" />
+          <option value="check" />
         </list>
       </option>
       <option name="vmOptions" value="" />
@@ -19,6 +19,7 @@
     <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
     <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
     <DebugAllEnabled>false</DebugAllEnabled>
+    <RunAsTest>true</RunAsTest>
     <method v="2" />
   </configuration>
-</component>
\ No newline at end of file
+</component>
diff --git a/.run/Run Plugin Verification.run.xml b/.run/Run Verifications.run.xml
similarity index 100%
rename from .run/Run Plugin Verification.run.xml
rename to .run/Run Verifications.run.xml
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7ff47ce..fbc5377 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 <!-- Keep a Changelog guide -> https://keepachangelog.com -->
 
+# Buggregator Changelog
+
+## Unreleased
+
 ## 0.0.1
 
 ### Added
diff --git a/build.gradle.kts b/build.gradle.kts
index 633c31a..38794ab 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,101 +1,86 @@
 import org.jetbrains.changelog.Changelog
 import org.jetbrains.changelog.markdownToHTML
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
-fun properties(key: String) = project.findProperty(key).toString()
+fun properties(key: String) = providers.gradleProperty(key)
+fun environment(key: String) = providers.environmentVariable(key)
 
 plugins {
-    // Java support
-    id("java")
-    // Kotlin support
-    id("org.jetbrains.kotlin.jvm") version "1.9.10"
-    // Gradle IntelliJ Plugin
-    id("org.jetbrains.intellij") version "1.15.0"
-    // Gradle Changelog Plugin
-    id("org.jetbrains.changelog") version "2.2.0"
+    id("java") // Java support
+    alias(libs.plugins.kotlin) // Kotlin support
+    alias(libs.plugins.gradleIntelliJPlugin) // Gradle IntelliJ Plugin
+    alias(libs.plugins.changelog) // Gradle Changelog Plugin
 }
 
-group = properties("pluginGroup")
-version = properties("pluginVersion")
+group = properties("pluginGroup").get()
+version = properties("pluginVersion").get()
 
 // Configure project's dependencies
 repositories {
     mavenCentral()
 }
 
+// Dependencies are managed with Gradle version catalog - read more: https://docs.gradle.org/current/userguide/platforms.html#sub:version-catalog
 dependencies {
     implementation("net.jpountz.lz4:lz4:1.3.0")
     testImplementation("org.mockito.kotlin:mockito-kotlin:5.1.0")
 }
 
-// Set the JVM language level used to compile sources and generate files - Java 11 is required since 2020.3
+// Set the JVM language level used to build the project.
 kotlin {
-    jvmToolchain {
-        this.languageVersion.set(JavaLanguageVersion.of(17))
-    }
+    jvmToolchain(17)
 }
 
-// Configure Gradle IntelliJ Plugin - read more: https://github.com/JetBrains/gradle-intellij-plugin
+// Configure Gradle IntelliJ Plugin - read more: https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin.html
 intellij {
-    pluginName.set(properties("pluginName"))
-    version.set(properties("platformVersion"))
-    type.set(properties("platformType"))
+    pluginName = properties("pluginName")
+    version = properties("platformVersion")
+    type = properties("platformType")
 
     // Plugin Dependencies. Uses `platformPlugins` property from the gradle.properties file.
-    plugins.set(properties("platformPlugins").split(',').map(String::trim).filter(String::isNotEmpty))
+    plugins = properties("platformPlugins").map { it.split(',').map(String::trim).filter(String::isNotEmpty) }
 }
 
 // Configure Gradle Changelog Plugin - read more: https://github.com/JetBrains/gradle-changelog-plugin
 changelog {
-    version.set(properties("pluginVersion"))
-    groups.set(emptyList())
+    groups.empty()
+    repositoryUrl = properties("pluginRepositoryUrl")
 }
 
 tasks {
-    // Set the JVM compatibility versions
-    properties("javaVersion").let {
-        withType<JavaCompile> {
-            sourceCompatibility = it
-            targetCompatibility = it
-        }
-        withType<KotlinCompile> {
-            kotlinOptions.jvmTarget = it
-        }
-    }
-
     wrapper {
-        gradleVersion = properties("gradleVersion")
+        gradleVersion = properties("gradleVersion").get()
     }
 
     patchPluginXml {
-        version.set(properties("pluginVersion"))
-        sinceBuild.set(properties("pluginSinceBuild"))
-        untilBuild.set(properties("pluginUntilBuild"))
+        version = properties("pluginVersion")
+        sinceBuild = properties("pluginSinceBuild")
+        untilBuild = properties("pluginUntilBuild")
 
         // Extract the <!-- Plugin description --> section from README.md and provide for the plugin's manifest
-        pluginDescription.set(
-            projectDir.resolve("README.md").readText().lines().run {
-                val start = "<!-- Plugin description -->"
-                val end = "<!-- Plugin description end -->"
+        pluginDescription = providers.fileContents(layout.projectDirectory.file("README.md")).asText.map {
+            val start = "<!-- Plugin description -->"
+            val end = "<!-- Plugin description end -->"
 
+            with (it.lines()) {
                 if (!containsAll(listOf(start, end))) {
                     throw GradleException("Plugin description section not found in README.md:\n$start ... $end")
                 }
-                subList(indexOf(start) + 1, indexOf(end))
-            }.joinToString("\n").run { markdownToHTML(this) }
-        )
+                subList(indexOf(start) + 1, indexOf(end)).joinToString("\n").let(::markdownToHTML)
+            }
+        }
 
+        val changelog = project.changelog // local variable for configuration cache compatibility
         // Get the latest available change notes from the changelog file
-        changeNotes.set(provider {
-            changelog.renderItem(changelog.run {
-                getOrNull(properties("pluginVersion")) ?: getLatest()
-            }, Changelog.OutputType.HTML)
-        })
-    }
-
-    listProductsReleases {
-        // TODO: hot fix
-        untilVersion.set("221")
+        changeNotes = properties("pluginVersion").map { pluginVersion ->
+            with(changelog) {
+                renderItem(
+                    (getOrNull(pluginVersion) ?: getUnreleased())
+                        .withHeader(false)
+                        .withEmptySections(false),
+                    Changelog.OutputType.HTML,
+                )
+            }
+        }
     }
 
     // Configure UI tests plugin
@@ -108,17 +93,17 @@ tasks {
     }
 
     signPlugin {
-        certificateChain.set(System.getenv("CERTIFICATE_CHAIN"))
-        privateKey.set(System.getenv("PRIVATE_KEY"))
-        password.set(System.getenv("PRIVATE_KEY_PASSWORD"))
+        certificateChain = environment("CERTIFICATE_CHAIN")
+        privateKey = environment("PRIVATE_KEY")
+        password = environment("PRIVATE_KEY_PASSWORD")
     }
 
     publishPlugin {
         dependsOn("patchChangelog")
-        token.set(System.getenv("PUBLISH_TOKEN"))
-        // pluginVersion is based on the SemVer (https://semver.org) and supports pre-release labels, like 2.1.7-alpha.3
+        token = environment("PUBLISH_TOKEN")
+        // The pluginVersion is based on the SemVer (https://semver.org) and supports pre-release labels, like 2.1.7-alpha.3
         // Specify pre-release label to publish the plugin in a custom Release Channel automatically. Read more:
         // https://plugins.jetbrains.com/docs/intellij/deployment.html#specifying-a-release-channel
-        channels.set(listOf(properties("pluginVersion").split('-').getOrElse(1) { "default" }.split('.').first()))
+        channels = properties("pluginVersion").map { listOf(it.substringAfter('-', "").substringBefore('.').ifEmpty { "default" }) }
     }
 }
diff --git a/gradle.properties b/gradle.properties
index 0a04897..b048d94 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,28 +1,31 @@
-# IntelliJ Platform Artifacts Repositories
-# -> https://www.jetbrains.org/intellij/sdk/docs/reference_guide/intellij_artifacts.html
+# IntelliJ Platform Artifacts Repositories -> https://plugins.jetbrains.com/docs/intellij/intellij-artifacts.html
 
 pluginGroup = com.intellij.plugins.phpstorm_dd
 pluginName = PhpStorm DD
+pluginRepositoryUrl = https://github.com/buggregator/phpstorm-plugin
+# SemVer format -> https://semver.org
 pluginVersion = 0.0.1
 
-# See https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
-# for insight into build numbers and IntelliJ Platform versions.
-pluginSinceBuild = 232.10072.32
+# Supported build number ranges and IntelliJ Platform versions -> https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
+pluginSinceBuild = 232
 pluginUntilBuild =
 
+# IntelliJ Platform Properties -> https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin.html#configuration-intellij-extension
 platformType = PS
-platformVersion = LATEST-EAP-SNAPSHOT
-platformDownloadSources = true
-# https://plugins.jetbrains.com/plugin/6610-php/versions
+platformVersion = 2023.2.3
+
+# Plugin Dependencies -> https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html
+# Example: platformPlugins = com.intellij.java, com.jetbrains.php:203.4449.22
 platformPlugins = com.jetbrains.php
 
-# Java language level used to compile sources and to generate the files for - Java 11 is required since 2020.3
-javaVersion = 17
+# Gradle Releases -> https://github.com/gradle/gradle/releases
+gradleVersion = 8.6
+
+# Opt-out flag for bundling Kotlin standard library -> https://jb.gg/intellij-platform-kotlin-stdlib
+kotlin.stdlib.default.dependency = false
 
-gradleVersion = 8.0
+# Enable Gradle Configuration Cache -> https://docs.gradle.org/current/userguide/configuration_cache.html
+org.gradle.configuration-cache = true
 
-# Opt-out flag for bundling Kotlin standard library.
-# See https://plugins.jetbrains.com/docs/intellij/kotlin.html#kotlin-standard-library for details.
-# suppress inspection "UnusedProperty"
-kotlin.stdlib.default.dependency = true
-kotlin.incremental.useClasspathSnapshot=false
+# Enable Gradle Build Cache -> https://docs.gradle.org/current/userguide/build_cache.html
+org.gradle.caching = true
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
new file mode 100644
index 0000000..7446cc6
--- /dev/null
+++ b/gradle/libs.versions.toml
@@ -0,0 +1,14 @@
+[versions]
+# libraries
+
+# plugins
+kotlin = "1.9.23"
+changelog = "2.2.0"
+gradleIntelliJPlugin = "1.17.2"
+
+[libraries]
+
+[plugins]
+changelog = { id = "org.jetbrains.changelog", version.ref = "changelog" }
+gradleIntelliJPlugin = { id = "org.jetbrains.intellij", version.ref = "gradleIntelliJPlugin" }
+kotlin = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 41d9927..d64cd49 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index db9a6b8..a80b22c 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index 1b6c787..1aa94a4 100755
--- a/gradlew
+++ b/gradlew
@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,13 +80,11 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -133,22 +131,29 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -193,11 +198,15 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
@@ -205,6 +214,12 @@ set -- \
         org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.
diff --git a/gradlew.bat b/gradlew.bat
index 107acd3..25da30d 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +25,8 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,13 +41,13 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -56,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal
diff --git a/settings.gradle.kts b/settings.gradle.kts
index cc7057a..cf93fdb 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -1,10 +1,5 @@
-rootProject.name = "phpstorm-dd"
-
-pluginManagement {
-    repositories {
-        maven {
-            url = uri("https://oss.sonatype.org/content/repositories/snapshots/")
-        }
-        gradlePluginPortal()
-    }
+plugins {
+    id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
 }
+
+rootProject.name = "phpstorm-dd"
diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
index f2791d7..3ee7200 100644
--- a/src/main/resources/META-INF/plugin.xml
+++ b/src/main/resources/META-INF/plugin.xml
@@ -16,13 +16,6 @@
     ]]>
   </description>
 
-  <change-notes><![CDATA[
-    ]]>
-  </change-notes>
-
-  <!-- Please see http://www.jetbrains.org/intellij/sdk/docs/basics/getting_started/build_number_ranges.html for description -->
-  <idea-version since-build="201.0"/>
-
   <depends>com.intellij.modules.platform</depends>
   <depends>com.jetbrains.php</depends>