Extract mod selector into its own mod.

2014-03-23 17:07:10 +13:00
parent fa775a88c1
commit c720cb0b41
36 changed files with 1507 additions and 279 deletions
--- a/OpenRA.Game/GameRules/Settings.cs
+++ b/OpenRA.Game/GameRules/Settings.cs
@@ -123,7 +123,8 @@ namespace OpenRA.GameRules

 	public class GameSettings
 	{
-		public string Mod = "ra";
+		public string Mod = "modchooser";
+		public string PreviousMod = "ra";

 		public bool ShowShellmap = true;

--- a/OpenRA.Mods.RA/ModChooserLoadScreen.cs
+++ b/OpenRA.Mods.RA/ModChooserLoadScreen.cs
@@ -0,0 +1,51 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2014 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see COPYING.
+ */
+#endregion
+
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Linq;
+using OpenRA.FileFormats;
+using OpenRA.Graphics;
+using OpenRA.Support;
+using OpenRA.Widgets;
+
+namespace OpenRA.Mods.Cnc
+{
+	public class ModChooserLoadScreen : ILoadScreen
+	{
+		Sprite sprite;
+		Rectangle bounds;
+
+		public void Init(Manifest m, Dictionary<string, string> info)
+		{
+			var sheet = new Sheet("mods/modchooser/chrome.png");
+			var res = Game.Renderer.Resolution;
+			bounds = new Rectangle(0, 0, res.Width, res.Height);
+			sprite = new Sprite(sheet, new Rectangle(0,0,1024,480), TextureChannel.Alpha);
+		}
+
+		public void Display()
+		{
+			var r = Game.Renderer;
+			if (r == null)
+				return;
+
+			r.BeginFrame(float2.Zero, 1f);
+			WidgetUtils.FillRectWithSprite(bounds, sprite);
+			r.EndFrame(new NullInputHandler());
+		}
+
+		public void StartGame()
+		{
+			Ui.LoadWidget("MODCHOOSER", Ui.Root, new WidgetArgs());
+		}
+	}
+}
--- a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
+++ b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
@@ -491,6 +491,7 @@
    <Compile Include="Widgets\LogicKeyListenerWidget.cs" />
    <Compile Include="Widgets\Logic\ControlGroupLogic.cs" />
    <Compile Include="Buildings\LineBuildNode.cs" />
+    <Compile Include="ModChooserLoadScreen.cs" />
  </ItemGroup>
  <ItemGroup>
    <ProjectReference Include="..\OpenRA.FileFormats\OpenRA.FileFormats.csproj">
--- a/OpenRA.Mods.RA/Widgets/Logic/InstallLogic.cs
+++ b/OpenRA.Mods.RA/Widgets/Logic/InstallLogic.cs
@@ -42,15 +42,10 @@ namespace OpenRA.Mods.RA.Widgets.Logic
 			panel.Get<ButtonWidget>("INSTALL_BUTTON").OnClick = () =>
 				Ui.OpenWindow("INSTALL_FROMCD_PANEL", args);

-			panel.Get<ButtonWidget>("QUIT_BUTTON").OnClick = Game.Exit;
-
-			panel.Get<ButtonWidget>("MODS_BUTTON").OnClick = () =>
+			panel.Get<ButtonWidget>("BACK_BUTTON").OnClick = () =>
 			{
-				Ui.OpenWindow("MODS_PANEL", new WidgetArgs()
-				{
-					{ "onExit", () => { } },
-					{ "onSwitch", Ui.CloseWindow },
-				});
+				Game.Settings.Game.PreviousMod = Game.modData.Manifest.Mod.Id;
+				Game.InitializeWithMod("modchooser", null);
 			};
 		}
 	}
--- a/OpenRA.Mods.RA/Widgets/Logic/MainMenuLogic.cs
+++ b/OpenRA.Mods.RA/Widgets/Logic/MainMenuLogic.cs
@@ -44,12 +44,8 @@ namespace OpenRA.Mods.RA.Widgets.Logic

 			mainMenu.Get<ButtonWidget>("MODS_BUTTON").OnClick = () =>
 			{
-				menuType = MenuType.None;
-				Ui.OpenWindow("MODS_PANEL", new WidgetArgs
-				{
-					{ "onExit", () => menuType = MenuType.Main },
-					{ "onSwitch", RemoveShellmapUI }
-				});
+				Game.Settings.Game.PreviousMod = Game.modData.Manifest.Mod.Id;
+				Game.InitializeWithMod("modchooser", null);
 			};

 			mainMenu.Get<ButtonWidget>("SETTINGS_BUTTON").OnClick = () =>
--- a/OpenRA.Mods.RA/Widgets/Logic/ModBrowserLogic.cs
+++ b/OpenRA.Mods.RA/Widgets/Logic/ModBrowserLogic.cs
@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2014 The OpenRA Developers (see AUTHORS)
 * This file is part of OpenRA, which is free software. It is made
 * available to you under the terms of the GNU General Public License
 * as published by the Free Software Foundation. For more information,
@@ -9,50 +9,160 @@
 #endregion

 using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.IO;
 using System.Linq;
 using OpenRA.FileFormats;
+using OpenRA.Graphics;
 using OpenRA.Widgets;

 namespace OpenRA.Mods.RA.Widgets.Logic
 {
 	public class ModBrowserLogic
 	{
-		Mod currentMod;
+		Widget modList;
+		ButtonWidget modTemplate;
+		Mod[] allMods;
+		Mod selectedMod;
+		string selectedAuthor;
+		string selectedDescription;
+		int modOffset = 0;
+		Dictionary<string, Sprite> previews;
+		Dictionary<string, Sprite> logos;

 		[ObjectCreator.UseCtor]
-		public ModBrowserLogic(Widget widget, Action onSwitch, Action onExit)
+		public ModBrowserLogic(Widget widget)
 		{
 			var panel = widget;
-			var modList = panel.Get<ScrollPanelWidget>("MOD_LIST");
 			var loadButton = panel.Get<ButtonWidget>("LOAD_BUTTON");
-			loadButton.OnClick = () => LoadMod(currentMod.Id, onSwitch);
-			loadButton.IsDisabled = () => currentMod.Id == Game.modData.Manifest.Mod.Id;
+			loadButton.OnClick = () => LoadMod(selectedMod);
+			loadButton.IsDisabled = () => selectedMod.Id == Game.modData.Manifest.Mod.Id;

-			panel.Get<ButtonWidget>("BACK_BUTTON").OnClick = () => { Ui.CloseWindow(); onExit(); };
-			currentMod = Game.modData.Manifest.Mod;
+			panel.Get<ButtonWidget>("QUIT_BUTTON").OnClick = Game.Exit;

-			// Mod list
-			var modTemplate = modList.Get<ScrollItemWidget>("MOD_TEMPLATE");
+			modList = panel.Get("MOD_LIST");
+			modTemplate = modList.Get<ButtonWidget>("MOD_TEMPLATE");
+
+			panel.Get<LabelWidget>("MOD_DESC").GetText = () => selectedDescription;
+			panel.Get<LabelWidget>("MOD_TITLE").GetText = () => selectedMod.Title;
+			panel.Get<LabelWidget>("MOD_AUTHOR").GetText = () => selectedAuthor;
+			panel.Get<LabelWidget>("MOD_VERSION").GetText = () => selectedMod.Version;
+
+			var prevMod = panel.Get<ButtonWidget>("PREV_MOD");
+			prevMod.OnClick = () => { modOffset -= 1; RebuildModList(); };
+			prevMod.IsVisible = () => modOffset > 0;
+
+			var nextMod = panel.Get<ButtonWidget>("NEXT_MOD");
+			nextMod.OnClick = () => { modOffset += 1; RebuildModList(); };
+			nextMod.IsVisible = () => modOffset + 5 < allMods.Length;
+
+			panel.Get<RGBASpriteWidget>("MOD_PREVIEW").GetSprite = () =>
+			{
+				Sprite ret = null;
+				previews.TryGetValue(selectedMod.Id, out ret);
+				return ret;
+			};
+
+			var sheetBuilder = new SheetBuilder(SheetType.BGRA);
+			previews = new Dictionary<string, Sprite>();
+			logos = new Dictionary<string, Sprite>();
+			allMods = Mod.AllMods.Values.Where(m => m.Id != "modchooser")
+				.OrderBy(m => m.Title)
+				.ToArray();
+
+			// Load preview images, and eat any errors
+			foreach (var mod in allMods)
+			{
+				try
+				{
+					var preview = new Bitmap(new[] { "mods", mod.Id, "preview.png" }.Aggregate(Path.Combine));
+					if (preview.Width != 296 || preview.Height != 196)
+						continue;
+
+					previews.Add(mod.Id, sheetBuilder.Add(preview));
+				}
+				catch (Exception) { }
+
+				try
+				{
+					var logo = new Bitmap(new[] { "mods", mod.Id, "logo.png" }.Aggregate(Path.Combine));
+					if (logo.Width != 96 || logo.Height != 96)
+						continue;
+
+					logos.Add(mod.Id, sheetBuilder.Add(logo));
+				}
+				catch (Exception) { }
+			}
+
+
+			Mod initialMod = null;
+			Mod.AllMods.TryGetValue(Game.Settings.Game.PreviousMod, out initialMod);
+			SelectMod(initialMod ?? Mod.AllMods["ra"]);
+
+			RebuildModList();
+		}
+
+		void RebuildModList()
+		{
 			modList.RemoveChildren();

-			foreach (var m in Mod.AllMods)
+			var width = modTemplate.Bounds.Width;
+			var height = modTemplate.Bounds.Height;
+			var innerMargin = modTemplate.Bounds.Left;
+			var outerMargin = (modList.Bounds.Width - Math.Min(5, allMods.Length) * width - 4 * innerMargin) / 2;
+			var stride = width + innerMargin;
+
+			for (var i = 0; i < 5; i++)
 			{
-				var mod = m.Value;
-				var item = ScrollItemWidget.Setup(modTemplate, () => currentMod == mod, () => currentMod = mod, () => LoadMod(currentMod.Id, onSwitch));
-				item.Get<LabelWidget>("TITLE").GetText = () => mod.Title;
-				item.Get<LabelWidget>("VERSION").GetText = () => mod.Version;
-				item.Get<LabelWidget>("AUTHOR").GetText = () => mod.Author;
+				var j = i + modOffset;
+				if (j >= allMods.Length)
+					break;
+
+				var mod = allMods[j];
+				var item = modTemplate.Clone() as ButtonWidget;
+				item.Bounds = new Rectangle(outerMargin + i * stride, 0, width, height);
+				item.IsHighlighted = () => selectedMod == mod;
+				item.OnClick = () => SelectMod(mod);
+				item.OnDoubleClick = () => LoadMod(mod);
+				item.OnKeyPress = e =>
+				{
+					if (e.MultiTapCount == 2)
+						LoadMod(mod);
+					else
+						SelectMod(mod);
+				};
+
+				item.TooltipText = mod.Title;
+
+				if (j < 9)
+					item.Key = new Hotkey((Keycode)((int)Keycode.NUMBER_1 + j), Modifiers.None);
+
+				Sprite logo = null;
+				logos.TryGetValue(mod.Id, out logo);
+				item.Get<RGBASpriteWidget>("MOD_LOGO").GetSprite = () => logo;
+				item.Get("MOD_NO_LOGO").IsVisible = () => logo == null;
+
 				modList.AddChild(item);
 			}
 		}

-		void LoadMod(string mod, Action onSwitch)
+		void SelectMod(Mod mod)
+		{
+			selectedMod = mod;
+			selectedAuthor = "By " + mod.Author ?? "unknown author";
+			selectedDescription = (mod.Description ?? "").Replace("\\n", "\n");
+			var selectedIndex = Array.IndexOf(allMods, mod);
+			if (selectedIndex - modOffset > 4)
+				modOffset = selectedIndex - 4;
+		}
+
+		void LoadMod(Mod mod)
 		{
 			Game.RunAfterTick(() =>
 			{
 				Ui.CloseWindow();
-				onSwitch();
-				Game.InitializeWithMod(mod, null);
+				Game.InitializeWithMod(mod.Id, null);
 			});
 		}
 	}
--- a/artsrc/cnc/logo.svg
+++ b/artsrc/cnc/logo.svg
@@ -0,0 +1,320 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="96"
+   height="96"
+   id="svg4130"
+   version="1.1"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="logo.svg"
+   inkscape:export-filename="/Users/paul/src/OpenRA/mods/cnc/logo.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4132">
+    <linearGradient
+       id="linearGradient3822">
+      <stop
+         style="stop-color:#6c4500;stop-opacity:0;"
+         offset="0"
+         id="stop3824" />
+      <stop
+         id="stop3826"
+         offset="0.53448278"
+         style="stop-color:#c57d00;stop-opacity:0.49803922;" />
+      <stop
+         style="stop-color:#ffae22;stop-opacity:1;"
+         offset="1"
+         id="stop3828" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3814">
+      <stop
+         id="stop3816"
+         offset="0"
+         style="stop-color:#dd8d00;stop-opacity:0;" />
+      <stop
+         style="stop-color:#f19900;stop-opacity:0.49803922;"
+         offset="0.53448278"
+         id="stop3818" />
+      <stop
+         id="stop3820"
+         offset="1"
+         style="stop-color:#583800;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3782">
+      <stop
+         style="stop-color:#dd8d00;stop-opacity:0;"
+         offset="0"
+         id="stop3784" />
+      <stop
+         id="stop3796"
+         offset="0.53448278"
+         style="stop-color:#f19900;stop-opacity:0.49803922;" />
+      <stop
+         style="stop-color:#8d5900;stop-opacity:1;"
+         offset="1"
+         id="stop3786" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient6616">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop6618" />
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="1"
+         id="stop6620" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient6596">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0.98425198;"
+         offset="0"
+         id="stop6598" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0.39370078;"
+         offset="1"
+         id="stop6600" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient6572">
+      <stop
+         id="stop6574"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+      <stop
+         id="stop6576"
+         offset="1"
+         style="stop-color:#000000;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5110">
+      <stop
+         style="stop-color:#bd6c00;stop-opacity:1;"
+         offset="0"
+         id="stop5112" />
+      <stop
+         style="stop-color:#ffa32e;stop-opacity:1;"
+         offset="1"
+         id="stop5114" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5084">
+      <stop
+         style="stop-color:#000000;stop-opacity:0.64566928;"
+         offset="0"
+         id="stop5086" />
+      <stop
+         style="stop-color:#808080;stop-opacity:0;"
+         offset="1"
+         id="stop5088" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5084"
+       id="linearGradient5098"
+       gradientUnits="userSpaceOnUse"
+       x1="71.720825"
+       y1="459.90771"
+       x2="305.06607"
+       y2="459.90771" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3782"
+       id="radialGradient3792"
+       cx="84.734207"
+       cy="567.22565"
+       fx="84.734207"
+       fy="567.22565"
+       r="21.637486"
+       gradientTransform="matrix(1,0,0,0.99974406,0,0.14517841)"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3822"
+       id="radialGradient3812"
+       cx="84.577248"
+       cy="567.14465"
+       fx="84.577248"
+       fy="567.14465"
+       r="8.3748941"
+       gradientTransform="matrix(1,0,0,0.99907109,0,0.52682475)"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3782"
+       id="radialGradient3034"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.99974406,0,0.14517841)"
+       cx="84.734207"
+       cy="567.22565"
+       fx="84.734207"
+       fy="567.22565"
+       r="21.637486" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5084"
+       id="linearGradient3036"
+       gradientUnits="userSpaceOnUse"
+       x1="71.720825"
+       y1="459.90771"
+       x2="305.06607"
+       y2="459.90771" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="2.3372088"
+     inkscape:cx="71.042325"
+     inkscape:cy="115.94373"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1071"
+     inkscape:window-height="856"
+     inkscape:window-x="561"
+     inkscape:window-y="22"
+     inkscape:window-maximized="0"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     fit-margin-top="14"
+     fit-margin-left="14"
+     fit-margin-right="14"
+     fit-margin-bottom="14" />
+  <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
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-21.534337,-535.20401)">
+    <g
+       id="g3022"
+       transform="matrix(0.83934059,0,0,0.8393405,-2.2578941,107.12651)"
+       inkscape:export-filename="/Users/paul/src/OpenRA/mods/cnc/g3022.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90">
+      <path
+         transform="translate(21.534337,503.20399)"
+         id="path6583"
+         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"
+         style="fill:#6e6e6e;fill-opacity:1;stroke:none"
+         inkscape:connector-curvature="0" />
+      <path
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/Users/paul/Desktop/logo.png"
+         sodipodi:type="arc"
+         style="fill:#808080;fill-opacity:1;stroke:none"
+         id="path5072"
+         sodipodi:cx="188.39345"
+         sodipodi:cy="459.90771"
+         sodipodi:rx="116.67262"
+         sodipodi:ry="116.67262"
+         d="m 305.06607,459.90771 c 0,64.43652 -52.23611,116.67263 -116.67262,116.67263 -64.43651,0 -116.672625,-52.23611 -116.672625,-116.67263 0,-64.43651 52.236115,-116.67262 116.672625,-116.67262 64.43651,0 116.67262,52.23611 116.67262,116.67262 z"
+         transform="matrix(0.47140451,0,0,0.4714047,-3.2751835,350.40132)" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:#6e6e6e;fill-opacity:1;stroke:none"
+         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"
+         id="path3010" />
+      <path
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/Users/paul/Desktop/logo.png"
+         transform="matrix(0.3798902,0,0,0.37989036,13.965509,392.48946)"
+         d="m 305.06607,459.90771 c 0,64.43652 -52.23611,116.67263 -116.67262,116.67263 -64.43651,0 -116.672625,-52.23611 -116.672625,-116.67263 0,-64.43651 52.236115,-116.67262 116.672625,-116.67262 64.43651,0 116.67262,52.23611 116.67262,116.67262 z"
+         sodipodi:ry="116.67262"
+         sodipodi:rx="116.67262"
+         sodipodi:cy="459.90771"
+         sodipodi:cx="188.39345"
+         id="path5076"
+         style="fill:#000000;fill-opacity:1;stroke:none"
+         sodipodi:type="arc" />
+      <path
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/Users/paul/Desktop/logo.png"
+         sodipodi:nodetypes="scccscccscccscccs"
+         inkscape:connector-curvature="0"
+         id="path5063"
+         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:#ffaf27;fill-opacity:1;stroke:none" />
+      <path
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/Users/paul/Desktop/logo.png"
+         inkscape:transform-center-x="6.4579251"
+         sodipodi:nodetypes="sssccsssccs"
+         inkscape:connector-curvature="0"
+         id="path4264"
+         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"
+         style="fill:#ff0000;fill-opacity:1;stroke:#ffffff;stroke-width:1.0655036;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         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"
+         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="path3780"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="scccscccscccscccs"
+         inkscape:export-filename="/Users/paul/Desktop/logo.png"
+         inkscape:export-xdpi="90"
+         inkscape:export-ydpi="90" />
+      <path
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/Users/paul/Desktop/logo.png"
+         sodipodi:nodetypes="ccccc"
+         inkscape:connector-curvature="0"
+         id="path6630"
+         d="m 76.745851,559.32102 0.07958,15.64723 15.583209,-0.14361 -0.07958,-15.45512 z"
+         style="fill:none;stroke:#a0a0a0;stroke-width:1.08700001;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/Users/paul/Desktop/logo.png"
+         inkscape:connector-curvature="0"
+         id="path4796"
+         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"
+         style="fill:#ff0000;fill-opacity:1;stroke:#ffffff;stroke-width:1.0655036;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         transform="matrix(-0.25240968,-0.42008026,0.4200804,-0.25240977,-60.11205,762.43008)"
+         d="m 305.06607,459.90771 c 0,64.43652 -52.23611,116.67263 -116.67262,116.67263 -64.43651,0 -116.672625,-52.23611 -116.672625,-116.67263 0,-64.43651 52.236115,-116.67262 116.672625,-116.67262 64.43651,0 116.67262,52.23611 116.67262,116.67262 z"
+         sodipodi:ry="116.67262"
+         sodipodi:rx="116.67262"
+         sodipodi:cy="459.90771"
+         sodipodi:cx="188.39345"
+         id="path5082"
+         style="opacity:0.9;fill:url(#linearGradient3036);fill-opacity:1;stroke:none"
+         sodipodi:type="arc"
+         inkscape:export-filename="/Users/paul/Desktop/logo.png"
+         inkscape:export-xdpi="90"
+         inkscape:export-ydpi="90" />
+    </g>
+  </g>
+</svg>
--- a/artsrc/modchooser/chrome.svg
+++ b/artsrc/modchooser/chrome.svg
@@ -0,0 +1,576 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   width="1024"
+   height="1024"
+   id="svg2"
+   style="enable-background:new"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="chrome.svg"
+   inkscape:export-filename="/Users/paul/src/OpenRA/mods/modchooser/chrome.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1400"
+     inkscape:window-height="935"
+     id="namedview39"
+     showgrid="false"
+     inkscape:zoom="5.0312499"
+     inkscape:cx="66.679329"
+     inkscape:cy="477.38407"
+     inkscape:window-x="96"
+     inkscape:window-y="35"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg2"
+     showguides="true"
+     inkscape:guide-bbox="true">
+    <sodipodi:guide
+       orientation="0,1"
+       position="0,512"
+       id="guide3015" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="384,0"
+       id="guide3853" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="404,554.58255"
+       id="guide3857" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="424,504.14908"
+       id="guide3859" />
+  </sodipodi:namedview>
+  <defs
+     id="defs4">
+    <marker
+       refX="0"
+       refY="0"
+       orient="auto"
+       id="Arrow1Lend"
+       style="overflow:visible">
+      <path
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
+         transform="matrix(-0.8,0,0,-0.8,-10,0)"
+         id="path4339"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       refX="0"
+       refY="0"
+       orient="auto"
+       id="TriangleOutL"
+       style="overflow:visible">
+      <path
+         d="m 5.77,0 -8.65,5 0,-10 8.65,5 z"
+         transform="scale(0.8,0.8)"
+         id="path4479"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <filter
+       x="0"
+       y="0"
+       width="1"
+       height="1"
+       color-interpolation-filters="sRGB"
+       id="filter3186">
+      <feTurbulence
+         result="fbSourceGraphic"
+         seed="406"
+         numOctaves="10"
+         baseFrequency="0.40000000000000002"
+         type="fractalNoise"
+         id="feTurbulence3188" />
+      <feColorMatrix
+         id="feColorMatrix3980"
+         values="0 0 0 -1 0 0 0 0 -1 0 0 0 0 -1 0 0 0 0 1 0"
+         in="fbSourceGraphic"
+         result="fbSourceGraphicAlpha" />
+      <feColorMatrix
+         in="fbSourceGraphic"
+         values="0"
+         type="saturate"
+         id="feColorMatrix3982" />
+    </filter>
+    <filter
+       color-interpolation-filters="sRGB"
+       id="filter4024">
+      <feBlend
+         in2="BackgroundImage"
+         mode="multiply"
+         id="feBlend4026" />
+    </filter>
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient3799"
+       id="linearGradient3932"
+       y2="236.97458"
+       x2="173.77965"
+       y1="128.49998"
+       x1="118.38983" />
+    <linearGradient
+       spreadMethod="pad"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient3777"
+       id="linearGradient3924"
+       y2="92.378876"
+       x2="89.046608"
+       y1="69.056839"
+       x1="65.91964" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient3799"
+       id="linearGradient3887"
+       y2="128.5"
+       x2="279"
+       y1="128.5"
+       x1="-21" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient3799"
+       id="linearGradient3885"
+       y2="128.5"
+       x2="279"
+       y1="128.5"
+       x1="-21" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient3799"
+       id="linearGradient3880"
+       y2="128.5"
+       x2="279"
+       y1="128.5"
+       x1="-21" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient3799"
+       id="linearGradient3878"
+       y2="128.5"
+       x2="279"
+       y1="128.5"
+       x1="-21" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient3799"
+       id="linearGradient3876"
+       y2="128.5"
+       x2="279"
+       y1="128.5"
+       x1="-21" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient3799"
+       id="linearGradient3870"
+       y2="128.5"
+       x2="279"
+       y1="128.5"
+       x1="-21" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient3799"
+       id="linearGradient3868"
+       y2="128.5"
+       x2="279"
+       y1="128.5"
+       x1="-21" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient3799"
+       id="linearGradient3866"
+       y2="128.5"
+       x2="279"
+       y1="128.5"
+       x1="-21" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient3777"
+       id="linearGradient3864"
+       y2="126"
+       x2="225"
+       y1="126"
+       x1="16" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient3777"
+       id="linearGradient3862"
+       y2="126"
+       x2="225"
+       y1="126"
+       x1="16" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient3777"
+       id="linearGradient3856"
+       y2="126"
+       x2="225"
+       y1="126"
+       x1="16" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient3777"
+       id="linearGradient3854"
+       y2="126"
+       x2="225"
+       y1="126"
+       x1="16" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient3777"
+       id="linearGradient3852"
+       y2="126"
+       x2="225"
+       y1="126"
+       x1="16" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient3777"
+       id="linearGradient3845"
+       y2="126"
+       x2="225"
+       y1="126"
+       x1="16" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient3777"
+       id="linearGradient3843"
+       y2="126"
+       x2="225"
+       y1="126"
+       x1="16" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient3777"
+       id="linearGradient3841"
+       y2="126"
+       x2="225"
+       y1="126"
+       x1="16" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient3777"
+       id="linearGradient3839"
+       y2="126"
+       x2="225"
+       y1="126"
+       x1="16" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient3777"
+       id="linearGradient3837"
+       y2="126"
+       x2="225"
+       y1="126"
+       x1="16" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient3777"
+       id="linearGradient3835"
+       y2="126"
+       x2="225"
+       y1="126"
+       x1="16" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient3777"
+       id="linearGradient3833"
+       y2="126"
+       x2="225"
+       y1="126"
+       x1="16" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient3799"
+       id="linearGradient3805"
+       y2="128.5"
+       x2="279"
+       y1="128.5"
+       x1="-21" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient3777"
+       id="linearGradient3797"
+       y2="126"
+       x2="225"
+       y1="126"
+       x1="16" />
+    <linearGradient
+       id="linearGradient3761">
+      <stop
+         offset="0"
+         style="stop-color:#ffd300;stop-opacity:1"
+         id="stop3763" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3767">
+      <stop
+         offset="0"
+         style="stop-color:#000000;stop-opacity:1"
+         id="stop3769" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3777">
+      <stop
+         offset="0"
+         style="stop-color:#ffd300;stop-opacity:1"
+         id="stop3779" />
+      <stop
+         offset="1"
+         style="stop-color:#a07100;stop-opacity:1"
+         id="stop3781" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3799">
+      <stop
+         offset="0"
+         style="stop-color:#ff0000;stop-opacity:1"
+         id="stop3801" />
+      <stop
+         offset="1"
+         style="stop-color:#440000;stop-opacity:1"
+         id="stop3803" />
+    </linearGradient>
+  </defs>
+  <metadata
+     id="metadata7">
+    <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 />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="translate(2.5597095e-5,-572.35676)"
+     id="layer1">
+    <rect
+       width="1072.9114"
+       height="539.86554"
+       x="-27.317541"
+       y="538.92322"
+       id="rect4484"
+       style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none" />
+    <g
+       transform="matrix(0.64,0,0,0.64,770.43938,648.69103)"
+       id="g3833">
+      <path
+         d="m 199.6875,27.8125 -33.5625,87.5625 -94.5,4.75 72.93661,59.07642 -26.33831,91.62977 80.3079,-53.14369 79.13296,54.18566 -24.78921,-92.93566 72.94546,-58.97487 -94.08631,-3.18561 z"
+         transform="translate(-2.5597095e-5,302.3739)"
+         id="path3835"
+         style="fill:#140100;fill-opacity:1;stroke:#280800;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m 189.53125,81.0625 c 0.34734,0.01204 0.79593,0.09471 1.34375,0.25 5.1671,1.46475 20.52909,9.326818 28.6875,14.46875 16.59312,10.458 27.17092,24.66662 33.25,43.03125 2.73059,8.24897 3.16363,10.94856 3.21875,20.5 0.0717,12.43038 -1.53411,19.2214 -6.25,26.5 l -2.9375,4.5 L 251.375,195 c 2.58718,2.67866 4.27611,5.26153 3.96875,6.0625 -5.10182,5.86493 -9.74586,9.63288 -15.8125,15.0625 l -7.90625,-7.6875 -3.75,1.8125 c -11.84475,5.70905 -23.1196,7.5235 -35.25,5.65625 -10.84898,-1.67001 -18.4348,-5.578 -27.53125,-14.21875 l -7.71875,-7.375 -2.625,3.5 c -4.94212,6.59036 -14.31451,15.86657 -17.625,17.4375 -4.36236,2.07007 -5.73234,1.98326 -8.96875,-0.5625 -6.38696,-5.02399 -5.37308,-12.08824 2.78125,-19.53125 2.91421,-2.66 7.87262,-6.14067 11,-7.71875 3.36287,-1.6969 5.69994,-3.53553 5.71875,-4.5 0.0584,-2.99259 2.55867,-5.12338 6.0625,-5.15625 1.86437,-0.0175 4.27613,-0.6925 5.34375,-1.5 3.10966,-2.35203 4.36896,-1.81868 11.53125,4.8125 9.73682,9.01482 15.98477,12.21324 23.53125,12.0625 5.67441,-0.11334 16.76852,-3.23727 18.8125,-5.28125 -10.88942,-15.02108 -20.52657,-24.07141 -34.5,-39.125 l -6.46875,6.03125 c -3.54367,3.31494 -7.71875,6.03125 -7.71875,6.03125 L 146.625,143 c 0,0 6.86249,-7.34874 15.25,-15.03125 L 177.125,114 l 13.28125,-0.71875 c 11.94007,-0.64289 12.89107,-1.19122 14.65625,0.40625 1.08027,0.97763 2.5625,3.17049 2.5625,4.0625 0,0.892 -3.12611,4.71781 -6.9375,8.5 l -6.9375,6.875 c 12.56431,11.49811 22.83688,25.90148 36,36.6875 1.13748,0.018 3.87573,-6.77681 5,-12.375 3.61054,-17.97819 -10.08878,-41.93607 -38.3125,-66.96875 -6.8919,-6.112689 -9.33761,-9.490512 -6.90625,-9.40625 z"
+         transform="translate(-2.5597095e-5,302.3739)"
+         id="path3837"
+         style="fill:#000000;fill-opacity:1;stroke:#280800;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
+    </g>
+    <g
+       transform="matrix(0.64,0,0,0.64,1.1593663,394.50122)"
+       id="g4558">
+      <path
+         d="m 199.6875,27.8125 -33.5625,87.5625 -94.5,4.75 72.93661,59.07642 -26.33831,91.62977 80.3079,-53.14369 79.13296,54.18566 -24.78921,-92.93566 72.94546,-58.97487 -94.08631,-3.18561 z"
+         transform="translate(-2.5597095e-5,302.3739)"
+         id="path4554"
+         style="fill:#140100;fill-opacity:1;stroke:#280800;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m 189.53125,81.0625 c 0.34734,0.01204 0.79593,0.09471 1.34375,0.25 5.1671,1.46475 20.52909,9.326818 28.6875,14.46875 16.59312,10.458 27.17092,24.66662 33.25,43.03125 2.73059,8.24897 3.16363,10.94856 3.21875,20.5 0.0717,12.43038 -1.53411,19.2214 -6.25,26.5 l -2.9375,4.5 L 251.375,195 c 2.58718,2.67866 4.27611,5.26153 3.96875,6.0625 -5.10182,5.86493 -9.74586,9.63288 -15.8125,15.0625 l -7.90625,-7.6875 -3.75,1.8125 c -11.84475,5.70905 -23.1196,7.5235 -35.25,5.65625 -10.84898,-1.67001 -18.4348,-5.578 -27.53125,-14.21875 l -7.71875,-7.375 -2.625,3.5 c -4.94212,6.59036 -14.31451,15.86657 -17.625,17.4375 -4.36236,2.07007 -5.73234,1.98326 -8.96875,-0.5625 -6.38696,-5.02399 -5.37308,-12.08824 2.78125,-19.53125 2.91421,-2.66 7.87262,-6.14067 11,-7.71875 3.36287,-1.6969 5.69994,-3.53553 5.71875,-4.5 0.0584,-2.99259 2.55867,-5.12338 6.0625,-5.15625 1.86437,-0.0175 4.27613,-0.6925 5.34375,-1.5 3.10966,-2.35203 4.36896,-1.81868 11.53125,4.8125 9.73682,9.01482 15.98477,12.21324 23.53125,12.0625 5.67441,-0.11334 16.76852,-3.23727 18.8125,-5.28125 -10.88942,-15.02108 -20.52657,-24.07141 -34.5,-39.125 l -6.46875,6.03125 c -3.54367,3.31494 -7.71875,6.03125 -7.71875,6.03125 L 146.625,143 c 0,0 6.86249,-7.34874 15.25,-15.03125 L 177.125,114 l 13.28125,-0.71875 c 11.94007,-0.64289 12.89107,-1.19122 14.65625,0.40625 1.08027,0.97763 2.5625,3.17049 2.5625,4.0625 0,0.892 -3.12611,4.71781 -6.9375,8.5 l -6.9375,6.875 c 12.56431,11.49811 22.83688,25.90148 36,36.6875 1.13748,0.018 3.87573,-6.77681 5,-12.375 3.61054,-17.97819 -10.08878,-41.93607 -38.3125,-66.96875 -6.8919,-6.112689 -9.33761,-9.490512 -6.90625,-9.40625 z"
+         transform="translate(-2.5597095e-5,302.3739)"
+         id="path4173"
+         style="fill:#000000;fill-opacity:1;stroke:#280800;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
+    </g>
+    <g
+       transform="matrix(0.64,0,0,0.64,-2.6806337,396.42122)"
+       id="g4510">
+      <path
+         d="m 568.68993,915.392 6.51287,-8.4863 8.99845,-7.7667 10.22953,-4.7609 7.15606,0.1958 7.31397,11.5478 3.11492,-1.9865 3.26388,-12.5467 3.92395,-7.1343 6.46556,-6.5096 8.71745,-4.6004 8.49526,9.2703 2.9461,-3.2706 -5.49468,-13.9457 -0.0889,-14.6749 1.47336,-1.4111 11.04088,-0.2141 0.31753,-4.5583 -16.70733,-9.6014 -6.79621,-10.5948 8.04326,-7.9626 -0.21448,-1.9865 -3.86433,2.3342 -19.82227,0 -9.62796,-6.2906 2.0794,-7.3573 -1.98431,-0.5282 -15.25207,14.467 -9.4449,0.1974 -2.05281,-6.398 -3.16163,1.395 -1.05273,13.7283 -8.69688,9.2238 -0.0787,3.4142 5.38033,3.3109 1.98222,11.2569 4.53081,9.9325 0,11.2569 -8.49526,9.6014 4.83116,-10.5251 -0.38329,-9.7683 -6.44432,-7.4379 -6.04975,-1.4444 -7.24527,-6.2504 -0.4834,-7.3975 1.85776,-4.9844 -0.54536,-7.3296 4.10228,-13.5508 8.66114,-6.799 -0.56636,-9.6015 14.44193,-8.6082 17.2737,0.6622 10.26057,-2.7858 11.7098,1.3478 16.82463,12.6949 12.26538,4.0367 10.44313,12.2335 3.79226,8.4074 0.24923,10.8219 6.31279,10.1902 -0.26599,13.3604 -9.04443,19.5708 -3.66705,13.7518 -19.17888,14.3973 -19.40166,7.849 -9.46208,8.0597 -13.66945,4.1268 -16.70734,0.331 z"
+         id="path3093"
+         style="fill:#140100;fill-opacity:1;stroke:#280300;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m 634.81181,767.27097 74.88793,120.13333 -31.23668,44.6818 -145.77116,0 -31.23668,-44.6818 74.88793,-120.13333 z m 7.60893,-14.04674 -73.68652,0 -83.29781,134.18007 40.04702,58.7286 160.1881,0 40.04702,-58.7286 z"
+         id="path5446"
+         style="fill:#140100;fill-opacity:1;stroke:#280300;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
+    </g>
+    <path
+       d="m 107.948,917.6111 -10.584094,0.50104 -19.61031,-4.34328 c 1.39408,-2.58687 2.95535,-5.02726 4.68071,-7.29897 z m 15.35505,-7.84955 -6.11423,0.18557 -27.131644,-11.85126 c 1.16953,-1.05737 2.3773,-2.06279 3.57756,-3.05016 z m -21.07269,83.98408 C 78.413966,981.3558 66.657146,954.87102 71.833756,929.7397 l 35.905804,24.37307 7.2259,15.77333 6.85535,3.71136 1.66752,7.60829 -2.03808,3.34019 3.89088,10.76302 0.18527,-9.27846 12.96957,0.18559 9.26398,8.3506 -7.96703,-13.54652 -9.63453,-0.18559 -6.11423,-24.86619 28.53306,6.68049 3.33503,9.27843 -9.81982,1.85573 13.71069,0.18559 8.70815,-12.24757 -6.67007,-12.80457 -21.86299,-12.98978 27.97721,-12.80423 -66.54794,-33.02035 c 16.48524,-8.95421 36.94589,-9.79045 54.82616,-0.48872 28.58218,14.86913 39.81786,50.05979 25.06806,78.94516 -14.99744,28.9201 -50.36089,40.12283 -79.07134,25.18706 z m -3.007274,5.79874 c -31.90805,-16.59925 -44.33918,-55.96294 -27.76571,-87.92074 16.57346,-31.95781 55.875494,-44.40832 87.783544,-27.80902 31.76551,16.52516 44.25256,55.63515 27.85999,87.73763 -16.66775,32.14106 -55.96978,44.59146 -87.877824,27.99213 z"
+       id="path6111"
+       style="fill:#141200;fill-opacity:1;fill-rule:evenodd;stroke:#282400;stroke-width:1.27999997;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       inkscape:connector-curvature="0" />
+    <g
+       transform="scale(1.0152588,0.98497054)"
+       id="text3979"
+       style="font-size:17.91491699px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans Bold" />
+    <g
+       transform="matrix(0.64,0,0,0.64,2.6483062,398.40997)"
+       id="g4506">
+      <path
+         d="m 521.01615,374.4706 54.27731,25.47173 5.19338,-15.25003 16.63639,-8.96736 19.11204,8.58227 3.48792,12.70834 -5.86454,0.69319 0.92424,2.2556 59.63574,-25.41671 11.49803,8.95636 -86.79918,137.63533 0.0845,-33.63633 52.92478,-77.504 -3.73651,-0.041 -49.89277,72.19005 0.76701,-35.88047 24.08969,-29.52386 -52.06574,0 24.90309,29.5208 -0.0651,35.97733 -50.14623,-72.77105 -3.95946,0.088 c 0,0 36.04235,51.90588 54.09731,78.00138 l -0.0151,33.66745 -87.39876,-137.73472 12.31224,-9.02239 z"
+         id="rect4387"
+         style="fill:#000914;fill-opacity:1;fill-rule:evenodd;stroke:#001328;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m 726.00001,357.70974 -254.93728,0.24205 126.34633,202.54146 128.59095,-202.78351 z m -232.16128,12.81838 209.1322,0 L 597.53009,536.34188 493.83873,370.52812 z"
+         id="path4372"
+         style="fill:#000914;fill-opacity:1;stroke:#001328;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
+    </g>
+    <path
+       d="m 876.60758,661.01619 -10.5841,0.50104 -19.6103,-4.34329 c 1.3941,-2.58686 2.9554,-5.02725 4.6807,-7.29896 z m 15.35506,-7.84955 -6.1142,0.18557 -27.13166,-11.85126 c 1.1696,-1.05737 2.3773,-2.06279 3.5776,-3.05016 z m -21.07266,83.98408 c -23.8164,-12.38983 -35.5732,-38.87461 -30.3966,-64.00593 l 35.9058,24.37306 7.2259,15.77334 6.85536,3.71136 1.6675,7.60829 -2.0381,3.34019 3.8908,10.76302 0.1853,-9.27846 12.9696,0.18559 9.264,8.35059 -7.967,-13.54651 -9.6346,-0.18559 -6.1142,-24.86619 28.533,6.68048 3.3351,9.27844 -9.8199,1.85573 13.7107,0.18558 8.7082,-12.24756 -6.6701,-12.80457 -21.863,-12.98978 27.9773,-12.80423 -66.54796,-33.02035 c 16.48516,-8.95421 36.94586,-9.79045 54.82616,-0.48872 28.5821,14.86913 39.8178,50.05979 25.068,78.94516 -14.9974,28.92005 -50.3609,40.1228 -79.07126,25.18706 z m -3.0073,5.79878 c -31.908,-16.59929 -44.3391,-55.96298 -27.7657,-87.92078 16.5735,-31.95782 55.87546,-44.40832 87.78356,-27.80902 31.7655,16.52516 44.2525,55.63515 27.8599,87.73763 -16.6677,32.14104 -55.9698,44.5914 -87.87776,27.99217 z"
+       id="path4514"
+       style="fill:#141200;fill-opacity:1;fill-rule:evenodd;stroke:#282400;stroke-width:1.27999997;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       inkscape:connector-curvature="0" />
+    <g
+       transform="matrix(0.64,0,0,0.64,254.36682,139.37376)"
+       id="g4516">
+      <path
+         d="m 568.68993,915.392 6.51287,-8.4863 8.99845,-7.7667 10.22953,-4.7609 7.15606,0.1958 7.31397,11.5478 3.11492,-1.9865 3.26388,-12.5467 3.92395,-7.1343 6.46556,-6.5096 8.71745,-4.6004 8.49526,9.2703 2.9461,-3.2706 -5.49468,-13.9457 -0.0889,-14.6749 1.47336,-1.4111 11.04088,-0.2141 0.31753,-4.5583 -16.70733,-9.6014 -6.79621,-10.5948 8.04326,-7.9626 -0.21448,-1.9865 -3.86433,2.3342 -19.82227,0 -9.62796,-6.2906 2.0794,-7.3573 -1.98431,-0.5282 -15.25207,14.467 -9.4449,0.1974 -2.05281,-6.398 -3.16163,1.395 -1.05273,13.7283 -8.69688,9.2238 -0.0787,3.4142 5.38033,3.3109 1.98222,11.2569 4.53081,9.9325 0,11.2569 -8.49526,9.6014 4.83116,-10.5251 -0.38329,-9.7683 -6.44432,-7.4379 -6.04975,-1.4444 -7.24527,-6.2504 -0.4834,-7.3975 1.85776,-4.9844 -0.54536,-7.3296 4.10228,-13.5508 8.66114,-6.799 -0.56636,-9.6015 14.44193,-8.6082 17.2737,0.6622 10.26057,-2.7858 11.7098,1.3478 16.82463,12.6949 12.26538,4.0367 10.44313,12.2335 3.79226,8.4074 0.24923,10.8219 6.31279,10.1902 -0.26599,13.3604 -9.04443,19.5708 -3.66705,13.7518 -19.17888,14.3973 -19.40166,7.849 -9.46208,8.0597 -13.66945,4.1268 -16.70734,0.331 z"
+         id="path4518"
+         style="fill:#140100;fill-opacity:1;stroke:#280300;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m 634.81181,767.27097 74.88793,120.13333 -31.23668,44.6818 -145.77116,0 -31.23668,-44.6818 74.88793,-120.13333 z m 7.60893,-14.04674 -73.68652,0 -83.29781,134.18007 40.04702,58.7286 160.1881,0 40.04702,-58.7286 z"
+         id="path4520"
+         style="fill:#140100;fill-opacity:1;stroke:#280300;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
+    </g>
+    <g
+       transform="matrix(0.64,0,0,0.64,258.84557,655.08253)"
+       id="g4522">
+      <path
+         d="m 521.01615,374.4706 54.27731,25.47173 5.19338,-15.25003 16.63639,-8.96736 19.11204,8.58227 3.48792,12.70834 -5.86454,0.69319 0.92424,2.2556 59.63574,-25.41671 11.49803,8.95636 -86.79918,137.63533 0.0845,-33.63633 52.92478,-77.504 -3.73651,-0.041 -49.89277,72.19005 0.76701,-35.88047 24.08969,-29.52386 -52.06574,0 24.90309,29.5208 -0.0651,35.97733 -50.14623,-72.77105 -3.95946,0.088 c 0,0 36.04235,51.90588 54.09731,78.00138 l -0.0151,33.66745 -87.39876,-137.73472 12.31224,-9.02239 z"
+         id="path4524"
+         style="fill:#000914;fill-opacity:1;fill-rule:evenodd;stroke:#001328;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m 726.00001,357.70974 -254.93728,0.24205 126.34633,202.54146 128.59095,-202.78351 z m -232.16128,12.81838 209.1322,0 L 597.53009,536.34188 493.83873,370.52812 z"
+         id="path4526"
+         style="fill:#000914;fill-opacity:1;stroke:#001328;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
+    </g>
+  </g>
+  <g
+     transform="translate(2.5597095e-5,511.9872)"
+     id="layer3"
+     style="opacity:0.2;display:inline;filter:url(#filter4024)" />
+  <rect
+     style="fill:#272d2c;fill-opacity:1;stroke:#650b03;stroke-width:2.89014864;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+     id="rect3017"
+     width="61.109852"
+     height="61.109852"
+     x="1.4450743"
+     y="513.44507" />
+  <rect
+     y="513.44507"
+     x="65.445076"
+     height="61.109852"
+     width="61.109852"
+     id="rect3799"
+     style="fill:#393c2a;fill-opacity:0.40000001;stroke:#650b03;stroke-width:2.89014864000000005;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+  <g
+     id="g3996"
+     transform="translate(-1.3050848,572.77667)">
+    <polygon
+       style="fill:url(#linearGradient3932);fill-opacity:1;stroke:#000000;stroke-width:8;stroke-miterlimit:10"
+       id="polygon11"
+       transform="matrix(0.5,0,0,0.5,-0.19491524,0.3898305)"
+       points="100.333,100.333 130.5,19.333 158,100.333 243,102.667 175.819,154.676 199.667,237.667 129.5,188.333 57.667,237.667 82.667,154 15,102.333 " />
+    <path
+       style="fill:url(#linearGradient3924);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2.20000005;stroke-miterlimit:10;stroke-dasharray:none"
+       id="path3813"
+       d="m 37.638585,60.889831 c -0.1665,0.8335 8.555,9.8815 9.3335,9.6665 0.43,-0.1185 7,-6.1665 7,-6.1665 l 17.1665,18.5 c 0,0 -4.6665,2.6665 -9.6665,2.1665 -5,-0.5 -7.95,-2.5445 -13.6665,-8.833 -1.667,-1.8335 -4.167,1.1665 -4.167,1.1665 l -3,-0.1665 c 0,0 -3.6665,1.333 -2.5,3.6665 0.707,1.414 -17.2395,7.364499 -10.3335,15.3335 6.5,7.499999 14.6665,-8 15.8335,-8.8335 1.167,-0.8335 10.6665,18.999999 37.1665,7 0,0 3.6425,3.798 4,3.826499 0.519,0.042 9.5,-7.951499 9.5,-8.659999 0,-0.604 -5,-5.333 -5,-5.333 0,0 11.999995,-14.167 -1.573,-34.645001 -0.9945,-1.500499 -6.1265,-8.296999 -13.031,-12.773499 -4.0045,-2.596 -9.095,-5.647501 -16.896,-8.248501 -2.5,-0.8335 2.992,3.7 9.033,9.798501 3.533,3.567 6.7525,7.9 8.967,10.868 7.8335,10.5 6.8235,20.2185 3.8335,24.999999 0,0 -8.916,-9.575 -17,-18.3335 0,0 7.4165,-7.3335 7,-7.8335 -1.307,-1.5695 -1.1715,-1.673 -2.667,-2.6665 0,0 -1.793,0.558 -4.5125,0.661 -3.838,0.1455 -9.0255,-0.118499 -9.3205,0.172 -1.0025,0.988 -15.25,13.417501 -15.5,14.667501 z"
+       inkscape:connector-curvature="0" />
+  </g>
+  <flowRoot
+     xml:space="preserve"
+     id="flowRoot4002"
+     style="fill:black;stroke:none;stroke-opacity:1;stroke-width:1px;stroke-linejoin:miter;stroke-linecap:butt;fill-opacity:1;font-family:Cambria;font-style:normal;font-weight:normal;font-size:40px;line-height:125%;letter-spacing:0px;word-spacing:0px;-inkscape-font-specification:Cambria"><flowRegion
+       id="flowRegion4004"><rect
+         id="rect4006"
+         width="409.82327"
+         height="108.49917"
+         x="156.84595"
+         y="616.98755"
+         style="-inkscape-font-specification:Cambria;font-family:Cambria" /></flowRegion><flowPara
+       id="flowPara4008" /></flowRoot>  <text
+     xml:space="preserve"
+     style="font-size:32px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:125%;letter-spacing:-1px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Georgia;-inkscape-font-specification:Georgia Bold"
+     x="125.89062"
+     y="649.0625"
+     id="text4010"
+     sodipodi:linespacing="125%"><tspan
+       sodipodi:role="line"
+       id="tspan4012"
+       x="125.89062"
+       y="649.0625">OpenRA</tspan></text>
+  <rect
+     y="512"
+     x="128"
+     height="64"
+     width="64"
+     id="rect4189"
+     style="fill:#272d2c;fill-opacity:1;stroke:none"
+     ry="10" />
+  <rect
+     ry="10"
+     style="fill:#88888c;fill-opacity:1;stroke:none"
+     id="rect4191"
+     width="64"
+     height="64"
+     x="192"
+     y="512" />
+  <rect
+     y="513.43286"
+     x="257.43283"
+     height="61.134327"
+     width="61.134331"
+     id="rect4193"
+     style="fill:#272d2c;fill-opacity:1;stroke:#650b03;stroke-width:2.86567163;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+     ry="9.5522385" />
+  <rect
+     ry="9.5522385"
+     style="fill:#88888c;fill-opacity:1;stroke:#650b03;stroke-width:2.86567163000000003;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+     id="rect4197"
+     width="61.134331"
+     height="61.134327"
+     x="321.43283"
+     y="513.43286" />
+  <path
+     style="fill:none;stroke:#ffffff;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+     d="m 396.4102,520 -5.6068,24 5.6068,24"
+     id="path3071"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="ccc" />
+  <path
+     sodipodi:nodetypes="ccc"
+     inkscape:connector-curvature="0"
+     id="path3855"
+     d="M 411.58951,520.00006 417.19649,544 l -5.60698,23.99994"
+     style="fill:none;stroke:#ffffff;stroke-width:4.00005674;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+</svg>
--- a/mods/cnc/chrome/install.yaml
+++ b/mods/cnc/chrome/install.yaml
@@ -63,17 +63,11 @@ Container@INSTALL_PANEL:
 					WordWrap:true
 					Text:OpenRA can download these files (excluding music and videos) from the internet, or you can install from the original C&C CDs.
 					Font:Bold
-		Button@QUIT_BUTTON:
+		Button@BACK_BUTTON:
 			Y:149
 			Width:140
 			Height:35
-			Text:Quit
-		Button@MODS_BUTTON:
-			X:150
-			Y:149
-			Width:140
-			Height:35
-			Text:Change Mod
+			Text:Back
 		Button@DOWNLOAD_BUTTON:
 			X:350
 			Y:149
--- a/mods/cnc/chrome/mainmenu.yaml
+++ b/mods/cnc/chrome/mainmenu.yaml
@@ -86,24 +86,24 @@ Container@MENU_BACKGROUND:
 							Width:140
 							Height:35
 							Text:Multiplayer
-						Button@MODS_BUTTON:
-							X:300
-							Y:0
-							Width:140
-							Height:35
-							Text:Mods
 						Button@SETTINGS_BUTTON:
-							X:450
+							X:300
 							Y:0
 							Width:140
 							Height:35
 							Text:Settings
 						Button@EXTRAS_BUTTON:
-							X:600
+							X:450
 							Y:0
 							Width:140
 							Height:35
 							Text:Extras
+						Button@MODS_BUTTON:
+							X:600
+							Y:0
+							Width:140
+							Height:35
+							Text:Mods
 						Button@QUIT_BUTTON:
 							X:750
 							Y:0
--- a/mods/cnc/chrome/modchooser.yaml
+++ b/mods/cnc/chrome/modchooser.yaml
@@ -1,88 +0,0 @@
-Container@MODS_PANEL:
-	Logic:ModBrowserLogic
-	X:(WINDOW_RIGHT - WIDTH)/2
-	Y:(WINDOW_BOTTOM - 500)/2
-	Width:740
-	Height:535
-	Children:
-		Label@TITLE:
-			Text:Select Mod
-			Width:740
-			Y:0-25
-			Font:BigBold
-			Contrast:true
-			Align:Center
-		Background@bg:
-			Width:740
-			Height:500
-			Background:panel-black
-			Children:
-				ScrollPanel@MOD_LIST:
-					X:15
-					Y:30
-					Width:710
-					Height:455
-					Children:
-						ScrollItem@MOD_TEMPLATE:
-							Width:PARENT_RIGHT-27
-							Height:25
-							X:2
-							Y:0
-							Visible:false
-							Children:
-								Label@TITLE:
-									X:10
-									Width:200
-									Height:25								
-								Label@AUTHOR:
-									X:PARENT_RIGHT-300
-									Align:Center
-									Width:50
-									Height:25
-								Label@VERSION:
-									Width:140
-									X:PARENT_RIGHT-150
-									Align:Center
-									Height:25
-				Container@MOD_LABELS:
-					Width:710-25
-					Height:25
-					X:15
-					Y:5
-					Children:
-						Label@TITLE:
-							Width:125
-							Height:25
-							X:0
-							Y:0
-							Text:Title
-							Align:Center
-							Font:Bold
-						Label@AUTHOR:
-							X:PARENT_RIGHT-300
-							Align:Center
-							Width:50
-							Height:25
-							Text:Author
-							Font:Bold
-						Label@VERSION:
-							Width:140
-							X:PARENT_RIGHT-150
-							Align:Center
-							Height:25
-							Text:Version
-							Font:Bold
-		Button@BACK_BUTTON:
-			Key:escape
-			X:0
-			Y:499
-			Width:140
-			Height:35
-			Text:Back
-		Button@LOAD_BUTTON:
-			Key:return
-			X:600
-			Y:499
-			Width:140
-			Height:35
-			Text:Load Mod
--- a/mods/cnc/logo.png
+++ b/mods/cnc/logo.png
--- a/mods/cnc/mod.yaml
+++ b/mods/cnc/mod.yaml
@@ -1,8 +1,8 @@
 Metadata:
 	Title: Tiberian Dawn
-	Description: OpenRA Reimagining of the classic game
+	Description: Join the Global Defense Initiative or the Brotherhood of Nod in our\nrecreation of the classic game that started it all.\n\nTiberian Dawn modernizes the original Command & Conquer gameplay\nby introducing features from later games, including per-factory\nproduction queues, unit veterancy, and capturable tech structures.
 	Version: {DEV_VERSION}
-	Author: The OpenRA Developers
+	Author: the OpenRA Developers

 Folders:
 	.
@@ -90,7 +90,6 @@ ChromeLayout:
 	mods/cnc/chrome/ingame-chat.yaml
 	mods/cnc/chrome/ingamemenu.yaml
 	mods/cnc/chrome/music.yaml
-	mods/cnc/chrome/modchooser.yaml
 	mods/cnc/chrome/settings.yaml
 	mods/cnc/chrome/credits.yaml
 	mods/cnc/chrome/cheats.yaml
--- a/mods/cnc/preview.png
+++ b/mods/cnc/preview.png
--- a/mods/d2k/chrome/gameinit.yaml
+++ b/mods/d2k/chrome/gameinit.yaml
@@ -48,19 +48,12 @@ Background@INSTALL_PANEL:
 			Height:25
 			Text:From CD
 			Font:Bold
-		Button@MODS_BUTTON:
-			X:PARENT_RIGHT - 250
-			Y:PARENT_BOTTOM - 45
-			Width:110
-			Height:25
-			Text:Change Mod
-			Font:Bold
-		Button@QUIT_BUTTON:
+		Button@BACK_BUTTON:
 			X:PARENT_RIGHT - 130
 			Y:PARENT_BOTTOM - 45
 			Width:110
 			Height:25
-			Text:Quit
+			Text:Back
 			Font:Bold

 Background@INSTALL_DOWNLOAD_PANEL:
--- a/mods/d2k/chrome/mainmenu.yaml
+++ b/mods/d2k/chrome/mainmenu.yaml
@@ -39,27 +39,27 @@ Container@MAINMENU:
 							Height:30
 							Text:Multiplayer
 							Font:Bold
-						Button@MODS_BUTTON:
-							X:PARENT_RIGHT/2-WIDTH/2
-							Y:140
-							Width:140
-							Height:30
-							Text:Mods
-							Font:Bold
 						Button@SETTINGS_BUTTON:
 							X:PARENT_RIGHT/2-WIDTH/2
-							Y:180
+							Y:140
 							Width:140
 							Height:30
 							Text:Settings
 							Font:Bold
 						Button@EXTRAS_BUTTON:
 							X:PARENT_RIGHT/2-WIDTH/2
-							Y:220
+							Y:180
 							Width:140
 							Height:30
 							Text:Extras
 							Font:Bold
+						Button@MODS_BUTTON:
+							X:PARENT_RIGHT/2-WIDTH/2
+							Y:220
+							Width:140
+							Height:30
+							Text:Mods
+							Font:Bold
 						Button@QUIT_BUTTON:
 							X:PARENT_RIGHT/2-WIDTH/2
 							Y:260
--- a/mods/d2k/logo.png
+++ b/mods/d2k/logo.png
--- a/mods/d2k/mod.yaml
+++ b/mods/d2k/mod.yaml
@@ -1,8 +1,8 @@
 Metadata:
 	Title: Dune 2000
-	Description: OpenRA Reimagining of the classic game
+	Description: Three great houses fight for the precious spice, melange.\nHe who controls the spice controls the universe!\n\nOur work in progress Dune 2000 recreation brings modern\ngameplay improvements into the Dune universe.\n\nFuture versions of OpenRA will incorporate more of the missing\nunique features from this classic game.
 	Version: {DEV_VERSION}
-	Author: The OpenRA Developers
+	Author: the OpenRA Developers

 Folders:
 	.
@@ -80,7 +80,6 @@ ChromeLayout:
 	mods/ra/chrome/directconnect.yaml
 	mods/ra/chrome/replaybrowser.yaml
 	mods/d2k/chrome/dropdowns.yaml
-	mods/ra/chrome/modchooser.yaml
 	mods/ra/chrome/cheats.yaml
 	mods/ra/chrome/musicplayer.yaml
 	mods/d2k/chrome/tooltips.yaml
--- a/mods/d2k/preview.png
+++ b/mods/d2k/preview.png
--- a/mods/modchooser/chrome.png
+++ b/mods/modchooser/chrome.png
--- a/mods/modchooser/chrome.yaml
+++ b/mods/modchooser/chrome.yaml
@@ -0,0 +1,136 @@
+panel-header: chrome.png
+	background: 3,515,58,58
+	border-r: 61,515,3,58
+	border-l: 0,515,3,58
+	border-b: 3,573,58,3
+	border-t: 3,512,58,3
+	corner-tl: 0,512,3,3
+	corner-tr: 61,512,3,3
+	corner-bl: 0,573,3,3
+	corner-br: 61,573,3,3
+
+panel-bg: chrome.png
+	background: 67,515,58,58
+	border-r: 125,515,3,58
+	border-l: 64,515,3,58
+	border-b: 67,573,58,3
+	border-t: 67,512,58,3
+	corner-tl: 64,512,3,3
+	corner-tr: 125,512,3,3
+	corner-bl: 64,573,3,3
+	corner-br: 125,573,3,3
+
+panel-thinborder: chrome.png
+	background: 3,515,58,58
+	border-r: 61,515,2,58
+	border-l: 1,515,2,58
+	border-b: 3,573,58,2
+	border-t: 3,513,58,2
+	corner-tl: 1,513,2,2
+	corner-tr: 61,513,2,2
+	corner-bl: 1,573,2,2
+	corner-br: 61,573,2,2
+
+button: chrome.png
+	background: 138,522,44,44
+	border-r: 182,522,10,44
+	border-l: 128,522,10,44
+	border-b: 138,566,44,10
+	border-t: 138,512,44,10
+	corner-tl: 128,512,10,10
+	corner-tr: 182,512,10,10
+	corner-bl: 128,566,10,10
+	corner-br: 182,566,10,10
+
+button-hover: chrome.png
+	background: 202,522,44,44
+	border-r: 246,522,10,44
+	border-l: 192,522,10,44
+	border-b: 202,566,44,10
+	border-t: 202,512,44,10
+	corner-tl: 192,512,10,10
+	corner-tr: 246,512,10,10
+	corner-bl: 192,566,10,10
+	corner-br: 246,566,10,10
+
+# Copy of button
+button-disabled: chrome.png
+	background: 138,522,44,44
+	border-r: 182,522,10,44
+	border-l: 128,522,10,44
+	border-b: 138,566,44,10
+	border-t: 138,512,44,10
+	corner-tl: 128,512,10,10
+	corner-tr: 182,512,10,10
+	corner-bl: 128,566,10,10
+	corner-br: 182,566,10,10
+
+# Copy of button-highlighted-hover
+button-pressed: chrome.png
+	background: 330,522,44,44
+	border-r: 374,522,10,44
+	border-l: 320,522,10,44
+	border-b: 330,566,44,10
+	border-t: 330,512,44,10
+	corner-tl: 320,512,10,10
+	corner-tr: 374,512,10,10
+	corner-bl: 320,566,10,10
+	corner-br: 374,566,10,10
+
+button-highlighted: chrome.png
+	background: 266,522,44,44
+	border-r: 310,522,10,44
+	border-l: 256,522,10,44
+	border-b: 266,566,44,10
+	border-t: 266,512,44,10
+	corner-tl: 256,512,10,10
+	corner-tr: 310,512,10,10
+	corner-bl: 256,566,10,10
+	corner-br: 310,566,10,10
+
+button-highlighted-hover: chrome.png
+	background: 330,522,44,44
+	border-r: 374,522,10,44
+	border-l: 320,522,10,44
+	border-b: 330,566,44,10
+	border-t: 330,512,44,10
+	corner-tl: 320,512,10,10
+	corner-tr: 374,512,10,10
+	corner-bl: 320,566,10,10
+	corner-br: 374,566,10,10
+
+# Copy of button-mod-highlighted-hover
+button-highlighted-pressed: chrome.png
+	background: 330,522,44,44
+	border-r: 374,522,10,44
+	border-l: 320,522,10,44
+	border-b: 330,566,44,10
+	border-t: 330,512,44,10
+	corner-tl: 320,512,10,10
+	corner-tr: 374,512,10,10
+	corner-bl: 320,566,10,10
+	corner-br: 374,566,10,10
+
+
+# Copy of button-mod-highlighted
+button-highlighted-disabled: chrome.png
+	background: 266,522,44,44
+	border-r: 310,522,10,44
+	border-l: 256,522,10,44
+	border-b: 266,566,44,10
+	border-t: 266,512,44,10
+	corner-tl: 256,512,10,10
+	corner-tr: 310,512,10,10
+	corner-bl: 256,566,10,10
+	corner-br: 310,566,10,10
+
+panel-rule: chrome.png
+	border-t: 64,512,64,2
+
+background: chrome.png
+	background:0,0,1024,480
+
+modchooser: chrome.png
+	logo: 0,576,280,128
+	leftarrow:384,512,20,64
+	rightarrow:404,512,20,64
--- a/mods/modchooser/cursor.pal
+++ b/mods/modchooser/cursor.pal
--- a/mods/modchooser/cursor.shp
+++ b/mods/modchooser/cursor.shp
--- a/mods/modchooser/cursors.yaml
+++ b/mods/modchooser/cursors.yaml
@@ -0,0 +1,9 @@
+Palettes:
+	cursor: cursor.pal
+
+Cursors:
+	cursor.shp: cursor
+		default:
+			start:0
+			x: -4
+			y: -7
--- a/mods/modchooser/metrics.yaml
+++ b/mods/modchooser/metrics.yaml
@@ -0,0 +1,21 @@
+# General dumping-ground for UI element sizes, etc.
+
+Metrics:
+	ButtonDepth: 0
+	ButtonFont: Bold
+	ButtonTextColor: 255,255,255
+	ButtonTextColorDisabled: 128,128,128
+	ButtonTextContrast: false
+	ButtonTextContrastColor: 0,0,0
+	CheckboxPressedState: true
+	HotkeyFont: Regular
+	HotkeyColor: 255,255,255
+	HotkeyColorDisabled: 128,128,128
+	TextfieldFont: Regular
+	TextfieldColor: 255,255,255
+	TextfieldColorDisabled: 128,128,128
+	TextFont: Regular
+	TextColor: 255,255,255
+	TextContrast: false
+	TextContrastColor: 0,0,0
+	ColorPickerRemapIndices: 176, 178, 180, 182, 184, 186, 189, 191, 177, 179, 181, 183, 185, 187, 188, 190
--- a/mods/modchooser/mod.yaml
+++ b/mods/modchooser/mod.yaml
@@ -0,0 +1,51 @@
+Metadata:
+	Title: Mod Chooser
+	Version: {DEV_VERSION}
+	Author: The OpenRA Developers
+
+Folders:
+	.
+	./mods/modchooser
+
+
+Cursors:
+	mods/modchooser/cursors.yaml
+
+Chrome:
+	mods/modchooser/chrome.yaml
+
+Assemblies:
+	mods/ra/OpenRA.Mods.RA.dll
+
+ChromeLayout:
+	mods/modchooser/modchooser.yaml
+
+Notifications:
+	mods/modchooser/notifications.yaml
+
+LoadScreen: ModChooserLoadScreen
+
+ChromeMetrics:
+	mods/modchooser/metrics.yaml
+
+Fonts:
+	Regular:
+		Font:FreeSans.ttf
+		Size:14
+	Bold:
+		Font:FreeSansBold.ttf
+		Size:14
+	BigBold:
+		Font:FreeSansBold.ttf
+		Size:24
+	MediumBold:
+		Font:FreeSansBold.ttf
+		Size:18
+	Tiny:
+		Font:FreeSans.ttf
+		Size:10
+	TinyBold:
+		Font:FreeSansBold.ttf
+		Size:10
+Packages:
+LobbyDefaults:
--- a/mods/modchooser/modchooser.yaml
+++ b/mods/modchooser/modchooser.yaml
@@ -0,0 +1,160 @@
+Background@MODCHOOSER:
+	Logic:ModBrowserLogic
+	Background: background
+	Width:WINDOW_RIGHT
+	Height:WINDOW_BOTTOM
+	Children:
+		Container:
+			X:(WINDOW_RIGHT - WIDTH)/2
+			Y:(WINDOW_BOTTOM - 500)/2
+			Width:750
+			Height:550-4-32
+			Children:
+				Background@bg:
+					Y:69
+					Width:PARENT_RIGHT
+					Height:PARENT_BOTTOM - 69
+					Background:panel-bg
+					Children:
+						Label:
+							X:53
+							Y:30
+							Align:Left
+							Font:MediumBold
+							Text:Choose your Battlefield:
+						Container@MOD_LIST:
+							X:53
+							Y:60
+							Width:PARENT_RIGHT-106
+							Height:150
+							Children:
+								Button@MOD_TEMPLATE:
+									X:16
+									Width:114
+									Height:114
+									TooltipContainer:TOOLTIP_CONTAINER
+									IgnoreChildMouseOver:true
+									Children:
+										Container@MOD_NO_LOGO:
+											Width:PARENT_RIGHT
+											Height:PARENT_BOTTOM
+											Children:
+												Label@A:
+													Width:PARENT_RIGHT
+													Height:PARENT_BOTTOM-20
+													Text:Missing or
+													Align:center
+												Label@B:
+													Y:20
+													Width:PARENT_RIGHT
+													Height:PARENT_BOTTOM-20
+													Text:invalid logo
+													Align:center
+										RGBASprite@MOD_LOGO:
+											X:9
+											Y:9
+						Button@PREV_MOD:
+							X:15
+							Y:60+41-16
+							Width:25
+							Height:64
+							IgnoreChildMouseOver:true
+							Children:
+								Image:
+									X:2
+									ImageCollection:modchooser
+									ImageName:leftarrow
+						Button@NEXT_MOD:
+							X:PARENT_RIGHT - WIDTH - 20
+							Y:60+41-16
+							Width:25
+							Height:64
+							IgnoreChildMouseOver:true
+							Children:
+								Image:
+									X:3
+									ImageCollection:modchooser
+									ImageName:rightarrow
+						Background@RULE:
+							X:53
+							Y:PARENT_BOTTOM - 249
+							Width:PARENT_RIGHT-106
+							Height:150
+							Background:panel-rule
+						Label@MOD_TITLE:
+							X:PARENT_RIGHT - 53 - 140 - 170
+							Y:PARENT_BOTTOM-220
+							Align:Left
+							Font:Bold
+						Label@MOD_AUTHOR:
+							X:PARENT_RIGHT - 53 - 140 - 170
+							Y:PARENT_BOTTOM-205
+							Align:Left
+							Font:TinyBold
+						Label@MOD_VERSION:
+							X:PARENT_RIGHT - 53 - 140 - 170
+							Y:PARENT_BOTTOM-192
+							Align:Left
+							Font:Tiny
+						Label@MOD_DESC:
+							X:PARENT_RIGHT - 53 - 140 - 170
+							Y:PARENT_BOTTOM-175
+							Align:Left
+							VAlign:Top
+							Font:Tiny
+						Background@PREVIEW:
+							X:53
+							Y:PARENT_BOTTOM - 25 - HEIGHT
+							Width:300
+							Height:200
+							Background:panel-thinborder
+							Children:
+								Label:
+									Width:PARENT_RIGHT
+									Height:PARENT_BOTTOM
+									Text:Missing or invalid preview
+									Align:Center
+								RGBASprite@MOD_PREVIEW:
+									X:2
+									Y:2
+						Button@LOAD_BUTTON:
+							Background:button-highlighted
+							Key:return
+							X:PARENT_RIGHT - 53 - WIDTH - 170
+							Y:PARENT_BOTTOM - 25 - HEIGHT
+							Width:140
+							Height:35
+							Text:Load Mod
+						Button@QUIT_BUTTON:
+							Background:button-highlighted
+							X:PARENT_RIGHT - 53 - WIDTH
+							Y:PARENT_BOTTOM - 25 - HEIGHT
+							Width:140
+							Height:35
+							Text:Quit
+				Background@header:
+					Width:PARENT_RIGHT
+					Height:72
+					Background:panel-header
+					Children:
+						Image:
+							X:(PARENT_RIGHT - WIDTH)/2
+							Y:0-28
+							Width:280
+							ImageCollection:modchooser
+							ImageName:logo
+				TooltipContainer@TOOLTIP_CONTAINER:
+
+Background@BUTTON_TOOLTIP:
+	Logic:ButtonTooltipLogic
+	Background:panel-thinborder
+	Height:25
+	Children:
+		Label@LABEL:
+			X:5
+			Height:23
+			Font:Bold
+		Label@HOTKEY:
+			TextColor:255,255,0
+			Height:23
+			Font:Bold
--- a/mods/modchooser/notifications.yaml
+++ b/mods/modchooser/notifications.yaml
@@ -0,0 +1,5 @@
+Sounds:
+	Notifications:
+		TabClick: button
+		ClickSound: button
+		ClickDisabledSound: scold2
--- a/mods/ra/chrome/gameinit.yaml
+++ b/mods/ra/chrome/gameinit.yaml
@@ -41,19 +41,12 @@ Background@INSTALL_PANEL:
 			Height:25
 			Text:Use CD
 			Font:Bold
-		Button@MODS_BUTTON:
-			X:PARENT_RIGHT - 250
-			Y:PARENT_BOTTOM - 45
-			Width:110
-			Height:25
-			Text:Change Mod
-			Font:Bold
-		Button@QUIT_BUTTON:
+		Button@BACK_BUTTON:
 			X:PARENT_RIGHT - 130
 			Y:PARENT_BOTTOM - 45
 			Width:110
 			Height:25
-			Text:Quit
+			Text:Back
 			Font:Bold

 Background@INSTALL_DOWNLOAD_PANEL:
--- a/mods/ra/chrome/mainmenu.yaml
+++ b/mods/ra/chrome/mainmenu.yaml
@@ -52,27 +52,27 @@ Container@MAINMENU:
 							Height:30
 							Text:Multiplayer
 							Font:Bold
-						Button@MODS_BUTTON:
-							X:PARENT_RIGHT/2-WIDTH/2
-							Y:140
-							Width:140
-							Height:30
-							Text:Mods
-							Font:Bold
 						Button@SETTINGS_BUTTON:
 							X:PARENT_RIGHT/2-WIDTH/2
-							Y:180
+							Y:140
 							Width:140
 							Height:30
 							Text:Settings
 							Font:Bold
 						Button@EXTRAS_BUTTON:
 							X:PARENT_RIGHT/2-WIDTH/2
-							Y:220
+							Y:180
 							Width:140
 							Height:30
 							Text:Extras
 							Font:Bold
+						Button@MODS_BUTTON:
+							X:PARENT_RIGHT/2-WIDTH/2
+							Y:220
+							Width:140
+							Height:30
+							Text:Mods
+							Font:Bold
 						Button@QUIT_BUTTON:
 							X:PARENT_RIGHT/2-WIDTH/2
 							Y:260
--- a/mods/ra/chrome/modchooser.yaml
+++ b/mods/ra/chrome/modchooser.yaml
@@ -1,85 +0,0 @@
-Background@MODS_PANEL:
-	Logic:ModBrowserLogic
-	Width:740
-	Height:500
-	X:(WINDOW_RIGHT - WIDTH)/2
-	Y:(WINDOW_BOTTOM - HEIGHT)/2
-	Children:
-		Label@TITLE:
-			Text:Select Mod
-			Y:20
-			Width:PARENT_RIGHT
-			Height:25
-			Font:Bold
-			Align:Center
-		ScrollPanel@MOD_LIST:
-			X:20
-			Y:70
-			Width:700
-			Height:PARENT_BOTTOM - 125
-			Children:
-				ScrollItem@MOD_TEMPLATE:
-					Width:PARENT_RIGHT-27
-					Height:25
-					X:2
-					Y:0
-					Visible:false
-					Children:
-						Label@TITLE:
-							X:10
-							Width:200
-							Height:25
-						Label@AUTHOR:
-							X:PARENT_RIGHT-300
-							Align:Center
-							Width:50
-							Height:25
-						Label@VERSION:
-							Width:140
-							X:PARENT_RIGHT-150
-							Align:Center
-							Height:25
-		Container@MOD_LABELS:
-			Width:710-25
-			Height:25
-			X:15
-			Y:45
-			Children:
-				Label@TITLE:
-					Width:125
-					Height:25
-					X:0
-					Y:0
-					Text:Title
-					Align:Center
-					Font:Bold
-				Label@AUTHOR:
-					X:PARENT_RIGHT-300
-					Align:Center
-					Width:50
-					Height:25
-					Text:Author
-					Font:Bold
-				Label@VERSION:
-					Width:140
-					X:PARENT_RIGHT-150
-					Align:Center
-					Height:25
-					Text:Version
-					Font:Bold
-		Button@BACK_BUTTON:
-			Key:escape
-			X:PARENT_RIGHT-180
-			Y:PARENT_BOTTOM-45
-			Width:160
-			Height:25
-			Font:Bold
-			Text:Cancel
-		Button@LOAD_BUTTON:
-			Key:return
-			X:PARENT_RIGHT-360
-			Y:PARENT_BOTTOM-45
-			Width:160
-			Height:25
-			Font:Bold
-			Text:Load Mod
--- a/mods/ra/logo.png
+++ b/mods/ra/logo.png
--- a/mods/ra/mod.yaml
+++ b/mods/ra/mod.yaml
@@ -1,8 +1,8 @@
 Metadata:
 	Title: Red Alert
-	Description: OpenRA Reimagining of the classic game
+	Description: In a world where Hitler was assassinated and the Third Reich never\nexisted, the Soviet Union seeks power over all of Europe.  Allied\nagainst this Evil Empire, the free world faces a Cold War turned hot.\n\nRed Alert fuses the quick and fun gameplay of the original\nC&C: Red Alert, with balance improvements and new gameplay\nfeatures inspired by modern RTS games.
 	Version: {DEV_VERSION}
-	Author: The OpenRA Developers
+	Author: the OpenRA Developers

 Folders:
 	.
@@ -94,7 +94,6 @@ ChromeLayout:
 	mods/ra/chrome/directconnect.yaml
 	mods/ra/chrome/replaybrowser.yaml
 	mods/ra/chrome/dropdowns.yaml
-	mods/ra/chrome/modchooser.yaml
 	mods/ra/chrome/cheats.yaml
 	mods/ra/chrome/musicplayer.yaml
 	mods/ra/chrome/tooltips.yaml
--- a/mods/ra/preview.png
+++ b/mods/ra/preview.png
--- a/mods/ts/chrome/gameinit.yaml
+++ b/mods/ts/chrome/gameinit.yaml
@@ -41,19 +41,12 @@ Background@INSTALL_PANEL:
 			Height:25
 			Text:Use CD
 			Font:Bold
-		Button@MODS_BUTTON:
-			X:PARENT_RIGHT - 250
-			Y:PARENT_BOTTOM - 45
-			Width:110
-			Height:25
-			Text:Change Mod
-			Font:Bold
-		Button@QUIT_BUTTON:
+		Button@BACK_BUTTON:
 			X:PARENT_RIGHT - 130
 			Y:PARENT_BOTTOM - 45
 			Width:110
 			Height:25
-			Text:Quit
+			Text:Back
 			Font:Bold

 Background@INSTALL_DOWNLOAD_PANEL:
--- a/mods/ts/mod.yaml
+++ b/mods/ts/mod.yaml
@@ -2,7 +2,7 @@ Metadata:
 	Title: Tiberian Sun
 	Description: Developer stub, not yet ready for release!
 	Version: {DEV_VERSION}
-	Author: The OpenRA Developers
+	Author: the OpenRA Developers

 Folders:
 	.
@@ -119,7 +119,6 @@ ChromeLayout:
 	mods/ra/chrome/directconnect.yaml
 	mods/ra/chrome/replaybrowser.yaml
 	mods/ra/chrome/dropdowns.yaml
-	mods/ra/chrome/modchooser.yaml
 	mods/ra/chrome/cheats.yaml
 	mods/ra/chrome/musicplayer.yaml
 	mods/ra/chrome/tooltips.yaml