diff --git a/python/openapi/src/com/jetbrains/python/templateLanguages/TemplatesService.java b/python/openapi/src/com/jetbrains/python/templateLanguages/TemplatesService.java
index c527e39e6adc..74f8b12dfd75 100644
--- a/python/openapi/src/com/jetbrains/python/templateLanguages/TemplatesService.java
+++ b/python/openapi/src/com/jetbrains/python/templateLanguages/TemplatesService.java
@@ -1,24 +1,11 @@
 package com.jetbrains.python.templateLanguages;
 
-import com.google.common.collect.Lists;
 import com.intellij.lang.Language;
-import com.intellij.lang.LanguageExtensionPoint;
-import com.intellij.openapi.application.Application;
-import com.intellij.openapi.components.PersistentStateComponent;
-import com.intellij.openapi.components.State;
-import com.intellij.openapi.components.Storage;
-import com.intellij.openapi.fileTypes.FileType;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.module.ModuleServiceManager;
-import com.intellij.openapi.vfs.LocalFileSystem;
 import com.intellij.openapi.vfs.VirtualFile;
-import com.intellij.psi.LanguageSubstitutors;
 import com.intellij.util.containers.ContainerUtil;
-import com.intellij.util.xmlb.XmlSerializerUtil;
-import com.intellij.util.xmlb.annotations.Transient;
 
-import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 
 /**
@@ -29,11 +16,13 @@ public abstract class TemplatesService {
   public static final String DJANGO = "Django";
   public static final String MAKO = "Mako";
   public static final String JINJA2 = "Jinja2";
+  public static final String WEB2PY = "Web2Py";
 
   private static List<String> ALL_TEMPLATE_LANGUAGES = ContainerUtil.immutableList(NONE,
                                                                                    DJANGO,
                                                                                    MAKO,
-                                                                                  JINJA2);
+                                                                                  JINJA2,
+                                                                                  WEB2PY);
 
   public abstract Language getSelectedTemplateLanguage();
 
diff --git a/python/src/META-INF/python-plugin-common.xml b/python/src/META-INF/python-plugin-common.xml
index 20b4341a9b54..03f7ae3b021b 100644
--- a/python/src/META-INF/python-plugin-common.xml
+++ b/python/src/META-INF/python-plugin-common.xml
@@ -811,6 +811,12 @@
     <codeInsight.lineMarkerProvider language="Python" implementationClass="com.jetbrains.web2py.annotator.Web2PyViewLineMarkerProvider"/>
     <codeInsight.lineMarkerProvider language="HTML" implementationClass="com.jetbrains.web2py.annotator.Web2PyControllerLineMarkerProvider"/>
     <codeInsight.lineMarkerProvider language="XML" implementationClass="com.jetbrains.web2py.annotator.Web2PyControllerLineMarkerProvider"/>
+
+    <fileTypeFactory implementation="com.jetbrains.web2py.templates.Web2PyFileTypeFactory"/>
+    <lang.fileViewProviderFactory language="Web2Py"
+                                  implementationClass="com.jetbrains.web2py.templates.Web2PyFileProviderFactory"/>
+    <lang.parserDefinition language="Web2Py"
+                           implementationClass="com.jetbrains.web2py.templates.parser.Web2PyParserDefinition"/>
   </extensions>
 
   <extensionPoints>