diff --git a/.clang-format b/.clang-format
new file mode 100644
index 000000000..72b1a4f87
--- /dev/null
+++ b/.clang-format
@@ -0,0 +1,54 @@
+---
+# Base style
+BasedOnStyle: LLVM
+
+# Indentation settings
+IndentWidth: 4
+UseTab: Never
+TabWidth: 4
+
+# Access modifier offset
+AccessModifierOffset: -4
+
+# Brace breaking style
+BreakBeforeBraces: Allman
+
+# Pointer and reference alignment
+PointerAlignment: Left
+ReferenceAlignment: Left
+
+# Space settings
+SpaceBeforeParens: ControlStatements
+SpaceBeforeAssignmentOperators: true
+SpaceBeforeRangeBasedForLoopColon: true
+SpaceInEmptyParentheses: false
+SpacesInAngles: false
+SpacesInContainerLiterals: true
+SpacesInParentheses: false
+SpacesInSquareBrackets: false
+
+# Column limit
+ColumnLimit: 256
+
+# Namespace indentation
+NamespaceIndentation: All
+
+# Keep short statements on single line
+AllowShortBlocksOnASingleLine: Empty
+AllowShortFunctionsOnASingleLine: Empty
+AllowShortIfStatementsOnASingleLine: Never
+AllowShortLoopsOnASingleLine: false
+
+# Constructor initializer list
+ConstructorInitializerIndentWidth: 4
+BreakConstructorInitializers: BeforeColon
+
+# Binary operator line breaking
+BreakBeforeBinaryOperators: None
+
+# Comment alignment
+AlignTrailingComments: true
+
+# Consecutive assignment alignment
+AlignConsecutiveAssignments: false
+AlignConsecutiveDeclarations: false
\ No newline at end of file
diff --git a/.editorconfig b/.editorconfig
index a5d009a2e..8d0744627 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,6 +1,11 @@
 # Visual Studio generated .editorconfig file with C++ settings.
 root = true
 
+[*]
+indent_style = space
+indent_size = 4
+charset = utf-8
+
 [*.{c++,cc,cpp,cppm,cxx,h,h++,hh,hpp,hxx,inl,ipp,ixx,tlh,tli}]
 
 # Visual C++ Code Style settings
@@ -9,65 +14,65 @@ cpp_generate_documentation_comments = xml
 
 # Visual C++ Formatting settings
 
-cpp_indent_braces=false
-cpp_indent_multi_line_relative_to=innermost_parenthesis
-cpp_indent_within_parentheses=indent
-cpp_indent_preserve_within_parentheses=false
-cpp_indent_case_contents=true
-cpp_indent_case_labels=false
-cpp_indent_case_contents_when_block=false
-cpp_indent_lambda_braces_when_parameter=true
-cpp_indent_goto_labels=one_left
-cpp_indent_preprocessor=leftmost_column
-cpp_indent_access_specifiers=false
-cpp_indent_namespace_contents=true
-cpp_indent_preserve_comments=false
-cpp_new_line_before_open_brace_namespace=ignore
-cpp_new_line_before_open_brace_type=ignore
-cpp_new_line_before_open_brace_function=ignore
-cpp_new_line_before_open_brace_block=ignore
-cpp_new_line_before_open_brace_lambda=ignore
-cpp_new_line_scope_braces_on_separate_lines=false
-cpp_new_line_close_brace_same_line_empty_type=false
-cpp_new_line_close_brace_same_line_empty_function=false
-cpp_new_line_before_catch=true
-cpp_new_line_before_else=true
-cpp_new_line_before_while_in_do_while=false
-cpp_space_before_function_open_parenthesis=remove
-cpp_space_within_parameter_list_parentheses=false
-cpp_space_between_empty_parameter_list_parentheses=false
-cpp_space_after_keywords_in_control_flow_statements=true
-cpp_space_within_control_flow_statement_parentheses=false
-cpp_space_before_lambda_open_parenthesis=false
-cpp_space_within_cast_parentheses=false
-cpp_space_after_cast_close_parenthesis=false
-cpp_space_within_expression_parentheses=false
-cpp_space_before_block_open_brace=true
-cpp_space_between_empty_braces=false
-cpp_space_before_initializer_list_open_brace=false
-cpp_space_within_initializer_list_braces=true
-cpp_space_preserve_in_initializer_list=true
-cpp_space_before_open_square_bracket=false
-cpp_space_within_square_brackets=false
-cpp_space_before_empty_square_brackets=false
-cpp_space_between_empty_square_brackets=false
-cpp_space_group_square_brackets=true
-cpp_space_within_lambda_brackets=false
-cpp_space_between_empty_lambda_brackets=false
-cpp_space_before_comma=false
-cpp_space_after_comma=true
-cpp_space_remove_around_member_operators=true
-cpp_space_before_inheritance_colon=true
-cpp_space_before_constructor_colon=true
-cpp_space_remove_before_semicolon=true
-cpp_space_after_semicolon=false
-cpp_space_remove_around_unary_operator=true
-cpp_space_around_binary_operator=insert
-cpp_space_around_assignment_operator=insert
-cpp_space_pointer_reference_alignment=left
-cpp_space_around_ternary_operator=insert
+cpp_indent_braces = false
+cpp_indent_multi_line_relative_to = innermost_parenthesis
+cpp_indent_within_parentheses = indent
+cpp_indent_preserve_within_parentheses = false
+cpp_indent_case_contents = true
+cpp_indent_case_labels = false
+cpp_indent_case_contents_when_block = false
+cpp_indent_lambda_braces_when_parameter = true
+cpp_indent_goto_labels = one_left
+cpp_indent_preprocessor = leftmost_column
+cpp_indent_access_specifiers = false
+cpp_indent_namespace_contents = true
+cpp_indent_preserve_comments = false
+cpp_new_line_before_open_brace_namespace = ignore
+cpp_new_line_before_open_brace_type = ignore
+cpp_new_line_before_open_brace_function = ignore
+cpp_new_line_before_open_brace_block = ignore
+cpp_new_line_before_open_brace_lambda = ignore
+cpp_new_line_scope_braces_on_separate_lines = false
+cpp_new_line_close_brace_same_line_empty_type = false
+cpp_new_line_close_brace_same_line_empty_function = false
+cpp_new_line_before_catch = true
+cpp_new_line_before_else = true
+cpp_new_line_before_while_in_do_while = false
+cpp_space_before_function_open_parenthesis = remove
+cpp_space_within_parameter_list_parentheses = false
+cpp_space_between_empty_parameter_list_parentheses = false
+cpp_space_after_keywords_in_control_flow_statements = true
+cpp_space_within_control_flow_statement_parentheses = false
+cpp_space_before_lambda_open_parenthesis = false
+cpp_space_within_cast_parentheses = false
+cpp_space_after_cast_close_parenthesis = false
+cpp_space_within_expression_parentheses = false
+cpp_space_before_block_open_brace = true
+cpp_space_between_empty_braces = false
+cpp_space_before_initializer_list_open_brace = false
+cpp_space_within_initializer_list_braces = true
+cpp_space_preserve_in_initializer_list = true
+cpp_space_before_open_square_bracket = false
+cpp_space_within_square_brackets = false
+cpp_space_before_empty_square_brackets = false
+cpp_space_between_empty_square_brackets = false
+cpp_space_group_square_brackets = true
+cpp_space_within_lambda_brackets = false
+cpp_space_between_empty_lambda_brackets = false
+cpp_space_before_comma = false
+cpp_space_after_comma = true
+cpp_space_remove_around_member_operators = true
+cpp_space_before_inheritance_colon = true
+cpp_space_before_constructor_colon = true
+cpp_space_remove_before_semicolon = true
+cpp_space_after_semicolon = false
+cpp_space_remove_around_unary_operator = true
+cpp_space_around_binary_operator = insert
+cpp_space_around_assignment_operator = insert
+cpp_space_pointer_reference_alignment = left
+cpp_space_around_ternary_operator = insert
 cpp_use_unreal_engine_macro_formatting = true
-cpp_wrap_preserve_blocks=one_liners
+cpp_wrap_preserve_blocks = one_liners
 
 # Visual C++ Inlcude Cleanup settings
 
@@ -167,8 +172,6 @@ csharp_style_unused_value_expression_statement_preference = discard_variable
 dotnet_diagnostic.IDE0058.severity = warning
 csharp_style_unused_value_assignment_preference = discard_variable
 dotnet_diagnostic.IDE0059.severity = warning
-
-indent_style = space
 csharp_indent_case_contents = true
 csharp_indent_switch_labels = true
 csharp_new_line_before_open_brace = types, object_collection, methods, control_blocks, lambdas