Merge pull request #3486 from pchote/misc-ui-polish

Misc UI polish.
2013-06-29 01:22:12 -07:00
parent 8f087878be 05030e6b98
commit e805dff16f
29 changed files with 1302 additions and 1368 deletions
--- a/OpenRA.Game/GameRules/Settings.cs
+++ b/OpenRA.Game/GameRules/Settings.cs
@@ -77,6 +77,7 @@ namespace OpenRA.GameRules
 		public bool SanityCheckUnsyncedCode = false;
 		public int Samples = 25;
 		public bool IgnoreVersionMismatch = false;
+		public bool DeveloperMenu = false;
 	}

 	public class GraphicSettings
--- a/OpenRA.Game/Widgets/ChromeMetrics.cs
+++ b/OpenRA.Game/Widgets/ChromeMetrics.cs
@@ -15,7 +15,7 @@ using OpenRA.FileFormats;

 namespace OpenRA.Widgets
 {
-	static class ChromeMetrics
+	public static class ChromeMetrics
 	{
 		static Dictionary<string, string> data = new Dictionary<string, string>();

@@ -32,7 +32,7 @@ namespace OpenRA.Widgets

 		public static T Get<T>(string key)
 		{
-			return FieldLoader.GetValue<T>( key, data[key] );
+			return FieldLoader.GetValue<T>(key, data[key]);
 		}
 	}
 }
--- a/OpenRA.Game/Widgets/Widget.cs
+++ b/OpenRA.Game/Widgets/Widget.cs
@@ -48,6 +48,15 @@ namespace OpenRA.Widgets
 			return window;
 		}

+		public static T LoadWidget<T>(string id, Widget parent, WidgetArgs args) where T : Widget
+		{
+			var widget = LoadWidget(id, parent, args) as T;
+			if (widget == null)
+				throw new InvalidOperationException(
+					"Widget {0} is not of type {1}".F(id, typeof(T).Name));
+			return widget;
+		}
+
 		public static Widget LoadWidget(string id, Widget parent, WidgetArgs args)
 		{
 			return Game.modData.WidgetLoader.LoadWidget(args, parent, id);
--- a/OpenRA.Mods.RA/Widgets/ColorMixerWidget.cs
+++ b/OpenRA.Mods.RA/Widgets/ColorMixerWidget.cs
@@ -26,11 +26,11 @@ namespace OpenRA.Mods.RA.Widgets
 		public event Action OnChange = () => {};

 		float H, S, V;
-		Bitmap frontBitmap, swapBitmap, backBitmap;
+		Bitmap frontBitmap, backBitmap;
 		Sprite mixerSprite;
 		bool isMoving;

-		bool updateFront, updateBack;
+		bool update;
 		object syncWorker = new object();
 		Thread workerThread;
 		bool workerAlive;
@@ -51,7 +51,6 @@ namespace OpenRA.Mods.RA.Widgets

 			// Bitmap data is generated in a background thread and then flipped
 			frontBitmap = new Bitmap(256, 256);
-			swapBitmap = new Bitmap(256, 256);
 			backBitmap = new Bitmap(256, 256);

 			var rect = new Rectangle((int)(255*SRange[0]), (int)(255*(1 - VRange[1])), (int)(255*(SRange[1] - SRange[0]))+1, (int)(255*(VRange[1] - VRange[0])) + 1);
@@ -65,7 +64,7 @@ namespace OpenRA.Mods.RA.Widgets
 			// so we do it in a background thread
 			lock (syncWorker)
 			{
-				updateBack = true;
+				update = true;

 				if (workerThread == null || !workerAlive)
 				{
@@ -85,53 +84,55 @@ namespace OpenRA.Mods.RA.Widgets
 				float hue;
 				lock (syncWorker)
 				{
-					if (!updateBack)
+					if (!update)
 					{
 						workerAlive = false;
 						break;
 					}
-					updateBack = false;
+					update = false;

 					// Take a local copy of the hue to generate to avoid tearing
 					hue = H;
 				}

-				var bitmapData = backBitmap.LockBits(backBitmap.Bounds(),
-					ImageLockMode.ReadWrite, PixelFormat.Format32bppArgb);
-
-				unsafe
+				lock (backBitmap)
 				{
-					int* c = (int*)bitmapData.Scan0;
+					var bitmapData = backBitmap.LockBits(backBitmap.Bounds(),
+						ImageLockMode.ReadWrite, PixelFormat.Format32bppArgb);

-					// Generate palette in HSV
-					for (var v = 0; v < 256; v++)
-						for (var s = 0; s < 256; s++)
-							*(c + (v * bitmapData.Stride >> 2) + s) = HSLColor.FromHSV(hue, s / 255f, (255 - v) / 255f).RGB.ToArgb();
-				}
+					unsafe
+					{
+						int* c = (int*)bitmapData.Scan0;

-				backBitmap.UnlockBits(bitmapData);
-				lock (syncWorker)
-				{
-					var swap = swapBitmap;
-					swapBitmap = backBitmap;
-					backBitmap = swap;
-					updateFront = true;
+						// Generate palette in HSV
+						for (var v = 0; v < 256; v++)
+							for (var s = 0; s < 256; s++)
+								*(c + (v * bitmapData.Stride >> 2) + s) = HSLColor.FromHSV(hue, s / 255f, (255 - v) / 255f).RGB.ToArgb();
+					}
+
+					backBitmap.UnlockBits(bitmapData);
+
+					lock (frontBitmap)
+					{
+						var swap = frontBitmap;
+						frontBitmap = backBitmap;
+						backBitmap = swap;
+					}
 				}
 			}
 		}

 		public override void Draw()
 		{
-			lock (syncWorker)
+			if (Monitor.TryEnter(frontBitmap))
 			{
-				if (updateFront)
+				try
 				{
-					var swap = swapBitmap;
-					swapBitmap = frontBitmap;
-					frontBitmap = swap;
-
 					mixerSprite.sheet.Texture.SetData(frontBitmap);
-					updateFront = false;
+				}
+				finally
+				{
+					Monitor.Exit(frontBitmap);
 				}
 			}

--- a/OpenRA.Mods.RA/Widgets/ColorPreviewManagerWidget.cs
+++ b/OpenRA.Mods.RA/Widgets/ColorPreviewManagerWidget.cs
@@ -21,7 +21,7 @@ namespace OpenRA.Mods.RA.Widgets
 	public class ColorPreviewManagerWidget : Widget
 	{
 		public readonly string Palette = "colorpicker";
-		public readonly int[] RemapIndices = {};
+		public readonly int[] RemapIndices = ChromeMetrics.Get<int[]>("ColorPickerRemapIndices");
 		public readonly float Ramp = 0.05f;
 		public HSLColor Color;

--- a/OpenRA.Mods.RA/Widgets/Logic/CheatsLogic.cs
+++ b/OpenRA.Mods.RA/Widgets/Logic/CheatsLogic.cs
@@ -115,49 +115,11 @@ namespace OpenRA.Mods.RA.Widgets.Logic
 				showAstarCostCheckbox.OnClick = () => { if (dbgOverlay != null) dbgOverlay.Visible ^= true; };
 			}

-			var desync = widget.GetOrNull<ButtonWidget>("DESYNC");
-			var desyncEnabled = widget.GetOrNull<CheckboxWidget>("DESYNC_ARMED");
-			if (desync != null && desyncEnabled != null)
-			{
-				desyncEnabled.IsChecked = () => !desync.Disabled;
-				desyncEnabled.OnClick = () => desync.Disabled ^= true;
-
-				desync.Disabled = true;
-				desync.OnClick = () => TriggerDesync(world);
-			}
-
 			var close = widget.GetOrNull<ButtonWidget>("CLOSE");
 			if (close != null)
 				close.OnClick = () => { Ui.CloseWindow(); onExit(); };
 		}

-		void TriggerDesync(World world)
-		{
-			var trait = world.ActorsWithTrait<ISync>().Random(CosmeticRandom).Trait;
-			var t = trait.GetType();
-			const BindingFlags bf = BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance;
-
-			var fields = t.GetFields(bf).Where(x => x.HasAttribute<SyncAttribute>()).ToArray();
-			if (fields.Length > 0)
-			{
-				var f = fields[CosmeticRandom.Next(fields.Length)];
-				var before = f.GetValue(trait);
-
-				if (f.FieldType == typeof(Boolean))
-					f.SetValue(trait, !(Boolean) f.GetValue(trait));
-				else if (f.FieldType == typeof(Int32))
-					f.SetValue(trait, CosmeticRandom.Next(Int32.MaxValue));
-				else
-					Game.AddChatLine(Color.White, "Debug", "Sorry, Field-Type not implemented. Try again!");
-
-				var after = f.GetValue(trait);
-				Game.AddChatLine(Color.White, "Debug", "Type: {0}\nField: ({1}) {2}\nBefore: {3}\nAfter: {4}"
-					.F(t.Name, f.FieldType.Name, f.Name, before, after));
-			}
-			else
-				Game.AddChatLine(Color.White, "Debug", "Bad random choice. This trait has no fields. Try again!");
-		}
-
 		public void Order(World world, string order)
 		{
 			world.IssueOrder(new Order(order, world.LocalPlayer.PlayerActor, false));
--- a/OpenRA.Mods.RA/Widgets/Logic/LobbyLogic.cs
+++ b/OpenRA.Mods.RA/Widgets/Logic/LobbyLogic.cs
@@ -102,7 +102,7 @@ namespace OpenRA.Mods.RA.Widgets.Logic
 				name.GetText = () => orderManager.LobbyInfo.GlobalSettings.ServerName;

 			UpdateCurrentMap();
-			Players = lobby.Get<ScrollPanelWidget>("PLAYERS");
+			Players = Ui.LoadWidget<ScrollPanelWidget>("LOBBY_PLAYER_BIN", lobby, new WidgetArgs());
 			EditablePlayerTemplate = Players.Get("TEMPLATE_EDITABLE_PLAYER");
 			NonEditablePlayerTemplate = Players.Get("TEMPLATE_NONEDITABLE_PLAYER");
 			EmptySlotTemplate = Players.Get("TEMPLATE_EMPTY");
--- a/OpenRA.Mods.RA/Widgets/Logic/MainMenuButtonsLogic.cs
+++ b/OpenRA.Mods.RA/Widgets/Logic/MainMenuButtonsLogic.cs
@@ -81,7 +81,8 @@ namespace OpenRA.Mods.RA.Widgets.Logic
 				});
 			};

-			widget.Get<ButtonWidget>("MAINMENU_BUTTON_ASSET_BROWSER").OnClick = () =>
+			var assetBrowserButton = widget.Get<ButtonWidget>("MAINMENU_BUTTON_ASSET_BROWSER");
+			assetBrowserButton.OnClick = () =>
 			{
 				Menu = MenuType.None;
 				Game.OpenWindow("ASSETBROWSER_BG", new WidgetArgs()
@@ -90,7 +91,18 @@ namespace OpenRA.Mods.RA.Widgets.Logic
 				});
 			};

-			widget.Get<ButtonWidget>("MAINMENU_BUTTON_QUIT").OnClick = () => Game.Exit();
+			var quitButton = widget.Get<ButtonWidget>("MAINMENU_BUTTON_QUIT");
+			quitButton.OnClick = () => Game.Exit();
+
+			// Hide developer-specific buttons
+			if (Game.Settings.Debug.DeveloperMenu == false)
+			{
+				assetBrowserButton.IsVisible = () => false;
+				var offset = assetBrowserButton.Bounds.Y - quitButton.Bounds.Y;
+				quitButton.Bounds.Y += offset;
+				rootMenu.Bounds.Height += offset;
+				rootMenu.Bounds.Y -= offset/2;
+			}
 		}

 		void RemoveShellmapUI()
--- a/OpenRA.Mods.RA/Widgets/Logic/SettingsMenuLogic.cs
+++ b/OpenRA.Mods.RA/Widgets/Logic/SettingsMenuLogic.cs
@@ -114,11 +114,6 @@ namespace OpenRA.Mods.RA.Widgets.Logic
 			var display = bg.Get("DISPLAY_PANE");
 			var gs = Game.Settings.Graphics;

-			var GraphicsRendererDropdown = display.Get<DropDownButtonWidget>("GRAPHICS_RENDERER");
-			GraphicsRendererDropdown.OnMouseDown = _ => ShowRendererDropdown(GraphicsRendererDropdown, gs);
-			GraphicsRendererDropdown.GetText = () => gs.Renderer == "Gl" ?
-				"OpenGL" : gs.Renderer == "Cg" ? "Cg Toolkit" : "OpenGL";
-
 			var windowModeDropdown = display.Get<DropDownButtonWidget>("MODE_DROPDOWN");
 			windowModeDropdown.OnMouseDown = _ => ShowWindowModeDropdown(windowModeDropdown, gs);
 			windowModeDropdown.GetText = () => gs.Mode == WindowMode.Windowed ?
@@ -235,14 +230,14 @@ namespace OpenRA.Mods.RA.Widgets.Logic
 			botdebugCheckbox.IsChecked = () => Game.Settings.Debug.BotDebug;
 			botdebugCheckbox.OnClick = () => Game.Settings.Debug.BotDebug ^= true;

-			var ignoreVersionMismatchCheckbox = debug.Get<CheckboxWidget>("IGNOREVERSIONMISMATCH_CHECKBOX");
-			ignoreVersionMismatchCheckbox.IsChecked = () => Game.Settings.Debug.IgnoreVersionMismatch;
-			ignoreVersionMismatchCheckbox.OnClick = () => Game.Settings.Debug.IgnoreVersionMismatch ^= true;
-
 			var verboseNatDiscoveryCheckbox = debug.Get<CheckboxWidget>("VERBOSE_NAT_DISCOVERY_CHECKBOX");
 			verboseNatDiscoveryCheckbox.IsChecked = () => Game.Settings.Server.VerboseNatDiscovery;
 			verboseNatDiscoveryCheckbox.OnClick = () => Game.Settings.Server.VerboseNatDiscovery ^= true;

+			var developerMenuCheckbox = debug.Get<CheckboxWidget>("DEVELOPER_MENU_CHECKBOX");
+			developerMenuCheckbox.IsChecked = () => Game.Settings.Debug.DeveloperMenu;
+			developerMenuCheckbox.OnClick = () => Game.Settings.Debug.DeveloperMenu ^= true;
+
 			bg.Get<ButtonWidget>("BUTTON_CLOSE").OnClick = () =>
 			{
 				int x, y;
--- a/artsrc/cnc/chrome.svg
+++ b/artsrc/cnc/chrome.svg
@@ -17,7 +17,8 @@
   sodipodi:docname="chrome.svg"
   inkscape:export-filename="/Users/paul/src/OpenRA/mods/cnc/uibits/chrome.png"
   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
+   inkscape:export-ydpi="90"
+   enable-background="new">
  <defs
     id="defs4">
    <inkscape:perspective
@@ -53,6 +54,43 @@
         d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z "
         id="path4479" />
    </marker>
+    <filter
+       id="filter3186"
+       inkscape:label="Desaturate"
+       x="0"
+       y="0"
+       width="1"
+       height="1"
+       inkscape:menu="Color"
+       inkscape:menu-tooltip="Render in shades of gray by reducing saturation to zero"
+       color-interpolation-filters="sRGB">
+      <feTurbulence
+         id="feTurbulence3188"
+         type="fractalNoise"
+         baseFrequency="0.40000000000000002"
+         numOctaves="10"
+         seed="406"
+         result="fbSourceGraphic" />
+      <feColorMatrix
+         result="fbSourceGraphicAlpha"
+         in="fbSourceGraphic"
+         values="0 0 0 -1 0 0 0 0 -1 0 0 0 0 -1 0 0 0 0 1 0"
+         id="feColorMatrix3980" />
+      <feColorMatrix
+         id="feColorMatrix3982"
+         type="saturate"
+         values="0"
+         in="fbSourceGraphic" />
+    </filter>
+    <filter
+       inkscape:collect="always"
+       id="filter4024">
+      <feBlend
+         inkscape:collect="always"
+         mode="multiply"
+         in2="BackgroundImage"
+         id="feBlend4026" />
+    </filter>
  </defs>
  <sodipodi:namedview
     id="base"
@@ -61,11 +99,11 @@
     borderopacity="1.0"
     inkscape:pageopacity="0.0"
     inkscape:pageshadow="2"
-     inkscape:zoom="5.656854"
-     inkscape:cx="366.7043"
-     inkscape:cy="471.90817"
+     inkscape:zoom="15.999999"
+     inkscape:cx="385.97751"
+     inkscape:cy="397.09537"
     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
+     inkscape:current-layer="svg2"
     showgrid="false"
     inkscape:window-width="1386"
     inkscape:window-height="856"
@@ -150,6 +188,10 @@
       orientation="0,1"
       position="227.75,416"
       id="guide3167" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="389.62502,401.06252"
+       id="guide3995" />
  </sodipodi:namedview>
  <metadata
     id="metadata7">
@@ -159,10 +201,17 @@
        <dc:format>image/svg+xml</dc:format>
        <dc:type
           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
      </cc:Work>
    </rdf:RDF>
  </metadata>
+  <rect
+     style="fill:#768bd7;fill-opacity:1;stroke:none"
+     id="rect3200"
+     width="767.91803"
+     height="742.46216"
+     x="-195.16148"
+     y="-169.65097" />
  <g
     inkscape:label="Layer 1"
     inkscape:groupmode="layer"
@@ -1294,5 +1343,155 @@
       id="path4070"
       inkscape:connector-curvature="0"
       sodipodi:nodetypes="ccccc" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       inkscape:connector-curvature="0"
+       id="path3990"
+       d="m 386,657.09952 1.73732,-1.73732 9.26268,9.26246 -1.73734,1.73754 z"
+       style="fill:#ffffff;fill-opacity:1;stroke:none" />
+    <path
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       d="m 397,657.09952 -1.73731,-1.73732 -9.26269,9.26246 1.73734,1.73754 z"
+       id="path3993"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccc" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer3"
+     inkscape:label="Noise"
+     style="opacity:0.2;display:inline;filter:url(#filter4024)">
+    <rect
+       transform="matrix(0.98412698,0,0,-0.98412698,14.31746,15.761905)"
+       style="fill:#000000;fill-opacity:1;stroke:none;filter:url(#filter3186)"
+       id="rect3182"
+       width="63"
+       height="63"
+       x="51.5"
+       y="-48"
+       inkscape:export-filename="/Users/paul/src/OpenRA/mods/cnc/uibits/rect3776.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
+    <rect
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/Users/paul/src/OpenRA/mods/cnc/uibits/rect3776.png"
+       y="-48"
+       x="51.5"
+       height="63"
+       width="63"
+       id="rect3988"
+       style="fill:#000000;fill-opacity:1;stroke:none;filter:url(#filter3186)"
+       transform="matrix(0.98412698,0,0,-0.98412698,-49.682539,79.761905)" />
+    <rect
+       transform="matrix(0.98412698,0,0,-0.98412698,14.317461,79.761905)"
+       style="fill:#000000;fill-opacity:1;stroke:none;filter:url(#filter3186)"
+       id="rect3990"
+       width="63"
+       height="63"
+       x="51.5"
+       y="-48"
+       inkscape:export-filename="/Users/paul/src/OpenRA/mods/cnc/uibits/rect3776.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
+    <rect
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/Users/paul/src/OpenRA/mods/cnc/uibits/rect3776.png"
+       y="-48"
+       x="51.5"
+       height="63"
+       width="63"
+       id="rect3992"
+       style="fill:#000000;fill-opacity:1;stroke:none;filter:url(#filter3186)"
+       transform="matrix(0.98412698,0,0,-0.98412698,14.317461,143.76191)" />
+    <rect
+       transform="matrix(0.98412698,0,0,-0.98412698,-49.682539,143.76191)"
+       style="fill:#000000;fill-opacity:1;stroke:none;filter:url(#filter3186)"
+       id="rect3994"
+       width="63"
+       height="63"
+       x="51.5"
+       y="-48"
+       inkscape:export-filename="/Users/paul/src/OpenRA/mods/cnc/uibits/rect3776.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
+    <rect
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/Users/paul/src/OpenRA/mods/cnc/uibits/rect3776.png"
+       y="-48"
+       x="51.5"
+       height="63"
+       width="63"
+       id="rect3996"
+       style="fill:#000000;fill-opacity:1;stroke:none;filter:url(#filter3186)"
+       transform="matrix(0.98412698,0,0,-0.98412698,-49.682539,207.76191)" />
+    <rect
+       transform="matrix(0.98412698,0,0,-0.98412698,14.317461,207.76191)"
+       style="fill:#000000;fill-opacity:1;stroke:none;filter:url(#filter3186)"
+       id="rect3998"
+       width="63"
+       height="63"
+       x="51.5"
+       y="-48"
+       inkscape:export-filename="/Users/paul/src/OpenRA/mods/cnc/uibits/rect3776.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
+    <rect
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/Users/paul/src/OpenRA/mods/cnc/uibits/rect3776.png"
+       y="-48"
+       x="51.5"
+       height="63"
+       width="63"
+       id="rect4000"
+       style="fill:#000000;fill-opacity:1;stroke:none;filter:url(#filter3186)"
+       transform="matrix(0.47619048,0,0,-0.47619048,232.47619,168.14286)" />
+    <rect
+       transform="matrix(0.47619048,0,0,-0.47619048,264.47619,168.14286)"
+       style="fill:#000000;fill-opacity:1;stroke:none;filter:url(#filter3186)"
+       id="rect4002"
+       width="63"
+       height="63"
+       x="51.5"
+       y="-48"
+       inkscape:export-filename="/Users/paul/src/OpenRA/mods/cnc/uibits/rect3776.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
+    <rect
+       transform="matrix(0.47619048,0,0,-0.47619048,232.47619,136.14286)"
+       style="fill:#000000;fill-opacity:1;stroke:none;filter:url(#filter3186)"
+       id="rect4004"
+       width="63"
+       height="63"
+       x="51.5"
+       y="-48"
+       inkscape:export-filename="/Users/paul/src/OpenRA/mods/cnc/uibits/rect3776.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
+    <rect
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/Users/paul/src/OpenRA/mods/cnc/uibits/rect3776.png"
+       y="-48"
+       x="51.5"
+       height="63"
+       width="63"
+       id="rect4006"
+       style="fill:#000000;fill-opacity:1;stroke:none;filter:url(#filter3186)"
+       transform="matrix(0.47619048,0,0,-0.47619048,264.47619,136.14286)" />
+    <rect
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/Users/paul/src/OpenRA/mods/cnc/uibits/rect3776.png"
+       y="-48"
+       x="51.5"
+       height="63"
+       width="63"
+       id="rect4046"
+       style="fill:#000000;fill-opacity:1;stroke:none;filter:url(#filter3186)"
+       transform="matrix(0.98412698,0,0,-0.98412698,14.31746,15.761905)" />
  </g>
 </svg>
--- a/mods/cnc/chrome.yaml
+++ b/mods/cnc/chrome.yaml
@@ -392,6 +392,7 @@ lobby-bits: chrome.png
 	admin: 340,39,7,5
 	colorpicker: 256,32,16,16
 	huepicker: 388,96,7,15
+	kick: 386,115,11,11

 checkbox-bits: chrome.png
 	checked: 272,32,16,16
--- a/mods/cnc/chrome/lobby-playerbin.yaml
+++ b/mods/cnc/chrome/lobby-playerbin.yaml
@@ -0,0 +1,319 @@
+ScrollPanel@LOBBY_PLAYER_BIN:
+	X:15
+	Y:30
+	Width:503
+	ItemSpacing:5
+	Height:219
+	Children:
+		Container@TEMPLATE_EDITABLE_PLAYER:
+			X:5
+			Y:0
+			Width:475
+			Height:25
+			Visible:false
+			Children:
+				Image@ADMIN_INDICATOR:
+					ImageCollection:lobby-bits
+					ImageName:admin
+					X:2
+					Visible:false
+				Background@LATENCY:
+					Background:button
+					X:0
+					Y:6
+					Width:11
+					Height:14
+					Visible:false
+					Children:
+						ColorBlock@LATENCY_COLOR:
+							X:2
+							Y:2
+							Width:PARENT_RIGHT-4
+							Height:PARENT_BOTTOM-4
+				ClientTooltipRegion@CLIENT_REGION:
+					TooltipContainer:TOOLTIP_CONTAINER
+					Template:CLIENT_TOOLTIP
+					Width:11
+					Height:25
+				TextField@NAME:
+					Text:Name
+					X:15
+					Width:190
+					Height:25
+					MaxLength:16
+					Visible:false
+				DropDownButton@SLOT_OPTIONS:
+					Text:Name
+					X:15
+					Width:190
+					Height:25
+					Font:Regular
+					Visible:false
+				DropDownButton@COLOR:
+					Width:70
+					Height:25
+					X:210
+					Font:Regular
+					IgnoreChildMouseOver: true
+					Children:
+						ColorBlock@COLORBLOCK:
+							X:5
+							Y:6
+							Width:PARENT_RIGHT-35
+							Height:PARENT_BOTTOM-12
+				DropDownButton@FACTION:
+					Width:100
+					Height:25
+					X:285
+					Font:Regular
+					IgnoreChildMouseOver: true
+					Children:
+						Image@FACTIONFLAG:
+							Width:32
+							Height:16
+							X:4
+							Y:4
+						Label@FACTIONNAME:
+							Text:Faction
+							Width:60
+							Height:25
+							X:40
+							Y:0
+				DropDownButton@TEAM:
+					Width:50
+					Height:25
+					X:390
+					Font:Regular
+				Image@STATUS_IMAGE:
+					Visible:false
+					X:450
+					Y:4
+					Width:20
+					Height:20
+					ImageCollection:checkbox-bits
+					ImageName:checked
+				Checkbox@STATUS_CHECKBOX:
+					Visible:false
+					X:448
+					Y:2
+					Width:20
+					Height:20
+		Container@TEMPLATE_NONEDITABLE_PLAYER:
+			X:5
+			Y:0
+			Width:475
+			Height:25
+			Visible:false
+			Children:
+				Image@ADMIN_INDICATOR:
+					ImageCollection:lobby-bits
+					ImageName:admin
+					X:2
+					Visible:false
+				Background@LATENCY:
+					Background:button
+					X:0
+					Y:6
+					Width:11
+					Height:14
+					Visible:false
+					Children:
+						ColorBlock@LATENCY_COLOR:
+							X:2
+							Y:2
+							Width:PARENT_RIGHT-4
+							Height:PARENT_BOTTOM-4
+				ClientTooltipRegion@CLIENT_REGION:
+					TooltipContainer:TOOLTIP_CONTAINER
+					Template:CLIENT_TOOLTIP
+					Width:11
+					Height:25
+				Label@NAME:
+					Text:Name
+					Width:185
+					Height:25
+					X:15
+					Y:0-1
+				Button@KICK:
+					Width:25
+					Height:25
+					X:180
+					Children:
+						Image:
+							ImageCollection:lobby-bits
+							ImageName:kick
+							X:7
+							Y:7
+				ColorBlock@COLORBLOCK:
+					X:215
+					Y:6
+					Width:35
+					Height:13
+				Container@FACTION:
+					Width:100
+					Height:25
+					X:285
+					Y:0
+					Children:
+						Image@FACTIONFLAG:
+							Width:30
+							Height:15
+							X:5
+							Y:5
+						Label@FACTIONNAME:
+							Text:Faction
+							Width:60
+							Height:25
+							X:40
+							Y:0
+				Label@TEAM:
+					Align:Center
+					Width:25
+					Height:25
+					X:390
+					Y:0
+				Image@STATUS_IMAGE:
+					Visible:false
+					X:450
+					Y:4
+					Width:20
+					Height:20
+					ImageCollection:checkbox-bits
+					ImageName:checked
+		Container@TEMPLATE_EMPTY:
+			X:5
+			Y:0
+			Width:475
+			Height:25
+			Visible:false
+			Children:
+				DropDownButton@SLOT_OPTIONS:
+					Text:Name
+					X:15
+					Width:190
+					Height:25
+					Font:Regular
+					Visible:false
+				Label@NAME:
+					Text:Name
+					Width:200
+					Height:25
+					X:15
+					Y:0-1
+					Visible:false
+				Button@JOIN:
+					Text:Play in this slot
+					Font:Regular
+					Width:315-55
+					Height:25
+					X:210
+					Y:0
+		Container@TEMPLATE_EDITABLE_SPECTATOR:
+			X:5
+			Y:0
+			Width:475
+			Height:25
+			Visible:false
+			Children:
+				Image@ADMIN_INDICATOR:
+					ImageCollection:lobby-bits
+					ImageName:admin
+					X:2
+					Visible:false
+				Background@LATENCY:
+					Background:button
+					X:0
+					Y:6
+					Width:11
+					Height:14
+					Visible:false
+					Children:
+						ColorBlock@LATENCY_COLOR:
+							X:2
+							Y:2
+							Width:PARENT_RIGHT-4
+							Height:PARENT_BOTTOM-4
+				ClientTooltipRegion@CLIENT_REGION:
+					TooltipContainer:TOOLTIP_CONTAINER
+					Template:CLIENT_TOOLTIP
+					Width:11
+					Height:25
+				TextField@NAME:
+					Text:Name
+					X:15
+					Width:190
+					Height:25
+					MaxLength:16
+				Label@SPECTATOR:
+					Text:Spectator
+					Width:315-55
+					Height:25
+					X:210
+					Y:0
+					Align:Center
+					Font:Bold
+		Container@TEMPLATE_NONEDITABLE_SPECTATOR:
+			X:5
+			Y:0
+			Width:475
+			Height:25
+			Visible:false
+			Children:
+				Image@ADMIN_INDICATOR:
+					ImageCollection:lobby-bits
+					ImageName:admin
+					X:2
+					Visible:false
+				Background@LATENCY:
+					Background:button
+					X:0
+					Y:6
+					Width:11
+					Height:14
+					Visible:false
+					Children:
+						ColorBlock@LATENCY_COLOR:
+							X:2
+							Y:2
+							Width:PARENT_RIGHT-4
+							Height:PARENT_BOTTOM-4
+				ClientTooltipRegion@CLIENT_REGION:
+					TooltipContainer:TOOLTIP_CONTAINER
+					Template:CLIENT_TOOLTIP
+					Width:11
+					Height:25
+				Label@NAME:
+					Text:Name
+					Width:185
+					Height:25
+					X:15
+					Y:0-1
+				Button@KICK:
+					Text:X
+					Width:25
+					Height:23
+					X:180
+					Y:2
+					Font:Bold
+				Label@SPECTATOR:
+					Text:Spectator
+					Width:315-55
+					Height:25
+					X:210
+					Y:0
+					Align:Center
+					Font:Bold
+		Container@TEMPLATE_NEW_SPECTATOR:
+			X:5
+			Y:0
+			Width:475
+			Height:25
+			Visible:false
+			Children:
+				Button@SPECTATE:
+					Text:Spectate
+					Font:Regular
+					Width:455
+					Height:25
+					X:15
+					Y:0
--- a/mods/cnc/chrome/lobby.yaml
+++ b/mods/cnc/chrome/lobby.yaml
@@ -6,7 +6,6 @@ Container@SERVER_LOBBY:
 	Height:535
 	Children:
 		ColorPreviewManager@COLOR_MANAGER:
-			RemapIndices: 176, 178, 180, 182, 184, 186, 189, 191, 177, 179, 181, 183, 185, 187, 188, 190
 		Label@SERVER_NAME:
 			Width:740
 			Y:0-25
@@ -52,322 +51,6 @@ Container@SERVER_LOBBY:
 					Height:25
 					Font:Tiny
 					Align:Center
-				ScrollPanel@PLAYERS:
-					X:15
-					Y:30
-					Width:503
-					ItemSpacing:5
-					Height:219
-					Children:
-						Container@TEMPLATE_EDITABLE_PLAYER:
-							X:5
-							Y:0
-							Width:475
-							Height:25
-							Visible:false
-							Children:
-								Image@ADMIN_INDICATOR:
-									ImageCollection:lobby-bits
-									ImageName:admin
-									X:2
-									Visible:false
-								Background@LATENCY:
-									Background:button
-									X:0
-									Y:6
-									Width:11
-									Height:14
-									Visible:false
-									Children:
-										ColorBlock@LATENCY_COLOR:
-											X:2
-											Y:2
-											Width:PARENT_RIGHT-4
-											Height:PARENT_BOTTOM-4
-								ClientTooltipRegion@CLIENT_REGION:
-									TooltipContainer:TOOLTIP_CONTAINER
-									Template:CLIENT_TOOLTIP
-									Width:11
-									Height:25
-								TextField@NAME:
-									Text:Name
-									X:15
-									Width:190
-									Height:25
-									MaxLength:16
-									Visible:false
-								DropDownButton@SLOT_OPTIONS:
-									Text:Name
-									X:15
-									Width:190
-									Height:25
-									Font:Regular
-									Visible:false
-								DropDownButton@COLOR:
-									Width:70
-									Height:25
-									X:210
-									Font:Regular
-									IgnoreChildMouseOver: true
-									Children:
-										ColorBlock@COLORBLOCK:
-											X:5
-											Y:6
-											Width:PARENT_RIGHT-35
-											Height:PARENT_BOTTOM-12
-								DropDownButton@FACTION:
-									Width:100
-									Height:25
-									X:285
-									Font:Regular
-									IgnoreChildMouseOver: true
-									Children:
-										Image@FACTIONFLAG:
-											Width:32
-											Height:16
-											X:4
-											Y:4
-										Label@FACTIONNAME:
-											Text:Faction
-											Width:60
-											Height:25
-											X:40
-											Y:0
-								DropDownButton@TEAM:
-									Width:50
-									Height:25
-									X:390
-									Font:Regular
-								Image@STATUS_IMAGE:
-									Visible:false
-									X:450
-									Y:4
-									Width:20
-									Height:20
-									ImageCollection:checkbox-bits
-									ImageName:checked
-								Checkbox@STATUS_CHECKBOX:
-									Visible:false
-									X:448
-									Y:2
-									Width:20
-									Height:20
-						Container@TEMPLATE_NONEDITABLE_PLAYER:
-							X:5
-							Y:0
-							Width:475
-							Height:25
-							Visible:false
-							Children:
-								Image@ADMIN_INDICATOR:
-									ImageCollection:lobby-bits
-									ImageName:admin
-									X:2
-									Visible:false
-								Background@LATENCY:
-									Background:button
-									X:0
-									Y:6
-									Width:11
-									Height:14
-									Visible:false
-									Children:
-										ColorBlock@LATENCY_COLOR:
-											X:2
-											Y:2
-											Width:PARENT_RIGHT-4
-											Height:PARENT_BOTTOM-4
-								ClientTooltipRegion@CLIENT_REGION:
-									TooltipContainer:TOOLTIP_CONTAINER
-									Template:CLIENT_TOOLTIP
-									Width:11
-									Height:25
-								Label@NAME:
-									Text:Name
-									Width:185
-									Height:25
-									X:15
-									Y:0-1
-								Button@KICK:
-									Text:X
-									Width:25
-									Height:23
-									X:180
-									Y:2
-									Font:Bold
-								ColorBlock@COLORBLOCK:
-									X:215
-									Y:6
-									Width:35
-									Height:13
-								Container@FACTION:
-									Width:100
-									Height:25
-									X:285
-									Y:0
-									Children:
-										Image@FACTIONFLAG:
-											Width:30
-											Height:15
-											X:5
-											Y:5
-										Label@FACTIONNAME:
-											Text:Faction
-											Width:60
-											Height:25
-											X:40
-											Y:0
-								Label@TEAM:
-									Align:Center
-									Width:25
-									Height:25
-									X:390
-									Y:0
-								Image@STATUS_IMAGE:
-									Visible:false
-									X:450
-									Y:4
-									Width:20
-									Height:20
-									ImageCollection:checkbox-bits
-									ImageName:checked
-						Container@TEMPLATE_EMPTY:
-							X:5
-							Y:0
-							Width:475
-							Height:25
-							Visible:false
-							Children:
-								DropDownButton@SLOT_OPTIONS:
-									Text:Name
-									X:15
-									Width:190
-									Height:25
-									Font:Regular
-									Visible:false
-								Label@NAME:
-									Text:Name
-									Width:200
-									Height:25
-									X:15
-									Y:0-1
-									Visible:false
-								Button@JOIN:
-									Text:Play in this slot
-									Font:Regular
-									Width:315-55
-									Height:25
-									X:210
-									Y:0
-						Container@TEMPLATE_EDITABLE_SPECTATOR:
-							X:5
-							Y:0
-							Width:475
-							Height:25
-							Visible:false
-							Children:
-								Image@ADMIN_INDICATOR:
-									ImageCollection:lobby-bits
-									ImageName:admin
-									X:2
-									Visible:false
-								Background@LATENCY:
-									Background:button
-									X:0
-									Y:6
-									Width:11
-									Height:14
-									Visible:false
-									Children:
-										ColorBlock@LATENCY_COLOR:
-											X:2
-											Y:2
-											Width:PARENT_RIGHT-4
-											Height:PARENT_BOTTOM-4
-								ClientTooltipRegion@CLIENT_REGION:
-									TooltipContainer:TOOLTIP_CONTAINER
-									Template:CLIENT_TOOLTIP
-									Width:11
-									Height:25
-								TextField@NAME:
-									Text:Name
-									X:15
-									Width:190
-									Height:25
-									MaxLength:16
-								Label@SPECTATOR:
-									Text:Spectator
-									Width:315-55
-									Height:25
-									X:210
-									Y:0
-									Align:Center
-									Font:Bold
-						Container@TEMPLATE_NONEDITABLE_SPECTATOR:
-							X:5
-							Y:0
-							Width:475
-							Height:25
-							Visible:false
-							Children:
-								Image@ADMIN_INDICATOR:
-									ImageCollection:lobby-bits
-									ImageName:admin
-									X:2
-									Visible:false
-								Background@LATENCY:
-									Background:button
-									X:0
-									Y:6
-									Width:11
-									Height:14
-									Visible:false
-									Children:
-										ColorBlock@LATENCY_COLOR:
-											X:2
-											Y:2
-											Width:PARENT_RIGHT-4
-											Height:PARENT_BOTTOM-4
-								ClientTooltipRegion@CLIENT_REGION:
-									TooltipContainer:TOOLTIP_CONTAINER
-									Template:CLIENT_TOOLTIP
-									Width:11
-									Height:25
-								Label@NAME:
-									Text:Name
-									Width:185
-									Height:25
-									X:15
-									Y:0-1
-								Button@KICK:
-									Text:X
-									Width:25
-									Height:23
-									X:180
-									Y:2
-									Font:Bold
-								Label@SPECTATOR:
-									Text:Spectator
-									Width:315-55
-									Height:25
-									X:210
-									Y:0
-									Align:Center
-									Font:Bold
-						Container@TEMPLATE_NEW_SPECTATOR:
-							X:5
-							Y:0
-							Width:475
-							Height:25
-							Visible:false
-							Children:
-								Button@SPECTATE:
-									Text:Spectate
-									Font:Regular
-									Width:455
-									Height:25
-									X:15
-									Y:0
 				Container@LABEL_CONTAINER:
 					X:20
 					Y:5
--- a/mods/cnc/chrome/settings.yaml
+++ b/mods/cnc/chrome/settings.yaml
@@ -6,7 +6,6 @@ Container@SETTINGS_PANEL:
 	Height:535
 	Children:
 		ColorPreviewManager@COLOR_MANAGER:
-			RemapIndices: 176, 178, 180, 182, 184, 186, 189, 191, 177, 179, 181, 183, 185, 187, 188, 190
 		Label@TITLE:
 			Width:740
 			Y:0-25
--- a/mods/cnc/metrics.yaml
+++ b/mods/cnc/metrics.yaml
@@ -3,4 +3,5 @@
 Metrics:
 	ButtonDepth: 0
 	ButtonFont: Bold
-	CheckboxPressedState: true
+	CheckboxPressedState: true
+	ColorPickerRemapIndices: 176, 178, 180, 182, 184, 186, 189, 191, 177, 179, 181, 183, 185, 187, 188, 190
--- a/mods/cnc/mod.yaml
+++ b/mods/cnc/mod.yaml
@@ -69,6 +69,7 @@ ChromeLayout:
 	mods/cnc/chrome/createserver.yaml
 	mods/cnc/chrome/directconnect.yaml
 	mods/cnc/chrome/lobby.yaml
+	mods/cnc/chrome/lobby-playerbin.yaml
 	mods/cnc/chrome/connection.yaml
 	mods/cnc/chrome/mapchooser.yaml
 	mods/cnc/chrome/replaybrowser.yaml
--- a/mods/cnc/uibits/chrome.png
+++ b/mods/cnc/uibits/chrome.png
--- a/mods/d2k/chrome/lobby-playerbin.yaml
+++ b/mods/d2k/chrome/lobby-playerbin.yaml
@@ -0,0 +1,310 @@
+ScrollPanel@LOBBY_PLAYER_BIN:
+	X:20
+	Y:67
+	ItemSpacing:5
+	Width:504
+	Height:235
+	Children:
+		Container@TEMPLATE_EDITABLE_PLAYER:
+			X:5
+			Y:0
+			Width:475
+			Height:25
+			Visible:false
+			Children:
+				Image@ADMIN_INDICATOR:
+					ImageCollection:lobby-bits
+					ImageName:admin
+					X:2
+					Visible:false
+				Container@LATENCY:
+					X:0
+					Y:6
+					Width:11
+					Height:14
+					Visible:false
+					Children:
+						ColorBlock@LATENCY_COLOR:
+							X:2
+							Y:2
+							Width:PARENT_RIGHT-4
+							Height:PARENT_BOTTOM-4
+				ClientTooltipRegion@CLIENT_REGION:
+					TooltipContainer:TOOLTIP_CONTAINER
+					Template:CLIENT_TOOLTIP
+					Width:11
+					Height:25
+				TextField@NAME:
+					Text:Name
+					X:15
+					Width:135
+					Height:25
+					MaxLength:16
+				DropDownButton@SLOT_OPTIONS:
+					Text:Name
+					X:15
+					Width:135
+					Height:25
+					Font:Regular
+					Visible:false
+				DropDownButton@COLOR:
+					Width:80
+					Height:25
+					X:160
+					Y:0
+					Children:
+						ColorBlock@COLORBLOCK:
+							X:5
+							Y:6
+							Width:PARENT_RIGHT-35
+							Height:PARENT_BOTTOM-12
+				DropDownButton@FACTION:
+					Width:130
+					Height:25
+					X:250
+					Y:0
+					Children:
+						Image@FACTIONFLAG:
+							Width:23
+							Height:23
+							X:5
+							Y:2
+						Label@FACTIONNAME:
+							Text:Faction
+							Width:70
+							Height:25
+							X:30
+							Y:0
+				DropDownButton@TEAM:
+					Text:Team
+					Width:48
+					Height:25
+					X:390
+					Y:0
+				Checkbox@STATUS_CHECKBOX:
+					X:448
+					Y:2
+					Width:20
+					Height:20
+					Visible:false
+				Image@STATUS_IMAGE:
+					Visible:false
+					X:450
+					Y:4
+					Width:20
+					Height:20
+					ImageCollection:checkbox-bits
+					ImageName:checked
+					Visible:false
+		Container@TEMPLATE_NONEDITABLE_PLAYER:
+			X:5
+			Y:0
+			Width:475
+			Height:25
+			Visible:false
+			Children:
+				Image@ADMIN_INDICATOR:
+					ImageCollection:lobby-bits
+					ImageName:admin
+					X:2
+					Visible:false
+				Container@LATENCY:
+					X:0
+					Y:6
+					Width:11
+					Height:14
+					Visible:false
+					Children:
+						ColorBlock@LATENCY_COLOR:
+							X:2
+							Y:2
+							Width:PARENT_RIGHT-4
+							Height:PARENT_BOTTOM-4
+				ClientTooltipRegion@CLIENT_REGION:
+					TooltipContainer:TOOLTIP_CONTAINER
+					Template:CLIENT_TOOLTIP
+					Width:11
+					Height:25
+				Label@NAME:
+					Text:Name
+					Width:130
+					Height:25
+					X:20
+					Y:0-1
+				Button@KICK:
+					Text:X
+					Width:25
+					Height:23
+					X:125
+					Y:2
+					Font:Bold
+				ColorBlock@COLORBLOCK:
+					X:165
+					Y:6
+					Width:45
+					Height:13
+				Container@FACTION:
+					Width:130
+					Height:25
+					X:250
+					Y:0
+					Children:
+						Image@FACTIONFLAG:
+							Width:23
+							Height:23
+							X:5
+							Y:2
+						Label@FACTIONNAME:
+							Text:Faction
+							Width:60
+							Height:25
+							X:40
+							Y:0
+				Label@TEAM:
+					Text:Team
+					Width:23
+					Height:25
+					Align:Center
+					X:390
+					Y:0
+				Image@STATUS_IMAGE:
+					Visible:false
+					X:450
+					Y:4
+					Width:20
+					Height:20
+					ImageCollection:checkbox-bits
+					ImageName:checked
+		Container@TEMPLATE_EMPTY:
+			X:5
+			Y:0
+			Width:475
+			Height:25
+			Visible:false
+			Children:
+				Label@NAME:
+					Text:Name
+					Width:130
+					Height:25
+					X:20
+					Y:0-1
+				DropDownButton@SLOT_OPTIONS:
+					Text:Name
+					Width:135
+					Height:25
+					X:15
+					Y:0
+					Visible:false
+				Button@JOIN:
+					Text:Play in this slot
+					Width:278
+					Height:25
+					X:160
+					Y:0
+		Container@TEMPLATE_EDITABLE_SPECTATOR:
+			X:5
+			Y:0
+			Width:475
+			Height:25
+			Visible:false
+			Children:
+				Image@ADMIN_INDICATOR:
+					ImageCollection:lobby-bits
+					ImageName:admin
+					X:2
+					Visible:false
+				Container@LATENCY:
+					X:0
+					Y:6
+					Width:11
+					Height:14
+					Visible:false
+					Children:
+						ColorBlock@LATENCY_COLOR:
+							X:2
+							Y:2
+							Width:PARENT_RIGHT-4
+							Height:PARENT_BOTTOM-4
+				ClientTooltipRegion@CLIENT_REGION:
+					TooltipContainer:TOOLTIP_CONTAINER
+					Template:CLIENT_TOOLTIP
+					Width:11
+					Height:25
+				TextField@NAME:
+					Text:Name
+					X:15
+					Width:135
+					Height:25
+					MaxLength:16
+				Label@SPECTATOR:
+					Text:Spectator
+					Width:278
+					Height:25
+					X:160
+					Y:0
+					Align:Center
+					Font:Bold
+		Container@TEMPLATE_NONEDITABLE_SPECTATOR:
+			X:5
+			Y:0
+			Width:475
+			Height:25
+			Visible:false
+			Children:
+				Image@ADMIN_INDICATOR:
+					ImageCollection:lobby-bits
+					ImageName:admin
+					X:2
+					Visible:false
+				Container@LATENCY:
+					X:0
+					Y:6
+					Width:11
+					Height:14
+					Visible:false
+					Children:
+						ColorBlock@LATENCY_COLOR:
+							X:2
+							Y:2
+							Width:PARENT_RIGHT-4
+							Height:PARENT_BOTTOM-4
+				ClientTooltipRegion@CLIENT_REGION:
+					TooltipContainer:TOOLTIP_CONTAINER
+					Template:CLIENT_TOOLTIP
+					Width:11
+					Height:25
+				Label@NAME:
+					Text:Name
+					Width:130
+					Height:25
+					X:20
+					Y:0-1
+				Button@KICK:
+					Text:X
+					Width:25
+					Height:23
+					X:125
+					Y:2
+					Font:Bold
+				Label@SPECTATOR:
+					Text:Spectator
+					Width:278
+					Height:25
+					X:160
+					Y:0
+					Align:Center
+					Font:Bold
+		Container@TEMPLATE_NEW_SPECTATOR:
+			X:5
+			Y:0
+			Width:475
+			Height:25
+			Visible:false
+			Children:
+				Button@SPECTATE:
+					Text:Spectate
+					Font:Regular
+					Width:278
+					Height:25
+					X:160
+					Y:0
--- a/mods/d2k/chrome/lobby.yaml
+++ b/mods/d2k/chrome/lobby.yaml
@@ -1,540 +0,0 @@
-Background@SERVER_LOBBY:
-	Logic:LobbyLogic
-	X:(WINDOW_RIGHT - WIDTH)/2
-	Y:(WINDOW_BOTTOM - HEIGHT)/2
-	Width:800
-	Height:600
-	Children:
-		ColorPreviewManager@COLOR_MANAGER:
-			RemapIndices: 255, 254, 253, 252, 251, 250, 249, 248, 247, 246, 245, 244, 243, 242, 241, 240
-		Label@SERVER_NAME:
-			X:0
-			Y:17
-			Align:Center
-			Width:530
-			Height:20
-			Font:Bold
-			Text:OpenD2k Multiplayer Lobby
-		Label@MAP_TITLE:
-			X:532
-			Y:17
-			Align:Center
-			Width:250
-			Height:20
-			Font:Bold
-		Background@LOBBY_MAP_BG:
-			X:PARENT_RIGHT-268
-			Y:50
-			Width:252
-			Height:252
-			Background:dialog3
-			Children:
-				MapPreview@MAP_PREVIEW:
-					X:4
-					Y:4
-					Width:244
-					Height:244
-					TooltipContainer:TOOLTIP_CONTAINER
-		ScrollPanel@PLAYERS:
-			X:20
-			Y:67
-			ItemSpacing:5
-			Width:504
-			Height:235
-			Children:
-				Container@TEMPLATE_EDITABLE_PLAYER:
-					X:5
-					Y:0
-					Width:475
-					Height:25
-					Visible:false
-					Children:
-						Image@ADMIN_INDICATOR:
-							ImageCollection:lobby-bits
-							ImageName:admin
-							X:2
-							Visible:false
-						Container@LATENCY:
-							X:0
-							Y:6
-							Width:11
-							Height:14
-							Visible:false
-							Children:
-								ColorBlock@LATENCY_COLOR:
-									X:2
-									Y:2
-									Width:PARENT_RIGHT-4
-									Height:PARENT_BOTTOM-4
-						ClientTooltipRegion@CLIENT_REGION:
-							TooltipContainer:TOOLTIP_CONTAINER
-							Template:CLIENT_TOOLTIP
-							Width:11
-							Height:25
-						TextField@NAME:
-							Text:Name
-							X:15
-							Width:135
-							Height:25
-							MaxLength:16
-						DropDownButton@SLOT_OPTIONS:
-							Text:Name
-							X:15
-							Width:135
-							Height:25
-							Font:Regular
-							Visible:false
-						DropDownButton@COLOR:
-							Width:80
-							Height:25
-							X:160
-							Y:0
-							Children:
-								ColorBlock@COLORBLOCK:
-									X:5
-									Y:6
-									Width:PARENT_RIGHT-35
-									Height:PARENT_BOTTOM-12
-						DropDownButton@FACTION:
-							Width:130
-							Height:25
-							X:250
-							Y:0
-							Children:
-								Image@FACTIONFLAG:
-									Width:23
-									Height:23
-									X:5
-									Y:2
-								Label@FACTIONNAME:
-									Text:Faction
-									Width:70
-									Height:25
-									X:30
-									Y:0
-						DropDownButton@TEAM:
-							Text:Team
-							Width:48
-							Height:25
-							X:390
-							Y:0
-						Checkbox@STATUS_CHECKBOX:
-							X:448
-							Y:2
-							Width:20
-							Height:20
-							Visible:false
-						Image@STATUS_IMAGE:
-							Visible:false
-							X:450
-							Y:4
-							Width:20
-							Height:20
-							ImageCollection:checkbox-bits
-							ImageName:checked
-							Visible:false
-				Container@TEMPLATE_NONEDITABLE_PLAYER:
-					X:5
-					Y:0
-					Width:475
-					Height:25
-					Visible:false
-					Children:
-						Image@ADMIN_INDICATOR:
-							ImageCollection:lobby-bits
-							ImageName:admin
-							X:2
-							Visible:false
-						Container@LATENCY:
-							X:0
-							Y:6
-							Width:11
-							Height:14
-							Visible:false
-							Children:
-								ColorBlock@LATENCY_COLOR:
-									X:2
-									Y:2
-									Width:PARENT_RIGHT-4
-									Height:PARENT_BOTTOM-4
-						ClientTooltipRegion@CLIENT_REGION:
-							TooltipContainer:TOOLTIP_CONTAINER
-							Template:CLIENT_TOOLTIP
-							Width:11
-							Height:25
-						Label@NAME:
-							Text:Name
-							Width:130
-							Height:25
-							X:20
-							Y:0-1
-						Button@KICK:
-							Text:X
-							Width:25
-							Height:23
-							X:125
-							Y:2
-							Font:Bold
-						ColorBlock@COLORBLOCK:
-							X:165
-							Y:6
-							Width:45
-							Height:13
-						Container@FACTION:
-							Width:130
-							Height:25
-							X:250
-							Y:0
-							Children:
-								Image@FACTIONFLAG:
-									Width:23
-									Height:23
-									X:5
-									Y:2
-								Label@FACTIONNAME:
-									Text:Faction
-									Width:60
-									Height:25
-									X:40
-									Y:0
-						Label@TEAM:
-							Text:Team
-							Width:23
-							Height:25
-							Align:Center
-							X:390
-							Y:0
-						Image@STATUS_IMAGE:
-							Visible:false
-							X:450
-							Y:4
-							Width:20
-							Height:20
-							ImageCollection:checkbox-bits
-							ImageName:checked
-				Container@TEMPLATE_EMPTY:
-					X:5
-					Y:0
-					Width:475
-					Height:25
-					Visible:false
-					Children:
-						Label@NAME:
-							Text:Name
-							Width:130
-							Height:25
-							X:20
-							Y:0-1
-						DropDownButton@SLOT_OPTIONS:
-							Text:Name
-							Width:135
-							Height:25
-							X:15
-							Y:0
-							Visible:false
-						Button@JOIN:
-							Text:Play in this slot
-							Width:278
-							Height:25
-							X:160
-							Y:0
-				Container@TEMPLATE_EDITABLE_SPECTATOR:
-					X:5
-					Y:0
-					Width:475
-					Height:25
-					Visible:false
-					Children:
-						Image@ADMIN_INDICATOR:
-							ImageCollection:lobby-bits
-							ImageName:admin
-							X:2
-							Visible:false
-						Container@LATENCY:
-							X:0
-							Y:6
-							Width:11
-							Height:14
-							Visible:false
-							Children:
-								ColorBlock@LATENCY_COLOR:
-									X:2
-									Y:2
-									Width:PARENT_RIGHT-4
-									Height:PARENT_BOTTOM-4
-						ClientTooltipRegion@CLIENT_REGION:
-							TooltipContainer:TOOLTIP_CONTAINER
-							Template:CLIENT_TOOLTIP
-							Width:11
-							Height:25
-						TextField@NAME:
-							Text:Name
-							X:15
-							Width:135
-							Height:25
-							MaxLength:16
-						Label@SPECTATOR:
-							Text:Spectator
-							Width:278
-							Height:25
-							X:160
-							Y:0
-							Align:Center
-							Font:Bold
-				Container@TEMPLATE_NONEDITABLE_SPECTATOR:
-					X:5
-					Y:0
-					Width:475
-					Height:25
-					Visible:false
-					Children:
-						Image@ADMIN_INDICATOR:
-							ImageCollection:lobby-bits
-							ImageName:admin
-							X:2
-							Visible:false
-						Container@LATENCY:
-							X:0
-							Y:6
-							Width:11
-							Height:14
-							Visible:false
-							Children:
-								ColorBlock@LATENCY_COLOR:
-									X:2
-									Y:2
-									Width:PARENT_RIGHT-4
-									Height:PARENT_BOTTOM-4
-						ClientTooltipRegion@CLIENT_REGION:
-							TooltipContainer:TOOLTIP_CONTAINER
-							Template:CLIENT_TOOLTIP
-							Width:11
-							Height:25
-						Label@NAME:
-							Text:Name
-							Width:130
-							Height:25
-							X:20
-							Y:0-1
-						Button@KICK:
-							Text:X
-							Width:25
-							Height:23
-							X:125
-							Y:2
-							Font:Bold
-						Label@SPECTATOR:
-							Text:Spectator
-							Width:278
-							Height:25
-							X:160
-							Y:0
-							Align:Center
-							Font:Bold
-				Container@TEMPLATE_NEW_SPECTATOR:
-					X:5
-					Y:0
-					Width:475
-					Height:25
-					Visible:false
-					Children:
-						Button@SPECTATE:
-							Text:Spectate
-							Font:Regular
-							Width:278
-							Height:25
-							X:160
-							Y:0
-		Container@LABEL_CONTAINER:
-			X:25
-			Y:40
-			Children:
-				Label@LABEL_LOBBY_NAME:
-					Width:150
-					Height:25
-					X:0
-					Y:0
-					Text:Name
-					Align:Center
-					Font:Bold
-				Label@LABEL_LOBBY_COLOR:
-					Width:80
-					Height:25
-					X:160
-					Y:0
-					Text:Color
-					Align:Center
-					Font:Bold
-				Label@LABEL_LOBBY_FACTION:
-					Width:130
-					Height:25
-					X:250
-					Y:0
-					Text:Faction
-					Align:Center
-					Font:Bold
-				Label@LABEL_LOBBY_TEAM:
-					Width:48
-					Height:25
-					X:390
-					Y:0
-					Text:Team
-					Align:Center
-					Font:Bold
-				Label@LABEL_LOBBY_STATUS:
-					X:448
-					Y:0
-					Width:20
-					Height:25
-					Text:Ready
-					Align:Left
-					Font:Bold
-		ScrollPanel@CHAT_DISPLAY:
-			X:20
-			Y:PARENT_BOTTOM - 289
-			Width:PARENT_RIGHT - 200
-			Height:230
-			ItemSpacing:1
-			Children:
-				Container@CHAT_TEMPLATE:
-					Width:PARENT_RIGHT-27
-					Height:16
-					X:2
-					Y:0
-					Children:
-						Label@TIME:
-							X:3
-							Width:50
-							Height:15
-							VAlign:Top
-						Label@NAME:
-							X:45
-							Width:50
-							Height:15
-							VAlign:Top
-						Label@TEXT:
-							X:55
-							Width:PARENT_RIGHT - 60
-							Height:15
-							WordWrap:true
-							VAlign:Top
-		Label@LABEL_CHATTYPE:
-			Width:65
-			Height:25
-			X:0
-			Y:PARENT_BOTTOM - 50
-			Text:Chat:
-			Align:Right
-		TextField@CHAT_TEXTFIELD:
-			X:70
-			Y:PARENT_BOTTOM - 49
-			Width:550
-			Height:25
-		Button@CHANGEMAP_BUTTON:
-			X:PARENT_RIGHT-154
-			Y:PARENT_BOTTOM-289
-			Width:120
-			Height:25
-			Text:Change Map
-			Font:Bold
-		Button@ADD_BOTS:
-			X:PARENT_RIGHT-154
-			Y:PARENT_BOTTOM-(289-25-5)
-			Width:120
-			Height:25
-			Text:Add Bots
-			Font:Bold
-		DropDownButton@ASSIGNTEAMS_DROPDOWNBUTTON:
-			X:PARENT_RIGHT-154
-			Y:PARENT_BOTTOM-229
-			Width:120
-			Height:25
-			Font:Bold
-			Visible:false
-			Text:Assign
-		DropDownButton@DIFFICULTY_DROPDOWNBUTTON:
-			X:PARENT_RIGHT-154
-			Y:PARENT_BOTTOM-199
-			Width:120
-			Height:25
-			Font:Bold
-			Visible:false
-		Checkbox@ALLOWCHEATS_CHECKBOX:
-			X: PARENT_RIGHT-154
-			Y: PARENT_BOTTOM-169
-			Width: 80
-			Height: 20
-			Text: Allow Cheats
-		Checkbox@CRATES_CHECKBOX:
-			X: PARENT_RIGHT-154
-			Y: PARENT_BOTTOM-144
-			Width: 80
-			Height: 20
-			Text: Crates
-		Button@DISCONNECT_BUTTON:
-			X:PARENT_RIGHT-154
-			Y:PARENT_BOTTOM-99
-			Width:120
-			Height:25
-			Text:Disconnect
-			Font:Bold
-		Button@START_GAME_BUTTON:
-			X:PARENT_RIGHT-154
-			Y:PARENT_BOTTOM-49
-			Width:120
-			Height:25
-			Text:Start Game
-			Font:Bold
-		TooltipContainer@TOOLTIP_CONTAINER:
-
-Background@KICK_CLIENT_DIALOG:
-	X:20
-	Y:67
-	Width:504
-	Height:235
-	Logic:KickClientLogic
-	Background:dialog3
-	Children:
-		Label@TITLE:
-			X:0
-			Y:40
-			Width:PARENT_RIGHT
-			Height:25
-			Font:Bold
-			Align:Center
-		Label@TEXTA:
-			X:0
-			Y:67
-			Width:PARENT_RIGHT
-			Height:25
-			Font:Regular
-			Align:Center
-			Text:You may also apply a temporary ban, preventing
-		Label@TEXTB:
-			X:0
-			Y:85
-			Width:PARENT_RIGHT
-			Height:25
-			Font:Regular
-			Align:Center
-			Text:them from joining for the remainder of this game.
-		Checkbox@PREVENT_REJOINING_CHECKBOX:
-			X:(PARENT_RIGHT - WIDTH)/2
-			Y:120
-			Width:150
-			Height:20
-			Text:Temporarily Ban
-		Button@OK_BUTTON:
-			X:(PARENT_RIGHT - WIDTH)/2 + 75
-			Y:155
-			Width:120
-			Height:25
-			Text:Kick
-			Font:Bold
-		Button@CANCEL_BUTTON:
-			X:(PARENT_RIGHT - WIDTH)/2 - 75
-			Y:155
-			Width:120
-			Height:25
-			Text:Cancel
-			Font:Bold
--- a/mods/d2k/metrics.yaml
+++ b/mods/d2k/metrics.yaml
@@ -4,3 +4,4 @@ Metrics:
 	ButtonDepth: 1
 	ButtonFont: Regular
 	CheckboxPressedState: false
+	ColorPickerRemapIndices: 255, 254, 253, 252, 251, 250, 249, 248, 247, 246, 245, 244, 243, 242, 241, 240
--- a/mods/d2k/mod.yaml
+++ b/mods/d2k/mod.yaml
@@ -57,7 +57,9 @@ ChromeLayout:
 	mods/d2k/chrome/mainmenu.yaml
 	mods/ra/chrome/settings.yaml
 	mods/ra/chrome/credits.yaml
-	mods/d2k/chrome/lobby.yaml
+	mods/ra/chrome/lobby.yaml
+	mods/d2k/chrome/lobby-playerbin.yaml
+	mods/ra/chrome/lobby-dialogs.yaml
 	mods/d2k/chrome/color-picker.yaml
 	mods/ra/chrome/map-chooser.yaml
 	mods/ra/chrome/create-server.yaml
--- a/mods/ra/chrome/cheats.yaml
+++ b/mods/ra/chrome/cheats.yaml
@@ -3,7 +3,7 @@ Background@CHEATS_PANEL:
 	X:(WINDOW_RIGHT - WIDTH)/2
 	Y:(WINDOW_BOTTOM - HEIGHT)/2
 	Width:350
-	Height:505
+	Height:475
 	Visible:false
 	Children:
 		Label@LABEL_TITLE:
@@ -93,21 +93,9 @@ Background@CHEATS_PANEL:
 			Height:20
 			Width:200
 			Text:Show Render Geometry
-		Checkbox@DESYNC_ARMED:
-			X:30
-			Y:412
-			Width:20
-			Height:20
-		Button@DESYNC:
-			X:60
-			Y:410
-			Width:150
-			Height:20
-			Text: Force Desync
-			Height:25
 		Button@CLOSE:
 			X:30
-			Y:450
+			Y:420
 			Width:PARENT_RIGHT - 60
 			Height:25
 			Text:Close
--- a/mods/ra/chrome/lobby-dialogs.yaml
+++ b/mods/ra/chrome/lobby-dialogs.yaml
@@ -0,0 +1,51 @@
+Background@KICK_CLIENT_DIALOG:
+	X:20
+	Y:67
+	Width:504
+	Height:235
+	Logic:KickClientLogic
+	Background:dialog3
+	Children:
+		Label@TITLE:
+			X:0
+			Y:40
+			Width:PARENT_RIGHT
+			Height:25
+			Font:Bold
+			Align:Center
+		Label@TEXTA:
+			X:0
+			Y:67
+			Width:PARENT_RIGHT
+			Height:25
+			Font:Regular
+			Align:Center
+			Text:You may also apply a temporary ban, preventing
+		Label@TEXTB:
+			X:0
+			Y:85
+			Width:PARENT_RIGHT
+			Height:25
+			Font:Regular
+			Align:Center
+			Text:them from joining for the remainder of this game.
+		Checkbox@PREVENT_REJOINING_CHECKBOX:
+			X:(PARENT_RIGHT - WIDTH)/2
+			Y:120
+			Width:150
+			Height:20
+			Text:Temporarily Ban
+		Button@OK_BUTTON:
+			X:(PARENT_RIGHT - WIDTH)/2 + 75
+			Y:155
+			Width:120
+			Height:25
+			Text:Kick
+			Font:Bold
+		Button@CANCEL_BUTTON:
+			X:(PARENT_RIGHT - WIDTH)/2 - 75
+			Y:155
+			Width:120
+			Height:25
+			Text:Cancel
+			Font:Bold
--- a/mods/ra/chrome/lobby-playerbin.yaml
+++ b/mods/ra/chrome/lobby-playerbin.yaml
@@ -0,0 +1,310 @@
+ScrollPanel@LOBBY_PLAYER_BIN:
+	X:20
+	Y:67
+	ItemSpacing:5
+	Width:504
+	Height:235
+	Children:
+		Container@TEMPLATE_EDITABLE_PLAYER:
+			X:5
+			Y:0
+			Width:475
+			Height:25
+			Visible:false
+			Children:
+				Image@ADMIN_INDICATOR:
+					ImageCollection:lobby-bits
+					ImageName:admin
+					X:2
+					Visible:false
+				Container@LATENCY:
+					X:0
+					Y:6
+					Width:11
+					Height:14
+					Visible:false
+					Children:
+						ColorBlock@LATENCY_COLOR:
+							X:2
+							Y:2
+							Width:PARENT_RIGHT-4
+							Height:PARENT_BOTTOM-4
+				ClientTooltipRegion@CLIENT_REGION:
+					TooltipContainer:TOOLTIP_CONTAINER
+					Template:CLIENT_TOOLTIP
+					Width:11
+					Height:25
+				TextField@NAME:
+					Text:Name
+					X:15
+					Width:135
+					Height:25
+					MaxLength:16
+				DropDownButton@SLOT_OPTIONS:
+					Text:Name
+					X:15
+					Width:135
+					Height:25
+					Font:Regular
+					Visible:false
+				DropDownButton@COLOR:
+					Width:80
+					Height:25
+					X:160
+					Y:0
+					Children:
+						ColorBlock@COLORBLOCK:
+							X:5
+							Y:6
+							Width:PARENT_RIGHT-35
+							Height:PARENT_BOTTOM-12
+				DropDownButton@FACTION:
+					Width:130
+					Height:25
+					X:250
+					Y:0
+					Children:
+						Image@FACTIONFLAG:
+							Width:30
+							Height:15
+							X:5
+							Y:5
+						Label@FACTIONNAME:
+							Text:Faction
+							Width:60
+							Height:25
+							X:40
+							Y:0
+				DropDownButton@TEAM:
+					Text:Team
+					Width:48
+					Height:25
+					X:390
+					Y:0
+				Checkbox@STATUS_CHECKBOX:
+					X:448
+					Y:2
+					Width:20
+					Height:20
+					Visible:false
+				Image@STATUS_IMAGE:
+					Visible:false
+					X:450
+					Y:4
+					Width:20
+					Height:20
+					ImageCollection:checkbox-bits
+					ImageName:checked
+					Visible:false
+		Container@TEMPLATE_NONEDITABLE_PLAYER:
+			X:5
+			Y:0
+			Width:475
+			Height:25
+			Visible:false
+			Children:
+				Image@ADMIN_INDICATOR:
+					ImageCollection:lobby-bits
+					ImageName:admin
+					X:2
+					Visible:false
+				Container@LATENCY:
+					X:0
+					Y:6
+					Width:11
+					Height:14
+					Visible:false
+					Children:
+						ColorBlock@LATENCY_COLOR:
+							X:2
+							Y:2
+							Width:PARENT_RIGHT-4
+							Height:PARENT_BOTTOM-4
+				ClientTooltipRegion@CLIENT_REGION:
+					TooltipContainer:TOOLTIP_CONTAINER
+					Template:CLIENT_TOOLTIP
+					Width:11
+					Height:25
+				Label@NAME:
+					Text:Name
+					Width:130
+					Height:25
+					X:20
+					Y:0-1
+				Button@KICK:
+					Text:X
+					Width:25
+					Height:23
+					X:125
+					Y:2
+					Font:Bold
+				ColorBlock@COLORBLOCK:
+					X:165
+					Y:6
+					Width:45
+					Height:13
+				Container@FACTION:
+					Width:130
+					Height:25
+					X:250
+					Y:0
+					Children:
+						Image@FACTIONFLAG:
+							Width:30
+							Height:15
+							X:5
+							Y:5
+						Label@FACTIONNAME:
+							Text:Faction
+							Width:60
+							Height:25
+							X:40
+							Y:0
+				Label@TEAM:
+					Text:Team
+					Width:23
+					Height:25
+					Align:Center
+					X:390
+					Y:0
+				Image@STATUS_IMAGE:
+					Visible:false
+					X:450
+					Y:4
+					Width:20
+					Height:20
+					ImageCollection:checkbox-bits
+					ImageName:checked
+		Container@TEMPLATE_EMPTY:
+			X:5
+			Y:0
+			Width:475
+			Height:25
+			Visible:false
+			Children:
+				Label@NAME:
+					Text:Name
+					Width:130
+					Height:25
+					X:20
+					Y:0-1
+				DropDownButton@SLOT_OPTIONS:
+					Text:Name
+					Width:135
+					Height:25
+					X:15
+					Y:0
+					Visible:false
+				Button@JOIN:
+					Text:Play in this slot
+					Width:278
+					Height:25
+					X:160
+					Y:0
+		Container@TEMPLATE_EDITABLE_SPECTATOR:
+			X:5
+			Y:0
+			Width:475
+			Height:25
+			Visible:false
+			Children:
+				Image@ADMIN_INDICATOR:
+					ImageCollection:lobby-bits
+					ImageName:admin
+					X:2
+					Visible:false
+				Container@LATENCY:
+					X:0
+					Y:6
+					Width:11
+					Height:14
+					Visible:false
+					Children:
+						ColorBlock@LATENCY_COLOR:
+							X:2
+							Y:2
+							Width:PARENT_RIGHT-4
+							Height:PARENT_BOTTOM-4
+				ClientTooltipRegion@CLIENT_REGION:
+					TooltipContainer:TOOLTIP_CONTAINER
+					Template:CLIENT_TOOLTIP
+					Width:11
+					Height:25
+				TextField@NAME:
+					Text:Name
+					X:15
+					Width:135
+					Height:25
+					MaxLength:16
+				Label@SPECTATOR:
+					Text:Spectator
+					Width:278
+					Height:25
+					X:160
+					Y:0
+					Align:Center
+					Font:Bold
+		Container@TEMPLATE_NONEDITABLE_SPECTATOR:
+			X:5
+			Y:0
+			Width:475
+			Height:25
+			Visible:false
+			Children:
+				Image@ADMIN_INDICATOR:
+					ImageCollection:lobby-bits
+					ImageName:admin
+					X:2
+					Visible:false
+				Container@LATENCY:
+					X:0
+					Y:6
+					Width:11
+					Height:14
+					Visible:false
+					Children:
+						ColorBlock@LATENCY_COLOR:
+							X:2
+							Y:2
+							Width:PARENT_RIGHT-4
+							Height:PARENT_BOTTOM-4
+				ClientTooltipRegion@CLIENT_REGION:
+					TooltipContainer:TOOLTIP_CONTAINER
+					Template:CLIENT_TOOLTIP
+					Width:11
+					Height:25
+				Label@NAME:
+					Text:Name
+					Width:130
+					Height:25
+					X:20
+					Y:0-1
+				Button@KICK:
+					Text:X
+					Width:25
+					Height:23
+					X:125
+					Y:2
+					Font:Bold
+				Label@SPECTATOR:
+					Text:Spectator
+					Width:278
+					Height:25
+					X:160
+					Y:0
+					Align:Center
+					Font:Bold
+		Container@TEMPLATE_NEW_SPECTATOR:
+			X:5
+			Y:0
+			Width:475
+			Height:25
+			Visible:false
+			Children:
+				Button@SPECTATE:
+					Text:Spectate
+					Font:Regular
+					Width:278
+					Height:25
+					X:160
+					Y:0
--- a/mods/ra/chrome/lobby.yaml
+++ b/mods/ra/chrome/lobby.yaml
@@ -6,7 +6,6 @@ Background@SERVER_LOBBY:
 	Height:600
 	Children:
 		ColorPreviewManager@COLOR_MANAGER:
-			RemapIndices: 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95
 		Label@SERVER_NAME:
 			X:0
 			Y:17
@@ -14,7 +13,6 @@ Background@SERVER_LOBBY:
 			Width:530
 			Height:20
 			Font:Bold
-			Text:OpenRA Multiplayer Lobby
 		Label@MAP_TITLE:
 			X:532
 			Y:17
@@ -35,316 +33,6 @@ Background@SERVER_LOBBY:
 					Width:244
 					Height:244
 					TooltipContainer:TOOLTIP_CONTAINER
-		ScrollPanel@PLAYERS:
-			X:20
-			Y:67
-			ItemSpacing:5
-			Width:504
-			Height:235
-			Children:
-				Container@TEMPLATE_EDITABLE_PLAYER:
-					X:5
-					Y:0
-					Width:475
-					Height:25
-					Visible:false
-					Children:
-						Image@ADMIN_INDICATOR:
-							ImageCollection:lobby-bits
-							ImageName:admin
-							X:2
-							Visible:false
-						Container@LATENCY:
-							X:0
-							Y:6
-							Width:11
-							Height:14
-							Visible:false
-							Children:
-								ColorBlock@LATENCY_COLOR:
-									X:2
-									Y:2
-									Width:PARENT_RIGHT-4
-									Height:PARENT_BOTTOM-4
-						ClientTooltipRegion@CLIENT_REGION:
-							TooltipContainer:TOOLTIP_CONTAINER
-							Template:CLIENT_TOOLTIP
-							Width:11
-							Height:25
-						TextField@NAME:
-							Text:Name
-							X:15
-							Width:135
-							Height:25
-							MaxLength:16
-						DropDownButton@SLOT_OPTIONS:
-							Text:Name
-							X:15
-							Width:135
-							Height:25
-							Font:Regular
-							Visible:false
-						DropDownButton@COLOR:
-							Width:80
-							Height:25
-							X:160
-							Y:0
-							Children:
-								ColorBlock@COLORBLOCK:
-									X:5
-									Y:6
-									Width:PARENT_RIGHT-35
-									Height:PARENT_BOTTOM-12
-						DropDownButton@FACTION:
-							Width:130
-							Height:25
-							X:250
-							Y:0
-							Children:
-								Image@FACTIONFLAG:
-									Width:30
-									Height:15
-									X:5
-									Y:5
-								Label@FACTIONNAME:
-									Text:Faction
-									Width:60
-									Height:25
-									X:40
-									Y:0
-						DropDownButton@TEAM:
-							Text:Team
-							Width:48
-							Height:25
-							X:390
-							Y:0
-						Checkbox@STATUS_CHECKBOX:
-							X:448
-							Y:2
-							Width:20
-							Height:20
-							Visible:false
-						Image@STATUS_IMAGE:
-							Visible:false
-							X:450
-							Y:4
-							Width:20
-							Height:20
-							ImageCollection:checkbox-bits
-							ImageName:checked
-							Visible:false
-				Container@TEMPLATE_NONEDITABLE_PLAYER:
-					X:5
-					Y:0
-					Width:475
-					Height:25
-					Visible:false
-					Children:
-						Image@ADMIN_INDICATOR:
-							ImageCollection:lobby-bits
-							ImageName:admin
-							X:2
-							Visible:false
-						Container@LATENCY:
-							X:0
-							Y:6
-							Width:11
-							Height:14
-							Visible:false
-							Children:
-								ColorBlock@LATENCY_COLOR:
-									X:2
-									Y:2
-									Width:PARENT_RIGHT-4
-									Height:PARENT_BOTTOM-4
-						ClientTooltipRegion@CLIENT_REGION:
-							TooltipContainer:TOOLTIP_CONTAINER
-							Template:CLIENT_TOOLTIP
-							Width:11
-							Height:25
-						Label@NAME:
-							Text:Name
-							Width:130
-							Height:25
-							X:20
-							Y:0-1
-						Button@KICK:
-							Text:X
-							Width:25
-							Height:23
-							X:125
-							Y:2
-							Font:Bold
-						ColorBlock@COLORBLOCK:
-							X:165
-							Y:6
-							Width:45
-							Height:13
-						Container@FACTION:
-							Width:130
-							Height:25
-							X:250
-							Y:0
-							Children:
-								Image@FACTIONFLAG:
-									Width:30
-									Height:15
-									X:5
-									Y:5
-								Label@FACTIONNAME:
-									Text:Faction
-									Width:60
-									Height:25
-									X:40
-									Y:0
-						Label@TEAM:
-							Text:Team
-							Width:23
-							Height:25
-							Align:Center
-							X:390
-							Y:0
-						Image@STATUS_IMAGE:
-							Visible:false
-							X:450
-							Y:4
-							Width:20
-							Height:20
-							ImageCollection:checkbox-bits
-							ImageName:checked
-				Container@TEMPLATE_EMPTY:
-					X:5
-					Y:0
-					Width:475
-					Height:25
-					Visible:false
-					Children:
-						Label@NAME:
-							Text:Name
-							Width:130
-							Height:25
-							X:20
-							Y:0-1
-						DropDownButton@SLOT_OPTIONS:
-							Text:Name
-							Width:135
-							Height:25
-							X:15
-							Y:0
-							Visible:false
-						Button@JOIN:
-							Text:Play in this slot
-							Width:278
-							Height:25
-							X:160
-							Y:0
-				Container@TEMPLATE_EDITABLE_SPECTATOR:
-					X:5
-					Y:0
-					Width:475
-					Height:25
-					Visible:false
-					Children:
-						Image@ADMIN_INDICATOR:
-							ImageCollection:lobby-bits
-							ImageName:admin
-							X:2
-							Visible:false
-						Container@LATENCY:
-							X:0
-							Y:6
-							Width:11
-							Height:14
-							Visible:false
-							Children:
-								ColorBlock@LATENCY_COLOR:
-									X:2
-									Y:2
-									Width:PARENT_RIGHT-4
-									Height:PARENT_BOTTOM-4
-						ClientTooltipRegion@CLIENT_REGION:
-							TooltipContainer:TOOLTIP_CONTAINER
-							Template:CLIENT_TOOLTIP
-							Width:11
-							Height:25
-						TextField@NAME:
-							Text:Name
-							X:15
-							Width:135
-							Height:25
-							MaxLength:16
-						Label@SPECTATOR:
-							Text:Spectator
-							Width:278
-							Height:25
-							X:160
-							Y:0
-							Align:Center
-							Font:Bold
-				Container@TEMPLATE_NONEDITABLE_SPECTATOR:
-					X:5
-					Y:0
-					Width:475
-					Height:25
-					Visible:false
-					Children:
-						Image@ADMIN_INDICATOR:
-							ImageCollection:lobby-bits
-							ImageName:admin
-							X:2
-							Visible:false
-						Container@LATENCY:
-							X:0
-							Y:6
-							Width:11
-							Height:14
-							Visible:false
-							Children:
-								ColorBlock@LATENCY_COLOR:
-									X:2
-									Y:2
-									Width:PARENT_RIGHT-4
-									Height:PARENT_BOTTOM-4
-						ClientTooltipRegion@CLIENT_REGION:
-							TooltipContainer:TOOLTIP_CONTAINER
-							Template:CLIENT_TOOLTIP
-							Width:11
-							Height:25
-						Label@NAME:
-							Text:Name
-							Width:130
-							Height:25
-							X:20
-							Y:0-1
-						Button@KICK:
-							Text:X
-							Width:25
-							Height:23
-							X:125
-							Y:2
-							Font:Bold
-						Label@SPECTATOR:
-							Text:Spectator
-							Width:278
-							Height:25
-							X:160
-							Y:0
-							Align:Center
-							Font:Bold
-				Container@TEMPLATE_NEW_SPECTATOR:
-					X:5
-					Y:0
-					Width:475
-					Height:25
-					Visible:false
-					Children:
-						Button@SPECTATE:
-							Text:Spectate
-							Font:Regular
-							Width:278
-							Height:25
-							X:160
-							Y:0
 		Container@LABEL_CONTAINER:
 			X:25
 			Y:40
@@ -491,56 +179,4 @@ Background@SERVER_LOBBY:
 			Height:25
 			Text:Start Game
 			Font:Bold
-		TooltipContainer@TOOLTIP_CONTAINER:
-
-Background@KICK_CLIENT_DIALOG:
-	X:20
-	Y:67
-	Width:504
-	Height:235
-	Logic:KickClientLogic
-	Background:dialog3
-	Children:
-		Label@TITLE:
-			X:0
-			Y:40
-			Width:PARENT_RIGHT
-			Height:25
-			Font:Bold
-			Align:Center
-		Label@TEXTA:
-			X:0
-			Y:67
-			Width:PARENT_RIGHT
-			Height:25
-			Font:Regular
-			Align:Center
-			Text:You may also apply a temporary ban, preventing
-		Label@TEXTB:
-			X:0
-			Y:85
-			Width:PARENT_RIGHT
-			Height:25
-			Font:Regular
-			Align:Center
-			Text:them from joining for the remainder of this game.
-		Checkbox@PREVENT_REJOINING_CHECKBOX:
-			X:(PARENT_RIGHT - WIDTH)/2
-			Y:120
-			Width:150
-			Height:20
-			Text:Temporarily Ban
-		Button@OK_BUTTON:
-			X:(PARENT_RIGHT - WIDTH)/2 + 75
-			Y:155
-			Width:120
-			Height:25
-			Text:Kick
-			Font:Bold
-		Button@CANCEL_BUTTON:
-			X:(PARENT_RIGHT - WIDTH)/2 - 75
-			Y:155
-			Width:120
-			Height:25
-			Text:Cancel
-			Font:Bold
+		TooltipContainer@TOOLTIP_CONTAINER:
--- a/mods/ra/chrome/map-chooser.yaml
+++ b/mods/ra/chrome/map-chooser.yaml
@@ -21,43 +21,46 @@ Background@MAPCHOOSER_PANEL:
 			Children:
 				ScrollItem@MAP_TEMPLATE:
 					Width:180
-					Height:208
-					X:2
+					Height:229
+					X:4
 					Y:0
 					Visible:false
 					Children:
+						Background@PREVIEW_PLACEHOLDER:
+							X:(PARENT_RIGHT - WIDTH)/2
+							Y:4
+							Width:170
+							Height:170
+							Background:dialog3
+							ClickThrough:true
+						MapPreview@PREVIEW:
+							X:(PARENT_RIGHT - WIDTH)/2
+							Y:4
+							Width:170
+							Height:170
 						Label@TITLE:
 							X:2
-							Y:PARENT_BOTTOM-47
+							Y:PARENT_BOTTOM-48
 							Width:PARENT_RIGHT-4
-							Height:25
 							Align:Center
 						Label@DETAILS:
 							Width:PARENT_RIGHT-4
 							X:2
-							Y:PARENT_BOTTOM-35
+							Y:PARENT_BOTTOM-34
 							Align:Center
-							Height:25
 							Font:Tiny
 						Label@AUTHOR:
 							Width:PARENT_RIGHT-4
 							X:2
-							Y:PARENT_BOTTOM-26
+							Y:PARENT_BOTTOM-22
 							Align:Center
-							Height:25
 							Font:Tiny
 						Label@SIZE:
 							Width:PARENT_RIGHT-4
 							X:2
-							Y:PARENT_BOTTOM-17
+							Y:PARENT_BOTTOM-10
 							Align:Center
-							Height:25
 							Font:Tiny
-						MapPreview@PREVIEW:
-							X:(PARENT_RIGHT - WIDTH)/2
-							Y:4
-							Width:160
-							Height:160
 		DropDownButton@GAMEMODE_FILTER:
 			X:PARENT_RIGHT - 220
 			Y:17
--- a/mods/ra/chrome/settings.yaml
+++ b/mods/ra/chrome/settings.yaml
@@ -127,7 +127,7 @@ Background@SETTINGS_MENU:
 					Y:210
 					Width:200
 					Height:20
-					Text: Try to discover routers suitable for automatic port-forwarding on startup.
+					Text: Enable Network Discovery (UPnP)
 		Container@AUDIO_PANE:
 			X:37
 			Y:100
@@ -202,35 +202,22 @@ Background@SETTINGS_MENU:
 			Height:PARENT_BOTTOM - 100
 			Visible: false
 			Children:
-				Label@RENDERER_LABEL:
-					X:0
-					Y:0
-					Width:75
-					Height:25
-					Text:Renderer:
-				DropDownButton@GRAPHICS_RENDERER:
-					X:80
-					Y:1
-					Width:120
-					Height:25
-					Font:Regular
-					Text:OpenGL
 				Label@MODE_LABEL:
 					X:0
-					Y:30
+					Y:0
 					Width:45
 					Height:25
 					Text:Mode:
 				DropDownButton@MODE_DROPDOWN:
 					X:50
-					Y:30
+					Y:0
 					Width:170
 					Height:25
 					Font:Regular
 					Text:Windowed
 				Container@WINDOW_RESOLUTION:
 					X:225
-					Y:30
+					Y:0
 					Children:
 						Label@At:
 							Text:@
@@ -258,27 +245,27 @@ Background@SETTINGS_MENU:
 							Height:25
 							MaxLength:5
 				Label@VIDEO_DESC:
-					Y:60
+					Y:30
 					Width:PARENT_RIGHT
 					Height:25
 					Font:Tiny
 					Align:Center
 					Text:Renderer/Mode/Resolution changes will be applied after the game is restarted.
 				Checkbox@PIXELDOUBLE_CHECKBOX:
-					Y:90
+					Y:60
 					Width:200
 					Height:20
 					Font:Regular
 					Text:Enable Pixel Doubling
 				Checkbox@CAPFRAMERATE_CHECKBOX:
-					Y:120
+					Y:90
 					Width:200
 					Height:20
 					Font:Regular
 					Text:Cap Framerate @ 
 				TextField@MAX_FRAMERATE:
 					X:150
-					Y:120
+					Y:90
 					Width:45
 					Height:25
 					MaxLength:3
@@ -386,15 +373,15 @@ Background@SETTINGS_MENU:
 					Width:300
 					Height:20
 					Text:Show Bot Debug Messages
-				Checkbox@IGNOREVERSIONMISMATCH_CHECKBOX:
+				Checkbox@VERBOSE_NAT_DISCOVERY_CHECKBOX:
 					X:0
 					Y:150
 					Width:300
 					Height:20
-					Text:Don't check for compatible version in game server browser.
-				Checkbox@VERBOSE_NAT_DISCOVERY_CHECKBOX:
+					Text:Detailed NAT logging
+				Checkbox@DEVELOPER_MENU_CHECKBOX:
 					X:0
 					Y:180
 					Width:300
 					Height:20
-					Text:Print very detailed information to server.log about NAT devices.
+					Text:Enable Asset Browser (requires restart)
--- a/mods/ra/metrics.yaml
+++ b/mods/ra/metrics.yaml
@@ -4,3 +4,4 @@ Metrics:
 	ButtonDepth: 1
 	ButtonFont: Regular
 	CheckboxPressedState: false
+	ColorPickerRemapIndices: 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95
--- a/mods/ra/mod.yaml
+++ b/mods/ra/mod.yaml
@@ -70,6 +70,8 @@ ChromeLayout:
 	mods/ra/chrome/settings.yaml
 	mods/ra/chrome/credits.yaml
 	mods/ra/chrome/lobby.yaml
+	mods/ra/chrome/lobby-playerbin.yaml
+	mods/ra/chrome/lobby-dialogs.yaml
 	mods/ra/chrome/color-picker.yaml
 	mods/ra/chrome/map-chooser.yaml
 	mods/ra/chrome/create-server.yaml