diff --git a/.clang-format b/.clang-format
index e73fcaf..3f6e6ef 100644
--- a/.clang-format
+++ b/.clang-format
@@ -1,9 +1,34 @@
 ---
+AllowShortIfStatementsOnASingleLine: Never
+CompactNamespaces: 'false'
+DisableFormat: 'false'
+IndentCaseLabels: 'true'
+IndentPPDirectives: BeforeHash
 IndentWidth: '4'
 Language: Cpp
 NamespaceIndentation: All
 PointerAlignment: Left
+ReflowComments: 'true'
+SortIncludes: 'true'
+SortUsingDeclarations: 'true'
+SpacesInCStyleCastParentheses: 'false'
+Standard: Cpp11
 TabWidth: '0'
 UseTab: Never
-
-...
+AllowShortEnumsOnASingleLine: false
+BraceWrapping:
+  AfterEnum: true
+AccessModifierOffset: -4
+SpaceAfterTemplateKeyword: 'false'
+AllowAllParametersOfDeclarationOnNextLine: false
+AlignAfterOpenBracket: AlwaysBreak
+BinPackArguments: false
+BinPackParameters: false
+ColumnLimit: 120
+AllowShortBlocksOnASingleLine: 'false'
+AllowShortCaseLabelsOnASingleLine: 'false'
+AllowShortFunctionsOnASingleLine: 'Empty'
+AllowShortLambdasOnASingleLine: 'Empty'
+AllowShortLoopsOnASingleLine: 'false'
+SeparateDefinitionBlocks : 'Always'
+...
\ No newline at end of file
diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000..ce0d2bb
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,8 @@
+root = true
+
+[*]
+insert_final_newline = true
+indent_style = space
+indent_size = 4
+tab_width = 4
+max_line_length = 120