diff --git a/platform/platform-resources/src/META-INF/built-in-server.xml b/platform/platform-resources/src/META-INF/built-in-server.xml
index b8926761ac25..1cc11142a072 100644
--- a/platform/platform-resources/src/META-INF/built-in-server.xml
+++ b/platform/platform-resources/src/META-INF/built-in-server.xml
@@ -2,7 +2,7 @@
   <extensionPoints>
     <extensionPoint qualifiedName="org.jetbrains.webServerPathHandler" interface="org.jetbrains.builtInWebServer.WebServerPathHandler"/>
     <extensionPoint qualifiedName="org.jetbrains.webServerFileHandler" interface="org.jetbrains.builtInWebServer.WebServerFileHandler"/>
-    <extensionPoint qualifiedName="org.jetbrains.webServerRootsProvider" interface="org.jetbrains.builtInWebServer.WebServerRootsProvider"/>
+    <extensionPoint qualifiedName="org.jetbrains.webServerRootsProvider" interface="org.jetbrains.builtInWebServer.WebServerRootsProvider" dynamic="true"/>
 
     <extensionPoint name="httpRequestHandler" interface="org.jetbrains.ide.HttpRequestHandler"/>
     <extensionPoint qualifiedName="org.jetbrains.binaryRequestHandler" interface="org.jetbrains.ide.BinaryRequestHandler"/>
diff --git a/plugins/properties/properties-psi-impl/src/com/intellij/properties/PropertiesCoreEnvironment.java b/plugins/properties/properties-psi-impl/src/com/intellij/properties/PropertiesCoreEnvironment.java
index e59ef1153b3c..06d60ecf39fa 100644
--- a/plugins/properties/properties-psi-impl/src/com/intellij/properties/PropertiesCoreEnvironment.java
+++ b/plugins/properties/properties-psi-impl/src/com/intellij/properties/PropertiesCoreEnvironment.java
@@ -38,7 +38,7 @@ import com.intellij.lang.properties.refactoring.PropertiesRefactoringSettings;
 import com.intellij.lang.properties.structureView.PropertiesSeparatorManager;
 import com.intellij.lang.properties.xml.XmlPropertiesIconProvider;
 import com.intellij.lang.properties.xml.XmlPropertiesIndex;
-import com.intellij.openapi.fileTypes.SyntaxHighlighterFactory;
+import com.intellij.openapi.fileTypes.LanguageSyntaxHighlighters;
 import com.intellij.psi.ElementManipulators;
 import com.intellij.psi.impl.cache.impl.id.IdIndexers;
 import com.intellij.psi.impl.cache.impl.idCache.PropertiesIdIndexer;
@@ -56,8 +56,8 @@ public class PropertiesCoreEnvironment {
   public static class ApplicationEnvironment {
     public ApplicationEnvironment(CoreApplicationEnvironment appEnvironment) {
       appEnvironment.registerFileType(PropertiesFileType.INSTANCE, "properties");
-      appEnvironment.addExplicitExtension(SyntaxHighlighterFactory.LANGUAGE_FACTORY, PropertiesLanguage.INSTANCE,
-                                          new PropertiesSyntaxHighlighterFactory());
+      appEnvironment.addExplicitExtension(LanguageSyntaxHighlighters.INSTANCE, PropertiesLanguage.INSTANCE,
+                                          new PropertiesHighlighter());
       appEnvironment.addExplicitExtension(LanguageParserDefinitions.INSTANCE, PropertiesLanguage.INSTANCE, new PropertiesParserDefinition());
       appEnvironment.addExtension(FileBasedIndexExtension.EXTENSION_POINT_NAME, new XmlPropertiesIndex());
       appEnvironment.addExtension(StubIndexExtension.EP_NAME, new PropertyKeyIndex());
diff --git a/plugins/properties/properties-psi-impl/src/com/intellij/properties/PropertiesSyntaxHighlighterFactory.java b/plugins/properties/properties-psi-impl/src/com/intellij/properties/PropertiesSyntaxHighlighterFactory.java
deleted file mode 100644
index 1ec761b44960..000000000000
--- a/plugins/properties/properties-psi-impl/src/com/intellij/properties/PropertiesSyntaxHighlighterFactory.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.intellij.properties;
-
-import com.intellij.lang.properties.PropertiesHighlighter;
-import com.intellij.openapi.fileTypes.SingleLazyInstanceSyntaxHighlighterFactory;
-import com.intellij.openapi.fileTypes.SyntaxHighlighter;
-import org.jetbrains.annotations.NotNull;
-
-/**
- * @author Anna Bulenkova
- */
-public class PropertiesSyntaxHighlighterFactory extends SingleLazyInstanceSyntaxHighlighterFactory {
-  @NotNull
-  @Override
-  protected SyntaxHighlighter createHighlighter() {
-    return new PropertiesHighlighter();
-  }
-}
diff --git a/plugins/sh/resources/META-INF/plugin.xml b/plugins/sh/resources/META-INF/plugin.xml
index 2848b40b9818..a015c762265f 100644
--- a/plugins/sh/resources/META-INF/plugin.xml
+++ b/plugins/sh/resources/META-INF/plugin.xml
@@ -13,6 +13,7 @@ Adds support for working with shell script files
 </li></ul>]]></description>
   <extensions defaultExtensionNs="com.intellij">
     <fileType language="Shell Script" extensions="sh;bash;zsh" fieldName="INSTANCE" name="Shell Script" implementationClass="com.intellij.sh.ShFileType"/>
+    <lang.syntaxHighlighter language="Shell Script" implementationClass="com.intellij.sh.highlighter.ShSyntaxHighlighter"/>
     <lang.parserDefinition language="Shell Script" implementationClass="com.intellij.sh.parser.ShParserDefinition"/>
     <lang.commenter language="Shell Script" implementationClass="com.intellij.sh.ShCommenter"/>
     <lang.quoteHandler language="Shell Script" implementationClass="com.intellij.sh.ShQuoteHandler"/>
diff --git a/plugins/sh/src/com/intellij/sh/ShLanguage.java b/plugins/sh/src/com/intellij/sh/ShLanguage.java
index 2601b390c96a..e6b8ccfd307e 100644
--- a/plugins/sh/src/com/intellij/sh/ShLanguage.java
+++ b/plugins/sh/src/com/intellij/sh/ShLanguage.java
@@ -2,14 +2,11 @@
 package com.intellij.sh;
 
 import com.intellij.lang.Language;
-import com.intellij.openapi.fileTypes.SyntaxHighlighterFactory;
-import com.intellij.sh.highlighter.ShHighlighterFactory;
 
 public class ShLanguage extends Language {
   public static final Language INSTANCE = new ShLanguage();
 
   public ShLanguage() {
     super("Shell Script", "application/x-bsh", "application/x-sh", "text/x-script.sh");
-    SyntaxHighlighterFactory.LANGUAGE_FACTORY.addExplicitExtension(this, new ShHighlighterFactory());
   }
 }
diff --git a/plugins/sh/src/com/intellij/sh/highlighter/ShHighlighterFactory.java b/plugins/sh/src/com/intellij/sh/highlighter/ShHighlighterFactory.java
deleted file mode 100644
index bea14f812039..000000000000
--- a/plugins/sh/src/com/intellij/sh/highlighter/ShHighlighterFactory.java
+++ /dev/null
@@ -1,14 +0,0 @@
-// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.sh.highlighter;
-
-import com.intellij.openapi.fileTypes.SingleLazyInstanceSyntaxHighlighterFactory;
-import com.intellij.openapi.fileTypes.SyntaxHighlighter;
-import org.jetbrains.annotations.NotNull;
-
-public class ShHighlighterFactory extends SingleLazyInstanceSyntaxHighlighterFactory {
-  @Override
-  @NotNull
-  protected SyntaxHighlighter createHighlighter() {
-    return new ShSyntaxHighlighter();
-  }
-}
diff --git a/python/src/META-INF/python-core-buildout.xml b/python/src/META-INF/python-core-buildout.xml
index 90607355fc7c..82f9638d9372 100644
--- a/python/src/META-INF/python-core-buildout.xml
+++ b/python/src/META-INF/python-core-buildout.xml
@@ -8,6 +8,7 @@
     <framework.detector implementation="com.jetbrains.python.buildout.BuildoutFrameworkDetector"/>
 
     <lang.parserDefinition language="BuildoutCfg" implementationClass="com.jetbrains.python.buildout.config.BuildoutCfgParserDefinition"/>
+    <lang.syntaxHighlighter language="BuildoutCfg" implementationClass="com.jetbrains.python.buildout.config.BuildoutCfgSyntaxHighlighter"/>
     <fileType name="BuildoutCfg"
               language="BuildoutCfg"
               fileNamesCaseInsensitive="buildout.cfg"
diff --git a/python/src/com/jetbrains/python/buildout/config/BuildoutCfgLanguage.java b/python/src/com/jetbrains/python/buildout/config/BuildoutCfgLanguage.java
index f210b2a83c43..54bfa7941ece 100644
--- a/python/src/com/jetbrains/python/buildout/config/BuildoutCfgLanguage.java
+++ b/python/src/com/jetbrains/python/buildout/config/BuildoutCfgLanguage.java
@@ -2,9 +2,6 @@
 package com.jetbrains.python.buildout.config;
 
 import com.intellij.lang.Language;
-import com.intellij.openapi.fileTypes.SingleLazyInstanceSyntaxHighlighterFactory;
-import com.intellij.openapi.fileTypes.SyntaxHighlighter;
-import com.intellij.openapi.fileTypes.SyntaxHighlighterFactory;
 import org.jetbrains.annotations.NotNull;
 
 /**
@@ -15,13 +12,6 @@ public class BuildoutCfgLanguage extends Language {
 
   private BuildoutCfgLanguage() {
     super("BuildoutCfg");
-    SyntaxHighlighterFactory.LANGUAGE_FACTORY.addExplicitExtension(this, new SingleLazyInstanceSyntaxHighlighterFactory() {
-      @Override
-      @NotNull
-      protected SyntaxHighlighter createHighlighter() {
-        return new BuildoutCfgSyntaxHighlighter();
-      }
-    });
   }
 
   @NotNull
diff --git a/xml/relaxng/src/META-INF/relaxng-plugin.xml b/xml/relaxng/src/META-INF/relaxng-plugin.xml
index 5625c3a7772d..0e5799dd5c82 100644
--- a/xml/relaxng/src/META-INF/relaxng-plugin.xml
+++ b/xml/relaxng/src/META-INF/relaxng-plugin.xml
@@ -17,7 +17,7 @@
     <lang.foldingBuilder language="RELAX-NG" implementationClass="org.intellij.plugins.relaxNG.compact.folding.RncFoldingBuilder" />
     <lang.formatter language="RELAX-NG" implementationClass="org.intellij.plugins.relaxNG.compact.formatting.RncFormattingModelBuilder" />
     <lang.namesValidator language="RELAX-NG" implementationClass="org.intellij.plugins.relaxNG.compact.RngCompactLanguage$MyNamesValidator" />
-    <lang.syntaxHighlighterFactory language="RELAX-NG" implementationClass="org.intellij.plugins.relaxNG.compact.RngCompactLanguage$MySyntaxHighlighterFactory" />
+    <lang.syntaxHighlighter language="RELAX-NG" implementationClass="org.intellij.plugins.relaxNG.compact.RncHighlighter" />
 
     <lang.elementManipulator forClass="org.intellij.plugins.relaxNG.compact.psi.RncFileReference" implementationClass="org.intellij.plugins.relaxNG.RncFileReferenceManipulator" />
 
diff --git a/xml/relaxng/src/org/intellij/plugins/relaxNG/compact/RngCompactLanguage.java b/xml/relaxng/src/org/intellij/plugins/relaxNG/compact/RngCompactLanguage.java
index 64998e58ab4d..b15e449ad2db 100644
--- a/xml/relaxng/src/org/intellij/plugins/relaxNG/compact/RngCompactLanguage.java
+++ b/xml/relaxng/src/org/intellij/plugins/relaxNG/compact/RngCompactLanguage.java
@@ -22,8 +22,6 @@ import com.intellij.lang.Language;
 import com.intellij.lang.PairedBraceMatcher;
 import com.intellij.lang.documentation.DocumentationProvider;
 import com.intellij.lang.refactoring.NamesValidator;
-import com.intellij.openapi.fileTypes.SingleLazyInstanceSyntaxHighlighterFactory;
-import com.intellij.openapi.fileTypes.SyntaxHighlighter;
 import com.intellij.openapi.project.Project;
 import com.intellij.psi.PsiComment;
 import com.intellij.psi.PsiElement;
@@ -143,12 +141,4 @@ public class RngCompactLanguage extends Language {
       return null;
     }
   }
-
-  public static class MySyntaxHighlighterFactory extends SingleLazyInstanceSyntaxHighlighterFactory {
-    @Override
-    @NotNull
-    protected SyntaxHighlighter createHighlighter() {
-      return new RncHighlighter();
-    }
-  }
 }