diff --git a/.editorconfig b/.editorconfig
index 2fdef902..6a7926d0 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,12 +1,30 @@
+# top-most EditorConfig file
 root = true
 
+# Baseline
 [*]
-end_of_line = crlf
+charset = utf-8
 insert_final_newline = true
 indent_style = space
+indent_size = 4
+trim_trailing_whitespace = true
+max_line_length = 160
+
+[*.{yml,json}]
+indent_size = 2
 
-[*.props, *.csproj, *.yml, *.json]
+# Xml files (data, config, projects)
+[*.{xml,props,targets,config,csproj}]
 indent_size = 2
 
+# Xml project files
+[*.{csproj}]
+indent_size = 2
+
+# Shell scripts
+[*.sh]
+end_of_line = lf
+
+# C#
 [*.cs]
-indent_size = 4
+dotnet_sort_system_directives_first = true
diff --git a/.gitignore b/.gitignore
index 62d8b8ed..4af01ca7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,18 +12,6 @@
 *.suo
 *.cache
 
-.env
-*.local
-*.local.json
-*.local.ini
-
-# misc
-*~
-*.swp
-*.sdf
-*.orig
-*.pfx
-
 # rider
 .idea
 
@@ -36,5 +24,18 @@ _ReSharper.*
 *.[Rr]e[Ss]harper.user
 *.DotSettings.user
 
+# env config etc
+.env
+*.local
+*.local.json
+*.local.ini
+
+# misc
+*~
+*.swp
+*.sdf
+*.orig
+*.pfx
+
 #windows stuff
-Thumbs.db
\ No newline at end of file
+Thumbs.db
diff --git a/source/projects/MyCouch/MyCouch.csproj b/source/projects/MyCouch/MyCouch.csproj
index 7dbe6d9f..adb60fee 100644
--- a/source/projects/MyCouch/MyCouch.csproj
+++ b/source/projects/MyCouch/MyCouch.csproj
@@ -21,8 +21,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Ensure.That" Version="9.2.0" />
-    <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
+    <PackageReference Include="Ensure.That" Version="10.1.0" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     <PackageReference Include="System.Reflection.Emit.Lightweight" Version="4.7.0" />
   </ItemGroup>
 
diff --git a/source/tests/IntegrationTests/IntegrationTests.csproj b/source/tests/IntegrationTests/IntegrationTests.csproj
index e64a0720..b8f1e796 100644
--- a/source/tests/IntegrationTests/IntegrationTests.csproj
+++ b/source/tests/IntegrationTests/IntegrationTests.csproj
@@ -19,8 +19,8 @@
     <PackageReference Include="FluentAssertions" Version="5.10.3" />
     <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="5.0.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Ini" Version="5.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
-    <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
       <PrivateAssets>all</PrivateAssets>
diff --git a/source/tests/Testing/Testing.csproj b/source/tests/Testing/Testing.csproj
index 0d9a5d7c..64ec31fc 100644
--- a/source/tests/Testing/Testing.csproj
+++ b/source/tests/Testing/Testing.csproj
@@ -7,7 +7,7 @@
 
   <ItemGroup>
     <PackageReference Include="FluentAssertions" Version="5.10.3" />
-    <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/source/tests/UnitTests/UnitTests.csproj b/source/tests/UnitTests/UnitTests.csproj
index 9c845f01..679a35b9 100644
--- a/source/tests/UnitTests/UnitTests.csproj
+++ b/source/tests/UnitTests/UnitTests.csproj
@@ -8,8 +8,8 @@
 
   <ItemGroup>
     <PackageReference Include="FluentAssertions" Version="5.10.3" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
-    <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
       <PrivateAssets>all</PrivateAssets>