diff --git a/_windows/keymap.xml b/_windows/keymap.xml
new file mode 100644
index 0000000..8497d4d
--- /dev/null
+++ b/_windows/keymap.xml
@@ -0,0 +1,5 @@
+<application>
+  <component name="KeymapManager">
+    <active_keymap name="DebuggerX" />
+  </component>
+</application>
\ No newline at end of file
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/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">
diff --git a/keymaps/DebuggerX.xml b/keymaps/DebuggerX.xml
index 5e53c4d..df7d159 100644
--- a/keymaps/DebuggerX.xml
+++ b/keymaps/DebuggerX.xml
@@ -1,36 +1,36 @@
-<keymap version="1" name="DebuggerX" parent="Default for XWin">				
-  <action id="$EditorTranslateAction">				
-    <keyboard-shortcut first-keystroke="alt x" />				
-  </action>				
-  <action id="$TranslateAndReplaceAction">				
-    <keyboard-shortcut first-keystroke="alt z" />				
-  </action>				
-  <action id="CodeCompletion">				
-    <keyboard-shortcut first-keystroke="alt slash" />				
-  </action>				
-  <action id="Editor EditorTranslateAction">				
-    <keyboard-shortcut first-keystroke="alt x" />				
-  </action>				
-  <action id="Editor TranslateAndReplaceAction">				
-    <keyboard-shortcut first-keystroke="alt z" />				
-  </action>				
-  <action id="FindInPath">				
-    <keyboard-shortcut first-keystroke="shift alt f" />				
-  </action>				
-  <action id="HippieBackwardCompletion" />				
-  <action id="HippieCompletion" />				
-  <action id="ReformatCode">				
-    <keyboard-shortcut first-keystroke="ctrl alt l" />				
-    <keyboard-shortcut first-keystroke="shift ctrl f" />				
-  </action>				
-  <action id="SmartTypeCompletion">				
-    <keyboard-shortcut first-keystroke="shift alt slash" />				
-  </action>				
-  <action id="UpdateRunningApplication" />				
-  <action id="android.deploy.ApplyChanges">				
-    <keyboard-shortcut first-keystroke="ctrl f10" />				
-  </action>				
-  <action id="android.deploy.CodeSwap">				
-    <keyboard-shortcut first-keystroke="ctrl alt f10" />				
-  </action>				
+<keymap version="1" name="DebuggerX" parent="Default for XWin">
+  <action id="$EditorTranslateAction">
+    <keyboard-shortcut first-keystroke="alt x" />
+  </action>
+  <action id="$TranslateAndReplaceAction">
+    <keyboard-shortcut first-keystroke="alt z" />
+  </action>
+  <action id="CodeCompletion">
+    <keyboard-shortcut first-keystroke="alt slash" />
+  </action>
+  <action id="Editor EditorTranslateAction">
+    <keyboard-shortcut first-keystroke="alt x" />
+  </action>
+  <action id="Editor TranslateAndReplaceAction">
+    <keyboard-shortcut first-keystroke="alt z" />
+  </action>
+  <action id="FindInPath">
+    <keyboard-shortcut first-keystroke="shift alt f" />
+  </action>
+  <action id="HippieBackwardCompletion" />
+  <action id="HippieCompletion" />
+  <action id="ReformatCode">
+    <keyboard-shortcut first-keystroke="ctrl alt l" />
+    <keyboard-shortcut first-keystroke="shift ctrl f" />
+  </action>
+  <action id="SmartTypeCompletion">
+    <keyboard-shortcut first-keystroke="shift alt slash" />
+  </action>
+  <action id="UpdateRunningApplication" />
+  <action id="android.deploy.ApplyChanges">
+    <keyboard-shortcut first-keystroke="ctrl f10" />
+  </action>
+  <action id="android.deploy.CodeSwap">
+    <keyboard-shortcut first-keystroke="ctrl alt f10" />
+  </action>
 </keymap>
\ No newline at end of file