diff --git a/codestyles/Default.xml b/codestyles/Default.xml
index 2d5f093..777e137 100644
--- a/codestyles/Default.xml
+++ b/codestyles/Default.xml
@@ -27,15 +27,7 @@
     </value>
   </option>
   <option name="RIGHT_MARGIN" value="100" />
-  <AndroidXmlCodeStyleSettings>
-    <option name="USE_CUSTOM_SETTINGS" value="true" />
-  </AndroidXmlCodeStyleSettings>
   <JavaCodeStyleSettings>
-    <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" />
-    <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" />
-    <option name="PACKAGES_TO_USE_IMPORT_ON_DEMAND">
-      <value />
-    </option>
     <option name="IMPORT_LAYOUT_TABLE">
       <value>
         <package name="android" withSubpackages="true" static="false" />
@@ -61,12 +53,6 @@
       </value>
     </option>
   </JavaCodeStyleSettings>
-  <XML>
-    <option name="XML_KEEP_LINE_BREAKS" value="false" />
-    <option name="XML_ALIGN_ATTRIBUTES" value="false" />
-    <option name="XML_SPACE_INSIDE_EMPTY_TAG" value="true" />
-    <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
-  </XML>
   <codeStyleSettings language="XML">
     <option name="FORCE_REARRANGE_MODE" value="1" />
     <indentOptions>
diff --git a/find.xml b/find.xml
index 31d19aa..9d6ee4a 100644
--- a/find.xml
+++ b/find.xml
@@ -2,8 +2,8 @@
   <component name="FindSettings">
     <option name="customScope" value="All Places" />
     <option name="defaultScopeName" value="All Places" />
-    <option name="localCaseSensitive" value="true" />
-    <option name="LOCAL_CASE_SENSITIVE_SEARCH" value="true" />
+    <option name="localRegularExpressions" value="true" />
+    <option name="LOCAL_REGULAR_EXPRESSIONS" value="true" />
     <option name="SEARCH_SCOPE" value="All Places" />
     <mask>*.css</mask>
     <mask>*.html</mask>
diff --git a/ide.general.xml b/ide.general.xml
index 2edc4d6..55f7550 100644
--- a/ide.general.xml
+++ b/ide.general.xml
@@ -7,11 +7,10 @@
     <option name="confirmOpenNewProject2" value="0" />
   </component>
   <component name="Registry">
-    <entry key="ide.instant.shutdown" value="false" />
     <entry key="ide.experimental.ui" value="false" />
     <entry key="ide.experimental.ui.inter.font" value="false" />
-    <entry key="debugger.new.tool.window.layout" value="false" />
     <entry key="idea.plugins.compatible.build" value="" />
+    <entry key="ide.instant.shutdown" value="false" />
   </component>
   <component name="StatusBar">
     <option name="widgets">