diff --git a/.editorconfig b/.editorconfig
index 1608003..88530f4 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -8,7 +8,55 @@ insert_final_newline = true
 trim_trailing_whitespace = true
 
 [*.{cs}]
+charset = utf-8-bom
 indent_size = 4
+dotnet_style_qualification_for_field = true:error
+dotnet_style_qualification_for_property = true:error
+dotnet_style_qualification_for_method = true:error
+dotnet_style_qualification_for_event = true:error
+dotnet_style_predefined_type_for_locals_parameters_members = true:error
+dotnet_style_predefined_type_for_member_access = true:error
+dotnet_style_require_accessibility_modifiers = always:error
+dotnet_style_object_initializer = true:suggestion
+dotnet_style_collection_initializer = true:warning
+dotnet_style_explicit_tuple_names = true:suggestion
+dotnet_style_prefer_inferred_tuple_names = true:suggestion
+dotnet_style_prefer_inferred_anonymous_type_member_names = true:suggestion
+dotnet_style_coalesce_expression = true:warning
+dotnet_style_null_propagation = true:warning
+csharp_prefer_braces = true:error
+csharp_style_expression_bodied_methods = false:suggestion
+csharp_style_expression_bodied_constructors = false:none
+csharp_style_expression_bodied_operators = false:none
+csharp_style_expression_bodied_properties = true:suggestion
+csharp_style_expression_bodied_indexers = true:suggestion
+csharp_style_expression_bodied_accessors = true:suggestion
+csharp_style_pattern_local_over_anonymous_function = true:warning
+csharp_style_var_for_built_in_types = true:error
+csharp_style_var_when_type_is_apparent = true:error
+csharp_style_var_elsewhere = true:warning
+csharp_style_inlined_variable_declaration = true:warning
+csharp_style_deconstructed_variable_declaration = true:warning
+csharp_style_pattern_matching_over_is_with_cast_check = true:warning
+csharp_style_pattern_matching_over_as_with_null_check = true:warning
+csharp_prefer_simple_default_expression = true:warning
+csharp_style_throw_expression = true:warning
+csharp_style_conditional_delegate_call = true:warning
+dotnet_sort_system_directives_first = true
+csharp_new_line_before_open_brace = all
+csharp_new_line_before_else = true
+csharp_new_line_before_catch = true
+csharp_new_line_before_finally = true
+csharp_new_line_between_query_expression_clauses = true
+csharp_indent_case_contents = true
+csharp_indent_switch_labels = true
+csharp_indent_labels = one_less_than_current
+csharp_space_after_cast = false
+csharp_space_after_keywords_in_control_flow_statements = true
+csharp_space_between_method_declaration_parameter_list_parentheses = false
+csharp_space_between_method_call_parameter_list_parentheses = false
+csharp_preserve_single_line_statements = true
+csharp_preserve_single_line_blocks = true
 
 [*.{csproj,xml,yml,yaml,json,config,props,targets,ruleset}]
 indent_size = 2
diff --git a/GitVersionConfig.yaml b/GitVersion.yaml
similarity index 50%
rename from GitVersionConfig.yaml
rename to GitVersion.yaml
index 1565e69..a3eb952 100644
--- a/GitVersionConfig.yaml
+++ b/GitVersion.yaml
@@ -1,3 +1,3 @@
 tag-prefix: v
-mode: ContinuousDeployment
+mode: ContinuousDelivery
 branches: {}
diff --git a/Strict.ruleset b/Strict.ruleset
index e1ddafd..4ae54f7 100644
--- a/Strict.ruleset
+++ b/Strict.ruleset
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RuleSet Name="Strict" Description="A strict ruleset based on the Microsoft All Rules ruleset." ToolsVersion="14.0">
+<RuleSet Name="Strict" Description="A strict ruleset based on the Microsoft All Rules ruleset." ToolsVersion="15.0">
   <IncludeAll Action="Warning" />
   <Rules AnalyzerId="Microsoft.Analyzers.ManagedCodeAnalysis" RuleNamespace="Microsoft.Rules.Managed">
     <Rule Id="CA1004" Action="None" />
diff --git a/Weave.sln b/Weave.sln
index 5867db7..333de6d 100644
--- a/Weave.sln
+++ b/Weave.sln
@@ -1,4 +1,3 @@
-
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.27428.2037
@@ -10,7 +9,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		.gitignore = .gitignore
 		appveyor.yml = appveyor.yml
 		CodeMaid.config = CodeMaid.config
-		GitVersionConfig.yaml = GitVersionConfig.yaml
+		GitVersion.yaml = GitVersion.yaml
 		license.md = license.md
 		readme.md = readme.md
 		SharedAssemblyInfo.props = SharedAssemblyInfo.props
diff --git a/Weave/Weave.csproj b/Weave/Weave.csproj
index 4a24ffe..291fffe 100644
--- a/Weave/Weave.csproj
+++ b/Weave/Weave.csproj
@@ -3,6 +3,7 @@
   <Import Project="..\SharedAssemblyInfo.props" />
   <PropertyGroup>
     <OutputType>Exe</OutputType>
+    <ApplicationIcon>..\Weave.ico</ApplicationIcon>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <CodeAnalysisRuleSet>Weave.ruleset</CodeAnalysisRuleSet>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
diff --git a/appveyor.yml b/appveyor.yml
index 1fe379c..dcc1173 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -2,7 +2,7 @@ os: Visual Studio 2017
 configuration: Release
 install:
   - "SET PATH=C:\\ProgramData\\chocolatey\\bin;%PATH%"
-  - choco install gitversion.portable -pre -y
+  - choco install gitversion.portable -y
   - gitversion /l console /output buildserver
   - choco install GitReleaseNotes.Portable
   - choco install opencover.portable