diff --git a/colorSchemes/src/colorSchemes/Darcula.xml b/colorSchemes/src/colorSchemes/Darcula.xml
index aafce6e567d0..e4bd75cc6000 100644
--- a/colorSchemes/src/colorSchemes/Darcula.xml
+++ b/colorSchemes/src/colorSchemes/Darcula.xml
@@ -896,8 +896,7 @@
     </option>
     <option name="MATCHED_BRACE_ATTRIBUTES">
       <value>
-        <option name="FOREGROUND" value="ffffff" />
-        <option name="FONT_TYPE" value="1" />
+        <option name="FOREGROUND" value="ff8647" />
       </value>
     </option>
     <option name="MESSAGE_ARGUMENT">
@@ -1474,6 +1473,11 @@
         <option name="FOREGROUND" value="247877" />
       </value>
     </option>
+    <option name="UNMATCHED_BRACE_ATTRIBUTES">
+      <value>
+        <option name="FOREGROUND" value="d1243b" />
+      </value>
+    </option>
     <option name="Unresolved reference access">
       <value>
         <option name="FOREGROUND" value="808080" />
diff --git a/java/idea-ui/src/com/intellij/ide/util/projectWizard/importSources/util/CommonSourceRootDetectionUtil.java b/java/idea-ui/src/com/intellij/ide/util/projectWizard/importSources/util/CommonSourceRootDetectionUtil.java
index 091fd175268b..6e8370d99e69 100644
--- a/java/idea-ui/src/com/intellij/ide/util/projectWizard/importSources/util/CommonSourceRootDetectionUtil.java
+++ b/java/idea-ui/src/com/intellij/ide/util/projectWizard/importSources/util/CommonSourceRootDetectionUtil.java
@@ -18,10 +18,10 @@ package com.intellij.ide.util.projectWizard.importSources.util;
 import com.intellij.openapi.util.Pair;
 import com.intellij.openapi.util.SystemInfo;
 import com.intellij.openapi.util.io.FileUtilRt;
+import com.intellij.openapi.vfs.CharsetToolkit;
 import com.intellij.openapi.vfs.VfsUtilCore;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.util.NullableFunction;
-import com.intellij.util.text.CharsetUtil;
 import com.intellij.util.text.StringFactory;
 import org.jetbrains.annotations.Nullable;
 
@@ -109,7 +109,7 @@ public abstract class CommonSourceRootDetectionUtil<F> {
 
   private static char[] loadFileTextSkippingBom(File file) throws IOException {
     //noinspection IOResourceOpenedButNotSafelyClosed
-    InputStream stream = CharsetUtil.inputStreamSkippingBOM(new BufferedInputStream(new FileInputStream(file)));
+    InputStream stream = CharsetToolkit.inputStreamSkippingBOM(new BufferedInputStream(new FileInputStream(file)));
     Reader reader = new InputStreamReader(stream);
     try {
       return FileUtilRt.loadText(reader, (int)file.length());
diff --git a/jps/jps-builders/testSrc/org/jetbrains/jps/incremental/artifacts/ArtifactBuilderOverwriteTest.java b/jps/jps-builders/testSrc/org/jetbrains/jps/incremental/artifacts/ArtifactBuilderOverwriteTest.java
index ee9ad9ad0d28..a6575478885f 100644
--- a/jps/jps-builders/testSrc/org/jetbrains/jps/incremental/artifacts/ArtifactBuilderOverwriteTest.java
+++ b/jps/jps-builders/testSrc/org/jetbrains/jps/incremental/artifacts/ArtifactBuilderOverwriteTest.java
@@ -16,8 +16,8 @@
 package org.jetbrains.jps.incremental.artifacts;
 
 import com.intellij.openapi.util.io.FileUtil;
+import com.intellij.openapi.vfs.CharsetToolkit;
 import com.intellij.util.PathUtil;
-import com.intellij.util.text.CharsetUtil;
 import org.jetbrains.jps.model.artifact.JpsArtifact;
 
 import java.io.File;
@@ -175,7 +175,7 @@ public class ArtifactBuilderOverwriteTest extends ArtifactBuilderTestCase {
       ZipOutputStream output = new ZipOutputStream(new FileOutputStream(file));
       try {
         output.putNextEntry(new ZipEntry(fileNameInArchive));
-        output.write(text.getBytes(CharsetUtil.UTF8));
+        output.write(text.getBytes(CharsetToolkit.UTF8));
         output.closeEntry();
       }
       finally {
diff --git a/platform/core-api/src/com/intellij/openapi/vfs/VfsUtilCore.java b/platform/core-api/src/com/intellij/openapi/vfs/VfsUtilCore.java
index 57cf1fe4f8ef..93aad356b9de 100644
--- a/platform/core-api/src/com/intellij/openapi/vfs/VfsUtilCore.java
+++ b/platform/core-api/src/com/intellij/openapi/vfs/VfsUtilCore.java
@@ -24,7 +24,6 @@ import com.intellij.util.Function;
 import com.intellij.util.PathUtil;
 import com.intellij.util.containers.ContainerUtil;
 import com.intellij.util.containers.DistinctRootsCollection;
-import com.intellij.util.text.CharsetUtil;
 import com.intellij.util.text.StringFactory;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
@@ -82,6 +81,10 @@ public class VfsUtilCore {
   public static String getRelativePath(@NotNull VirtualFile file, @NotNull VirtualFile ancestor, char separator) {
     if (!file.getFileSystem().equals(ancestor.getFileSystem())) return null;
 
+    return doGetRelative(file, ancestor, separator);
+  }
+
+  public static String doGetRelative(VirtualFile file, VirtualFile ancestor, char separator) {
     int length = 0;
     VirtualFile parent = file;
     while (true) {
@@ -166,7 +169,7 @@ public class VfsUtilCore {
 
   @NotNull
   public static InputStream inputStreamSkippingBOM(@NotNull InputStream stream, @NotNull VirtualFile file) throws IOException {
-    return CharsetUtil.inputStreamSkippingBOM(stream);
+    return CharsetToolkit.inputStreamSkippingBOM(stream);
   }
 
   @NotNull
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupCellRenderer.java b/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupCellRenderer.java
index ea3f31cf5708..2d39912b6cbc 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupCellRenderer.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupCellRenderer.java
@@ -31,7 +31,6 @@ import com.intellij.ui.speedSearch.SpeedSearchUtil;
 import com.intellij.util.containers.FList;
 import com.intellij.util.ui.EmptyIcon;
 import com.intellij.util.ui.GraphicsUtil;
-import com.intellij.util.ui.UIUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -49,23 +48,22 @@ public class LookupCellRenderer implements ListCellRenderer {
   //TODO[kb]: move all these awesome constants to Editor's Fonts & Colors settings
   private static final int AFTER_TAIL = 10;
   private static final int AFTER_TYPE = 6;
-  public static final Color BACKGROUND_COLOR_DARK_VARIANT = new Color(0x141D29);
   private Icon myEmptyIcon = EmptyIcon.create(5);
   private final Font myNormalFont;
   private final Font myBoldFont;
   private final FontMetrics myNormalMetrics;
   private final FontMetrics myBoldMetrics;
 
-  public static final Color BACKGROUND_COLOR = new Color(235, 244, 254);
-  private static final Color FOREGROUND_COLOR = Color.black;
-  private static final Color GRAYED_FOREGROUND_COLOR = Gray._160;
+  public static final Color BACKGROUND_COLOR = new JBColor(new Color(235, 244, 254), JBColor.background);
+  private static final Color FOREGROUND_COLOR = JBColor.foreground;
+  private static final Color GRAYED_FOREGROUND_COLOR = new JBColor(Gray._160, Gray._110);
   private static final Color SELECTED_BACKGROUND_COLOR = new Color(0, 82, 164);
-  private static final Color SELECTED_NON_FOCUSED_BACKGROUND_COLOR = new Color(110, 142, 162);
-  private static final Color SELECTED_FOREGROUND_COLOR = Color.white;
-  private static final Color SELECTED_GRAYED_FOREGROUND_COLOR = Color.white;
+  private static final Color SELECTED_NON_FOCUSED_BACKGROUND_COLOR = new JBColor(new Color(110, 142, 162), new Color(85, 88, 90));
+  private static final Color SELECTED_FOREGROUND_COLOR = new JBColor(JBColor.WHITE, JBColor.foreground);
+  private static final Color SELECTED_GRAYED_FOREGROUND_COLOR = new JBColor(JBColor.WHITE, JBColor.foreground);
 
-  static final Color PREFIX_FOREGROUND_COLOR = new Color(176, 0, 176);
-  private static final Color SELECTED_PREFIX_FOREGROUND_COLOR = new Color(249, 236, 204);
+  static final Color PREFIX_FOREGROUND_COLOR = new JBColor(new Color(176, 0, 176), new Color(209, 122, 214));
+  private static final Color SELECTED_PREFIX_FOREGROUND_COLOR = new JBColor(new Color(249, 236, 204), new Color(209, 122, 214));
 
   private static final Color EMPTY_ITEM_FOREGROUND_COLOR = FOREGROUND_COLOR;
 
@@ -128,7 +126,7 @@ public class LookupCellRenderer implements ListCellRenderer {
     final LookupElement item = (LookupElement)value;
     final Color foreground = getForegroundColor(isSelected);
     final Color background = nonFocusedSelection ? SELECTED_NON_FOCUSED_BACKGROUND_COLOR :
-                             isSelected ? SELECTED_BACKGROUND_COLOR : new JBColor(BACKGROUND_COLOR, BACKGROUND_COLOR_DARK_VARIANT);
+                             isSelected ? SELECTED_BACKGROUND_COLOR : BACKGROUND_COLOR;
 
     int allowedWidth = list.getWidth() - AFTER_TAIL - AFTER_TYPE - getIconIndent();
     final LookupElementPresentation presentation = new RealLookupElementPresentation(isSelected ? getMaxWidth() : allowedWidth, myNormalMetrics, myBoldMetrics, myLookup);
@@ -183,7 +181,7 @@ public class LookupCellRenderer implements ListCellRenderer {
   }
 
   private static Color getForegroundColor(boolean isSelected) {
-    return UIUtil.isUnderDarcula() ? UIUtil.getListForeground() : isSelected ? SELECTED_FOREGROUND_COLOR : FOREGROUND_COLOR;
+    return isSelected ? SELECTED_FOREGROUND_COLOR : FOREGROUND_COLOR;
   }
 
   private int getMaxWidth() {
@@ -259,7 +257,7 @@ public class LookupCellRenderer implements ListCellRenderer {
   }
 
   public static Color getGrayedForeground(boolean isSelected) {
-    return UIUtil.isUnderDarcula() ? Gray._230 : isSelected ? SELECTED_GRAYED_FOREGROUND_COLOR : GRAYED_FOREGROUND_COLOR;
+    return isSelected ? SELECTED_GRAYED_FOREGROUND_COLOR : GRAYED_FOREGROUND_COLOR;
   }
 
   private int setItemTextLabel(LookupElement item, final Color foreground, final boolean selected, LookupElementPresentation presentation, int allowedWidth) {
@@ -348,7 +346,7 @@ public class LookupCellRenderer implements ListCellRenderer {
     }
 
     myTypeLabel.setBackground(sampleBackground);
-    myTypeLabel.setForeground(presentation.isTypeGrayed() ? getGrayedForeground(selected) : item instanceof EmptyLookupItem ? UIUtil.isUnderDarcula() ? Gray._230 : EMPTY_ITEM_FOREGROUND_COLOR : foreground);
+    myTypeLabel.setForeground(presentation.isTypeGrayed() ? getGrayedForeground(selected) : item instanceof EmptyLookupItem ? JBColor.foreground : foreground);
     return used;
   }
 
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupImpl.java b/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupImpl.java
index ffd3d5df09d6..758b90f663bb 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupImpl.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupImpl.java
@@ -73,7 +73,6 @@ import com.intellij.util.containers.ContainerUtil;
 import com.intellij.util.ui.AbstractLayoutManager;
 import com.intellij.util.ui.AsyncProcessIcon;
 import com.intellij.util.ui.ButtonlessScrollBarUI;
-import com.intellij.util.ui.UIUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.annotations.TestOnly;
@@ -174,7 +173,7 @@ public class LookupImpl extends LightweightHint implements LookupEx, Disposable
     myList.setFixedCellWidth(50);
 
     myList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
-    myList.setBackground(UIUtil.isUnderDarcula() ? LookupCellRenderer.BACKGROUND_COLOR_DARK_VARIANT : LookupCellRenderer.BACKGROUND_COLOR);
+    myList.setBackground(LookupCellRenderer.BACKGROUND_COLOR);
 
     myList.getExpandableItemsHandler();
 
@@ -218,7 +217,7 @@ public class LookupImpl extends LightweightHint implements LookupEx, Disposable
 
     addListeners();
 
-    mySortingLabel.setBorder(new LineBorder(Color.LIGHT_GRAY));
+    mySortingLabel.setBorder(new LineBorder(new JBColor(Color.LIGHT_GRAY, JBColor.background)));
     mySortingLabel.setOpaque(true);
     new ChangeLookupSorting().installOn(mySortingLabel);
     updateSorting();
diff --git a/platform/lang-impl/src/com/intellij/ui/debugger/extensions/PlaybackDebugger.java b/platform/lang-impl/src/com/intellij/ui/debugger/extensions/PlaybackDebugger.java
index e635a991587a..83d0d5498a39 100644
--- a/platform/lang-impl/src/com/intellij/ui/debugger/extensions/PlaybackDebugger.java
+++ b/platform/lang-impl/src/com/intellij/ui/debugger/extensions/PlaybackDebugger.java
@@ -31,6 +31,7 @@ import com.intellij.openapi.ui.playback.PlaybackContext;
 import com.intellij.openapi.ui.playback.PlaybackRunner;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.openapi.vfs.*;
+import com.intellij.openapi.vfs.encoding.EncodingRegistry;
 import com.intellij.openapi.wm.IdeFrame;
 import com.intellij.openapi.wm.WindowManager;
 import com.intellij.openapi.wm.ex.WindowManagerEx;
@@ -270,7 +271,7 @@ public class PlaybackDebugger implements UiDebuggerExtension, PlaybackRunner.Sta
 
   private void loadFrom(@NotNull VirtualFile file) {
     try {
-      final String text = CharsetToolkit.bytesToString(file.contentsToByteArray());
+      final String text = CharsetToolkit.bytesToString(file.contentsToByteArray(), EncodingRegistry.getInstance().getDefaultCharset());
       fillDocument(text);
       myChanged = false;
     }
diff --git a/platform/lvcs-impl/src/com/intellij/history/integration/IdeaGateway.java b/platform/lvcs-impl/src/com/intellij/history/integration/IdeaGateway.java
index 17fc0ed9f244..1c4424b3d142 100644
--- a/platform/lvcs-impl/src/com/intellij/history/integration/IdeaGateway.java
+++ b/platform/lvcs-impl/src/com/intellij/history/integration/IdeaGateway.java
@@ -37,6 +37,7 @@ import com.intellij.openapi.util.Key;
 import com.intellij.openapi.util.Pair;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.openapi.vfs.*;
+import com.intellij.openapi.vfs.encoding.EncodingRegistry;
 import com.intellij.openapi.vfs.newvfs.ManagingFS;
 import com.intellij.openapi.vfs.newvfs.NewVirtualFile;
 import com.intellij.util.NullableFunction;
@@ -338,7 +339,7 @@ public class IdeaGateway {
     try {
       VirtualFile file = findVirtualFile(path);
       if (file == null) {
-        return CharsetToolkit.bytesToString(bytes);
+        return CharsetToolkit.bytesToString(bytes, EncodingRegistry.getInstance().getDefaultCharset());
       }
       return new String(bytes, file.getCharset().name());
     }
diff --git a/platform/platform-api/src/com/intellij/openapi/diff/BinaryContent.java b/platform/platform-api/src/com/intellij/openapi/diff/BinaryContent.java
index 5dc00ee23090..218e11d32fa3 100644
--- a/platform/platform-api/src/com/intellij/openapi/diff/BinaryContent.java
+++ b/platform/platform-api/src/com/intellij/openapi/diff/BinaryContent.java
@@ -23,6 +23,7 @@ import com.intellij.openapi.fileTypes.UIBasedFileType;
 import com.intellij.openapi.vfs.CharsetToolkit;
 import com.intellij.openapi.vfs.LocalFileSystem;
 import com.intellij.openapi.vfs.VirtualFile;
+import com.intellij.openapi.vfs.encoding.EncodingRegistry;
 import com.intellij.testFramework.LightVirtualFile;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -74,7 +75,7 @@ public class BinaryContent extends DiffContent {
       String text = null;
       try {
         if (myCharset == null) {
-          text = CharsetToolkit.bytesToString(myBytes);
+          text = CharsetToolkit.bytesToString(myBytes, EncodingRegistry.getInstance().getDefaultCharset());
         }
         else {
           text = CharsetToolkit.bytesToString(myBytes, myCharset);
diff --git a/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/persistent/PersistentFSImpl.java b/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/persistent/PersistentFSImpl.java
index 159e9e67f1a8..7f633c8e5d3d 100644
--- a/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/persistent/PersistentFSImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/persistent/PersistentFSImpl.java
@@ -60,7 +60,7 @@ public class PersistentFSImpl extends PersistentFS implements ApplicationCompone
   private final ConcurrentIntObjectMap<VirtualFileSystemEntry> myIdToDirCache = new StripedLockIntObjectConcurrentHashMap<VirtualFileSystemEntry>();
   private final Object myInputLock = new Object();
 
-  @Nullable private VirtualFileSystemEntry myFakeRoot;
+  @Nullable private volatile VirtualFileSystemEntry myFakeRoot;
   private boolean myShutDown = false;
 
   public PersistentFSImpl(@NotNull final MessageBus bus) {
@@ -378,9 +378,22 @@ public class PersistentFSImpl extends PersistentFS implements ApplicationCompone
 
   @Override
   public int getId(@NotNull final VirtualFile parent, @NotNull final String childName, @NotNull final NewVirtualFileSystem fs) {
-    final int parentId = getFileId(parent);
+    int parentId = getFileId(parent);
 
-    final int[] children = FSRecords.list(parentId);
+    if (parent == myFakeRoot) {
+      // children of the fake root must be the FS roots only
+      myRootsLock.readLock().lock();
+      try {
+        String rootUrl = fs.getProtocol() + "://" + VfsImplUtil.normalize(fs, childName);
+        VirtualFileSystemEntry root = myRoots.get(rootUrl);
+        return root == null ? 0 : root.getId();
+      }
+      finally {
+        myRootsLock.readLock().unlock();
+      }
+    }
+
+    int[] children = FSRecords.list(parentId);
 
     if (children.length > 0) {
       // fast path, check that some child has same nameId as given name, this avoid O(N) on retrieving names for processing non-cached children
diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/components/impl/ProjectStoreBaseTestCase.java b/platform/platform-tests/testSrc/com/intellij/openapi/components/impl/ProjectStoreBaseTestCase.java
index f3f68cc328d5..5d566ec77023 100644
--- a/platform/platform-tests/testSrc/com/intellij/openapi/components/impl/ProjectStoreBaseTestCase.java
+++ b/platform/platform-tests/testSrc/com/intellij/openapi/components/impl/ProjectStoreBaseTestCase.java
@@ -20,8 +20,8 @@ import com.intellij.openapi.components.State;
 import com.intellij.openapi.components.Storage;
 import com.intellij.openapi.util.JDOMBuilder;
 import com.intellij.openapi.util.JDOMUtil;
+import com.intellij.openapi.vfs.CharsetToolkit;
 import com.intellij.testFramework.PlatformLangTestCase;
-import com.intellij.util.text.CharsetUtil;
 
 import java.io.UnsupportedEncodingException;
 
@@ -34,7 +34,7 @@ public abstract class ProjectStoreBaseTestCase extends PlatformLangTestCase {
                        JDOMBuilder.tag("option", JDOMBuilder.attr("name", "VALUE"), JDOMBuilder.attr("value", "true")))
       )),
       "\n");
-    return iprContent.getBytes(CharsetUtil.UTF8);
+    return iprContent.getBytes(CharsetToolkit.UTF8);
   }
 
   @State(
diff --git a/platform/platform-tests/testSrc/com/intellij/util/io/PersistentFSTest.java b/platform/platform-tests/testSrc/com/intellij/util/io/PersistentFSTest.java
index 6692086ca057..f48e2470808e 100644
--- a/platform/platform-tests/testSrc/com/intellij/util/io/PersistentFSTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/util/io/PersistentFSTest.java
@@ -45,4 +45,19 @@ public class PersistentFSTest extends PlatformTestCase {
 
     assertNull(PersistentFS.getInstance().findFileById(id));
   }
+
+  public void testListChildrenOfTheRootOfTheRoot() {
+    PersistentFS fs = PersistentFS.getInstance();
+    VirtualFile fakeRoot = fs.findRoot("", LocalFileSystem.getInstance());
+    int users = fs.getId(fakeRoot, "Users", LocalFileSystem.getInstance());
+    assertEquals(0, users);
+    int win = fs.getId(fakeRoot, "Windows", LocalFileSystem.getInstance());
+    assertEquals(0, win);
+
+    VirtualFile[] roots = fs.getRoots(LocalFileSystem.getInstance());
+    for (VirtualFile root : roots) {
+      int rid = fs.getId(fakeRoot, root.getName(), LocalFileSystem.getInstance());
+      assertTrue(0 != rid);
+    }
+  }
 }
diff --git a/platform/core-api/src/com/intellij/openapi/vfs/CharsetToolkit.java b/platform/util/src/com/intellij/openapi/vfs/CharsetToolkit.java
similarity index 87%
rename from platform/core-api/src/com/intellij/openapi/vfs/CharsetToolkit.java
rename to platform/util/src/com/intellij/openapi/vfs/CharsetToolkit.java
index 0f8a6d7f52b2..951f35838f80 100644
--- a/platform/core-api/src/com/intellij/openapi/vfs/CharsetToolkit.java
+++ b/platform/util/src/com/intellij/openapi/vfs/CharsetToolkit.java
@@ -15,18 +15,13 @@
  */
 package com.intellij.openapi.vfs;
 
-import com.intellij.openapi.vfs.encoding.EncodingRegistry;
 import com.intellij.util.ArrayUtil;
-import com.intellij.util.text.CharsetUtil;
 import gnu.trove.THashMap;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
+import java.io.*;
 import java.nio.ByteBuffer;
 import java.nio.CharBuffer;
 import java.nio.charset.Charset;
@@ -78,19 +73,24 @@ import java.util.Map;
  * @author Guillaume LAFORGE
  */
 public class CharsetToolkit {
-  @NonNls public static final String UTF8 = CharsetUtil.UTF8;
+  @NonNls public static final String UTF8 = "UTF-8";
   public static final Charset UTF8_CHARSET = Charset.forName(UTF8);
   public static final Charset UTF_16LE_CHARSET = Charset.forName("UTF-16LE");
   public static final Charset UTF_16BE_CHARSET = Charset.forName("UTF-16BE");
   public static final Charset UTF_32BE_CHARSET = Charset.forName("UTF-32BE");
   public static final Charset UTF_32LE_CHARSET = Charset.forName("UTF-32LE");
   public static final Charset UTF_16_CHARSET = Charset.forName("UTF-16");
+  private static final byte FF = (byte)0xff;
+  private static final byte FE = (byte)0xfe;
+  private static final byte EF = (byte)0xef;
+  private static final byte BB = (byte)0xbb;
+  private static final byte BF = (byte)0xbf;
 
   private final byte[] buffer;
   private final Charset defaultCharset;
   private boolean enforce8Bit = false;
 
-  public static final byte[] UTF8_BOM = CharsetUtil.UTF8_BOM;
+  public static final byte[] UTF8_BOM = {0xffffffef, 0xffffffbb, 0xffffffbf};
   public static final byte[] UTF16LE_BOM = {-1, -2, };
   public static final byte[] UTF16BE_BOM = {-2, -1, };
   public static final byte[] UTF32BE_BOM = {0, 0, -2, -1, };
@@ -126,6 +126,96 @@ public class CharsetToolkit {
     this.defaultCharset = defaultCharset == null ? getDefaultSystemCharset() : defaultCharset;
   }
 
+  @NotNull
+  public static InputStream inputStreamSkippingBOM(@NotNull InputStream stream) throws IOException {
+    assert stream.markSupported() :stream;
+    stream.mark(4);
+    boolean mustReset = true;
+    try {
+      int ret = stream.read();
+      if (ret == -1) {
+        return stream; // no bom
+      }
+      byte b0 = (byte)ret;
+      if (b0 != EF && b0 != FF && b0 != FE && b0 != 0) return stream; // no bom
+
+      ret = stream.read();
+      if (ret == -1) {
+        return stream; // no bom
+      }
+      byte b1 = (byte)ret;
+      if (b0 == FF && b1 == FE) {
+        stream.mark(2);
+        ret = stream.read();
+        if (ret == -1) {
+          return stream;  // utf-16 LE
+        }
+        byte b2 = (byte)ret;
+        if (b2 != 0) {
+          return stream; // utf-16 LE
+        }
+        ret = stream.read();
+        if (ret == -1) {
+          return stream;
+        }
+        byte b3 = (byte)ret;
+        if (b3 != 0) {
+          return stream; // utf-16 LE
+        }
+
+        // utf-32 LE
+        mustReset = false;
+        return stream;
+      }
+      if (b0 == FE && b1 == FF) {
+        mustReset = false;
+        return stream; // utf-16 BE
+      }
+      if (b0 == EF && b1 == BB) {
+        ret = stream.read();
+        if (ret == -1) {
+          return stream; // no bom
+        }
+        byte b2 = (byte)ret;
+        if (b2 == BF) {
+          mustReset = false;
+          return stream; // utf-8 bom
+        }
+
+        // no bom
+        return stream;
+      }
+
+      if (b0 == 0 && b1 == 0) {
+        ret = stream.read();
+        if (ret == -1) {
+          return stream;  // no bom
+        }
+        byte b2 = (byte)ret;
+        if (b2 != FE) {
+          return stream; // no bom
+        }
+        ret = stream.read();
+        if (ret == -1) {
+          return stream;  // no bom
+        }
+        byte b3 = (byte)ret;
+        if (b3 != FF) {
+          return stream; // no bom
+        }
+
+        mustReset = false;
+        return stream; // UTF-32 BE
+      }
+
+      // no bom
+      return stream;
+    }
+    finally {
+      if (mustReset) stream.reset();
+    }
+  }
+
   /**
    * If US-ASCII is recognized, enforce to return the default encoding, rather than US-ASCII.
    * It might be a file without any special character in the range 128-255, but that may be or become
@@ -197,11 +287,6 @@ public class CharsetToolkit {
     return null;
   }
 
-  @NotNull
-  public static String bytesToString(@NotNull byte[] bytes) {
-    return bytesToString(bytes, EncodingRegistry.getInstance().getDefaultCharset());
-  }
-
   @NotNull
   public static String bytesToString(@NotNull byte[] bytes, @NotNull final Charset defaultCharset) {
     Charset charset = new CharsetToolkit(bytes, defaultCharset).guessEncoding(bytes.length);
@@ -335,10 +420,6 @@ public class CharsetToolkit {
     return guessEncoding(guess_length, defaultCharset);
   }
 
-  public static Charset guessEncoding(@NotNull File f, int bufferLength) throws IOException {
-    return guessEncoding(f, bufferLength, EncodingRegistry.getInstance().getDefaultCharset());
-  }
-
   public static Charset guessEncoding(@NotNull File f, int bufferLength, Charset defaultCharset) throws IOException {
     byte[] buffer = new byte[bufferLength];
     int read;
@@ -437,7 +518,7 @@ public class CharsetToolkit {
    * @return true if the buffer has a BOM for UTF8.
    */
   public static boolean hasUTF8Bom(@NotNull byte[] bom) {
-    return CharsetUtil.hasUTF8Bom(bom);
+    return ArrayUtil.startsWith(bom, UTF8_BOM);
   }
 
   /**
@@ -482,7 +563,12 @@ public class CharsetToolkit {
 
   @NotNull
   public static byte[] getUtf8Bytes(@NotNull String s) {
-    return CharsetUtil.getUtf8Bytes(s);
+    try {
+      return s.getBytes(CharsetToolkit.UTF8);
+    }
+    catch (UnsupportedEncodingException e) {
+      throw new RuntimeException("UTF-8 must be supported", e);
+    }
   }
 
   public static int getBOMLength(@NotNull byte[] content, Charset charset) {
@@ -545,12 +631,4 @@ public class CharsetToolkit {
 
     return charset;
   }
-
-  /**
-   * @deprecated use {@link CharsetUtil#inputStreamSkippingBOM(java.io.InputStream)} instead
-   */
-  @NotNull
-  public static InputStream inputStreamSkippingBOM(@NotNull InputStream stream) throws IOException {
-    return CharsetUtil.inputStreamSkippingBOM(stream);
-  }
 }
diff --git a/platform/util/src/com/intellij/util/text/CharsetUtil.java b/platform/util/src/com/intellij/util/text/CharsetUtil.java
deleted file mode 100644
index 99d831b6bffa..000000000000
--- a/platform/util/src/com/intellij/util/text/CharsetUtil.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
- * Copyright 2000-2012 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.util.text;
-
-import com.intellij.util.ArrayUtil;
-import org.jetbrains.annotations.NonNls;
-import org.jetbrains.annotations.NotNull;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.UnsupportedEncodingException;
-
-/**
- * @author nik
- */
-public class CharsetUtil {
-  public static final byte[] UTF8_BOM = {0xffffffef, 0xffffffbb, 0xffffffbf};
-  @NonNls public static final String UTF8 = "UTF-8";
-  private static final byte FF = (byte)0xff;
-  private static final byte FE = (byte)0xfe;
-  private static final byte EF = (byte)0xef;
-  private static final byte BB = (byte)0xbb;
-  private static final byte BF = (byte)0xbf;
-
-  public static boolean hasUTF8Bom(byte[] bom) {
-    return ArrayUtil.startsWith(bom, UTF8_BOM);
-  }
-
-  public static byte[] getUtf8Bytes(String s) {
-    try {
-      return s.getBytes(UTF8);
-    }
-    catch (UnsupportedEncodingException e) {
-      throw new RuntimeException("UTF-8 must be supported", e);
-    }
-  }
-
-  @NotNull
-  public static InputStream inputStreamSkippingBOM(@NotNull InputStream stream) throws IOException {
-    assert stream.markSupported() :stream;
-    stream.mark(4);
-    boolean mustReset = true;
-    try {
-      int ret = stream.read();
-      if (ret == -1) {
-        return stream; // no bom
-      }
-      byte b0 = (byte)ret;
-      if (b0 != EF && b0 != FF && b0 != FE && b0 != 0) return stream; // no bom
-
-      ret = stream.read();
-      if (ret == -1) {
-        return stream; // no bom
-      }
-      byte b1 = (byte)ret;
-      if (b0 == FF && b1 == FE) {
-        stream.mark(2);
-        ret = stream.read();
-        if (ret == -1) {
-          return stream;  // utf-16 LE
-        }
-        byte b2 = (byte)ret;
-        if (b2 != 0) {
-          return stream; // utf-16 LE
-        }
-        ret = stream.read();
-        if (ret == -1) {
-          return stream;
-        }
-        byte b3 = (byte)ret;
-        if (b3 != 0) {
-          return stream; // utf-16 LE
-        }
-
-        // utf-32 LE
-        mustReset = false;
-        return stream;
-      }
-      if (b0 == FE && b1 == FF) {
-        mustReset = false;
-        return stream; // utf-16 BE
-      }
-      if (b0 == EF && b1 == BB) {
-        ret = stream.read();
-        if (ret == -1) {
-          return stream; // no bom
-        }
-        byte b2 = (byte)ret;
-        if (b2 == BF) {
-          mustReset = false;
-          return stream; // utf-8 bom
-        }
-
-        // no bom
-        return stream;
-      }
-
-      if (b0 == 0 && b1 == 0) {
-        ret = stream.read();
-        if (ret == -1) {
-          return stream;  // no bom
-        }
-        byte b2 = (byte)ret;
-        if (b2 != FE) {
-          return stream; // no bom
-        }
-        ret = stream.read();
-        if (ret == -1) {
-          return stream;  // no bom
-        }
-        byte b3 = (byte)ret;
-        if (b3 != FF) {
-          return stream; // no bom
-        }
-
-        mustReset = false;
-        return stream; // UTF-32 BE
-      }
-
-      // no bom
-      return stream;
-    }
-    finally {
-      if (mustReset) stream.reset();
-    }
-  }
-}
diff --git a/platform/util/src/com/intellij/util/text/XmlCharsetDetector.java b/platform/util/src/com/intellij/util/text/XmlCharsetDetector.java
index 372eb755032b..de6267823289 100644
--- a/platform/util/src/com/intellij/util/text/XmlCharsetDetector.java
+++ b/platform/util/src/com/intellij/util/text/XmlCharsetDetector.java
@@ -16,6 +16,7 @@
 package com.intellij.util.text;
 
 import com.intellij.openapi.util.text.StringUtil;
+import com.intellij.openapi.vfs.CharsetToolkit;
 import com.intellij.util.ArrayUtil;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
@@ -26,17 +27,17 @@ import org.jetbrains.annotations.Nullable;
  */
 public class XmlCharsetDetector {
   @NonNls private static final String XML_PROLOG_START = "<?xml";
-  @NonNls private static final byte[] XML_PROLOG_START_BYTES = CharsetUtil.getUtf8Bytes(XML_PROLOG_START);
+  @NonNls private static final byte[] XML_PROLOG_START_BYTES = CharsetToolkit.getUtf8Bytes(XML_PROLOG_START);
   @NonNls private static final String ENCODING = "encoding";
-  @NonNls private static final byte[] ENCODING_BYTES = CharsetUtil.getUtf8Bytes(ENCODING);
+  @NonNls private static final byte[] ENCODING_BYTES = CharsetToolkit.getUtf8Bytes(ENCODING);
   @NonNls private static final String XML_PROLOG_END = "?>";
-  @NonNls private static final byte[] XML_PROLOG_END_BYTES = CharsetUtil.getUtf8Bytes(XML_PROLOG_END);
+  @NonNls private static final byte[] XML_PROLOG_END_BYTES = CharsetToolkit.getUtf8Bytes(XML_PROLOG_END);
 
   @Nullable
   public static String extractXmlEncodingFromProlog(final byte[] bytes) {
     int index = 0;
-    if (CharsetUtil.hasUTF8Bom(bytes)) {
-      index = CharsetUtil.UTF8_BOM.length;
+    if (CharsetToolkit.hasUTF8Bom(bytes)) {
+      index = CharsetToolkit.UTF8_BOM.length;
     }
 
     index = skipWhiteSpace(index, bytes);
diff --git a/platform/vcs-api/src/com/intellij/openapi/vcs/impl/ContentRevisionCache.java b/platform/vcs-api/src/com/intellij/openapi/vcs/impl/ContentRevisionCache.java
index b77b52578ea7..e3ab8d9d5491 100644
--- a/platform/vcs-api/src/com/intellij/openapi/vcs/impl/ContentRevisionCache.java
+++ b/platform/vcs-api/src/com/intellij/openapi/vcs/impl/ContentRevisionCache.java
@@ -27,6 +27,7 @@ import com.intellij.openapi.vcs.changes.FilePathsHelper;
 import com.intellij.openapi.vcs.changes.VcsDirtyScope;
 import com.intellij.openapi.vcs.history.VcsRevisionNumber;
 import com.intellij.openapi.vfs.CharsetToolkit;
+import com.intellij.openapi.vfs.encoding.EncodingRegistry;
 import com.intellij.reference.SoftReference;
 import com.intellij.util.Consumer;
 import com.intellij.util.containers.HashSet;
@@ -167,7 +168,7 @@ public class ContentRevisionCache {
       return charBuffer.toString();
     }
 
-    return CharsetToolkit.bytesToString(bytes);
+    return CharsetToolkit.bytesToString(bytes, EncodingRegistry.getInstance().getDefaultCharset());
   }
 
   @Nullable
diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/changeBrowser/CvsContentRevision.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/changeBrowser/CvsContentRevision.java
index 4c0e6472486d..10788cb563e6 100644
--- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/changeBrowser/CvsContentRevision.java
+++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/changeBrowser/CvsContentRevision.java
@@ -38,6 +38,7 @@ import com.intellij.openapi.vcs.actions.VcsContextFactory;
 import com.intellij.openapi.vcs.changes.ContentRevision;
 import com.intellij.openapi.vcs.history.VcsRevisionNumber;
 import com.intellij.openapi.vfs.CharsetToolkit;
+import com.intellij.openapi.vfs.encoding.EncodingRegistry;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -72,7 +73,7 @@ public class CvsContentRevision implements ContentRevision {
       byte[] content = loadContent();
       if (content != null) {
         final Charset charset = myLocalFile.getCharset();
-        myContent = charset == null ? CharsetToolkit.bytesToString(content) : CharsetToolkit.bytesToString(content, charset);
+        myContent = charset == null ? CharsetToolkit.bytesToString(content, EncodingRegistry.getInstance().getDefaultCharset()) : CharsetToolkit.bytesToString(content, charset);
       }
     }
     return myContent;
diff --git a/plugins/git4idea/src/git4idea/history/wholeTree/GitLogUI.java b/plugins/git4idea/src/git4idea/history/wholeTree/GitLogUI.java
index dd32f1d795bb..81c29a9bec97 100644
--- a/plugins/git4idea/src/git4idea/history/wholeTree/GitLogUI.java
+++ b/plugins/git4idea/src/git4idea/history/wholeTree/GitLogUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2012 JetBrains s.r.o.
+ * Copyright 2000-2013 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.
@@ -1772,7 +1772,7 @@ public class GitLogUI implements Disposable {
   }
 
   interface Colors {
-    Color tag = new JBColor(new Color(0xf1ef9e), new Color(0x7D7B12));
+    Color tag = new JBColor(new Color(0xf1ef9e), new Color(113, 111, 64));
     Color remote = new JBColor(new Color(0xbcbcfc), new Color(0xbcbcfc).darker().darker());
     Color local = new JBColor(new Color(0x75eec7), new Color(0x0D6D4F));
     Color highlighted = new JBColor(new Color(210,255,233), UIUtil.getTableBackground());
diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/geb/AbstractGebLightTestCase.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/geb/AbstractGebLightTestCase.groovy
index ac45518d7f49..6fb85ec7d106 100644
--- a/plugins/groovy/test/org/jetbrains/plugins/groovy/geb/AbstractGebLightTestCase.groovy
+++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/geb/AbstractGebLightTestCase.groovy
@@ -29,7 +29,7 @@ import org.jetbrains.plugins.groovy.util.TestUtils
 /**
  * @author Sergey Evdokimov
  */
-class AbstractGebLightTestCase extends LightCodeInsightFixtureTestCase {
+abstract class AbstractGebLightTestCase extends LightCodeInsightFixtureTestCase {
 
   static descriptor = new GebProjectDescriptor()
 
diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/MavenJDOMUtil.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/MavenJDOMUtil.java
index 9eb88b27f1b5..e3a14b2613ac 100644
--- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/MavenJDOMUtil.java
+++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/MavenJDOMUtil.java
@@ -22,6 +22,7 @@ import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.openapi.vfs.CharsetToolkit;
 import com.intellij.openapi.vfs.VfsUtil;
 import com.intellij.openapi.vfs.VirtualFile;
+import com.intellij.openapi.vfs.encoding.EncodingRegistry;
 import com.intellij.psi.impl.source.parsing.xml.XmlBuilder;
 import com.intellij.psi.impl.source.parsing.xml.XmlBuilderDriver;
 import org.jdom.Element;
@@ -57,7 +58,7 @@ public class MavenJDOMUtil {
 
   @Nullable
   public static Element read(byte[] bytes, @Nullable ErrorHandler handler) {
-    return doRead(CharsetToolkit.bytesToString(bytes), handler);
+    return doRead(CharsetToolkit.bytesToString(bytes, EncodingRegistry.getInstance().getDefaultCharset()), handler);
   }
 
   @Nullable
diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/status/DiffContentRevision.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/status/DiffContentRevision.java
index 2d280b21d3ec..bec2f3e963e9 100644
--- a/plugins/svn4idea/src/org/jetbrains/idea/svn/status/DiffContentRevision.java
+++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/status/DiffContentRevision.java
@@ -21,6 +21,7 @@ import com.intellij.openapi.vcs.VcsException;
 import com.intellij.openapi.vcs.changes.ContentRevision;
 import com.intellij.openapi.vcs.history.VcsRevisionNumber;
 import com.intellij.openapi.vfs.CharsetToolkit;
+import com.intellij.openapi.vfs.encoding.EncodingRegistry;
 import com.intellij.vcsUtil.VcsUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -59,7 +60,7 @@ public class DiffContentRevision implements ContentRevision {
       }
       final byte[] bytes = bos.toByteArray();
       final Charset charset = myFilePath.getCharset();
-      myContents = charset == null ? CharsetToolkit.bytesToString(bytes) : CharsetToolkit.bytesToString(bytes, charset);
+      myContents = charset == null ? CharsetToolkit.bytesToString(bytes, EncodingRegistry.getInstance().getDefaultCharset()) : CharsetToolkit.bytesToString(bytes, charset);
     }
     return myContents;
   }