diff --git a/.gitignore b/.gitignore
index 92c9f86a..2e37d895 100644
--- a/.gitignore
+++ b/.gitignore
@@ -41,19 +41,10 @@ captures/
 
 # IntelliJ
 *.iml
-.idea/workspace.xml
-.idea/tasks.xml
-.idea/gradle.xml
-.idea/assetWizardSettings.xml
-.idea/dictionaries
-.idea/libraries
-# Android Studio 3 in .gitignore file.
-.idea/caches
-.idea/modules.xml
-# Comment next line if keeping position of elements in Navigation Editor is relevant for you
-.idea/navEditor.xml
-# Local deployment targets
-.idea/deploymentTargetSelector.xml
+/.idea/*
+!/.idea/codeStyleSettings.xml
+!/.idea/codeStyles
+!/.idea/dictionaries
 
 # Keystore files
 # Uncomment the following lines if you do not want to check your keystore files in.
@@ -91,11 +82,6 @@ lint/tmp/
 
 publish.properties
 *.gpg
-/.idea/.gitignore
-/.idea/compiler.xml
-/.idea/jarRepositories.xml
-/.idea/misc.xml
-/.idea/shelf
 
 # general
 **/.DS_Store
diff --git a/.idea/.name b/.idea/.name
deleted file mode 100644
index decc89cc..00000000
--- a/.idea/.name
+++ /dev/null
@@ -1 +0,0 @@
-Ably Chat SDK
\ No newline at end of file
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 8cbc9db8..c37d3b88 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -1,40 +1,19 @@
 <component name="ProjectCodeStyleConfiguration">
   <code_scheme name="Project" version="173">
-    <option name="OTHER_INDENT_OPTIONS">
-      <value />
-    </option>
     <option name="RIGHT_MARGIN" value="140" />
-    <JavaCodeStyleSettings>
-      <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="50" />
-      <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="50" />
-      <option name="JD_ALIGN_PARAM_COMMENTS" value="false" />
-    </JavaCodeStyleSettings>
     <JetCodeStyleSettings>
       <option name="PACKAGES_TO_USE_STAR_IMPORTS">
         <value />
       </option>
       <option name="NAME_COUNT_TO_USE_STAR_IMPORT" value="2147483647" />
       <option name="NAME_COUNT_TO_USE_STAR_IMPORT_FOR_MEMBERS" value="2147483647" />
-      <option name="CONTINUATION_INDENT_IN_PARAMETER_LISTS" value="true" />
-      <option name="CONTINUATION_INDENT_IN_ARGUMENT_LISTS" value="true" />
-      <option name="CONTINUATION_INDENT_FOR_CHAINED_CALLS" value="true" />
-      <option name="CONTINUATION_INDENT_IN_IF_CONDITIONS" value="true" />
-      <option name="CONTINUATION_INDENT_IN_ELVIS" value="true" />
-      <option name="ALLOW_TRAILING_COMMA" value="true" />
+      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
     </JetCodeStyleSettings>
-    <Markdown>
-      <option name="WRAP_TEXT_IF_LONG" value="false" />
-      <option name="WRAP_TEXT_INSIDE_BLOCKQUOTES" value="false" />
-    </Markdown>
-    <Properties>
-      <option name="KEEP_BLANK_LINES" value="true" />
-    </Properties>
     <codeStyleSettings language="kotlin">
-      <option name="CALL_PARAMETERS_WRAP" value="0" />
-      <option name="CALL_PARAMETERS_LPAREN_ON_NEXT_LINE" value="false" />
+      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
       <indentOptions>
         <option name="CONTINUATION_INDENT_SIZE" value="4" />
       </indentOptions>
     </codeStyleSettings>
   </code_scheme>
-</component>
\ No newline at end of file
+</component>
diff --git a/.idea/dictionaries/shared.xml b/.idea/dictionaries/shared.xml
new file mode 100644
index 00000000..de5c5c99
--- /dev/null
+++ b/.idea/dictionaries/shared.xml
@@ -0,0 +1,7 @@
+<component name="ProjectDictionaryState">
+  <dictionary name="shared">
+    <words>
+      <w>timeserial</w>
+    </words>
+  </dictionary>
+</component>
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
deleted file mode 100644
index 5815a4a6..00000000
--- a/.idea/kotlinc.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="KotlinJpsPluginSettings">
-    <option name="version" value="2.0.10" />
-  </component>
-</project>
\ No newline at end of file