diff --git a/.idea/.idea.Aaru/.idea/contentModel.xml b/.idea/.idea.Aaru/.idea/contentModel.xml
index f3e5cc842..6b3a3b5d7 100644
--- a/.idea/.idea.Aaru/.idea/contentModel.xml
+++ b/.idea/.idea.Aaru/.idea/contentModel.xml
@@ -5,8 +5,6 @@
     <e p="$USER_HOME$/.cache/JetBrains/Rider2020.1/resharper-host/local/Transient/ReSharperHost/v201/SolutionCaches/_Aaru.232757112.00" t="ExcludeRecursive" />
     <e p="$APPLICATION_CONFIG_DIR$/consoles/db" t="IncludeRecursive" />
     <e p="$APPLICATION_CONFIG_DIR$/extensions" t="IncludeRecursive" />
-    <e p="$APPLICATION_CONFIG_DIR$/scratches" t="IncludeRecursive" />
-    <e p="$USER_HOME$/.config/git/ignore" t="IncludeRecursive" />
     <e p="$APPLICATION_PLUGINS_DIR$/puppet/lib/stubs" t="IncludeRecursive" />
     <e p="$PROJECT_DIR$" t="IncludeFlat">
       <e p=".git/info/exclude" t="IncludeRecursive" />
@@ -83,7 +81,7 @@
         <e p="bin" t="ExcludeRecursive" />
         <e p="obj" t="ExcludeRecursive">
           <e p="Debug" t="Include">
-            <e p="netcoreapp3.0" t="Include">
+            <e p="netcoreapp3.1" t="Include">
               <e p="Aaru.AssemblyInfo.cs" t="Include" />
             </e>
           </e>
@@ -112,7 +110,7 @@
         <e p="bin" t="ExcludeRecursive" />
         <e p="obj" t="ExcludeRecursive">
           <e p="Debug" t="Include">
-            <e p="netcoreapp3.0" t="Include">
+            <e p="netcoreapp3.1" t="Include">
               <e p="Aaru.Checksums.AssemblyInfo.cs" t="Include" />
             </e>
           </e>
@@ -203,7 +201,7 @@
         <e p="bin" t="ExcludeRecursive" />
         <e p="obj" t="ExcludeRecursive">
           <e p="Debug" t="Include">
-            <e p="netcoreapp3.0" t="Include">
+            <e p="netcoreapp3.1" t="Include">
               <e p="Aaru.CommonTypes.AssemblyInfo.cs" t="Include" />
             </e>
           </e>
@@ -216,7 +214,7 @@
         <e p="bin" t="ExcludeRecursive" />
         <e p="obj" t="ExcludeRecursive">
           <e p="Debug" t="Include">
-            <e p="netcoreapp3.0" t="Include">
+            <e p="netcoreapp3.1" t="Include">
               <e p="Aaru.Compression.AssemblyInfo.cs" t="Include" />
             </e>
           </e>
@@ -230,7 +228,7 @@
         <e p="bin" t="ExcludeRecursive" />
         <e p="obj" t="ExcludeRecursive">
           <e p="Debug" t="Include">
-            <e p="netcoreapp3.0" t="Include">
+            <e p="netcoreapp3.1" t="Include">
               <e p="Aaru.Console.AssemblyInfo.cs" t="Include" />
             </e>
           </e>
@@ -344,7 +342,7 @@
         <e p="bin" t="ExcludeRecursive" />
         <e p="obj" t="ExcludeRecursive">
           <e p="Debug" t="Include">
-            <e p="netcoreapp3.0" t="Include">
+            <e p="netcoreapp3.1" t="Include">
               <e p="Aaru.Core.AssemblyInfo.cs" t="Include" />
             </e>
           </e>
@@ -430,7 +428,7 @@
         <e p="bin" t="ExcludeRecursive" />
         <e p="obj" t="ExcludeRecursive">
           <e p="Debug" t="Include">
-            <e p="netcoreapp3.0" t="Include">
+            <e p="netcoreapp3.1" t="Include">
               <e p="Aaru.Database.AssemblyInfo.cs" t="Include" />
             </e>
           </e>
@@ -588,7 +586,7 @@
         <e p="bin" t="ExcludeRecursive" />
         <e p="obj" t="ExcludeRecursive">
           <e p="Debug" t="Include">
-            <e p="netcoreapp3.0" t="Include">
+            <e p="netcoreapp3.1" t="Include">
               <e p="Aaru.Decoders.AssemblyInfo.cs" t="Include" />
             </e>
           </e>
@@ -672,7 +670,7 @@
         <e p="bin" t="ExcludeRecursive" />
         <e p="obj" t="ExcludeRecursive">
           <e p="Debug" t="Include">
-            <e p="netcoreapp3.0" t="Include">
+            <e p="netcoreapp3.1" t="Include">
               <e p="Aaru.Devices.AssemblyInfo.cs" t="Include" />
             </e>
           </e>
@@ -690,7 +688,7 @@
         <e p="bin" t="ExcludeRecursive" />
         <e p="obj" t="ExcludeRecursive">
           <e p="Debug" t="Include">
-            <e p="netcoreapp3.0" t="Include">
+            <e p="netcoreapp3.1" t="Include">
               <e p="Aaru.Dto.AssemblyInfo.cs" t="Include" />
             </e>
           </e>
@@ -894,7 +892,7 @@
         <e p="extFS.cs" t="Include" />
         <e p="obj" t="ExcludeRecursive">
           <e p="Debug" t="Include">
-            <e p="netcoreapp3.0" t="Include">
+            <e p="netcoreapp3.1" t="Include">
               <e p="Aaru.Filesystems.AssemblyInfo.cs" t="Include" />
             </e>
           </e>
@@ -917,7 +915,7 @@
         <e p="bin" t="ExcludeRecursive" />
         <e p="obj" t="ExcludeRecursive">
           <e p="Debug" t="Include">
-            <e p="netcoreapp3.0" t="Include">
+            <e p="netcoreapp3.1" t="Include">
               <e p="Aaru.Filters.AssemblyInfo.cs" t="Include" />
             </e>
           </e>
@@ -1374,7 +1372,8 @@
         <e p="bin" t="ExcludeRecursive" />
         <e p="obj" t="ExcludeRecursive">
           <e p="Debug" t="Include">
-            <e p="netcoreapp3.0" t="Include">
+            <e p="netcoreapp3.1" t="Include">
+              <e p="Aaru.Gui.AssemblyInfo.cs" t="Include" />
               <e p="Avalonia" t="Include">
                 <e p="resources" t="Include" />
               </e>
@@ -1402,7 +1401,7 @@
         <e p="bin" t="ExcludeRecursive" />
         <e p="obj" t="ExcludeRecursive">
           <e p="Debug" t="Include">
-            <e p="netcoreapp3.0" t="Include">
+            <e p="netcoreapp3.1" t="Include">
               <e p="Aaru.Helpers.AssemblyInfo.cs" t="Include" />
             </e>
           </e>
@@ -1970,7 +1969,7 @@
         <e p="bin" t="ExcludeRecursive" />
         <e p="obj" t="ExcludeRecursive">
           <e p="Debug" t="Include">
-            <e p="netcoreapp3.0" t="Include">
+            <e p="netcoreapp3.1" t="Include">
               <e p="Aaru.Images.AssemblyInfo.cs" t="Include" />
             </e>
           </e>
@@ -2003,7 +2002,7 @@
         <e p="bin" t="ExcludeRecursive" />
         <e p="obj" t="ExcludeRecursive">
           <e p="Debug" t="Include">
-            <e p="netcoreapp3.0" t="Include">
+            <e p="netcoreapp3.1" t="Include">
               <e p="Aaru.Partitions.AssemblyInfo.cs" t="Include" />
             </e>
           </e>
@@ -2015,7 +2014,7 @@
         <e p="bin" t="ExcludeRecursive" />
         <e p="obj" t="ExcludeRecursive">
           <e p="Debug" t="Include">
-            <e p="netcoreapp3.0" t="Include">
+            <e p="netcoreapp3.1" t="Include">
               <e p="Aaru.Settings.AssemblyInfo.cs" t="Include" />
             </e>
           </e>
@@ -2224,7 +2223,6 @@
               <e p="Avalonia" t="Include">
                 <e p="resources" t="Include" />
               </e>
-              <e p="OxyPlot.Avalonia.AssemblyInfo.cs" t="Include" />
             </e>
           </e>
         </e>
diff --git a/Aaru.Checksums b/Aaru.Checksums
index d7e802338..d4e706c90 160000
--- a/Aaru.Checksums
+++ b/Aaru.Checksums
@@ -1 +1 @@
-Subproject commit d7e802338b3a8703160072ef1ab12cdb580b483d
+Subproject commit d4e706c90bc29f3d357a5f9097aa1c79a06f0233
diff --git a/Aaru.CommonTypes b/Aaru.CommonTypes
index fa999bfe4..bea7e22c2 160000
--- a/Aaru.CommonTypes
+++ b/Aaru.CommonTypes
@@ -1 +1 @@
-Subproject commit fa999bfe45e7d031cedf4671228587949df614ac
+Subproject commit bea7e22c2af033b7610569adf51cbb9a0a9e17a3
diff --git a/Aaru.Compression/Aaru.Compression.csproj b/Aaru.Compression/Aaru.Compression.csproj
index 76f81ee99..e1ea6bedc 100644
--- a/Aaru.Compression/Aaru.Compression.csproj
+++ b/Aaru.Compression/Aaru.Compression.csproj
@@ -18,7 +18,7 @@
     <Product>Aaru Data Preservation Suite</Product>
     <Title>Aaru Data Preservation Suite</Title>
     <ApplicationVersion>$(Version)</ApplicationVersion>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
   </PropertyGroup>
   <PropertyGroup>
     <NrtRevisionFormat>$(Version)+{chash:8} built by {mname} in $(Configuration){!:, modified}</NrtRevisionFormat>
diff --git a/Aaru.Console b/Aaru.Console
index 312233024..f908d537c 160000
--- a/Aaru.Console
+++ b/Aaru.Console
@@ -1 +1 @@
-Subproject commit 312233024856137df3306e55b25dfba2ccf25530
+Subproject commit f908d537c396c1bac7d0649bf0740fc6de688a77
diff --git a/Aaru.Core/Aaru.Core.csproj b/Aaru.Core/Aaru.Core.csproj
index 1cf77c06e..cf95757ae 100644
--- a/Aaru.Core/Aaru.Core.csproj
+++ b/Aaru.Core/Aaru.Core.csproj
@@ -17,7 +17,7 @@
     <Product>Aaru Data Preservation Suite</Product>
     <Title>Aaru.Core</Title>
     <ApplicationVersion>$(Version)</ApplicationVersion>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <LangVersion>latest</LangVersion>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/Aaru.Database/Aaru.Database.csproj b/Aaru.Database/Aaru.Database.csproj
index 80e499e93..f7242c27b 100644
--- a/Aaru.Database/Aaru.Database.csproj
+++ b/Aaru.Database/Aaru.Database.csproj
@@ -16,7 +16,7 @@
     <Product>Aaru Data Preservation Suite</Product>
     <Title>Aaru.Database</Title>
     <ApplicationVersion>$(Version)</ApplicationVersion>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
   </PropertyGroup>
   <PropertyGroup>
     <NrtRevisionFormat>$(Version)+{chash:8} built by {mname} in $(Configuration){!:, modified}</NrtRevisionFormat>
diff --git a/Aaru.Decoders b/Aaru.Decoders
index 0cdc850bf..02fa1a1b0 160000
--- a/Aaru.Decoders
+++ b/Aaru.Decoders
@@ -1 +1 @@
-Subproject commit 0cdc850bf80bc3d12be4c3299c84e861db363eb5
+Subproject commit 02fa1a1b0f4f7d8e006382024be71a9361bc7a99
diff --git a/Aaru.Devices/Aaru.Devices.csproj b/Aaru.Devices/Aaru.Devices.csproj
index 16235eaea..0778313f9 100644
--- a/Aaru.Devices/Aaru.Devices.csproj
+++ b/Aaru.Devices/Aaru.Devices.csproj
@@ -17,7 +17,7 @@
     <Product>Aaru Data Preservation Suite</Product>
     <Title>Aaru.Devices</Title>
     <ApplicationVersion>$(Version)</ApplicationVersion>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
   </PropertyGroup>
   <PropertyGroup>
     <NrtRevisionFormat>$(Version)+{chash:8} built by {mname} in $(Configuration){!:, modified}</NrtRevisionFormat>
diff --git a/Aaru.Dto b/Aaru.Dto
index 4b27f3a38..f4aa43c5d 160000
--- a/Aaru.Dto
+++ b/Aaru.Dto
@@ -1 +1 @@
-Subproject commit 4b27f3a389f423de490d5ebeace5ceade46dcfcf
+Subproject commit f4aa43c5d4203f48cf0f237be01ad8d5a87dccd1
diff --git a/Aaru.Filesystems/Aaru.Filesystems.csproj b/Aaru.Filesystems/Aaru.Filesystems.csproj
index 99f897e78..44a6129d1 100644
--- a/Aaru.Filesystems/Aaru.Filesystems.csproj
+++ b/Aaru.Filesystems/Aaru.Filesystems.csproj
@@ -17,7 +17,7 @@
     <Product>Aaru Data Preservation Suite</Product>
     <Title>Aaru.Filesystems</Title>
     <ApplicationVersion>$(Version)</ApplicationVersion>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <NoWarn>CS0649</NoWarn>
     <LangVersion>latest</LangVersion>
   </PropertyGroup>
diff --git a/Aaru.Filters/Aaru.Filters.csproj b/Aaru.Filters/Aaru.Filters.csproj
index 22411ff5b..2b306fc07 100644
--- a/Aaru.Filters/Aaru.Filters.csproj
+++ b/Aaru.Filters/Aaru.Filters.csproj
@@ -17,7 +17,7 @@
     <Product>Aaru Data Preservation Suite</Product>
     <Title>Aaru.Filters</Title>
     <ApplicationVersion>$(Version)</ApplicationVersion>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
   </PropertyGroup>
   <PropertyGroup>
     <NrtRevisionFormat>$(Version)+{chash:8} built by {mname} in $(Configuration){!:, modified}</NrtRevisionFormat>
diff --git a/Aaru.Gui/Aaru.Gui.csproj b/Aaru.Gui/Aaru.Gui.csproj
index 2210e7a30..c27622a65 100644
--- a/Aaru.Gui/Aaru.Gui.csproj
+++ b/Aaru.Gui/Aaru.Gui.csproj
@@ -10,7 +10,7 @@
     <Product>Aaru Data Preservation Suite</Product>
     <Title>Aaru Data Preservation Suite</Title>
     <ApplicationVersion>$(Version)</ApplicationVersion>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <NoWarn>CS0649,CS0169</NoWarn>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/Aaru.Helpers b/Aaru.Helpers
index f2b5d64d4..9abb9f23b 160000
--- a/Aaru.Helpers
+++ b/Aaru.Helpers
@@ -1 +1 @@
-Subproject commit f2b5d64d4ecce7223476483cd8e39280cefbf4e4
+Subproject commit 9abb9f23bc4796f908a71dc8b8baee2fd60963d5
diff --git a/Aaru.Images/Aaru.Images.csproj b/Aaru.Images/Aaru.Images.csproj
index c80f5c3f2..0db1ecd0e 100644
--- a/Aaru.Images/Aaru.Images.csproj
+++ b/Aaru.Images/Aaru.Images.csproj
@@ -17,7 +17,7 @@
     <Product>Aaru Data Preservation Suite</Product>
     <Title>Aaru.DiscImages</Title>
     <ApplicationVersion>$(Version)</ApplicationVersion>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <NoWarn>CS0649</NoWarn>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/Aaru.Partitions/Aaru.Partitions.csproj b/Aaru.Partitions/Aaru.Partitions.csproj
index 997e12310..39b0e347b 100644
--- a/Aaru.Partitions/Aaru.Partitions.csproj
+++ b/Aaru.Partitions/Aaru.Partitions.csproj
@@ -17,7 +17,7 @@
     <Product>Aaru Data Preservation Suite</Product>
     <Title>Aaru.Partitions</Title>
     <ApplicationVersion>$(Version)</ApplicationVersion>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <NoWarn>CS0649</NoWarn>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/Aaru.Settings/Aaru.Settings.csproj b/Aaru.Settings/Aaru.Settings.csproj
index dc65eaf6c..1cf46d3ef 100644
--- a/Aaru.Settings/Aaru.Settings.csproj
+++ b/Aaru.Settings/Aaru.Settings.csproj
@@ -17,7 +17,7 @@
     <Product>Aaru Data Preservation Suite</Product>
     <Title>Aaru.Settings</Title>
     <ApplicationVersion>$(Version)</ApplicationVersion>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
   </PropertyGroup>
   <PropertyGroup>
     <NrtRevisionFormat>$(Version)+{chash:8} built by {mname} in $(Configuration){!:, modified}</NrtRevisionFormat>
diff --git a/Aaru/Aaru.csproj b/Aaru/Aaru.csproj
index 6eed1688c..9eaf59348 100644
--- a/Aaru/Aaru.csproj
+++ b/Aaru/Aaru.csproj
@@ -10,7 +10,7 @@
     <AssemblyName>aaru</AssemblyName>
     <ReleaseVersion>$(Version)</ReleaseVersion>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
     <Version>5.0.99.2991</Version>
     <Company>Claunia.com</Company>
diff --git a/build.sh b/build.sh
index cfaa8c1b6..2fc3e212d 100644
--- a/build.sh
+++ b/build.sh
@@ -10,7 +10,7 @@ for conf in Debug Release;
 do
  for distro in alpine-x64 linux-arm64 linux-arm linux-x64 osx-x64 win-arm64 win-arm win-x64 win-x86 debian-arm debian-arm64 debian-x64 rhel-arm64 rhel-x64 sles-x64;
  do
-  dotnet publish -f netcoreapp3.0 -r ${distro} -c ${conf}
+  dotnet publish -f netcoreapp3.1 -r ${distro} -c ${conf}
 
 # Package the Linux packages
   if [[ ${distro} == alpine* ]] || [[ ${distro} == linux* ]]; then
@@ -22,7 +22,7 @@ do
   else
     pkg="deb"
   fi
-  dotnet ${pkg} -f netcoreapp3.0 -r ${distro} -c ${conf} -o ../build
+  dotnet ${pkg} -f netcoreapp3.1 -r ${distro} -c ${conf} -o ../build
  done
 done
 
@@ -66,10 +66,10 @@ mkdir -p build/macos/Aaru.app/Contents/Resources
 mkdir -p build/macos/Aaru.app/Contents/MacOS
 cp Aaru/Aaru.icns build/macos/Aaru.app/Contents/Resources
 cp Aaru/Info.plist build/macos/Aaru.app/Contents
-cp -r Aaru/bin/Release/netcoreapp3.0/osx-x64/publish/* build/macos/Aaru.app/Contents/MacOS
+cp -r Aaru/bin/Release/netcoreapp3.1/osx-x64/publish/* build/macos/Aaru.app/Contents/MacOS
 rm -Rf build/macos-dbg/Aaru.app
 mkdir -p build/macos-dbg/Aaru.app/Contents/Resources
 mkdir -p build/macos-dbg/Aaru.app/Contents/MacOS
 cp Aaru/Aaru.icns build/macos-dbg/Aaru.app/Contents/Resources
 cp Aaru/Info.plist build/macos-dbg/Aaru.app/Contents
-cp -r Aaru/bin/Debug/netcoreapp3.0/osx-x64/publish/* build/macos-dbg/Aaru.app/Contents/MacOS
\ No newline at end of file
+cp -r Aaru/bin/Debug/netcoreapp3.1/osx-x64/publish/* build/macos-dbg/Aaru.app/Contents/MacOS
diff --git a/pkg/pacman/rolling/PKGBUILD b/pkg/pacman/rolling/PKGBUILD
index 2a0f67db5..1246ad964 100644
--- a/pkg/pacman/rolling/PKGBUILD
+++ b/pkg/pacman/rolling/PKGBUILD
@@ -1,6 +1,6 @@
 #@IgnoreInspection BashAddShebang
 # Maintainer: Natalia Portillo <claunia@claunia.com>
-_netcoretarget='netcoreapp2.1'
+_netcoretarget='netcoreapp3.1'
 _aarubase='Aaru'
 packager='Natalia Portillo <claunia@claunia.com>'
 pkgbase='aaru-git'
@@ -12,7 +12,7 @@ arch=('x86_64' 'armv7h' 'aarch64')
 url='http://www.aaru.app'
 license=('GPL')
 source=('git://github.com/aaru-dps/Aaru')
-makedepends=('dotnet-sdk>=2.1.0' 'git')
+makedepends=('dotnet-sdk>=3.1.0' 'git')
 options=('!strip' 'staticlibs')
 sha256sums=('SKIP')
 provides=('aaru')
@@ -94,4 +94,4 @@ post_upgrade() {
 
 post_remove() {
   post_install "$1"
-}
\ No newline at end of file
+}