diff --git a/.editorconfig b/.editorconfig
index 33c579ef6..c04e2c7a4 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -152,3 +152,6 @@ dotnet_analyzer_diagnostic.category-Performance.severity = suggestion
 
 # CC0097: You have missing/unexistent parameters in Xml Docs
 dotnet_diagnostic.CC0097.severity = none
+
+csharp_style_namespace_declarations = file_scoped
+dotnet_diagnostic.IDE0161.severity = warning
diff --git a/CodeConverter/CodeConverter.csproj b/CodeConverter/CodeConverter.csproj
index 8c7d1ad4f..6ed5cff38 100644
--- a/CodeConverter/CodeConverter.csproj
+++ b/CodeConverter/CodeConverter.csproj
@@ -22,6 +22,7 @@
     <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
     <EmbedUntrackedSources>$(ContinuousIntegrationBuild)</EmbedUntrackedSources>
     <ImplicitUsings>enable</ImplicitUsings>
+    <AnalysisMode>Recommended</AnalysisMode>
   </PropertyGroup>
   <ItemGroup>
     <Compile Remove="Shared\DefaultReferences.cs" />