diff --git a/.idea/modules.xml b/.idea/modules.xml
index 88366cc3906d..41cfc2204e7f 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -161,7 +161,7 @@
       <module fileurl="file://$PROJECT_DIR$/plugins/xslt-debugger/engine/impl/xslt-debugger-engine-impl.iml" filepath="$PROJECT_DIR$/plugins/xslt-debugger/engine/impl/xslt-debugger-engine-impl.iml" group="plugins" />
       <module fileurl="file://$PROJECT_DIR$/plugins/xpath/xslt-rt/xslt-rt.iml" filepath="$PROJECT_DIR$/plugins/xpath/xslt-rt/xslt-rt.iml" group="plugins" />
       <module fileurl="file://$PROJECT_DIR$/platform/editor-ui-api/editor-ui-api.iml" filepath="$PROJECT_DIR$/platform/editor-ui-api/editor-ui-api.iml" />
-      <module fileurl="file://$PROJECT_DIR$/platform/editor-ui-impl/editor-ui-impl.iml" filepath="$PROJECT_DIR$/platform/editor-ui-impl/editor-ui-impl.iml" />
+      <module fileurl="file://$PROJECT_DIR$/platform/editor-ui-ex/editor-ui-ex.iml" filepath="$PROJECT_DIR$/platform/editor-ui-ex/editor-ui-ex.iml" />
     </modules>
   </component>
 </project>
diff --git a/build/scripts/utils.gant b/build/scripts/utils.gant
index eb0e9f1d6d66..bd314d670c14 100644
--- a/build/scripts/utils.gant
+++ b/build/scripts/utils.gant
@@ -267,7 +267,7 @@ binding.setVariable("platformImplementationModules", [
   "analysis-impl",
   "core-impl",
   "dvcs",
-  "editor-ui-impl",
+  "editor-ui-ex",
   "images",
   "indexing-impl",
   "jps-model-impl",
diff --git a/platform/analysis-impl/analysis-impl.iml b/platform/analysis-impl/analysis-impl.iml
index 34cdcbacb6a3..5e1e23ccbf43 100644
--- a/platform/analysis-impl/analysis-impl.iml
+++ b/platform/analysis-impl/analysis-impl.iml
@@ -14,7 +14,7 @@
     <orderEntry type="module" module-name="extensions" />
     <orderEntry type="module" module-name="resources-en" />
     <orderEntry type="module" module-name="projectModel-impl" />
-    <orderEntry type="module" module-name="editor-ui-impl" />
+    <orderEntry type="module" module-name="editor-ui-ex" />
     <orderEntry type="module" module-name="indexing-api" />
   </component>
 </module>
diff --git a/platform/editor-ui-api/src/com/intellij/openapi/editor/colors/EditorColorsScheme.java b/platform/editor-ui-api/src/com/intellij/openapi/editor/colors/EditorColorsScheme.java
index 989ddac83728..c54b44153f91 100644
--- a/platform/editor-ui-api/src/com/intellij/openapi/editor/colors/EditorColorsScheme.java
+++ b/platform/editor-ui-api/src/com/intellij/openapi/editor/colors/EditorColorsScheme.java
@@ -29,7 +29,6 @@ public interface EditorColorsScheme extends Cloneable, JDOMExternalizable, TextA
 
   void setName(String name);
 
-  TextAttributes getAttributes(TextAttributesKey key);
   void setAttributes(TextAttributesKey key, TextAttributes attributes);
 
   @NotNull
diff --git a/platform/editor-ui-impl/editor-ui-impl.iml b/platform/editor-ui-ex/editor-ui-ex.iml
similarity index 100%
rename from platform/editor-ui-impl/editor-ui-impl.iml
rename to platform/editor-ui-ex/editor-ui-ex.iml
diff --git a/platform/editor-ui-impl/src/com/intellij/injected/editor/MarkupModelWindow.java b/platform/editor-ui-ex/src/com/intellij/injected/editor/MarkupModelWindow.java
similarity index 100%
rename from platform/editor-ui-impl/src/com/intellij/injected/editor/MarkupModelWindow.java
rename to platform/editor-ui-ex/src/com/intellij/injected/editor/MarkupModelWindow.java
diff --git a/platform/editor-ui-impl/src/com/intellij/openapi/editor/ex/MarkupModelEx.java b/platform/editor-ui-ex/src/com/intellij/openapi/editor/ex/MarkupModelEx.java
similarity index 100%
rename from platform/editor-ui-impl/src/com/intellij/openapi/editor/ex/MarkupModelEx.java
rename to platform/editor-ui-ex/src/com/intellij/openapi/editor/ex/MarkupModelEx.java
diff --git a/platform/editor-ui-impl/src/com/intellij/openapi/editor/ex/RangeHighlighterEx.java b/platform/editor-ui-ex/src/com/intellij/openapi/editor/ex/RangeHighlighterEx.java
similarity index 100%
rename from platform/editor-ui-impl/src/com/intellij/openapi/editor/ex/RangeHighlighterEx.java
rename to platform/editor-ui-ex/src/com/intellij/openapi/editor/ex/RangeHighlighterEx.java
diff --git a/platform/editor-ui-impl/src/com/intellij/openapi/editor/impl/DocumentMarkupModel.java b/platform/editor-ui-ex/src/com/intellij/openapi/editor/impl/DocumentMarkupModel.java
similarity index 100%
rename from platform/editor-ui-impl/src/com/intellij/openapi/editor/impl/DocumentMarkupModel.java
rename to platform/editor-ui-ex/src/com/intellij/openapi/editor/impl/DocumentMarkupModel.java
diff --git a/platform/editor-ui-impl/src/com/intellij/openapi/editor/impl/DocumentMarkupModelManager.java b/platform/editor-ui-ex/src/com/intellij/openapi/editor/impl/DocumentMarkupModelManager.java
similarity index 100%
rename from platform/editor-ui-impl/src/com/intellij/openapi/editor/impl/DocumentMarkupModelManager.java
rename to platform/editor-ui-ex/src/com/intellij/openapi/editor/impl/DocumentMarkupModelManager.java
diff --git a/platform/editor-ui-impl/src/com/intellij/openapi/editor/impl/EmptyMarkupModel.java b/platform/editor-ui-ex/src/com/intellij/openapi/editor/impl/EmptyMarkupModel.java
similarity index 100%
rename from platform/editor-ui-impl/src/com/intellij/openapi/editor/impl/EmptyMarkupModel.java
rename to platform/editor-ui-ex/src/com/intellij/openapi/editor/impl/EmptyMarkupModel.java
diff --git a/platform/editor-ui-impl/src/com/intellij/openapi/editor/impl/MarkupModelImpl.java b/platform/editor-ui-ex/src/com/intellij/openapi/editor/impl/MarkupModelImpl.java
similarity index 100%
rename from platform/editor-ui-impl/src/com/intellij/openapi/editor/impl/MarkupModelImpl.java
rename to platform/editor-ui-ex/src/com/intellij/openapi/editor/impl/MarkupModelImpl.java
diff --git a/platform/editor-ui-impl/src/com/intellij/openapi/editor/impl/PersistentRangeHighlighterImpl.java b/platform/editor-ui-ex/src/com/intellij/openapi/editor/impl/PersistentRangeHighlighterImpl.java
similarity index 100%
rename from platform/editor-ui-impl/src/com/intellij/openapi/editor/impl/PersistentRangeHighlighterImpl.java
rename to platform/editor-ui-ex/src/com/intellij/openapi/editor/impl/PersistentRangeHighlighterImpl.java
diff --git a/platform/editor-ui-impl/src/com/intellij/openapi/editor/impl/RangeHighlighterData.java b/platform/editor-ui-ex/src/com/intellij/openapi/editor/impl/RangeHighlighterData.java
similarity index 100%
rename from platform/editor-ui-impl/src/com/intellij/openapi/editor/impl/RangeHighlighterData.java
rename to platform/editor-ui-ex/src/com/intellij/openapi/editor/impl/RangeHighlighterData.java
diff --git a/platform/editor-ui-impl/src/com/intellij/openapi/editor/impl/RangeHighlighterImpl.java b/platform/editor-ui-ex/src/com/intellij/openapi/editor/impl/RangeHighlighterImpl.java
similarity index 100%
rename from platform/editor-ui-impl/src/com/intellij/openapi/editor/impl/RangeHighlighterImpl.java
rename to platform/editor-ui-ex/src/com/intellij/openapi/editor/impl/RangeHighlighterImpl.java
diff --git a/platform/editor-ui-impl/src/com/intellij/openapi/editor/impl/RangeHighlighterTree.java b/platform/editor-ui-ex/src/com/intellij/openapi/editor/impl/RangeHighlighterTree.java
similarity index 100%
rename from platform/editor-ui-impl/src/com/intellij/openapi/editor/impl/RangeHighlighterTree.java
rename to platform/editor-ui-ex/src/com/intellij/openapi/editor/impl/RangeHighlighterTree.java
diff --git a/platform/editor-ui-impl/src/com/intellij/openapi/editor/impl/event/MarkupModelListener.java b/platform/editor-ui-ex/src/com/intellij/openapi/editor/impl/event/MarkupModelListener.java
similarity index 100%
rename from platform/editor-ui-impl/src/com/intellij/openapi/editor/impl/event/MarkupModelListener.java
rename to platform/editor-ui-ex/src/com/intellij/openapi/editor/impl/event/MarkupModelListener.java
diff --git a/platform/platform-impl/platform-impl.iml b/platform/platform-impl/platform-impl.iml
index d47879947da2..41aecc34c1ed 100644
--- a/platform/platform-impl/platform-impl.iml
+++ b/platform/platform-impl/platform-impl.iml
@@ -38,7 +38,7 @@
     <orderEntry type="module" module-name="jps-model-impl" />
     <orderEntry type="module" module-name="analysis-impl" exported="" />
     <orderEntry type="library" name="jayatana" level="project" />
-    <orderEntry type="module" module-name="editor-ui-impl" exported="" />
+    <orderEntry type="module" module-name="editor-ui-ex" exported="" />
     <orderEntry type="library" name="gson" level="project" />
   </component>
 </module>