diff --git a/.gitattributes b/.gitattributes
index fe0ff4e0..9d9371b6 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,11 +1,15 @@
+* text=crlf
+
 version text eol=crlf
 *.xdp text eol=crlf
 *.cfg text eol=crlf
 *.ini text eol=crlf
 *.map text eol=crlf
 *.txt text eol=crlf
+*.json text eol=crlf
 preupdateexec text eol=crlf
 updateexec text eol=crlf
 version text eol=crlf
 
 *.sh text eol=lf
+*.ps1 eol=lf
diff --git a/package/Qt/CnCNetQM-wine.sh b/package/Qt/CnCNetQM-wine.sh
new file mode 100755
index 00000000..135e0803
--- /dev/null
+++ b/package/Qt/CnCNetQM-wine.sh
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+# Uncomment next line to create a detached prefix
+# export WINEPREFIX=${PWD}/wineprefix/
+
+# Set win7 windows version for gamemd-spawn.exe and CnCNetQM.exe
+${WINE:=wine} reg add HKEY_CURRENT_USER\\Software\\Wine\\AppDefaults\\gamemd-spawn.exe /v Version /d win7 /f
+${WINE:=wine} reg add HKEY_CURRENT_USER\\Software\\Wine\\AppDefaults\\CnCNetQM.exe /v Version /d win7 /f
+
+# Set native,builtin for ddraw override option for gamemd-spawn.exe
+${WINE:=wine} reg add HKEY_CURRENT_USER\\Software\\Wine\\AppDefaults\\gamemd-spawn.exe\\DllOverrides /v ddraw /d native,builtin /f
+
+${WINE:=wine} ./Qt/CnCNetQM.exe
diff --git a/package/Resources/Binaries/OpenGL/ClientCore.dll b/package/Resources/Binaries/OpenGL/ClientCore.dll
index 0fb6e0a2..b0354da3 100644
Binary files a/package/Resources/Binaries/OpenGL/ClientCore.dll and b/package/Resources/Binaries/OpenGL/ClientCore.dll differ
diff --git a/package/Resources/Binaries/OpenGL/ClientCore.pdb b/package/Resources/Binaries/OpenGL/ClientCore.pdb
index 1c24fb7d..493e119e 100644
Binary files a/package/Resources/Binaries/OpenGL/ClientCore.pdb and b/package/Resources/Binaries/OpenGL/ClientCore.pdb differ
diff --git a/package/Resources/Binaries/OpenGL/ClientGUI.dll b/package/Resources/Binaries/OpenGL/ClientGUI.dll
index b9b6a4cd..0efb2053 100644
Binary files a/package/Resources/Binaries/OpenGL/ClientGUI.dll and b/package/Resources/Binaries/OpenGL/ClientGUI.dll differ
diff --git a/package/Resources/Binaries/OpenGL/ClientGUI.pdb b/package/Resources/Binaries/OpenGL/ClientGUI.pdb
index a60b526e..c59ca4b4 100644
Binary files a/package/Resources/Binaries/OpenGL/ClientGUI.pdb and b/package/Resources/Binaries/OpenGL/ClientGUI.pdb differ
diff --git a/package/Resources/Binaries/OpenGL/DTAConfig.dll b/package/Resources/Binaries/OpenGL/DTAConfig.dll
index 810a9806..78fdf299 100644
Binary files a/package/Resources/Binaries/OpenGL/DTAConfig.dll and b/package/Resources/Binaries/OpenGL/DTAConfig.dll differ
diff --git a/package/Resources/Binaries/OpenGL/DTAConfig.pdb b/package/Resources/Binaries/OpenGL/DTAConfig.pdb
index cabd18ce..593a8484 100644
Binary files a/package/Resources/Binaries/OpenGL/DTAConfig.pdb and b/package/Resources/Binaries/OpenGL/DTAConfig.pdb differ
diff --git a/package/Resources/Binaries/OpenGL/clientogl.deps.json b/package/Resources/Binaries/OpenGL/clientogl.deps.json
index 234c11f5..dbe89e81 100644
--- a/package/Resources/Binaries/OpenGL/clientogl.deps.json
+++ b/package/Resources/Binaries/OpenGL/clientogl.deps.json
@@ -6,7 +6,7 @@
   "compilationOptions": {},
   "targets": {
     ".NETCoreApp,Version=v7.0": {
-      "clientogl/2.8.0-beta0220": {
+      "clientogl/2.8.0-beta0221": {
         "dependencies": {
           "DTAConfig": "2.2.0",
           "DiscordRichPresence": "1.1.3.18",
@@ -1284,7 +1284,7 @@
     }
   },
   "libraries": {
-    "clientogl/2.8.0-beta0220": {
+    "clientogl/2.8.0-beta0221": {
       "type": "project",
       "serviceable": false,
       "sha512": ""
diff --git a/package/Resources/Binaries/OpenGL/clientogl.dll b/package/Resources/Binaries/OpenGL/clientogl.dll
index c3f5b98b..4c13aa8e 100644
Binary files a/package/Resources/Binaries/OpenGL/clientogl.dll and b/package/Resources/Binaries/OpenGL/clientogl.dll differ
diff --git a/package/Resources/Binaries/OpenGL/clientogl.pdb b/package/Resources/Binaries/OpenGL/clientogl.pdb
index df42ca48..ec3f8a0d 100644
Binary files a/package/Resources/Binaries/OpenGL/clientogl.pdb and b/package/Resources/Binaries/OpenGL/clientogl.pdb differ
diff --git a/package/Resources/Binaries/UniversalGL/ClientCore.dll b/package/Resources/Binaries/UniversalGL/ClientCore.dll
index e8feea8a..7cd8739a 100644
Binary files a/package/Resources/Binaries/UniversalGL/ClientCore.dll and b/package/Resources/Binaries/UniversalGL/ClientCore.dll differ
diff --git a/package/Resources/Binaries/UniversalGL/ClientCore.pdb b/package/Resources/Binaries/UniversalGL/ClientCore.pdb
index 7b95a66d..884c7977 100644
Binary files a/package/Resources/Binaries/UniversalGL/ClientCore.pdb and b/package/Resources/Binaries/UniversalGL/ClientCore.pdb differ
diff --git a/package/Resources/Binaries/UniversalGL/ClientGUI.dll b/package/Resources/Binaries/UniversalGL/ClientGUI.dll
index dc7688d0..3a0c4182 100644
Binary files a/package/Resources/Binaries/UniversalGL/ClientGUI.dll and b/package/Resources/Binaries/UniversalGL/ClientGUI.dll differ
diff --git a/package/Resources/Binaries/UniversalGL/ClientGUI.pdb b/package/Resources/Binaries/UniversalGL/ClientGUI.pdb
index e1387d2e..10972fab 100644
Binary files a/package/Resources/Binaries/UniversalGL/ClientGUI.pdb and b/package/Resources/Binaries/UniversalGL/ClientGUI.pdb differ
diff --git a/package/Resources/Binaries/UniversalGL/DTAConfig.dll b/package/Resources/Binaries/UniversalGL/DTAConfig.dll
index c8095840..59c59401 100644
Binary files a/package/Resources/Binaries/UniversalGL/DTAConfig.dll and b/package/Resources/Binaries/UniversalGL/DTAConfig.dll differ
diff --git a/package/Resources/Binaries/UniversalGL/DTAConfig.pdb b/package/Resources/Binaries/UniversalGL/DTAConfig.pdb
index 88a79865..b11a052d 100644
Binary files a/package/Resources/Binaries/UniversalGL/DTAConfig.pdb and b/package/Resources/Binaries/UniversalGL/DTAConfig.pdb differ
diff --git a/package/Resources/Binaries/UniversalGL/clientogl.deps.json b/package/Resources/Binaries/UniversalGL/clientogl.deps.json
index 902d9711..5dbd35fc 100644
--- a/package/Resources/Binaries/UniversalGL/clientogl.deps.json
+++ b/package/Resources/Binaries/UniversalGL/clientogl.deps.json
@@ -6,7 +6,7 @@
   "compilationOptions": {},
   "targets": {
     ".NETCoreApp,Version=v7.0": {
-      "clientogl/2.8.0-beta0220": {
+      "clientogl/2.8.0-beta0221": {
         "dependencies": {
           "DTAConfig": "2.2.0",
           "DiscordRichPresence": "1.1.3.18",
@@ -1375,7 +1375,7 @@
     }
   },
   "libraries": {
-    "clientogl/2.8.0-beta0220": {
+    "clientogl/2.8.0-beta0221": {
       "type": "project",
       "serviceable": false,
       "sha512": ""
diff --git a/package/Resources/Binaries/UniversalGL/clientogl.dll b/package/Resources/Binaries/UniversalGL/clientogl.dll
index 4b927453..bdd72fd8 100644
Binary files a/package/Resources/Binaries/UniversalGL/clientogl.dll and b/package/Resources/Binaries/UniversalGL/clientogl.dll differ
diff --git a/package/Resources/Binaries/UniversalGL/clientogl.pdb b/package/Resources/Binaries/UniversalGL/clientogl.pdb
index 58ec7b09..0e6cf260 100644
Binary files a/package/Resources/Binaries/UniversalGL/clientogl.pdb and b/package/Resources/Binaries/UniversalGL/clientogl.pdb differ
diff --git a/package/Resources/Binaries/Windows/ClientCore.dll b/package/Resources/Binaries/Windows/ClientCore.dll
index b354e18d..1f56e2ed 100644
Binary files a/package/Resources/Binaries/Windows/ClientCore.dll and b/package/Resources/Binaries/Windows/ClientCore.dll differ
diff --git a/package/Resources/Binaries/Windows/ClientCore.pdb b/package/Resources/Binaries/Windows/ClientCore.pdb
index 4634a9da..d340ebcb 100644
Binary files a/package/Resources/Binaries/Windows/ClientCore.pdb and b/package/Resources/Binaries/Windows/ClientCore.pdb differ
diff --git a/package/Resources/Binaries/Windows/ClientGUI.dll b/package/Resources/Binaries/Windows/ClientGUI.dll
index 07bf7cff..9e071c06 100644
Binary files a/package/Resources/Binaries/Windows/ClientGUI.dll and b/package/Resources/Binaries/Windows/ClientGUI.dll differ
diff --git a/package/Resources/Binaries/Windows/ClientGUI.pdb b/package/Resources/Binaries/Windows/ClientGUI.pdb
index a63e543a..77a44e6e 100644
Binary files a/package/Resources/Binaries/Windows/ClientGUI.pdb and b/package/Resources/Binaries/Windows/ClientGUI.pdb differ
diff --git a/package/Resources/Binaries/Windows/DTAConfig.dll b/package/Resources/Binaries/Windows/DTAConfig.dll
index 52d9d865..d6fb42fe 100644
Binary files a/package/Resources/Binaries/Windows/DTAConfig.dll and b/package/Resources/Binaries/Windows/DTAConfig.dll differ
diff --git a/package/Resources/Binaries/Windows/DTAConfig.pdb b/package/Resources/Binaries/Windows/DTAConfig.pdb
index b5123242..ba7fd587 100644
Binary files a/package/Resources/Binaries/Windows/DTAConfig.pdb and b/package/Resources/Binaries/Windows/DTAConfig.pdb differ
diff --git a/package/Resources/Binaries/Windows/clientdx.deps.json b/package/Resources/Binaries/Windows/clientdx.deps.json
index 1160606d..d029f78a 100644
--- a/package/Resources/Binaries/Windows/clientdx.deps.json
+++ b/package/Resources/Binaries/Windows/clientdx.deps.json
@@ -6,7 +6,7 @@
   "compilationOptions": {},
   "targets": {
     ".NETCoreApp,Version=v7.0": {
-      "clientdx/2.8.0-beta0220": {
+      "clientdx/2.8.0-beta0221": {
         "dependencies": {
           "DTAConfig": "2.2.0",
           "DiscordRichPresence": "1.1.3.18",
@@ -2008,7 +2008,7 @@
     }
   },
   "libraries": {
-    "clientdx/2.8.0-beta0220": {
+    "clientdx/2.8.0-beta0221": {
       "type": "project",
       "serviceable": false,
       "sha512": ""
diff --git a/package/Resources/Binaries/Windows/clientdx.dll b/package/Resources/Binaries/Windows/clientdx.dll
index 4175710b..f6e26543 100644
Binary files a/package/Resources/Binaries/Windows/clientdx.dll and b/package/Resources/Binaries/Windows/clientdx.dll differ
diff --git a/package/Resources/Binaries/Windows/clientdx.pdb b/package/Resources/Binaries/Windows/clientdx.pdb
index aedae21a..ce4d4810 100644
Binary files a/package/Resources/Binaries/Windows/clientdx.pdb and b/package/Resources/Binaries/Windows/clientdx.pdb differ
diff --git a/package/Resources/Binaries/XNA/ClientCore.dll b/package/Resources/Binaries/XNA/ClientCore.dll
index a58c9313..9f13036d 100644
Binary files a/package/Resources/Binaries/XNA/ClientCore.dll and b/package/Resources/Binaries/XNA/ClientCore.dll differ
diff --git a/package/Resources/Binaries/XNA/ClientCore.pdb b/package/Resources/Binaries/XNA/ClientCore.pdb
index 610aa144..4f3fdb56 100644
Binary files a/package/Resources/Binaries/XNA/ClientCore.pdb and b/package/Resources/Binaries/XNA/ClientCore.pdb differ
diff --git a/package/Resources/Binaries/XNA/ClientGUI.dll b/package/Resources/Binaries/XNA/ClientGUI.dll
index 4a04326b..c70b68d1 100644
Binary files a/package/Resources/Binaries/XNA/ClientGUI.dll and b/package/Resources/Binaries/XNA/ClientGUI.dll differ
diff --git a/package/Resources/Binaries/XNA/ClientGUI.pdb b/package/Resources/Binaries/XNA/ClientGUI.pdb
index eb282daa..1256bb8c 100644
Binary files a/package/Resources/Binaries/XNA/ClientGUI.pdb and b/package/Resources/Binaries/XNA/ClientGUI.pdb differ
diff --git a/package/Resources/Binaries/XNA/DTAConfig.dll b/package/Resources/Binaries/XNA/DTAConfig.dll
index d2105b9c..e6bcf17d 100644
Binary files a/package/Resources/Binaries/XNA/DTAConfig.dll and b/package/Resources/Binaries/XNA/DTAConfig.dll differ
diff --git a/package/Resources/Binaries/XNA/DTAConfig.pdb b/package/Resources/Binaries/XNA/DTAConfig.pdb
index fe8f7c8a..a5dded7a 100644
Binary files a/package/Resources/Binaries/XNA/DTAConfig.pdb and b/package/Resources/Binaries/XNA/DTAConfig.pdb differ
diff --git a/package/Resources/Binaries/XNA/clientxna.deps.json b/package/Resources/Binaries/XNA/clientxna.deps.json
index 59d455ef..63fd93ca 100644
--- a/package/Resources/Binaries/XNA/clientxna.deps.json
+++ b/package/Resources/Binaries/XNA/clientxna.deps.json
@@ -7,7 +7,7 @@
   "targets": {
     ".NETCoreApp,Version=v7.0": {},
     ".NETCoreApp,Version=v7.0/win-x86": {
-      "clientxna/2.8.0-beta0220": {
+      "clientxna/2.8.0-beta0221": {
         "dependencies": {
           "DTAConfig": "2.2.0",
           "DiscordRichPresence": "1.1.3.18",
@@ -1427,7 +1427,7 @@
     }
   },
   "libraries": {
-    "clientxna/2.8.0-beta0220": {
+    "clientxna/2.8.0-beta0221": {
       "type": "project",
       "serviceable": false,
       "sha512": ""
diff --git a/package/Resources/Binaries/XNA/clientxna.dll b/package/Resources/Binaries/XNA/clientxna.dll
index 859e48f0..ab6acd4b 100644
Binary files a/package/Resources/Binaries/XNA/clientxna.dll and b/package/Resources/Binaries/XNA/clientxna.dll differ
diff --git a/package/Resources/Binaries/XNA/clientxna.pdb b/package/Resources/Binaries/XNA/clientxna.pdb
index 69a24c64..0fc1ddfd 100644
Binary files a/package/Resources/Binaries/XNA/clientxna.pdb and b/package/Resources/Binaries/XNA/clientxna.pdb differ
diff --git a/package/Resources/MainMenu.ini b/package/Resources/MainMenu.ini
index 3d1b3a77..62d680e9 100644
--- a/package/Resources/MainMenu.ini
+++ b/package/Resources/MainMenu.ini
@@ -75,7 +75,8 @@ FontIndex=1
 [btnQuickmatch]
 Location=645,241
 Text=Ranked Match
-URL=Qt\CnCNetQM.exe
+URL=Qt/CnCNetQM.exe
+UnixURL=Qt/CnCNetQM-wine.sh
 
 IdleTexture=MainMenu\button.png
 HoverTexture=MainMenu\button_c.png
diff --git a/package/Resources/yr-wine.sh b/package/Resources/yr-wine.sh
index d70d558f..83cae531 100755
--- a/package/Resources/yr-wine.sh
+++ b/package/Resources/yr-wine.sh
@@ -1,6 +1,5 @@
 #!/bin/sh
 
-
 # Uncomment next line to create a detached prefix
 # export WINEPREFIX=${PWD}/wineprefix/