diff --git a/Common.props b/Common.props
index dd90c73b55..a376ad01f6 100644
--- a/Common.props
+++ b/Common.props
@@ -4,6 +4,7 @@
 		<ErrorReport>prompt</ErrorReport>
 		<IsTargetingNetFramework>$(TargetFramework.StartsWith("net4"))</IsTargetingNetFramework>
 		<LangVersion>9.0</LangVersion>
+		<Nullable>enable</Nullable>
 		<PlatformTarget>AnyCPU</PlatformTarget>
 		<RunAnalyzersDuringBuild Condition=" '$(MachineRunAnalyzersDuringBuild)' == '' ">false</RunAnalyzersDuringBuild>
 		<RunCodeAnalysis>false</RunCodeAnalysis>
@@ -24,6 +25,9 @@
 		<DefineConstants>$(DefineConstants);$(MachineExtraCompilationFlag)</DefineConstants>
 	</PropertyGroup>
 	<ItemGroup>
+		<PackageReference Include="Nullable" Version="1.3.0" PrivateAssets="all" />
+	</ItemGroup>
+	<ItemGroup Condition=" $(IsTargetingNetFramework) ">
 		<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" PrivateAssets="all" />
 	</ItemGroup>
 </Project>
diff --git a/CommonNullable.props b/CommonNullable.props
deleted file mode 100644
index accb25bd3b..0000000000
--- a/CommonNullable.props
+++ /dev/null
@@ -1,8 +0,0 @@
-<Project>
-	<PropertyGroup>
-		<Nullable>enable</Nullable>
-	</PropertyGroup>
-	<ItemGroup>
-		<PackageReference Include="Nullable" Version="1.3.0" PrivateAssets="all" />
-	</ItemGroup>
-</Project>
diff --git a/ExternalToolProjects/ExtToolCommon.props b/ExternalToolProjects/ExtToolCommon.props
index 03b798f4ae..2da08c2ead 100644
--- a/ExternalToolProjects/ExtToolCommon.props
+++ b/ExternalToolProjects/ExtToolCommon.props
@@ -1,6 +1,5 @@
 <Project>
 	<Import Project="../Common.props" />
-	<Import Project="../CommonNullable.props" />
 	<PropertyGroup>
 		<CodeAnalysisRuleSet>$(ProjectDir)../../Common.ruleset</CodeAnalysisRuleSet>
 		<OutputPath>$(ProjectDir)bin/$(Configuration)/</OutputPath>
diff --git a/src/BizHawk.BizInvoke/BizHawk.BizInvoke.csproj b/src/BizHawk.BizInvoke/BizHawk.BizInvoke.csproj
index ae456e50b9..8bcfe1bcbe 100644
--- a/src/BizHawk.BizInvoke/BizHawk.BizInvoke.csproj
+++ b/src/BizHawk.BizInvoke/BizHawk.BizInvoke.csproj
@@ -5,6 +5,7 @@
 	<Import Project="../MainSlnCommon.props" />
 	<PropertyGroup>
 		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+		<Nullable>disable</Nullable>
 	</PropertyGroup>
 	<ItemGroup>
 		<ProjectReference Include="$(ProjectDir)../BizHawk.Common/BizHawk.Common.csproj" />
diff --git a/src/BizHawk.Bizware.BizwareGL/BizHawk.Bizware.BizwareGL.csproj b/src/BizHawk.Bizware.BizwareGL/BizHawk.Bizware.BizwareGL.csproj
index 11a6b18b03..6293786b9c 100644
--- a/src/BizHawk.Bizware.BizwareGL/BizHawk.Bizware.BizwareGL.csproj
+++ b/src/BizHawk.Bizware.BizwareGL/BizHawk.Bizware.BizwareGL.csproj
@@ -5,6 +5,7 @@
 	<Import Project="../MainSlnCommon.props" />
 	<PropertyGroup>
 		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+		<Nullable>disable</Nullable>
 	</PropertyGroup>
 	<ItemGroup>
 		<PackageReference Include="Cyotek.Drawing.BitmapFont" Version="1.0.2" NoWarn="NU1701" />
diff --git a/src/BizHawk.Bizware.DirectX/BizHawk.Bizware.DirectX.csproj b/src/BizHawk.Bizware.DirectX/BizHawk.Bizware.DirectX.csproj
index 2bb8de3094..4dd9dfe238 100644
--- a/src/BizHawk.Bizware.DirectX/BizHawk.Bizware.DirectX.csproj
+++ b/src/BizHawk.Bizware.DirectX/BizHawk.Bizware.DirectX.csproj
@@ -5,6 +5,7 @@
 	<Import Project="../MainSlnCommon.props" />
 	<PropertyGroup>
 		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+		<Nullable>disable</Nullable>
 	</PropertyGroup>
 	<ItemGroup>
 		<Reference Include="System.Windows.Forms" />
diff --git a/src/BizHawk.Client.Common/BizHawk.Client.Common.csproj b/src/BizHawk.Client.Common/BizHawk.Client.Common.csproj
index c2008806a5..35f39448b9 100644
--- a/src/BizHawk.Client.Common/BizHawk.Client.Common.csproj
+++ b/src/BizHawk.Client.Common/BizHawk.Client.Common.csproj
@@ -5,6 +5,7 @@
 	<Import Project="../MainSlnCommon.props" />
 	<PropertyGroup>
 		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+		<Nullable>disable</Nullable>
 	</PropertyGroup>
 	<ItemGroup>
 		<Reference Include="System.Data.SQLite, Version=1.0.105.2, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=AMD64" SpecificVersion="False" HintPath="$(ProjectDir)../../References/x64/SQLite/System.Data.SQLite.dll" />
diff --git a/src/BizHawk.Client.DiscoHawk/BizHawk.Client.DiscoHawk.csproj b/src/BizHawk.Client.DiscoHawk/BizHawk.Client.DiscoHawk.csproj
index a711537520..df139d4cbb 100755
--- a/src/BizHawk.Client.DiscoHawk/BizHawk.Client.DiscoHawk.csproj
+++ b/src/BizHawk.Client.DiscoHawk/BizHawk.Client.DiscoHawk.csproj
@@ -6,58 +6,8 @@
 	<PropertyGroup>
 		<ApplicationIcon>discohawk.ico</ApplicationIcon>
 		<DefineConstants>$(DefineConstants);EXE_PROJECT</DefineConstants>
+		<Nullable>disable</Nullable>
 	</PropertyGroup>
-<!--
-	<PropertyGroup>
-		<AppDesignerFolder>Properties</AppDesignerFolder>
-		<ApplicationRevision>0</ApplicationRevision>
-		<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-		<AssemblyName>DiscoHawk</AssemblyName>
-		<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-		<BootstrapperEnabled>true</BootstrapperEnabled>
-		<FileAlignment>512</FileAlignment>
-		<FileUpgradeFlags/>
-		<Install>true</Install>
-		<InstallFrom>Disk</InstallFrom>
-		<IsWebBootstrapper>false</IsWebBootstrapper>
-		<MapFileExtensions>true</MapFileExtensions>
-		<NoWin32Manifest>true</NoWin32Manifest>
-		<OldToolsVersion>3.5</OldToolsVersion>
-		<ProductVersion>9.0.30729</ProductVersion>
-		<ProjectGuid>{C4366030-6D03-424B-AE53-F4F43BB217C3}</ProjectGuid>
-		<PublishUrl>publish/</PublishUrl>
-		<RootNamespace>BizHawk.Client.DiscoHawk</RootNamespace>
-		<SchemaVersion>2.0</SchemaVersion>
-		<StartupObject/>
-		<TargetFrameworkProfile/>
-		<UpdateEnabled>false</UpdateEnabled>
-		<UpdateInterval>7</UpdateInterval>
-		<UpdateIntervalUnits>Days</UpdateIntervalUnits>
-		<UpdateMode>Foreground</UpdateMode>
-		<UpdatePeriodically>false</UpdatePeriodically>
-		<UpdateRequired>false</UpdateRequired>
-		<UpgradeBackupLocation/>
-		<UseApplicationTrust>false</UseApplicationTrust>
-		<UseVSHostingProcess>false</UseVSHostingProcess>
-	</PropertyGroup>
-	<ItemGroup>
-		<BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-			<Visible>False</Visible>
-			<ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-			<Install>false</Install>
-		</BootstrapperPackage>
-		<BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-			<Visible>False</Visible>
-			<ProductName>.NET Framework 3.5 SP1</ProductName>
-			<Install>true</Install>
-		</BootstrapperPackage>
-		<BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-			<Visible>False</Visible>
-			<ProductName>Windows Installer 3.1</ProductName>
-			<Install>true</Install>
-		</BootstrapperPackage>
-	</ItemGroup>
--->
 	<ItemGroup>
 		<Reference Include="System.Web" />
 		<Reference Include="System.Windows.Forms" />
diff --git a/src/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj b/src/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
index bbda3dd26e..54cfeb1c12 100755
--- a/src/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
+++ b/src/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
@@ -8,75 +8,9 @@
 		<ApplicationIcon>images/logo.ico</ApplicationIcon>
 		<ApplicationManifest>app.manifest</ApplicationManifest>
 		<DefineConstants>$(DefineConstants);EXE_PROJECT</DefineConstants>
+		<Nullable>disable</Nullable>
 		<ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
 	</PropertyGroup>
-<!--
-	<PropertyGroup>
-		<AppDesignerFolder>Properties</AppDesignerFolder>
-		<ApplicationRevision>0</ApplicationRevision>
-		<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-		<AssemblyName>EmuHawk</AssemblyName>
-		<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-		<BootstrapperEnabled>true</BootstrapperEnabled>
-		<FileAlignment>512</FileAlignment>
-		<FileUpgradeFlags/>
-		<Install>true</Install>
-		<InstallFrom>Disk</InstallFrom>
-		<IsWebBootstrapper>false</IsWebBootstrapper>
-		<MapFileExtensions>true</MapFileExtensions>
-		<OldToolsVersion>3.5</OldToolsVersion>
-		<Prefer32Bit>false</Prefer32Bit>
-		<ProjectGuid>{DD448B37-BA3F-4544-9754-5406E8094723}</ProjectGuid>
-		<ProductVersion>9.0.30729</ProductVersion>
-		<PublishUrl>publish/</PublishUrl>
-		<ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
-		<RootNamespace>BizHawk.Client.EmuHawk</RootNamespace>
-		<SchemaVersion>2.0</SchemaVersion>
-		<StartupObject>BizHawk.Client.EmuHawk.Program</StartupObject>
-		<TargetFrameworkProfile/>
-		<UpdateEnabled>false</UpdateEnabled>
-		<UpdateInterval>7</UpdateInterval>
-		<UpdateIntervalUnits>Days</UpdateIntervalUnits>
-		<UpdateMode>Foreground</UpdateMode>
-		<UpdatePeriodically>false</UpdatePeriodically>
-		<UpdateRequired>false</UpdateRequired>
-		<UpgradeBackupLocation/>
-		<UseApplicationTrust>false</UseApplicationTrust>
-		<UseVSHostingProcess>false</UseVSHostingProcess>
-	</PropertyGroup>
-	<ItemGroup>
-		<BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-			<Visible>False</Visible>
-			<ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-			<Install>false</Install>
-		</BootstrapperPackage>
-		<BootstrapperPackage Include="Microsoft.Net.Framework.2.0">
-			<Visible>False</Visible>
-			<ProductName>.NET Framework 2.0 %28x86%29</ProductName>
-			<Install>false</Install>
-		</BootstrapperPackage>
-		<BootstrapperPackage Include="Microsoft.Net.Framework.3.0">
-			<Visible>False</Visible>
-			<ProductName>.NET Framework 3.0 %28x86%29</ProductName>
-			<Install>false</Install>
-		</BootstrapperPackage>
-		<BootstrapperPackage Include="Microsoft.Net.Framework.3.5">
-			<Visible>False</Visible>
-			<ProductName>.NET Framework 3.5</ProductName>
-			<Install>false</Install>
-		</BootstrapperPackage>
-		<BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-			<Visible>False</Visible>
-			<ProductName>.NET Framework 3.5 SP1</ProductName>
-			<Install>true</Install>
-		</BootstrapperPackage>
-		<BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-			<Visible>False</Visible>
-			<ProductName>Windows Installer 3.1</ProductName>
-			<Install>true</Install>
-		</BootstrapperPackage>
-	</ItemGroup>
--->
 	<ItemGroup>
 		<PackageReference Include="System.Net.Http" Version="4.3.4" />
 		<Reference Include="System.Windows.Forms" />
@@ -112,24 +46,6 @@
 	<ItemGroup>
 		<Compile Update="ArchiveChooser.cs" SubType="Form" />
 		<Compile Update="ArchiveChooser.Designer.cs" DependentUpon="ArchiveChooser.cs" />
-		<Compile Update="config\Messages\ColorRow.cs">
-		  <SubType>UserControl</SubType>
-		</Compile>
-		<Compile Update="config\Messages\ColorRow.Designer.cs">
-		  <DependentUpon>ColorRow.cs</DependentUpon>
-		</Compile>
-		<Compile Update="config\Messages\MessageRow.cs">
-		  <SubType>UserControl</SubType>
-		</Compile>
-		<Compile Update="config\Messages\MessageRow.Designer.cs">
-		  <DependentUpon>MessageRow.cs</DependentUpon>
-		</Compile>
-		<Compile Update="config\Messages\MessageEdit.cs">
-		  <SubType>UserControl</SubType>
-		</Compile>
-		<Compile Update="config\Messages\MessageEdit.Designer.cs">
-		  <DependentUpon>MessageEdit.cs</DependentUpon>
-		</Compile>
 		<EmbeddedResource Update="ArchiveChooser.resx" DependentUpon="ArchiveChooser.cs" SubType="Designer" />
 		<Compile Update="AVOut/FFmpegWriterForm.cs" SubType="Form" />
 		<Compile Update="AVOut/FFmpegWriterForm.Designer.cs" DependentUpon="FFmpegWriterForm.cs" />
@@ -241,15 +157,18 @@
 		<Compile Update="config/INTV/IntvControllerSettings.cs" SubType="Form" />
 		<Compile Update="config/INTV/IntvControllerSettings.Designer.cs" DependentUpon="IntvControllerSettings.cs" />
 		<EmbeddedResource Update="config/INTV/IntvControllerSettings.resx" DependentUpon="IntvControllerSettings.cs" />
-		<Compile Update="config\Messages\MessageConfig.cs" SubType="Form" />
-		<Compile Update="config\Messages\MessageConfig.Designer.cs" DependentUpon="MessageConfig.cs" />
-		<EmbeddedResource Update="config\Messages\ColorRow.resx">
-		  <DependentUpon>ColorRow.cs</DependentUpon>
-		</EmbeddedResource>
-		<EmbeddedResource Update="config\Messages\MessageRow.resx">
-		  <DependentUpon>MessageRow.cs</DependentUpon>
-		</EmbeddedResource>
-		<EmbeddedResource Update="config\Messages\MessageConfig.resx" DependentUpon="MessageConfig.cs" SubType="Designer" />
+		<Compile Update="config/Messages/ColorRow.cs" SubType="UserControl" />
+		<Compile Update="config/Messages/ColorRow.Designer.cs" DependentUpon="ColorRow.cs" />
+		<EmbeddedResource Update="config/Messages/ColorRow.resx" DependentUpon="ColorRow.cs" />
+		<Compile Update="config/Messages/MessageConfig.cs" SubType="Form" />
+		<Compile Update="config/Messages/MessageConfig.Designer.cs" DependentUpon="MessageConfig.cs" />
+		<EmbeddedResource Update="config/Messages/MessageConfig.resx" DependentUpon="MessageConfig.cs" SubType="Designer" />
+		<Compile Update="config/Messages/MessageEdit.cs" SubType="UserControl" />
+		<Compile Update="config/Messages/MessageEdit.Designer.cs" DependentUpon="MessageEdit.cs" />
+		<EmbeddedResource Update="config/Messages/MessageEdit.resx" DependentUpon="MessageEdit.cs" />
+		<Compile Update="config/Messages/MessageRow.cs" SubType="UserControl" />
+		<Compile Update="config/Messages/MessageRow.Designer.cs" DependentUpon="MessageRow.cs" />
+		<EmbeddedResource Update="config/Messages/MessageRow.resx" DependentUpon="MessageRow.cs" />
 		<Compile Update="config/N64/N64ControllerSettingControl.cs" SubType="UserControl" />
 		<Compile Update="config/N64/N64ControllerSettingControl.Designer.cs" DependentUpon="N64ControllerSettingControl.cs" />
 		<EmbeddedResource Update="config/N64/N64ControllerSettingControl.resx" DependentUpon="N64ControllerSettingControl.cs" />
diff --git a/src/BizHawk.Common/BizHawk.Common.csproj b/src/BizHawk.Common/BizHawk.Common.csproj
index fc0aeacb82..31c1155191 100644
--- a/src/BizHawk.Common/BizHawk.Common.csproj
+++ b/src/BizHawk.Common/BizHawk.Common.csproj
@@ -3,7 +3,6 @@
 		<TargetFramework>netstandard2.0</TargetFramework>
 	</PropertyGroup>
 	<Import Project="../MainSlnCommon.props" />
-	<Import Project="../../CommonNullable.props" />
 	<PropertyGroup>
 		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
 	</PropertyGroup>
diff --git a/src/BizHawk.Emulation.Common/BizHawk.Emulation.Common.csproj b/src/BizHawk.Emulation.Common/BizHawk.Emulation.Common.csproj
index 57e0a01d95..70a7dfe314 100644
--- a/src/BizHawk.Emulation.Common/BizHawk.Emulation.Common.csproj
+++ b/src/BizHawk.Emulation.Common/BizHawk.Emulation.Common.csproj
@@ -5,6 +5,7 @@
 	<Import Project="../MainSlnCommon.props" />
 	<PropertyGroup>
 		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+		<Nullable>disable</Nullable>
 	</PropertyGroup>
 	<ItemGroup>
 		<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
diff --git a/src/BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj b/src/BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj
index 07edd18c6a..7c1593e0c9 100644
--- a/src/BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj
+++ b/src/BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj
@@ -6,6 +6,7 @@
 	<PropertyGroup>
 		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
 		<NoWarn>$(NoWarn);SA1137;SA1205;SA1208;SA1400</NoWarn>
+		<Nullable>disable</Nullable>
 	</PropertyGroup>
 	<ItemGroup>
 		<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
diff --git a/src/BizHawk.Emulation.DiscSystem/BizHawk.Emulation.DiscSystem.csproj b/src/BizHawk.Emulation.DiscSystem/BizHawk.Emulation.DiscSystem.csproj
index b21125948b..386fc884ba 100644
--- a/src/BizHawk.Emulation.DiscSystem/BizHawk.Emulation.DiscSystem.csproj
+++ b/src/BizHawk.Emulation.DiscSystem/BizHawk.Emulation.DiscSystem.csproj
@@ -5,6 +5,7 @@
 	<Import Project="../MainSlnCommon.props" />
 	<PropertyGroup>
 		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+		<Nullable>disable</Nullable>
 	</PropertyGroup>
 	<ItemGroup>
 		<Reference Include="ISOParser" HintPath="$(ProjectDir)../../References/ISOParser.dll" Private="true" />
diff --git a/src/BizHawk.Tests/BizHawk.Tests.csproj b/src/BizHawk.Tests/BizHawk.Tests.csproj
index a2fa4eaded..c728cd27da 100644
--- a/src/BizHawk.Tests/BizHawk.Tests.csproj
+++ b/src/BizHawk.Tests/BizHawk.Tests.csproj
@@ -4,7 +4,6 @@
 		<TargetFramework Condition=" '$(APPVEYOR)' != '' ">netcoreapp3.1</TargetFramework>
 	</PropertyGroup>
 	<Import Project="../MainSlnCommon.props" />
-	<Import Project="../../CommonNullable.props" />
 	<PropertyGroup>
 		<OutputPath>$(ProjectDir)../../test_output</OutputPath>
 	</PropertyGroup>
diff --git a/src/BizHawk.WinForms.Controls/BizHawk.WinForms.Controls.csproj b/src/BizHawk.WinForms.Controls/BizHawk.WinForms.Controls.csproj
index 80a5f0f2f8..7d82a7c78f 100644
--- a/src/BizHawk.WinForms.Controls/BizHawk.WinForms.Controls.csproj
+++ b/src/BizHawk.WinForms.Controls/BizHawk.WinForms.Controls.csproj
@@ -3,7 +3,6 @@
 		<TargetFramework>net48</TargetFramework>
 	</PropertyGroup>
 	<Import Project="../MainSlnCommon.props" />
-	<Import Project="../../CommonNullable.props" />
 	<ItemGroup>
 		<Reference Include="System.Windows.Forms" />
 	</ItemGroup>