diff --git a/.idea/modules.xml b/.idea/modules.xml
index 9bbcacf87c18..feb0fef0ced2 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -722,11 +722,9 @@
       <module fileurl="file://$PROJECT_DIR$/jvm/jvm-analysis-kotlin-tests/intellij.jvm.analysis.kotlin.tests.iml" filepath="$PROJECT_DIR$/jvm/jvm-analysis-kotlin-tests/intellij.jvm.analysis.kotlin.tests.iml" />
       <module fileurl="file://$PROJECT_DIR$/jvm/jvm-analysis-tests/intellij.jvm.analysis.testFramework.iml" filepath="$PROJECT_DIR$/jvm/jvm-analysis-tests/intellij.jvm.analysis.testFramework.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/keymaps/eclipse-keymap/intellij.keymap.eclipse.iml" filepath="$PROJECT_DIR$/plugins/keymaps/eclipse-keymap/intellij.keymap.eclipse.iml" />
-      <module fileurl="file://$PROJECT_DIR$/plugins/keymaps/emacs-keymap/intellij.keymap.emacs.iml" filepath="$PROJECT_DIR$/plugins/keymaps/emacs-keymap/intellij.keymap.emacs.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/keymaps/netbeans5.6-keymap/intellij.keymap.netbeans.iml" filepath="$PROJECT_DIR$/plugins/keymaps/netbeans5.6-keymap/intellij.keymap.netbeans.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/keymaps/qtcreator-keymap/intellij.keymap.qtcreator.iml" filepath="$PROJECT_DIR$/plugins/keymaps/qtcreator-keymap/intellij.keymap.qtcreator.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/keymaps/resharper-keymap/intellij.keymap.resharper.iml" filepath="$PROJECT_DIR$/plugins/keymaps/resharper-keymap/intellij.keymap.resharper.iml" />
-      <module fileurl="file://$PROJECT_DIR$/plugins/keymaps/sublime-keymap/intellij.keymap.sublime.iml" filepath="$PROJECT_DIR$/plugins/keymaps/sublime-keymap/intellij.keymap.sublime.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/keymaps/visual-assist-keymap/intellij.keymap.visualAssist.iml" filepath="$PROJECT_DIR$/plugins/keymaps/visual-assist-keymap/intellij.keymap.visualAssist.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/keymaps/visual-studio-keymap/intellij.keymap.visualStudio.iml" filepath="$PROJECT_DIR$/plugins/keymaps/visual-studio-keymap/intellij.keymap.visualStudio.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/keymaps/visual-studio2022-keymap/intellij.keymap.visualStudio2022.iml" filepath="$PROJECT_DIR$/plugins/keymaps/visual-studio2022-keymap/intellij.keymap.visualStudio2022.iml" />
diff --git a/platform/build-scripts/src/org/jetbrains/intellij/build/impl/DistributionJARsBuilder.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/DistributionJARsBuilder.kt
index 6ed1a9eacf26..c2a8d107533d 100644
--- a/platform/build-scripts/src/org/jetbrains/intellij/build/impl/DistributionJARsBuilder.kt
+++ b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/DistributionJARsBuilder.kt
@@ -967,7 +967,9 @@ private suspend fun buildKeymapPlugins(targetDir: Path, context: BuildContext):
         arrayOf("Mac OS X", "Mac OS X 10.5+"),
         arrayOf("Default for GNOME"),
         arrayOf("Default for KDE"),
-        arrayOf("Default for XWin")
+        arrayOf("Default for XWin"),
+        arrayOf("Emacs"),
+        arrayOf("Sublime Text", "Sublime Text (Mac OS X)")
       ).map {
         async { buildKeymapPlugin(it, context.buildNumber, targetDir, keymapDir) }
       }
diff --git a/plugins/keymaps/emacs-keymap/intellij.keymap.emacs.iml b/plugins/keymaps/emacs-keymap/intellij.keymap.emacs.iml
deleted file mode 100644
index e7bd1f91989f..000000000000
--- a/plugins/keymaps/emacs-keymap/intellij.keymap.emacs.iml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="module" module-name="intellij.platform.resources" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/plugins/keymaps/emacs-keymap/resources/META-INF/plugin.xml b/plugins/keymaps/emacs-keymap/resources/META-INF/plugin.xml
deleted file mode 100644
index 665047ca966a..000000000000
--- a/plugins/keymaps/emacs-keymap/resources/META-INF/plugin.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<idea-plugin>
-<name>Emacs Keymap</name>
-<id>com.intellij.plugins.emacskeymap</id>
-<vendor>JetBrains</vendor>
-<category>Keymap</category>
-<description>
-  Emacs keymap for all IntelliJ-based IDEs.
-  Use this plugin if Emacs keymap is not pre-installed in your IDE.
-</description>
-<depends>com.intellij.modules.lang</depends>
-<extensions defaultExtensionNs="com.intellij">
-    <bundledKeymap file="Emacs.xml"/>
-</extensions>
-</idea-plugin>
\ No newline at end of file
diff --git a/plugins/keymaps/emacs-keymap/resources/META-INF/pluginIcon.svg b/plugins/keymaps/emacs-keymap/resources/META-INF/pluginIcon.svg
deleted file mode 100644
index caaad8dfdad0..000000000000
--- a/plugins/keymaps/emacs-keymap/resources/META-INF/pluginIcon.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="40" height="40" viewBox="0 0 40 40">
-  <path fill="#389FD6" fill-rule="evenodd" d="M0,0 L36,0 L36,26 L0,26 L0,0 Z M16,5 L20,5 L20,9 L16,9 L16,5 Z M22,5 L26,5 L26,9 L22,9 L22,5 Z M28,5 L32,5 L32,9 L28,9 L28,5 Z M28,11 L32,11 L32,15 L28,15 L28,11 Z M22,11 L26,11 L26,15 L22,15 L22,11 Z M10,11 L14,11 L14,15 L10,15 L10,11 Z M4,11 L8,11 L8,15 L4,15 L4,11 Z M4,5 L8,5 L8,9 L4,9 L4,5 Z M10,5 L14,5 L14,9 L10,9 L10,5 Z M16,11 L20,11 L20,15 L16,15 L16,11 Z M25,21 L11,21 L11,17 L25,17 L25,21 Z" transform="translate(2 7)"/>
-</svg>
diff --git a/plugins/keymaps/emacs-keymap/resources/META-INF/pluginIcon_dark.svg b/plugins/keymaps/emacs-keymap/resources/META-INF/pluginIcon_dark.svg
deleted file mode 100644
index 2cfbe2b0c10b..000000000000
--- a/plugins/keymaps/emacs-keymap/resources/META-INF/pluginIcon_dark.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="40" height="40" viewBox="0 0 40 40">
-  <path fill="#3592C4" fill-rule="evenodd" d="M0,0 L36,0 L36,26 L0,26 L0,0 Z M16,5 L20,5 L20,9 L16,9 L16,5 Z M22,5 L26,5 L26,9 L22,9 L22,5 Z M28,5 L32,5 L32,9 L28,9 L28,5 Z M28,11 L32,11 L32,15 L28,15 L28,11 Z M22,11 L26,11 L26,15 L22,15 L22,11 Z M10,11 L14,11 L14,15 L10,15 L10,11 Z M4,11 L8,11 L8,15 L4,15 L4,11 Z M4,5 L8,5 L8,9 L4,9 L4,5 Z M10,5 L14,5 L14,9 L10,9 L10,5 Z M16,11 L20,11 L20,15 L16,15 L16,11 Z M25,21 L11,21 L11,17 L25,17 L25,21 Z" transform="translate(2 7)"/>
-</svg>
diff --git a/plugins/keymaps/sublime-keymap/intellij.keymap.sublime.iml b/plugins/keymaps/sublime-keymap/intellij.keymap.sublime.iml
deleted file mode 100644
index e7bd1f91989f..000000000000
--- a/plugins/keymaps/sublime-keymap/intellij.keymap.sublime.iml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="module" module-name="intellij.platform.resources" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/plugins/keymaps/sublime-keymap/resources/META-INF/plugin.xml b/plugins/keymaps/sublime-keymap/resources/META-INF/plugin.xml
deleted file mode 100644
index 8f14d24e569f..000000000000
--- a/plugins/keymaps/sublime-keymap/resources/META-INF/plugin.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<idea-plugin>
-<name>Sublime Text Keymap</name>
-<id>com.intellij.plugins.sublimetextkeymap</id>
-<vendor>JetBrains</vendor>
-<category>Keymap</category>
-<description>
-  Sublime Text keymap for all IntelliJ-based IDEs.
-  Use this plugin if Sublime Text keymap is not pre-installed in your IDE.
-</description>
-<depends>com.intellij.modules.lang</depends>
-<extensions defaultExtensionNs="com.intellij">
-    <bundledKeymap file="Sublime Text.xml"/>
-    <bundledKeymap file="Sublime Text (Mac OS X).xml"/>
-</extensions>
-</idea-plugin>
\ No newline at end of file
diff --git a/plugins/keymaps/sublime-keymap/resources/META-INF/pluginIcon.svg b/plugins/keymaps/sublime-keymap/resources/META-INF/pluginIcon.svg
deleted file mode 100644
index caaad8dfdad0..000000000000
--- a/plugins/keymaps/sublime-keymap/resources/META-INF/pluginIcon.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="40" height="40" viewBox="0 0 40 40">
-  <path fill="#389FD6" fill-rule="evenodd" d="M0,0 L36,0 L36,26 L0,26 L0,0 Z M16,5 L20,5 L20,9 L16,9 L16,5 Z M22,5 L26,5 L26,9 L22,9 L22,5 Z M28,5 L32,5 L32,9 L28,9 L28,5 Z M28,11 L32,11 L32,15 L28,15 L28,11 Z M22,11 L26,11 L26,15 L22,15 L22,11 Z M10,11 L14,11 L14,15 L10,15 L10,11 Z M4,11 L8,11 L8,15 L4,15 L4,11 Z M4,5 L8,5 L8,9 L4,9 L4,5 Z M10,5 L14,5 L14,9 L10,9 L10,5 Z M16,11 L20,11 L20,15 L16,15 L16,11 Z M25,21 L11,21 L11,17 L25,17 L25,21 Z" transform="translate(2 7)"/>
-</svg>
diff --git a/plugins/keymaps/sublime-keymap/resources/META-INF/pluginIcon_dark.svg b/plugins/keymaps/sublime-keymap/resources/META-INF/pluginIcon_dark.svg
deleted file mode 100644
index 2cfbe2b0c10b..000000000000
--- a/plugins/keymaps/sublime-keymap/resources/META-INF/pluginIcon_dark.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="40" height="40" viewBox="0 0 40 40">
-  <path fill="#3592C4" fill-rule="evenodd" d="M0,0 L36,0 L36,26 L0,26 L0,0 Z M16,5 L20,5 L20,9 L16,9 L16,5 Z M22,5 L26,5 L26,9 L22,9 L22,5 Z M28,5 L32,5 L32,9 L28,9 L28,5 Z M28,11 L32,11 L32,15 L28,15 L28,11 Z M22,11 L26,11 L26,15 L22,15 L22,11 Z M10,11 L14,11 L14,15 L10,15 L10,11 Z M4,11 L8,11 L8,15 L4,15 L4,11 Z M4,5 L8,5 L8,9 L4,9 L4,5 Z M10,5 L14,5 L14,9 L10,9 L10,5 Z M16,11 L20,11 L20,15 L16,15 L16,11 Z M25,21 L11,21 L11,17 L25,17 L25,21 Z" transform="translate(2 7)"/>
-</svg>