diff --git a/.editorconfig b/.editorconfig
index 8b506da..d74d8fc 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -608,6 +608,7 @@ csharp_space_around_dot=false
 csharp_space_around_lambda_arrow=true
 csharp_space_before_pointer_asterik_declaration=false
 csharp_space_before_nullable_mark=false
+csharp_style_namespace_declarations = file_scoped:warning
 
 [*.cshtml]
 linebreaks_around_razor_statements=true
diff --git a/.idea/.idea.Claunia.Encoding/.idea/misc.xml b/.idea/.idea.Claunia.Encoding/.idea/misc.xml
index ab84326..1d8c84d 100644
--- a/.idea/.idea.Claunia.Encoding/.idea/misc.xml
+++ b/.idea/.idea.Claunia.Encoding/.idea/misc.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="MacroExpansionManager">
-    <option name="directoryName" value="MFTKhOEq" />
-  </component>
   <component name="com.jetbrains.rider.android.RiderAndroidMiscFileCreationComponent">
     <option name="ENSURE_MISC_FILE_EXISTS" value="true" />
   </component>
diff --git a/Claunia.Encoding.Tests/Claunia.Encoding.Tests.csproj b/Claunia.Encoding.Tests/Claunia.Encoding.Tests.csproj
index b3cc33d..b792677 100644
--- a/Claunia.Encoding.Tests/Claunia.Encoding.Tests.csproj
+++ b/Claunia.Encoding.Tests/Claunia.Encoding.Tests.csproj
@@ -4,8 +4,8 @@
     <OutputType>Library</OutputType>
     <RootNamespace>Claunia.Encoding.Tests</RootNamespace>
     <AssemblyName>Claunia.Encoding.Tests</AssemblyName>
-    <TargetFrameworks>netcoreapp3.1;net5.0</TargetFrameworks>
     <ReleaseVersion>1.9.1</ReleaseVersion>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\Claunia.Encoding\Claunia.Encoding.csproj">
diff --git a/Claunia.Encoding/Claunia.Encoding.csproj b/Claunia.Encoding/Claunia.Encoding.csproj
index fd3178d..8dd18fe 100644
--- a/Claunia.Encoding/Claunia.Encoding.csproj
+++ b/Claunia.Encoding/Claunia.Encoding.csproj
@@ -18,7 +18,6 @@
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <ReleaseVersion>1.9.1</ReleaseVersion>
     <PackageReleaseNotes>Updated all codepages to include symbols defined as of Unicode 13.0</PackageReleaseNotes>
-    <TargetFrameworks>netcoreapp3.1;net5.0</TargetFrameworks>
     <VersionPrefix>1.9.1</VersionPrefix>
     <Company>Claunia.com</Company>
     <Copyright>© 2016-2021 Natalia Portillo</Copyright>
@@ -30,6 +29,7 @@
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <EmbedUntrackedSources>true</EmbedUntrackedSources>
     <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
   <PropertyGroup>