diff --git a/editor_basics/resources/META-INF/plugin.xml b/editor_basics/resources/META-INF/plugin.xml
index ea5345564..42fc7b342 100644
--- a/editor_basics/resources/META-INF/plugin.xml
+++ b/editor_basics/resources/META-INF/plugin.xml
@@ -4,26 +4,11 @@
   <version>1.0</version>
   <vendor email="support@jetbrains.com" url="http://www.jetbrains.com">JetBrains</vendor>
 
-  <description>Illustration of Editor's basics</description>
+  <description>Illustration of various basic Editor APIs</description>
 
-  <change-notes>Initial commit</change-notes>
-
-  <!-- please see http://www.jetbrains.org/intellij/sdk/docs/basics/getting_started/build_number_ranges.html for description -->
   <idea-version since-build="131"/>
   <depends>com.intellij.modules.lang</depends>
 
-  <extensions defaultExtensionNs="com.intellij">
-    <!-- Add your extensions here -->
-  </extensions>
-
-  <application-components>
-    <!-- Add your application components here -->
-  </application-components>
-
-  <project-components>
-    <!-- Add your project components here -->
-  </project-components>
-
   <actions>
     <action id="EditorBasics.EditorIllustration"
             class="org.jetbrains.tutorials.editor.basics.EditorIllustration"
diff --git a/facet_basics/resources/META-INF/plugin.xml b/facet_basics/resources/META-INF/plugin.xml
index de2b87a22..f05b42f7c 100644
--- a/facet_basics/resources/META-INF/plugin.xml
+++ b/facet_basics/resources/META-INF/plugin.xml
@@ -2,35 +2,14 @@
   <id>com.intellij.tutorials.facet</id>
   <name>Facet Demo</name>
   <version>1.0</version>
-  <vendor email="support@jetbrains.com" url="http://www.yourcompany.com">JetBrains</vendor>
+  <vendor>JetBrains</vendor>
 
-  <description>Basic example of working with facets</description>
+  <description>Basic example of adding support for custom Facets</description>
 
-  <change-notes>Initial commit</change-notes>
-
-  <!-- please see http://www.jetbrains.org/intellij/sdk/docs/basics/getting_started/build_number_ranges.html for description -->
   <idea-version since-build="131"/>
 
-  <!-- please see http://www.jetbrains.org/intellij/sdk/docs/basics/getting_started/plugin_compatibility.html
-       on how to target different products -->
-  <!-- uncomment to enable plugin in all products
-  <depends>com.intellij.modules.lang</depends>
-  -->
-
   <extensions defaultExtensionNs="com.intellij">
     <facetType implementation="com.intellij.tutorials.facet.DemoFacetType"/>
   </extensions>
 
-  <application-components>
-    <!-- Add your application components here -->
-  </application-components>
-
-  <project-components>
-    <!-- Add your project components here -->
-  </project-components>
-
-  <actions>
-    <!-- Add your actions here -->
-  </actions>
-
 </idea-plugin>
\ No newline at end of file
diff --git a/framework/resources/META-INF/plugin.xml b/framework/resources/META-INF/plugin.xml
index 174c09bf8..fd9f155d8 100644
--- a/framework/resources/META-INF/plugin.xml
+++ b/framework/resources/META-INF/plugin.xml
@@ -2,35 +2,14 @@
   <id>com.intellij.demo.framework</id>
   <name>Framework example</name>
   <version>1.0</version>
-  <vendor email="support@yourcompany.com" url="http://www.yourcompany.com">YourCompany</vendor>
+  <vendor>JetBrains</vendor>
 
-  <description>Framework support tutorial</description>
+  <description>Demonstrates basic Framework support with custom Configurable</description>
 
-  <change-notes>Initial commit</change-notes>
-
-  <!-- please see http://www.jetbrains.org/intellij/sdk/docs/basics/getting_started/build_number_ranges.html for description -->
   <idea-version since-build="131"/>
 
-  <!-- please see http://www.jetbrains.org/intellij/sdk/docs/basics/getting_started/plugin_compatibility.html
-       on how to target different products -->
-  <!-- uncomment to enable plugin in all products
-  <depends>com.intellij.modules.lang</depends>
-  -->
-
   <extensions defaultExtensionNs="com.intellij">
     <framework.type implementation="com.intellij.tutorials.framework.DemoFramework"/>
   </extensions>
 
-  <application-components>
-    <!-- Add your application components here -->
-  </application-components>
-
-  <project-components>
-    <!-- Add your project components here -->
-  </project-components>
-
-  <actions>
-    <!-- Add your actions here -->
-  </actions>
-
 </idea-plugin>
\ No newline at end of file
diff --git a/inspection/resources/META-INF/plugin.xml b/inspection/resources/META-INF/plugin.xml
index 12f0d37e0..5bcfd22fc 100644
--- a/inspection/resources/META-INF/plugin.xml
+++ b/inspection/resources/META-INF/plugin.xml
@@ -2,29 +2,14 @@
   <id>com.intellij.tutorials.inspection</id>
   <name>Inspection Demo</name>
   <version>1.0</version>
-  <vendor email="support@jetbrains.com" url="http://www.jetbrains.com">JetBrains</vendor>
+  <vendor>JetBrains</vendor>
 
   <description>Basic example of working with code inspections</description>
 
-  <change-notes>Initial commit</change-notes>
-
   <idea-version since-build="131"/>
 
   <extensions defaultExtensionNs="com.intellij">
     <inspectionToolProvider implementation="com.intellij.tutorials.inspection.DemoInspectionToolProvider"/>
-
   </extensions>
 
-  <application-components>
-    <!-- Add your application components here -->
-  </application-components>
-
-  <project-components>
-    <!-- Add your project components here -->
-  </project-components>
-
-  <actions>
-    <!-- Add your actions here -->
-  </actions>
-
 </idea-plugin>
\ No newline at end of file
diff --git a/live_templates/resources/META-INF/plugin.xml b/live_templates/resources/META-INF/plugin.xml
index 29b50f3eb..9d398b9c4 100644
--- a/live_templates/resources/META-INF/plugin.xml
+++ b/live_templates/resources/META-INF/plugin.xml
@@ -1,37 +1,17 @@
 <idea-plugin>
   <id>live_templates</id>
-  <name>live_templates</name>
+  <name>Live Templates</name>
   <version>1.0</version>
-  <vendor email="support@yourcompany.com" url="http://www.yourcompany.com">YourCompany</vendor>
+  <vendor>JetBrains</vendor>
 
-  <description><![CDATA[
-      Enter short description for your plugin here.<br>
-      <em>most HTML tags may be used</em>
-    ]]></description>
+  <description>Provides live templates for Markdown language</description>
 
-  <change-notes><![CDATA[
-      Add change notes here.<br>
-      <em>most HTML tags may be used</em>
-    ]]>
-  </change-notes>
-
-  <!-- please see http://www.jetbrains.org/intellij/sdk/docs/basics/getting_started/build_number_ranges.html for description -->
   <idea-version since-build="141.0"/>
 
-  <!-- please see http://www.jetbrains.org/intellij/sdk/docs/basics/getting_started/plugin_compatibility.html
-       on how to target different products -->
-  <!-- uncomment to enable plugin in all products
-  <depends>com.intellij.modules.lang</depends>
-  -->
-
   <extensions defaultExtensionNs="com.intellij">
     <defaultLiveTemplatesProvider implementation="MarkdownTemplateProvider"/>
     <liveTemplateContext implementation="MarkdownContext"/>
 
   </extensions>
 
-  <actions>
-    <!-- Add your actions here -->
-  </actions>
-
 </idea-plugin>
\ No newline at end of file
diff --git a/max_opened_projects/resources/META-INF/plugin.xml b/max_opened_projects/resources/META-INF/plugin.xml
index 4ea0f43a9..0ebd0c576 100644
--- a/max_opened_projects/resources/META-INF/plugin.xml
+++ b/max_opened_projects/resources/META-INF/plugin.xml
@@ -1,29 +1,18 @@
 <idea-plugin>
-  <name>max_opened_projects</name>
-  <description>short description of the plugin</description>
+  <name>Maximum Open Projects</name>
+  <description>Shows warning dialog when the maximum allowed number of open projects is exceeded</description>
   <version>1.0</version>
-  <vendor>YourCompany</vendor>
-  <idea-version since-build="8000"/>
-
-  <application-components>
-    <!-- Add your application components here -->
-  </application-components>
+  <vendor>JetBrains</vendor>
+  <idea-version since-build="131"/>
 
   <project-components>
-    <!-- Add your project components here -->
     <component>
       <implementation-class>MyPackage.MaxProject</implementation-class>
     </component>
   </project-components>
 
-  <actions>
-    <!-- Add your actions here -->
-  </actions>
-
   <extensions defaultExtensionNs="com.intellij">
-    <!-- Add your extensions here -->
-    <applicationService serviceInterface="MyPackage.MyCounter" serviceImplementation="MyPackage.MyCounter">
-
-    </applicationService>
+    <applicationService serviceInterface="MyPackage.MyCounter"
+                        serviceImplementation="MyPackage.MyCounter"/>
   </extensions>
 </idea-plugin>
\ No newline at end of file
diff --git a/module/resources/META-INF/plugin.xml b/module/resources/META-INF/plugin.xml
index 999c23645..da14ef442 100644
--- a/module/resources/META-INF/plugin.xml
+++ b/module/resources/META-INF/plugin.xml
@@ -2,35 +2,14 @@
   <id>com.intellij.tutorials.module</id>
   <name>Module Type Demo</name>
   <version>1.0</version>
-  <vendor email="support@jetbrains.com" url="http://www.jetbrains.com">JetBrains</vendor>
+  <vendor>JetBrains</vendor>
 
   <description>Basic example of working with module types</description>
 
-  <change-notes>Initial commit</change-notes>
-
-  <!-- please see http://www.jetbrains.org/intellij/sdk/docs/basics/getting_started/build_number_ranges.html for description -->
   <idea-version since-build="131"/>
 
-  <!-- please see http://www.jetbrains.org/intellij/sdk/docs/basics/getting_started/plugin_compatibility.html
-       on how to target different products -->
-  <!-- uncomment to enable plugin in all products
-  <depends>com.intellij.modules.lang</depends>
-  -->
-
   <extensions defaultExtensionNs="com.intellij">
     <moduleType id="DEMO_MODULE_TYPE" implementationClass="com.intellij.tutorials.module.DemoModuleType"/>
   </extensions>
 
-  <application-components>
-    <!-- Add your application components here -->
-  </application-components>
-
-  <project-components>
-    <!-- Add your project components here -->
-  </project-components>
-
-  <actions>
-    <!-- Add your actions here -->
-  </actions>
-
 </idea-plugin>
\ No newline at end of file
diff --git a/project_model/resources/META-INF/plugin.xml b/project_model/resources/META-INF/plugin.xml
index 9e1987a1f..37970ed71 100644
--- a/project_model/resources/META-INF/plugin.xml
+++ b/project_model/resources/META-INF/plugin.xml
@@ -2,28 +2,13 @@
   <id>org.jetbrains.plugins.sample.ProjectModel</id>
   <name>Project Model</name>
   <version>1.0</version>
-  <vendor email="support@jetbrains.com" url="http://www.jetbrains.com">JetBrains</vendor>
+  <vendor>JetBrains</vendor>
 
-  <description>Project model illustration</description>
+  <description>Demonstrates various aspects of interacting with project model</description>
 
-  <change-notes>Initial commit</change-notes>
-
-  <!-- please see http://www.jetbrains.org/intellij/sdk/docs/basics/getting_started/build_number_ranges.html for description -->
   <idea-version since-build="131"/>
   <depends>com.intellij.modules.lang</depends>
 
-  <extensions defaultExtensionNs="com.intellij">
-    <!-- Add your extensions here -->
-  </extensions>
-
-  <application-components>
-    <!-- Add your application components here -->
-  </application-components>
-
-  <project-components>
-    <!-- Add your project components here -->
-  </project-components>
-
   <actions>
     <action id="ProjectModel.SourceRoots" class="com.intellij.tutorials.project.model.ShowSourceRootsActions"
             text="Show Source Roots"
diff --git a/project_view_pane/resources/META-INF/plugin.xml b/project_view_pane/resources/META-INF/plugin.xml
index d94d631ae..5c1fc994f 100644
--- a/project_view_pane/resources/META-INF/plugin.xml
+++ b/project_view_pane/resources/META-INF/plugin.xml
@@ -2,13 +2,10 @@
   <id>org.jetbrains.plugins.sample.ProjectViewPane</id>
   <name>Project View Pane Demo</name>
   <version>1.0</version>
-  <vendor email="support@jetbrains.com" url="http://www.jetbrains.com">JetBrains</vendor>
+  <vendor>JetBrains</vendor>
 
-  <description>Project View Pane Demo</description>
+  <description>Project View Pane Demo listing only image files</description>
 
-  <change-notes>Initial commit</change-notes>
-
-  <!-- please see http://www.jetbrains.org/intellij/sdk/docs/basics/getting_started/build_number_ranges.html for description -->
   <idea-version since-build="131"/>
   <depends>com.intellij.modules.lang</depends>
 
@@ -16,15 +13,4 @@
     <projectViewPane implementation="org.jetbrains.tutorials.view.pane.ImagesProjectViewPane"/>
   </extensions>
 
-  <application-components>
-    <!-- Add your application components here -->
-  </application-components>
-
-  <project-components>
-    <!-- Add your project components here -->
-  </project-components>
-
-  <actions>
-    <!-- Add your actions here -->
-  </actions>
 </idea-plugin>
\ No newline at end of file
diff --git a/project_wizard/resources/META-INF/plugin.xml b/project_wizard/resources/META-INF/plugin.xml
index 137d0463b..f40d9a3d4 100644
--- a/project_wizard/resources/META-INF/plugin.xml
+++ b/project_wizard/resources/META-INF/plugin.xml
@@ -2,32 +2,17 @@
   <id>org.jetbrains.tutorials.ProjectWizard</id>
   <name>Project Wizard Demo</name>
   <version>1.0</version>
-  <vendor email="support@jetbrains.com" url="http://www.jetbrains.com">JetBrains</vendor>
+  <vendor>JetBrains</vendor>
 
   <description>Illustration of working with Project Wizard</description>
 
-  <change-notes>Initial commit</change-notes>
-
-  <!-- please see http://www.jetbrains.org/intellij/sdk/docs/basics/getting_started/build_number_ranges.html for description -->
   <idea-version since-build="131"/>
   <depends>com.intellij.modules.lang</depends>
 
   <extensions defaultExtensionNs="com.intellij">
-    <!-- Add your extensions here -->
     <moduleBuilder builderClass="org.jetbrains.tutorials.project.wizard.DemoModuleWizardStep"
                    id="DEMO_STEP"
                    order="first"/>
   </extensions>
 
-  <application-components>
-    <!-- Add your application components here -->
-  </application-components>
-
-  <project-components>
-    <!-- Add your project components here -->
-  </project-components>
-
-  <actions>
-  </actions>
-
 </idea-plugin>
\ No newline at end of file
diff --git a/psi_demo/resources/META-INF/plugin.xml b/psi_demo/resources/META-INF/plugin.xml
index 106ff0adb..e9586d42a 100644
--- a/psi_demo/resources/META-INF/plugin.xml
+++ b/psi_demo/resources/META-INF/plugin.xml
@@ -2,21 +2,10 @@
   <id>com.jetbrains.psidemo</id>
   <name>PSI demo</name>
   <version>1.0</version>
-  <vendor email="support@yourcompany.com" url="http://www.yourcompany.com">YourCompany</vendor>
+  <vendor>JetBrains</vendor>
 
-  <!-- please see http://www.jetbrains.org/intellij/sdk/docs/basics/getting_started/build_number_ranges.html for description -->
   <idea-version since-build="173.0"/>
 
-  <!-- please see http://www.jetbrains.org/intellij/sdk/docs/basics/getting_started/plugin_compatibility.html
-       on how to target different products -->
-  <!-- uncomment to enable plugin in all products
-  <depends>com.intellij.modules.lang</depends>
-  -->
-
-  <extensions defaultExtensionNs="com.intellij">
-    <!-- Add your extensions here -->
-  </extensions>
-
   <actions>
     <action class="com.intellij.tutorials.psi.PsiNavigationDemoAction" id="PsiNavigationDemo" text="PSI Navigation Demo...">
       <add-to-group group-id="ToolsMenu" anchor="last"/>
diff --git a/register_actions/resources/META-INF/plugin.xml b/register_actions/resources/META-INF/plugin.xml
index 9cb5b953c..341a81975 100644
--- a/register_actions/resources/META-INF/plugin.xml
+++ b/register_actions/resources/META-INF/plugin.xml
@@ -1,35 +1,16 @@
 <idea-plugin>
   <id>org.jetbrains.tutorials.actions.RegisterActions</id>
-  <name>Sample plugin for working with IntelliJ Action System</name>
+  <name>Sample for working with IntelliJ Action System</name>
   <version>1.1</version>
-  <vendor email="support@jetbrains.com" url="http://www.jetbrains.com">JetBrains</vendor>
+  <vendor>JetBrains</vendor>
 
-  <description>Illustration of the Action System</description>
+  <description>Illustration of the Action System with various registration variants</description>
 
   <change-notes>Refactor to give users feedback when menu items are selected.</change-notes>
 
-  <!-- please see http://www.jetbrains.org/intellij/sdk/docs/basics/getting_started/build_number_ranges.html for description -->
   <idea-version since-build="131"/>
   <depends>com.intellij.modules.lang</depends>
 
-  <!-- please see http://www.jetbrains.org/intellij/sdk/docs/basics/getting_started/plugin_compatibility.html
-       on how to target different products -->
-  <!-- uncomment to enable plugin in all products
-  <depends>com.intellij.modules.lang</depends>
-  -->
-
-  <extensions defaultExtensionNs="com.intellij">
-    <!-- Add your extensions here -->
-  </extensions>
-
-  <application-components>
-    <!-- Add your application components here -->
-  </application-components>
-
-  <project-components>
-    <!-- Add your project components here -->
-  </project-components>
-
   <actions>
     <!-- Add your actions here -->
     <!-- The <action> element defines an action to register.
diff --git a/run_configuration/resources/META-INF/plugin.xml b/run_configuration/resources/META-INF/plugin.xml
index dc17f94a2..c2e7f0426 100644
--- a/run_configuration/resources/META-INF/plugin.xml
+++ b/run_configuration/resources/META-INF/plugin.xml
@@ -1,14 +1,11 @@
-<idea-plugin url="www.jetbrains.com">
+<idea-plugin>
   <id>org.jetbrains.tutorials.run.configuration</id>
-  <name>Run Configuration</name>
+  <name>Run Configuration Demo</name>
   <version>1.0</version>
-  <vendor email="support@jetbrains.com" url="http://www.jetbrains.com">JetBrains</vendor>
+  <vendor>JetBrains</vendor>
 
   <description>Illustration of working with run configurations</description>
 
-  <change-notes>Initial commit</change-notes>
-
-  <!-- please see http://www.jetbrains.org/intellij/sdk/docs/basics/getting_started/build_number_ranges.html for description -->
   <idea-version since-build="131"/>
   <depends>com.intellij.modules.lang</depends>
 
@@ -16,15 +13,4 @@
     <configurationType implementation="org.jetbrains.tutorials.run.configuration.DemoRunConfigurationType"/>
   </extensions>
 
-  <application-components>
-    <!-- Add your application components here -->
-  </application-components>
-
-  <project-components>
-    <!-- Add your project components here -->
-  </project-components>
-
-  <actions>
-  </actions>
-
 </idea-plugin>
\ No newline at end of file
diff --git a/tool_window/resources/META-INF/plugin.xml b/tool_window/resources/META-INF/plugin.xml
index fb3f599dc..a28d5b6b9 100644
--- a/tool_window/resources/META-INF/plugin.xml
+++ b/tool_window/resources/META-INF/plugin.xml
@@ -1,33 +1,16 @@
 <idea-plugin>
   <id>org.jetbrains.plugins.sample.ToolWindow</id>
-  <name>Tool Window</name>
+  <name>Tool Window Demo</name>
   <description>This sample plugin illustrates how to create your custom tool window.</description>
   <version>2.0</version>
-  <vendor email="support@yourcompany.com" url="http://www.yourcompany.com">YourCompany</vendor>
+  <vendor>JetBrains</vendor>
 
-  <change-notes><![CDATA[
-      Add change notes here.<br>
-      <em>most HTML tags may be used</em>
-    ]]>
-  </change-notes>
-
-  <!-- please see http://www.jetbrains.org/intellij/sdk/docs/basics/getting_started/build_number_ranges.html for description -->
   <idea-version since-build="141.0"/>
 
-  <!-- please see http://www.jetbrains.org/intellij/sdk/docs/basics/getting_started/plugin_compatibility.html
-       on how to target different products -->
-  <!-- uncomment to enable plugin in all products
-  <depends>com.intellij.modules.lang</depends>
-  -->
-
   <extensions defaultExtensionNs="com.intellij">
     <toolWindow id="Sample Calendar" secondary="true" icon="/myToolWindow/plus.png" anchor="right"
                 factoryClass="myToolWindow.MyToolWindowFactory"/>
 
   </extensions>
 
-  <actions>
-    <!-- Add your actions here -->
-  </actions>
-
 </idea-plugin>
\ No newline at end of file
diff --git a/tree_structure_provider/resources/META-INF/plugin.xml b/tree_structure_provider/resources/META-INF/plugin.xml
index 9055a3fcc..571dace95 100644
--- a/tree_structure_provider/resources/META-INF/plugin.xml
+++ b/tree_structure_provider/resources/META-INF/plugin.xml
@@ -1,12 +1,10 @@
-<idea-plugin url="www.jetbrains.com">
+<idea-plugin>
   <id>org.jetbrains.plugins.sample.TreeStructure</id>
   <name>Tree Structure Provider Demo</name>
   <version>1.0</version>
-  <vendor email="support@jetbrains.com" url="http://www.jetbrains.com">JetBrains</vendor>
+  <vendor>JetBrains</vendor>
 
-  <description>Tree Structure Provider Demo</description>
-
-  <change-notes>Initial commit</change-notes>
+  <description>Tree Structure Provider Demo showing only plain text files</description>
 
   <idea-version since-build="131"/>
   <depends>com.intellij.modules.lang</depends>
@@ -15,16 +13,4 @@
     <treeStructureProvider implementation="org.jetbrains.tutorials.tree.structure.TextOnlyTreeStructureProvider"/>
   </extensions>
 
-  <application-components>
-    <!-- Add your application components here -->
-  </application-components>
-
-  <project-components>
-    <!-- Add your project components here -->
-  </project-components>
-
-  <actions>
-    <!-- Add your actions here -->
-  </actions>
-
 </idea-plugin>
\ No newline at end of file