diff --git a/mods/ts/chrome.yaml b/mods/ts/chrome.yaml
index 90e8d08e2c..4f08919a6a 100644
--- a/mods/ts/chrome.yaml
+++ b/mods/ts/chrome.yaml
@@ -1,115 +1,393 @@
-chrome-gdi: chrome-gdi.png
-	specialbin-top: 0,0,30,51
-	specialbin-middle: 0,51,30,51
-	specialbin-bottom: 0,153,30,39
-	moneybin: 192,0,320,32
-	tooltip-bg: 0,288,272,136
-	radar: 297,31,210,222
+sidebar-gdi: chrome.png
+	background-top: 0,167,238,290
+	background-iconrow: 0,457,238,47
+	background-bottom: 0,504,238,8
+	background-supportoverlay: 184,118,64,48
 
-sidebar-bits: chrome-gdi.png
-	power-indicator: 187,4,4,7
+sidebar-button-gdi: chrome.png
+	background: 59,31,22,22
+	border-r: 81,31,3,22
+	border-l: 56,31,3,22
+	border-b: 59,53,22,3
+	border-t: 59,28,22,3
+	corner-tl: 56,28,3,3
+	corner-tr: 81,28,3,3
+	corner-bl: 56,53,3,3
+	corner-br: 81,53,3,3
+sidebar-button-gdi-hover: chrome.png
+	background: 59,3,22,22
+	border-r: 81,3,3,22
+	border-l: 56,3,3,22
+	border-b: 59,25,22,3
+	border-t: 59,0,22,3
+	corner-tl: 56,0,3,3
+	corner-tr: 81,0,3,3
+	corner-bl: 56,25,3,3
+	corner-br: 81,25,3,3
+sidebar-button-gdi-pressed: chrome.png
+	background: 59,31,22,22
+	border-r: 81,31,3,22
+	border-l: 56,31,3,22
+	border-b: 59,53,22,3
+	border-t: 59,28,22,3
+	corner-tl: 56,28,3,3
+	corner-tr: 81,28,3,3
+	corner-bl: 56,53,3,3
+	corner-br: 81,53,3,3
+sidebar-button-gdi-highlighted: chrome.png
+	background: 87,31,22,22
+	border-r: 109,31,3,22
+	border-l: 84,31,3,22
+	border-b: 87,53,22,3
+	border-t: 87,28,22,3
+	corner-tl: 84,28,3,3
+	corner-tr: 109,28,3,3
+	corner-bl: 84,53,3,3
+	corner-br: 109,53,3,3
+sidebar-button-gdi-highlighted-hover: chrome.png
+	background: 87,3,22,22
+	border-r: 109,3,3,22
+	border-l: 84,3,3,22
+	border-b: 87,25,22,3
+	border-t: 87,0,22,3
+	corner-tl: 84,0,3,3
+	corner-tr: 109,0,3,3
+	corner-bl: 84,25,3,3
+	corner-br: 109,25,3,3
+sidebar-button-gdi-highlighted-pressed: chrome.png
+	background: 87,31,22,22
+	border-r: 109,31,3,22
+	border-l: 84,31,3,22
+	border-b: 87,53,22,3
+	border-t: 87,28,22,3
+	corner-tl: 84,28,3,3
+	corner-tr: 109,28,3,3
+	corner-bl: 84,53,3,3
+	corner-br: 109,53,3,3
+sidebar-button-gdi-disabled: chrome.png
+	background: 171,3,22,22
+	border-r: 193,3,3,22
+	border-l: 168,3,3,22
+	border-b: 171,25,22,3
+	border-t: 171,0,22,3
+	corner-tl: 168,0,3,3
+	corner-tr: 193,0,3,3
+	corner-bl: 168,25,3,3
+	corner-br: 193,25,3,3
+sidebar-button-gdi-highlighted-disabled: chrome.png
+	background: 171,3,22,22
+	border-r: 193,3,3,22
+	border-l: 168,3,3,22
+	border-b: 171,25,22,3
+	border-t: 171,0,22,3
+	corner-tl: 168,0,3,3
+	corner-tr: 193,0,3,3
+	corner-bl: 168,25,3,3
+	corner-br: 193,25,3,3
 
-palette-gdi: chrome-gdi.png
-	top: 297,288,201,9
-	dock-top: 498,274,14,23
-	bottom: 297,489,201,9
-	dock-bottom: 498,489,14,23
-	bg-0: 297,297,201,48
-	dock-0: 498,297,14,48
-	bg-1: 297,345,201,48
-	dock-1: 498,345,14,48
-	bg-2: 297,393,201,48
-	dock-2: 498,393,14,48
-	bg-3: 297,441,201,48
-	dock-3: 498,441,14,48
+sidebar-nod: chrome.png
+	background-top: 274,167,238,290
+	background-iconrow: 274,457,238,47
+	background-bottom: 274,504,238,8
+	background-supportoverlay: 249,118,64,48
 
-digits-gdi: chrome-gdi.png
-	0: 32,0,13,17
-	1: 45,0,13,17
-	2: 58,0,13,17
-	3: 71,0,13,17
-	4: 84,0,13,17
-	5: 97,0,13,17
-	6: 110,0,13,17
-	7: 123,0,13,17
-	8: 136,0,13,17
-	9: 149,0,13,17
+sidebar-button-nod: chrome.png
+	background: 3,31,22,22
+	border-r: 25,31,3,22
+	border-l: 0,31,3,22
+	border-b: 3,53,22,3
+	border-t: 3,28,22,3
+	corner-tl: 0,28,3,3
+	corner-tr: 25,28,3,3
+	corner-bl: 0,53,3,3
+	corner-br: 25,53,3,3
+sidebar-button-nod-hover: chrome.png
+	background: 3,3,22,22
+	border-r: 25,3,3,22
+	border-l: 0,3,3,22
+	border-b: 3,25,22,3
+	border-t: 3,0,22,3
+	corner-tl: 0,0,3,3
+	corner-tr: 25,0,3,3
+	corner-bl: 0,25,3,3
+	corner-br: 25,25,3,3
+sidebar-button-nod-pressed: chrome.png
+	background: 3,31,22,22
+	border-r: 25,31,3,22
+	border-l: 0,31,3,22
+	border-b: 3,53,22,3
+	border-t: 3,28,22,3
+	corner-tl: 0,28,3,3
+	corner-tr: 25,28,3,3
+	corner-bl: 0,53,3,3
+	corner-br: 25,53,3,3
+sidebar-button-nod-highlighted: chrome.png
+	background: 31,31,22,22
+	border-r: 53,31,3,22
+	border-l: 28,31,3,22
+	border-b: 31,53,22,3
+	border-t: 31,28,22,3
+	corner-tl: 28,28,3,3
+	corner-tr: 53,28,3,3
+	corner-bl: 28,53,3,3
+	corner-br: 53,53,3,3
+sidebar-button-nod-highlighted-hover: chrome.png
+	background: 31,3,22,22
+	border-r: 53,3,3,22
+	border-l: 28,3,3,22
+	border-b: 31,25,22,3
+	border-t: 31,0,22,3
+	corner-tl: 28,0,3,3
+	corner-tr: 53,0,3,3
+	corner-bl: 28,25,3,3
+	corner-br: 53,25,3,3
+sidebar-button-nod-highlighted-pressed: chrome.png
+	background: 31,31,22,22
+	border-r: 53,31,3,22
+	border-l: 28,31,3,22
+	border-b: 31,53,22,3
+	border-t: 31,28,22,3
+	corner-tl: 28,28,3,3
+	corner-tr: 53,28,3,3
+	corner-bl: 28,53,3,3
+	corner-br: 53,53,3,3
+sidebar-button-nod-disabled: chrome.png
+	background: 171,3,22,22
+	border-r: 193,3,3,22
+	border-l: 168,3,3,22
+	border-b: 171,25,22,3
+	border-t: 171,0,22,3
+	corner-tl: 168,0,3,3
+	corner-tr: 193,0,3,3
+	corner-bl: 168,25,3,3
+	corner-br: 193,25,3,3
+sidebar-button-nod-highlighted-disabled: chrome.png
+	background: 171,3,22,22
+	border-r: 193,3,3,22
+	border-l: 168,3,3,22
+	border-b: 171,25,22,3
+	border-t: 171,0,22,3
+	corner-tl: 168,0,3,3
+	corner-tr: 193,0,3,3
+	corner-bl: 168,25,3,3
+	corner-br: 193,25,3,3
 
-chrome-nod: chrome-nod.png
-	specialbin-top: 0,0,30,51
-	specialbin-middle: 0,51,30,51
-	specialbin-bottom: 0,153,30,39
-	moneybin: 192,0,320,32
-	tooltip-bg: 0,288,272,136
-	radar: 297,31,210,222
+sidebar-bits: chrome.png
+	production-tooltip-time: 416, 80, 16, 16
+	production-tooltip-power: 432, 80, 16, 16
+	production-tooltip-cost: 448, 80, 16, 16
+	production-iconoverlay: 314,118,238,48
 
-palette-nod: chrome-nod.png
-	top: 297,288,201,9
-	dock-top: 498,274,14,23
-	bottom: 297,489,201,9
-	dock-bottom: 498,489,14,23
-	bg-0: 297,297,201,48
-	dock-0: 498,297,14,48
-	bg-1: 297,345,201,48
-	dock-1: 498,345,14,48
-	bg-2: 297,393,201,48
-	dock-2: 498,393,14,48
-	bg-3: 297,441,201,48
-	dock-3: 498,441,14,48
+power-icons: chrome.png
+	power-normal: 350,0,12,18
+	power-critical: 363,0,12,18
 
-digits-nod: chrome-nod.png
-	0: 32,0,13,17
-	1: 45,0,13,17
-	2: 58,0,13,17
-	3: 71,0,13,17
-	4: 84,0,13,17
-	5: 97,0,13,17
-	6: 110,0,13,17
-	7: 123,0,13,17
-	8: 136,0,13,17
-	9: 149,0,13,17
+production-icons: chrome.png
+	building: 384,0,16,16
+	building-disabled: 384,16,16,16
+	building-alert: 384,32,16,16
+	defense: 400,0,16,16
+	defense-disabled: 400,16,16,16
+	defense-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
+	air: 448,0,16,16
+	air-disabled: 448,16,16,16
+	air-alert: 448,32,16,16
 
-tabs-selected: tabs.png
-	gdi-Building: 0,0,27,41
-	gdi-Defense: 0,40,27,41
-	gdi-Infantry: 0,80,27,41
-	gdi-Vehicle: 0,120,27,41
-	gdi-Air: 0,160,27,41
-	gdi-Ship: 0,200,27,41
-	nod-Building: 80,0,27,41
-	nod-Defense: 80,40,27,41
-	nod-Infantry: 80,80,27,41
-	nod-Vehicle: 80,120,27,41
-	nod-Air: 80,160,27,41
-	nod-Ship: 80,200,27,41
+order-icons: chrome.png
+	options: 480,0,16,16
+	options-disabled: 480,16,16,16
+	options-active: 480,32,16,16
+	diplomacy: 464,48,16,16
+	diplomacy-disabled: 464,64,16,16
+	diplomacy-active: 464,80,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
+	power: 480,48,16,16
+	power-disabled: 480,64,16,16
+	power-active: 480,80,16,16
+	stats: 368,48,16,16
+	stats-disabled: 368,64,16,16
+	stats-active: 368,80,16,16
 
-tabs-ready: tabs.png
-	gdi-Building: 27,0,27,41
-	gdi-Defense: 27,40,27,41
-	gdi-Infantry: 27,80,27,41
-	gdi-Vehicle: 27,120,27,41
-	gdi-Air: 27,160,27,41
-	gdi-Ship: 27,200,27,41
-	nod-Building: 107,0,27,41
-	nod-Defense: 107,40,27,41
-	nod-Infantry: 107,80,27,41
-	nod-Vehicle: 107,120,27,41
-	nod-Air: 107,160,27,41
-	nod-Ship: 107,200,27,41
+sidebar-observer: chrome.png
+	background: 512,167,238,287
+	replay-bottom: 512,454,238,40
+	observer-bottom: 512,495,238,8
 
-tabs-normal: tabs.png
-	gdi-Building: 54,0,27,41
-	gdi-Defense: 54,40,27,41
-	gdi-Infantry: 54,80,27,41
-	gdi-Vehicle: 54,120,27,41
-	gdi-Air: 54,160,27,41
-	gdi-Ship: 54,200,27,41
-	nod-Building: 134,0,27,41
-	nod-Defense: 134,40,27,41
-	nod-Infantry: 134,80,27,41
-	nod-Vehicle: 134,120,27,41
-	nod-Air: 134,160,27,41
-	nod-Ship: 134,200,27,41
+sidebar-button-observershroud: chrome.png
+sidebar-button-observershroud-pressed: chrome.png
+sidebar-button-observershroud-hover: chrome.png
+
+sidebar-button-observer: chrome.png
+	background: 117,33,18,18
+	border-r: 135,33,5,18
+	border-l: 112,33,5,18
+	border-b: 117,51,18,5
+	border-t: 117,28,18,5
+	corner-tl: 112,28,5,5
+	corner-tr: 135,28,5,5
+	corner-bl: 112,51,5,5
+	corner-br: 135,51,5,5
+sidebar-button-observer-hover: chrome.png
+	background: 117,5,18,18
+	border-r: 135,5,5,18
+	border-l: 112,5,5,18
+	border-b: 117,23,18,5
+	border-t: 117,0,18,5
+	corner-tl: 112,0,5,5
+	corner-tr: 135,0,5,5
+	corner-bl: 112,23,5,5
+	corner-br: 135,23,5,5
+sidebar-button-observer-pressed: chrome.png
+	background: 117,33,18,18
+	border-r: 135,33,5,18
+	border-l: 112,33,5,18
+	border-b: 117,51,18,5
+	border-t: 117,28,18,5
+	corner-tl: 112,28,5,5
+	corner-tr: 135,28,5,5
+	corner-bl: 112,51,5,5
+	corner-br: 135,51,5,5
+sidebar-button-observer-highlighted: chrome.png
+	background: 145,33,18,18
+	border-r: 163,33,5,18
+	border-l: 140,33,5,18
+	border-b: 145,51,18,5
+	border-t: 145,28,18,5
+	corner-tl: 140,28,5,5
+	corner-tr: 163,28,5,5
+	corner-bl: 140,51,5,5
+	corner-br: 163,51,5,5
+sidebar-button-observer-highlighted-hover: chrome.png
+	background: 145,5,18,18
+	border-r: 163,5,5,18
+	border-l: 140,5,5,18
+	border-b: 145,23,18,5
+	border-t: 145,0,18,5
+	corner-tl: 140,0,5,5
+	corner-tr: 163,0,5,5
+	corner-bl: 140,23,5,5
+	corner-br: 163,23,5,5
+sidebar-button-observer-highlighted-pressed: chrome.png
+	background: 33,33,18,18
+	border-r: 51,33,5,18
+	border-l: 28,33,5,18
+	border-b: 33,51,18,5
+	border-t: 33,28,18,5
+	corner-tl: 28,28,5,5
+	corner-tr: 51,28,5,5
+	corner-bl: 28,51,5,5
+	corner-br: 51,51,5,5
+sidebar-button-observer-disabled: chrome.png
+	background: 173,5,18,18
+	border-r: 191,5,5,18
+	border-l: 168,5,5,18
+	border-b: 173,23,18,5
+	border-t: 173,0,18,5
+	corner-tl: 168,0,5,5
+	corner-tr: 191,0,5,5
+	corner-bl: 168,23,5,5
+	corner-br: 191,23,5,5
+sidebar-button-observer-highlighted-disabled: chrome.png
+	background: 173,5,18,18
+	border-r: 191,5,5,18
+	border-l: 168,5,5,18
+	border-b: 173,23,18,5
+	border-t: 173,0,18,5
+	corner-tl: 168,0,5,5
+	corner-tr: 191,0,5,5
+	corner-bl: 168,23,5,5
+	corner-br: 191,23,5,5
+
+observer-scrollpanel-button: dialog.png
+	background: 769,257,126,126
+	border-r: 895,257,1,126
+	border-l: 768,257,1,126
+	border-b: 769,383,126,1
+	border-t: 769,256,126,1
+	corner-tl: 768,256,1,1
+	corner-tr: 895,256,1,1
+	corner-bl: 768,383,1,1
+	corner-br: 895,383,1,1
+
+observer-scrollpanel-button-hover: dialog.png
+	background: 769,257,126,126
+	border-r: 895,257,1,126
+	border-l: 768,257,1,126
+	border-b: 769,383,126,1
+	border-t: 769,256,126,1
+	corner-tl: 768,256,1,1
+	corner-tr: 895,256,1,1
+	corner-bl: 768,383,1,1
+	corner-br: 895,383,1,1
+
+observer-scrollpanel-button-pressed: dialog.png
+	background: 897,257,126,126
+	border-r: 1023,257,1,126
+	border-l: 896,257,1,126
+	border-b: 897,383,126,1
+	border-t: 897,256,126,1
+	corner-tl: 896,256,1,1
+	corner-tr: 1023,256,1,1
+	corner-bl: 896,383,1,1
+	corner-br: 1023,383,1,1
+
+observer-scrollpanel-button-disabled: dialog.png
+	background: 769,385,126,126
+	border-r: 895,385,1,126
+	border-l: 768,385,1,126
+	border-b: 769,511,126,1
+	border-t: 769,384,126,1
+	corner-tl: 768,384,1,1
+	corner-tr: 895,384,1,1
+	corner-bl: 768,511,1,1
+	corner-br: 895,511,1,1
+
+observer-scrollheader-selected: dialog.png
+	background: 769,385,126,126
+	border-r: 895,385,1,126
+	border-l: 768,385,1,126
+	border-b: 769,511,126,1
+	border-t: 769,384,126,1
+	corner-tl: 768,384,1,1
+	corner-tr: 895,384,1,1
+	corner-bl: 768,511,1,1
+	corner-br: 895,511,1,1
+
+observer-scrollitem-selected: dialog.png
+	background: 897,257,126,126
+	border-r: 1023,257,1,126
+	border-l: 896,257,1,126
+	border-b: 897,383,126,1
+	border-t: 897,256,126,1
+	corner-tl: 896,256,1,1
+	corner-tr: 1023,256,1,1
+	corner-bl: 896,383,1,1
+	corner-br: 1023,383,1,1
+
+observer-scrollitem-hover: dialog.png
+	background: 769,257,126,126
+	border-r: 895,257,1,126
+	border-l: 768,257,1,126
+	border-b: 769,383,126,1
+	border-t: 769,256,126,1
+	corner-tl: 768,256,1,1
+	corner-tr: 895,256,1,1
+	corner-bl: 768,383,1,1
+	corner-br: 895,383,1,1
 
 # Used for the menu
 dialog: dialog.png
@@ -172,20 +450,6 @@ strategic: strategic.png
 	enemy_owned: 32,32,32,32
 	player_owned: 96,0,32,32
 
-order-icons: buttons.png
-	sell: 0,0,34,28
-	sell-disabled: 68,0,34,28
-	sell-active: 34,0,34,28
-	repair: 0,28,34,28
-	repair-disabled: 68,28,34,28
-	repair-active: 34,28,34,28
-	power: 0,56,34,28
-	power-disabled: 68,56,34,28
-	power-active: 34,56,34,28
-	beacon: 0,84,34,28
-	beacon-disabled: 68,84,34,28
-	beacon-active: 34,84,34,28
-
 flags: buttons.png
 	gdi: 30,112,30,15
 	nod: 0,112,30,15
diff --git a/mods/ts/chrome/ingame-observer.yaml b/mods/ts/chrome/ingame-observer.yaml
deleted file mode 100644
index ec3d644771..0000000000
--- a/mods/ts/chrome/ingame-observer.yaml
+++ /dev/null
@@ -1,130 +0,0 @@
-Container@OBSERVER_WIDGETS:
-	Children:
-		MenuButton@OBSERVER_STATS_BUTTON:
-			Logic: OrderButtonsChromeLogic
-			MenuContainer: INGAME_OBSERVERSTATS_BG
-			HideIngameUI: False
-			Pause: False
-			X: 162
-			Y: 0
-			Width: 160
-			Height: 25
-			Text: Statistics (F1)
-			Font: Bold
-			Key: f1
-		Background@RADAR_BG:
-			X: WINDOW_RIGHT-255
-			Y: 5
-			Width: 250
-			Height: 250
-			Children:
-				Radar@INGAME_RADAR:
-					X: 10
-					Y: 10
-					Width: PARENT_RIGHT-19
-					Height: PARENT_BOTTOM-19
-					WorldInteractionController: INTERACTION_CONTROLLER
-		Background@OBSERVER_CONTROL_BG:
-			X: WINDOW_RIGHT-255
-			Y: 260
-			Width: 250
-			Height: 55
-			Children:
-				DropDownButton@SHROUD_SELECTOR:
-					Logic: ObserverShroudSelectorLogic
-					X: 15
-					Y: 15
-					Width: 220
-					Height: 25
-					Font: Bold
-					Children:
-						LogicKeyListener@SHROUD_KEYHANDLER:
-						Image@FLAG:
-							X: 4
-							Y: 4
-							Width: 32
-							Height: 16
-						Label@LABEL:
-							X: 40
-							Width: 60
-							Height: 25
-						Label@NOFLAG_LABEL:
-							X: 5
-							Width: PARENT_RIGHT
-							Height: 25
-				Container@REPLAY_PLAYER:
-					Logic: ReplayControlBarLogic
-					Y: 39
-					Width: 160
-					Height: 35
-					Visible: false
-					Children:
-						Button@BUTTON_PAUSE:
-							X: 15
-							Y: 10
-							Width: 26
-							Height: 26
-							IgnoreChildMouseOver: true
-							Children:
-								Image@IMAGE_PAUSE:
-									Y: 1
-									Width: 25
-									Height: 25
-									ImageCollection: music
-									ImageName: pause
-						Button@BUTTON_PLAY:
-							X: 15
-							Y: 10
-							Width: 26
-							Height: 26
-							IgnoreChildMouseOver: true
-							Children:
-								Image@IMAGE_PLAY:
-									Width: 25
-									Height: 25
-									ImageCollection: music
-									ImageName: play
-						Button@BUTTON_SLOW:
-							X: 55
-							Y: 13
-							Width: 36
-							Height: 20
-							BaseLine: 1
-							TooltipText: Slow speed
-							TooltipContainer: TOOLTIP_CONTAINER
-							VisualHeight: 0
-							Text: 50%
-							Font: TinyBold
-						Button@BUTTON_REGULAR:
-							X: 55 + 45
-							Y: 13
-							Width: 38
-							Height: 20
-							BaseLine: 1
-							TooltipText: Regular speed
-							TooltipContainer: TOOLTIP_CONTAINER
-							VisualHeight: 0
-							Text: 100%
-							Font: TinyBold
-						Button@BUTTON_FAST:
-							X: 55 + 45*2
-							Y: 13
-							Width: 38
-							Height: 20
-							BaseLine: 1
-							TooltipText: Fast speed
-							TooltipContainer: TOOLTIP_CONTAINER
-							VisualHeight: 0
-							Text: 200%
-							Font: TinyBold
-						Button@BUTTON_MAXIMUM:
-							X: 55 + 45*3
-							Y: 13
-							Width: 38
-							Height: 20
-							BaseLine: 1
-							TooltipText: Maximum speed
-							TooltipContainer: TOOLTIP_CONTAINER
-							VisualHeight: 0
-							Text: MAX
-							Font: TinyBold
\ No newline at end of file
diff --git a/mods/ts/chrome/ingame-player.yaml b/mods/ts/chrome/ingame-player.yaml
index 256637f409..8a31fdb1ec 100644
--- a/mods/ts/chrome/ingame-player.yaml
+++ b/mods/ts/chrome/ingame-player.yaml
@@ -3,127 +3,355 @@ Container@PLAYER_WIDGETS:
 		LogicKeyListener@CONTROLGROUP_KEYHANDLER:
 			Logic: ControlGroupLogic
 		LogicTicker@SIDEBAR_TICKER:
-		MenuButton@OPTIONS_BUTTON:
-			Logic: OrderButtonsChromeLogic
-			MenuContainer: INGAME_MENU
-			X: 0
-			Y: 0
-			Width: 160
-			Height: 25
-			Text: Options (Esc)
-			Font: Bold
-			Key: escape
-		MenuButton@DIPLOMACY_BUTTON:
-			Logic: OrderButtonsChromeLogic
-			MenuContainer: INGAME_DIPLOMACY_BG
-			HideIngameUI: False
-			X: 162
-			Y: 0
-			Width: 160
-			Height: 25
-			Text: Diplomacy (P)
-			Font: Bold
-			Key: p
-		MenuButton@DEBUG_BUTTON:
-			Logic: OrderButtonsChromeLogic
-			MenuContainer: INGAME_MENU
-			X: 324
-			Y: 0
-			Width: 160
-			Height: 25
-			Text: Debug (Shift + Esc)
-			Visible: false
-			Font: Bold
-			Key: escape Shift
-		SlidingContainer@INGAME_RADAR_BIN:
-			Logic: SlidingRadarBinLogic
-			X: WINDOW_RIGHT-215
-			Y: 0
-			OpenOffset: 0,29
-			ClosedOffset: 0,-166
-			AnimationLength: 15
+		Container@SUPPORT_POWERS:
+			Logic: SupportPowerBinLogic
+			X: 10
+			Y: 10
 			Children:
-				LogicTicker@RADAR_TICKER:
-				Image@RADAR_BIN_BG:
-					ImageName: radar
-				Radar@RADAR_MINIMAP:
-					WorldInteractionController: INTERACTION_CONTROLLER
+				SupportPowers@SUPPORT_PALETTE:
+					IconSize: 62, 46
+					IconSpriteOffset: -1, -1
+					TooltipContainer: TOOLTIP_CONTAINER
+					ReadyText: READY
+					HoldText: ON HOLD
+				Container@PALETTE_FOREGROUND:
+					Children:
+						Image@ICON_TEMPLATE:
+							Logic: AddRaceSuffixLogic
+							X:0-2
+							Y:0-2
+							Width: 62
+							Height: 46
+							IgnoreMouseOver: true
+							ImageCollection: sidebar
+							ImageName: background-supportoverlay
+		Image@SIDEBAR_BACKGROUND_TOP:
+			Logic: AddRaceSuffixLogic
+			X: WINDOW_RIGHT - 250
+			Y: 10
+			Width: 238
+			Height: 291
+			ImageCollection: sidebar
+			ImageName: background-top
+			ClickThrough: false
+			Children:
+				Container@TOP_BUTTONS:
+					Logic: OrderButtonsChromeLogic
 					X: 9
-					Width: 192
-					Height: 192
-				VqaPlayer@PLAYER:
-					X: 9
-					Width: 192
-					Height: 192
-					Skippable: false
-				ResourceBar@POWERBAR:
-					Logic: IngamePowerBarLogic
-					X: 42
-					Y: 205
-					Width: 138
-					Height: 5
+					Y: 7
+					Children:
+						Button@BEACON_BUTTON:
+							Logic: AddRaceSuffixLogic
+							Width: 28
+							Height: 28
+							Background: sidebar-button
+							TooltipText: Place Beacon
+							TooltipContainer: TOOLTIP_CONTAINER
+							VisualHeight: 0
+							Children:
+								Image@ICON:
+									X: 6
+									Y: 6
+									ImageCollection: order-icons
+						Button@SELL_BUTTON:
+							Logic: AddRaceSuffixLogic
+							X: 32
+							Width: 28
+							Height: 28
+							Background: sidebar-button
+							TooltipText: Sell
+							TooltipContainer: TOOLTIP_CONTAINER
+							VisualHeight: 0
+							Children:
+								Image@ICON:
+									X: 6
+									Y: 6
+									ImageCollection: order-icons
+						Button@POWER_BUTTON:
+							Logic: AddRaceSuffixLogic
+							X: 64
+							Width: 28
+							Height: 28
+							Background: sidebar-button
+							TooltipText: Power Down
+							TooltipContainer: TOOLTIP_CONTAINER
+							VisualHeight: 0
+							Children:
+								Image@ICON:
+									X: 6
+									Y: 6
+									ImageCollection: order-icons
+						Button@REPAIR_BUTTON:
+							Logic: AddRaceSuffixLogic
+							X: 96
+							Width: 28
+							Height: 28
+							Background: sidebar-button
+							TooltipText: Repair
+							TooltipContainer: TOOLTIP_CONTAINER
+							VisualHeight: 0
+							Children:
+								Image@ICON:
+									X: 6
+									Y: 6
+									ImageCollection: order-icons
+						MenuButton@DEBUG_BUTTON:
+							Logic: AddRaceSuffixLogic
+							Key: escape Shift
+							X: 128
+							Width: 28
+							Height: 28
+							Background: sidebar-button
+							TooltipText: Debug Menu
+							TooltipContainer: TOOLTIP_CONTAINER
+							VisualHeight: 0
+							Children:
+								Image@ICON:
+									X: 6
+									Y: 6
+									ImageCollection: order-icons
+									ImageName: options
+						MenuButton@DIPLOMACY_BUTTON:
+							Logic: AddRaceSuffixLogic
+							MenuContainer: INGAME_DIPLOMACY_BG
+							HideIngameUI: false
+							Pause: false
+							Key: P
+							X: 160
+							Width: 28
+							Height: 28
+							Background: sidebar-button
+							TooltipText: Diplomacy
+							TooltipContainer: TOOLTIP_CONTAINER
+							VisualHeight: 0
+							Children:
+								Image@ICON:
+									X: 6
+									Y: 6
+									ImageCollection: order-icons
+									ImageName: diplomacy
+						MenuButton@OPTIONS_BUTTON:
+							Logic: AddRaceSuffixLogic
+							Key: escape
+							X: 192
+							Width: 28
+							Height: 28
+							Background: sidebar-button
+							TooltipText: Options
+							TooltipContainer: TOOLTIP_CONTAINER
+							VisualHeight: 0
+							Children:
+								Image@ICON:
+									X: 6
+									Y: 6
+									ImageCollection: order-icons
+									ImageName: options
+				Container@RADAR:
+					Logic: IngameRadarDisplayLogic
+					Children:
+						LogicTicker@RADAR_TICKER:
+						ColorBlock@RADAR_FADETOBLACK:
+							X: 8
+							Y: 40
+							Width: 222
+							Height: 222
+						Radar@RADAR_MINIMAP:
+							WorldInteractionController: INTERACTION_CONTROLLER
+							X: 9
+							Y: 41
+							Width: 220
+							Height: 220
+							Children:
+				Label@GAME_TIMER:
+					Logic: GameTimerLogic
+					X: 3
+					Y: 263
+					Width: PARENT_RIGHT
+					Height: 22
+					Align: Center
+					Font: TinyBold
+				LabelWithTooltip@CASH:
+					Logic: IngameCashCounterLogic
+					X: 35
+					Y: 262
+					Width: 50
+					Height: 22
+					Font: Bold
+					Text: {0}
 					TooltipContainer: TOOLTIP_CONTAINER
 					TooltipTemplate: SIMPLE_TOOLTIP
-					IndicatorImage: power-indicator
-					Orientation: Horizontal
-					Style: Bevelled
-		MoneyBin@INGAME_MONEY_BIN:
-			Logic: OrderButtonsChromeLogic
-			X: WINDOW_RIGHT - WIDTH
-			Width: 320
-			Height: 32
-			Children:
-				Button@BEACON_BUTTON:
-					X: 3-36
-					Width: 34
-					Height: 28
-					TooltipText: Place Beacon
+				LabelWithTooltip@POWER:
+					Logic: IngamePowerCounterLogic
+					X: PARENT_RIGHT - WIDTH - 30
+					Y: 262
+					Width: 50
+					Height: 22
+					Align: Right
+					Font: Bold
+					Text: {0}
 					TooltipContainer: TOOLTIP_CONTAINER
-					VisualHeight: 0
+					TooltipTemplate: SIMPLE_TOOLTIP
 					Children:
-						Image@ICON:
-							ImageCollection: order-icons
-				Button@SELL_BUTTON:
-					X: 3
-					Width: 34
-					Height: 28
-					TooltipText: Sell
-					TooltipContainer: TOOLTIP_CONTAINER
-					VisualHeight: 0
-					Children:
-						Image@ICON:
-							ImageCollection: order-icons
-				Button@POWER_BUTTON:
-					X: 39
-					Width: 34
-					Height: 28
-					TooltipText: Power Down
-					TooltipContainer: TOOLTIP_CONTAINER
-					VisualHeight: 0
-					Children:
-						Image@ICON:
-							ImageCollection: order-icons
-				Button@REPAIR_BUTTON:
-					X: 75
-					Width: 34
-					Height: 28
-					TooltipText: Repair
-					TooltipContainer: TOOLTIP_CONTAINER
-					VisualHeight: 0
-					Children:
-						Image@ICON:
-							ImageCollection: order-icons
-		SupportPowerBin@INGAME_POWERS_BIN:
-			X: 0
-			Y: 25
-			ReadyText: READY
-			HoldText: ON HOLD
-		BuildPalette@INGAME_BUILD_PALETTE:
+						Image@POWER_ICON:
+							X: PARENT_RIGHT + 4
+							Y: 5
+							ImageCollection: power-icons
+							ImageName: power-normal
+		Container@SIDEBAR_PRODUCTION:
+			Logic: ClassicProductionLogic
 			X: WINDOW_RIGHT - 250
-			Y: 280
-			Width: 250
-			Height: 500
-			ReadyText: READY
-			HoldText: ON HOLD
-			RequiresText: Requires {0}
-
+			Y: 300
+			Width: 238
+			Height: 250
+			Children:
+				Container@PALETTE_BACKGROUND:
+					Children:
+						Image@ROW_TEMPLATE:
+							Logic: AddRaceSuffixLogic
+							Width: 238
+							Height: 47
+							ClickThrough: false
+							ImageCollection: sidebar
+							ImageName: background-iconrow
+						Image@BOTTOM_CAP:
+							Logic: AddRaceSuffixLogic
+							Width: 238
+							Height: 8
+							ClickThrough: false
+							ImageCollection: sidebar
+							ImageName: background-bottom
+				LogicTicker@PRODUCTION_TICKER:
+				ProductionPalette@PRODUCTION_PALETTE:
+					X: 42
+					Y: 1
+					TooltipContainer: TOOLTIP_CONTAINER
+					ReadyText: READY
+					HoldText: ON HOLD
+					IconSize: 62, 46
+					IconMargin: 1, 1
+					IconSpriteOffset: -1, -1
+				Container@PALETTE_FOREGROUND:
+					X: 40
+					Y: 0-1
+					Children:
+						Image@ROW_TEMPLATE:
+							Width: 238
+							Height: 47
+							IgnoreMouseOver: true
+							ImageCollection: sidebar-bits
+							ImageName: production-iconoverlay
+				Container@PRODUCTION_TYPES:
+					X: 7
+					Y: 2
+					Width: 29
+					Height: 240
+					Children:
+						ProductionTypeButton@BUILDING:
+							Logic: AddRaceSuffixLogic
+							Width: 28
+							Height: 28
+							VisualHeight: 0
+							Background: sidebar-button
+							TooltipText: Buildings
+							TooltipContainer: TOOLTIP_CONTAINER
+							ProductionGroup: Building
+							HotkeyName: ProductionTypeBuildingKey
+							Children:
+								Image@ICON:
+									X: 6
+									Y: 6
+									ImageCollection: production-icons
+						ProductionTypeButton@DEFENSE:
+							Logic: AddRaceSuffixLogic
+							Y: 31
+							Width: 28
+							Height: 28
+							VisualHeight: 0
+							Background: sidebar-button
+							TooltipText: Defense
+							TooltipContainer: TOOLTIP_CONTAINER
+							ProductionGroup: Defense
+							HotkeyName: ProductionTypeDefenseKey
+							Children:
+								Image@ICON:
+									X: 6
+									Y: 6
+									ImageCollection: production-icons
+						ProductionTypeButton@INFANTRY:
+							Logic: AddRaceSuffixLogic
+							Y: 62
+							Width: 28
+							Height: 28
+							VisualHeight: 0
+							Background: sidebar-button
+							TooltipText: Infantry
+							TooltipContainer: TOOLTIP_CONTAINER
+							ProductionGroup: Infantry
+							HotkeyName: ProductionTypeInfantryKey
+							Children:
+								Image@ICON:
+									X: 6
+									Y: 6
+									ImageCollection: production-icons
+						ProductionTypeButton@VEHICLE:
+							Logic: AddRaceSuffixLogic
+							Y: 93
+							Width: 28
+							Height: 28
+							VisualHeight: 0
+							Background: sidebar-button
+							TooltipText: Vehicles
+							TooltipContainer: TOOLTIP_CONTAINER
+							ProductionGroup: Vehicle
+							HotkeyName: ProductionTypeVehicleKey
+							Children:
+								Image@ICON:
+									X: 6
+									Y: 6
+									ImageCollection: production-icons
+						ProductionTypeButton@AIRCRAFT:
+							Logic: AddRaceSuffixLogic
+							Y: 124
+							Width: 28
+							Height: 28
+							VisualHeight: 0
+							Background: sidebar-button
+							TooltipText: Aircraft
+							TooltipContainer: TOOLTIP_CONTAINER
+							ProductionGroup: Air
+							HotkeyName: ProductionTypeAircraftKey
+							Children:
+								Image@ICON:
+									X: 6
+									Y: 6
+									ImageCollection: production-icons
+						Button@SCROLL_UP_BUTTON:
+							Logic: AddRaceSuffixLogic
+							Y: 186
+							Width: 28
+							Height: 22
+							VisualHeight: 0
+							Background: sidebar-button
+							TooltipText: Scroll up
+							TooltipContainer: TOOLTIP_CONTAINER
+							Children:
+								Image@ICON:
+									X: 6
+									Y: 3
+									ImageCollection: scrollbar
+									ImageName: up_arrow
+						Button@SCROLL_DOWN_BUTTON:
+							Logic: AddRaceSuffixLogic
+							Y: 211
+							Width: 28
+							Height: 22
+							VisualHeight: 0
+							Background: sidebar-button
+							TooltipText: Scroll down
+							TooltipContainer: TOOLTIP_CONTAINER
+							Children:
+								Image@ICON:
+									X: 6
+									Y: 3
+									ImageCollection: scrollbar
+									ImageName: down_arrow
\ No newline at end of file
diff --git a/mods/ts/chrome/ingame.yaml b/mods/ts/chrome/ingame.yaml
deleted file mode 100644
index 76899d4801..0000000000
--- a/mods/ts/chrome/ingame.yaml
+++ /dev/null
@@ -1,74 +0,0 @@
-Container@INGAME_ROOT:
-	Logic: LoadIngamePlayerOrObserverUILogic
-	Children:
-		Container@WORLD_ROOT:
-			Children:
-				LogicTicker@DISCONNECT_WATCHER:
-					Logic: DisconnectWatcherLogic
-				WorldInteractionController@INTERACTION_CONTROLLER:
-					X: 0
-					Y: 0
-					Width: WINDOW_RIGHT
-					Height: WINDOW_BOTTOM
-				ViewportController:
-					X: 0
-					Y: 0
-					Width: WINDOW_RIGHT
-					Height: WINDOW_BOTTOM
-					TooltipContainer: TOOLTIP_CONTAINER
-				WorldCommand:
-					X: 0
-					Y: 0
-					Width: WINDOW_RIGHT
-					Height: WINDOW_BOTTOM
-				StrategicProgress@STRATEGIC_PROGRESS:
-					X: WINDOW_RIGHT/2
-					Y: 40
-				SupportPowerTimer@SUPPORT_POWER_TIMER:
-					X: 80
-					Y: 34
-					Order: Descending
-				Container@PLAYER_ROOT:
-				Container@PERFORMANCE_INFO:
-					Logic: PerfDebugLogic
-					Children:
-						Label@PERF_TEXT:
-							X: WINDOW_RIGHT - 200
-							Y: WINDOW_BOTTOM - 70
-							Width: 170
-							Height: 40
-							Contrast: true
-						Background@GRAPH_BG:
-							ClickThrough: true
-							Background: dialog4
-							X: 30
-							Y: WINDOW_BOTTOM - 240
-							Width: 210
-							Height: 210
-							Children:
-								PerfGraph@GRAPH:
-									X: 5
-									Y: 5
-									Width: 200
-									Height: 200
-				Container@GAME_TIMER_BLOCK:
-					Logic: GameTimerLogic
-					X: WINDOW_RIGHT/2 - WIDTH
-					Width: 100
-					Height: 55
-					Children:
-						Label@GAME_TIMER:
-							Width: PARENT_RIGHT
-							Height: 15
-							Align: Center
-							Font: Title
-							Contrast: true
-						Label@GAME_TIMER_STATUS:
-							Y: 35
-							Width: PARENT_RIGHT
-							Height: 15
-							Align: Center
-							Font: Bold
-							Contrast: true
-		Container@MENU_ROOT:
-		TooltipContainer@TOOLTIP_CONTAINER:
diff --git a/mods/ts/mod.yaml b/mods/ts/mod.yaml
index bc9fd0d818..441fd3d07d 100644
--- a/mods/ts/mod.yaml
+++ b/mods/ts/mod.yaml
@@ -102,7 +102,7 @@ Assemblies:
 
 ChromeLayout:
 	./mods/ts/chrome/install.yaml
-	./mods/ts/chrome/ingame.yaml
+	./mods/ra/chrome/ingame.yaml
 	./mods/ra/chrome/ingame-chat.yaml
 	./mods/ra/chrome/ingame-diplomacy.yaml
 	./mods/ra/chrome/ingame-fmvplayer.yaml
@@ -112,7 +112,7 @@ ChromeLayout:
 	./mods/ra/chrome/ingame-infobriefing.yaml
 	./mods/ra/chrome/ingame-infoobjectives.yaml
 	./mods/ra/chrome/ingame-infostats.yaml
-	./mods/ts/chrome/ingame-observer.yaml
+	./mods/ra/chrome/ingame-observer.yaml
 	./mods/ra/chrome/ingame-observerstats.yaml
 	./mods/ts/chrome/ingame-player.yaml
 	./mods/ra/chrome/ingame-debug.yaml
diff --git a/mods/ts/rules/world.yaml b/mods/ts/rules/world.yaml
index 9675140a65..09d2d92913 100644
--- a/mods/ts/rules/world.yaml
+++ b/mods/ts/rules/world.yaml
@@ -8,7 +8,8 @@ World:
 	LoadWidgetAtGameStart:
 	MenuPaletteEffect:
 	BuildingInfluence:
-	ChooseBuildTabOnSelect:
+	ProductionQueueFromSelection:
+		ProductionTabsWidget: PRODUCTION_TABS
 	PaletteFromFile@player:
 		Name: player
 		Filename: unittem.pal
diff --git a/mods/ts/uibits/chrome-gdi.png b/mods/ts/uibits/chrome-gdi.png
deleted file mode 100644
index 39267ded71..0000000000
Binary files a/mods/ts/uibits/chrome-gdi.png and /dev/null differ
diff --git a/mods/ts/uibits/chrome-nod.png b/mods/ts/uibits/chrome-nod.png
deleted file mode 100644
index c910aaf1a3..0000000000
Binary files a/mods/ts/uibits/chrome-nod.png and /dev/null differ
diff --git a/mods/ts/uibits/chrome.png b/mods/ts/uibits/chrome.png
new file mode 100644
index 0000000000..ec0c8d6d3a
Binary files /dev/null and b/mods/ts/uibits/chrome.png differ
diff --git a/mods/ts/uibits/tabs.png b/mods/ts/uibits/tabs.png
deleted file mode 100644
index b16ad92595..0000000000
Binary files a/mods/ts/uibits/tabs.png and /dev/null differ