diff --git a/.editorconfig b/.editorconfig
index 97dc2c0bdb..a54359c8a0 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -49,7 +49,7 @@ ij_kotlin_field_annotation_wrap = split_into_lines
ij_kotlin_finally_on_new_line = false
ij_kotlin_if_rparen_on_new_line = true
ij_kotlin_import_nested_classes = false
-ij_kotlin_imports_layout = *,java.**,javax.**,kotlin.**,^
+ij_kotlin_imports_layout = android.**,androidx.**,com.android.**,org.cqfn.diktat.**,*,java.**,javax.**,kotlin.**,kotlinx.**,^
ij_kotlin_insert_whitespaces_in_simple_one_line_method = true
ij_kotlin_keep_blank_lines_before_right_brace = 2
ij_kotlin_keep_blank_lines_in_code = 2
diff --git a/pom.xml b/pom.xml
index b3ba9f99aa..df3352fddf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,6 +44,7 @@
UTF-8
1.6.21
true
+ official
1.3.3
0.45.2
5.8.2