diff --git a/codestyles/Default _1_.xml b/codestyles/Default _1_.xml
index 84e633a..542c6f9 100644
--- a/codestyles/Default _1_.xml	
+++ b/codestyles/Default _1_.xml	
@@ -60,6 +60,14 @@
   <codeStyleSettings language="Dart">
     <option name="RIGHT_MARGIN" value="120" />
   </codeStyleSettings>
+  <codeStyleSettings language="EditorConfig">
+    <option name="SPACE_AFTER_COLON" value="true" />
+    <indentOptions>
+      <option name="INDENT_SIZE" value="2" />
+      <option name="CONTINUATION_INDENT_SIZE" value="4" />
+      <option name="TAB_SIZE" value="2" />
+    </indentOptions>
+  </codeStyleSettings>
   <codeStyleSettings language="JAVA">
     <option name="KEEP_FIRST_COLUMN_COMMENT" value="false" />
     <option name="KEEP_CONTROL_STATEMENT_IN_ONE_LINE" value="false" />
diff --git a/colors/My Vim dark .icls b/colors/My Vim dark .icls
index 0e606d1..766d485 100644
--- a/colors/My Vim dark .icls	
+++ b/colors/My Vim dark .icls	
@@ -1,15 +1,5 @@
 <scheme name="My Vim dark " version="142" parent_scheme="Default">
   <option name="FONT_SCALE" value="1.5" />
-  <option name="LINE_SPACING" value="1.0" />
-  <font>
-    <option name="EDITOR_FONT_NAME" value="Fira Code SemiBold" />
-    <option name="EDITOR_FONT_SIZE" value="21" />
-  </font>
-  <font>
-    <option name="EDITOR_FONT_NAME" value="Noto Sans CJK SC Regular" />
-    <option name="EDITOR_FONT_SIZE" value="22" />
-  </font>
-  <option name="EDITOR_LIGATURES" value="true" />
   <console-font>
     <option name="EDITOR_FONT_NAME" value="DejaVu Sans Mono" />
     <option name="EDITOR_FONT_SIZE" value="18" />
@@ -18,6 +8,7 @@
     <option name="EDITOR_FONT_NAME" value="Noto Sans CJK SC Regular" />
     <option name="EDITOR_FONT_SIZE" value="18" />
   </console-font>
+  <option name="CONSOLE_LINE_SPACING" value="1.0" />
   <colors>
     <option name="ADDED_LINES_COLOR" value="295622" />
     <option name="BORDER_LINES_COLOR" value="cfe7ff" />
diff --git a/editor-font.xml b/editor-font.xml
index 653d8a9..c7e1c46 100644
--- a/editor-font.xml
+++ b/editor-font.xml
@@ -2,9 +2,12 @@
   <component name="DefaultFont">
     <option name="VERSION" value="1" />
     <option name="FONT_SIZE" value="20" />
-    <option name="FONT_SIZE_2D" value="19.5" />
-    <option name="FONT_REGULAR_SUB_FAMILY" value="Regular" />
+    <option name="FONT_SIZE_2D" value="20.0" />
+    <option name="FONT_FAMILY" value="Fira Code" />
+    <option name="FONT_REGULAR_SUB_FAMILY" value="SemiBold" />
     <option name="FONT_BOLD_SUB_FAMILY" value="Bold" />
     <option name="FONT_SCALE" value="1.5" />
+    <option name="USE_LIGATURES" value="true" />
+    <option name="SECONDARY_FONT_FAMILY" value="WenQuanYi Micro Hei" />
   </component>
 </application>
\ No newline at end of file
diff --git a/editor.xml b/editor.xml
index 53fcf47..5a814ed 100644
--- a/editor.xml
+++ b/editor.xml
@@ -1,6 +1,6 @@
 <application>
   <component name="CodeFoldingSettings">
-    <option name="COLLAPSE_DOC_COMMENTS" value="true" />
+    <option name="COLLAPSE_IMPORTS" value="false" />
   </component>
   <component name="CodeInsightSettings">
     <option name="completionCaseSensitive" value="2" />
@@ -23,6 +23,7 @@
   <component name="EditorSettings">
     <option name="USE_SOFT_WRAPS" value="CONSOLE" />
     <option name="ENABLE_RENDERED_DOC" value="true" />
+    <option name="USE_EDITOR_FONT_IN_INLAYS" value="true" />
     <option name="IS_DND_ENABLED" value="false" />
   </component>
   <component name="InlayHintsSettings">
diff --git a/ide.general.xml b/ide.general.xml
index b2d9ef4..7c807d4 100644
--- a/ide.general.xml
+++ b/ide.general.xml
@@ -11,6 +11,7 @@
     <entry key="external.system.auto.import.disabled" value="true" />
     <entry key="ide.text.editor.with.preview.show.floating.toolbar" value="false" />
     <entry key="gradle.version.catalogs.dynamic.support" value="true" />
+    <entry key="ide.instant.shutdown" value="false" />
   </component>
   <component name="StatusBar">
     <option name="widgets">
diff --git a/keymaps/Default copy.xml b/keymaps/Default copy.xml
index 44e4940..59ea20c 100644
--- a/keymaps/Default copy.xml	
+++ b/keymaps/Default copy.xml	
@@ -36,6 +36,7 @@
   <action id="GotoNextError">
     <keyboard-shortcut first-keystroke="f1" />
   </action>
+  <action id="GotoTest" />
   <action id="HippieCompletion">
     <keyboard-shortcut first-keystroke="ctrl space" />
   </action>
@@ -49,10 +50,15 @@
   <action id="ReformatCode">
     <keyboard-shortcut first-keystroke="shift ctrl f" />
   </action>
+  <action id="ResourceExplorer.show" />
+  <action id="ServiceView.ShowServices" />
   <action id="ShowSettings" />
   <action id="StartStopMacroRecording">
     <keyboard-shortcut first-keystroke="shift ctrl alt f6" />
   </action>
+  <action id="SurroundWith">
+    <keyboard-shortcut first-keystroke="shift ctrl t" />
+  </action>
   <action id="SwitchApply">
     <keyboard-shortcut first-keystroke="shift alt enter" />
   </action>
diff --git a/templates/DebuggerX.xml b/templates/DebuggerX.xml
index 62556f8..47fed0c 100644
--- a/templates/DebuggerX.xml
+++ b/templates/DebuggerX.xml
@@ -4,6 +4,7 @@
     <variable name="viewid" expression="" defaultValue="" alwaysStopAt="true" />
     <variable name="options" expression="" defaultValue="" alwaysStopAt="true" />
     <context>
+      <option name="DART" value="true" />
       <option name="JAVA_CODE" value="true" />
     </context>
   </template>
@@ -13,7 +14,7 @@
       <option name="JAVA_CODE" value="true" />
     </context>
   </template>
-  <template name="ssf" value="/// $comment$&#10;static String $name$($params$) =&gt; '$baseURL/$path$/';" description="static String function" toReformat="false" toShortenFQNames="true">
+  <template name="ssf" value="/// $comment$&#10;static String $name$($params$) =&gt; '$baseURL/$path$/';" description="static String function" toReformat="false" toShortenFQNames="true" deactivated="true">
     <variable name="name" expression="" defaultValue="" alwaysStopAt="true" />
     <variable name="params" expression="" defaultValue="" alwaysStopAt="true" />
     <variable name="path" expression="" defaultValue="" alwaysStopAt="true" />
@@ -22,7 +23,7 @@
       <option name="DART" value="true" />
     </context>
   </template>
-  <template name="resp" value="/// $comment$&#10;Future&lt;$type$&gt; $name$({@required $params$}) =&gt; _post&lt;$type$&gt;(&#10;    $path$,&#10;    (json) =&gt; $type$(json),&#10;    data: {'$params$': $params$},&#10;);" description="create a request function" toReformat="false" toShortenFQNames="true">
+  <template name="resp" value="/// $comment$&#10;Future&lt;$type$&gt; $name$({@required $params$}) =&gt; _post&lt;$type$&gt;(&#10;    $path$,&#10;    (json) =&gt; $type$(json),&#10;    data: {'$params$': $params$},&#10;);" description="create a request function" toReformat="false" toShortenFQNames="true" deactivated="true">
     <variable name="type" expression="" defaultValue="&quot;TYPE&quot;" alwaysStopAt="true" />
     <variable name="name" expression="lowercaseAndDash(type)" defaultValue="" alwaysStopAt="false" />
     <variable name="params" expression="" defaultValue="&quot;PARAMS&quot;" alwaysStopAt="true" />
diff --git a/ui.lnf.xml b/ui.lnf.xml
index 170b287..8aef346 100644
--- a/ui.lnf.xml
+++ b/ui.lnf.xml
@@ -3,7 +3,6 @@
     <option name="MAX_LOOKUP_LIST_HEIGHT" value="22" />
     <option name="MAX_LOOKUP_WIDTH2" value="1134" />
     <option name="OVERRIDE_NONIDEA_LAF_FONTS" value="true" />
-    <option name="RIGHT_HORIZONTAL_SPLIT" value="true" />
     <option name="SHOW_MAIN_TOOLBAR" value="true" />
     <option name="SHOW_TOOL_WINDOW_NUMBERS" value="true" />
   </component>