diff --git a/platform/platform-impl/src/com/intellij/ide/util/TipAndTrickBean.java b/platform/platform-impl/src/com/intellij/ide/util/TipAndTrickBean.java
new file mode 100644
index 000000000000..fcaa09c22ae0
--- /dev/null
+++ b/platform/platform-impl/src/com/intellij/ide/util/TipAndTrickBean.java
@@ -0,0 +1,55 @@
+/*
+ * 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.ide.util;
+
+import com.intellij.openapi.extensions.AbstractExtensionPointBean;
+import com.intellij.openapi.extensions.ExtensionPointName;
+import com.intellij.openapi.extensions.Extensions;
+import com.intellij.openapi.util.Comparing;
+import com.intellij.util.xmlb.annotations.Attribute;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * @author gregsh
+ */
+public class TipAndTrickBean extends AbstractExtensionPointBean {
+  public static final ExtensionPointName<TipAndTrickBean> EP_NAME = ExtensionPointName.create("com.intellij.tipAndTrick");
+
+  @Attribute("file")
+  public String myFileName;
+
+  @Attribute("feature-id")
+  public String myFeatureId;
+
+  public String getFileName() {
+    return myFileName;
+  }
+
+  public String getFeatureId() {
+    return myFeatureId;
+  }
+
+  @Nullable
+  public static TipAndTrickBean findByFileName(String tipFileName) {
+    for (TipAndTrickBean tip : Extensions.getExtensions(EP_NAME)) {
+      if (Comparing.equal(tipFileName, tip.getFileName())) {
+        return tip;
+      }
+    }
+    return null;
+  }
+}
+
diff --git a/platform/platform-impl/src/com/intellij/ide/util/TipPanel.java b/platform/platform-impl/src/com/intellij/ide/util/TipPanel.java
index 8ccdda223cb6..e44be06c8b41 100644
--- a/platform/platform-impl/src/com/intellij/ide/util/TipPanel.java
+++ b/platform/platform-impl/src/com/intellij/ide/util/TipPanel.java
@@ -15,18 +15,17 @@
  */
 package com.intellij.ide.util;
 
-import com.intellij.featureStatistics.FeatureDescriptor;
-import com.intellij.featureStatistics.ProductivityFeaturesProvider;
 import com.intellij.icons.AllIcons;
+import com.intellij.ide.BrowserUtil;
 import com.intellij.ide.GeneralSettings;
 import com.intellij.ide.IdeBundle;
 import com.intellij.openapi.application.ApplicationNamesInfo;
-import com.intellij.openapi.util.JDOMUtil;
+import com.intellij.openapi.extensions.Extensions;
 import com.intellij.ui.ScrollPaneFactory;
+import com.intellij.ui.SimpleTextAttributes;
+import com.intellij.ui.components.JBLabel;
+import com.intellij.util.containers.ContainerUtil;
 import com.intellij.util.ui.UIUtil;
-import org.jdom.Document;
-import org.jdom.Element;
-import org.jetbrains.annotations.NonNls;
 
 import javax.swing.*;
 import javax.swing.event.HyperlinkEvent;
@@ -35,20 +34,16 @@ import javax.swing.text.html.HTMLEditorKit;
 import java.awt.*;
 import java.awt.event.ItemEvent;
 import java.awt.event.ItemListener;
-import java.util.ArrayList;
-import java.util.HashMap;
+import java.util.Collections;
+import java.util.List;
 
 public class TipPanel extends JPanel {
   private static final int DEFAULT_WIDTH = 400;
   private static final int DEFAULT_HEIGHT = 200;
-  private final JCheckBox myCheckBox;
-  private final JEditorPane browser;
-  private final ArrayList<String> myTipPaths = new ArrayList<String>();
-  private final HashMap<String, Class< ? extends ProductivityFeaturesProvider>> myPathsToProviderMap = new HashMap<String, Class<? extends ProductivityFeaturesProvider>>();
-  @NonNls
-  private static final String ELEMENT_TIP = "tip";
-  @NonNls
-  private static final String ATTRIBUTE_FILE = "file";
+
+  private final JEditorPane myBrowserPanel;
+  private final JLabel myPoweredByLabel;
+  private final List<TipAndTrickBean> myTips = ContainerUtil.newArrayList();
 
   public TipPanel() {
     setLayout(new BorderLayout());
@@ -63,45 +58,42 @@ public class TipPanel extends JPanel {
     jpanel.add(jlabel1, BorderLayout.CENTER);
     jpanel.setBorder(BorderFactory.createEmptyBorder(5, 0, 5, 0));
     add(jpanel, BorderLayout.NORTH);
-    browser = new JEditorPane();
-    browser.setEditable(false);
-    browser.setEditorKit(new HTMLEditorKit());
-    browser.setBackground(UIUtil.getTextFieldBackground());
-    browser.addHyperlinkListener(
+    myBrowserPanel = new JEditorPane();
+    myBrowserPanel.setEditable(false);
+    myBrowserPanel.setEditorKit(new HTMLEditorKit());
+    myBrowserPanel.setBackground(UIUtil.getTextFieldBackground());
+    myBrowserPanel.addHyperlinkListener(
       new HyperlinkListener() {
         public void hyperlinkUpdate(HyperlinkEvent e) {
           if (e.getEventType() == HyperlinkEvent.EventType.ACTIVATED) {
-            //TODO: Open url in browser
+            BrowserUtil.browse(e.getURL());
           }
         }
       }
     );
-    JScrollPane scrollPane = ScrollPaneFactory.createScrollPane(browser);
+    JScrollPane scrollPane = ScrollPaneFactory.createScrollPane(myBrowserPanel);
     add(scrollPane, BorderLayout.CENTER);
-    myCheckBox = new JCheckBox(IdeBundle.message("checkbox.show.tips.on.startup"), true);
-    myCheckBox.setBorder(BorderFactory.createEmptyBorder(5, 0, 0, 0));
+
+    JPanel southPanel = new JPanel(new BorderLayout());
+    JCheckBox showOnStartCheckBox = new JCheckBox(IdeBundle.message("checkbox.show.tips.on.startup"), true);
+    showOnStartCheckBox.setBorder(BorderFactory.createEmptyBorder(5, 0, 0, 0));
     final GeneralSettings settings = GeneralSettings.getInstance();
-    myCheckBox.setSelected(settings.showTipsOnStartup());
-    myCheckBox.addItemListener(new ItemListener() {
+    showOnStartCheckBox.setSelected(settings.showTipsOnStartup());
+    showOnStartCheckBox.addItemListener(new ItemListener() {
       public void itemStateChanged(ItemEvent e) {
         settings.setShowTipsOnStartup(e.getStateChange() == ItemEvent.SELECTED);
       }
     });
-    add(myCheckBox, BorderLayout.SOUTH);
-    try {
-      readTips("/tips/tips.xml");
-      readTips("/tips/IdeSpecificTips.xml");
-    }
-    catch (Exception exception) {//
-    }
+    southPanel.add(showOnStartCheckBox, BorderLayout.WEST);
 
-    for (ProductivityFeaturesProvider provider : ProductivityFeaturesProvider.EP_NAME.getExtensions()) {
-      final FeatureDescriptor[] descriptors = provider.getFeatureDescriptors();
-      for (int j = 0; descriptors != null && j < descriptors.length; j++) {
-        FeatureDescriptor descriptor = descriptors[j];
-        myPathsToProviderMap.put(descriptor.getTipFileName(), descriptor.getProvider());
-      }
-    }
+    myPoweredByLabel = new JBLabel();
+    myPoweredByLabel.setHorizontalAlignment(SwingConstants.RIGHT);
+    myPoweredByLabel.setForeground(SimpleTextAttributes.GRAY_ITALIC_ATTRIBUTES.getFgColor());
+
+    southPanel.add(myPoweredByLabel, BorderLayout.EAST);
+    add(southPanel, BorderLayout.SOUTH);
+
+    Collections.addAll(myTips, Extensions.getExtensions(TipAndTrickBean.EP_NAME));
   }
 
   public Dimension getPreferredSize() {
@@ -109,57 +101,49 @@ public class TipPanel extends JPanel {
   }
 
   public void prevTip() {
-    if (myTipPaths.size() == 0) {
-      browser.setText(IdeBundle.message("error.tips.not.found", ApplicationNamesInfo.getInstance().getFullProductName()));
+    if (myTips.size() == 0) {
+      myBrowserPanel.setText(IdeBundle.message("error.tips.not.found", ApplicationNamesInfo.getInstance().getFullProductName()));
       return;
     }
     final GeneralSettings settings = GeneralSettings.getInstance();
     int lastTip = settings.getLastTip();
 
-    final String path;
+    final TipAndTrickBean tip;
     lastTip--;
     if (lastTip <= 0) {
-      path = myTipPaths.get(myTipPaths.size() - 1);
-      lastTip = myTipPaths.size();
+      tip = myTips.get(myTips.size() - 1);
+      lastTip = myTips.size();
     }
     else {
-      path = myTipPaths.get(lastTip - 1);
+      tip = myTips.get(lastTip - 1);
     }
 
-    setTip(path, lastTip, browser, settings);
+    setTip(tip, lastTip, myBrowserPanel, settings);
   }
 
-  private void setTip (String path, int lastTip, JEditorPane browser, GeneralSettings settings) {
-    TipUIUtil.openTipInBrowser(path, browser, myPathsToProviderMap.get(path));
+  private void setTip (TipAndTrickBean tip, int lastTip, JEditorPane browser, GeneralSettings settings) {
+    TipUIUtil.openTipInBrowser(tip, browser);
+    myPoweredByLabel.setText(TipUIUtil.getPoweredByText(tip));
     settings.setLastTip(lastTip);
   }
 
   public void nextTip() {
-    if (myTipPaths.size() == 0) {
-      browser.setText(IdeBundle.message("error.tips.not.found", ApplicationNamesInfo.getInstance().getFullProductName()));
+    if (myTips.size() == 0) {
+      myBrowserPanel.setText(IdeBundle.message("error.tips.not.found", ApplicationNamesInfo.getInstance().getFullProductName()));
       return;
     }
     GeneralSettings settings = GeneralSettings.getInstance();
     int lastTip = settings.getLastTip();
-    String path;
+    TipAndTrickBean tip;
     lastTip++;
-    if (lastTip - 1 >= myTipPaths.size()) {
-      path = myTipPaths.get(0);
+    if (lastTip - 1 >= myTips.size()) {
+      tip = myTips.get(0);
       lastTip = 1;
     }
     else {
-      path = myTipPaths.get(lastTip - 1);
+      tip = myTips.get(lastTip - 1);
     }
 
-    setTip(path, lastTip, browser, settings);
-  }
-
-  private void readTips(String tipsURL) throws Exception {
-    final Document document = JDOMUtil.loadDocument(getClass().getResource(tipsURL).openStream());
-
-    for (Object o : document.getRootElement().getChildren(ELEMENT_TIP)) {
-      Element tip = (Element)o;
-      myTipPaths.add(tip.getAttributeValue(ATTRIBUTE_FILE));
-    }
+    setTip(tip, lastTip, myBrowserPanel, settings);
   }
 }
diff --git a/platform/platform-impl/src/com/intellij/ide/util/TipUIUtil.java b/platform/platform-impl/src/com/intellij/ide/util/TipUIUtil.java
index 0e531bfc1fc9..afa6a2b5f219 100644
--- a/platform/platform-impl/src/com/intellij/ide/util/TipUIUtil.java
+++ b/platform/platform-impl/src/com/intellij/ide/util/TipUIUtil.java
@@ -16,17 +16,22 @@
 package com.intellij.ide.util;
 
 import com.intellij.ide.IdeBundle;
+import com.intellij.ide.plugins.IdeaPluginDescriptor;
+import com.intellij.ide.plugins.PluginManagerCore;
 import com.intellij.openapi.actionSystem.KeyboardShortcut;
 import com.intellij.openapi.actionSystem.Shortcut;
 import com.intellij.openapi.application.ApplicationInfo;
 import com.intellij.openapi.application.ApplicationNamesInfo;
+import com.intellij.openapi.extensions.PluginDescriptor;
 import com.intellij.openapi.keymap.Keymap;
 import com.intellij.openapi.keymap.KeymapManager;
 import com.intellij.openapi.keymap.KeymapUtil;
 import com.intellij.openapi.keymap.impl.DefaultKeymap;
+import com.intellij.util.ObjectUtils;
 import com.intellij.util.ResourceUtil;
 import com.intellij.util.ui.UIUtil;
 import org.jetbrains.annotations.NonNls;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import javax.imageio.ImageIO;
@@ -46,7 +51,20 @@ public class TipUIUtil {
   private TipUIUtil() {
   }
 
-  public static void openTipInBrowser(String tipPath, JEditorPane browser, Class providerClass) {
+  @NotNull
+  public static String getPoweredByText(@NotNull TipAndTrickBean tip) {
+    PluginDescriptor descriptor = tip.getPluginDescriptor();
+    return descriptor instanceof IdeaPluginDescriptor &&
+           !PluginManagerCore.CORE_PLUGIN_ID.equals(descriptor.getPluginId().getIdString()) ?
+           ((IdeaPluginDescriptor)descriptor).getName() : "";
+  }
+
+  public static void openTipInBrowser(String tipFileName, JEditorPane browser, Class providerClass) {
+    openTipInBrowser(TipAndTrickBean.findByFileName(tipFileName), browser);
+  }
+
+  public static void openTipInBrowser(@Nullable TipAndTrickBean tip, JEditorPane browser) {
+    if (tip == null) return;
     /* TODO: detect that file is not present
     if (!file.exists()) {
       browser.read(new StringReader("Tips for '" + feature.getDisplayName() + "' not found.  Make sure you installed IntelliJ IDEA correctly."), null);
@@ -54,18 +72,18 @@ public class TipUIUtil {
     }
     */
     try {
-      if (tipPath == null) return;
-      if (providerClass == null) providerClass = TipUIUtil.class;
-      URL url = ResourceUtil.getResource(providerClass, "/tips/", tipPath);
+      ClassLoader tipLoader = ObjectUtils.notNull(tip.getPluginDescriptor().getPluginClassLoader(), TipUIUtil.class.getClassLoader());
+
+      URL url = ResourceUtil.getResource(tipLoader, "/tips/", tip.getFileName());
 
       if (url == null) {
-        setCantReadText(browser, tipPath);
+        setCantReadText(browser, tip);
         return;
       }
 
       StringBuffer text = new StringBuffer(ResourceUtil.loadText(url));
       updateShortcuts(text);
-      updateImages(text, providerClass);
+      updateImages(text, tipLoader);
       String replaced = text.toString().replace("&productName;", ApplicationNamesInfo.getInstance().getFullProductName());
       replaced = replaced.replace("&majorVersion;", ApplicationInfo.getInstance().getMajorVersion());
       replaced = replaced.replace("&minorVersion;", ApplicationInfo.getInstance().getMinorVersion());
@@ -75,11 +93,11 @@ public class TipUIUtil {
       browser.read(new StringReader(replaced), url);
     }
     catch (IOException e) {
-      setCantReadText(browser, tipPath);
+      setCantReadText(browser, tip);
     }
   }
 
-  private static void setCantReadText(JEditorPane browser, String missingFile) {
+  private static void setCantReadText(JEditorPane browser, TipAndTrickBean missingFile) {
     try {
       browser.read(new StringReader(
         IdeBundle.message("error.unable.to.read.tip.of.the.day", missingFile, ApplicationNamesInfo.getInstance().getFullProductName())), null);
@@ -88,7 +106,7 @@ public class TipUIUtil {
     }
   }
 
-  private static void updateImages(StringBuffer text, Class providerClass) {
+  private static void updateImages(StringBuffer text, ClassLoader tipLoader) {
     final boolean dark = UIUtil.isUnderDarcula();
     final boolean retina = UIUtil.isRetina();
 //    if (!dark && !retina) {
@@ -109,7 +127,7 @@ public class TipUIUtil {
         String path = img.substring(srcIndex + 5, endIndex);
         if (!path.endsWith("_dark") && !path.endsWith("@2x")) {
           path += suffix + ".png";
-          URL url = ResourceUtil.getResource(providerClass, "/tips/", path);
+          URL url = ResourceUtil.getResource(tipLoader, "/tips/", path);
           if (url != null) {
             String newImgTag = "<img src=\"" + path + "\" ";
             if (retina) {
diff --git a/platform/platform-resources/src/META-INF/PlatformExtensionPoints.xml b/platform/platform-resources/src/META-INF/PlatformExtensionPoints.xml
index 4ab86f41ee1b..eaff367e3eb1 100644
--- a/platform/platform-resources/src/META-INF/PlatformExtensionPoints.xml
+++ b/platform/platform-resources/src/META-INF/PlatformExtensionPoints.xml
@@ -215,5 +215,6 @@
     </extensionPoint>
 
     <extensionPoint qualifiedName="org.jetbrains.urlOpener" interface="com.intellij.ide.browsers.UrlOpener"/>
+    <extensionPoint name="tipAndTrick" beanClass="com.intellij.ide.util.TipAndTrickBean"/>
   </extensionPoints>
 </idea-plugin>
diff --git a/platform/util/src/com/intellij/util/ResourceUtil.java b/platform/util/src/com/intellij/util/ResourceUtil.java
index 469e79d8b7e9..19aba6368d78 100644
--- a/platform/util/src/com/intellij/util/ResourceUtil.java
+++ b/platform/util/src/com/intellij/util/ResourceUtil.java
@@ -38,6 +38,10 @@ public class ResourceUtil {
   }
 
   public static URL getResource(@NotNull Class loaderClass, @NonNls @NotNull String basePath, @NonNls @NotNull String fileName) {
+    return getResource(loaderClass.getClassLoader(), basePath, fileName);
+  }
+
+  public static URL getResource(@NotNull ClassLoader loaderClass, @NonNls @NotNull String basePath, @NonNls @NotNull String fileName) {
     if (basePath.endsWith("/")) basePath = basePath.substring(0, basePath.length() - 1);
 
     final List<String> bundles = calculateBundleNames(basePath, Locale.getDefault());
diff --git a/python/resources/tips/tips.xml b/python/resources/tips/tips.xml
deleted file mode 100644
index 5ef93412ac62..000000000000
--- a/python/resources/tips/tips.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-<tips>
-  <tip file="Welcome.html"/>
-  <tip file="MultipleProjects.html"/>
-  <tip file="GoToClass.html"/>
-  <tip file="CodeCompletion.html"/>
-  <tip file="ClassNameCompletion.html"/>
-  <tip file="FindUsages.html"/>
-  <tip file="QuickJavaDoc.html"/>
-  <tip file="GoToDeclaration.html"/>
-  <tip file="FileStructurePopup.html"/>
-  <tip file="Rename.html"/>
-  <tip file="TabInLookups.html"/>
-  <tip file="TabInEditorClose.html"/>
-  <tip file="SelectIn.html"/>
-  <tip file="SpeedSearch.html"/>
-  <tip file="Escape.html"/>
-  <tip file="CtrlW.html"/>
-  <tip file="ExtractVariable.html"/>
-  <tip file="CtrlD.html"/>
-  <tip file="MoveUpDown.html"/>
-  <tip file="JoinLines.html"/>
-  <tip file="ParameterInfo.html"/>
-  <tip file="JumpToLastEdit.html"/>
-  <tip file="HighlightUsagesInFile.html"/>
-  <tip file="LocalVCS.html"/>
-  <tip file="RecentFiles.html"/>
-  <tip file="MethodSeparators.html"/>
-  <tip file="CodeCompletionMiddle.html"/>
-  <tip file="MethodUpDown.html"/>
-  <tip file="ClipboardStack.html"/>
-  <tip file="QuickJavaDocInLookups.html"/>
-  <tip file="OverrideImplementMethods.html"/>
-  <tip file="MenuItemsDescriptions.html"/>
-  <tip file="GoToSymbol.html"/>
-  <tip file="RecentChanges.html"/>
-  <tip file="ImageFileCompletion.html"/>
-  <tip file="QuickSwitchScheme.html"/>
-  <tip file="CamelPrefixesInNavigationPopups.html"/>
-  <tip file="ColumnSelection.html"/>
-  <tip file="PyColorFiles.html"/>
-  <tip file="CopyWithNoSelection.html"/>
-  <tip file="MoveToChangelist.html"/>
-  <tip file="moveFileToChangelist.html"/>
-  <tip file="ShowUsages.html"/>
-  <tip file="GoToAction.html"/>
-  <tip file="GoToInspection.html"/>
-  <tip file="SearchInSettings.html"/>
-  <tip file="SelectRunDebugConfiguration.html"/>
-  <tip file="ShowAppliedStyles.html"/>
-  <tip file="ImagesLookup.html"/>
-  <tip file="RenameCssSelector.html"/>
-  <tip file="ColorEditingInCss.html"/>
-  <tip file="Spellchecker.html"/>
-  <tip file="SpellcheckerDictionaries.html"/>
-  <tip file="TagNameCompletion.html"/>
-  <tip file="WildcardsInNavigationPopups.html"/>
-  <tip file="VcsQuickList.html"/>
-  <tip file="Comment.html"/>
-  <tip file="NavBar.html"/>
-  <tip file="ChangesView.html"/>
-  <tip file="Surround.html"/>
-  <tip file="Consoles.html"/>
-  <tip file="ConsolesCodeCompletion.html"/>
-  <tip file="ConsolesHistory.html"/>
-  <tip file="QuickFixRightArrow.html"/>
-  <tip file="NavigateToFilePath.html"/>
-  <tip file="IssueNavigation.html"/>
-  <tip file="Managepy.html"/>
-  <tip file="Templates.html"/>
-  <tip file="Switcher.html"/>
-  <tip file="DragToOpen.html"/>
-  <tip file="CloseOthers.html"/>
-  <tip file="EnterDirectoryInGotoFile.html"/>
-  <tip file="GotoLineInFile.html"/>
-  <tip file="LineEndings.html"/>
-  <tip file="LineEndingsFolder.html"/>
-  <tip file="HierarchyBrowser.html"/>
-  <tip file="ShowHideSideBars.html"/>
-  <tip file="ExcludeFromProject.html"/>
-  <tip file="CodeCompletionNoShift.html"/>
-  <tip file="CommitCtrlK.html"/>
-  <tip file="FindReplaceToggle.html"/>
-  <tip file="ScopesInTODO.html"/>
-  <tip file="PreviewTODO.html"/>
-  <tip file="SelectTasks.html"/>
-  <tip file="RunConfigFolders.html"/>
-  <tip file="LiveTemplatesDjango.html"/>
-  <tip file="LiveTemplates.html"/>
-  <tip file="SpeedSearchinLiveTemplates.html"/>
-  <tip file="LaunchConsole.html"/>
-  <tip file="Interpreter.html"/>
-  <tip file="RemoteInterpreter.html"/>
-  <tip file="BreakpointSpeedmenu.html"/>
-  <tip file="BuiltInServer.html"/>
-  <tip file="ConfiguringTerminal.html"/>
-  <tip file="Terminal.html"/>
-  <tip file="SearchEverywhere.html"/>
-  <tip file="WideScreen.html"/>
-  <tip file="WordCompletion.html"/>
-  <tip file="Reopen.html"/>
-  <tip file="Emmet.html"/>
-  <tip file="RefactorThis.html"/>
-  <tip file="ToolWindowsQuickAccess.html"/>
-  <tip file="CamelHumpsInCodeCompletion.html"/>
-  <tip file="CancelByControlArrows.html"/>
-  <tip file="ChangeSorting.html"/>
-  <tip file="CheckRegExp.html"/>
-  <tip file="CtrlDotInLookups.html"/>
-  <tip file="FinishByControlEnter.html"/>
-  <tip file="HorizontalScrolling.html"/>
-</tips>
-
diff --git a/python/src/META-INF/IdeTipsAndTricks.xml b/python/src/META-INF/IdeTipsAndTricks.xml
new file mode 100644
index 000000000000..41a5febdab94
--- /dev/null
+++ b/python/src/META-INF/IdeTipsAndTricks.xml
@@ -0,0 +1,113 @@
+<idea-plugin version="2">
+  <extensions defaultExtensionNs="com.intellij">
+    <tipAndTrick file="Welcome.html"/>
+    <tipAndTrick file="MultipleProjects.html"/>
+    <tipAndTrick file="GoToClass.html"/>
+    <tipAndTrick file="CodeCompletion.html"/>
+    <tipAndTrick file="ClassNameCompletion.html"/>
+    <tipAndTrick file="FindUsages.html"/>
+    <tipAndTrick file="QuickJavaDoc.html"/>
+    <tipAndTrick file="GoToDeclaration.html"/>
+    <tipAndTrick file="FileStructurePopup.html"/>
+    <tipAndTrick file="Rename.html"/>
+    <tipAndTrick file="TabInLookups.html"/>
+    <tipAndTrick file="TabInEditorClose.html"/>
+    <tipAndTrick file="SelectIn.html"/>
+    <tipAndTrick file="SpeedSearch.html"/>
+    <tipAndTrick file="Escape.html"/>
+    <tipAndTrick file="CtrlW.html"/>
+    <tipAndTrick file="ExtractVariable.html"/>
+    <tipAndTrick file="CtrlD.html"/>
+    <tipAndTrick file="MoveUpDown.html"/>
+    <tipAndTrick file="JoinLines.html"/>
+    <tipAndTrick file="ParameterInfo.html"/>
+    <tipAndTrick file="JumpToLastEdit.html"/>
+    <tipAndTrick file="HighlightUsagesInFile.html"/>
+    <tipAndTrick file="LocalVCS.html"/>
+    <tipAndTrick file="RecentFiles.html"/>
+    <tipAndTrick file="MethodSeparators.html"/>
+    <tipAndTrick file="CodeCompletionMiddle.html"/>
+    <tipAndTrick file="MethodUpDown.html"/>
+    <tipAndTrick file="ClipboardStack.html"/>
+    <tipAndTrick file="QuickJavaDocInLookups.html"/>
+    <tipAndTrick file="OverrideImplementMethods.html"/>
+    <tipAndTrick file="MenuItemsDescriptions.html"/>
+    <tipAndTrick file="GoToSymbol.html"/>
+    <tipAndTrick file="RecentChanges.html"/>
+    <tipAndTrick file="ImageFileCompletion.html"/>
+    <tipAndTrick file="QuickSwitchScheme.html"/>
+    <tipAndTrick file="CamelPrefixesInNavigationPopups.html"/>
+    <tipAndTrick file="ColumnSelection.html"/>
+    <tipAndTrick file="PyColorFiles.html"/>
+    <tipAndTrick file="CopyWithNoSelection.html"/>
+    <tipAndTrick file="MoveToChangelist.html"/>
+    <tipAndTrick file="moveFileToChangelist.html"/>
+    <tipAndTrick file="ShowUsages.html"/>
+    <tipAndTrick file="GoToAction.html"/>
+    <tipAndTrick file="GoToInspection.html"/>
+    <tipAndTrick file="SearchInSettings.html"/>
+    <tipAndTrick file="SelectRunDebugConfiguration.html"/>
+    <tipAndTrick file="ShowAppliedStyles.html"/>
+    <tipAndTrick file="ImagesLookup.html"/>
+    <tipAndTrick file="RenameCssSelector.html"/>
+    <tipAndTrick file="ColorEditingInCss.html"/>
+    <tipAndTrick file="Spellchecker.html"/>
+    <tipAndTrick file="SpellcheckerDictionaries.html"/>
+    <tipAndTrick file="TagNameCompletion.html"/>
+    <tipAndTrick file="WildcardsInNavigationPopups.html"/>
+    <tipAndTrick file="VcsQuickList.html"/>
+    <tipAndTrick file="Comment.html"/>
+    <tipAndTrick file="NavBar.html"/>
+    <tipAndTrick file="ChangesView.html"/>
+    <tipAndTrick file="Surround.html"/>
+    <tipAndTrick file="Consoles.html"/>
+    <tipAndTrick file="ConsolesCodeCompletion.html"/>
+    <tipAndTrick file="ConsolesHistory.html"/>
+    <tipAndTrick file="QuickFixRightArrow.html"/>
+    <tipAndTrick file="NavigateToFilePath.html"/>
+    <tipAndTrick file="IssueNavigation.html"/>
+    <tipAndTrick file="Managepy.html"/>
+    <tipAndTrick file="Templates.html"/>
+    <tipAndTrick file="Switcher.html"/>
+    <tipAndTrick file="DragToOpen.html"/>
+    <tipAndTrick file="CloseOthers.html"/>
+    <tipAndTrick file="EnterDirectoryInGotoFile.html"/>
+    <tipAndTrick file="GotoLineInFile.html"/>
+    <tipAndTrick file="LineEndings.html"/>
+    <tipAndTrick file="LineEndingsFolder.html"/>
+    <tipAndTrick file="HierarchyBrowser.html"/>
+    <tipAndTrick file="ShowHideSideBars.html"/>
+    <tipAndTrick file="ExcludeFromProject.html"/>
+    <tipAndTrick file="CodeCompletionNoShift.html"/>
+    <tipAndTrick file="CommitCtrlK.html"/>
+    <tipAndTrick file="FindReplaceToggle.html"/>
+    <tipAndTrick file="ScopesInTODO.html"/>
+    <tipAndTrick file="PreviewTODO.html"/>
+    <tipAndTrick file="SelectTasks.html"/>
+    <tipAndTrick file="RunConfigFolders.html"/>
+    <tipAndTrick file="LiveTemplatesDjango.html"/>
+    <tipAndTrick file="LiveTemplates.html"/>
+    <tipAndTrick file="SpeedSearchinLiveTemplates.html"/>
+    <tipAndTrick file="LaunchConsole.html"/>
+    <tipAndTrick file="Interpreter.html"/>
+    <tipAndTrick file="RemoteInterpreter.html"/>
+    <tipAndTrick file="BreakpointSpeedmenu.html"/>
+    <tipAndTrick file="BuiltInServer.html"/>
+    <tipAndTrick file="ConfiguringTerminal.html"/>
+    <tipAndTrick file="Terminal.html"/>
+    <tipAndTrick file="SearchEverywhere.html"/>
+    <tipAndTrick file="WideScreen.html"/>
+    <tipAndTrick file="WordCompletion.html"/>
+    <tipAndTrick file="Reopen.html"/>
+    <tipAndTrick file="Emmet.html"/>
+    <tipAndTrick file="RefactorThis.html"/>
+    <tipAndTrick file="ToolWindowsQuickAccess.html"/>
+    <tipAndTrick file="CamelHumpsInCodeCompletion.html"/>
+    <tipAndTrick file="CancelByControlArrows.html"/>
+    <tipAndTrick file="ChangeSorting.html"/>
+    <tipAndTrick file="CheckRegExp.html"/>
+    <tipAndTrick file="CtrlDotInLookups.html"/>
+    <tipAndTrick file="FinishByControlEnter.html"/>
+    <tipAndTrick file="HorizontalScrolling.html"/>
+  </extensions>
+</idea-plugin>
\ No newline at end of file
diff --git a/python/src/META-INF/pycharm-core.xml b/python/src/META-INF/pycharm-core.xml
index a232079090a0..dc95bd030198 100644
--- a/python/src/META-INF/pycharm-core.xml
+++ b/python/src/META-INF/pycharm-core.xml
@@ -1,5 +1,6 @@
 <idea-plugin version="2" xmlns:xi="http://www.w3.org/2001/XInclude">
   <!-- Components and extensions declared in this file work ONLY in PyCharm, not in Python plugin. -->
+  <xi:include href="/META-INF/IdeTipsAndTricks.xml" xpointer="xpointer(/idea-plugin/*)"/>
   <xi:include href="/META-INF/PlatformLangPlugin.xml" xpointer="xpointer(/idea-plugin/*)"/>
   <xi:include href="/META-INF/XmlPlugin.xml" xpointer="xpointer(/idea-plugin/*)"/>
   <xi:include href="/META-INF/ImagesPlugin.xml" xpointer="xpointer(/idea-plugin/*)">
diff --git a/resources-en/src/tips/UmlClassDiagram.html b/resources-en/src/tips/UmlClassDiagram.html
deleted file mode 100644
index fba09a6258d8..000000000000
Binary files a/resources-en/src/tips/UmlClassDiagram.html and /dev/null differ
diff --git a/resources-en/src/tips/images/umlClassDiagram.png b/resources-en/src/tips/images/umlClassDiagram.png
deleted file mode 100644
index b5d759e0c2a8..000000000000
Binary files a/resources-en/src/tips/images/umlClassDiagram.png and /dev/null differ
diff --git a/resources-en/src/tips/tips.xml b/resources-en/src/tips/tips.xml
deleted file mode 100644
index 503f38594771..000000000000
--- a/resources-en/src/tips/tips.xml
+++ /dev/null
@@ -1,166 +0,0 @@
-<tips>                                      <!--covered items are included to ProductivityFeaturesRegistry.xml -->
-  <!--
-  <tip file="NotReadyYet.html"/>
-  -->
-  <tip file="Welcome.html"/>
-  <tip file="GoToClass.html"/>
-  <!--covered-->
-  <tip file="CodeCompletion.html"/>
-  <!--covered-->
-  <tip file="FindUsages.html"/>
-  <tip file="QuickJavaDoc.html"/>
-  <!--covered-->
-  <tip file="GoToDeclaration.html"/>
-  <!--covered-->
-  <tip file="FileStructurePopup.html"/>
-  <!--covered-->
-  <tip file="Rename.html"/>
-  <tip file="OverrideImplementMethods.html"/>
-  <!--covered-->
-  <tip file="SmartTypeCompletion.html"/>
-  <!--covered-->
-  <tip file="TabInLookups.html"/>
-  <!--covered-->
-  <tip file="TabInEditorClose.html"/>
-  <tip file="AltInsertInEditor.html"/>
-  <!--<tip file="ClosingTabsWithMiddleMouse.html"/>-->
-  <tip file="SelectIn.html"/>
-  <!--covered-->
-  <tip file="SpeedSearch.html"/>
-  <!--covered-->
-  <tip file="Escape.html"/>
-  <tip file="SurroundWith.html"/>
-  <!--covered-->
-  <tip file="SmartTypeAfterNew.html"/>
-  <!--covered-->
-  <tip file="GoToImplementation.html"/>
-  <!--covered-->
-  <tip file="CtrlW.html"/>
-  <!--covered-->
-  <tip file="IntroduceVariable.html"/>
-  <!--covered-->
-  <tip file="CommentCode.html"/>
-  <!--covered-->
-  <!--<tip file="DisableBulb.html"/>-->
-  <tip file="ExternalJavaDoc.html"/>
-  <!--covered-->
-  <tip file="SmartTypeCasting.html"/>
-  <!--covered-->
-  <tip file="CtrlD.html"/>
-  <tip file="LiveTemplates.html"/>
-  <tip file="VariableNameCompletion.html"/>
-  <!--covered-->
-  <tip file="ParameterInfo.html"/>
-  <tip file="JumpToLastEdit.html"/>
-  <tip file="HighlightUsagesInFile.html"/>
-  <tip file="LayoutCode.html"/>
-  <tip file="LocalVCS.html"/>
-  <tip file="ContextInfo.html"/>
-  <tip file="RecentFiles.html"/>
-  <!--covered-->
-  <tip file="NextPrevError.html"/>
-  <tip file="InsertLiveTemplate.html"/>
-  <tip file="MethodSeparators.html"/>
-  <tip file="CodeCompletionMiddle.html"/>
-  <!--covered-->
-  <tip file="MethodUpDown.html"/>
-  <tip file="JoinLines.html"/>
-  <tip file="CopyClass.html"/>
-  <!--covered-->
-  <tip file="ClipboardStack.html"/>
-  <tip file="HierarchyBrowser.html"/>
-  <tip file="BreakpointSpeedmenu.html"/>
-  <tip file="EvaluateExpressionInEditor.html"/>
-  <tip file="WordCompletion.html"/>
-  <tip file="QuickJavaDocInLookups.html"/>
-  <!--covered-->
-  <tip file="DotEtcInLookups.html"/>
-  <!--covered-->
-  <tip file="MenuItemsDescriptions.html"/>
-  <tip file="WildcardsInNavigationPopups.html"/>
-  <tip file="MoveInnerToUpper.html"/>
-  <tip file="IntroduceVariableIncompleteCode.html"/>
-  <!--<tip file="CreateTargetTag.html"/>-->
-  <tip file="GoToSymbol.html"/>
-  <tip file="RecentChanges.html"/>
-  <!--covered-->
-  <tip file="ImageFileCompletion.html"/>
-  <tip file="CreatePropertyTag.html"/>
-  <tip file="QuickSwitchScheme.html"/>
-  <!--covered-->
-  <tip file="CompleteStatement.html"/>
-  <tip file="CamelPrefixesInNavigationPopups.html"/>
-  <tip file="CtrlShiftI.html"/>
-  <!--covered-->
-  <tip file="CompletionInHTML.html"/>
-  <tip file="CopyPasteReference.html"/>
-  <tip file="MoveUpDown.html"/>
-  <tip file="SelectRunDebugConfiguration.html"/>
-  <tip file="CtrlShiftIForLookup.html"/>
-  <!--covered-->
-  <tip file="PropertiesCompletion.html"/>
-  <tip file="ShowAppliedStyles.html"/>
-  <tip file="ImagesLookup.html"/>
-  <tip file="RenameCssSelector.html"/>
-  <tip file="NavBar.html"/>
-  <tip file="ChangesView.html"/>
-  <tip file="Antivirus.html"/>
-  <tip file="MavenQuickOpen.html"/>
-  <tip file="MoveToChangelist.html"/>
-  <tip file="EclipseQuickOpen.html"/>
-  <tip file="ShowUsages.html"/>
-  <tip file="GoToAction.html"/>
-  <tip file="GoToInspection.html"/>
-  <tip file="SearchInSettings.html"/>
-  <tip file="CompleteMethod.html"/>
-  <tip file="HighlightImplements.html"/>
-  <tip file="RecentSearch.html"/>
-  <tip file="CodeCompletionInSearch.html"/>
-  <tip file="HighlightMethodExitPoint.html"/>
-  <tip file="HighlightThrows.html"/>
-  <tip file="QuickFixRightArrow.html"/>
-  <tip file="NavigateToFilePath.html"/>
-  <tip file="IssueNavigation.html"/>
-  <tip file="UmlClassDiagram.html"/>
-  <tip file="ColorEditingInCss.html"/>
-  <tip file="CreateTestIntentionAction.html"/>
-  <tip file="ColumnSelection.html"/>
-  <tip file="ColorFiles.html"/>
-  <tip file="CopyWithNoSelection.html"/>
-  <tip file="moveFileToChangelist.html"/>
-  <tip file="Spellchecker.html"/>
-  <tip file="SpellcheckerDictionaries.html"/>
-  <tip file="VcsQuickList.html"/>
-  <tip file="Switcher.html"/>
-  <tip file="DragToOpen.html"/>
-  <tip file="CloseOthers.html"/>
-  <tip file="EnterDirectoryInGotoFile.html"/>
-  <tip file="GotoLineInFile.html"/>
-  <tip file="AnnotationsAndDiffs.html"/>
-  <tip file="DirDiff.html"/>
-  <tip file="JarDiff.html"/>
-  <tip file="ShowHideSideBars.html"/>
-  <tip file="ExcludeFromProject.html"/>
-  <tip file="CodeCompletionNoShift.html"/>
-  <tip file="CommitCtrlK.html"/>
-  <tip file="FindReplaceToggle.html"/>
-  <tip file="ScopesInTODO.html"/>
-  <tip file="PreviewTODO.html"/>
-  <tip file="FixDocComment.html"/>
-  <tip file="SelectTasks.html"/>
-  <tip file="RunConfigFolders.html"/>
-  <tip file="SpeedSearchinLiveTemplates.html"/>
-  <tip file="EditRegExp.html"/>
-
-  <tip file="Emmet.html"/>
-  <tip file="EscapeCharactersInResourceBundle.html"/>
-  <tip file="LineEndings.html"/>
-  <tip file="LineEndingsFolder.html"/>
-  <tip file="RefactorThis.html"/>
-  <tip file="FavoritesToolWindow1.html"/>
-  <tip file="FavoritesToolWindow2.html"/>
-
-  <tip file="WideScreen.html"/>
-  <tip file="Terminal.html"/>
-  <tip file="ConfiguringTerminal.html"/>
-</tips>
diff --git a/resources/src/META-INF/IdeTipsAndTricks.xml b/resources/src/META-INF/IdeTipsAndTricks.xml
new file mode 100644
index 000000000000..c70dba109cf4
--- /dev/null
+++ b/resources/src/META-INF/IdeTipsAndTricks.xml
@@ -0,0 +1,139 @@
+<idea-plugin version="2">
+  <extensions defaultExtensionNs="com.intellij">
+    <!--
+    <tipAndTrick file="NotReadyYet.html"/>
+    -->
+    <tipAndTrick file="Welcome.html"/>
+    <tipAndTrick file="GoToClass.html" feature-id="navigation.popup.class"/>
+    <tipAndTrick file="CodeCompletion.html" feature-id="editing.completion.basic"/>
+    <tipAndTrick file="FindUsages.html"/>
+    <tipAndTrick file="QuickJavaDoc.html" feature-id="codeassists.quickjavadoc"/>
+    <tipAndTrick file="GoToDeclaration.html" feature-id="navigation.goto.declaration"/>
+    <tipAndTrick file="FileStructurePopup.html" feature-id="navigation.popup.file.structure"/>
+    <tipAndTrick file="Rename.html"/>
+    <tipAndTrick file="OverrideImplementMethods.html" feature-id="codeassists.overrideimplement"/>
+    <tipAndTrick file="SmartTypeCompletion.html" feature-id="editing.completion.smarttype.general"/>
+    <tipAndTrick file="TabInLookups.html" feature-id="editing.completion.replace"/>
+    <tipAndTrick file="TabInEditorClose.html"/>
+    <tipAndTrick file="AltInsertInEditor.html"/>
+    <!--<tipAndTrick file="ClosingTabsWithMiddleMouse.html"/>-->
+    <tipAndTrick file="SelectIn.html" feature-id="navigation.select.in"/>
+    <tipAndTrick file="SpeedSearch.html" feature-id="ui.tree.speedsearch"/>
+    <tipAndTrick file="Escape.html"/>
+    <tipAndTrick file="SurroundWith.html" feature-id="codeassists.surroundwith.expression"/>
+    <tipAndTrick file="SmartTypeAfterNew.html" feature-id="editing.completion.smarttype.afternew"/>
+    <tipAndTrick file="GoToImplementation.html" feature-id="navigation.goto.implementation"/>
+    <tipAndTrick file="CtrlW.html" feature-id="editing.select.word"/>
+    <tipAndTrick file="IntroduceVariable.html" feature-id="refactoring.introduceVariable"/>
+    <tipAndTrick file="CommentCode.html" feature-id="codeassists.comment.line"/>
+    <!--<tipAndTrick file="DisableBulb.html"/>-->
+    <tipAndTrick file="ExternalJavaDoc.html" feature-id="codeassists.javadoc.external"/>
+    <tipAndTrick file="SmartTypeCasting.html" feature-id="editing.completion.smarttype.casting"/>
+    <tipAndTrick file="CtrlD.html"/>
+    <tipAndTrick file="LiveTemplates.html"/>
+    <tipAndTrick file="VariableNameCompletion.html" feature-id="editing.completion.variable.name"/>
+    <tipAndTrick file="ParameterInfo.html"/>
+    <tipAndTrick file="JumpToLastEdit.html"/>
+    <tipAndTrick file="HighlightUsagesInFile.html"/>
+    <tipAndTrick file="LayoutCode.html"/>
+    <tipAndTrick file="LocalVCS.html"/>
+    <tipAndTrick file="ContextInfo.html"/>
+    <tipAndTrick file="RecentFiles.html" feature-id="navigation.recent.files"/>
+    <tipAndTrick file="NextPrevError.html"/>
+    <tipAndTrick file="InsertLiveTemplate.html"/>
+    <tipAndTrick file="MethodSeparators.html"/>
+    <tipAndTrick file="CodeCompletionMiddle.html"/>
+    <tipAndTrick file="MethodUpDown.html"/>
+    <tipAndTrick file="JoinLines.html"/>
+    <tipAndTrick file="CopyClass.html" feature-id="refactoring.copyClass"/>
+    <tipAndTrick file="ClipboardStack.html"/>
+    <tipAndTrick file="HierarchyBrowser.html"/>
+    <tipAndTrick file="BreakpointSpeedmenu.html"/>
+    <tipAndTrick file="EvaluateExpressionInEditor.html"/>
+    <tipAndTrick file="WordCompletion.html"/>
+    <tipAndTrick file="QuickJavaDocInLookups.html" feature-id="codeassists.quickjavadoc.lookup"/>
+    <tipAndTrick file="DotEtcInLookups.html" feature-id="editing.completion.finishByDotEtc"/>
+    <tipAndTrick file="MenuItemsDescriptions.html"/>
+    <tipAndTrick file="WildcardsInNavigationPopups.html"/>
+    <tipAndTrick file="MoveInnerToUpper.html"/>
+    <tipAndTrick file="IntroduceVariableIncompleteCode.html"/>
+    <!--<tipAndTrick file="CreateTargetTag.html"/>-->
+    <tipAndTrick file="GoToSymbol.html" feature-id="navigation.popup.symbol"/>
+    <tipAndTrick file="RecentChanges.html" feature-id="ui.recentchanges"/>
+    <tipAndTrick file="ImageFileCompletion.html"/>
+    <tipAndTrick file="CreatePropertyTag.html"/>
+    <tipAndTrick file="QuickSwitchScheme.html" feature-id="ui.scheme.quickswitch"/>
+    <tipAndTrick file="CompleteStatement.html"/>
+    <tipAndTrick file="CamelPrefixesInNavigationPopups.html"/>
+    <tipAndTrick file="CtrlShiftI.html" feature-id="codeassists.quickdefinition"/>
+    <tipAndTrick file="CompletionInHTML.html"/>
+    <tipAndTrick file="CopyPasteReference.html"/>
+    <tipAndTrick file="MoveUpDown.html"/>
+    <tipAndTrick file="SelectRunDebugConfiguration.html"/>
+    <tipAndTrick file="CtrlShiftIForLookup.html" feature-id="codeassists.quickdefinition.lookup"/>
+    <tipAndTrick file="PropertiesCompletion.html"/>
+    <tipAndTrick file="ShowAppliedStyles.html"/>
+    <tipAndTrick file="ImagesLookup.html"/>
+    <tipAndTrick file="RenameCssSelector.html"/>
+    <tipAndTrick file="NavBar.html"/>
+    <tipAndTrick file="ChangesView.html"/>
+    <tipAndTrick file="Antivirus.html"/>
+    <tipAndTrick file="MavenQuickOpen.html"/>
+    <tipAndTrick file="MoveToChangelist.html"/>
+    <tipAndTrick file="EclipseQuickOpen.html"/>
+    <tipAndTrick file="ShowUsages.html"/>
+    <tipAndTrick file="GoToAction.html"/>
+    <tipAndTrick file="GoToInspection.html"/>
+    <tipAndTrick file="SearchInSettings.html"/>
+    <tipAndTrick file="CompleteMethod.html"/>
+    <tipAndTrick file="HighlightImplements.html"/>
+    <tipAndTrick file="RecentSearch.html"/>
+    <tipAndTrick file="CodeCompletionInSearch.html"/>
+    <tipAndTrick file="HighlightMethodExitPoint.html"/>
+    <tipAndTrick file="HighlightThrows.html"/>
+    <tipAndTrick file="QuickFixRightArrow.html"/>
+    <tipAndTrick file="NavigateToFilePath.html"/>
+    <tipAndTrick file="IssueNavigation.html"/>
+    <tipAndTrick file="ColorEditingInCss.html"/>
+    <tipAndTrick file="CreateTestIntentionAction.html"/>
+    <tipAndTrick file="ColumnSelection.html"/>
+    <tipAndTrick file="ColorFiles.html"/>
+    <tipAndTrick file="CopyWithNoSelection.html"/>
+    <tipAndTrick file="moveFileToChangelist.html"/>
+    <tipAndTrick file="Spellchecker.html"/>
+    <tipAndTrick file="SpellcheckerDictionaries.html"/>
+    <tipAndTrick file="VcsQuickList.html"/>
+    <tipAndTrick file="Switcher.html"/>
+    <tipAndTrick file="DragToOpen.html"/>
+    <tipAndTrick file="CloseOthers.html"/>
+    <tipAndTrick file="EnterDirectoryInGotoFile.html"/>
+    <tipAndTrick file="GotoLineInFile.html"/>
+    <tipAndTrick file="AnnotationsAndDiffs.html"/>
+    <tipAndTrick file="DirDiff.html"/>
+    <tipAndTrick file="JarDiff.html"/>
+    <tipAndTrick file="ShowHideSideBars.html"/>
+    <tipAndTrick file="ExcludeFromProject.html"/>
+    <tipAndTrick file="CodeCompletionNoShift.html"/>
+    <tipAndTrick file="CommitCtrlK.html"/>
+    <tipAndTrick file="FindReplaceToggle.html"/>
+    <tipAndTrick file="ScopesInTODO.html"/>
+    <tipAndTrick file="PreviewTODO.html"/>
+    <tipAndTrick file="FixDocComment.html"/>
+    <tipAndTrick file="SelectTasks.html"/>
+    <tipAndTrick file="RunConfigFolders.html"/>
+    <tipAndTrick file="SpeedSearchinLiveTemplates.html"/>
+    <tipAndTrick file="EditRegExp.html"/>
+
+    <tipAndTrick file="Emmet.html"/>
+    <tipAndTrick file="EscapeCharactersInResourceBundle.html"/>
+    <tipAndTrick file="LineEndings.html"/>
+    <tipAndTrick file="LineEndingsFolder.html"/>
+    <tipAndTrick file="RefactorThis.html"/>
+    <tipAndTrick file="FavoritesToolWindow1.html"/>
+    <tipAndTrick file="FavoritesToolWindow2.html"/>
+
+    <tipAndTrick file="WideScreen.html"/>
+    <tipAndTrick file="Terminal.html"/>
+    <tipAndTrick file="ConfiguringTerminal.html"/>
+  </extensions>
+</idea-plugin>
\ No newline at end of file
diff --git a/resources/src/META-INF/IdeaPlugin.xml b/resources/src/META-INF/IdeaPlugin.xml
index 88c827c78da6..e6d8f987a166 100644
--- a/resources/src/META-INF/IdeaPlugin.xml
+++ b/resources/src/META-INF/IdeaPlugin.xml
@@ -2,6 +2,7 @@
   <id>com.intellij</id>
   <name>IDEA CORE</name>
 
+  <xi:include href="/META-INF/IdeTipsAndTricks.xml" xpointer="xpointer(/idea-plugin/*)"/>
   <xi:include href="/idea/RichPlatformPlugin.xml" xpointer="xpointer(/idea-plugin/*)"/>
   <module value="com.intellij.modules.java"/>
   <module value="com.intellij.modules.all"/>