diff --git a/RombaSharp/Partials/RombaSharp_Helpers.cs b/RombaSharp/Partials/RombaSharp_Helpers.cs
index ec1eacd3..4d3b66cb 100644
--- a/RombaSharp/Partials/RombaSharp_Helpers.cs
+++ b/RombaSharp/Partials/RombaSharp_Helpers.cs
@@ -9,7 +9,7 @@ using SabreTools.Helper.Data;
 using SabreTools.Helper.Dats;
 using SabreTools.Helper.Tools;
 
-#if __MonoCS__
+#if mono
 using System.IO;
 #else
 using Alphaleonis.Win32.Filesystem;
diff --git a/RombaSharp/Partials/RombaSharp_Inits.cs b/RombaSharp/Partials/RombaSharp_Inits.cs
index 85ad3c0f..1ccfc437 100644
--- a/RombaSharp/Partials/RombaSharp_Inits.cs
+++ b/RombaSharp/Partials/RombaSharp_Inits.cs
@@ -8,7 +8,7 @@ using SabreTools.Helper.Data;
 using SabreTools.Helper.Dats;
 using SabreTools.Helper.Tools;
 
-#if __MonoCS__
+#if mono
 using System.IO;
 #else
 using Alphaleonis.Win32.Filesystem;
diff --git a/RombaSharp/RombaSharp.csproj b/RombaSharp/RombaSharp.csproj
index 32f25850..bf2e9059 100644
--- a/RombaSharp/RombaSharp.csproj
+++ b/RombaSharp/RombaSharp.csproj
@@ -46,7 +46,8 @@
     <OutputPath>..\..\Debug-mono</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
-    <DebugType></DebugType>
+    <DebugType>
+    </DebugType>
     <PlatformTarget>x64</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
@@ -55,7 +56,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Mono|AnyCPU'">
     <DebugSymbols>true</DebugSymbols>
     <OutputPath>..\..\Debug-mono</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;mono</DefineConstants>
     <DebugType>full</DebugType>
     <PlatformTarget>x64</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
@@ -64,7 +65,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Mono|x64'">
     <DebugSymbols>true</DebugSymbols>
     <OutputPath>..\..\Debug-mono-x64</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;mono</DefineConstants>
     <DebugType>full</DebugType>
     <PlatformTarget>x64</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
diff --git a/SabreTools.Helper/Dats/DatFile.cs b/SabreTools.Helper/Dats/DatFile.cs
index af99b616..5b1909dc 100644
--- a/SabreTools.Helper/Dats/DatFile.cs
+++ b/SabreTools.Helper/Dats/DatFile.cs
@@ -11,7 +11,7 @@ using SabreTools.Helper.Data;
 using SabreTools.Helper.Skippers;
 using SabreTools.Helper.Tools;
 
-#if __MonoCS__
+#if mono
 using System.IO;
 #else
 using Alphaleonis.Win32.Filesystem;
diff --git a/SabreTools.Helper/Dats/DatItem.cs b/SabreTools.Helper/Dats/DatItem.cs
index 46ee0d1d..4014c049 100644
--- a/SabreTools.Helper/Dats/DatItem.cs
+++ b/SabreTools.Helper/Dats/DatItem.cs
@@ -4,7 +4,7 @@ using System.Collections.Generic;
 using SabreTools.Helper.Data;
 using SabreTools.Helper.Tools;
 
-#if __MonoCS__
+#if mono
 using System.IO;
 #else
 using Alphaleonis.Win32.Filesystem;
diff --git a/SabreTools.Helper/External/SupportedFiles/ZipFile.cs b/SabreTools.Helper/External/SupportedFiles/ZipFile.cs
index 4e3d5e11..afa5faff 100644
--- a/SabreTools.Helper/External/SupportedFiles/ZipFile.cs
+++ b/SabreTools.Helper/External/SupportedFiles/ZipFile.cs
@@ -4,7 +4,7 @@ using System.Text;
 
 using SabreTools.Helper.Data;
 
-#if __MonoCS__
+#if mono
 using System.IO;
 #else
 using Alphaleonis.Win32.Filesystem;
diff --git a/SabreTools.Helper/External/Zlib/GZipStream.cs b/SabreTools.Helper/External/Zlib/GZipStream.cs
index d80cc628..0c304632 100644
--- a/SabreTools.Helper/External/Zlib/GZipStream.cs
+++ b/SabreTools.Helper/External/Zlib/GZipStream.cs
@@ -28,7 +28,7 @@
 
 using System;
 
-#if __MonoCS__
+#if mono
 using System.IO;
 #else
 using Alphaleonis.Win32.Filesystem;
diff --git a/SabreTools.Helper/SabreTools.Helper.csproj b/SabreTools.Helper/SabreTools.Helper.csproj
index a00535c7..91836441 100644
--- a/SabreTools.Helper/SabreTools.Helper.csproj
+++ b/SabreTools.Helper/SabreTools.Helper.csproj
@@ -44,7 +44,8 @@
     <OutputPath>..\..\Release-x64</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
-    <DebugType></DebugType>
+    <DebugType>
+    </DebugType>
     <PlatformTarget>x64</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
@@ -52,7 +53,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Mono|AnyCPU'">
     <DebugSymbols>true</DebugSymbols>
     <OutputPath>..\..\Debug-mono</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;/define:mono</DefineConstants>
     <DebugType>full</DebugType>
     <PlatformTarget>x64</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
@@ -61,7 +62,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Mono|x64'">
     <DebugSymbols>true</DebugSymbols>
     <OutputPath>..\..\Debug-mono-x64</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;mono</DefineConstants>
     <DebugType>full</DebugType>
     <PlatformTarget>x64</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
@@ -226,12 +227,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Mono|x64' ">
-    <DebugSymbols>true</DebugSymbols>
-    <Optimize>false</Optimize>
-    <OutputPath>..\..\Debug-mono</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <WarningLevel>4</WarningLevel>
-    <PlatformTarget>x64</PlatformTarget>
-  </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/SabreTools.Helper/Skippers/Skipper.cs b/SabreTools.Helper/Skippers/Skipper.cs
index ee2e9561..c6cf1093 100644
--- a/SabreTools.Helper/Skippers/Skipper.cs
+++ b/SabreTools.Helper/Skippers/Skipper.cs
@@ -6,7 +6,7 @@ using System.Xml;
 using SabreTools.Helper.Data;
 using SabreTools.Helper.Tools;
 
-#if __MonoCS__
+#if mono
 using System.IO;
 #else
 using Alphaleonis.Win32.Filesystem;
diff --git a/SabreTools.Helper/Skippers/SkipperRule.cs b/SabreTools.Helper/Skippers/SkipperRule.cs
index cd589237..f596dbc5 100644
--- a/SabreTools.Helper/Skippers/SkipperRule.cs
+++ b/SabreTools.Helper/Skippers/SkipperRule.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 
 using SabreTools.Helper.Data;
 
-#if __MonoCS__
+#if mono
 using System.IO;
 #else
 using Alphaleonis.Win32.Filesystem;
diff --git a/SabreTools.Helper/Tools/ArchiveTools.cs b/SabreTools.Helper/Tools/ArchiveTools.cs
index 531003af..c88ae7a2 100644
--- a/SabreTools.Helper/Tools/ArchiveTools.cs
+++ b/SabreTools.Helper/Tools/ArchiveTools.cs
@@ -6,7 +6,7 @@ using System.Text.RegularExpressions;
 using SabreTools.Helper.Data;
 using SabreTools.Helper.Dats;
 
-#if __MonoCS__
+#if mono
 using System.IO;
 #else
 using Alphaleonis.Win32.Filesystem;
diff --git a/SabreTools.Helper/Tools/DatabaseTools.cs b/SabreTools.Helper/Tools/DatabaseTools.cs
index 5df6fda2..10397764 100644
--- a/SabreTools.Helper/Tools/DatabaseTools.cs
+++ b/SabreTools.Helper/Tools/DatabaseTools.cs
@@ -3,7 +3,7 @@ using System;
 
 using SabreTools.Helper.Data;
 
-#if __MonoCS__
+#if mono
 using System.IO;
 #else
 using Alphaleonis.Win32.Filesystem;
diff --git a/SabreTools.Helper/Tools/FileTools.cs b/SabreTools.Helper/Tools/FileTools.cs
index 1f324867..20c9e12d 100644
--- a/SabreTools.Helper/Tools/FileTools.cs
+++ b/SabreTools.Helper/Tools/FileTools.cs
@@ -10,7 +10,7 @@ using SabreTools.Helper.Data;
 using SabreTools.Helper.Dats;
 using SabreTools.Helper.Skippers;
 
-#if __MonoCS__
+#if mono
 using System.IO;
 #else
 using Alphaleonis.Win32.Filesystem;
diff --git a/SabreTools.Helper/Tools/Style.cs b/SabreTools.Helper/Tools/Style.cs
index 1de3ccff..21c41694 100644
--- a/SabreTools.Helper/Tools/Style.cs
+++ b/SabreTools.Helper/Tools/Style.cs
@@ -9,7 +9,7 @@ using System.Web;
 using SabreTools.Helper.Data;
 using SabreTools.Helper.Dats;
 
-#if __MonoCS__
+#if mono
 using System.IO;
 #else
 using Alphaleonis.Win32.Filesystem;
diff --git a/SabreTools/Partials/SabreTools_Inits.cs b/SabreTools/Partials/SabreTools_Inits.cs
index fdcd6eef..afc259cb 100644
--- a/SabreTools/Partials/SabreTools_Inits.cs
+++ b/SabreTools/Partials/SabreTools_Inits.cs
@@ -6,7 +6,7 @@ using SabreTools.Helper.Data;
 using SabreTools.Helper.Dats;
 using SabreTools.Helper.Tools;
 
-#if __MonoCS__
+#if mono
 using System.IO;
 #else
 using Alphaleonis.Win32.Filesystem;
diff --git a/SabreTools/SabreTools.cs b/SabreTools/SabreTools.cs
index 76319226..a5e15406 100644
--- a/SabreTools/SabreTools.cs
+++ b/SabreTools/SabreTools.cs
@@ -5,7 +5,7 @@ using SabreTools.Helper;
 using SabreTools.Helper.Data;
 using SabreTools.Helper.Tools;
 
-#if __MonoCS__
+#if mono
 using System.IO;
 #else
 using Alphaleonis.Win32.Filesystem;
diff --git a/SabreTools/SabreTools.csproj b/SabreTools/SabreTools.csproj
index 430fcc72..e731dee4 100644
--- a/SabreTools/SabreTools.csproj
+++ b/SabreTools/SabreTools.csproj
@@ -72,7 +72,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Mono|AnyCPU'">
     <DebugSymbols>true</DebugSymbols>
     <OutputPath>..\..\Debug-mono</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;mono</DefineConstants>
     <DebugType>full</DebugType>
     <PlatformTarget>x64</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
@@ -81,7 +81,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Mono|x64'">
     <DebugSymbols>true</DebugSymbols>
     <OutputPath>..\..\Debug-mono-x64</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;mono</DefineConstants>
     <DebugType>full</DebugType>
     <PlatformTarget>x64</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>