diff --git a/live_templates/build.gradle b/live_templates/build.gradle
index 65d5e23f7..d4444015e 100644
--- a/live_templates/build.gradle
+++ b/live_templates/build.gradle
@@ -1,24 +1,27 @@
 // Copyright 2000-2020 JetBrains s.r.o. and other contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 
 plugins {
-    id 'java'
-    id 'org.jetbrains.intellij' version '0.4.16'
+  id 'java'
+  id 'org.jetbrains.intellij' version '0.4.16'
 }
 
 group 'org.intellij.sdk'
-version '2.0.0'
+version '2.1.0'
 
 sourceCompatibility = 1.8
 
 repositories {
-    mavenCentral()
+  mavenCentral()
 }
 
 // See https://github.com/JetBrains/gradle-intellij-plugin/
 intellij {
-    version '2019.3.3'
-    updateSinceUntilBuild = false
+//    version '2020.1'
+
+  // Sets <idea-version> in plugin.xml
+  sameSinceUntilBuild = true
 }
 patchPluginXml {
-    version = project.version
+  // Sets <version> in plugin.xml
+  version = project.version
 }
\ No newline at end of file
diff --git a/live_templates/src/main/java/org/intellij/sdk/liveTemplates/MarkdownTemplateProvider.java b/live_templates/src/main/java/org/intellij/sdk/liveTemplates/MarkdownTemplateProvider.java
deleted file mode 100644
index f052130bd..000000000
--- a/live_templates/src/main/java/org/intellij/sdk/liveTemplates/MarkdownTemplateProvider.java
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright 2000-2020 JetBrains s.r.o. and other contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
-package org.intellij.sdk.liveTemplates;
-
-import com.intellij.codeInsight.template.impl.DefaultLiveTemplatesProvider;
-import org.jetbrains.annotations.Nullable;
-
-public class MarkdownTemplateProvider implements DefaultLiveTemplatesProvider {
-  @Override
-  public String[] getDefaultLiveTemplateFiles() {
-    return new String[]{"liveTemplates/Markdown"};
-  }
-
-  @Nullable
-  @Override
-  public String[] getHiddenLiveTemplateFiles() {
-    return null;
-  }
-}
diff --git a/live_templates/src/main/resources/META-INF/plugin.xml b/live_templates/src/main/resources/META-INF/plugin.xml
index 8a9a4aef0..3071d91bd 100644
--- a/live_templates/src/main/resources/META-INF/plugin.xml
+++ b/live_templates/src/main/resources/META-INF/plugin.xml
@@ -7,11 +7,9 @@
   <!-- Text to display as name on Preferences/Settings | Plugin page  -->
   <name>SDK: Live Templates Sample Project</name>
 
-  <!-- The version of this plugin -->
-  <version>2.0.0</version>
+  <!-- The <version> of this plugin is set by patchPluginXml.version in build.gradle -->
 
-  <!-- Compatible with the following versions of IntelliJ Platform - needed for plugin logo -->
-  <idea-version since-build="191"/>
+  <!-- The <idea-version> compatibility of this plugin is set by intellij.sameSinceUntilBuild in build.gradle -->
 
   <!-- Product and plugin compatibility requirements -->
   <depends>com.intellij.modules.lang</depends>
@@ -25,6 +23,7 @@
   <change-notes>
     <![CDATA[
       <ul>
+        <li><b>2.1.0</b> Use com.intellij.defaultLiveTemplates, add custom macro.</li>
         <li><b>2.0.0</b> Convert to Gradle-based plugin, change plugin ID</li>
         <li><b>1.0.0</b> Release 2018.3 and earlier.</li>
       </ul>
@@ -35,7 +34,7 @@
   <vendor url="https://plugins.jetbrains.com">IntelliJ Platform SDK</vendor>
 
   <extensions defaultExtensionNs="com.intellij">
-    <defaultLiveTemplatesProvider implementation="org.intellij.sdk.liveTemplates.MarkdownTemplateProvider"/>
+    <defaultLiveTemplates file="/liveTemplates/Markdown"/>
     <liveTemplateContext implementation="org.intellij.sdk.liveTemplates.MarkdownContext"/>
   </extensions>
 
diff --git a/live_templates/src/main/resources/liveTemplates/Markdown.xml b/live_templates/src/main/resources/liveTemplates/Markdown.xml
index 725f104ee..611af85f9 100644
--- a/live_templates/src/main/resources/liveTemplates/Markdown.xml
+++ b/live_templates/src/main/resources/liveTemplates/Markdown.xml
@@ -1,7 +1,7 @@
 <templateSet group="Markdown">
-  <template name="["
+  <template name="{"
             value="[$TEXT$]($LINK$)$END$"
-            description="SDK: New link reference."
+            description="SDK: New link reference"
             toReformat="false"
             toShortenFQNames="false">
     <variable name="TEXT" expression="" defaultValue="" alwaysStopAt="true"/>