diff --git a/.gitmodules b/.gitmodules
index 264943919..0a8499607 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -20,8 +20,8 @@
 	path = Aaru.Helpers
 	url = https://github.com/aaru-dps/Aaru.Helpers
 [submodule "cuetools.net"]
-	path = cuetools.net
-	url = https://github.com/claunia/cuetools.net
+	path = Aaru.Compression/cuetools.net
+	url = https://github.com/gchudov/cuetools.net
 [submodule "Aaru.Decryption"]
 	path = Aaru.Decryption
 	url = https://github.com/aaru-dps/Aaru.Decryption
diff --git a/Aaru.Compression/Aaru.Compression.csproj b/Aaru.Compression/Aaru.Compression.csproj
index fe8eb4d6d..1bd804b13 100644
--- a/Aaru.Compression/Aaru.Compression.csproj
+++ b/Aaru.Compression/Aaru.Compression.csproj
@@ -59,14 +59,27 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
+    <Reference Include="System"/>
+    <Reference Include="System.Core"/>
+    <Reference Include="System.Data"/>
+    <Reference Include="System.Xml"/>
   </ItemGroup>
+  <PropertyGroup>
+    <DefaultItemExcludes>
+      $(DefaultItemExcludes);cuetools.net/**/*
+    </DefaultItemExcludes>
+  </PropertyGroup>
   <ItemGroup>
     <Compile Include="AppleRle.cs" />
     <Compile Include="TeleDiskLzh.cs" />
+    <Compile Include="cuetools.net/CUETools.Codecs/*.cs" />
+    <Compile Include="cuetools.net/CUETools.Codecs/CommandLine/*.cs" />
+    <Compile Include="cuetools.net/CUETools.Codecs/CRC/*.cs" />
+    <Compile Include="cuetools.net/CUETools.Codecs/NULL/*.cs" />
+    <Compile Include="cuetools.net/CUETools.Codecs/ViewModel/*.cs" />
+    <Compile Include="cuetools.net/CUETools.Codecs/WAV/*.cs" />
+    <Compile Include="cuetools.net/CUETools.Codecs.Flake/*.cs" />
+    <Compile Include="cuetools.net/CUETools.Codecs.Flake/Properties/*.cs" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="..\LICENSE.LGPL">
@@ -74,6 +87,8 @@
     </Content>
   </ItemGroup>
   <ItemGroup>
+    <PackageReference Include="Newtonsoft.Json" Version="11.0.1" />
+    <PackageReference Include="System.Resources.Extensions" Version="5.0.0" />
     <PackageReference Include="Unclassified.NetRevisionTask" Version="0.4.1" PrivateAssets="all" />
   </ItemGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
diff --git a/Aaru.Compression/cuetools.net b/Aaru.Compression/cuetools.net
new file mode 160000
index 000000000..c68f96b6f
--- /dev/null
+++ b/Aaru.Compression/cuetools.net
@@ -0,0 +1 @@
+Subproject commit c68f96b6fd2aeb237574513df906237746037cf4
diff --git a/Aaru.Images/Aaru.Images.csproj b/Aaru.Images/Aaru.Images.csproj
index 3fb66809c..4af43a7f2 100644
--- a/Aaru.Images/Aaru.Images.csproj
+++ b/Aaru.Images/Aaru.Images.csproj
@@ -556,8 +556,6 @@
       <Project>{D571B8EF-903D-4353-BDD5-B834F9F029EF}</Project>
       <Name>Aaru.Filters</Name>
     </ProjectReference>
-    <ProjectReference Include="..\cuetools.net\CUETools.Codecs.Flake\CUETools.Codecs.Flake.csproj" />
-    <ProjectReference Include="..\cuetools.net\CUETools.Codecs\CUETools.Codecs.csproj" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="..\LICENSE.LGPL">
diff --git a/Aaru.sln b/Aaru.sln
index ce727b0ab..7097a34de 100644
--- a/Aaru.sln
+++ b/Aaru.sln
@@ -36,14 +36,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aaru.Dto", "Aaru.Dto\Aaru.D
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aaru.Gui", "Aaru.Gui\Aaru.Gui.csproj", "{18C4C44D-2562-4B6D-8181-32D7EA067D96}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CUETools.Codecs", "cuetools.net\CUETools.Codecs\CUETools.Codecs.csproj", "{D1F69B02-A6A4-4EF2-A916-815BACC18F71}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aaru.Tests", "Aaru.Tests\Aaru.Tests.csproj", "{B2A2CCF8-150D-4A00-BCB5-1B0CBCFA95D5}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aaru.Tests.Devices", "Aaru.Tests.Devices\Aaru.Tests.Devices.csproj", "{A40662EB-D202-46A4-AB41-9C32ADE6D6B5}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CUETools.Codecs.Flake", "cuetools.net\CUETools.Codecs.Flake\CUETools.Codecs.Flake.csproj", "{69FAC887-A3DE-4C23-84A5-9C5F64E4C3E1}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aaru.Decryption", "Aaru.Decryption\Aaru.Decryption.csproj", "{B609D333-80C5-4503-BF46-8B9B91F04E97}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aaru.Archives", "Aaru.Archives\Aaru.Archives.csproj", "{282271D0-CCC2-4ED7-BA38-EC06A84BB974}"
@@ -192,14 +188,6 @@ Global
 		{18C4C44D-2562-4B6D-8181-32D7EA067D96}.Release|Any CPU.Build.0 = Release|Any CPU
 		{18C4C44D-2562-4B6D-8181-32D7EA067D96}.Release|x86.ActiveCfg = Release|Any CPU
 		{18C4C44D-2562-4B6D-8181-32D7EA067D96}.Release|x86.Build.0 = Release|Any CPU
-		{D1F69B02-A6A4-4EF2-A916-815BACC18F71}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D1F69B02-A6A4-4EF2-A916-815BACC18F71}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D1F69B02-A6A4-4EF2-A916-815BACC18F71}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{D1F69B02-A6A4-4EF2-A916-815BACC18F71}.Debug|x86.Build.0 = Debug|Any CPU
-		{D1F69B02-A6A4-4EF2-A916-815BACC18F71}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D1F69B02-A6A4-4EF2-A916-815BACC18F71}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D1F69B02-A6A4-4EF2-A916-815BACC18F71}.Release|x86.ActiveCfg = Release|Any CPU
-		{D1F69B02-A6A4-4EF2-A916-815BACC18F71}.Release|x86.Build.0 = Release|Any CPU
 		{B2A2CCF8-150D-4A00-BCB5-1B0CBCFA95D5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{B2A2CCF8-150D-4A00-BCB5-1B0CBCFA95D5}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B2A2CCF8-150D-4A00-BCB5-1B0CBCFA95D5}.Debug|x86.ActiveCfg = Debug|Any CPU
@@ -216,14 +204,6 @@ Global
 		{A40662EB-D202-46A4-AB41-9C32ADE6D6B5}.Release|Any CPU.Build.0 = Release|Any CPU
 		{A40662EB-D202-46A4-AB41-9C32ADE6D6B5}.Release|x86.ActiveCfg = Release|Any CPU
 		{A40662EB-D202-46A4-AB41-9C32ADE6D6B5}.Release|x86.Build.0 = Release|Any CPU
-		{69FAC887-A3DE-4C23-84A5-9C5F64E4C3E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{69FAC887-A3DE-4C23-84A5-9C5F64E4C3E1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{69FAC887-A3DE-4C23-84A5-9C5F64E4C3E1}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{69FAC887-A3DE-4C23-84A5-9C5F64E4C3E1}.Debug|x86.Build.0 = Debug|Any CPU
-		{69FAC887-A3DE-4C23-84A5-9C5F64E4C3E1}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{69FAC887-A3DE-4C23-84A5-9C5F64E4C3E1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{69FAC887-A3DE-4C23-84A5-9C5F64E4C3E1}.Release|x86.ActiveCfg = Release|Any CPU
-		{69FAC887-A3DE-4C23-84A5-9C5F64E4C3E1}.Release|x86.Build.0 = Release|Any CPU
 		{B609D333-80C5-4503-BF46-8B9B91F04E97}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{B609D333-80C5-4503-BF46-8B9B91F04E97}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B609D333-80C5-4503-BF46-8B9B91F04E97}.Debug|x86.ActiveCfg = Debug|Any CPU
diff --git a/cuetools.net b/cuetools.net
deleted file mode 160000
index becd5fde9..000000000
--- a/cuetools.net
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit becd5fde95b0e336740487ecde6d7add067cee83