diff --git a/python/ide/src/com/jetbrains/python/PyCharmCustomizeIDEWizardStepsProvider.java b/python/ide/src/com/jetbrains/python/PyCharmCustomizeIDEWizardStepsProvider.java
new file mode 100644
index 000000000000..0721120c935e
--- /dev/null
+++ b/python/ide/src/com/jetbrains/python/PyCharmCustomizeIDEWizardStepsProvider.java
@@ -0,0 +1,38 @@
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+package com.jetbrains.python;
+
+import com.intellij.ide.customize.*;
+import com.intellij.openapi.util.Pair;
+
+import javax.swing.*;
+import java.util.List;
+import java.util.Map;
+
+public class PyCharmCustomizeIDEWizardStepsProvider implements CustomizeIDEWizardStepsProvider {
+  @Override
+  public void initSteps(CustomizeIDEWizardDialog wizardDialog, List<AbstractCustomizeWizardStep> steps) {
+    PluginGroups groups = new PluginGroups() {
+      @Override
+      protected void initGroups(Map<String, Pair<Icon, List<String>>> tree, Map<String, String> featuredPlugins) {
+        addVcsGroup(tree);
+
+        addVimPlugin(featuredPlugins);
+        addMarkdownPlugin(featuredPlugins);
+        featuredPlugins.put("BashSupport", "Languages:Bash language support:BashSupport");
+        featuredPlugins.put(".ignore",
+                            "VCS Integration:Support for .gitignore (GIT), .hgignore (Mercurial), .npmignore (NPM), .dockerignore (Docker) etc:mobi.hsz.idea.gitignore");
+        featuredPlugins.put("R Language Support", "Languages:R language support:R4Intellij");
+        featuredPlugins.put("YAML/Ansible support", "Languages:YAML/Ansible support with Jinja2 tags:YAML/Ansible support");
+      }
+    };
+
+    steps.add(new CustomizeUIThemeStepPanel());
+
+    if (CustomizeLauncherScriptStep.isAvailable()) {
+      steps.add(new CustomizeLauncherScriptStep());
+    }
+
+    steps.add(new CustomizePluginsStepPanel(groups));
+    steps.add(new CustomizeFeaturedPluginsStepPanel(groups));
+  }
+}
diff --git a/python/ide/src/com/jetbrains/python/PyCharmInitialConfigurator.java b/python/ide/src/com/jetbrains/python/PyCharmInitialConfigurator.java
index e43932ab8aa9..9e6ac0ed2193 100644
--- a/python/ide/src/com/jetbrains/python/PyCharmInitialConfigurator.java
+++ b/python/ide/src/com/jetbrains/python/PyCharmInitialConfigurator.java
@@ -15,7 +15,6 @@
  */
 package com.jetbrains.python;
 
-import com.intellij.application.options.InitialConfigurationDialog;
 import com.intellij.codeInsight.CodeInsightSettings;
 import com.intellij.ide.AppLifecycleListener;
 import com.intellij.ide.ui.UISettings;
@@ -24,15 +23,12 @@ import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.editor.ex.EditorSettingsExternalizable;
 import com.intellij.openapi.fileTypes.FileTypeManager;
 import com.intellij.openapi.util.registry.Registry;
-import com.intellij.openapi.wm.WindowManager;
 import com.intellij.psi.codeStyle.CodeStyleSettings;
 import com.intellij.psi.codeStyle.CodeStyleSettingsManager;
 import com.intellij.util.messages.MessageBus;
 import com.jetbrains.python.codeInsight.PyCodeInsightSettings;
 import org.jetbrains.annotations.NonNls;
 
-import javax.swing.*;
-
 /**
  * Initialize PyCharm.
  *
@@ -85,7 +81,6 @@ public class PyCharmInitialConfigurator {
         public void welcomeScreenDisplayed() {
           ApplicationManager.getApplication().invokeLater(() -> {
             propertiesComponent.setValue(DISPLAYED_PROPERTY, "true");
-            showInitialConfigurationDialog();
           });
         }
       });
@@ -93,9 +88,4 @@ public class PyCharmInitialConfigurator {
 
     Registry.get("ide.ssh.one.time.password").setValue(true);
   }
-
-  private static void showInitialConfigurationDialog() {
-    final JFrame frame = WindowManager.getInstance().findVisibleFrame();
-    new InitialConfigurationDialog(frame, "Python").show();
-  }
 }
diff --git a/python/python-community-ide-resources/resources/idea/PyCharmCoreApplicationInfo.xml b/python/python-community-ide-resources/resources/idea/PyCharmCoreApplicationInfo.xml
index abbd34948ab3..8c98cdb36270 100644
--- a/python/python-community-ide-resources/resources/idea/PyCharmCoreApplicationInfo.xml
+++ b/python/python-community-ide-resources/resources/idea/PyCharmCoreApplicationInfo.xml
@@ -12,6 +12,7 @@
   <names product="PyCharm" edition="Community Edition" script="charm"/>
 
   <welcome-screen logo-url="/PyCharmCoreWelcomeScreen.png"/>
+  <customize-ide-wizard provider="com.jetbrains.python.PyCharmCustomizeIDEWizardStepsProvider"/>
 
   <plugins url="http://plugins.jetbrains.com/"/>
   <update-urls check="http://www.jetbrains.com/updates/updates.xml"
diff --git a/python/resources/lafs/LinuxDarcula.png b/python/resources/lafs/LinuxDarcula.png
new file mode 100644
index 000000000000..498fb7052a73
Binary files /dev/null and b/python/resources/lafs/LinuxDarcula.png differ
diff --git a/python/resources/lafs/LinuxGTK.png b/python/resources/lafs/LinuxGTK.png
new file mode 100644
index 000000000000..9826841fa57b
Binary files /dev/null and b/python/resources/lafs/LinuxGTK.png differ
diff --git a/python/resources/lafs/LinuxIntelliJ.png b/python/resources/lafs/LinuxIntelliJ.png
new file mode 100644
index 000000000000..2ab60389172f
Binary files /dev/null and b/python/resources/lafs/LinuxIntelliJ.png differ
diff --git a/python/resources/lafs/OSXAqua.png b/python/resources/lafs/OSXAqua.png
new file mode 100644
index 000000000000..e8d76678c225
Binary files /dev/null and b/python/resources/lafs/OSXAqua.png differ
diff --git a/python/resources/lafs/OSXAqua@2x.png b/python/resources/lafs/OSXAqua@2x.png
new file mode 100644
index 000000000000..bb693c7e9a14
Binary files /dev/null and b/python/resources/lafs/OSXAqua@2x.png differ
diff --git a/python/resources/lafs/OSXDarcula.png b/python/resources/lafs/OSXDarcula.png
new file mode 100644
index 000000000000..e1043e60ec70
Binary files /dev/null and b/python/resources/lafs/OSXDarcula.png differ
diff --git a/python/resources/lafs/OSXDarcula@2x.png b/python/resources/lafs/OSXDarcula@2x.png
new file mode 100644
index 000000000000..3ea5bba14110
Binary files /dev/null and b/python/resources/lafs/OSXDarcula@2x.png differ
diff --git a/python/resources/lafs/WindowsDarcula.png b/python/resources/lafs/WindowsDarcula.png
new file mode 100644
index 000000000000..b504473e883b
Binary files /dev/null and b/python/resources/lafs/WindowsDarcula.png differ
diff --git a/python/resources/lafs/WindowsIntelliJ.png b/python/resources/lafs/WindowsIntelliJ.png
new file mode 100644
index 000000000000..34470c9c917f
Binary files /dev/null and b/python/resources/lafs/WindowsIntelliJ.png differ