diff --git a/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/SelectTemplateSettings.java b/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/SelectTemplateSettings.java
index 73cf726a0b1e..414fca47790b 100644
--- a/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/SelectTemplateSettings.java
+++ b/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/SelectTemplateSettings.java
@@ -23,8 +23,13 @@ import org.jetbrains.annotations.Nullable;
  * @author Dmitry Avdeev
  *         Date: 10/9/12
  */
-@State(name = "SelectProjectTemplateSettings", storages = {@Storage(file = StoragePathMacros.APP_CONFIG + "/other.xml")})
+@State(
+  name = "SelectProjectTemplateSettings",
+  storages = @Storage(file = StoragePathMacros.APP_CONFIG + "/projectSelectTemplate.xml", roamingType = RoamingType.DISABLED)
+)
 public class SelectTemplateSettings implements PersistentStateComponent<SelectTemplateSettings> {
+  public boolean EXPERT_MODE = false;
+  public String LAST_TEMPLATE = null;
 
   public static SelectTemplateSettings getInstance() {
     return ServiceManager.getService(SelectTemplateSettings.class);
@@ -61,7 +66,4 @@ public class SelectTemplateSettings implements PersistentStateComponent<SelectTe
     EXPERT_MODE = state.EXPERT_MODE;
     LAST_TEMPLATE = state.LAST_TEMPLATE;
   }
-
-  public boolean EXPERT_MODE = false;
-  public String LAST_TEMPLATE = null;
 }
diff --git a/java/java-tests/testData/compileServer/incremental/fieldModifiers/setPrivateToConstantField.log b/java/java-tests/testData/compileServer/incremental/fieldModifiers/setPrivateToConstantField.log
new file mode 100644
index 000000000000..edcb40523223
--- /dev/null
+++ b/java/java-tests/testData/compileServer/incremental/fieldModifiers/setPrivateToConstantField.log
@@ -0,0 +1,12 @@
+Cleaning output files:
+out/production/SetPrivateToConstantField/A.class
+End of files
+Compiling files:
+src/A.java
+End of files
+Cleaning output files:
+out/production/SetPrivateToConstantField/B.class
+End of files
+Compiling files:
+src/B.java
+End of files
diff --git a/java/java-tests/testData/compileServer/incremental/fieldModifiers/setPrivateToConstantField/src/A.java b/java/java-tests/testData/compileServer/incremental/fieldModifiers/setPrivateToConstantField/src/A.java
new file mode 100644
index 000000000000..047971192cf9
--- /dev/null
+++ b/java/java-tests/testData/compileServer/incremental/fieldModifiers/setPrivateToConstantField/src/A.java
@@ -0,0 +1,7 @@
+public class A {
+    public static final int x = init();
+    
+    private static int init() {
+      return 10;
+    }
+}
\ No newline at end of file
diff --git a/java/java-tests/testData/compileServer/incremental/fieldModifiers/setPrivateToConstantField/src/A.java.new b/java/java-tests/testData/compileServer/incremental/fieldModifiers/setPrivateToConstantField/src/A.java.new
new file mode 100644
index 000000000000..0b9ad0d28e30
--- /dev/null
+++ b/java/java-tests/testData/compileServer/incremental/fieldModifiers/setPrivateToConstantField/src/A.java.new
@@ -0,0 +1,7 @@
+public class A {
+    private static final int x = init();
+    
+    private static int init() {
+      return 10;
+    }
+}
\ No newline at end of file
diff --git a/java/java-tests/testData/compileServer/incremental/fieldModifiers/setPrivateToConstantField/src/B.java b/java/java-tests/testData/compileServer/incremental/fieldModifiers/setPrivateToConstantField/src/B.java
new file mode 100644
index 000000000000..499893af26be
--- /dev/null
+++ b/java/java-tests/testData/compileServer/incremental/fieldModifiers/setPrivateToConstantField/src/B.java
@@ -0,0 +1,5 @@
+public class B {
+    void f (A a) {
+        int y = a.x;
+    }
+}
\ No newline at end of file
diff --git a/jps/jps-builders/testSrc/org/jetbrains/ether/FieldModifierTest.java b/jps/jps-builders/testSrc/org/jetbrains/ether/FieldModifierTest.java
index bfbf3f491d7f..ba288a648f55 100644
--- a/jps/jps-builders/testSrc/org/jetbrains/ether/FieldModifierTest.java
+++ b/jps/jps-builders/testSrc/org/jetbrains/ether/FieldModifierTest.java
@@ -32,6 +32,10 @@ public class FieldModifierTest extends IncrementalTestCase {
     doTest();
   }
 
+  public void testSetPrivateToConstantField() throws Exception {
+    doTest();
+  }
+
   public void testSetProtected() throws Exception {
     doTest();
   }
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/template/impl/ExportableTemplateSettings.java b/platform/lang-impl/src/com/intellij/codeInsight/template/impl/ExportableTemplateSettings.java
index 4f9a846d5763..9d4520a6386b 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/template/impl/ExportableTemplateSettings.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/template/impl/ExportableTemplateSettings.java
@@ -20,55 +20,32 @@ import com.intellij.openapi.components.State;
 import com.intellij.openapi.components.Storage;
 import com.intellij.openapi.components.StoragePathMacros;
 import com.intellij.util.SmartList;
-import com.intellij.util.xmlb.XmlSerializerUtil;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.Collection;
+import java.util.List;
 
-/**
- * Contains exportable part of TemplateSettings (can be shared via export/import settings).
- * @author Rustam Vishnyakov
- */
+@SuppressWarnings("deprecation")
+@Deprecated
 @State(
   name = "ExportableTemplateSettings",
   storages = @Storage(file = StoragePathMacros.APP_CONFIG + "/template.settings.xml")
 )
-public class ExportableTemplateSettings implements PersistentStateComponent<ExportableTemplateSettings> {
-  private Collection<TemplateSettings.TemplateKey> deletedKeys = new SmartList<TemplateSettings.TemplateKey>();
-  private boolean isLoaded = false;
-  private TemplateSettings parentSettings;
+final class ExportableTemplateSettings implements PersistentStateComponent<ExportableTemplateSettings> {
+  public Collection<TemplateSettings.TemplateKey> deletedKeys = new SmartList<TemplateSettings.TemplateKey>();
 
   @Nullable
   @Override
   public ExportableTemplateSettings getState() {
-    if (parentSettings != null) {
-      deletedKeys.clear();
-      deletedKeys.addAll(parentSettings.getDeletedTemplates());
-    }
     return this;
   }
 
   @Override
   public void loadState(ExportableTemplateSettings state) {
-    XmlSerializerUtil.copyBean(state, this);
-    isLoaded = true;
-  }
-
-  public boolean isLoaded() {
-    return isLoaded;
-  }
-
-  @SuppressWarnings("UnusedDeclaration") // Property via reflection
-  public Collection<TemplateSettings.TemplateKey> getDeletedKeys() {
-    return deletedKeys;
-  }
-
-  @SuppressWarnings("UnusedDeclaration") // Property via reflection
-  public void setDeletedKeys(Collection<TemplateSettings.TemplateKey> deletedKeys) {
-    this.deletedKeys = deletedKeys;
-  }
-
-  void setParentSettings(TemplateSettings settings) {
-    parentSettings = settings;
+    TemplateSettings templateSettings = TemplateSettings.getInstance();
+    List<TemplateSettings.TemplateKey> deletedTemplates = templateSettings.getDeletedTemplates();
+    deletedTemplates.clear();
+    deletedTemplates.addAll(state.deletedKeys);
+    templateSettings.applyNewDeletedTemplates();
   }
 }
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateSettings.java b/platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateSettings.java
index 02fe604990f0..2c58438acba3 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateSettings.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateSettings.java
@@ -20,15 +20,18 @@ import com.intellij.codeInsight.template.Template;
 import com.intellij.openapi.application.ex.DecodeDefaultsUtil;
 import com.intellij.openapi.components.*;
 import com.intellij.openapi.diagnostic.Logger;
-import com.intellij.openapi.extensions.Extensions;
 import com.intellij.openapi.options.BaseSchemeProcessor;
 import com.intellij.openapi.options.SchemeProcessor;
 import com.intellij.openapi.options.SchemesManager;
 import com.intellij.openapi.options.SchemesManagerFactory;
+import com.intellij.openapi.util.Comparing;
 import com.intellij.openapi.util.InvalidDataException;
 import com.intellij.openapi.util.JDOMUtil;
 import com.intellij.openapi.util.WriteExternalException;
+import com.intellij.util.SmartList;
 import com.intellij.util.containers.MultiMap;
+import com.intellij.util.xmlb.Converter;
+import com.intellij.util.xmlb.annotations.OptionTag;
 import org.jdom.Document;
 import org.jdom.Element;
 import org.jdom.JDOMException;
@@ -42,19 +45,22 @@ import java.util.*;
 
 @State(
   name = "TemplateSettings",
-  storages = @Storage(file = StoragePathMacros.APP_CONFIG + "/other.xml")
+  storages = {
+    @Storage(file = StoragePathMacros.APP_CONFIG + "/other.xml"),
+    @Storage(file = StoragePathMacros.APP_CONFIG + "/templates.xml")
+  },
+  storageChooser = LastStorageChooserForWrite.class
 )
-public class TemplateSettings implements PersistentStateComponent<Element> {
+public class TemplateSettings implements PersistentStateComponent<TemplateSettings.State> {
   private static final Logger LOG = Logger.getInstance(TemplateSettings.class);
 
+  private static final String FILE_SPEC = StoragePathMacros.ROOT_CONFIG + "/templates";
+
   @NonNls public static final String USER_GROUP_NAME = "user";
   @NonNls private static final String TEMPLATE_SET = "templateSet";
   @NonNls private static final String GROUP = "group";
   @NonNls private static final String TEMPLATE = "template";
 
-  @NonNls private static final String DELETED_TEMPLATES = "deleted_templates";
-  private final List<TemplateKey> myDeletedTemplates = new ArrayList<TemplateKey>();
-
   public static final char SPACE_CHAR = ' ';
   public static final char TAB_CHAR = '\t';
   public static final char ENTER_CHAR = '\n';
@@ -81,22 +87,48 @@ public class TemplateSettings implements PersistentStateComponent<Element> {
   @NonNls private static final String TO_SHORTEN_FQ_NAMES = "toShortenFQNames";
   @NonNls private static final String USE_STATIC_IMPORT = "useStaticImport";
 
-  @NonNls private static final String DEFAULT_SHORTCUT = "defaultShortcut";
   @NonNls private static final String DEACTIVATED = "deactivated";
 
   @NonNls private static final String RESOURCE_BUNDLE = "resource-bundle";
   @NonNls private static final String KEY = "key";
   @NonNls private static final String ID = "id";
 
-  private final MultiMap<String,TemplateImpl> myTemplates = MultiMap.createLinked();
-    
-  private final Map<String,Template> myTemplatesById = new LinkedHashMap<String,Template>();
-  private final Map<TemplateKey,TemplateImpl> myDefaultTemplates = new LinkedHashMap<TemplateKey, TemplateImpl>();
+  private final MultiMap<String, TemplateImpl> myTemplates = MultiMap.createLinked();
+
+  private final Map<String, Template> myTemplatesById = new LinkedHashMap<String, Template>();
+  private final Map<TemplateKey, TemplateImpl> myDefaultTemplates = new LinkedHashMap<TemplateKey, TemplateImpl>();
 
   private int myMaxKeyLength = 0;
-  private char myDefaultShortcutChar = TAB_CHAR;
   private final SchemesManager<TemplateGroup, TemplateGroup> mySchemesManager;
-  private static final String FILE_SPEC = StoragePathMacros.ROOT_CONFIG + "/templates";
+
+  private State myState = new State();
+
+  static final class ShortcutConverter extends Converter<Character> {
+    @Nullable
+    @Override
+    public Character fromString(@NotNull String shortcut) {
+      return TAB.equals(shortcut) ? TAB_CHAR :
+             ENTER.equals(shortcut) ? ENTER_CHAR :
+             CUSTOM.equals(shortcut) ? CUSTOM_CHAR :
+             SPACE_CHAR;
+    }
+
+    @NotNull
+    @Override
+    public String toString(@NotNull Character shortcut) {
+      return shortcut == TAB_CHAR ? TAB :
+             shortcut == ENTER_CHAR ? ENTER :
+             shortcut == CUSTOM_CHAR ? CUSTOM :
+             SPACE;
+    }
+  }
+
+  final static class State {
+    @OptionTag(nameAttribute = "", valueAttribute = "shortcut", converter = ShortcutConverter.class)
+    public char defaultShortcut = TAB_CHAR;
+
+    public List<TemplateSettings.TemplateKey> deletedKeys = new SmartList<TemplateKey>();
+  }
 
   public static class TemplateKey {
     private String groupName;
@@ -119,11 +151,7 @@ public class TemplateSettings implements PersistentStateComponent<Element> {
       if (o == null || getClass() != o.getClass()) return false;
 
       TemplateKey that = (TemplateKey)o;
-
-      if (groupName != null ? !groupName.equals(that.groupName) : that.groupName != null) return false;
-      if (key != null ? !key.equals(that.key) : that.key != null) return false;
-
-      return true;
+      return Comparing.equal(groupName, that.groupName) && Comparing.equal(key, that.key);
     }
 
     public int hashCode() {
@@ -151,14 +179,13 @@ public class TemplateSettings implements PersistentStateComponent<Element> {
 
     @Override
     public String toString() {
-      return getKey()+"@" + getGroupName();
+      return getKey() + "@" + getGroupName();
     }
   }
 
   private TemplateKey myLastSelectedTemplate;
 
   public TemplateSettings(SchemesManagerFactory schemesManagerFactory) {
-
     SchemeProcessor<TemplateGroup> processor = new BaseSchemeProcessor<TemplateGroup>() {
       @Override
       @Nullable
@@ -179,7 +206,7 @@ public class TemplateSettings implements PersistentStateComponent<Element> {
       }
 
       @Override
-      public Element writeScheme(@NotNull final TemplateGroup template) {
+      public Element writeScheme(@NotNull TemplateGroup template) {
         Element templateSetElement = new Element(TEMPLATE_SET);
         templateSetElement.setAttribute(GROUP, template.getName());
 
@@ -221,10 +248,13 @@ public class TemplateSettings implements PersistentStateComponent<Element> {
     loadTemplates();
   }
 
+  public static TemplateSettings getInstance() {
+    return ServiceManager.getService(TemplateSettings.class);
+  }
+
   private boolean differsFromDefault(TemplateImpl t) {
     TemplateImpl def = getDefaultTemplate(t);
-    if (def == null) return true;
-    return !t.equals(def) || !t.contextsEqual(def);
+    return def == null || !t.equals(def) || !t.contextsEqual(def);
   }
 
   @Nullable
@@ -232,67 +262,32 @@ public class TemplateSettings implements PersistentStateComponent<Element> {
     return myDefaultTemplates.get(TemplateKey.keyOf(t));
   }
 
-  public static TemplateSettings getInstance() {
-    return ServiceManager.getService(TemplateSettings.class);
+  @Override
+  public State getState() {
+    return myState;
   }
 
   @Override
-  public void loadState(Element parentNode) {
-    Element element = parentNode.getChild(DEFAULT_SHORTCUT);
-    if (element != null) {
-      String shortcut = element.getAttributeValue(SHORTCUT);
-      myDefaultShortcutChar = TAB.equals(shortcut) ? TAB_CHAR :
-                              ENTER.equals(shortcut) ? ENTER_CHAR :
-                              CUSTOM.equals(shortcut) ? CUSTOM_CHAR :
-                              SPACE_CHAR;
-    }
+  public void loadState(State state) {
+    myState = state;
 
-    ExportableTemplateSettings exportableSettings = ServiceManager.getService(ExportableTemplateSettings.class);
-    assert exportableSettings != null : "Can't find required ExportableTemplateSettings service.";
-    exportableSettings.setParentSettings(this);
-    if (exportableSettings.isLoaded()) {
-      myDeletedTemplates.addAll(exportableSettings.getDeletedKeys());
-    }
-    else {
-      Element deleted = parentNode.getChild(DELETED_TEMPLATES);
-      if (deleted != null) {
-        List children = deleted.getChildren();
-        for (final Object aChildren : children) {
-          Element child = (Element)aChildren;
-          myDeletedTemplates.add(new TemplateKey(child.getAttributeValue(GROUP), child.getAttributeValue(NAME)));
-        }
-      }
-    }
+    applyNewDeletedTemplates();
+  }
 
-    for (TemplateKey templateKey : myDeletedTemplates) {
+  void applyNewDeletedTemplates() {
+    for (TemplateKey templateKey : myState.deletedKeys) {
       if (templateKey.groupName == null) {
-        final Collection<TemplateImpl> templates = new ArrayList<TemplateImpl>(myTemplates.get(templateKey.key));
-        for (TemplateImpl template : templates) {
+        for (TemplateImpl template : new ArrayList<TemplateImpl>(myTemplates.get(templateKey.key))) {
           removeTemplate(template);
         }
       }
       else {
-        final TemplateImpl toDelete = getTemplate(templateKey.key, templateKey.groupName);
+        TemplateImpl toDelete = getTemplate(templateKey.key, templateKey.groupName);
         if (toDelete != null) {
           removeTemplate(toDelete);
         }
       }
     }
-
-    //TODO lesya reload schemes
-  }
-
-  @Override
-  public Element getState()  {
-    Element parentNode = new Element("TemplateSettings");
-    Element element = new Element(DEFAULT_SHORTCUT);
-    element.setAttribute(SHORTCUT, myDefaultShortcutChar == TAB_CHAR ? TAB :
-                                   myDefaultShortcutChar == ENTER_CHAR ? ENTER :
-                                   myDefaultShortcutChar == CUSTOM_CHAR ? CUSTOM :
-                                   SPACE);
-    parentNode.addContent(element);
-
-    return parentNode;
   }
 
   @Nullable
@@ -309,6 +304,7 @@ public class TemplateSettings implements PersistentStateComponent<Element> {
     myLastSelectedTemplate = group == null ? null : new TemplateKey(group, key);
   }
 
+  @SuppressWarnings("unused")
   public Collection<? extends TemplateImpl> getTemplatesAsList() {
     return myTemplates.values();
   }
@@ -319,11 +315,11 @@ public class TemplateSettings implements PersistentStateComponent<Element> {
   }
 
   public char getDefaultShortcutChar() {
-    return myDefaultShortcutChar;
+    return myState.defaultShortcut;
   }
 
   public void setDefaultShortcutChar(char defaultShortcutChar) {
-    myDefaultShortcutChar = defaultShortcutChar;
+    myState.defaultShortcut = defaultShortcutChar;
   }
 
   public Collection<TemplateImpl> getTemplates(@NonNls String key) {
@@ -378,15 +374,14 @@ public class TemplateSettings implements PersistentStateComponent<Element> {
     }
   }
 
-  private void addTemplateImpl(Template template) {
-    final TemplateImpl templateImpl = (TemplateImpl)template;
+  private void addTemplateImpl(@NotNull Template template) {
+    TemplateImpl templateImpl = (TemplateImpl)template;
     if (getTemplate(templateImpl.getKey(), templateImpl.getGroupName()) == null) {
       myTemplates.putValue(template.getKey(), templateImpl);
     }
 
     myMaxKeyLength = Math.max(myMaxKeyLength, template.getKey().length());
-    myDeletedTemplates.remove(TemplateKey.keyOf((TemplateImpl)template));
-
+    myState.deletedKeys.remove(TemplateKey.keyOf((TemplateImpl)template));
   }
 
   private void addTemplateById(Template template) {
@@ -398,19 +393,15 @@ public class TemplateSettings implements PersistentStateComponent<Element> {
     }
   }
 
-  public void removeTemplate(Template template) {
+  public void removeTemplate(@NotNull Template template) {
     myTemplates.remove(template.getKey(), (TemplateImpl)template);
 
-    TemplateImpl templateImpl = (TemplateImpl)template;
-    String groupName = templateImpl.getGroupName();
-    TemplateGroup group = mySchemesManager.findSchemeByName(groupName);
-
+    TemplateGroup group = mySchemesManager.findSchemeByName(((TemplateImpl)template).getGroupName());
     if (group != null) {
       group.removeElement((TemplateImpl)template);
       if (group.isEmpty()) {
         mySchemesManager.removeScheme(group);
       }
-
     }
   }
 
@@ -421,11 +412,14 @@ public class TemplateSettings implements PersistentStateComponent<Element> {
     template.setDescription(description);
     if (TAB.equals(shortcut)) {
       template.setShortcutChar(TAB_CHAR);
-    } else if (ENTER.equals(shortcut)) {
+    }
+    else if (ENTER.equals(shortcut)) {
       template.setShortcutChar(ENTER_CHAR);
-    } else if (SPACE.equals(shortcut)) {
+    }
+    else if (SPACE.equals(shortcut)) {
       template.setShortcutChar(SPACE_CHAR);
-    } else {
+    }
+    else {
       template.setShortcutChar(DEFAULT_CHAR);
     }
     if (isDefault) {
@@ -435,11 +429,8 @@ public class TemplateSettings implements PersistentStateComponent<Element> {
   }
 
   private void loadTemplates() {
-    Collection<TemplateGroup> loaded = mySchemesManager.loadSchemes();
-    for (TemplateGroup group : loaded) {
-      Collection<TemplateImpl> templates = group.getElements();
-
-      for (TemplateImpl template : templates) {
+    for (TemplateGroup group : mySchemesManager.loadSchemes()) {
+      for (TemplateImpl template : group.getElements()) {
         addTemplateImpl(template);
       }
     }
@@ -449,7 +440,7 @@ public class TemplateSettings implements PersistentStateComponent<Element> {
 
   private void loadDefaultLiveTemplates() {
     try {
-      for(DefaultLiveTemplatesProvider provider: Extensions.getExtensions(DefaultLiveTemplatesProvider.EP_NAME)) {
+      for (DefaultLiveTemplatesProvider provider : DefaultLiveTemplatesProvider.EP_NAME.getExtensions()) {
         for (String defTemplate : provider.getDefaultLiveTemplateFiles()) {
           readDefTemplate(provider, defTemplate, true);
         }
@@ -464,7 +455,8 @@ public class TemplateSettings implements PersistentStateComponent<Element> {
         catch (AbstractMethodError ignore) {
         }
       }
-    } catch (Exception e) {
+    }
+    catch (Exception e) {
       LOG.error(e);
     }
   }
@@ -474,11 +466,9 @@ public class TemplateSettings implements PersistentStateComponent<Element> {
     String templateName = getDefaultTemplateName(defTemplate);
     InputStream inputStream = DecodeDefaultsUtil.getDefaultsInputStream(provider, defTemplate);
     if (inputStream != null) {
-      TemplateGroup group =
-        readTemplateFile(JDOMUtil.loadDocument(inputStream), templateName, true, registerTemplate, provider.getClass().getClassLoader());
+      TemplateGroup group = readTemplateFile(JDOMUtil.loadDocument(inputStream), templateName, true, registerTemplate, provider.getClass().getClassLoader());
       if (group != null && group.getReplace() != null) {
-        Collection<TemplateImpl> templates = myTemplates.get(group.getReplace());
-        for (TemplateImpl template : templates) {
+        for (TemplateImpl template : myTemplates.get(group.getReplace())) {
           removeTemplate(template);
         }
       }
@@ -486,7 +476,7 @@ public class TemplateSettings implements PersistentStateComponent<Element> {
   }
 
   private static String getDefaultTemplateName(String defTemplate) {
-    return defTemplate.substring(defTemplate.lastIndexOf("/") + 1);
+    return defTemplate.substring(defTemplate.lastIndexOf('/') + 1);
   }
 
   @Nullable
@@ -511,7 +501,7 @@ public class TemplateSettings implements PersistentStateComponent<Element> {
 
       TemplateImpl template = readTemplateFromElement(isDefault, groupName, element, classLoader);
       TemplateImpl existing = getTemplate(template.getKey(), template.getGroupName());
-      boolean defaultTemplateModified = isDefault && (myDeletedTemplates.contains(TemplateKey.keyOf(template)) ||
+      boolean defaultTemplateModified = isDefault && (myState.deletedKeys.contains(TemplateKey.keyOf(template)) ||
                                                       myTemplatesById.containsKey(template.getId()) ||
                                                       existing != null);
 
@@ -648,11 +638,11 @@ public class TemplateSettings implements PersistentStateComponent<Element> {
     templateSetElement.addContent(element);
   }
 
-  public void setTemplates(List<TemplateGroup> newGroups) {
+  public void setTemplates(@NotNull List<TemplateGroup> newGroups) {
     myTemplates.clear();
-    myDeletedTemplates.clear();
+    myState.deletedKeys.clear();
     for (TemplateImpl template : myDefaultTemplates.values()) {
-      myDeletedTemplates.add(TemplateKey.keyOf(template));
+      myState.deletedKeys.add(TemplateKey.keyOf(template));
     }
     mySchemesManager.clearAllSchemes();
     myMaxKeyLength = 0;
@@ -695,20 +685,15 @@ public class TemplateSettings implements PersistentStateComponent<Element> {
 
   public char getShortcutChar(TemplateImpl template) {
     char c = template.getShortcutChar();
-    if (c == DEFAULT_CHAR) {
-      return getDefaultShortcutChar();
-    }
-    else {
-      return c;
-    }
+    return c == DEFAULT_CHAR ? getDefaultShortcutChar() : c;
   }
 
   public List<TemplateKey> getDeletedTemplates() {
-    return myDeletedTemplates;
+    return myState.deletedKeys;
   }
 
   public void reset() {
-    myDeletedTemplates.clear();
+    myState.deletedKeys.clear();
     loadDefaultLiveTemplates();
   }
 }
diff --git a/platform/platform-resources-en/src/messages/ApplicationBundle.properties b/platform/platform-resources-en/src/messages/ApplicationBundle.properties
index 66f2daad0b43..6162300942a0 100644
--- a/platform/platform-resources-en/src/messages/ApplicationBundle.properties
+++ b/platform/platform-resources-en/src/messages/ApplicationBundle.properties
@@ -312,7 +312,7 @@ checkbox.spaces.after.semicolon=After semicolon
 checkbox.spaces.before.semicolon=Before semicolon
 checkbox.spaces.after.type.cast=After type cast
 title.warning=Warning
-title.editor=Editor
+title.editor=General
 combobox.strip.modified.lines=Modified Lines
 combobox.strip.all=All
 combobox.strip.none=None
diff --git a/platform/util/src/com/intellij/util/xmlb/OptionTagBinding.java b/platform/util/src/com/intellij/util/xmlb/OptionTagBinding.java
index d7a14bb32dae..8dec40c854a0 100644
--- a/platform/util/src/com/intellij/util/xmlb/OptionTagBinding.java
+++ b/platform/util/src/com/intellij/util/xmlb/OptionTagBinding.java
@@ -42,16 +42,21 @@ class OptionTagBinding extends BasePrimitiveBinding {
   public OptionTagBinding(@NotNull Accessor accessor, @Nullable OptionTag optionTag) {
     super(accessor, optionTag == null ? null : optionTag.value(), optionTag == null ? null : optionTag.converter());
 
-    if (optionTag != null) {
-      myTagName = optionTag.tag();
-      myNameAttribute = optionTag.nameAttribute();
-      myValueAttribute = optionTag.valueAttribute();
-    }
-    else {
+    if (optionTag == null) {
       myTagName = Constants.OPTION;
       myNameAttribute = Constants.NAME;
       myValueAttribute = Constants.VALUE;
     }
+    else {
+      myNameAttribute = optionTag.nameAttribute();
+      myValueAttribute = optionTag.valueAttribute();
+
+      String tagName = optionTag.tag();
+      if (StringUtil.isEmpty(myNameAttribute) && Constants.OPTION.equals(tagName)) {
+        tagName = myAccessor.getName();
+      }
+      myTagName = tagName;
+    }
   }
 
   @Override
diff --git a/platform/util/src/com/intellij/util/xmlb/XmlSerializerImpl.java b/platform/util/src/com/intellij/util/xmlb/XmlSerializerImpl.java
index f001872a1a43..b2f354e1e3a9 100644
--- a/platform/util/src/com/intellij/util/xmlb/XmlSerializerImpl.java
+++ b/platform/util/src/com/intellij/util/xmlb/XmlSerializerImpl.java
@@ -144,21 +144,38 @@ class XmlSerializerImpl {
   @Nullable
   @SuppressWarnings({"unchecked"})
   static <T> T convert(Object value, Class<T> type) {
-    if (value == null) return null;
-    if (type.isInstance(value)) return (T)value;
-    if (String.class.isAssignableFrom(type)) return (T)String.valueOf(value);
-    if (int.class.isAssignableFrom(type) || Integer.class.isAssignableFrom(type)) return (T)Integer.valueOf(String.valueOf(value));
-    if (double.class.isAssignableFrom(type) || Double.class.isAssignableFrom(type)) return (T)Double.valueOf(String.valueOf(value));
-    if (float.class.isAssignableFrom(type) || Float.class.isAssignableFrom(type)) return (T)Float.valueOf(String.valueOf(value));
-    if (long.class.isAssignableFrom(type) || Long.class.isAssignableFrom(type)) return (T)Long.valueOf(String.valueOf(value));
-    if (boolean.class.isAssignableFrom(type) || Boolean.class.isAssignableFrom(type)) return (T)Boolean.valueOf(String.valueOf(value));
-
+    if (value == null) {
+      return null;
+    }
+    if (type.isInstance(value)) {
+      return (T)value;
+    }
+    if (String.class.isAssignableFrom(type)) {
+      return (T)String.valueOf(value);
+    }
+    if (int.class.isAssignableFrom(type) || Integer.class.isAssignableFrom(type)) {
+      return (T)Integer.valueOf(String.valueOf(value));
+    }
+    if (double.class.isAssignableFrom(type) || Double.class.isAssignableFrom(type)) {
+      return (T)Double.valueOf(String.valueOf(value));
+    }
+    if (float.class.isAssignableFrom(type) || Float.class.isAssignableFrom(type)) {
+      return (T)Float.valueOf(String.valueOf(value));
+    }
+    if (long.class.isAssignableFrom(type) || Long.class.isAssignableFrom(type)) {
+      return (T)Long.valueOf(String.valueOf(value));
+    }
+    if (boolean.class.isAssignableFrom(type) || Boolean.class.isAssignableFrom(type)) {
+      return (T)Boolean.valueOf(String.valueOf(value));
+    }
+    if (char.class.isAssignableFrom(type) || Character.class.isAssignableFrom(type)) {
+      return (T)value;
+    }
     if (type.isEnum()) {
       final T[] enumConstants = type.getEnumConstants();
       for (T enumConstant : enumConstants) {
         if (enumConstant.toString().equals(value.toString())) return enumConstant;
       }
-
       return null;
     }
 
diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/frame/DetailsPanel.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/frame/DetailsPanel.java
index ab5ad808feb9..b65b6cdef9a2 100644
--- a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/frame/DetailsPanel.java
+++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/frame/DetailsPanel.java
@@ -23,6 +23,7 @@ import com.intellij.openapi.vcs.changes.issueLinks.IssueLinkHtmlRenderer;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.ui.BrowserHyperlinkListener;
 import com.intellij.ui.ScrollPaneFactory;
+import com.intellij.ui.components.JBLabel;
 import com.intellij.ui.components.JBLoadingPanel;
 import com.intellij.ui.components.panels.NonOpaquePanel;
 import com.intellij.util.containers.ContainerUtil;
@@ -98,11 +99,15 @@ class DetailsPanel extends JPanel implements ListSelectionListener {
     content.add(myRefsPanel, "");
     content.add(myCommitDetailsPanel, "");
 
-    myLoadingPanel = new JBLoadingPanel(new BorderLayout(), logDataHolder, ProgressWindow.DEFAULT_PROGRESS_DIALOG_POSTPONE_TIME_MILLIS);
+    myLoadingPanel = new JBLoadingPanel(new BorderLayout(), logDataHolder, ProgressWindow.DEFAULT_PROGRESS_DIALOG_POSTPONE_TIME_MILLIS) {
+      @Override
+      public Color getBackground() {
+        return getDetailsBackground();
+      }
+    };
     myLoadingPanel.add(scrollPane);
 
     myMessagePanel = new MessagePanel();
-    setBackground(UIUtil.getTableBackground());
 
     setLayout(new CardLayout());
     add(myLoadingPanel, STANDARD_LAYER);
@@ -117,7 +122,7 @@ class DetailsPanel extends JPanel implements ListSelectionListener {
   }
 
   private static Color getDetailsBackground() {
-    return UIUtil.isUnderGTKLookAndFeel() ? UIManager.getColor("EditorPane.background") : UIUtil.getPanelBackground();
+    return UIUtil.getTableBackground();
   }
 
   void updateDataPack(@NotNull VisiblePack dataPack) {