diff --git a/topics/_shared/snippets.md b/topics/_shared/snippets.md
index f816dd64c..a83764df3 100644
--- a/topics/_shared/snippets.md
+++ b/topics/_shared/snippets.md
@@ -22,6 +22,15 @@
+
+
+> When using IntelliJ IDEA 2023.3 or later, the Plugin DevKit plugin must be installed from JetBrains Marketplace ([Plugin Homepage](https://plugins.jetbrains.com/plugin/22851-plugin-devkit))
+> as it is no longer bundled with the IDE.
+>
+{title="Plugin DevKit Availability" style="warning"}
+
+
+
> Qualifying Open Source projects can [apply for free licenses](https://www.jetbrains.com/community/opensource/) of JetBrains products.
diff --git a/topics/basics/getting_started/plugin/developing_plugins.md b/topics/basics/getting_started/plugin/developing_plugins.md
index cc774be8d..1381c74a2 100644
--- a/topics/basics/getting_started/plugin/developing_plugins.md
+++ b/topics/basics/getting_started/plugin/developing_plugins.md
@@ -1,26 +1,27 @@
-
-
# Developing a Plugin
+
+
Develop an IntelliJ Platform plugin using Gradle and Gradle IntelliJ Plugin.
IntelliJ Platform plugins can be developed by using either [IntelliJ IDEA Community Edition](https://www.jetbrains.com/idea/download/) or [IntelliJ IDEA Ultimate](https://www.jetbrains.com/idea/download/) as your IDE.
-Both include the complete set of plugin development tools.
-It is highly recommended to always use the latest available version, as the plugin development tooling support from bundled Plugin DevKit continues supporting new features.
-
-To become more familiar with IntelliJ IDEA, please refer to the [IntelliJ IDEA Web Help](https://www.jetbrains.com/idea/help/).
+It is highly recommended to always use the latest available version, as the plugin development tooling support from Plugin DevKit continues supporting new features.
Before starting with the actual development, make sure to understand all requirements to achieve best [](plugin_user_experience.md).
> In some cases, implementing an actual IntelliJ Platform plugin might not be necessary, as [alternative solutions](plugin_alternatives.md) exist.
>
+{title="Plugin Alternatives"}
## Gradle IntelliJ Plugin
The recommended solution for building IntelliJ Platform plugins is [](tools_gradle_intellij_plugin.md).
-The IntelliJ IDEA Ultimate and Community editions bundle the necessary plugins to support Gradle-based plugin development: _Gradle_ and _Plugin DevKit_.
+
+The IntelliJ IDEA Ultimate and Community editions provide the necessary plugins to support Gradle-based plugin development: _Gradle_ and _Plugin DevKit_.
To verify these plugins are installed and enabled, see the help section about [Managing Plugins](https://www.jetbrains.com/help/idea/managing-plugins.html).
+
+
Gradle IntelliJ Plugin manages the dependencies of a plugin project - both the base IDE and other [plugin dependencies](plugin_dependencies.md).
It provides tasks to run the IDE with your plugin and to package and [publish](publishing_plugin.md#publishing-plugin-with-gradle) your plugin to the [JetBrains Marketplace](https://plugins.jetbrains.com).
To make sure that a plugin is not affected by [API changes](api_changes_list.md), which may happen between major releases of the platform, you can quickly verify your plugin against other IDEs and releases.
diff --git a/topics/basics/getting_started/theme/creating_theme_project.md b/topics/basics/getting_started/theme/creating_theme_project.md
index 9eb60bc72..ee4d26bf3 100644
--- a/topics/basics/getting_started/theme/creating_theme_project.md
+++ b/topics/basics/getting_started/theme/creating_theme_project.md
@@ -1,14 +1,14 @@
-
-
# Creating a Theme Project
+
+
Creating a theme plugin project with Plugin DevKit wizard and generated project overview.
This documentation page describes a DevKit-based theme project generated with the [New Project Wizard](https://www.jetbrains.com/help/idea/new-project-wizard.html).
## Creating a Theme with New Project Wizard
-Before creating a theme project, make sure that [development environment is set up](setting_up_theme_environment.md).
+> Before creating a theme project, make sure that [development environment is set up](setting_up_theme_environment.md).
@@ -51,7 +51,7 @@ See [](theme_structure.md) for more details.
Theme plugin project [created with the new project wizard](#create-theme) contains a single theme description file by default.
In case a plugin needs to provide multiple themes (e.g., dark and light variants), it is possible to add them with the dedicated action.
-Additional plugin themes can be added using the DevKit Theme Wizard, which is a part of the Plugin DevKit bundled in IntelliJ IDEA.
+Additional plugin themes can be added using the DevKit Theme Wizard, which is a part of the Plugin DevKit plugin.
The wizard can be used for both DevKit-based and Gradle-based plugins.
diff --git a/topics/basics/getting_started/theme/setting_up_theme_environment.md b/topics/basics/getting_started/theme/setting_up_theme_environment.md
index 628f642b7..9be233052 100644
--- a/topics/basics/getting_started/theme/setting_up_theme_environment.md
+++ b/topics/basics/getting_started/theme/setting_up_theme_environment.md
@@ -1,7 +1,7 @@
-
-
# Setting Up a Development Environment
+
+
Setting up a development environment required for developing a theme.
@@ -9,7 +9,8 @@
Use the following checklist to ensure that you are ready to develop your custom theme:
1. **[IntelliJ IDEA Community Edition](https://www.jetbrains.com/idea/download/)** or **[IntelliJ IDEA Ultimate](https://www.jetbrains.com/idea/download/)** is installed.
-2. **Plugin DevKit** plugin is [enabled in IntelliJ IDEA](https://www.jetbrains.com/help/idea/managing-plugins.html).
+2. **Plugin DevKit** plugin is installed and [enabled in IntelliJ IDEA](https://www.jetbrains.com/help/idea/managing-plugins.html).
+
3. **IntelliJ IDEA CE source code** is checked-out. _(Optional)_
This step is needed only when you plan to debug the IntelliJ Platform code.
diff --git a/topics/tutorials/custom_language_support/prerequisites.md b/topics/tutorials/custom_language_support/prerequisites.md
index db073db9b..7abfe917f 100644
--- a/topics/tutorials/custom_language_support/prerequisites.md
+++ b/topics/tutorials/custom_language_support/prerequisites.md
@@ -1,7 +1,7 @@
-# 1. Prerequisites
-
+# 1. Prerequisites
+
Steps required before starting implementation of a sample custom language support.
@@ -20,7 +20,10 @@ Download the IntelliJ IDEA Community Edition source files as described in the In
## Install Required Plugins
-Make sure that the bundled *Plugin DevKit* and *Gradle* plugins are enabled.
+Make sure that the _Plugin DevKit_ and _Gradle_ plugins are enabled.
+
+
+
Install and enable [Grammar-Kit](https://plugins.jetbrains.com/plugin/6606-grammar-kit) and [PsiViewer](https://plugins.jetbrains.com/plugin/227-psiviewer) plugins.
## Create a Project