diff --git a/.gitignore b/.gitignore
index bbea5b283..632cab204 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 .idea/*
 !.idea/vcs.xml
 !.idea/codeStyleSettings.xml
+!.idea/codeStyles/
 *.iml
 *.iws
 *.ipr
diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml
index 7365d58fe..ab84625ee 100644
--- a/.idea/codeStyleSettings.xml
+++ b/.idea/codeStyleSettings.xml
@@ -4,17 +4,6 @@
     <option name="PER_PROJECT_SETTINGS">
       <value>
         <option name="LINE_SEPARATOR" value="&#10;" />
-        <ScalaCodeStyleSettings>
-          <option name="alwaysUsedImports">
-            <array>
-              <option value="scala.concurrent.duration._" />
-              <option value="com.avsystem.commons.jiop.JavaInterop._" />
-              <option value="com.avsystem.commons.commons.collection.CollectionAliases._" />
-            </array>
-          </option>
-          <option name="classCountToUseImportOnDemand" value="9999" />
-          <option name="PLACE_SELF_TYPE_ON_NEW_LINE" value="false" />
-        </ScalaCodeStyleSettings>
         <XML>
           <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
         </XML>
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
new file mode 100644
index 000000000..3a3cf4561
--- /dev/null
+++ b/.idea/codeStyles/Project.xml
@@ -0,0 +1,29 @@
+<component name="ProjectCodeStyleConfiguration">
+  <code_scheme name="Project" version="173">
+    <option name="LINE_SEPARATOR" value="&#10;" />
+    <MarkdownNavigatorCodeStyleSettings>
+      <option name="RIGHT_MARGIN" value="72" />
+    </MarkdownNavigatorCodeStyleSettings>
+    <ScalaCodeStyleSettings>
+      <option name="alwaysUsedImports">
+        <array>
+          <option value="com.avsystem.commons.commons.collection.CollectionAliases._" />
+          <option value="com.avsystem.commons.jiop.JavaInterop._" />
+          <option value="scala.concurrent.duration._" />
+        </array>
+      </option>
+      <option name="classCountToUseImportOnDemand" value="9999" />
+      <option name="PLACE_SELF_TYPE_ON_NEW_LINE" value="false" />
+      <option name="BLANK_LINES_AROUND_METHOD_IN_INNER_SCOPES" value="0" />
+    </ScalaCodeStyleSettings>
+    <XML>
+      <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
+    </XML>
+    <codeStyleSettings language="Scala">
+      <option name="BLANK_LINES_AROUND_CLASS" value="0" />
+      <option name="BLANK_LINES_AROUND_METHOD" value="0" />
+      <option name="BLANK_LINES_AROUND_METHOD_IN_INTERFACE" value="0" />
+      <option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
+    </codeStyleSettings>
+  </code_scheme>
+</component>
\ No newline at end of file
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
new file mode 100644
index 000000000..79ee123c2
--- /dev/null
+++ b/.idea/codeStyles/codeStyleConfig.xml
@@ -0,0 +1,5 @@
+<component name="ProjectCodeStyleConfiguration">
+  <state>
+    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
+  </state>
+</component>
\ No newline at end of file