diff --git a/data/patches/linux/linux-common-ra2.patch b/data/patches/linux/linux-common-ra2.patch
deleted file mode 100644
index f4791cf..0000000
--- a/data/patches/linux/linux-common-ra2.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- a/mods/all/mod.yaml
-+++ b/mods/all/mod.yaml
-@@ -20,6 +20,7 @@
- 	./mods/d2k/OpenRA.Mods.D2k.dll
- 	./mods/cnc/OpenRA.Mods.Cnc.dll
- 	./mods/ts/OpenRA.Mods.TS.dll
-+	./mods/ra2/OpenRA.Mods.RA2.dll
- 
- ChromeLayout:
- 
-
---- a/mods/ra2/mod.yaml
-+++ b/mods/ra2/mod.yaml
-@@ -5,7 +5,7 @@
- 	Author: RA2 team
- 
- RequiresMods:
--	modchooser: {DEV_VERSION}
-+
- 
- Packages:
- 	~^Content/ra2
-
---- a/utility.cmd
-+++ b/utility.cmd
-@@ -16,6 +16,7 @@
- if /I "%mod%" EQU "ra" (goto help)
- if /I "%mod%" EQU "cnc" (goto help)
- if /I "%mod%" EQU "ts" (goto help)
-+if /I "%mod%" EQU "ra2" (goto help)
- if /I "%mod%" EQU "d2k" (goto help)
- echo.
- echo Unknown mod: %mod%
diff --git a/data/patches/linux/linux-make.patch b/data/patches/linux/linux-make.patch
deleted file mode 100644
index 337a23f..0000000
--- a/data/patches/linux/linux-make.patch
+++ /dev/null
@@ -1,59 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -187,6 +187,15 @@
- PROGRAMS += mod_ts
- mod_ts: $(mod_ts_TARGET)
- 
-+# Red Alert 2
-+mod_ra2_SRCS := $(shell find OpenRA.Mods.RA2/ -iname '*.cs')
-+mod_ra2_TARGET = mods/ra2/OpenRA.Mods.RA2.dll
-+mod_ra2_KIND = library
-+mod_ra2_DEPS = $(STD_MOD_DEPS) $(mod_common_TARGET)
-+mod_ra2_LIBS = $(COMMON_LIBS) $(STD_MOD_LIBS) $(mod_common_TARGET)
-+PROGRAMS += mod_ra2
-+mod_ra2: $(mod_ra2_TARGET)
-+
- check-scripts:
- 	@echo
- 	@echo "Checking for Lua syntax errors..."
-@@ -222,6 +231,9 @@
- 	@echo "Checking for code style violations in OpenRA.Mods.TS..."
- 	@mono --debug OpenRA.Utility.exe ra --check-code-style OpenRA.Mods.TS
- 	@echo
-+	@echo "Checking for code style violations in OpenRA.Mods.RA2..."
-+	@mono --debug OpenRA.Utility.exe ra --check-code-style OpenRA.Mods.RA2
-+	@echo
- 	@echo "Checking for code style violations in OpenRA.Utility..."
- 	@mono --debug OpenRA.Utility.exe ra --check-code-style OpenRA.Utility
- 	@echo
-@@ -256,6 +268,9 @@
- 	@mono --debug OpenRA.Utility.exe ts --check-yaml
- 	@mono --debug OpenRA.Utility.exe ts --check-sequence-sprites
- 	@echo
-+	@echo "Testing Red Alert 2 mod MiniYAML..."
-+	@mono --debug OpenRA.Utility.exe ra2 --check-yaml
-+	@echo
- 	@echo "Testing Dune 2000 mod MiniYAML..."
- 	@mono --debug OpenRA.Utility.exe d2k --check-yaml
- 	@mono --debug OpenRA.Utility.exe d2k --check-sequence-sprites
-@@ -324,7 +339,7 @@
- 
- package: all-dependencies core tools docs version
- 
--mods: mod_common mod_ra mod_cnc mod_d2k mod_ts
-+mods: mod_common mod_ra mod_cnc mod_d2k mod_ts mod_ra2
- 
- all: dependencies core tools
- 
-@@ -393,6 +408,10 @@
- 	@$(CP_R) mods/d2k "$(DATA_INSTALL_DIR)/mods/"
- 	@$(INSTALL_PROGRAM) $(mod_d2k_TARGET) "$(DATA_INSTALL_DIR)/mods/d2k"
- 	@$(CP_R) mods/modchooser "$(DATA_INSTALL_DIR)/mods/"
-+	@$(CP_R) mods/ts "$(DATA_INSTALL_DIR)/mods/"
-+	@$(INSTALL_PROGRAM) $(mod_ts_TARGET) "$(DATA_INSTALL_DIR)/mods/ts"
-+	@$(CP_R) mods/ra2 "$(DATA_INSTALL_DIR)/mods/"
-+	@$(INSTALL_PROGRAM) $(mod_ra2_TARGET) "$(DATA_INSTALL_DIR)/mods/ra2"
- 
- 	@$(INSTALL_DATA) "global mix database.dat" "$(DATA_INSTALL_DIR)/global mix database.dat"
- 	@$(INSTALL_DATA) "GeoLite2-Country.mmdb.gz" "$(DATA_INSTALL_DIR)/GeoLite2-Country.mmdb.gz"
- 
diff --git a/data/patches/windows/windows-common-ra2.patch b/data/patches/windows/windows-ra2-common.patch
similarity index 100%
rename from data/patches/windows/windows-common-ra2.patch
rename to data/patches/windows/windows-ra2-common.patch
diff --git a/data/patches/windows/windows-ra2-csproj.patch b/data/patches/windows/windows-ra2-csproj.patch
deleted file mode 100644
index de5bffc..0000000
--- a/data/patches/windows/windows-ra2-csproj.patch
+++ /dev/null
@@ -1,109 +0,0 @@
---- a/OpenRA.Mods.RA2/OpenRA.Mods.RA2.csproj
-+++ b/OpenRA.Mods.RA2/OpenRA.Mods.RA2.csproj
-@@ -12,53 +12,64 @@
-   <PropertyGroup Condition=" '$(Platform)' == 'AnyCPU' ">
-     <PlatformTarget>x86</PlatformTarget>
-   </PropertyGroup>
--  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
-+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
-     <DebugSymbols>True</DebugSymbols>
-     <DebugType>Full</DebugType>
-     <Optimize>False</Optimize>
-     <CheckForOverflowUnderflow>True</CheckForOverflowUnderflow>
-     <DefineConstants>DEBUG;TRACE</DefineConstants>
-     <OutputPath>bin\Debug\</OutputPath>
-+    <PlatformTarget>x86</PlatformTarget>
-+    <ErrorReport>prompt</ErrorReport>
-     <CustomCommands>
-       <CustomCommands>
--        <Command type="AfterBuild" command="cp ${TargetFile} .." workingdir="${ProjectDir}" />
--        <Command type="AfterBuild" command="cp ${TargetFile}.mdb .." workingdir="${ProjectDir}" />
-+        <Command type="AfterBuild" command="cp ${TargetFile} ../mods/ra2" workingdir="${ProjectDir}" />
-+        <Command type="AfterBuild" command="cp ${TargetFile}.mdb ../mods/ra2" workingdir="${ProjectDir}" />
-       </CustomCommands>
-     </CustomCommands>
-+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-   </PropertyGroup>
--  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
--    <DebugSymbols>False</DebugSymbols>
--    <DebugType>None</DebugType>
-+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
-+    <DebugSymbols>True</DebugSymbols>
-+    <DebugType>pdbonly</DebugType>
-     <Optimize>True</Optimize>
-     <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
-     <DefineConstants>TRACE</DefineConstants>
-     <OutputPath>bin\Release\</OutputPath>
-+    <PlatformTarget>x86</PlatformTarget>
-+    <ErrorReport>prompt</ErrorReport>
-     <CustomCommands>
-       <CustomCommands>
--        <Command type="AfterBuild" command="cp ${TargetFile} .." workingdir="${ProjectDir}" />
--        <Command type="AfterBuild" command="cp ${TargetFile}.mdb .." workingdir="${ProjectDir}" />
-+        <Command type="AfterBuild" command="cp ${TargetFile} ../mods/ra2" workingdir="${ProjectDir}" />
-+        <Command type="AfterBuild" command="cp ${TargetFile}.mdb ../mods/ra2" workingdir="${ProjectDir}" />
-       </CustomCommands>
-     </CustomCommands>
-+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-   </PropertyGroup>
-   <ItemGroup>
-+    <Reference Include="System" />
-+    <Reference Include="System.Core" />
-+    <Reference Include="System.Drawing" />
-     <Reference Include="Microsoft.CSharp" />
-     <Reference Include="OpenRA.Game">
--      <HintPath>dependencies\OpenRA.Game.exe</HintPath>
-+      <HintPath>..\OpenRA.Mods.RA\OpenRA.Game.exe</HintPath>
-     </Reference>
-     <Reference Include="OpenRA.Mods.Common">
--      <HintPath>dependencies\OpenRA.Mods.Common.dll</HintPath>
-+      <HintPath>..\OpenRA.Mods.RA\OpenRA.Mods.Common.dll</HintPath>
-     </Reference>
-     <Reference Include="OpenRA.Mods.RA">
--      <HintPath>dependencies\OpenRA.Mods.RA.dll</HintPath>
-+      <HintPath>..\OpenRA.Mods.RA\OpenRA.Mods.RA.dll</HintPath>
-     </Reference>
-     <Reference Include="OpenRA.Mods.TS">
--      <HintPath>dependencies\OpenRA.Mods.TS.dll</HintPath>
-+      <HintPath>..\OpenRA.Mods.TS\OpenRA.Mods.TS.dll</HintPath>
-     </Reference>
-     <Reference Include="Eluant">
--      <HintPath>dependencies\Eluant.dll</HintPath>
-+      <HintPath>..\thirdparty\download\Eluant.dll</HintPath>
-     </Reference>
-     <Reference Include="Eluant">
--      <HintPath>dependencies\Eluant.dll</HintPath>
-+      <HintPath>..\thirdparty\download\Eluant.dll</HintPath>
-       <Private>False</Private>
-     </Reference>
-     <Reference Include="System" />
-@@ -68,10 +79,27 @@
-   </ItemGroup>
-   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-   <ItemGroup>
-+    <ProjectReference Include="..\OpenRA.Game\OpenRA.Game.csproj">
-+      <Project>{0DFB103F-2962-400F-8C6D-E2C28CCBA633}</Project>
-+      <Name>OpenRA.Game</Name>
-+      <Private>False</Private>
-+    </ProjectReference>
-+    <ProjectReference Include="..\OpenRA.Mods.Common\OpenRA.Mods.Common.csproj">
-+      <Project>{fe6c8cc0-2f07-442a-b29f-17617b3b7fc6}</Project>
-+      <Name>OpenRA.Mods.Common</Name>
-+      <Private>False</Private>
-+    </ProjectReference>
-+  </ItemGroup>
-+  <ItemGroup>
-     <Compile Include="Activities\ChronoResourceTeleport.cs" />
-     <Compile Include="Traits\ChronoResourceDelivery.cs" />
-     <Compile Include="Traits\Render\WithExitOverlay.cs" />
-     <Compile Include="Traits\Render\WithSwimSuit.cs" />
-   </ItemGroup>
-+  <PropertyGroup>
-+    <PostBuildEvent>mkdir "$(SolutionDir)mods/ra2/"
-+copy "$(TargetPath)" "$(SolutionDir)mods/ra2/"
-+cd "$(SolutionDir)"</PostBuildEvent>
-+  </PropertyGroup>
- </Project>
-  
diff --git a/data/patches/windows/windows-make.patch b/data/patches/windows/windows-ra2-make.patch
similarity index 64%
rename from data/patches/windows/windows-make.patch
rename to data/patches/windows/windows-ra2-make.patch
index e856687..45e4812 100644
--- a/data/patches/windows/windows-make.patch
+++ b/data/patches/windows/windows-ra2-make.patch
@@ -1,14 +1,5 @@
 --- a/make.ps1
 +++ b/make.ps1
-@@ -108,7 +108,7 @@
- 	
- 	if ($version -ne $null)
- 	{
--		$mods = @("mods/ra/mod.yaml", "mods/cnc/mod.yaml", "mods/d2k/mod.yaml", "mods/ts/mod.yaml", "mods/modchooser/mod.yaml", "mods/all/mod.yaml")
-+		$mods = @("mods/ra/mod.yaml", "mods/cnc/mod.yaml", "mods/d2k/mod.yaml", "mods/ts/mod.yaml", "mods/ra2/mod.yaml", "mods/modchooser/mod.yaml", "mods/all/mod.yaml")
- 		foreach ($mod in $mods)
- 		{
- 			$replacement = (gc $mod) -Replace "Version:.*", ("Version: {0}" -f $version)
 @@ -136,6 +136,8 @@
  		echo "Testing mods..."
  		echo "Testing Tiberian Sun mod MiniYAML..."
diff --git a/data/patches/windows/windows-openra-solution.patch b/data/patches/windows/windows-ra2-openra-solution.patch
similarity index 100%
rename from data/patches/windows/windows-openra-solution.patch
rename to data/patches/windows/windows-ra2-openra-solution.patch