diff --git a/.editorconfig b/.editorconfig
index b8df92b9..1dd77e1f 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -6,9 +6,18 @@ root = true
 # All files 
 [*] 
 indent_style = space 
+
+# MSBuild files
+[*.{csproj,targets,props}]
+indent_size = 2
+
+# Xml files
+[*.xml]
+indent_size = 2
+
 # Code files 
 [*.{cs,csx,vb,vbx}] 
-indent_size = 4 
+indent_size = 4
 insert_final_newline = true 
 charset = utf-8-bom 
 ############################### 
@@ -37,9 +46,9 @@ dotnet_style_readonly_field = true:suggestion
 dotnet_style_object_initializer = true:suggestion 
 dotnet_style_collection_initializer = true:suggestion 
 dotnet_style_explicit_tuple_names = true:suggestion 
-dotnet_style_null_propagation = true:suggestion 
-dotnet_style_coalesce_expression = true:suggestion 
-dotnet_style_prefer_is_null_check_over_reference_equality_method = true:silent 
+dotnet_style_null_propagation = true:suggestion
+dotnet_style_coalesce_expression = true:suggestion
+dotnet_style_prefer_is_null_check_over_reference_equality_method = true:silent
 dotnet_prefer_inferred_tuple_names = true:suggestion 
 dotnet_prefer_inferred_anonymous_type_member_names = true:suggestion 
 dotnet_style_prefer_auto_properties = true:silent 
@@ -51,13 +60,16 @@ dotnet_style_prefer_conditional_expression_over_return = true:silent
 # Style Definitions 
 dotnet_naming_style.pascal_case_style.capitalization             = pascal_case 
 # Use PascalCase for constant fields   
-dotnet_naming_rule.constant_fields_should_be_pascal_case.severity = suggestion 
+dotnet_naming_rule.constant_fields_should_be_pascal_case.severity = suggestion
 dotnet_naming_rule.constant_fields_should_be_pascal_case.symbols  = constant_fields 
-dotnet_naming_rule.constant_fields_should_be_pascal_case.style    = pascal_case_style 
+dotnet_naming_rule.constant_fields_should_be_pascal_case.style = pascal_case_style
 dotnet_naming_symbols.constant_fields.applicable_kinds            = field 
 dotnet_naming_symbols.constant_fields.applicable_accessibilities  = * 
 dotnet_naming_symbols.constant_fields.required_modifiers          = const 
 dotnet_diagnostic.CA2007.severity=warning
+dotnet_style_operator_placement_when_wrapping = beginning_of_line
+tab_width = 4
+end_of_line = crlf
 ############################### 
 # C# Coding Conventions       # 
 ############################### 
@@ -67,12 +79,12 @@ csharp_style_var_for_built_in_types = true:silent
 csharp_style_var_when_type_is_apparent = true:silent 
 csharp_style_var_elsewhere = true:silent 
 # Expression-bodied members 
-csharp_style_expression_bodied_methods = false:silent 
-csharp_style_expression_bodied_constructors = false:silent 
-csharp_style_expression_bodied_operators = false:silent 
-csharp_style_expression_bodied_properties = true:silent 
-csharp_style_expression_bodied_indexers = true:silent 
-csharp_style_expression_bodied_accessors = true:silent 
+csharp_style_expression_bodied_methods = false:silent
+csharp_style_expression_bodied_constructors = false:silent
+csharp_style_expression_bodied_operators = false:silent
+csharp_style_expression_bodied_properties = true:silent
+csharp_style_expression_bodied_indexers = true:silent
+csharp_style_expression_bodied_accessors = true:silent
 # Pattern matching preferences 
 csharp_style_pattern_matching_over_is_with_cast_check = true:suggestion 
 csharp_style_pattern_matching_over_as_with_null_check = true:suggestion 
@@ -82,7 +94,7 @@ csharp_style_conditional_delegate_call = true:suggestion
 # Modifier preferences 
 csharp_preferred_modifier_order = public,private,protected,internal,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,volatile,async:suggestion 
 # Expression-level preferences 
-csharp_prefer_braces = true:silent 
+csharp_prefer_braces = true:silent
 csharp_style_deconstructed_variable_declaration = true:suggestion 
 csharp_prefer_simple_default_expression = true:suggestion 
 csharp_style_pattern_local_over_anonymous_function = true:suggestion 
@@ -101,7 +113,7 @@ csharp_new_line_between_query_expression_clauses =false
 # Indentation preferences 
 csharp_indent_case_contents = true 
 csharp_indent_switch_labels = false 
-csharp_indent_labels = one_less_than_current 
+csharp_indent_labels = one_less_than_current
 # Space preferences 
 csharp_space_after_cast = true 
 csharp_space_after_keywords_in_control_flow_statements = true 
diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 00000000..0414fda7
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,8 @@
+{
+    "cSpell.words": [
+        "Avalonia",
+        "Skippable",
+        "Velo",
+        "Velopack"
+    ]
+}
\ No newline at end of file