diff --git a/.idea/.idea.Aaru/.idea/contentModel.xml b/.idea/.idea.Aaru/.idea/contentModel.xml
index 505b1b940..428009be1 100644
--- a/.idea/.idea.Aaru/.idea/contentModel.xml
+++ b/.idea/.idea.Aaru/.idea/contentModel.xml
@@ -82,9 +82,6 @@
           <e p="Debug" t="Include">
             <e p="netcoreapp3.0" t="Include">
               <e p="Aaru.AssemblyInfo.cs" t="Include" />
-              <e p="Avalonia" t="Include">
-                <e p="resources" t="Include" />
-              </e>
             </e>
           </e>
         </e>
@@ -1215,6 +1212,7 @@
         <e p="Controls" t="Include">
           <e p="BlockMap.cs" t="Include" />
         </e>
+        <e p="Main.cs" t="Include" />
         <e p="Models" t="Include">
           <e p="AssemblyModel.cs" t="Include" />
           <e p="ChecksumModel.cs" t="Include" />
@@ -2186,7 +2184,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.Gui/Main.cs b/Aaru.Gui/Main.cs
new file mode 100644
index 000000000..074f089fb
--- /dev/null
+++ b/Aaru.Gui/Main.cs
@@ -0,0 +1,17 @@
+using Avalonia;
+using Avalonia.Dialogs;
+using Avalonia.Logging.Serilog;
+using Avalonia.ReactiveUI;
+
+namespace Aaru.Gui
+{
+    public static class Main
+    {
+        public static int Start(string[] args) => BuildAvaloniaApp().StartWithClassicDesktopLifetime(args);
+
+        // Avalonia configuration, don't remove; also used by visual designer.
+        public static AppBuilder BuildAvaloniaApp() => AppBuilder.
+                                                       Configure<App>().UsePlatformDetect().LogToDebug().
+                                                       UseReactiveUI().UseManagedSystemDialogs();
+    }
+}
\ No newline at end of file
diff --git a/Aaru/Aaru.csproj b/Aaru/Aaru.csproj
index 4057a11ab..bc3823c8d 100644
--- a/Aaru/Aaru.csproj
+++ b/Aaru/Aaru.csproj
@@ -282,9 +282,6 @@
     <PackageReference Include="System.Runtime.InteropServices" Version="4.3.0" />
     <PackageReference Include="System.Net.Primitives" Version="4.3.1" />
     <PackageReference Include="System.IO.FileSystem" Version="4.3.0" />
-    <PackageReference Include="Avalonia" Version="0.9.7" />
-    <PackageReference Include="Avalonia.Desktop" Version="0.9.7" />
-    <PackageReference Include="Avalonia.ReactiveUI" Version="0.9.7" />
   </ItemGroup>
   <PropertyGroup Condition="'$(Configuration)' == 'Debug'">
     <DebugPackage>-dbg</DebugPackage>
diff --git a/Aaru/Main.cs b/Aaru/Main.cs
index 68d9b0844..c11c2c817 100644
--- a/Aaru/Main.cs
+++ b/Aaru/Main.cs
@@ -44,12 +44,7 @@ using Aaru.Commands.Media;
 using Aaru.Console;
 using Aaru.Core;
 using Aaru.Database;
-using Aaru.Gui;
 using Aaru.Settings;
-using Avalonia;
-using Avalonia.Dialogs;
-using Avalonia.Logging.Serilog;
-using Avalonia.ReactiveUI;
 using Microsoft.EntityFrameworkCore;
 
 namespace Aaru
@@ -75,7 +70,7 @@ namespace Aaru
             if(args.Length                == 1 &&
                args[0].ToLowerInvariant() == "gui")
             {
-                return BuildAvaloniaApp().StartWithClassicDesktopLifetime(args);
+                return Gui.Main.Start(args);
             }
 
             AaruConsole.WriteLineEvent      += System.Console.WriteLine;
@@ -167,10 +162,5 @@ namespace Aaru
             AaruConsole.WriteLine("{0}", _assemblyCopyright);
             AaruConsole.WriteLine();
         }
-
-        // Avalonia configuration, don't remove; also used by visual designer.
-        public static AppBuilder BuildAvaloniaApp() => AppBuilder.
-                                                       Configure<App>().UsePlatformDetect().LogToDebug().
-                                                       UseReactiveUI().UseManagedSystemDialogs();
     }
 }
\ No newline at end of file