diff --git a/Makefile b/Makefile
index adc6c3af42..6b6312263d 100644
--- a/Makefile
+++ b/Makefile
@@ -373,14 +373,28 @@ install-linux-icons:
 
 install-linux-desktop:
 	@$(INSTALL_DIR) "$(DESTDIR)$(datadir)/applications"
-	@$(INSTALL_DATA) packaging/linux/openra.desktop "$(DESTDIR)$(datadir)/applications"
+	@sed 's/{MOD}/ra/g' packaging/linux/openra.desktop.in | sed 's/{MODNAME}/Red Alert/g' > packaging/linux/openra-ra.desktop
+	@$(INSTALL_DATA) packaging/linux/openra-ra.desktop "$(DESTDIR)$(datadir)/applications"
+	@sed 's/{MOD}/cnc/g' packaging/linux/openra.desktop.in | sed 's/{MODNAME}/Tiberian Dawn/g' > packaging/linux/openra-cnc.desktop
+	@$(INSTALL_DATA) packaging/linux/openra-cnc.desktop "$(DESTDIR)$(datadir)/applications"
+	@sed 's/{MOD}/d2k/g' packaging/linux/openra.desktop.in | sed 's/{MODNAME}/Dune 2000/g' > packaging/linux/openra-d2k.desktop
+	@$(INSTALL_DATA) packaging/linux/openra-d2k.desktop "$(DESTDIR)$(datadir)/applications"
+	@-$(RM) packaging/linux/openra-ra.desktop packaging/linux/openra-cnc.desktop packaging/linux/openra-d2k.desktop
 
 install-linux-mime:
 	@$(INSTALL_DIR) "$(DESTDIR)$(datadir)/mime/packages/"
+
+	@sed 's/{MOD}/ra/g' packaging/linux/openra-mimeinfo.xml.in | sed 's/{TAG}/$(VERSION)/g' > packaging/linux/openra-mimeinfo.xml
 	@$(INSTALL_DATA) packaging/linux/openra-mimeinfo.xml "$(DESTDIR)$(datadir)/mime/packages/openra.xml"
 
 	@$(INSTALL_DIR) "$(DESTDIR)$(datadir)/applications"
-	@$(INSTALL_DATA) packaging/linux/openra-join-servers.desktop "$(DESTDIR)$(datadir)/applications"
+	@sed 's/{MOD}/ra/g' packaging/linux/openra-join-servers.desktop.in | sed 's/{MODNAME}/Red Alert/g' | sed 's/{TAG}/$(VERSION)/g' > packaging/linux/openra-ra-join-servers.desktop
+	@$(INSTALL_DATA) packaging/linux/openra-ra-join-servers.desktop "$(DESTDIR)$(datadir)/applications"
+	@sed 's/{MOD}/cnc/g' packaging/linux/openra-join-servers.desktop.in | sed 's/{MODNAME}/Tiberian Dawn/g' | sed 's/{TAG}/$(VERSION)/g' > packaging/linux/openra-cnc-join-servers.desktop
+	@$(INSTALL_DATA) packaging/linux/openra-cnc-join-servers.desktop "$(DESTDIR)$(datadir)/applications"
+	@sed 's/{MOD}/d2k/g' packaging/linux/openra-join-servers.desktop.in | sed 's/{MODNAME}/Dune 2000/g' | sed 's/{TAG}/$(VERSION)/g' > packaging/linux/openra-d2k-join-servers.desktop
+	@$(INSTALL_DATA) packaging/linux/openra-d2k-join-servers.desktop "$(DESTDIR)$(datadir)/applications"
+	@-$(RM) packaging/linux/openra-mimeinfo.xml packaging/linux/openra-ra-join-servers.desktop packaging/linux/openra-cnc-join-servers.desktop packaging/linux/openra-d2k-join-servers.desktop
 
 install-linux-appdata:
 	@$(INSTALL_DIR) "$(DESTDIR)$(datadir)/appdata/"
@@ -391,50 +405,63 @@ install-man-page: man-page
 	@$(INSTALL_DATA) openra.6 "$(DESTDIR)$(mandir)/man6/"
 
 install-linux-scripts:
-	@echo "#!/bin/sh" > openra
-	@echo 'cd "$(gameinstalldir)"' >> openra
-# Note: this relies on the non-standard -f flag implemented by gnu readlink
 ifeq ($(DEBUG), $(filter $(DEBUG),false no n off 0))
-	@echo 'mono OpenRA.Game.exe Engine.LaunchPath="$$(readlink -f $$0)" "$$@"' >> openra
+	@sed 's/{DEBUG}//' packaging/linux/openra.in | sed 's|{GAME_INSTALL_DIR}|$(gameinstalldir)|' | sed 's|{BIN_DIR}|$(bindir)|' > packaging/linux/openra.debug.in
+	@sed 's/{DEBUG}//' packaging/linux/openra-server.in | sed 's|{GAME_INSTALL_DIR}|$(gameinstalldir)|' | sed 's|{BIN_DIR}|$(bindir)|' > packaging/linux/openra-server.debug.in
 else
-	@echo 'mono --debug OpenRA.Game.exe Engine.LaunchPath="$$(readlink -f $$0)" "$$@"' >> openra
-endif
-	@echo 'if [ $$? != 0 -a $$? != 1 ]' >> openra
-	@echo 'then' >> openra
-	@echo 'ZENITY=`which zenity` || echo "OpenRA needs zenity installed to display a graphical error dialog. See ~/.openra. for log files."' >> openra
-	@echo '$$ZENITY --question --title "OpenRA" --text "OpenRA has encountered a fatal error.\nLog Files are available in ~/.openra." --ok-label "Quit" --cancel-label "View FAQ" || xdg-open https://github.com/OpenRA/OpenRA/wiki/FAQ' >> openra
-	@echo 'exit 1' >> openra
-	@echo 'fi' >> openra
-
-	@$(INSTALL_DIR) "$(BIN_INSTALL_DIR)"
-	@$(INSTALL_PROGRAM) -m +rx openra "$(BIN_INSTALL_DIR)"
-	@-$(RM) openra
-
-	@echo "#!/bin/sh" > openra-server
-	@echo 'cd "$(gameinstalldir)"' >> openra-server
-ifeq ($(DEBUG), $(filter $(DEBUG),false no n off 0))
-	@echo 'mono OpenRA.Server.exe "$$@"' >> openra-server
-else
-	@echo 'mono --debug OpenRA.Server.exe "$$@"' >> openra-server
+	@sed 's/{DEBUG}/--debug/' packaging/linux/openra.in | sed 's|{GAME_INSTALL_DIR}|$(gameinstalldir)|' | sed 's|{BIN_DIR}|$(bindir)|' > packaging/linux/openra.debug.in
+	@sed 's/{DEBUG}/--debug/' packaging/linux/openra-server.in | sed 's|{GAME_INSTALL_DIR}|$(gameinstalldir)|' | sed 's|{BIN_DIR}|$(bindir)|' > packaging/linux/openra-server.debug.in
 endif
 
+	@sed 's/{MOD}/ra/g' packaging/linux/openra.debug.in | sed 's/{MODNAME}/Red Alert/g' > packaging/linux/openra-ra
+	@sed 's/{MOD}/cnc/g' packaging/linux/openra.debug.in | sed 's/{MODNAME}/Tiberian Dawn/g' > packaging/linux/openra-cnc
+	@sed 's/{MOD}/d2k/g' packaging/linux/openra.debug.in | sed 's/{MODNAME}/Dune 2000/g' > packaging/linux/openra-d2k
+
 	@$(INSTALL_DIR) "$(BIN_INSTALL_DIR)"
-	@$(INSTALL_PROGRAM) -m +rx openra-server "$(BIN_INSTALL_DIR)"
-	@-$(RM) openra-server
+	@$(INSTALL_PROGRAM) -m +rx packaging/linux/openra-ra "$(BIN_INSTALL_DIR)"
+	@$(INSTALL_PROGRAM) -m +rx packaging/linux/openra-cnc "$(BIN_INSTALL_DIR)"
+	@$(INSTALL_PROGRAM) -m +rx packaging/linux/openra-d2k "$(BIN_INSTALL_DIR)"
+	@-$(RM) packaging/linux/openra-ra packaging/linux/openra-cnc packaging/linux/openra-d2k packaging/linux/openra.debug.in
+
+	@sed 's/{MOD}/ra/g' packaging/linux/openra-server.debug.in | sed 's/{MODNAME}/Red Alert/g' > packaging/linux/openra-ra-server
+	@sed 's/{MOD}/cnc/g' packaging/linux/openra-server.debug.in | sed 's/{MODNAME}/Tiberian Dawn/g' > packaging/linux/openra-cnc-server
+	@sed 's/{MOD}/d2k/g' packaging/linux/openra-server.debug.in | sed 's/{MODNAME}/Dune 2000/g' > packaging/linux/openra-d2k-server
+
+	@$(INSTALL_DIR) "$(BIN_INSTALL_DIR)"
+	@$(INSTALL_PROGRAM) -m +rx packaging/linux/openra-ra-server "$(BIN_INSTALL_DIR)"
+	@$(INSTALL_PROGRAM) -m +rx packaging/linux/openra-cnc-server "$(BIN_INSTALL_DIR)"
+	@$(INSTALL_PROGRAM) -m +rx packaging/linux/openra-d2k-server "$(BIN_INSTALL_DIR)"
+	@-$(RM) packaging/linux/openra-ra-server packaging/linux/openra-cnc-server packaging/linux/openra-d2k-server packaging/linux/openra-server.debug.in
 
 uninstall:
 	@-$(RM_R) "$(DATA_INSTALL_DIR)"
-	@-$(RM_F) "$(BIN_INSTALL_DIR)/openra"
-	@-$(RM_F) "$(BIN_INSTALL_DIR)/openra-server"
-	@-$(RM_F) "$(DESTDIR)$(datadir)/applications/openra.desktop"
-	@-$(RM_F) "$(DESTDIR)$(datadir)/applications/openra-join-servers.desktop"
-	@-$(RM_F) "$(DESTDIR)$(datadir)/applications/openra-launch-mod.desktop"
-	@-$(RM_F) "$(DESTDIR)$(datadir)/applications/openra-join-servers.desktop"
-	@-$(RM_F) "$(DESTDIR)$(datadir)/icons/hicolor/16x16/apps/openra.png"
-	@-$(RM_F) "$(DESTDIR)$(datadir)/icons/hicolor/32x32/apps/openra.png"
-	@-$(RM_F) "$(DESTDIR)$(datadir)/icons/hicolor/48x48/apps/openra.png"
-	@-$(RM_F) "$(DESTDIR)$(datadir)/icons/hicolor/64x64/apps/openra.png"
-	@-$(RM_F) "$(DESTDIR)$(datadir)/icons/hicolor/128x128/apps/openra.png"
+	@-$(RM_F) "$(BIN_INSTALL_DIR)/openra-ra"
+	@-$(RM_F) "$(BIN_INSTALL_DIR)/openra-ra-server"
+	@-$(RM_F) "$(BIN_INSTALL_DIR)/openra-cnc"
+	@-$(RM_F) "$(BIN_INSTALL_DIR)/openra-cnc-server"
+	@-$(RM_F) "$(BIN_INSTALL_DIR)/openra-d2k"
+	@-$(RM_F) "$(BIN_INSTALL_DIR)/openra-d2k-server"
+	@-$(RM_F) "$(DESTDIR)$(datadir)/applications/openra-ra.desktop"
+	@-$(RM_F) "$(DESTDIR)$(datadir)/applications/openra-cnc.desktop"
+	@-$(RM_F) "$(DESTDIR)$(datadir)/applications/openra-d2k.desktop"
+	@-$(RM_F) "$(DESTDIR)$(datadir)/applications/openra-ra-join-servers.desktop"
+	@-$(RM_F) "$(DESTDIR)$(datadir)/applications/openra-cnc-join-servers.desktop"
+	@-$(RM_F) "$(DESTDIR)$(datadir)/applications/openra-d2k-join-servers.desktop"
+	@-$(RM_F) "$(DESTDIR)$(datadir)/icons/hicolor/16x16/apps/openra-ra.png"
+	@-$(RM_F) "$(DESTDIR)$(datadir)/icons/hicolor/32x32/apps/openra-ra.png"
+	@-$(RM_F) "$(DESTDIR)$(datadir)/icons/hicolor/48x48/apps/openra-ra.png"
+	@-$(RM_F) "$(DESTDIR)$(datadir)/icons/hicolor/64x64/apps/openra-ra.png"
+	@-$(RM_F) "$(DESTDIR)$(datadir)/icons/hicolor/128x128/apps/openra-ra.png"
+	@-$(RM_F) "$(DESTDIR)$(datadir)/icons/hicolor/16x16/apps/openra-cnc.png"
+	@-$(RM_F) "$(DESTDIR)$(datadir)/icons/hicolor/32x32/apps/openra-cnc.png"
+	@-$(RM_F) "$(DESTDIR)$(datadir)/icons/hicolor/48x48/apps/openra-cnc.png"
+	@-$(RM_F) "$(DESTDIR)$(datadir)/icons/hicolor/64x64/apps/openra-cnc.png"
+	@-$(RM_F) "$(DESTDIR)$(datadir)/icons/hicolor/128x128/apps/openra-cnc.png"
+	@-$(RM_F) "$(DESTDIR)$(datadir)/icons/hicolor/16x16/apps/openra-d2k.png"
+	@-$(RM_F) "$(DESTDIR)$(datadir)/icons/hicolor/32x32/apps/openra-d2k.png"
+	@-$(RM_F) "$(DESTDIR)$(datadir)/icons/hicolor/48x48/apps/openra-d2k.png"
+	@-$(RM_F) "$(DESTDIR)$(datadir)/icons/hicolor/64x64/apps/openra-d2k.png"
+	@-$(RM_F) "$(DESTDIR)$(datadir)/icons/hicolor/128x128/apps/openra-d2k.png"
 	@-$(RM_F) "$(DESTDIR)$(datadir)/mime/packages/openra.xml"
 	@-$(RM_F) "$(DESTDIR)$(datadir)/appdata/openra.appdata.xml"
 	@-$(RM_F) "$(DESTDIR)$(mandir)/man6/openra.6"
diff --git a/packaging/linux/deb/buildpackage.sh b/packaging/linux/deb/buildpackage.sh
index b8cfeed828..53c4a38b48 100755
--- a/packaging/linux/deb/buildpackage.sh
+++ b/packaging/linux/deb/buildpackage.sh
@@ -28,8 +28,13 @@ chmod 0644 "${DEB_BUILD_ROOT}/${LIBDIR}/"*/**/*.dll
 
 # Binaries go in /usr/games
 mv "${DEB_BUILD_ROOT}/usr/bin/" "${DEB_BUILD_ROOT}/usr/games/"
-sed "s|/usr/bin|/usr/games|g" "${DEB_BUILD_ROOT}/usr/games/openra" > temp
-mv -f temp "${DEB_BUILD_ROOT}/usr/games/openra"
+sed "s|/usr/bin|/usr/games|g" "${DEB_BUILD_ROOT}/usr/games/openra-ra" > temp
+mv -f temp "${DEB_BUILD_ROOT}/usr/games/openra-ra"
+sed "s|/usr/bin|/usr/games|g" "${DEB_BUILD_ROOT}/usr/games/openra-cnc" > temp
+mv -f temp "${DEB_BUILD_ROOT}/usr/games/openra-cnc"
+sed "s|/usr/bin|/usr/games|g" "${DEB_BUILD_ROOT}/usr/games/openra-d2k" > temp
+mv -f temp "${DEB_BUILD_ROOT}/usr/games/openra-d2k"
+
 chmod 0755 "${DEB_BUILD_ROOT}/usr/games/openra"*
 
 # Compress the man page
diff --git a/packaging/linux/hicolor/128x128/apps/openra-cnc.png b/packaging/linux/hicolor/128x128/apps/openra-cnc.png
new file mode 100644
index 0000000000..b20c73c655
Binary files /dev/null and b/packaging/linux/hicolor/128x128/apps/openra-cnc.png differ
diff --git a/packaging/linux/hicolor/128x128/apps/openra-d2k.png b/packaging/linux/hicolor/128x128/apps/openra-d2k.png
new file mode 100644
index 0000000000..e88a4e0262
Binary files /dev/null and b/packaging/linux/hicolor/128x128/apps/openra-d2k.png differ
diff --git a/packaging/linux/hicolor/128x128/apps/openra.png b/packaging/linux/hicolor/128x128/apps/openra-ra.png
similarity index 100%
rename from packaging/linux/hicolor/128x128/apps/openra.png
rename to packaging/linux/hicolor/128x128/apps/openra-ra.png
diff --git a/packaging/linux/hicolor/16x16/apps/openra-cnc.png b/packaging/linux/hicolor/16x16/apps/openra-cnc.png
new file mode 100644
index 0000000000..86a2dc2603
Binary files /dev/null and b/packaging/linux/hicolor/16x16/apps/openra-cnc.png differ
diff --git a/packaging/linux/hicolor/16x16/apps/openra-d2k.png b/packaging/linux/hicolor/16x16/apps/openra-d2k.png
new file mode 100644
index 0000000000..0c5e286b52
Binary files /dev/null and b/packaging/linux/hicolor/16x16/apps/openra-d2k.png differ
diff --git a/packaging/linux/hicolor/16x16/apps/openra.png b/packaging/linux/hicolor/16x16/apps/openra-ra.png
similarity index 100%
rename from packaging/linux/hicolor/16x16/apps/openra.png
rename to packaging/linux/hicolor/16x16/apps/openra-ra.png
diff --git a/packaging/linux/hicolor/32x32/apps/openra-cnc.png b/packaging/linux/hicolor/32x32/apps/openra-cnc.png
new file mode 100644
index 0000000000..22b05bd91f
Binary files /dev/null and b/packaging/linux/hicolor/32x32/apps/openra-cnc.png differ
diff --git a/packaging/linux/hicolor/32x32/apps/openra-d2k.png b/packaging/linux/hicolor/32x32/apps/openra-d2k.png
new file mode 100644
index 0000000000..f91a40a3df
Binary files /dev/null and b/packaging/linux/hicolor/32x32/apps/openra-d2k.png differ
diff --git a/packaging/linux/hicolor/32x32/apps/openra.png b/packaging/linux/hicolor/32x32/apps/openra-ra.png
similarity index 100%
rename from packaging/linux/hicolor/32x32/apps/openra.png
rename to packaging/linux/hicolor/32x32/apps/openra-ra.png
diff --git a/packaging/linux/hicolor/48x48/apps/openra-cnc.png b/packaging/linux/hicolor/48x48/apps/openra-cnc.png
new file mode 100644
index 0000000000..595ad33c03
Binary files /dev/null and b/packaging/linux/hicolor/48x48/apps/openra-cnc.png differ
diff --git a/packaging/linux/hicolor/48x48/apps/openra-d2k.png b/packaging/linux/hicolor/48x48/apps/openra-d2k.png
new file mode 100644
index 0000000000..a57d4b5d09
Binary files /dev/null and b/packaging/linux/hicolor/48x48/apps/openra-d2k.png differ
diff --git a/packaging/linux/hicolor/48x48/apps/openra.png b/packaging/linux/hicolor/48x48/apps/openra-ra.png
similarity index 100%
rename from packaging/linux/hicolor/48x48/apps/openra.png
rename to packaging/linux/hicolor/48x48/apps/openra-ra.png
diff --git a/packaging/linux/hicolor/64x64/apps/openra-cnc.png b/packaging/linux/hicolor/64x64/apps/openra-cnc.png
new file mode 100644
index 0000000000..6a7a1706f5
Binary files /dev/null and b/packaging/linux/hicolor/64x64/apps/openra-cnc.png differ
diff --git a/packaging/linux/hicolor/64x64/apps/openra-d2k.png b/packaging/linux/hicolor/64x64/apps/openra-d2k.png
new file mode 100644
index 0000000000..2a5a309c46
Binary files /dev/null and b/packaging/linux/hicolor/64x64/apps/openra-d2k.png differ
diff --git a/packaging/linux/hicolor/64x64/apps/openra.png b/packaging/linux/hicolor/64x64/apps/openra-ra.png
similarity index 100%
rename from packaging/linux/hicolor/64x64/apps/openra.png
rename to packaging/linux/hicolor/64x64/apps/openra-ra.png
diff --git a/packaging/linux/hicolor/scalable/apps/openra-cnc.svg b/packaging/linux/hicolor/scalable/apps/openra-cnc.svg
new file mode 100644
index 0000000000..0bebfdf12f
--- /dev/null
+++ b/packaging/linux/hicolor/scalable/apps/openra-cnc.svg
@@ -0,0 +1,226 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   version="1.1"
+   id="svg4130"
+   height="96"
+   width="96">
+  <defs
+     id="defs4132">
+    <linearGradient
+       id="linearGradient3822">
+      <stop
+         id="stop3824"
+         offset="0"
+         style="stop-color:#6c4500;stop-opacity:0;" />
+      <stop
+         style="stop-color:#c57d00;stop-opacity:0.49803922;"
+         offset="0.53448278"
+         id="stop3826" />
+      <stop
+         id="stop3828"
+         offset="1"
+         style="stop-color:#ffae22;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3814">
+      <stop
+         style="stop-color:#dd8d00;stop-opacity:0;"
+         offset="0"
+         id="stop3816" />
+      <stop
+         id="stop3818"
+         offset="0.53448278"
+         style="stop-color:#f19900;stop-opacity:0.49803922;" />
+      <stop
+         style="stop-color:#583800;stop-opacity:1;"
+         offset="1"
+         id="stop3820" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3782">
+      <stop
+         id="stop3784"
+         offset="0"
+         style="stop-color:#dd8d00;stop-opacity:0;" />
+      <stop
+         style="stop-color:#f19900;stop-opacity:0.49803922;"
+         offset="0.53448278"
+         id="stop3796" />
+      <stop
+         id="stop3786"
+         offset="1"
+         style="stop-color:#8d5900;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient6616">
+      <stop
+         id="stop6618"
+         offset="0"
+         style="stop-color:#000000;stop-opacity:1;" />
+      <stop
+         id="stop6620"
+         offset="1"
+         style="stop-color:#000000;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient6596">
+      <stop
+         id="stop6598"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:0.98425198;" />
+      <stop
+         id="stop6600"
+         offset="1"
+         style="stop-color:#000000;stop-opacity:0.39370078;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient6572">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="0"
+         id="stop6574" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="1"
+         id="stop6576" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5110">
+      <stop
+         id="stop5112"
+         offset="0"
+         style="stop-color:#bd6c00;stop-opacity:1;" />
+      <stop
+         id="stop5114"
+         offset="1"
+         style="stop-color:#ffa32e;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5084">
+      <stop
+         id="stop5086"
+         offset="0"
+         style="stop-color:#000000;stop-opacity:0.64566928;" />
+      <stop
+         id="stop5088"
+         offset="1"
+         style="stop-color:#808080;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       y2="459.90771"
+       x2="305.06607"
+       y1="459.90771"
+       x1="71.720825"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient5098"
+       xlink:href="#linearGradient5084" />
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.99974406,0,0.14517841)"
+       r="21.637486"
+       fy="567.22565"
+       fx="84.734207"
+       cy="567.22565"
+       cx="84.734207"
+       id="radialGradient3792"
+       xlink:href="#linearGradient3782" />
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.99907109,0,0.52682475)"
+       r="8.3748941"
+       fy="567.14465"
+       fx="84.577248"
+       cy="567.14465"
+       cx="84.577248"
+       id="radialGradient3812"
+       xlink:href="#linearGradient3822" />
+    <radialGradient
+       r="21.637486"
+       fy="567.22565"
+       fx="84.734207"
+       cy="567.22565"
+       cx="84.734207"
+       gradientTransform="matrix(1,0,0,0.99974406,0,0.14517841)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3034"
+       xlink:href="#linearGradient3782" />
+    <linearGradient
+       y2="459.90771"
+       x2="305.06607"
+       y1="459.90771"
+       x1="71.720825"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3036"
+       xlink:href="#linearGradient5084" />
+  </defs>
+  <metadata
+     id="metadata4135">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="translate(-21.534337,-535.20401)"
+     id="layer1">
+    <g
+       transform="matrix(0.83934059,0,0,0.8393405,-2.2578941,107.12651)"
+       id="g3022">
+      <path
+         style="fill:#6e6e6e;fill-opacity:1;stroke:none"
+         d="M 64,6.8125 C 32.40886,6.8125 6.8125,32.408848 6.8125,64 6.8125,95.591152 32.40886,121.1875 64,121.1875 95.59114,121.1875 121.1875,95.591152 121.1875,64 121.1875,32.408848 95.59114,6.8125 64,6.8125 z m 0,5.5 c 28.552445,0 51.6875,23.135044 51.6875,51.6875 0,28.552456 -23.135055,51.6875 -51.6875,51.6875 C 35.447555,115.6875 12.3125,92.552456 12.3125,64 12.3125,35.447544 35.447555,12.3125 64,12.3125 z"
+         id="path6583"
+         transform="translate(21.534337,503.20399)" />
+      <path
+         transform="matrix(0.47140451,0,0,0.4714047,-3.2751835,350.40132)"
+         d="M 305.06607,459.90771 A 116.67262,116.67262 0 0 1 188.39345,576.58034 116.67262,116.67262 0 0 1 71.720825,459.90771 116.67262,116.67262 0 0 1 188.39345,343.23509 116.67262,116.67262 0 0 1 305.06607,459.90771 Z"
+         id="path5072"
+         style="fill:#808080;fill-opacity:1;stroke:none" />
+      <path
+         id="path3010"
+         d="m 85.534337,520.46025 c -25.564062,0 -46.27705,20.92185 -46.27705,46.74374 0,25.82189 20.712988,46.74374 46.27705,46.74374 25.564053,0 46.277053,-20.92185 46.277053,-46.74374 0,-25.82189 -20.713,-46.74374 -46.277053,-46.74374 z m 0,4.49557 c 23.105093,0 41.826353,18.91005 41.826353,42.24817 0,23.33812 -18.72126,42.24817 -41.826353,42.24817 -23.1051,0 -41.826361,-18.91005 -41.826361,-42.24817 0,-23.33812 18.721261,-42.24817 41.826361,-42.24817 z"
+         style="fill:#6e6e6e;fill-opacity:1;stroke:none" />
+      <path
+         style="fill:#000000;fill-opacity:1;stroke:none"
+         id="path5076"
+         d="M 305.06607,459.90771 A 116.67262,116.67262 0 0 1 188.39345,576.58034 116.67262,116.67262 0 0 1 71.720825,459.90771 116.67262,116.67262 0 0 1 188.39345,343.23509 116.67262,116.67262 0 0 1 305.06607,459.90771 Z"
+         transform="matrix(0.3798902,0,0,0.37989036,13.965509,392.48946)" />
+      <path
+         style="fill:#ffaf27;fill-opacity:1;stroke:none"
+         d="m 84.61767,546.12645 c -4.647961,0 -8.949813,1.50102 -12.441972,4.04004 3.382281,3.34321 4.069402,6.41938 4.72371,9.30793 -3.513263,-0.93044 -6.569652,-2.61856 -9.052317,-4.80174 -2.648436,3.53517 -4.217617,7.91795 -4.217617,12.67506 0,4.64796 1.501008,8.9498 4.040031,12.44198 3.343203,-3.3823 6.419382,-4.32055 9.307924,-4.97487 -0.938031,3.53703 -2.622425,6.81446 -4.801731,9.29237 3.535163,2.64845 7.917952,4.21762 12.675051,4.21762 4.647959,0 8.949814,-1.50102 12.441971,-4.04004 -3.38228,-3.3432 -4.383329,-6.7222 -5.037635,-9.61075 3.470275,0.90031 6.888845,2.93699 9.366235,5.11567 2.64845,-3.53517 4.21762,-7.91796 4.21762,-12.67507 0,-4.64795 -1.501,-8.9498 -4.04004,-12.44197 -3.34319,3.38228 -6.73329,4.19498 -9.621835,4.84929 0.93835,-3.54461 2.932955,-6.696 5.115655,-9.17789 -3.535162,-2.64845 -7.917951,-4.21763 -12.67505,-4.21763 z"
+         id="path5063" />
+      <path
+         style="fill:#ff0000;fill-opacity:1;stroke:#ffffff;stroke-width:1.0655036;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         d="m 85.538886,537.06965 c -16.6442,0 -30.144866,13.4896 -30.144866,30.1338 0,16.6442 13.500666,30.13378 30.144866,30.13378 5.675234,0 10.984394,-1.56834 15.516394,-4.29532 l -2.83024,-4.78366 c -3.703345,2.23673 -8.043553,3.51838 -12.686154,3.51838 -13.572947,0 -24.584269,-11.00024 -24.584269,-24.57318 0,-13.57295 11.011322,-24.5732 24.584269,-24.5732 4.633754,0 8.965238,1.27845 12.663954,3.5073 l 2.96343,-4.70598 c -4.55612,-2.76816 -9.90594,-4.36192 -15.627384,-4.36192 z"
+         id="path4264" />
+      <path
+         id="path3780"
+         d="m 84.61767,546.12645 c -4.647961,0 -8.949813,1.50102 -12.441972,4.04004 3.382281,3.34321 4.069402,6.41938 4.72371,9.30793 -3.513263,-0.93044 -6.569652,-2.61856 -9.052317,-4.80174 -2.648436,3.53517 -4.217617,7.91795 -4.217617,12.67506 0,4.64796 1.501008,8.9498 4.040031,12.44198 3.343203,-3.3823 6.419382,-4.32055 9.307924,-4.97487 -0.938031,3.53703 -2.622425,6.81446 -4.801731,9.29237 3.535163,2.64845 7.917952,4.21762 12.675051,4.21762 4.647959,0 8.949814,-1.50102 12.441971,-4.04004 -3.38228,-3.3432 -4.383329,-6.7222 -5.037635,-9.61075 3.470275,0.90031 6.888845,2.93699 9.366235,5.11567 2.64845,-3.53517 4.21762,-7.91796 4.21762,-12.67507 0,-4.64795 -1.501,-8.9498 -4.04004,-12.44197 -3.34319,3.38228 -6.73329,4.19498 -9.621835,4.84929 0.93835,-3.54461 2.932955,-6.696 5.115655,-9.17789 -3.535162,-2.64845 -7.917951,-4.21763 -12.67505,-4.21763 z"
+         style="fill:url(#radialGradient3034);fill-opacity:1;stroke:#a0a0a0;stroke-width:1.0655036;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         style="fill:none;stroke:#a0a0a0;stroke-width:1.08700001;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         d="m 76.745851,559.32102 0.07958,15.64723 15.583209,-0.14361 -0.07958,-15.45512 z"
+         id="path6630" />
+      <path
+         style="fill:#ff0000;fill-opacity:1;stroke:#ffffff;stroke-width:1.0655036;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         d="m 86.038341,527.29147 c -22.046179,0 -39.934178,17.8658 -39.934178,39.91198 0,22.04618 17.887999,39.91199 39.934178,39.91199 7.459453,0 14.438709,-2.04433 20.411049,-5.60499 l -3.20762,-5.4163 c -5.08086,3.06872 -11.03371,4.82806 -17.403212,4.82806 -18.621663,0 -33.72984,-15.09709 -33.72984,-33.71876 0,-18.62167 15.108177,-33.71875 33.72984,-33.71875 6.357363,0 12.295402,1.75905 17.369932,4.81695 l 3.363,-5.33862 c -6.00018,-3.60745 -13.021035,-5.67156 -20.533149,-5.67156 z"
+         id="path4796" />
+      <path
+         style="opacity:0.9;fill:url(#linearGradient3036);fill-opacity:1;stroke:none"
+         id="path5082"
+         d="M 305.06607,459.90771 A 116.67262,116.67262 0 0 1 188.39345,576.58034 116.67262,116.67262 0 0 1 71.720825,459.90771 116.67262,116.67262 0 0 1 188.39345,343.23509 116.67262,116.67262 0 0 1 305.06607,459.90771 Z"
+         transform="matrix(-0.25240968,-0.42008026,0.4200804,-0.25240977,-60.11205,762.43008)" />
+    </g>
+  </g>
+</svg>
diff --git a/packaging/linux/hicolor/scalable/apps/openra.svg b/packaging/linux/hicolor/scalable/apps/openra-ra.svg
similarity index 100%
rename from packaging/linux/hicolor/scalable/apps/openra.svg
rename to packaging/linux/hicolor/scalable/apps/openra-ra.svg
diff --git a/packaging/linux/openra-join-servers.desktop b/packaging/linux/openra-join-servers.desktop.in
similarity index 53%
rename from packaging/linux/openra-join-servers.desktop
rename to packaging/linux/openra-join-servers.desktop.in
index 96b7bc06c5..bf3c544ff9 100755
--- a/packaging/linux/openra-join-servers.desktop
+++ b/packaging/linux/openra-join-servers.desktop.in
@@ -1,12 +1,13 @@
 [Desktop Entry]
 Type=Application
 Version=1.0
-Name=OpenRA
+Name=OpenRA - {MODNAME}
 GenericName=Real Time Strategy Game
+GenericName[de]=Echtzeit-Strategiespiel
 Comment=Reimagining of early Westwood Games
-Icon=openra
-Exec=openra Launch.URI=%U
+Icon=openra-{MOD}
+Exec=openra-{MOD} Launch.URI=%U
 Terminal=false
 NoDisplay=true
 Categories=Game;StrategyGame;
-MimeType=x-scheme-handler/openra;
\ No newline at end of file
+MimeType=x-scheme-handler/openra-{MOD}-{TAG};
\ No newline at end of file
diff --git a/packaging/linux/openra-mimeinfo.xml b/packaging/linux/openra-mimeinfo.xml
deleted file mode 100644
index a7b7bb8b0a..0000000000
--- a/packaging/linux/openra-mimeinfo.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0"?>
-<mime-info xmlns='http://www.freedesktop.org/standards/shared-mime-info'>
-
-  <mime-type type="x-scheme-handler/openra">
-    <icon name="openra" />
-    <generic-icon name="applications-games"/>
-    <comment>OpenRA connect to server scheme</comment>
-    <glob weight="60" pattern="openra://*"/>
-  </mime-type>
-
-</mime-info>
diff --git a/packaging/linux/openra-mimeinfo.xml.in b/packaging/linux/openra-mimeinfo.xml.in
new file mode 100644
index 0000000000..3964390353
--- /dev/null
+++ b/packaging/linux/openra-mimeinfo.xml.in
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+<mime-info xmlns='http://www.freedesktop.org/standards/shared-mime-info'>
+
+  <mime-type type="x-scheme-handler/openra-ra-{TAG}">
+    <icon name="openra-ra" />
+    <generic-icon name="applications-games"/>
+    <comment>OpenRA connect to server scheme</comment>
+    <glob weight="60" pattern="openra-ra-{TAG}://*"/>
+  </mime-type>
+  <mime-type type="x-scheme-handler/openra-cnc-{TAG}">
+    <icon name="openra-cnc" />
+    <generic-icon name="applications-games"/>
+    <comment>OpenRA connect to server scheme</comment>
+    <glob weight="60" pattern="openra-cnc-{TAG}://*"/>
+  </mime-type>
+  <mime-type type="x-scheme-handler/openra-d2k-{TAG}">
+    <icon name="openra-d2k" />
+    <generic-icon name="applications-games"/>
+    <comment>OpenRA connect to server scheme</comment>
+    <glob weight="60" pattern="openra-d2k-{TAG}://*"/>
+  </mime-type>
+
+</mime-info>
diff --git a/packaging/linux/openra-server.in b/packaging/linux/openra-server.in
new file mode 100755
index 0000000000..63893307b1
--- /dev/null
+++ b/packaging/linux/openra-server.in
@@ -0,0 +1,4 @@
+#!/bin/sh
+cd "{GAME_INSTALL_DIR}"
+
+mono {DEBUG} OpenRA.Server.exe Game.Mod={MOD} "$$@"
\ No newline at end of file
diff --git a/packaging/linux/openra.desktop b/packaging/linux/openra.desktop.in
similarity index 77%
rename from packaging/linux/openra.desktop
rename to packaging/linux/openra.desktop.in
index 9ca3c84786..3d17dec974 100644
--- a/packaging/linux/openra.desktop
+++ b/packaging/linux/openra.desktop.in
@@ -1,11 +1,11 @@
 [Desktop Entry]
 Type=Application
 Version=1.0
-Name=OpenRA
+Name=OpenRA - {MODNAME}
 GenericName=Real Time Strategy Game
 GenericName[de]=Echtzeit-Strategiespiel
 Comment=Reimagining of early Westwood Games
-Icon=openra
-Exec=openra
+Icon=openra-{MOD}
+Exec=openra-{MOD}
 Terminal=false
 Categories=Game;StrategyGame;
diff --git a/packaging/linux/openra.in b/packaging/linux/openra.in
new file mode 100755
index 0000000000..f8216adc81
--- /dev/null
+++ b/packaging/linux/openra.in
@@ -0,0 +1,16 @@
+#!/bin/sh
+cd "{GAME_INSTALL_DIR}"
+
+mono {DEBUG} OpenRA.Game.exe Game.Mod={MOD} Engine.LaunchPath="{BIN_DIR}/openra-{MOD}" "$@"
+
+# Show a crash dialog if required
+if [ $? != 0 ] && [ $? != 1 ]
+then
+	if which zenity > /dev/null
+	then
+		zenity --question --title "{MODNAME}" --text "{MODNAME} has encountered a fatal error.\nLog Files are available in ~/.openra." --ok-label "Quit" --cancel-label "View FAQ" || xdg-open https://github.com/OpenRA/OpenRA/wiki/FAQ
+	else
+		printf "{MODNAME} has encountered a fatal error.\n  -> Log Files are available in ~/.openra\n  -> FAQ is available at https://github.com/OpenRA/OpenRA/wiki/FAQ\n"
+	fi
+	exit 1
+fi