diff --git a/idea/src/META-INF/plugin.xml b/idea/src/META-INF/plugin.xml
index 6fbcc23d4b6168eeac499f680e6b1dbe508bf51b..bab537865a3f790ebb81d85e47c1453d61056dfd 100644
--- a/idea/src/META-INF/plugin.xml
+++ b/idea/src/META-INF/plugin.xml
@@ -28,6 +28,7 @@
 
   <extensions defaultExtensionNs="com.intellij">
       <fileTypeFactory implementation="org.jetbrains.jet.plugin.JetFileFactory"/>
+      <lang.syntaxHighlighterFactory key="jet" implementationClass="org.jetbrains.jet.plugin.JetSyntaxHighlighterFactory"/>
       <lang.braceMatcher language="jet" implementationClass="org.jetbrains.jet.plugin.JetPairMatcher"/>
       <lang.parserDefinition language="jet" implementationClass="org.jetbrains.jet.lang.parsing.JetParserDefinition"/>
       <lang.commenter language="jet" implementationClass="org.jetbrains.jet.plugin.JetCommenter"/>
diff --git a/idea/src/org/jetbrains/jet/plugin/JetLanguage.java b/idea/src/org/jetbrains/jet/plugin/JetLanguage.java
index cf8802b6fc0fb67fb241a6046e0214095e7e45e7..40c5d1caaa0323c7faa99140e878f919b4861cfa 100644
--- a/idea/src/org/jetbrains/jet/plugin/JetLanguage.java
+++ b/idea/src/org/jetbrains/jet/plugin/JetLanguage.java
@@ -4,22 +4,11 @@
 package org.jetbrains.jet.plugin;
 
 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;
 
 public class JetLanguage extends Language {
     public static JetLanguage INSTANCE = new JetLanguage();
 
     private JetLanguage() {
         super("jet");
-
-        SyntaxHighlighterFactory.LANGUAGE_FACTORY.addExplicitExtension(this, new SingleLazyInstanceSyntaxHighlighterFactory() {
-          @NotNull
-          protected SyntaxHighlighter createHighlighter() {
-            return new JetHighlighter();
-          }
-        });
     }
 }
diff --git a/idea/src/org/jetbrains/jet/plugin/JetSyntaxHighlighterFactory.java b/idea/src/org/jetbrains/jet/plugin/JetSyntaxHighlighterFactory.java
new file mode 100644
index 0000000000000000000000000000000000000000..ff932b6ae0335156136f40d1825fffd6e83e5679
--- /dev/null
+++ b/idea/src/org/jetbrains/jet/plugin/JetSyntaxHighlighterFactory.java
@@ -0,0 +1,12 @@
+package org.jetbrains.jet.plugin;
+
+import com.intellij.openapi.fileTypes.SingleLazyInstanceSyntaxHighlighterFactory;
+import com.intellij.openapi.fileTypes.SyntaxHighlighter;
+import org.jetbrains.annotations.NotNull;
+
+public class JetSyntaxHighlighterFactory extends SingleLazyInstanceSyntaxHighlighterFactory {
+    @NotNull
+    protected SyntaxHighlighter createHighlighter() {
+      return new JetHighlighter();
+    }
+}