diff --git a/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/JetCoreEnvironment.java b/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/JetCoreEnvironment.java
index 684d0a9c6e6..a0b447897e3 100644
--- a/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/JetCoreEnvironment.java
+++ b/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/JetCoreEnvironment.java
@@ -35,6 +35,7 @@ import com.intellij.psi.PsiDocumentManager;
 import com.intellij.psi.PsiElementFinder;
 import com.intellij.psi.PsiFile;
 import com.intellij.psi.PsiManager;
+import com.intellij.psi.compiled.ClassFileDecompilers;
 import com.intellij.psi.impl.compiled.ClsCustomNavigationPolicy;
 import com.intellij.psi.impl.file.impl.JavaFileManager;
 import org.jetbrains.annotations.NotNull;
@@ -178,9 +179,11 @@ public class JetCoreEnvironment {
                 .getExtensionPoint(PsiElementFinder.EP_NAME)
                 .registerExtension(new JavaElementFinder(project, cliLightClassGenerationSupport));
 
-        // This extension point should be registered in JavaCoreApplicationEnvironment
+        // This extension points should be registered in JavaCoreApplicationEnvironment
         CoreApplicationEnvironment.registerExtensionPoint(Extensions.getRootArea(), ClsCustomNavigationPolicy.EP_NAME,
                                                           ClsCustomNavigationPolicy.class);
+        CoreApplicationEnvironment.registerExtensionPoint(Extensions.getRootArea(), ClassFileDecompilers.EP_NAME,
+                                                            ClassFileDecompilers.Decompiler.class);
 
         annotationsManager = new CoreExternalAnnotationsManager(project.getComponent(PsiManager.class));
         project.registerService(ExternalAnnotationsManager.class, annotationsManager);
diff --git a/idea/src/META-INF/plugin.xml b/idea/src/META-INF/plugin.xml
index 6059bb3cea2..011633d1b5d 100644
--- a/idea/src/META-INF/plugin.xml
+++ b/idea/src/META-INF/plugin.xml
@@ -6,7 +6,7 @@
   <version>@snapshot@</version>
   <vendor url="http://www.jetbrains.com">JetBrains Inc.</vendor>
 
-  <idea-version since-build="134.0" until-build="134.1010"/>
+  <idea-version since-build="134.1160" until-build="134.1170"/>
 
   <depends optional="true" config-file="junit.xml">JUnit</depends>
   <depends optional="true" config-file="gradle.xml">org.jetbrains.plugins.gradle</depends>
diff --git a/idea/src/org/jetbrains/jet/plugin/k2jsrun/K2JSConfigurationSettings.java b/idea/src/org/jetbrains/jet/plugin/k2jsrun/K2JSConfigurationSettings.java
index dfe29f0dbe1..a8365885b25 100644
--- a/idea/src/org/jetbrains/jet/plugin/k2jsrun/K2JSConfigurationSettings.java
+++ b/idea/src/org/jetbrains/jet/plugin/k2jsrun/K2JSConfigurationSettings.java
@@ -16,7 +16,7 @@
 
 package org.jetbrains.jet.plugin.k2jsrun;
 
-import com.intellij.ide.browsers.BrowsersConfiguration;
+import com.intellij.ide.browsers.BrowserFamily;
 import com.intellij.ide.browsers.WebBrowserManager;
 import com.intellij.openapi.project.Project;
 import org.jetbrains.annotations.NotNull;
@@ -32,7 +32,7 @@ public final class K2JSConfigurationSettings {
     private boolean shouldOpenInBrowserAfterTranslation = false;
 
     @NotNull
-    private BrowsersConfiguration.BrowserFamily browserFamily = WebBrowserManager.getInstance().getActiveBrowsers().get(0).getFamily();
+    private BrowserFamily browserFamily = WebBrowserManager.getInstance().getActiveBrowsers().get(0).getFamily();
 
     public K2JSConfigurationSettings(@NotNull Project project) {
         String basePath = project.getBasePath();
@@ -44,11 +44,11 @@ public final class K2JSConfigurationSettings {
     }
 
     @NotNull
-    public BrowsersConfiguration.BrowserFamily getBrowserFamily() {
+    public BrowserFamily getBrowserFamily() {
         return browserFamily;
     }
 
-    public void setBrowserFamily(@NotNull BrowsersConfiguration.BrowserFamily browserFamily) {
+    public void setBrowserFamily(@NotNull BrowserFamily browserFamily) {
         this.browserFamily = browserFamily;
     }
 
diff --git a/idea/src/org/jetbrains/jet/plugin/k2jsrun/K2JSRunConfigurationEditor.java b/idea/src/org/jetbrains/jet/plugin/k2jsrun/K2JSRunConfigurationEditor.java
index 0cf6d262374..5d06c4834df 100644
--- a/idea/src/org/jetbrains/jet/plugin/k2jsrun/K2JSRunConfigurationEditor.java
+++ b/idea/src/org/jetbrains/jet/plugin/k2jsrun/K2JSRunConfigurationEditor.java
@@ -16,7 +16,7 @@
 
 package org.jetbrains.jet.plugin.k2jsrun;
 
-import com.intellij.ide.browsers.BrowsersConfiguration;
+import com.intellij.ide.browsers.BrowserFamily;
 import com.intellij.ide.browsers.WebBrowser;
 import com.intellij.ide.browsers.WebBrowserManager;
 import com.intellij.openapi.fileChooser.FileChooserDescriptor;
@@ -69,8 +69,8 @@ public final class K2JSRunConfigurationEditor extends SettingsEditor<K2JSRunConf
         K2JSConfigurationSettings settings = configuration.settings();
         settings.setPageToOpenFilePath(toSystemIndependentName(htmlChooseFile.getText()));
         Object item = browserComboBox.getSelectedItem();
-        if (item instanceof BrowsersConfiguration.BrowserFamily) {
-            settings.setBrowserFamily((BrowsersConfiguration.BrowserFamily)item);
+        if (item instanceof BrowserFamily) {
+            settings.setBrowserFamily((BrowserFamily) item);
         }
         settings.setGeneratedFilePath(toSystemIndependentName(generatedChooseFile.getText()));
         settings.setShouldOpenInBrowserAfterTranslation(openInBrowserCheckBox.isSelected());
@@ -142,9 +142,9 @@ public final class K2JSRunConfigurationEditor extends SettingsEditor<K2JSRunConf
         for (WebBrowser browser : WebBrowserManager.getInstance().getActiveBrowsers()) {
             browserComboBox.addItem(browser.getFamily());
         }
-        browserComboBox.setRenderer(new ListCellRendererWrapper<BrowsersConfiguration.BrowserFamily>() {
+        browserComboBox.setRenderer(new ListCellRendererWrapper<BrowserFamily>() {
             @Override
-            public void customize(JList list, BrowsersConfiguration.BrowserFamily family, int index, boolean selected, boolean hasFocus) {
+            public void customize(JList list, BrowserFamily family, int index, boolean selected, boolean hasFocus) {
                 if (family != null) {
                     setText(family.getName());
                     setIcon(family.getIcon());
diff --git a/idea/src/org/jetbrains/jet/plugin/k2jsrun/K2JSRunnerUtils.java b/idea/src/org/jetbrains/jet/plugin/k2jsrun/K2JSRunnerUtils.java
index 91e51c0ff79..2d41d488da3 100644
--- a/idea/src/org/jetbrains/jet/plugin/k2jsrun/K2JSRunnerUtils.java
+++ b/idea/src/org/jetbrains/jet/plugin/k2jsrun/K2JSRunnerUtils.java
@@ -18,7 +18,9 @@ package org.jetbrains.jet.plugin.k2jsrun;
 
 import com.intellij.execution.configurations.RunProfile;
 import com.intellij.execution.runners.ExecutionEnvironment;
-import com.intellij.ide.browsers.UrlOpener;
+import com.intellij.ide.browsers.BrowserLauncher;
+import com.intellij.ide.browsers.WebBrowser;
+import com.intellij.ide.browsers.WebBrowserManager;
 import com.intellij.openapi.compiler.CompilerPaths;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.module.ModuleManager;
@@ -81,7 +83,8 @@ public final class K2JSRunnerUtils {
         String filePath = configurationSettings.getPageToOpenFilePath();
         String url = VirtualFileManager.constructUrl(LocalFileSystem.PROTOCOL, filePath);
 
-        UrlOpener.launchBrowser(configurationSettings.getBrowserFamily(), url);
+        WebBrowser browser = WebBrowserManager.getInstance().findBrowser(configurationSettings.getBrowserFamily());
+        BrowserLauncher.getInstance().browse(url, browser);
     }
 
     @NotNull
diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/safeDelete/KotlinOverridingDialog.java b/idea/src/org/jetbrains/jet/plugin/refactoring/safeDelete/KotlinOverridingDialog.java
index 08f4ce8804b..e94e1643cbe 100644
--- a/idea/src/org/jetbrains/jet/plugin/refactoring/safeDelete/KotlinOverridingDialog.java
+++ b/idea/src/org/jetbrains/jet/plugin/refactoring/safeDelete/KotlinOverridingDialog.java
@@ -29,6 +29,7 @@ import com.intellij.ui.BooleanTableCellRenderer;
 import com.intellij.ui.ScrollPaneFactory;
 import com.intellij.ui.table.JBTable;
 import com.intellij.usageView.UsageInfo;
+import com.intellij.usages.UsageViewPresentation;
 import com.intellij.usages.impl.UsagePreviewPanel;
 import jet.runtime.typeinfo.KotlinSignature;
 import org.jetbrains.annotations.NotNull;
@@ -80,7 +81,7 @@ class KotlinOverridingDialog extends DialogWrapper {
         for (int i = 0; i < myMethodText.length; i++) {
             myMethodText[i] = formatElement(((KotlinSafeDeleteOverridingUsageInfo) myOverridingMethods.get(i)).getOverridingElement());
         }
-        myUsagePreviewPanel = new UsagePreviewPanel(project);
+        myUsagePreviewPanel = new UsagePreviewPanel(project, new UsageViewPresentation());
         setTitle(JetBundle.message("unused.overriding.methods.title"));
         init();
     }
diff --git a/update_dependencies.xml b/update_dependencies.xml
index d1d34c5c6f8..60380148dd1 100644
--- a/update_dependencies.xml
+++ b/update_dependencies.xml
@@ -1,6 +1,6 @@
 <project name="Update Dependencies" default="update">
-    <property name="jb.buildserver.build.id" value="2358260"/>
-    <property name="public.buildserver.build.id" value="114358"/>
+    <property name="jb.buildserver.build.id" value="2376640"/>
+    <property name="public.buildserver.build.id" value="116034"/>
 
     <condition property="os.tag" value="win.zip">
       <os family="windows" />