diff --git a/.editorconfig b/.editorconfig
index efe60e1..304c6d3 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -57,6 +57,7 @@ dotnet_naming_symbols.private_static_fields_symbols.required_modifiers = static
 dotnet_naming_symbols.private_static_readonly_symbols.applicable_accessibilities = private
 dotnet_naming_symbols.private_static_readonly_symbols.applicable_kinds = field
 dotnet_naming_symbols.private_static_readonly_symbols.required_modifiers = static,readonly
+dotnet_separate_import_directive_groups = true
 dotnet_style_parentheses_in_arithmetic_binary_operators = always_for_clarity:suggestion
 dotnet_style_parentheses_in_other_binary_operators = always_for_clarity:suggestion
 dotnet_style_parentheses_in_relational_binary_operators = always_for_clarity:suggestion
@@ -97,6 +98,7 @@ resharper_apply_on_completion = true
 resharper_auto_property_can_be_made_get_only_global_highlighting = none
 resharper_auto_property_can_be_made_get_only_local_highlighting = none
 resharper_autodetect_indent_settings = true
+resharper_blank_lines_around_single_line_auto_property = 1
 resharper_braces_for_ifelse = required_for_multiline
 resharper_can_use_global_alias = false
 resharper_csharp_align_multiline_parameter = true
@@ -105,14 +107,22 @@ resharper_csharp_empty_block_style = multiline
 resharper_csharp_int_align_comments = true
 resharper_csharp_new_line_before_while = true
 resharper_csharp_wrap_after_declaration_lpar = true
+resharper_csharp_wrap_after_invocation_lpar = true
+resharper_csharp_wrap_arguments_style = chop_if_long
 resharper_enforce_line_ending_style = true
+resharper_instance_members_qualify_declared_in = this_class, base_class
 resharper_member_can_be_private_global_highlighting = none
 resharper_member_can_be_private_local_highlighting = none
-resharper_new_line_before_finally = false
+resharper_new_line_before_finally = true
+resharper_parentheses_non_obvious_operations = none, multiplicative, additive, arithmetic, shift, bitwise_and, bitwise_exclusive_or, bitwise_inclusive_or, bitwise
+resharper_parentheses_redundancy_style = remove_if_not_clarifies_precedence
 resharper_place_accessorholder_attribute_on_same_line = false
 resharper_place_field_attribute_on_same_line = false
+resharper_place_simple_initializer_on_single_line = true
 resharper_show_autodetect_configure_formatting_tip = false
+resharper_space_within_single_line_array_initializer_braces = true
 resharper_use_indent_from_vs = false
+resharper_wrap_array_initializer_style = chop_if_long
 
 # ReSharper inspection severities
 resharper_arrange_missing_parentheses_highlighting = hint
diff --git a/Plogon/BuildProcessor.cs b/Plogon/BuildProcessor.cs
index d9bb2ba..cbae577 100644
--- a/Plogon/BuildProcessor.cs
+++ b/Plogon/BuildProcessor.cs
@@ -9,14 +9,20 @@
 using System.Text.RegularExpressions;
 using System.Threading;
 using System.Threading.Tasks;
+
 using Docker.DotNet;
 using Docker.DotNet.Models;
+
 using LibGit2Sharp;
+
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
+
 using PgpCore;
+
 using Plogon.Manifests;
 using Plogon.Repo;
+
 using Serilog;
 
 namespace Plogon;
diff --git a/Plogon/BuildTask.cs b/Plogon/BuildTask.cs
index c97dbac..3b2b0b5 100644
--- a/Plogon/BuildTask.cs
+++ b/Plogon/BuildTask.cs
@@ -1,4 +1,5 @@
 using System;
+
 using Plogon.Manifests;
 #pragma warning disable CS8618
 #pragma warning disable CS1591
diff --git a/Plogon/DalamudReleases.cs b/Plogon/DalamudReleases.cs
index b288cdf..8d324b0 100644
--- a/Plogon/DalamudReleases.cs
+++ b/Plogon/DalamudReleases.cs
@@ -5,7 +5,9 @@
 using System.Net.Http;
 using System.Net.Http.Json;
 using System.Threading.Tasks;
+
 using Serilog;
+
 using Tomlyn;
 
 namespace Plogon;
diff --git a/Plogon/DiscordWebhook.cs b/Plogon/DiscordWebhook.cs
index f69565a..30222fd 100644
--- a/Plogon/DiscordWebhook.cs
+++ b/Plogon/DiscordWebhook.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Threading.Tasks;
+
 using Discord;
 using Discord.Webhook;
 
diff --git a/Plogon/GitHubApi.cs b/Plogon/GitHubApi.cs
index 921338b..efb6c0d 100644
--- a/Plogon/GitHubApi.cs
+++ b/Plogon/GitHubApi.cs
@@ -3,6 +3,7 @@
 using System.Linq;
 using System.Net.Http;
 using System.Threading.Tasks;
+
 using Octokit;
 
 namespace Plogon;
diff --git a/Plogon/Manifests/ManifestStorage.cs b/Plogon/Manifests/ManifestStorage.cs
index ad4c89e..a3e7583 100644
--- a/Plogon/Manifests/ManifestStorage.cs
+++ b/Plogon/Manifests/ManifestStorage.cs
@@ -4,7 +4,9 @@
 using System.IO;
 using System.Linq;
 using System.Text.RegularExpressions;
+
 using Serilog;
+
 using Tomlyn;
 #pragma warning disable CS1591
 
diff --git a/Plogon/NugetLockfile.cs b/Plogon/NugetLockfile.cs
index 99a77bd..af1fd19 100644
--- a/Plogon/NugetLockfile.cs
+++ b/Plogon/NugetLockfile.cs
@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+
 using Newtonsoft.Json;
 #pragma warning disable CS8618
 #pragma warning disable CS1591
diff --git a/Plogon/Program.cs b/Plogon/Program.cs
index 50a67c5..5cab03f 100644
--- a/Plogon/Program.cs
+++ b/Plogon/Program.cs
@@ -5,7 +5,9 @@
 using System.Linq;
 using System.Runtime.CompilerServices;
 using System.Threading.Tasks;
+
 using Discord;
+
 using Serilog;
 
 namespace Plogon;
diff --git a/Plogon/Repo/PluginRepository.cs b/Plogon/Repo/PluginRepository.cs
index dbaac1b..4541ed6 100644
--- a/Plogon/Repo/PluginRepository.cs
+++ b/Plogon/Repo/PluginRepository.cs
@@ -1,7 +1,9 @@
 using System;
 using System.IO;
 using System.Linq;
+
 using Serilog;
+
 using Tomlyn;
 
 namespace Plogon.Repo;
diff --git a/Plogon/WebServices.cs b/Plogon/WebServices.cs
index 97eba27..5577489 100644
--- a/Plogon/WebServices.cs
+++ b/Plogon/WebServices.cs
@@ -4,6 +4,7 @@
 using System.Net.Http;
 using System.Net.Http.Json;
 using System.Threading.Tasks;
+
 using Serilog;
 #pragma warning disable CS1591