diff --git a/OpenRA.Mods.Cnc/CncLoadScreen.cs b/OpenRA.Mods.Cnc/CncLoadScreen.cs
index 9b2eae7b35..c973dd2145 100644
--- a/OpenRA.Mods.Cnc/CncLoadScreen.cs
+++ b/OpenRA.Mods.Cnc/CncLoadScreen.cs
@@ -61,13 +61,13 @@ namespace OpenRA.Mods.Cnc
 
 			nodLogo = new Sprite(sheet, new Rectangle(0, 256, 256, 256), TextureChannel.RGBA);
 			gdiLogo = new Sprite(sheet, new Rectangle(256, 256, 256, 256), TextureChannel.RGBA);
-			evaLogo = new Sprite(sheet, new Rectangle(256, 64, 128, 64), TextureChannel.RGBA);
+			evaLogo = new Sprite(sheet, new Rectangle(768, 320, 128, 64), TextureChannel.RGBA);
 			nodPos = new float2(bounds.Width / 2 - 384, bounds.Height / 2 - 128);
 			gdiPos = new float2(bounds.Width / 2 + 128, bounds.Height / 2 - 128);
 			evaPos = new float2(bounds.Width - 43 - 128, 43);
 
-			brightBlock = new Sprite(sheet, new Rectangle(320, 0, 16, 35), TextureChannel.RGBA);
-			dimBlock = new Sprite(sheet, new Rectangle(336, 0, 16, 35), TextureChannel.RGBA);
+			brightBlock = new Sprite(sheet, new Rectangle(776, 384, 16, 35), TextureChannel.RGBA);
+			dimBlock = new Sprite(sheet, new Rectangle(792, 384, 16, 35), TextureChannel.RGBA);
 
 			versionText = modData.Manifest.Metadata.Version;
 		}
diff --git a/mods/cnc/chrome.yaml b/mods/cnc/chrome.yaml
index ddd61ffbd0..baf3a6360c 100644
--- a/mods/cnc/chrome.yaml
+++ b/mods/cnc/chrome.yaml
@@ -2,173 +2,368 @@ shellmap: reticle.png
 	reticle: 0,0,512,512
 
 shellmapbits: chrome.png
-	record: 288,16,16,16
+	record: 944,0,16,16
 
 logos: chrome.png
-	eva:256,64,128,64
+	eva:768,320,128,64
 	nod-load:0,256,256,256
 	gdi-load:256,256,256,256
 
+#
+# Button
+# ===
+#
+
 button: chrome.png
-	background: 2,194,60,60
-	border-r: 62,194,2,60
-	border-l: 0,194,2,60
-	border-b: 2,254,60,2
-	border-t: 2,192,60,2
-	corner-tl: 0,192,2,2
-	corner-tr: 62,192,2,2
-	corner-bl: 0,254,2,2
-	corner-br: 62,254,2,2
+	background: 129,1,30,30
+	border-r: 159,1,1,30
+	border-l: 128,1,1,30
+	border-b: 129,31,30,1
+	border-t: 129,0,30,1
+	corner-tl: 128,0,1,1
+	corner-tr: 159,0,1,1
+	corner-bl: 128,31,1,1
+	corner-br: 159,31,1,1
+
+button-nod: chrome.png
+	background: 129,1,30,30
+	border-r: 159,1,1,30
+	border-l: 128,1,1,30
+	border-b: 129,31,30,1
+	border-t: 129,0,30,1
+	corner-tl: 128,0,1,1
+	corner-tr: 159,0,1,1
+	corner-bl: 128,31,1,1
+	corner-br: 159,31,1,1
+
+button-gdi: chrome.png
+	background: 385,1,30,30
+	border-r: 415,1,1,30
+	border-l: 384,1,1,30
+	border-b: 385,31,30,1
+	border-t: 385,0,30,1
+	corner-tl: 384,0,1,1
+	corner-tr: 415,0,1,1
+	corner-bl: 384,31,1,1
+	corner-br: 415,31,1,1
 
 button-hover: chrome.png
-	background: 2,130,60,60
-	border-r: 62,130,2,60
-	border-l: 0,130,2,60
-	border-b: 2,190,60,2
-	border-t: 2,128,60,2
-	corner-tl: 0,128,2,2
-	corner-tr: 62,128,2,2
-	corner-bl: 0,190,2,2
-	corner-br: 62,190,2,2
+	background: 161,1,30,30
+	border-r: 191,1,1,30
+	border-l: 160,1,1,30
+	border-b: 161,31,30,1
+	border-t: 161,0,30,1
+	corner-tl: 160,0,1,1
+	corner-tr: 191,0,1,1
+	corner-bl: 160,31,1,1
+	corner-br: 191,31,1,1
+
+button-nod-hover: chrome.png
+	background: 161,1,30,30
+	border-r: 191,1,1,30
+	border-l: 160,1,1,30
+	border-b: 161,31,30,1
+	border-t: 161,0,30,1
+	corner-tl: 160,0,1,1
+	corner-tr: 191,0,1,1
+	corner-bl: 160,31,1,1
+	corner-br: 191,31,1,1
+
+button-gdi-hover: chrome.png
+	background: 417,1,30,30
+	border-r: 447,1,1,30
+	border-l: 416,1,1,30
+	border-b: 417,31,30,1
+	border-t: 417,0,30,1
+	corner-tl: 416,0,1,1
+	corner-tr: 447,0,1,1
+	corner-bl: 416,31,1,1
+	corner-br: 447,31,1,1
 
 button-disabled: chrome.png
-	background: 66,130,60,60
-	border-r: 126,130,2,60
-	border-l: 64,130,2,60
-	border-b: 66,190,60,2
-	border-t: 66,128,60,2
-	corner-tl: 64,128,2,2
-	corner-tr: 126,128,2,2
-	corner-bl: 64,190,2,2
-	corner-br: 126,190,2,2
+	background: 161,33,30,30
+	border-r: 191,33,1,30
+	border-l: 160,33,1,30
+	border-b: 161,63,30,1
+	border-t: 161,32,30,1
+	corner-tl: 160,32,1,1
+	corner-tr: 191,32,1,1
+	corner-bl: 160,63,1,1
+	corner-br: 191,63,1,1
+
+button-nod-disabled: chrome.png
+	background: 161,33,30,30
+	border-r: 191,33,1,30
+	border-l: 160,33,1,30
+	border-b: 161,63,30,1
+	border-t: 161,32,30,1
+	corner-tl: 160,32,1,1
+	corner-tr: 191,32,1,1
+	corner-bl: 160,63,1,1
+	corner-br: 191,63,1,1
+
+button-gdi-disabled: chrome.png
+	background: 417,33,30,30
+	border-r: 447,33,1,30
+	border-l: 416,33,1,30
+	border-b: 417,63,30,1
+	border-t: 417,32,30,1
+	corner-tl: 416,32,1,1
+	corner-tr: 447,32,1,1
+	corner-bl: 416,63,1,1
+	corner-br: 447,63,1,1
 
 button-pressed: chrome.png
-	background: 66,194,60,60
-	border-r: 126,194,2,60
-	border-l: 64,194,2,60
-	border-b: 66,254,60,2
-	border-t: 66,192,60,2
-	corner-tl: 64,192,2,2
-	corner-tr: 126,192,2,2
-	corner-bl: 64,254,2,2
-	corner-br: 126,254,2,2
+	background: 129,33,30,30
+	border-r: 159,33,1,30
+	border-l: 128,33,1,30
+	border-b: 129,63,30,1
+	border-t: 129,32,30,1
+	corner-tl: 128,32,1,1
+	corner-tr: 159,32,1,1
+	corner-bl: 128,63,1,1
+	corner-br: 159,63,1,1
+
+button-nod-pressed: chrome.png
+	background: 129,33,30,30
+	border-r: 159,33,1,30
+	border-l: 128,33,1,30
+	border-b: 129,63,30,1
+	border-t: 129,32,30,1
+	corner-tl: 128,32,1,1
+	corner-tr: 159,32,1,1
+	corner-bl: 128,63,1,1
+	corner-br: 159,63,1,1
+
+button-gdi-pressed: chrome.png
+	background: 385,33,30,30
+	border-r: 415,33,1,30
+	border-l: 384,33,1,30
+	border-b: 385,63,30,1
+	border-t: 385,32,30,1
+	corner-tl: 384,32,1,1
+	corner-tr: 415,32,1,1
+	corner-bl: 384,63,1,1
+	corner-br: 415,63,1,1
 
 button-highlighted: chrome.png
-	background: 257,129,30,30
-	border-r: 287,129,1,30
-	border-l: 256,129,1,30
-	border-b: 257,159,30,1
-	border-t: 257,128,30,1
-	corner-tl: 256,128,1,1
-	corner-tr: 287,128,1,1
-	corner-bl: 256,159,1,1
-	corner-br: 287,159,1,1
+	background: 129,65,30,30
+	border-r: 159,65,1,30
+	border-l: 128,65,1,30
+	border-b: 129,95,30,1
+	border-t: 129,64,30,1
+	corner-tl: 128,64,1,1
+	corner-tr: 159,64,1,1
+	corner-bl: 128,95,1,1
+	corner-br: 159,95,1,1
+
+button-nod-highlighted: chrome.png
+	background: 129,65,30,30
+	border-r: 159,65,1,30
+	border-l: 128,65,1,30
+	border-b: 129,95,30,1
+	border-t: 129,64,30,1
+	corner-tl: 128,64,1,1
+	corner-tr: 159,64,1,1
+	corner-bl: 128,95,1,1
+	corner-br: 159,95,1,1
+
+button-gdi-highlighted: chrome.png
+	background: 385,65,30,30
+	border-r: 415,65,1,30
+	border-l: 384,65,1,30
+	border-b: 385,95,30,1
+	border-t: 385,64,30,1
+	corner-tl: 354,64,1,1
+	corner-tr: 415,64,1,1
+	corner-bl: 384,95,1,1
+	corner-br: 415,95,1,1
 
 button-highlighted-hover: chrome.png
-	background: 289,129,30,30
-	border-r: 319,129,1,30
-	border-l: 288,129,1,30
-	border-b: 289,159,30,1
-	border-t: 289,128,30,1
-	corner-tl: 288,128,1,1
-	corner-tr: 319,128,1,1
-	corner-bl: 288,159,1,1
-	corner-br: 319,159,1,1
+	background: 161,65,30,30
+	border-r: 191,65,1,30
+	border-l: 160,65,1,30
+	border-b: 161,95,30,1
+	border-t: 161,64,30,1
+	corner-tl: 160,64,1,1
+	corner-tr: 191,64,1,1
+	corner-bl: 160,95,1,1
+	corner-br: 191,95,1,1
+
+button-nod-highlighted-hover: chrome.png
+	background: 161,65,30,30
+	border-r: 191,65,1,30
+	border-l: 160,65,1,30
+	border-b: 161,95,30,1
+	border-t: 161,64,30,1
+	corner-tl: 160,64,1,1
+	corner-tr: 191,64,1,1
+	corner-bl: 160,95,1,1
+	corner-br: 191,95,1,1
+
+button-gdi-highlighted-hover: chrome.png
+	background: 417,65,30,30
+	border-r: 447,65,1,30
+	border-l: 416,65,1,30
+	border-b: 417,95,30,1
+	border-t: 417,64,30,1
+	corner-tl: 416,64,1,1
+	corner-tr: 447,64,1,1
+	corner-bl: 416,95,1,1
+	corner-br: 447,95,1,1
 
 button-highlighted-pressed: chrome.png
-	background: 257,161,30,30
-	border-r: 287,161,1,30
-	border-l: 256,161,1,30
-	border-b: 257,191,30,1
-	border-t: 257,160,30,1
-	corner-tl: 256,160,1,1
-	corner-tr: 287,160,1,1
-	corner-bl: 256,191,1,1
-	corner-br: 287,191,1,1
+	background: 129,97,30,30
+	border-r: 159,97,1,30
+	border-l: 128,97,1,30
+	border-b: 129,97,30,1
+	border-t: 129,96,30,1
+	corner-tl: 128,96,1,1
+	corner-tr: 159,96,1,1
+	corner-bl: 128,97,1,1
+	corner-br: 159,97,1,1
+
+button-nod-highlighted-pressed: chrome.png
+	background: 129,97,30,30
+	border-r: 159,97,1,30
+	border-l: 128,97,1,30
+	border-b: 129,97,30,1
+	border-t: 129,96,30,1
+	corner-tl: 128,96,1,1
+	corner-tr: 159,96,1,1
+	corner-bl: 128,97,1,1
+	corner-br: 159,97,1,1
+
+button-gdi-highlighted-pressed: chrome.png
+	background: 385,97,30,30
+	border-r: 415,97,1,30
+	border-l: 384,97,1,30
+	border-b: 385,97,30,1
+	border-t: 385,96,30,1
+	corner-tl: 384,96,1,1
+	corner-tr: 415,96,1,1
+	corner-bl: 384,97,1,1
+	corner-br: 415,97,1,1
 
 button-highlighted-disabled: chrome.png
-	background: 289,161,30,30
-	border-r: 319,161,1,30
-	border-l: 288,161,1,30
-	border-b: 289,191,30,1
-	border-t: 289,160,30,1
-	corner-tl: 288,160,1,1
-	corner-tr: 319,160,1,1
-	corner-bl: 288,191,1,1
-	corner-br: 319,191,1,1
+	background: 161,97,30,30
+	border-r: 191,97,1,30
+	border-l: 160,97,1,30
+	border-b: 161,97,30,1
+	border-t: 161,96,30,1
+	corner-tl: 160,96,1,1
+	corner-tr: 191,96,1,1
+	corner-bl: 160,97,1,1
+	corner-br: 191,97,1,1
+
+button-nod-highlighted-disabled: chrome.png
+	background: 161,97,30,30
+	border-r: 191,97,1,30
+	border-l: 160,97,1,30
+	border-b: 161,97,30,1
+	border-t: 161,96,30,1
+	corner-tl: 160,96,1,1
+	corner-tr: 191,96,1,1
+	corner-bl: 160,97,1,1
+	corner-br: 191,97,1,1
+
+button-gdi-highlighted-disabled: chrome.png
+	background: 417,97,30,30
+	border-r: 447,97,1,30
+	border-l: 416,97,1,30
+	border-b: 417,97,30,1
+	border-t: 417,96,30,1
+	corner-tl: 416,96,1,1
+	corner-tr: 447,96,1,1
+	corner-bl: 416,97,1,1
+	corner-br: 447,97,1,1
+
+#
+# Textfield
+# ===
+#
 
 # A copy of button
 textfield: chrome.png
-	background: 2,194,60,60
-	border-r: 62,194,2,60
-	border-l: 0,194,2,60
-	border-b: 2,254,60,2
-	border-t: 2,192,60,2
-	corner-tl: 0,192,2,2
-	corner-tr: 62,192,2,2
-	corner-bl: 0,254,2,2
-	corner-br: 62,254,2,2
+	background: 129,1,30,30
+	border-r: 159,1,1,30
+	border-l: 128,1,1,30
+	border-b: 129,31,30,1
+	border-t: 129,0,30,1
+	corner-tl: 128,0,1,1
+	corner-tr: 159,0,1,1
+	corner-bl: 128,31,1,1
+	corner-br: 159,31,1,1
 
 # A copy of button-hover
 textfield-hover: chrome.png
-	background: 2,130,60,60
-	border-r: 62,130,2,60
-	border-l: 0,130,2,60
-	border-b: 2,190,60,2
-	border-t: 2,128,60,2
-	corner-tl: 0,128,2,2
-	corner-tr: 62,128,2,2
-	corner-bl: 0,190,2,2
-	corner-br: 62,190,2,2
+	background: 161,1,30,30
+	border-r: 191,1,1,30
+	border-l: 160,1,1,30
+	border-b: 161,31,30,1
+	border-t: 161,0,30,1
+	corner-tl: 160,0,1,1
+	corner-tr: 191,0,1,1
+	corner-bl: 160,31,1,1
+	corner-br: 191,31,1,1
 
 # A copy of button-disabled
 textfield-disabled: chrome.png
-	background: 66,130,60,60
-	border-r: 126,130,2,60
-	border-l: 64,130,2,60
-	border-b: 66,190,60,2
-	border-t: 66,128,60,2
-	corner-tl: 64,128,2,2
-	corner-tr: 126,128,2,2
-	corner-bl: 64,190,2,2
-	corner-br: 126,190,2,2
+	background: 161,33,30,30
+	border-r: 191,33,1,30
+	border-l: 160,33,1,30
+	border-b: 161,63,30,1
+	border-t: 161,32,30,1
+	corner-tl: 160,32,1,1
+	corner-tr: 191,32,1,1
+	corner-bl: 160,63,1,1
+	corner-br: 191,63,1,1
 
 # A copy of button-pressed
 textfield-focused: chrome.png
-	background: 66,194,60,60
-	border-r: 126,194,2,60
-	border-l: 64,194,2,60
-	border-b: 66,254,60,2
-	border-t: 66,192,60,2
-	corner-tl: 64,192,2,2
-	corner-tr: 126,192,2,2
-	corner-bl: 64,254,2,2
-	corner-br: 126,254,2,2
+	background: 129,33,30,30
+	border-r: 159,33,1,30
+	border-l: 128,33,1,30
+	border-b: 129,63,30,1
+	border-t: 129,32,30,1
+	corner-tl: 128,32,1,1
+	corner-tr: 159,32,1,1
+	corner-bl: 128,63,1,1
+	corner-br: 159,63,1,1
+
+#
+# Progress bar
+# ===
+#
 
 # A copy of button
 progressbar-bg: chrome.png
-	background: 2,194,60,60
-	border-r: 62,194,2,60
-	border-l: 0,194,2,60
-	border-b: 2,254,60,2
-	border-t: 2,192,60,2
-	corner-tl: 0,192,2,2
-	corner-tr: 62,192,2,2
-	corner-bl: 0,254,2,2
-	corner-br: 62,254,2,2
+	background: 129,1,30,30
+	border-r: 159,1,1,30
+	border-l: 128,1,1,30
+	border-b: 129,31,30,1
+	border-t: 129,0,30,1
+	corner-tl: 128,0,1,1
+	corner-tr: 159,0,1,1
+	corner-bl: 128,31,1,1
+	corner-br: 159,31,1,1
 
 # A copy of button-hover
 progressbar-thumb: chrome.png
-	background: 2,130,60,60
-	border-r: 62,130,2,60
-	border-l: 0,130,2,60
-	border-b: 2,190,60,2
-	border-t: 2,128,60,2
-	corner-tl: 0,128,2,2
-	corner-tr: 62,128,2,2
-	corner-bl: 0,190,2,2
-	corner-br: 62,190,2,2
+	background: 161,1,30,30
+	border-r: 191,1,1,30
+	border-l: 160,1,1,30
+	border-b: 161,31,30,1
+	border-t: 161,0,30,1
+	corner-tl: 160,0,1,1
+	corner-tr: 191,0,1,1
+	corner-bl: 160,31,1,1
+	corner-br: 191,31,1,1
 
+#
+# Scroll panel
+# ===
+#
 
 # A copy of panel-gray
 scrollpanel-bg: chrome.png
@@ -183,73 +378,77 @@ scrollpanel-bg: chrome.png
 	corner-br: 126,126,2,2
 
 scrollpanel-button: chrome.png
-	background: 2,194,60,60
-	border-r: 62,194,2,60
-	border-l: 0,194,2,60
-	border-b: 2,254,60,2
-	border-t: 2,192,60,2
-	corner-tl: 0,192,2,2
-	corner-tr: 62,192,2,2
-	corner-bl: 0,254,2,2
-	corner-br: 62,254,2,2
+	background: 129,1,30,30
+	border-r: 159,1,1,30
+	border-l: 128,1,1,30
+	border-b: 129,31,30,1
+	border-t: 129,0,30,1
+	corner-tl: 128,0,1,1
+	corner-tr: 159,0,1,1
+	corner-bl: 128,31,1,1
+	corner-br: 159,31,1,1
 
 scrollpanel-button-hover: chrome.png
-	background: 2,130,60,60
-	border-r: 62,130,2,60
-	border-l: 0,130,2,60
-	border-b: 2,190,60,2
-	border-t: 2,128,60,2
-	corner-tl: 0,128,2,2
-	corner-tr: 62,128,2,2
-	corner-bl: 0,190,2,2
-	corner-br: 62,190,2,2
+	background: 161,1,30,30
+	border-r: 191,1,1,30
+	border-l: 160,1,1,30
+	border-b: 161,31,30,1
+	border-t: 161,0,30,1
+	corner-tl: 160,0,1,1
+	corner-tr: 191,0,1,1
+	corner-bl: 160,31,1,1
+	corner-br: 191,31,1,1
 
 scrollpanel-button-disabled: chrome.png
-	background: 66,130,60,60
-	border-r: 126,130,2,60
-	border-l: 64,130,2,60
-	border-b: 66,190,60,2
-	border-t: 66,128,60,2
-	corner-tl: 64,128,2,2
-	corner-tr: 126,128,2,2
-	corner-bl: 64,190,2,2
-	corner-br: 126,190,2,2
+	background: 161,33,30,30
+	border-r: 191,33,1,30
+	border-l: 160,33,1,30
+	border-b: 161,63,30,1
+	border-t: 161,32,30,1
+	corner-tl: 160,32,1,1
+	corner-tr: 191,32,1,1
+	corner-bl: 160,63,1,1
+	corner-br: 191,63,1,1
 
 scrollpanel-button-pressed: chrome.png
-	background: 66,194,60,60
-	border-r: 126,194,2,60
-	border-l: 64,194,2,60
-	border-b: 66,254,60,2
-	border-t: 66,192,60,2
-	corner-tl: 64,192,2,2
-	corner-tr: 126,192,2,2
-	corner-bl: 64,254,2,2
-	corner-br: 126,254,2,2
+	background: 129,33,30,30
+	border-r: 159,33,1,30
+	border-l: 128,33,1,30
+	border-b: 129,63,30,1
+	border-t: 129,32,30,1
+	corner-tl: 128,32,1,1
+	corner-tr: 159,32,1,1
+	corner-bl: 128,63,1,1
+	corner-br: 159,63,1,1
 
 # A copy of button-hover
 scrollitem-hover: chrome.png
-	background: 2,130,60,60
-	border-r: 62,130,2,60
-	border-l: 0,130,2,60
-	border-b: 2,190,60,2
-	border-t: 2,128,60,2
-	corner-tl: 0,128,2,2
-	corner-tr: 62,128,2,2
-	corner-bl: 0,190,2,2
-	corner-br: 62,190,2,2
+	background: 129,1,30,30
+	border-r: 159,1,1,30
+	border-l: 128,1,1,30
+	border-b: 129,31,30,1
+	border-t: 129,0,30,1
+	corner-tl: 128,0,1,1
+	corner-tr: 159,0,1,1
+	corner-bl: 128,31,1,1
+	corner-br: 159,31,1,1
 
 # A copy of button-pressed
 scrollitem-selected: chrome.png
-	background: 66,194,60,60
-	border-r: 126,194,2,60
-	border-l: 64,194,2,60
-	border-b: 66,254,60,2
-	border-t: 66,192,60,2
-	corner-tl: 64,192,2,2
-	corner-tr: 126,192,2,2
-	corner-bl: 64,254,2,2
-	corner-br: 126,254,2,2
+	background: 129,33,30,30
+	border-r: 159,33,1,30
+	border-l: 128,33,1,30
+	border-b: 129,63,30,1
+	border-t: 129,32,30,1
+	corner-tl: 128,32,1,1
+	corner-tr: 159,32,1,1
+	corner-bl: 128,63,1,1
+	corner-br: 159,63,1,1
 
+#
+# Slider
+# ===
+#
 slider: chrome.png
 	tick: 64,64,1,4
 
@@ -266,108 +465,113 @@ slider-track: chrome.png
 	corner-br: 126,126,2,2
 
 slider-thumb: chrome.png
-	background: 2,194,60,60
-	border-r: 62,194,2,60
-	border-l: 0,194,2,60
-	border-b: 2,254,60,2
-	border-t: 2,192,60,2
-	corner-tl: 0,192,2,2
-	corner-tr: 62,192,2,2
-	corner-bl: 0,254,2,2
-	corner-br: 62,254,2,2
+	background: 129,1,30,30
+	border-r: 159,1,1,30
+	border-l: 128,1,1,30
+	border-b: 129,31,30,1
+	border-t: 129,0,30,1
+	corner-tl: 128,0,1,1
+	corner-tr: 159,0,1,1
+	corner-bl: 128,31,1,1
+	corner-br: 159,31,1,1
 
 slider-thumb-hover: chrome.png
-	background: 2,130,60,60
-	border-r: 62,130,2,60
-	border-l: 0,130,2,60
-	border-b: 2,190,60,2
-	border-t: 2,128,60,2
-	corner-tl: 0,128,2,2
-	corner-tr: 62,128,2,2
-	corner-bl: 0,190,2,2
-	corner-br: 62,190,2,2
+	background: 161,1,30,30
+	border-r: 191,1,1,30
+	border-l: 160,1,1,30
+	border-b: 161,31,30,1
+	border-t: 161,0,30,1
+	corner-tl: 160,0,1,1
+	corner-tr: 191,0,1,1
+	corner-bl: 160,31,1,1
+	corner-br: 191,31,1,1
 
 slider-thumb-disabled: chrome.png
-	background: 66,130,60,60
-	border-r: 126,130,2,60
-	border-l: 64,130,2,60
-	border-b: 66,190,60,2
-	border-t: 66,128,60,2
-	corner-tl: 64,128,2,2
-	corner-tr: 126,128,2,2
-	corner-bl: 64,190,2,2
-	corner-br: 126,190,2,2
+	background: 161,33,30,30
+	border-r: 191,33,1,30
+	border-l: 160,33,1,30
+	border-b: 161,63,30,1
+	border-t: 161,32,30,1
+	corner-tl: 160,32,1,1
+	corner-tr: 191,32,1,1
+	corner-bl: 160,63,1,1
+	corner-br: 191,63,1,1
 
 slider-thumb-pressed: chrome.png
-	background: 66,194,60,60
-	border-r: 126,194,2,60
-	border-l: 64,194,2,60
-	border-b: 66,254,60,2
-	border-t: 66,192,60,2
-	corner-tl: 64,192,2,2
-	corner-tr: 126,192,2,2
-	corner-bl: 64,254,2,2
-	corner-br: 126,254,2,2
+	background: 129,33,30,30
+	border-r: 159,33,1,30
+	border-l: 128,33,1,30
+	border-b: 129,63,30,1
+	border-t: 129,32,30,1
+	corner-tl: 128,32,1,1
+	corner-tr: 159,32,1,1
+	corner-bl: 128,63,1,1
+	corner-br: 159,63,1,1
 	
 # A copy of button
 checkbox: chrome.png
-	background: 2,194,60,60
-	border-r: 62,194,2,60
-	border-l: 0,194,2,60
-	border-b: 2,254,60,2
-	border-t: 2,192,60,2
-	corner-tl: 0,192,2,2
-	corner-tr: 62,192,2,2
-	corner-bl: 0,254,2,2
-	corner-br: 62,254,2,2
+	background: 129,1,30,30
+	border-r: 159,1,1,30
+	border-l: 128,1,1,30
+	border-b: 129,31,30,1
+	border-t: 129,0,30,1
+	corner-tl: 128,0,1,1
+	corner-tr: 159,0,1,1
+	corner-bl: 128,31,1,1
+	corner-br: 159,31,1,1
 
 # A copy of button-hover
 checkbox-hover: chrome.png
-	background: 2,130,60,60
-	border-r: 62,130,2,60
-	border-l: 0,130,2,60
-	border-b: 2,190,60,2
-	border-t: 2,128,60,2
-	corner-tl: 0,128,2,2
-	corner-tr: 62,128,2,2
-	corner-bl: 0,190,2,2
-	corner-br: 62,190,2,2
+	background: 161,1,30,30
+	border-r: 191,1,1,30
+	border-l: 160,1,1,30
+	border-b: 161,31,30,1
+	border-t: 161,0,30,1
+	corner-tl: 160,0,1,1
+	corner-tr: 191,0,1,1
+	corner-bl: 160,31,1,1
+	corner-br: 191,31,1,1
 
 # A copy of button-disabled
 checkbox-disabled: chrome.png
-	background: 66,130,60,60
-	border-r: 126,130,2,60
-	border-l: 64,130,2,60
-	border-b: 66,190,60,2
-	border-t: 66,128,60,2
-	corner-tl: 64,128,2,2
-	corner-tr: 126,128,2,2
-	corner-bl: 64,190,2,2
-	corner-br: 126,190,2,2
+	background: 161,33,30,30
+	border-r: 191,33,1,30
+	border-l: 160,33,1,30
+	border-b: 161,63,30,1
+	border-t: 161,32,30,1
+	corner-tl: 160,32,1,1
+	corner-tr: 191,32,1,1
+	corner-bl: 160,63,1,1
+	corner-br: 191,63,1,1
 
 # A copy of button-pressed
 checkbox-pressed: chrome.png
-	background: 66,194,60,60
-	border-r: 126,194,2,60
-	border-l: 64,194,2,60
-	border-b: 66,254,60,2
-	border-t: 66,192,60,2
-	corner-tl: 64,192,2,2
-	corner-tr: 126,192,2,2
-	corner-bl: 64,254,2,2
-	corner-br: 126,254,2,2
+	background: 129,33,30,30
+	border-r: 159,33,1,30
+	border-l: 128,33,1,30
+	border-b: 129,63,30,1
+	border-t: 129,32,30,1
+	corner-tl: 128,32,1,1
+	corner-tr: 159,32,1,1
+	corner-bl: 128,63,1,1
+	corner-br: 159,63,1,1
 
 # A copy of button-highlighted-pressed
 checkbox-highlighted: chrome.png
-	background: 257,161,30,30
-	border-r: 287,161,1,30
-	border-l: 256,161,1,30
-	border-b: 257,191,30,1
-	border-t: 257,160,30,1
-	corner-tl: 256,160,1,1
-	corner-tr: 287,160,1,1
-	corner-bl: 256,191,1,1
-	corner-br: 287,191,1,1
+	background: 385,97,30,30
+	border-r: 415,97,1,30
+	border-l: 384,97,1,30
+	border-b: 385,97,30,1
+	border-t: 385,96,30,1
+	corner-tl: 384,96,1,1
+	corner-tr: 415,96,1,1
+	corner-bl: 384,97,1,1
+	corner-br: 415,97,1,1
+
+#
+# Panels
+# ===
+#
 
 panel-black: chrome.png
 	background: 66,2,60,60
@@ -380,6 +584,28 @@ panel-black: chrome.png
 	corner-bl: 64,62,2,2
 	corner-br: 126,62,2,2
 
+panel-black-nod: chrome.png
+	background: 66,2,60,60
+	border-r: 126,2,2,60
+	border-l: 64,2,2,60
+	border-b: 66,62,60,2
+	border-t: 66,0,60,2
+	corner-tl: 64,0,2,2
+	corner-tr: 126,0,2,2
+	corner-bl: 64,62,2,2
+	corner-br: 126,62,2,2
+
+panel-black-gdi: chrome.png
+	background: 322,2,60,60
+	border-r: 382,2,2,60
+	border-l: 320,2,2,60
+	border-b: 322,62,60,2
+	border-t: 322,0,60,2
+	corner-tl: 320,0,2,2
+	corner-tr: 382,0,2,2
+	corner-bl: 320,62,2,2
+	corner-br: 382,62,2,2
+
 panel-darkred: chrome.png
 	background: 2,66,60,60
 	border-r: 62,66,2,60
@@ -391,6 +617,28 @@ panel-darkred: chrome.png
 	corner-bl: 0,126,2,2
 	corner-br: 62,126,2,2
 
+panel-darkred-nod: chrome.png
+	background: 2,66,60,60
+	border-r: 62,66,2,60
+	border-l: 0,66,2,60
+	border-b: 2,126,60,2
+	border-t: 2,64,60,2
+	corner-tl: 0,64,2,2
+	corner-tr: 62,64,2,2
+	corner-bl: 0,126,2,2
+	corner-br: 62,126,2,2
+
+panel-darkred-gdi: chrome.png
+	background: 258,66,60,60
+	border-r: 318,66,2,60
+	border-l: 256,66,2,60
+	border-b: 258,126,60,2
+	border-t: 258,64,60,2
+	corner-tl: 256,64,2,2
+	corner-tr: 318,64,2,2
+	corner-bl: 256,126,2,2
+	corner-br: 318,126,2,2
+
 panel-gray: chrome.png
 	background: 66,66,60,60
 	border-r: 126,66,2,60
@@ -402,26 +650,92 @@ panel-gray: chrome.png
 	corner-bl: 64,126,2,2
 	corner-br: 126,126,2,2
 
+panel-gray-nod: chrome.png
+	background: 66,66,60,60
+	border-r: 126,66,2,60
+	border-l: 64,66,2,60
+	border-b: 66,126,60,2
+	border-t: 66,64,60,2
+	corner-tl: 64,64,2,2
+	corner-tr: 126,64,2,2
+	corner-bl: 64,126,2,2
+	corner-br: 126,126,2,2
+
+panel-gray-gdi: chrome.png
+	background: 322,66,60,60
+	border-r: 382,66,2,60
+	border-l: 320,66,2,60
+	border-b: 322,126,60,2
+	border-t: 322,64,60,2
+	corner-tl: 320,64,2,2
+	corner-tr: 382,64,2,2
+	corner-bl: 320,126,2,2
+	corner-br: 382,126,2,2
+
 panel-allblack: chrome.png
-	background: 2,2,60,60
-	border-r: 62,2,2,60
-	border-l: 0,2,2,60
-	border-b: 2,62,60,2
-	border-t: 2,0,60,2
-	corner-tl: 0,0,2,2
-	corner-tr: 62,0,2,2
-	corner-bl: 0,62,2,2
-	corner-br: 62,62,2,2
+	background: 1,1,30,30
+	border-r: 31,1,1,30
+	border-l: 0,1,3,30
+	border-b: 1,31,30,1
+	border-t: 1,0,30,1
+	corner-tl: 0,0,1,1
+	corner-tr: 31,0,1,1
+	corner-bl: 0,31,1,1
+	corner-br: 31,31,1,1
+
+panel-allblack-nod: chrome.png
+	background: 1,1,30,30
+	border-r: 31,1,1,30
+	border-l: 0,1,3,30
+	border-b: 1,31,30,1
+	border-t: 1,0,30,1
+	corner-tl: 0,0,1,1
+	corner-tr: 31,0,1,1
+	corner-bl: 0,31,1,1
+	corner-br: 31,31,1,1
+
+panel-allblack-gdi: chrome.png
+	background: 257,1,30,30
+	border-r: 287,1,1,30
+	border-l: 256,1,3,30
+	border-b: 257,31,30,1
+	border-t: 257,0,30,1
+	corner-tl: 256,0,1,1
+	corner-tr: 287,0,1,1
+	corner-bl: 256,31,1,1
+	corner-br: 287,31,1,1
 
 panel-transparent: chrome.png
-	border-r: 190,2,2,60
-	border-l: 128,2,2,60
-	border-b: 130,62,60,2
-	border-t: 130,0,60,2
-	corner-tl: 128,0,2,2
-	corner-tr: 190,0,2,2
-	corner-bl: 128,62,2,2
-	corner-br: 190,62,2,2
+	border-r: 31,33,1,30
+	border-l: 0,33,1,30
+	border-b: 1,63,30,1
+	border-t: 1,32,30,1
+	corner-tl: 0,32,1,1
+	corner-tr: 31,32,1,1
+	corner-bl: 0,63,1,1
+	corner-br: 31,63,1,1
+
+panel-transparent-nod: chrome.png
+	background: 1,33,30,30
+	border-r: 31,33,1,30
+	border-l: 0,33,1,30
+	border-b: 1,63,30,1
+	border-t: 1,32,30,1
+	corner-tl: 0,32,1,1
+	corner-tr: 31,32,1,1
+	corner-bl: 0,63,1,1
+	corner-br: 31,63,1,1
+
+panel-transparent-gdi: chrome.png
+	background: 257,33,30,30
+	border-r: 287,33,1,30
+	border-l: 256,33,1,30
+	border-b: 257,63,30,1
+	border-t: 257,32,30,1
+	corner-tl: 256,32,1,1
+	corner-tr: 287,32,1,1
+	corner-bl: 256,63,1,1
+	corner-br: 287,63,1,1
 
 shellmapborder: chrome.png
 	border-t: 161,128,62,33
@@ -433,194 +747,255 @@ shellmapborder: chrome.png
 	corner-bl: 128,223,33,33
 	corner-br: 223,223,33,33
 
+shellmapborder-nod: chrome.png
+	border-t: 161,128,62,33
+	border-b: 161,223,62,33
+	border-l: 128,161,33,62
+	border-r: 223,161,33,62
+	corner-tl: 128,128,33,33
+	corner-tr: 223,128,33,33
+	corner-bl: 128,223,33,33
+	corner-br: 223,223,33,33
+
+shellmapborder-gdi: chrome.png
+	border-t: 417,128,62,33
+	border-b: 417,223,62,33
+	border-l: 384,161,33,62
+	border-r: 479,161,33,62
+	corner-tl: 384,128,33,33
+	corner-tr: 479,128,33,33
+	corner-bl: 384,223,33,33
+	corner-br: 479,223,33,33
+
+#
+# Misc
+# ===
+#
+
 music: chrome.png
-	pause: 256,0,16,16
-	stop: 272,0,16,16
-	play: 288,0,16,16
-	next: 256,16,16,16
-	prev: 272,16,16,16
-	fastforward: 416,64,16,16
-	slowmo: 416,80,16,16
+	pause: 768,0,16,16
+	stop: 784,0,16,16
+	play: 800,0,16,16
+	next: 816,0,16,16
+	prev: 832,0,16,16
+	fastforward: 848,0,16,16
+	slowmo: 864,0,16,16
 
 lobby-bits: chrome.png
-	spawn-claimed: 458,55,19,19
-	spawn-unclaimed: 435,55,19,19
-	admin: 340,39,7,5
-	colorpicker: 257,33,14,14
-	huepicker: 388,96,7,15
-	kick: 386,115,11,11
-	protected: 402,97,12,13
-	protected-disabled: 402,113,12,13
-	authentication: 418,97,12,13
-	authentication-disabled: 418,113,12,13
-	admin-registered: 448,112,16,16
-	admin-anonymous: 464,112,16,16
-	player-registered: 480,112,16,16
-	player-anonymous: 496,112,16,16
+	spawn-unclaimed: 776,420,19,19
+	spawn-claimed: 776,440,19,19
+	admin: 928,0,7,5
+	colorpicker: 880,0,14,14
+	huepicker: 896,0,7,15
+	kick: 912,0,11,11
+	protected: 768,16,12,13
+	protected-disabled: 784,16,12,13
+	authentication: 800,16,12,13
+	authentication-disabled: 816,16,12,13
+	admin-registered: 768,48,16,16
+	admin-anonymous: 800,48,16,16
+	player-registered: 784,48,16,16
+	player-anonymous: 816,48,16,16
 
 reload-icon: chrome.png
-	enabled: 256,192,16,16
-	disabled-0: 272,192,16,16
-	disabled-1: 288,192,16,16
-	disabled-2: 304,192,16,16
-	disabled-3: 320,192,16,16
-	disabled-4: 336,192,16,16
-	disabled-5: 352,192,16,16
-	disabled-6: 368,192,16,16
-	disabled-7: 384,192,16,16
-	disabled-8: 400,192,16,16
-	disabled-9: 416,192,16,16
-	disabled-10: 432,192,16,16
-	disabled-11: 448,192,16,16
+	enabled: 768,32,16,16
+	disabled-0: 784,32,16,16
+	disabled-1: 800,32,16,16
+	disabled-2: 816,32,16,16
+	disabled-3: 832,32,16,16
+	disabled-4: 848,32,16,16
+	disabled-5: 864,32,16,16
+	disabled-6: 880,32,16,16
+	disabled-7: 896,32,16,16
+	disabled-8: 912,32,16,16
+	disabled-9: 928,32,16,16
+	disabled-10: 944,32,16,16
+	disabled-11: 960,32,16,16
 
 checkbox-bits: chrome.png
-	checked: 272,32,16,16
-	checked-disabled: 272,48,16,16
-	crossed: 288,32,16,16
-	crossed-disabled: 288,48,16,16
+	checked: 960,16,16,16
+	checked-disabled: 976,16,16,16
+	crossed: 992,16,16,16
+	crossed-disabled: 1008,16,16,16
 
 scrollbar: chrome.png
-	down_arrow: 304,0,16,16
-	down_pressed: 304,16,16,16
-	up_arrow: 304,32,16,16
-	up_pressed: 304,48,16,16
-	right_arrow: 320,48,16,16
-	right_pressed: 336,48,16,16
-	left_arrow: 352,48,16,16
-	left_pressed: 368,48,16,16
+	down_arrow: 832,16,16,16
+	down_pressed: 848,16,16,16
+	up_arrow: 864,16,16,16
+	up_pressed: 880,16,16,16
+	right_arrow: 896,16,16,16
+	right_pressed: 912,16,16,16
+	left_arrow: 928,16,16,16
+	left_pressed: 944,16,16,16
 
 flags: chrome.png
-	nod: 352,0,32,16
-	gdi: 352,16,32,16
-	Random: 352,32,32,16
+	nod: 808,384,32,16
+	gdi: 808,400,32,16
+	Random: 808,416,32,16
 
-strategic: strategic.png
-	unowned: 0,0,32,32
-	critical_unowned: 0,32,32,32
-	enemy_owned: 32,32,32,32
-	player_owned: 96,0,32,32
-
-sidebar-bits: chrome.png
-	indicator-left: 416,48,16,8
-	indicator-right: 416,56,16,8
-	production-tooltip-time: 432, 80, 16, 16
-	production-tooltip-power: 448, 80, 16, 16
-	production-tooltip-cost: 464, 80, 16, 16
-
-production-icons: chrome.png
-	building: 384,0,16,16
-	building-disabled: 384,16,16,16
-	building-alert: 384,32,16,16
-	defence: 400,0,16,16
-	defence-disabled: 400,16,16,16
-	defence-alert: 400,32,16,16
-	infantry: 416,0,16,16
-	infantry-disabled: 416,16,16,16
-	infantry-alert: 416,32,16,16
-	vehicle: 432,0,16,16
-	vehicle-disabled: 432,16,16,16
-	vehicle-alert: 432,32,16,16
-	aircraft: 448,0,16,16
-	aircraft-disabled: 448,16,16,16
-	aircraft-alert: 448,32,16,16
-	support: 464,0,16,16
-	support-disabled: 464,16,16,16
-	support-alert: 464,32,16,16
-
-order-icons: chrome.png
-	options: 480,0,16,16
-	options-disabled: 480,16,16,16
-	options-active: 480,32,16,16
-	sell: 496,0,16,16
-	sell-disabled: 496,16,16,16
-	sell-active: 496,32,16,16
-	repair: 384,48,16,16
-	repair-disabled: 384,64,16,16
-	repair-active: 384,80,16,16
-	beacon: 400,48,16,16
-	beacon-disabled: 400,64,16,16
-	beacon-active: 400,80,16,16
-	stats: 464,96,16,16
-	stats-disabled: 480,96,16,16
-	stats-active: 496,96,16,16
-
-command-icons: chrome.png
-	attack-move: 320,128,24,24
-	attack-move-disabled: 320,152,24,24
-	force-move: 344,128,24,24
-	force-move-disabled: 344,152,24,24
-	force-attack: 368,128,24,24
-	force-attack-disabled: 368,152,24,24
-	guard: 392,128,24,24
-	guard-disabled: 392,152,24,24
-	deploy: 416,128,24,24
-	deploy-disabled: 416,152,24,24
-	scatter: 440,128,24,24
-	scatter-disabled: 440,152,24,24
-	stop: 464,128,24,24
-	stop-disabled: 464,152,24,24
-	queue-orders: 488,128,24,24
-	queue-orders-disabled: 488,152,24,24
-
-stance-icons: chrome.png
-	attack-anything: 320,176,16,16
-	attack-anything-disabled: 336,176,16,16
-	attack-anything-active: 352,176,16,16
-	defend: 368,176,16,16
-	defend-disabled: 384,176,16,16
-	defend-active: 400,176,16,16
-	return-fire: 416,176,16,16
-	return-fire-disabled: 432,176,16,16
-	return-fire-active: 448,176,16,16
-	hold-fire: 464,176,16,16
-	hold-fire-disabled: 480,176,16,16
-	hold-fire-active: 496,176,16,16
+strategic: chrome.png
+	unowned: 896,320,32,32
+	critical_unowned: 896,352,32,32
+	enemy_owned: 928,352,32,32
+	player_owned: 992,320,32,32
 
 dropdown: chrome.png
 	separator: 64,1,1,19
 
-command-button: chrome.png
+#
+# Common chrome
+# ===
+#
 
-command-button-hover: chrome.png
-	background: 2,130,60,60
+sidebar: chrome.png
+	background-sidebar: 512,0,230,315
+	background-commandbar: 512,468,494,44
 
-command-button-disabled: chrome.png
+sidebar-bits: chrome.png
+	indicator-left: 960,0,16,8
+	indicator-right: 960,8,16,8
+	production-tooltip-time: 896,48,16,16
+	production-tooltip-power: 864,48,16,16
+	production-tooltip-cost: 836,48,16,16
 
-command-button-pressed: chrome.png
-	background: 66,194,60,60
+vertical-bars: chrome.png
+	power: 743,0,10,190
+	silo: 754,0,10,190
 
-command-button-highlighted: chrome.png
-	background: 257,129,30,30
+production-icons: chrome.png
+	building: 768,64,16,16
+	building-disabled: 768,80,16,16
+	building-alert: 768,96,16,16
+	defence: 784,64,16,16
+	defence-disabled: 784,80,16,16
+	defence-alert: 784,96,16,16
+	infantry: 800,64,16,16
+	infantry-disabled: 800,80,16,16
+	infantry-alert: 800,96,16,16
+	vehicle: 816,64,16,16
+	vehicle-disabled: 816,80,16,16
+	vehicle-alert: 816,96,16,16
+	aircraft: 832,64,16,16
+	aircraft-disabled: 832,80,16,16
+	aircraft-alert: 832,96,16,16
 
-command-button-highlighted-hover: chrome.png
-	background: 289,129,30,30
+order-icons: chrome.png
+	repair: 896,64,16,16
+	repair-disabled: 896,80,16,16
+	repair-active: 896,96,16,16
+	sell: 880,64,16,16
+	sell-disabled: 880,80,16,16
+	sell-active: 880,96,16,16
+	options: 864,64,16,16
+	options-disabled: 864,80,16,16
+	options-active: 864,96,16,16
+	beacon: 912,64,16,16
+	beacon-disabled: 912,80,16,16
+	beacon-active: 912,96,16,16
+	stats: 960,64,16,16
+	stats-disabled: 960,80,16,16
+	stats-active: 960,96,16,16
 
-command-button-highlighted-pressed: chrome.png
-	background: 257,161,30,30
+power-icons: chrome.png
+	power-normal: 864,48,16,16
+	power-critical: 880,48,16,16
 
-command-button-highlighted-disabled: chrome.png
-	background: 289,161,30,30
+cash-icons: chrome.png
+	cash-normal: 832,48,16,16
+	cash-critical: 848,48,16,16
 
-stance-button: chrome.png
-	background: 2,194,60,60
+stance-icons: chrome.png
+	attack-anything: 768,112,16,16
+	attack-anything-disabled: 768,128,16,16
+	attack-anything-active: 768,144,16,16
+	defend: 784,112,16,16
+	defend-disabled: 784,128,16,16
+	defend-active: 784,144,16,16
+	return-fire: 800,112,16,16
+	return-fire-disabled: 800,128,16,16
+	return-fire-active: 800,144,16,16
+	hold-fire: 816,112,16,16
+	hold-fire-disabled: 816,128,16,16
+	hold-fire-active: 816,144,16,16
 
-stance-button-hover: chrome.png
-	background: 2,130,60,60
+command-icons: chrome.png
+	attack-move: 768,248,24,24
+	attack-move-disabled: 768,272,24,24
+	attack-move-active: 768,296,24,24
+	force-move: 792,248,24,24
+	force-move-disabled: 792,272,24,24
+	force-move-active: 792,296,24,24
+	force-attack: 816,248,24,24
+	force-attack-disabled: 816,272,24,24
+	force-attack-active: 816,296,24,24
+	guard: 840,248,24,24
+	guard-disabled: 840,272,24,24
+	guard-active: 840,296,24,24
+	deploy: 864,248,24,24
+	deploy-disabled: 864,272,24,24
+	deploy-active: 864,296,24,24
+	scatter: 888,248,24,24
+	scatter-disabled: 888,272,24,24
+	scatter-active: 888,296,24,24
+	stop: 912,248,24,24
+	stop-disabled: 912,272,24,24
+	stop-active: 912,296,24,24
+	queue-orders: 936,248,24,24
+	queue-orders-disabled: 936,272,24,24
+	queue-orders-active: 936,296,24,24
 
-stance-button-disabled: chrome.png
-	background: 66,130,60,60
+#
+# NOD chrome
+# ===
+#
 
-stance-button-pressed: chrome.png
-	background: 66,194,60,60
+chrome-button-background-nod: chrome.png
+	background: 192,0,32,32
+chrome-button-background-nod-hover: chrome.png
+	background: 224,0,32,32
+chrome-button-background-nod-disabled: chrome.png
+	background: 192,0,32,32
+chrome-button-background-nod-pressed: chrome.png
+	background: 224,32,32,32
+chrome-button-background-nod-highlighted: chrome.png
+	background: 192,64,32,32
+chrome-button-background-nod-highlighted-hover: chrome.png
+	background: 224,64,32,32
+chrome-button-background-nod-highlighted-pressed: chrome.png
+	background: 192,96,32,32
+chrome-button-background-nod-highlighted-disabled: chrome.png
+	background: 224,96,32,32
 
-stance-button-highlighted: chrome.png
-	background: 257,129,30,30
+chrome-button-nod: chrome.png
+	separator: 744,192,22,22
 
-stance-button-highlighted-hover: chrome.png
-	background: 289,129,30,30
+chrome-radar-nod: chrome.png
+	logo: 512,320,132,132
 
-stance-button-highlighted-pressed: chrome.png
-	background: 257,161,30,30
+#
+# GDI chrome
+# ===
+#
 
-stance-button-highlighted-disabled: chrome.png
-	background: 289,161,30,30
+chrome-button-background-gdi: chrome.png
+	background: 448,0,32,32
+chrome-button-background-gdi-hover: chrome.png
+	background: 480,0,32,32
+chrome-button-background-gdi-disabled: chrome.png
+	background: 448,0,32,32
+chrome-button-background-gdi-pressed: chrome.png
+	background: 480,32,32,32
+chrome-button-background-gdi-highlighted: chrome.png
+	background: 448,64,32,32
+chrome-button-background-gdi-highlighted-hover: chrome.png
+	background: 480,64,32,32
+chrome-button-background-gdi-highlighted-pressed: chrome.png
+	background: 448,96,32,32
+chrome-button-background-gdi-highlighted-disabled: chrome.png
+	background: 480,96,32,32
+
+chrome-button-gdi: chrome.png
+	separator: 745,192,22,22
+
+chrome-radar-gdi: chrome.png
+	logo: 644,320,132,132
diff --git a/mods/cnc/chrome/ingame-chat.yaml b/mods/cnc/chrome/ingame-chat.yaml
index 7589b5cffd..705f366831 100644
--- a/mods/cnc/chrome/ingame-chat.yaml
+++ b/mods/cnc/chrome/ingame-chat.yaml
@@ -1,6 +1,6 @@
 Container@CHAT_PANEL:
 	X: (WINDOW_RIGHT - WIDTH) / 2
-	Y: WINDOW_BOTTOM - HEIGHT - 45
+	Y: WINDOW_BOTTOM - HEIGHT - 56
 	Width: 550
 	Height: 194
 	Logic: IngameChatLogic
diff --git a/mods/cnc/chrome/ingame.yaml b/mods/cnc/chrome/ingame.yaml
index e8a6f4c726..700ecbc879 100644
--- a/mods/cnc/chrome/ingame.yaml
+++ b/mods/cnc/chrome/ingame.yaml
@@ -57,27 +57,6 @@ Container@INGAME_ROOT:
 					BookmarkSaveKeyPrefix: MapBookmarkSave
 					BookmarkRestoreKeyPrefix: MapBookmarkRestore
 					BookmarkKeyCount: 4
-				Container@GAME_TIMER_BLOCK:
-					Logic: GameTimerLogic
-					X: WINDOW_RIGHT / 2 - WIDTH
-					Width: 100
-					Height: 55
-					Children:
-						LabelWithTooltip@GAME_TIMER:
-							Width: PARENT_RIGHT
-							Height: 30
-							Align: Center
-							Font: Title
-							Contrast: true
-							TooltipContainer: TOOLTIP_CONTAINER
-							TooltipTemplate: SIMPLE_TOOLTIP
-						Label@GAME_TIMER_STATUS:
-							Y: 35
-							Width: PARENT_RIGHT
-							Height: 15
-							Align: Center
-							Font: Bold
-							Contrast: true
 				Container@PLAYER_ROOT:
 		Container@MENU_ROOT:
 		TooltipContainer@TOOLTIP_CONTAINER:
@@ -94,7 +73,7 @@ Container@PERF_WIDGETS:
 			VAlign: Top
 		Background@GRAPH_BG:
 			X: 5
-			Y: WINDOW_BOTTOM - HEIGHT - 45
+			Y: WINDOW_BOTTOM - HEIGHT - 56
 			Width: 220
 			Height: 220
 			Background: panel-black
@@ -114,6 +93,27 @@ Container@OBSERVER_WIDGETS:
 		StatisticsGraphKey: StatisticsGraph
 		StatisticsArmyGraphKey: StatisticsArmyGraph
 	Children:
+		Container@GAME_TIMER_BLOCK:
+			Logic: GameTimerLogic
+			X: WINDOW_RIGHT / 2 - WIDTH
+			Width: 100
+			Height: 55
+			Children:
+				LabelWithTooltip@GAME_TIMER:
+					Width: PARENT_RIGHT
+					Height: 30
+					Align: Center
+					Font: Title
+					Contrast: true
+					TooltipContainer: TOOLTIP_CONTAINER
+					TooltipTemplate: SIMPLE_TOOLTIP
+				Label@GAME_TIMER_STATUS:
+					Y: 35
+					Width: PARENT_RIGHT
+					Height: 15
+					Align: Center
+					Font: Bold
+					Contrast: true
 		LogicKeyListener@OBSERVER_KEY_LISTENER:
 		MenuButton@OPTIONS_BUTTON:
 			Key: escape
@@ -296,6 +296,7 @@ Container@PLAYER_WIDGETS:
 				Container@PALETTE_BACKGROUND:
 					Children:
 						Background@ICON_TEMPLATE:
+							Logic: AddFactionSuffixLogic
 							Width: 66
 							Height: 50
 							ClickThrough: false
@@ -308,21 +309,30 @@ Container@PLAYER_WIDGETS:
 					HoldText: On Hold
 					HotkeyPrefix: SupportPower
 					HotkeyCount: 6
-		Background@COMMAND_BAR:
-			Logic: CommandBarLogic
+		Image@COMMAND_BAR_BACKGROUND:
 			X: 5
 			Y: WINDOW_BOTTOM - HEIGHT - 5
-			Background: panel-black
-			Width: 276
-			Height: 36
+			Width: 494
+			Height: 44
+			ImageCollection: sidebar
+			ImageName: background-commandbar
+			ClickThrough: False
+		Container@COMMAND_BAR:
+			Logic: CommandBarLogic
+				HighlightOnButtonPress: True
+			X: 14
+			Y: WINDOW_BOTTOM - HEIGHT - 14
+			Width: 311
+			Height: 26
 			Children:
 				LogicKeyListener@MODIFIER_OVERRIDES:
 				Button@ATTACK_MOVE:
-					X: 1
-					Y: 1
-					Width: 34
-					Height: 34
-					Background: command-button
+					Logic: AddFactionSuffixLogic
+					X: 0
+					Y: 0
+					Width: 38
+					Height: 26
+					Background: chrome-button-background
 					Key: AttackMove
 					DisableKeySound: true
 					TooltipText: Attack Move
@@ -331,16 +341,23 @@ Container@PLAYER_WIDGETS:
 					TooltipTemplate: BUTTON_WITH_DESC_HIGHLIGHT_TOOLTIP
 					Children:
 						Image@ICON:
-							X: 5
-							Y: 5
+							X: 7
+							Y: 1
 							ImageCollection: command-icons
 							ImageName: attack-move
+						Image@SEPARATOR:
+							Logic: AddFactionSuffixLogic
+							X: 38
+							Y: 2
+							ImageCollection: chrome-button
+							ImageName: separator
 				Button@FORCE_MOVE:
-					X: 35
-					Y: 1
-					Width: 34
-					Height: 34
-					Background: command-button
+					Logic: AddFactionSuffixLogic
+					X: 39
+					Y: 0
+					Width: 38
+					Height: 26
+					Background: chrome-button-background
 					DisableKeySound: true
 					TooltipText: Force Move
 					TooltipDesc: Selected units will move to the desired location\n - Default activity for the target is suppressed\n - Vehicles will attempt to crush enemies at the target location\n - Units entering transports will consider nearby alternatives\n\nLeft-click icon then right-click on target.\nHold {(Alt)} to activate temporarily while commanding units.
@@ -348,16 +365,23 @@ Container@PLAYER_WIDGETS:
 					TooltipTemplate: BUTTON_WITH_DESC_HIGHLIGHT_TOOLTIP
 					Children:
 						Image@ICON:
-							X: 5
-							Y: 5
+							X: 7
+							Y: 1
 							ImageCollection: command-icons
 							ImageName: force-move
+						Image@SEPARATOR:
+							Logic: AddFactionSuffixLogic
+							X: 38
+							Y: 2
+							ImageCollection: chrome-button
+							ImageName: separator
 				Button@FORCE_ATTACK:
-					X: 69
-					Y: 1
-					Width: 34
-					Height: 34
-					Background: command-button
+					Logic: AddFactionSuffixLogic
+					X: 78
+					Y: 0
+					Width: 38
+					Height: 26
+					Background: chrome-button-background
 					DisableKeySound: true
 					TooltipText: Force Attack
 					TooltipDesc: Selected units will attack the targeted unit or location\n - Default activity for the target is suppressed\n - Allows targeting of own or ally forces\n - Long-range artillery units will always target the\n   location, ignoring units and buildings\n\nLeft-click icon then right-click on target.\nHold {(Ctrl)} to activate temporarily while commanding units.
@@ -365,16 +389,23 @@ Container@PLAYER_WIDGETS:
 					TooltipTemplate: BUTTON_WITH_DESC_HIGHLIGHT_TOOLTIP
 					Children:
 						Image@ICON:
-							X: 5
-							Y: 5
+							X: 7
+							Y: 1
 							ImageCollection: command-icons
 							ImageName: force-attack
+						Image@SEPARATOR:
+							Logic: AddFactionSuffixLogic
+							X: 38
+							Y: 2
+							ImageCollection: chrome-button
+							ImageName: separator
 				Button@GUARD:
-					X: 105
-					Y: 1
-					Width: 34
-					Height: 34
-					Background: command-button
+					Logic: AddFactionSuffixLogic
+					X: 117
+					Y: 0
+					Width: 38
+					Height: 26
+					Background: chrome-button-background
 					Key: Guard
 					DisableKeySound: true
 					TooltipText: Guard
@@ -382,16 +413,23 @@ Container@PLAYER_WIDGETS:
 					TooltipContainer: TOOLTIP_CONTAINER
 					Children:
 						Image@ICON:
-							X: 5
-							Y: 5
+							X: 7
+							Y: 1
 							ImageCollection: command-icons
 							ImageName: guard
+						Image@SEPARATOR:
+							Logic: AddFactionSuffixLogic
+							X: 38
+							Y: 2
+							ImageCollection: chrome-button
+							ImageName: separator
 				Button@DEPLOY:
-					X: 139
-					Y: 1
-					Width: 34
-					Height: 34
-					Background: command-button
+					Logic: AddFactionSuffixLogic
+					X: 156
+					Y: 0
+					Width: 38
+					Height: 26
+					Background: chrome-button-background
 					Key: Deploy
 					DisableKeyRepeat: true
 					DisableKeySound: true
@@ -400,16 +438,23 @@ Container@PLAYER_WIDGETS:
 					TooltipContainer: TOOLTIP_CONTAINER
 					Children:
 						Image@ICON:
-							X: 5
-							Y: 5
+							X: 7
+							Y: 1
 							ImageCollection: command-icons
 							ImageName: deploy
+						Image@SEPARATOR:
+							Logic: AddFactionSuffixLogic
+							X: 38
+							Y: 2
+							ImageCollection: chrome-button
+							ImageName: separator
 				Button@SCATTER:
-					X: 173
-					Y: 1
-					Width: 34
-					Height: 34
-					Background: command-button
+					Logic: AddFactionSuffixLogic
+					X: 195
+					Y: 0
+					Width: 38
+					Height: 26
+					Background: chrome-button-background
 					Key: Scatter
 					DisableKeyRepeat: true
 					DisableKeySound: true
@@ -418,16 +463,23 @@ Container@PLAYER_WIDGETS:
 					TooltipContainer: TOOLTIP_CONTAINER
 					Children:
 						Image@ICON:
-							X: 5
-							Y: 5
+							X: 7
+							Y: 1
 							ImageCollection: command-icons
 							ImageName: scatter
+						Image@SEPARATOR:
+							Logic: AddFactionSuffixLogic
+							X: 38
+							Y: 2
+							ImageCollection: chrome-button
+							ImageName: separator
 				Button@STOP:
-					X: 207
-					Y: 1
-					Width: 34
-					Height: 34
-					Background: command-button
+					Logic: AddFactionSuffixLogic
+					X: 234
+					Y: 0
+					Width: 38
+					Height: 26
+					Background: chrome-button-background
 					Key: Stop
 					DisableKeyRepeat: true
 					DisableKeySound: true
@@ -436,16 +488,23 @@ Container@PLAYER_WIDGETS:
 					TooltipContainer: TOOLTIP_CONTAINER
 					Children:
 						Image@ICON:
-							X: 5
-							Y: 5
+							X: 7
+							Y: 1
 							ImageCollection: command-icons
 							ImageName: stop
+						Image@SEPARATOR:
+							Logic: AddFactionSuffixLogic
+							X: 38
+							Y: 2
+							ImageCollection: chrome-button
+							ImageName: separator
 				Button@QUEUE_ORDERS:
-					X: 241
-					Y: 1
-					Width: 34
-					Height: 34
-					Background: command-button
+					Logic: AddFactionSuffixLogic
+					X: 273
+					Y: 0
+					Width: 38
+					Height: 26
+					Background: chrome-button-background
 					DisableKeySound: true
 					TooltipText: Waypoint Mode
 					TooltipDesc: Use Waypoint Mode to give multiple linking commands\nto the selected units. Units will execute the commands\nimmediately upon receiving them.\n\nLeft-click icon then give commands in the game world.\nHold {(Shift)} to activate temporarily while commanding units.
@@ -453,24 +512,24 @@ Container@PLAYER_WIDGETS:
 					TooltipTemplate: BUTTON_WITH_DESC_HIGHLIGHT_TOOLTIP
 					Children:
 						Image@ICON:
-							X: 5
-							Y: 5
+							X: 7
+							Y: 1
 							ImageCollection: command-icons
 							ImageName: queue-orders
-		Background@STANCE_BAR:
+		Container@STANCE_BAR:
 			Logic: StanceSelectorLogic
-			X: 280
-			Y: WINDOW_BOTTOM - HEIGHT - 5
-			Background: panel-black
-			Width: 138
-			Height: 28
+			X: 335
+			Y: WINDOW_BOTTOM - HEIGHT - 14
+			Width: 155
+			Height: 26
 			Children:
 				Button@STANCE_ATTACKANYTHING:
-					X: 1
-					Y: 1
-					Width: 34
+					Logic: AddFactionSuffixLogic
+					X: 0
+					Y: 0
+					Width: 38
 					Height: 26
-					Background: stance-button
+					Background: chrome-button-background
 					Key: StanceAttackAnything
 					DisableKeyRepeat: true
 					DisableKeySound: true
@@ -479,16 +538,23 @@ Container@PLAYER_WIDGETS:
 					TooltipContainer: TOOLTIP_CONTAINER
 					Children:
 						Image@ICON:
-							X: 9
+							X: 11
 							Y: 5
 							ImageCollection: stance-icons
 							ImageName: attack-anything
+						Image@SEPARATOR:
+							Logic: AddFactionSuffixLogic
+							X: 38
+							Y: 2
+							ImageCollection: chrome-button
+							ImageName: separator
 				Button@STANCE_DEFEND:
-					X: 35
-					Y: 1
-					Width: 34
+					Logic: AddFactionSuffixLogic
+					X: 39
+					Y: 0
+					Width: 38
 					Height: 26
-					Background: stance-button
+					Background: chrome-button-background
 					Key: StanceDefend
 					DisableKeyRepeat: true
 					DisableKeySound: true
@@ -497,16 +563,23 @@ Container@PLAYER_WIDGETS:
 					TooltipContainer: TOOLTIP_CONTAINER
 					Children:
 						Image@ICON:
-							X: 9
+							X: 11
 							Y: 5
 							ImageCollection: stance-icons
 							ImageName: defend
+						Image@SEPARATOR:
+							Logic: AddFactionSuffixLogic
+							X: 38
+							Y: 2
+							ImageCollection: chrome-button
+							ImageName: separator
 				Button@STANCE_RETURNFIRE:
-					X: 69
-					Y: 1
-					Width: 34
+					Logic: AddFactionSuffixLogic
+					X: 78
+					Y: 0
+					Width: 38
 					Height: 26
-					Background: stance-button
+					Background: chrome-button-background
 					Key: StanceReturnFire
 					DisableKeyRepeat: true
 					DisableKeySound: true
@@ -515,16 +588,23 @@ Container@PLAYER_WIDGETS:
 					TooltipContainer: TOOLTIP_CONTAINER
 					Children:
 						Image@ICON:
-							X: 9
+							X: 11
 							Y: 5
 							ImageCollection: stance-icons
 							ImageName: return-fire
+						Image@SEPARATOR:
+							Logic: AddFactionSuffixLogic
+							X: 38
+							Y: 2
+							ImageCollection: chrome-button
+							ImageName: separator
 				Button@STANCE_HOLDFIRE:
-					X: 103
-					Y: 1
-					Width: 34
+					Logic: AddFactionSuffixLogic
+					X: 117
+					Y: 0
+					Width: 38
 					Height: 26
-					Background: stance-button
+					Background: chrome-button-background
 					Key: StanceHoldFire
 					DisableKeyRepeat: true
 					DisableKeySound: true
@@ -533,238 +613,327 @@ Container@PLAYER_WIDGETS:
 					TooltipContainer: TOOLTIP_CONTAINER
 					Children:
 						Image@ICON:
-							X: 9
+							X: 11
 							Y: 5
 							ImageCollection: stance-icons
 							ImageName: hold-fire
-		Background@SIDEBAR_BACKGROUND:
-			Logic: MenuButtonsChromeLogic
-			X: WINDOW_RIGHT - 204
-			Y: 30
-			Width: 194
-			Height: 240
-			Background: panel-black
+		Image@SIDEBAR_BACKGROUND:
+			X: WINDOW_RIGHT - WIDTH - 5
+			Y: 5
+			Width: 230
+			Height: 291
+			ImageCollection: sidebar
+			ImageName: background-sidebar
+			ClickThrough: false
 			Children:
-				MenuButton@OPTIONS_BUTTON:
-					X: 22
-					Y: 0 - 24
-					Width: 30
-					Height: 25
-					Font: Bold
-					Key: escape
-					TooltipText: Menu
-					TooltipContainer: TOOLTIP_CONTAINER
-					DisableWorldSounds: true
+				Container@TOP_BUTTONS:
+					Logic: MenuButtonsChromeLogic
+					X: 18
+					Y: 1
 					Children:
-						Image@ICON:
-							X: 7
-							Y: 5
-							ImageCollection: order-icons
-							ImageName: options
-				Button@BEACON_BUTTON:
-					Logic: BeaconOrderButtonLogic
-					X: 62
-					Y: 0 - 24
-					Width: 30
-					Height: 25
-					Font: Bold
-					Key: PlaceBeacon
-					TooltipText: Place Beacon
-					TooltipContainer: TOOLTIP_CONTAINER
-					Children:
-						Image@ICON:
-							X: 7
-							Y: 5
-							ImageCollection: order-icons
-				Button@SELL_BUTTON:
-					Logic: SellOrderButtonLogic
-					X: 102
-					Y: 0 - 24
-					Width: 30
-					Height: 25
-					Font: Bold
-					Key: Sell
-					TooltipText: Sell
-					TooltipContainer: TOOLTIP_CONTAINER
-					Children:
-						Image@ICON:
-							X: 7
-							Y: 5
-							ImageCollection: order-icons
-				Button@REPAIR_BUTTON:
-					Logic: RepairOrderButtonLogic
-					X: 142
-					Y: 0 - 24
-					Width: 30
-					Height: 25
-					Font: Bold
-					Key: Repair
-					TooltipText: Repair
-					TooltipContainer: TOOLTIP_CONTAINER
-					Children:
-						Image@ICON:
-							X: 7
-							Y: 5
-							ImageCollection: order-icons
-				Background@RADAR:
-					X: 13
-					Y: 5
-					Width: 168
-					Height: 168
-					Background: panel-gray
+						Button@SELL_BUTTON:
+							Logic: SellOrderButtonLogic, AddFactionSuffixLogic
+							X: 0
+							Width: 28
+							Height: 26
+							Background: chrome-button-background
+							Key: Sell
+							TooltipText: Sell
+							TooltipContainer: TOOLTIP_CONTAINER
+							VisualHeight: 0
+							Children:
+								Image@ICON:
+									X: 6
+									Y: 5
+									ImageCollection: order-icons
+								Image@SEPARATOR:
+									Logic: AddFactionSuffixLogic
+									X: 28
+									Y: 2
+									ImageCollection: chrome-button
+									ImageName: separator
+						Button@REPAIR_BUTTON:
+							Logic: RepairOrderButtonLogic, AddFactionSuffixLogic
+							X: 29
+							Width: 28
+							Height: 26
+							Background: chrome-button-background
+							Key: Repair
+							TooltipText: Repair
+							TooltipContainer: TOOLTIP_CONTAINER
+							VisualHeight: 0
+							Children:
+								Image@ICON:
+									X: 6
+									Y: 5
+									ImageCollection: order-icons
+								Image@SEPARATOR:
+									Logic: AddFactionSuffixLogic
+									X: 28
+									Y: 2
+									ImageCollection: chrome-button
+									ImageName: separator
+						Button@BEACON_BUTTON:
+							Logic: BeaconOrderButtonLogic, AddFactionSuffixLogic
+							X: 58
+							Width: 28
+							Height: 26
+							Background: chrome-button-background
+							Key: PlaceBeacon
+							TooltipText: Place Beacon
+							TooltipContainer: TOOLTIP_CONTAINER
+							VisualHeight: 0
+							Children:
+								Image@ICON:
+									X: 6
+									Y: 5
+									ImageCollection: order-icons
+						MenuButton@OPTIONS_BUTTON:
+							Logic: AddFactionSuffixLogic
+							Key: escape
+							X: 156
+							Width: 38
+							Height: 26
+							Background: chrome-button-background
+							TooltipText: Options
+							TooltipContainer: TOOLTIP_CONTAINER
+							DisableWorldSounds: true
+							VisualHeight: 0
+							Children:
+								Image@ICON:
+									X: 11
+									Y: 5
+									ImageCollection: order-icons
+									ImageName: options
+				Container@RADAR:
+					Logic: IngameRadarDisplayLogic
+					X: 18
+					Y: 39
 					Children:
+						LogicTicker@RADAR_TICKER:
+						ColorBlock@RADAR_FADETOBLACK:
+							Width: 194
+							Height: 194
+						Image@RADAR_LOGO:
+							Logic: AddFactionSuffixLogic
+							X: 31
+							Y: 31
+							ImageCollection: chrome-radar
+							ImageName: logo
 						Radar@RADAR_MINIMAP:
-							Logic: IngameRadarDisplayLogic
-							X: 1
-							Y: 1
-							Width: PARENT_RIGHT - 2
-							Height: PARENT_BOTTOM - 2
 							WorldInteractionController: INTERACTION_CONTROLLER
+							Width: 194
+							Height: 194
 							SoundUp: RadarUp
 							SoundDown: RadarDown
-							Children:
-								LogicTicker@RADAR_TICKER:
 						VqaPlayer@PLAYER:
-							X: 1
-							Y: 1
-							Width: PARENT_RIGHT - 2
-							Height: PARENT_BOTTOM - 2
+							Width: 194
+							Height: 194
 							Skippable: false
-				Background@POWERBAR_PANEL:
+				Container@POWERBAR_PANEL:
 					Logic: IngamePowerBarLogic
-					X: 4
-					Y: 5
+					X: 0
+					Y: 51
 					Width: 10
-					Height: 168
-					Background: panel-black
+					Height: 190
 					Children:
 						ResourceBar@POWERBAR:
-							X: 1
-							Y: 1
-							Width: PARENT_RIGHT - 2
+							Width: 10
 							Height: PARENT_BOTTOM - 2
 							TooltipContainer: TOOLTIP_CONTAINER
 							TooltipTemplate: SIMPLE_TOOLTIP
 							IndicatorImage: indicator-left
-				Background@SILOBAR_PANEL:
+						Image@POWERBAR_PANEL:
+							ImageCollection: vertical-bars
+							ImageName: power
+				Container@SILOBAR_PANEL:
 					Logic: IngameSiloBarLogic
-					X: 180
-					Y: 5
+					X: 220
+					Y: 51
 					Width: 10
-					Height: 168
-					Background: panel-black
+					Height: 190
 					Children:
 						ResourceBar@SILOBAR:
-							X: 1
-							Y: 1
-							Width: PARENT_RIGHT - 2
+							Width: 10
 							Height: PARENT_BOTTOM - 2
 							TooltipContainer: TOOLTIP_CONTAINER
 							TooltipTemplate: SIMPLE_TOOLTIP
 							IndicatorImage: indicator-right
+						Image@SILOBAR_PANEL:
+							ImageCollection: vertical-bars
+							ImageName: silo
+				Label@GAME_TIMER:
+					Logic: GameTimerLogic
+					X: 0
+					Y: 233
+					Width: PARENT_RIGHT
+					Height: 22
+					Align: Center
+					Font: TinyBold
+				LabelWithTooltip@POWER:
+					Logic: IngamePowerCounterLogic
+					X: 35
+					Y: 232
+					Width: 50
+					Height: 22
+					Font: Bold
+					Text: {0}
+					TooltipContainer: TOOLTIP_CONTAINER
+					TooltipTemplate: SIMPLE_TOOLTIP
+					Children:
+						Image@POWER_ICON:
+							X: 0 - 16
+							Y: 5
+							ImageCollection: power-icons
+							ImageName: power-normal
 				LabelWithTooltip@CASH:
 					Logic: IngameCashCounterLogic
-					Y: 170
-					Width: PARENT_RIGHT
-					Height: 25
-					Align: Center
+					X: PARENT_RIGHT - WIDTH - 35
+					Y: 232
+					Width: 50
+					Height: 22
+					Align: Right
 					Font: Bold
-					Text: ${0}
+					Text: {0}
+					TooltipContainer: TOOLTIP_CONTAINER
+					TooltipTemplate: SIMPLE_TOOLTIP
+					Children:
+						Image@CASH_ICON:
+							X: PARENT_RIGHT
+							Y: 5
+							ImageCollection: cash-icons
+							ImageName: cash-normal
 				Container@PRODUCTION_TYPES:
-					X: 12
-					Y: 197
-					Width: 170
-					Height: 30
+					X: 18
+					Y: 267
+					Width: 194
+					Height: 26
 					Children:
 						ProductionTypeButton@BUILDING:
-							Width: 30
-							Height: 30
+							Logic: AddFactionSuffixLogic
+							Width: 38
+							Height: 26
+							Background: chrome-button-background
 							TooltipText: Buildings
 							TooltipContainer: TOOLTIP_CONTAINER
 							ProductionGroup: Building
 							Key: ProductionTypeBuilding
 							Children:
 								Image@ICON:
-									X: 7
-									Y: 7
+									X: 11
+									Y: 5
 									ImageCollection: production-icons
+								Image@SEPARATOR:
+									Logic: AddFactionSuffixLogic
+									X: 38
+									Y: 2
+									ImageCollection: chrome-button
+									ImageName: separator
 						ProductionTypeButton@DEFENCE:
-							X: 35
-							Width: 30
-							Height: 30
+							Logic: AddFactionSuffixLogic
+							X: 39
+							Width: 38
+							Height: 26
+							Background: chrome-button-background
 							TooltipText: Support
 							TooltipContainer: TOOLTIP_CONTAINER
 							ProductionGroup: Defence
 							Key: ProductionTypeDefense
 							Children:
 								Image@ICON:
-									X: 7
-									Y: 7
+									X: 11
+									Y: 5
 									ImageCollection: production-icons
+								Image@SEPARATOR:
+									Logic: AddFactionSuffixLogic
+									X: 38
+									Y: 2
+									ImageCollection: chrome-button
+									ImageName: separator
 						ProductionTypeButton@INFANTRY:
-							X: 70
-							Width: 30
-							Height: 30
+							Logic: AddFactionSuffixLogic
+							X: 78
+							Width: 38
+							Height: 26
+							Background: chrome-button-background
 							TooltipText: Infantry
 							TooltipContainer: TOOLTIP_CONTAINER
 							ProductionGroup: Infantry
 							Key: ProductionTypeInfantry
 							Children:
 								Image@ICON:
-									X: 7
-									Y: 7
+									X: 11
+									Y: 5
 									ImageCollection: production-icons
+								Image@SEPARATOR:
+									Logic: AddFactionSuffixLogic
+									X: 38
+									Y: 2
+									ImageCollection: chrome-button
+									ImageName: separator
 						ProductionTypeButton@VEHICLE:
-							X: 105
-							Width: 30
-							Height: 30
+							Logic: AddFactionSuffixLogic
+							X: 117
+							Width: 38
+							Height: 26
+							Background: chrome-button-background
 							TooltipText: Vehicles
 							TooltipContainer: TOOLTIP_CONTAINER
 							ProductionGroup: Vehicle
 							Key: ProductionTypeVehicle
 							Children:
 								Image@ICON:
-									X: 7
-									Y: 7
+									X: 11
+									Y: 5
 									ImageCollection: production-icons
+								Image@SEPARATOR:
+									Logic: AddFactionSuffixLogic
+									X: 38
+									Y: 2
+									ImageCollection: chrome-button
+									ImageName: separator
 						ProductionTypeButton@AIRCRAFT:
-							X: 140
-							Width: 30
-							Height: 30
+							Logic: AddFactionSuffixLogic
+							X: 156
+							Width: 38
+							Height: 26
+							Background: chrome-button-background
 							TooltipText: Aircraft
 							TooltipContainer: TOOLTIP_CONTAINER
 							ProductionGroup: Aircraft
 							Key: ProductionTypeAircraft
 							Children:
 								Image@ICON:
-									X: 7
-									Y: 7
+									X: 11
+									Y: 5
 									ImageCollection: production-icons
 		Container@PRODUCTION_BACKGROUND:
-			X: WINDOW_RIGHT - 204
-			Y: 287
+			X: WINDOW_RIGHT - 5 - 18 - 194
+			Y: 319
 			Children:
 				Background@ICON_TEMPLATE:
+					Logic: AddFactionSuffixLogic
 					Width: 66
 					Height: 50
 					Background: panel-black
 		ProductionPalette@PRODUCTION_PALETTE:
-			X: WINDOW_RIGHT - 203
-			Y: 288
+			X: WINDOW_RIGHT - 5 - 17 - 194
+			Y: 320
+			Width: 192
 			TooltipContainer: TOOLTIP_CONTAINER
 			ReadyText: Ready
 			HoldText: On Hold
 			HotkeyPrefix: Production
 			HotkeyCount: 24
 		ProductionTabs@PRODUCTION_TABS:
-			Logic: ProductionTabsLogic
+			Logic: AddFactionSuffixLogic, ProductionTabsLogic
 			PaletteWidget: PRODUCTION_PALETTE
 			TypesContainer: PRODUCTION_TYPES
 			BackgroundContainer: PRODUCTION_BACKGROUND
 			PreviousProductionTabKey: PreviousProductionTab
 			NextProductionTabKey: NextProductionTab
-			X: WINDOW_RIGHT - 204
-			Y: 268
+			X: WINDOW_RIGHT - 5 - 18 - 194
+			Y: 299
 			Width: 194
 			Height: 20
 
diff --git a/mods/cnc/uibits/chrome.png b/mods/cnc/uibits/chrome.png
index 2bb57bd517..05bfc1acb5 100644
Binary files a/mods/cnc/uibits/chrome.png and b/mods/cnc/uibits/chrome.png differ
diff --git a/mods/cnc/uibits/strategic.png b/mods/cnc/uibits/strategic.png
deleted file mode 100644
index 32be876d2b..0000000000
Binary files a/mods/cnc/uibits/strategic.png and /dev/null differ