diff --git a/.editorconfig b/.editorconfig
index e53c670fa..21d7ac4a3 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -5,14 +5,17 @@ root = true
 
 # Don't use tabs for indentation.
 [*]
-end_of_line = lf
 indent_style = space
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+guidelines = 120
 # (Please don't specify an indent_size here; that has too many unintended consequences.)
 
 # Code files
 [*.{cs,csx,vb,vbx}]
 indent_size = 4
-insert_final_newline = true
 charset = utf-8-bom
 
 # Xml project files
@@ -120,7 +123,3 @@ csharp_style_namespace_declarations = file_scoped:warning
 # Switch expression
 dotnet_diagnostic.CS8509.severity = error # missing switch case for named enum value
 dotnet_diagnostic.CS8524.severity = none # missing switch case for unnamed enum value
-
-# All files
-[*]
-guidelines = 120
diff --git a/Directory.Build.props b/Directory.Build.props
index 682e9c4c7..beede2124 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -2,7 +2,6 @@
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
-    <!--2022.6.2-->
     <Version>2023.7.0</Version>
     <RootNamespace>Bit.$(MSBuildProjectName)</RootNamespace>
     <RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
@@ -64,4 +63,4 @@
     </ItemGroup>
   </Target>
 
-</Project>
\ No newline at end of file
+</Project>
diff --git a/bitwarden-server.sln b/bitwarden-server.sln
index bd0e4648a..6a45e21eb 100644
--- a/bitwarden-server.sln
+++ b/bitwarden-server.sln
@@ -11,18 +11,20 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{DD5BD056-4
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{458155D3-BCBC-481D-B37A-40D2ED10F0A4}"
 	ProjectSection(SolutionItems) = preProject
-		.editorconfig = .editorconfig
-		.gitignore = .gitignore
-		build.sh = build.sh
-		.github\workflows\build.yml = .github\workflows\build.yml
 		Directory.Build.props = Directory.Build.props
-		dotnet-tools.json = dotnet-tools.json
-		LICENSE.txt = LICENSE.txt
-		LICENSE_AGPL.txt = LICENSE_AGPL.txt
-		LICENSE_BITWARDEN.txt = LICENSE_BITWARDEN.txt
-		NuGet.Config = NuGet.Config
+		global.json = global.json
+		.gitignore = .gitignore
 		README.md = README.md
+		.editorconfig = .editorconfig
+		TRADEMARK_GUIDELINES.md = TRADEMARK_GUIDELINES.md
 		SECURITY.md = SECURITY.md
+		NuGet.Config = NuGet.Config
+		LICENSE_FAQ.md = LICENSE_FAQ.md
+		LICENSE_BITWARDEN.txt = LICENSE_BITWARDEN.txt
+		LICENSE_AGPL.txt = LICENSE_AGPL.txt
+		LICENSE.txt = LICENSE.txt
+		CONTRIBUTING.md = CONTRIBUTING.md
+		.dockerignore = .dockerignore
 	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Core", "src\Core\Core.csproj", "{3973D21B-A692-4B60-9B70-3631C057423A}"