diff --git a/mods/cnc-classic/mod.yaml b/mods/cnc-classic/mod.yaml
index 4bc2c14963..68baf6b44a 100644
--- a/mods/cnc-classic/mod.yaml
+++ b/mods/cnc-classic/mod.yaml
@@ -66,9 +66,12 @@ ChromeLayout:
 	mods/ra/chrome/gameinit.yaml
 	mods/ra/chrome/ingame.yaml
 	mods/ra/chrome/ingame-chat.yaml
+	mods/ra/chrome/ingame-observer.yaml
+	mods/ra/chrome/ingame-fmvplayer.yaml
 	mods/ra/chrome/mainmenu.yaml
 	mods/ra/chrome/settings.yaml
 	mods/ra/chrome/lobby.yaml
+	mods/ra/chrome/color-picker.yaml
 	mods/ra/chrome/map-chooser.yaml
 	mods/ra/chrome/create-server.yaml
 	mods/ra/chrome/serverbrowser.yaml
diff --git a/mods/d2k/chrome/color-picker.yaml b/mods/d2k/chrome/color-picker.yaml
new file mode 100644
index 0000000000..a51f95e9b9
--- /dev/null
+++ b/mods/d2k/chrome/color-picker.yaml
@@ -0,0 +1,66 @@
+Background@COLOR_CHOOSER:
+	Logic:ColorPickerLogic
+	Background:dialog2
+	Width:310
+	Height:120
+	Children:
+		Button@SAVE_BUTTON:
+			X:210
+			Y:85
+			Width:90
+			Height:25
+			Text:Save
+			Font:Bold
+		Button@RANDOM_BUTTON:
+			X:115
+			Y:85
+			Width:90
+			Height:25
+			Text:Random
+			Font:Bold
+		ShpImage@CARRYALL:
+			X:220
+			Y:10
+			Image:carryall
+			Palette:colorpicker
+		Label@HUE_LABEL:
+			X:0
+			Y:5
+			Width:40
+			Height:20
+			Align: Right
+			Text: Hue:
+		Slider@HUE:
+			X:43
+			Y:10
+			Width:160
+			Height:20
+			Ticks:5
+		Label@SAT_LABEL:
+			X:0
+			Y:30
+			Width:40
+			Height:20
+			Align: Right
+			Text: Sat:
+		Slider@SAT:
+			X:43
+			Y:35
+			Width:160
+			Height:20
+			Ticks:5
+		Label@LUM_LABEL:
+			X:0
+			Y:55
+			Width:40
+			Height:20
+			Align: Right
+			Text: Lum:
+		Slider@LUM:
+			X:43
+			Y:60
+			Width:160
+			Height:20
+			Ticks:5
+			MinimumValue: 0.2
+			MaximumValue: 1
diff --git a/mods/d2k/chrome/ingame.yaml b/mods/d2k/chrome/ingame.yaml
index 445d94ac7c..00f3ca76f1 100644
--- a/mods/d2k/chrome/ingame.yaml
+++ b/mods/d2k/chrome/ingame.yaml
@@ -70,7 +70,7 @@ Container@INGAME_ROOT:
 			Y:0
 			Width:160
 			Height:25
-			Text:Options
+			Text:Options (ESC)
 			Font:Bold
 			Key: escape
 		Button@INGAME_DIPLOMACY_BUTTON:
@@ -78,24 +78,27 @@ Container@INGAME_ROOT:
 			Y:0
 			Width:160
 			Height:25
-			Text:Diplomacy
+			Text:Diplomacy (F1)
 			Font:Bold
+			Key: f1
 		Button@CHEATS_BUTTON:
 			X:324
 			Y:0
 			Width:160
 			Height:25
-			Text:Cheats
+			Text:Cheats (F2)
 			Visible:false
 			Font:Bold
+			Key: f2
 		Button@OBJECTIVES_BUTTON:
 			X:486
 			Y:0
 			Width:160
 			Height:25
-			Text:Objectives
+			Text:Objectives (F3)
 			Visible:false
 			Font:Bold
+			Key: f3
 		RadarBin@INGAME_RADAR_BIN:
 			WorldInteractionController:INTERACTION_CONTROLLER
 		PowerBin@INGAME_POWER_BIN:
@@ -200,161 +203,14 @@ Container@INGAME_ROOT:
 					Text:Diplomacy
 					Align:Center
 					Font:Bold
-		ChatDisplay@CHAT_DISPLAY:
-			X:250
-			Y:WINDOW_BOTTOM - HEIGHT - 30
-			Width: 760
-			Height: 200
-			DrawBackground: False
-			RemoveTime:250
-			UseContrast: yes
-		ChatEntry@CHAT_ENTRY:
-			X:250
-			Y:WINDOW_BOTTOM - HEIGHT
-			Width: 760
-			Height: 30
-			UseContrast: yes
-		Background@PERF_BG:
-			ClickThrough:true
-			Background:dialog4
-			Logic:PerfDebugLogic
-			X:10
-			Y:WINDOW_BOTTOM - 250
-			Width: 210
-			Height: 250
-			Children:
-				PerfGraph@GRAPH:
-					X:5
-					Y:5
-					Width:200
-					Height:200
-				Label@TEXT:
-					X:20
-					Y:205
-					Width:170
-					Height:40
-Container@OBSERVER_ROOT:
-	Visible:true
-	Logic:IngameObserverChromeLogic
-	Children:
-		WorldInteractionController@INTERACTION_CONTROLLER:
-			X:0
-			Y:0
-			Width:WINDOW_RIGHT
-			Height:WINDOW_BOTTOM
-		ViewportScrollController:
-			X:0
-			Y:0
-			Width:WINDOW_RIGHT
-			Height:WINDOW_BOTTOM
-		Timer@GAME_TIMER:
-			X: WINDOW_RIGHT/2
-			Y: 0-10
-		Background@POSTGAME_BG:
-			X:(WINDOW_RIGHT - WIDTH)/2
-			Y:(WINDOW_BOTTOM - HEIGHT)/2
-			Width:400
-			Height:100
-			Background:dialog4
-			Visible:false
-			Children:
-				Label@TEXT:
+				Button@CLOSE_DIPLOMACY:
 					X:(PARENT_RIGHT - WIDTH)/2
-					Y:0
-					Width:200
-					Height:80
-					Align:Center
-				Button@POSTGAME_OBSERVE:
-					X:10
-					Y:(PARENT_BOTTOM - HEIGHT - 10)
-					Width:150
-					Height:25
-					Font:Bold
-					Text:Observe
-				Button@POSTGAME_QUIT:
-					X:(PARENT_RIGHT - WIDTH - 10)
-					Y:(PARENT_BOTTOM - HEIGHT - 10)
-					Width:150
-					Height:25
-					Font:Bold
-					Text:Leave
-		SupportPowerBin@INGAME_POWERS_BIN:
-			X:0
-			Y:25
-		Button@INGAME_OPTIONS_BUTTON:
-			X:0
-			Y:0
-			Width:160
-			Height:25
-			Text:Options
-			Font:Bold
-			Key:escape
-		WorldTooltip:
-		Background@INGAME_OPTIONS_BG:
-			X:(WINDOW_RIGHT - WIDTH)/2
-			Y:(WINDOW_BOTTOM - HEIGHT)/2
-			Width:300
-			Height:295
-			Visible:false
-			Children:
-				Label@LABEL_TITLE:
-					X:(PARENT_RIGHT - WIDTH)/2
-					Y:20
-					Width:250
-					Height:25
-					Text:Options
-					Align:Center
-					Font:Bold
-				Button@RESUME:
-					X:(PARENT_RIGHT - WIDTH)/2
-					Y:60
+					Y:350
 					Width:160
 					Height:25
-					Text:Resume
+					Text:Close
 					Font:Bold
 					Key:escape
-				Button@SETTINGS:
-					X:(PARENT_RIGHT - WIDTH)/2
-					Y:100
-					Width:160
-					Height:25
-					Text:Settings
-					Font:Bold
-				Button@MUSIC:
-					X:(PARENT_RIGHT - WIDTH)/2
-					Y:140
-					Width:160
-					Height:25
-					Text:Music
-					Font:Bold
-				Button@SURRENDER:
-					X:(PARENT_RIGHT - WIDTH)/2
-					Y:180
-					Width:160
-					Height:25
-					Text:Surrender
-					Font:Bold
-				Button@DISCONNECT:
-					X:(PARENT_RIGHT - WIDTH)/2
-					Y:220
-					Width:160
-					Height:25
-					Text:Abort Mission
-					Font:Bold
-		ChatDisplay@CHAT_DISPLAY:
-			X:250
-			Y:WINDOW_BOTTOM - HEIGHT - 30
-			Width: 760
-			Height: 200
-			DrawBackground: False
-			RemoveTime:250
-			UseContrast: yes
-		ChatEntry@CHAT_ENTRY:
-			X:250
-			Y:WINDOW_BOTTOM - HEIGHT
-			Width: 760
-			Height: 30
-			UseContrast: yes
 		Background@PERF_BG:
 			ClickThrough:true
 			Background:dialog4
@@ -373,14 +229,4 @@ Container@OBSERVER_ROOT:
 					X:20
 					Y:205
 					Width:170
-					Height:40
-Background@FMVPLAYER:
-	Width:WINDOW_RIGHT
-	Height:WINDOW_BOTTOM
-	Background:dialog4
-	Children:
-		VqaPlayer@PLAYER:
-			X:0
-			Y:0
-			Width:WINDOW_RIGHT
-			Height:WINDOW_BOTTOM
+					Height:40
\ No newline at end of file
diff --git a/mods/d2k/chrome/lobby.yaml b/mods/d2k/chrome/lobby.yaml
index cbb4e9f03e..e1969e1cf1 100644
--- a/mods/d2k/chrome/lobby.yaml
+++ b/mods/d2k/chrome/lobby.yaml
@@ -433,70 +433,4 @@ Background@SERVER_LOBBY:
 			Width:120
 			Height:25
 			Text:Start Game
-			Font:Bold
-Background@COLOR_CHOOSER:
-	Logic:ColorPickerLogic
-	Background:dialog2
-	Width:310
-	Height:120
-	Children:
-		Button@SAVE_BUTTON:
-			X:210
-			Y:85
-			Width:90
-			Height:25
-			Text:Save
-			Font:Bold
-		Button@RANDOM_BUTTON:
-			X:115
-			Y:85
-			Width:90
-			Height:25
-			Text:Random
-			Font:Bold
-		ShpImage@CARRYALL:
-			X:220
-			Y:10
-			Image:carryall
-			Palette:colorpicker
-		Label@HUE_LABEL:
-			X:0
-			Y:5
-			Width:40
-			Height:20
-			Align: Right
-			Text: Hue:
-		Slider@HUE:
-			X:43
-			Y:10
-			Width:160
-			Height:20
-			Ticks:5
-		Label@SAT_LABEL:
-			X:0
-			Y:30
-			Width:40
-			Height:20
-			Align: Right
-			Text: Sat:
-		Slider@SAT:
-			X:43
-			Y:35
-			Width:160
-			Height:20
-			Ticks:5
-		Label@LUM_LABEL:
-			X:0
-			Y:55
-			Width:40
-			Height:20
-			Align: Right
-			Text: Lum:	
-		Slider@LUM:
-			X:43
-			Y:60
-			Width:160
-			Height:20
-			Ticks:5
-			MinimumValue: 0.2
-			MaximumValue: 1
+			Font:Bold
\ No newline at end of file
diff --git a/mods/d2k/mod.yaml b/mods/d2k/mod.yaml
index 1d5477292a..1af3dc4afa 100644
--- a/mods/d2k/mod.yaml
+++ b/mods/d2k/mod.yaml
@@ -47,9 +47,12 @@ ChromeLayout:
 	mods/d2k/chrome/gameinit.yaml
 	mods/d2k/chrome/ingame.yaml
 	mods/ra/chrome/ingame-chat.yaml
+	mods/ra/chrome/ingame-observer.yaml
+	mods/ra/chrome/ingame-fmvplayer.yaml
 	mods/d2k/chrome/mainmenu.yaml
 	mods/ra/chrome/settings.yaml
 	mods/d2k/chrome/lobby.yaml
+	mods/d2k/chrome/color-picker.yaml
 	mods/ra/chrome/map-chooser.yaml
 	mods/ra/chrome/create-server.yaml
 	mods/ra/chrome/serverbrowser.yaml
diff --git a/mods/ra-classic/mod.yaml b/mods/ra-classic/mod.yaml
index 9c0d6ce510..f626035688 100644
--- a/mods/ra-classic/mod.yaml
+++ b/mods/ra-classic/mod.yaml
@@ -57,9 +57,12 @@ ChromeLayout:
 	mods/ra/chrome/gameinit.yaml
 	mods/ra/chrome/ingame.yaml
 	mods/ra/chrome/ingame-chat.yaml
+	mods/ra/chrome/ingame-observer.yaml
+	mods/ra/chrome/ingame-fmvplayer.yaml
 	mods/ra/chrome/mainmenu.yaml
 	mods/ra/chrome/settings.yaml
 	mods/ra/chrome/lobby.yaml
+	mods/ra/chrome/color-picker.yaml
 	mods/ra/chrome/map-chooser.yaml
 	mods/ra/chrome/create-server.yaml
 	mods/ra/chrome/serverbrowser.yaml
diff --git a/mods/ra/chrome/color-picker.yaml b/mods/ra/chrome/color-picker.yaml
new file mode 100644
index 0000000000..6de1830ecd
--- /dev/null
+++ b/mods/ra/chrome/color-picker.yaml
@@ -0,0 +1,66 @@
+Background@COLOR_CHOOSER:
+	Logic:ColorPickerLogic
+	Background:dialog2
+	Width:310
+	Height:120
+	Children:
+		Button@SAVE_BUTTON:
+			X:210
+			Y:85
+			Width:90
+			Height:25
+			Text:Save
+			Font:Bold
+		Button@RANDOM_BUTTON:
+			X:115
+			Y:85
+			Width:90
+			Height:25
+			Text:Random
+			Font:Bold
+		ShpImage@FACT:
+			X:220
+			Y:10
+			Image:fact
+			Palette:colorpicker
+		Label@HUE_LABEL:
+			X:0
+			Y:5
+			Width:40
+			Height:20
+			Align: Right
+			Text: Hue:
+		Slider@HUE:
+			X:43
+			Y:10
+			Width:160
+			Height:20
+			Ticks:5
+		Label@SAT_LABEL:
+			X:0
+			Y:30
+			Width:40
+			Height:20
+			Align: Right
+			Text: Sat:	
+		Slider@SAT:
+			X:43
+			Y:35
+			Width:160
+			Height:20
+			Ticks:5
+		Label@LUM_LABEL:
+			X:0
+			Y:55
+			Width:40
+			Height:20
+			Align: Right
+			Text: Lum:	
+		Slider@LUM:
+			X:43
+			Y:60
+			Width:160
+			Height:20
+			Ticks:5
+			MinimumValue: 0.2
+			MaximumValue: 1
diff --git a/mods/ra/chrome/ingame-fmvplayer.yaml b/mods/ra/chrome/ingame-fmvplayer.yaml
new file mode 100644
index 0000000000..4a536b56b8
--- /dev/null
+++ b/mods/ra/chrome/ingame-fmvplayer.yaml
@@ -0,0 +1,10 @@
+Background@FMVPLAYER:
+	Width:WINDOW_RIGHT
+	Height:WINDOW_BOTTOM
+	Background:dialog4
+	Children:
+		VqaPlayer@PLAYER:
+			X:0
+			Y:0
+			Width:WINDOW_RIGHT
+			Height:WINDOW_BOTTOM
\ No newline at end of file
diff --git a/mods/ra/chrome/ingame-observer.yaml b/mods/ra/chrome/ingame-observer.yaml
new file mode 100644
index 0000000000..e757831a99
--- /dev/null
+++ b/mods/ra/chrome/ingame-observer.yaml
@@ -0,0 +1,643 @@
+Container@OBSERVER_ROOT:
+	Visible:true
+	Logic:IngameObserverChromeLogic
+	Children:
+		WorldInteractionController@INTERACTION_CONTROLLER:
+			X:0
+			Y:0
+			Width:WINDOW_RIGHT
+			Height:WINDOW_BOTTOM
+		ViewportScrollController:
+			X:0
+			Y:0
+			Width:WINDOW_RIGHT
+			Height:WINDOW_BOTTOM
+		Timer@GAME_TIMER:
+			X: WINDOW_RIGHT/2
+			Y: 0-10
+		Background@POSTGAME_BG:
+			X:(WINDOW_RIGHT - WIDTH)/2
+			Y:(WINDOW_BOTTOM - HEIGHT)/2
+			Width:400
+			Height:100
+			Background:dialog4
+			Visible:false
+			Children:
+				Label@TEXT:
+					X:(PARENT_RIGHT - WIDTH)/2
+					Y:0
+					Width:200
+					Height:80
+					Align:Center
+				Button@POSTGAME_OBSERVE:
+					X:10
+					Y:(PARENT_BOTTOM - HEIGHT - 10)
+					Width:150
+					Height:25
+					Font:Bold
+					Text:Observe
+				Button@POSTGAME_QUIT:
+					X:(PARENT_RIGHT - WIDTH - 10)
+					Y:(PARENT_BOTTOM - HEIGHT - 10)
+					Width:150
+					Height:25
+					Font:Bold
+					Text:Leave
+		SupportPowerBin@INGAME_POWERS_BIN:
+			X:0
+			Y:25
+		Button@INGAME_OPTIONS_BUTTON:
+			X:0
+			Y:0
+			Width:160
+			Height:25
+			Text:Options (ESC)
+			Font:Bold
+			Key:escape
+		Button@INGAME_STATS_BUTTON:
+			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
+		DropDownButton@SHROUD_SELECTOR:
+			Logic:ObserverShroudSelectorLogic
+			X:WINDOW_RIGHT-250
+			Y:260
+			Width:240
+			Height:25
+			Font:Bold
+			Visible:true
+		WorldTooltip:
+		Background@INGAME_OPTIONS_BG:
+			X:(WINDOW_RIGHT - WIDTH)/2
+			Y:(WINDOW_BOTTOM - HEIGHT)/2
+			Width:300
+			Height:295
+			Visible:false
+			Children:
+				Label@LABEL_TITLE:
+					X:(PARENT_RIGHT - WIDTH)/2
+					Y:20
+					Width:250
+					Height:25
+					Text:Options
+					Align:Center
+					Font:Bold
+				Button@RESUME:
+					X:(PARENT_RIGHT - WIDTH)/2
+					Y:60
+					Width:160
+					Height:25
+					Text:Resume
+					Font:Bold
+					Key:escape
+				Button@SETTINGS:
+					X:(PARENT_RIGHT - WIDTH)/2
+					Y:100
+					Width:160
+					Height:25
+					Text:Settings
+					Font:Bold
+				Button@MUSIC:
+					X:(PARENT_RIGHT - WIDTH)/2
+					Y:140
+					Width:160
+					Height:25
+					Text:Music
+					Font:Bold
+				Button@SURRENDER:
+					X:(PARENT_RIGHT - WIDTH)/2
+					Y:180
+					Width:160
+					Height:25
+					Text:Surrender
+					Font:Bold
+				Button@DISCONNECT:
+					X:(PARENT_RIGHT - WIDTH)/2
+					Y:220
+					Width:160
+					Height:25
+					Text:Abort Mission
+					Font:Bold
+		Background@PERF_BG:
+			ClickThrough:true
+			Background:dialog4
+			Logic:PerfDebugLogic
+			X:10
+			Y:WINDOW_BOTTOM - 250
+			Width: 210
+			Height: 250
+			Children:
+				PerfGraph@GRAPH:
+					X:5
+					Y:5
+					Width:200
+					Height:200
+				Label@TEXT:
+					X:20
+					Y:205
+					Width:170
+					Height:40
+		Container@OBSERVER_STATS:
+			Logic:ObserverStatsLogic
+			X:25
+			Y:50
+			Width:950
+			Height:500
+			Visible:false
+			Children:
+				Background@BACKGROUND:
+					Width:PARENT_RIGHT
+					Height:PARENT_BOTTOM
+					Background:dialog
+					Children:
+						Label@TITLE:
+							X:0
+							Y:15
+							Width:PARENT_RIGHT
+							Height:25
+							Font:Bold
+							Align:Center
+							Text:Statistics
+						DropDownButton@STATS_DROPDOWN:
+							X:PARENT_RIGHT-200
+							Y:15
+							Width:185
+							Height:25
+							Font:Bold
+						Container@BASIC_STATS_HEADERS:
+							X:0
+							Y:0
+							Width:PARENT_RIGHT
+							Height:PARENT_BOTTOM
+							Children:
+								Label@PLAYER_HEADER:
+									X:85
+									Y:40
+									Width:160
+									Height:25
+									Font:Bold
+									Text:Player
+								Label@CASH_HEADER:
+									X:245
+									Y:40
+									Width:80
+									Height:25
+									Font:Bold
+									Text:Cash
+								Label@EARNED_MIN_HEADER:
+									X:325
+									Y:40
+									Width:60
+									Height:25
+									Font:Bold
+									Text:Earned/min
+								Label@POWER_HEADER:
+									X:425
+									Y:40
+									Width:80
+									Height:25
+									Font:Bold
+									Text:Power
+								Label@KILLS_HEADER:
+									X:505
+									Y:40
+									Width:40
+									Height:25
+									Font:Bold
+									Text:Kills
+									Align:Right
+								Label@DEATHS_HEADER:
+									X:565
+									Y:40
+									Width:40
+									Height:25
+									Font:Bold
+									Text:Deaths
+									Align:Right
+								Label@ACTIONS_MIN_HEADER:
+									X:665
+									Y:40
+									Width:40
+									Height:25
+									Font:Bold
+									Text:Actions/min
+									Align:Right
+						Container@ECONOMY_STATS_HEADERS:
+							X:0
+							Y:0
+							Width:PARENT_RIGHT
+							Height:PARENT_BOTTOM
+							Children:
+								Label@PLAYER_HEADER:
+									X:85
+									Y:40
+									Width:160
+									Height:25
+									Font:Bold
+									Text:Player
+								Label@CASH_HEADER:
+									X:245
+									Y:40
+									Width:80
+									Height:25
+									Font:Bold
+									Text:Cash
+								Label@EARNED_MIN_HEADER:
+									X:325
+									Y:40
+									Width:60
+									Height:25
+									Font:Bold
+									Text:Earned/min
+								Label@EARNED_THIS_MIN_HEADER:
+									X:425
+									Y:40
+									Width:60
+									Height:25
+									Font:Bold
+									Text:Earned this min
+								Label@ASSETS_HEADER:
+									X:565
+									Y:40
+									Width:60
+									Height:25
+									Font:Bold
+									Text:Assets
+								Label@EARNED_HEADER:
+									X:645
+									Y:40
+									Width:60
+									Height:25
+									Font:Bold
+									Text:Earned
+								Label@SPENT_HEADER:
+									X:725
+									Y:40
+									Width:60
+									Height:25
+									Font:Bold
+									Text:Spent
+								Label@HARVESTERS_HEADER:
+									X:805
+									Y:40
+									Width:60
+									Height:25
+									Font:Bold
+									Text:Harvesters
+									Align:Right
+						Container@PRODUCTION_STATS_HEADERS:
+							X:0
+							Y:0
+							Width:PARENT_RIGHT
+							Height:PARENT_BOTTOM
+							Children:
+								Label@PLAYER_HEADER:
+									X:85
+									Y:40
+									Width:160
+									Height:25
+									Font:Bold
+									Text:Player
+								Label@PRODUCTION_HEADER:
+									X:245
+									Y:40
+									Width:320
+									Height:25
+									Font:Bold
+									Text:Production
+								Label@SUPPORT_POWERS_HEADER:
+									X:565
+									Y:40
+									Width:320
+									Height:25
+									Font:Bold
+									Text:Support Powers
+						Container@COMBAT_STATS_HEADERS:
+							X:0
+							Y:0
+							Width:PARENT_RIGHT
+							Height:PARENT_BOTTOM
+							Children:
+								Label@PLAYER_HEADER:
+									X:85
+									Y:40
+									Width:160
+									Height:25
+									Font:Bold
+									Text:Player
+								Label@CONTROL_HEADER:
+									X:245
+									Y:40
+									Width:60
+									Height:25
+									Font:Bold
+									Text:Control
+								Label@KILLS_COST_HEADER:
+									X:325
+									Y:40
+									Width:60
+									Height:25
+									Font:Bold
+									Text:Kills
+								Label@DEATHS_COST_HEADER:
+									X:405
+									Y:40
+									Width:60
+									Height:25
+									Font:Bold
+									Text:Deaths
+								Label@UNITS_KILLED_HEADER:
+									X:505
+									Y:40
+									Width:40
+									Height:25
+									Font:Bold
+									Text:Units Killed
+									Align:Right
+								Label@UNITS_DEAD_HEADER:
+									X:605
+									Y:40
+									Width:40
+									Height:25
+									Font:Bold
+									Text:Units Lost
+									Align:Right
+								Label@BUILDINGS_KILLED_HEADER:
+									X:725
+									Y:40
+									Width:40
+									Height:25
+									Font:Bold
+									Text:Bldg Killed
+									Align:Right
+								Label@BUILDINGS_DEAD_HEADER:
+									X:825
+									Y:40
+									Width:40
+									Height:25
+									Font:Bold
+									Text:Bldg Lost
+									Align:Right
+						Container@EARNED_THIS_MIN_GRAPH_HEADERS:
+							X:0
+							Y:0
+							Width:PARENT_RIGHT
+							Height:PARENT_BOTTOM
+							Children:
+								Label@EARNED_THIS_MIN_HEADER:
+									X:0
+									Y:40
+									Width:PARENT_RIGHT
+									Height:25
+									Font:Bold
+									Text:Earnings received each minute
+									Align:Center
+						ScrollPanel@PLAYER_STATS_PANEL:
+							X:25
+							Y:70
+							Width:PARENT_RIGHT-50
+							Height:PARENT_BOTTOM-45-50
+							ItemSpacing:5
+							Children:
+								ScrollItem@TEAM_TEMPLATE:
+									X:0
+									Y:0
+									Width:PARENT_RIGHT-35
+									Height:25
+									Children:
+										Label@TEAM:
+											X:0
+											Y:0
+											Width:PARENT_RIGHT
+											Height:PARENT_BOTTOM
+											Font:Bold
+								ScrollItem@BASIC_PLAYER_TEMPLATE:
+									X:0
+									Y:0
+									Width:PARENT_RIGHT-35
+									Height:25
+									Children:
+										Image@FLAG:
+											X:20
+											Y:5
+											Width:35
+											Height:PARENT_BOTTOM-5
+											ImageName:random
+											ImageCollection:flags
+										Label@PLAYER:
+											X:55
+											Y:0
+											Width:160
+											Height:PARENT_BOTTOM
+											Font:Bold
+										Label@CASH:
+											X:215
+											Y:0
+											Width:80
+											Height:PARENT_BOTTOM
+										Label@EARNED_MIN:
+											X:295
+											Y:0
+											Width:60
+											Height:PARENT_BOTTOM
+										Label@POWER:
+											X:395
+											Y:0
+											Width:80
+											Height:PARENT_BOTTOM
+										Label@KILLS:
+											X:475
+											Y:0
+											Width:40
+											Height:PARENT_BOTTOM
+											Align:Right
+										Label@DEATHS:
+											X:535
+											Y:0
+											Width:40
+											Height:PARENT_BOTTOM
+											Align:Right
+										Label@ACTIONS_MIN:
+											X:635
+											Y:0
+											Width:40
+											Height:PARENT_BOTTOM
+											Align:Right
+								ScrollItem@ECONOMY_PLAYER_TEMPLATE:
+									X:0
+									Y:0
+									Width:PARENT_RIGHT-35
+									Height:25
+									Children:
+										Image@FLAG:
+											X:20
+											Y:5
+											Width:35
+											Height:PARENT_BOTTOM-5
+											ImageName:random
+											ImageCollection:flags
+										Label@PLAYER:
+											X:55
+											Y:0
+											Width:160
+											Height:PARENT_BOTTOM
+											Font:Bold
+										Label@CASH:
+											X:215
+											Y:0
+											Width:80
+											Height:PARENT_BOTTOM
+										Label@EARNED_MIN:
+											X:295
+											Y:0
+											Width:60
+											Height:PARENT_BOTTOM
+										Label@EARNED_THIS_MIN:
+											X:395
+											Y:0
+											Width:60
+											Height:PARENT_BOTTOM
+										Label@ASSETS:
+											X:535
+											Y:0
+											Width:60
+											Height:PARENT_BOTTOM
+										Label@EARNED:
+											X:615
+											Y:0
+											Width:60
+											Height:PARENT_BOTTOM
+										Label@SPENT:
+											X:695
+											Y:0
+											Width:60
+											Height:PARENT_BOTTOM
+										Label@HARVESTERS:
+											X:775
+											Y:0
+											Width:60
+											Height:PARENT_BOTTOM
+											Align:Right
+								ScrollItem@PRODUCTION_PLAYER_TEMPLATE:
+									X:0
+									Y:0
+									Width:PARENT_RIGHT-35
+									Height:25
+									Children:
+										Image@FLAG:
+											X:20
+											Y:5
+											Width:35
+											Height:PARENT_BOTTOM-5
+											ImageName:random
+											ImageCollection:flags
+										Label@PLAYER:
+											X:55
+											Y:0
+											Width:160
+											Height:PARENT_BOTTOM
+											Font:Bold
+										ObserverProductionIcons@PRODUCTION_ICONS:
+											X:215
+											Y:0
+											Width:320
+											Height:PARENT_BOTTOM
+										ObserverSupportPowerIcons@SUPPORT_POWER_ICONS:
+											X:535
+											Y:0
+											Width:320
+											Height:PARENT_BOTTOM
+								ScrollItem@COMBAT_PLAYER_TEMPLATE:
+									X:0
+									Y:0
+									Width:PARENT_RIGHT-35
+									Height:25
+									Children:
+										Image@FLAG:
+											X:20
+											Y:5
+											Width:35
+											Height:PARENT_BOTTOM-5
+											ImageName:random
+											ImageCollection:flags
+										Label@PLAYER:
+											X:55
+											Y:0
+											Width:160
+											Height:PARENT_BOTTOM
+											Font:Bold
+										Label@CONTROL:
+											X:215
+											Y:0
+											Width:60
+											Height:PARENT_BOTTOM
+										Label@KILLS_COST:
+											X:295
+											Y:0
+											Width:60
+											Height:PARENT_BOTTOM
+										Label@DEATHS_COST:
+											X:375
+											Y:0
+											Width:60
+											Height:PARENT_BOTTOM
+										Label@UNITS_KILLED:
+											X:475
+											Y:0
+											Width:40
+											Height:PARENT_BOTTOM
+											Align:Right
+										Label@UNITS_DEAD:
+											X:575
+											Y:0
+											Width:40
+											Height:PARENT_BOTTOM
+											Align:Right
+										Label@BUILDINGS_KILLED:
+											X:695
+											Y:0
+											Width:40
+											Height:PARENT_BOTTOM
+											Align:Right
+										Label@BUILDINGS_DEAD:
+											X:795
+											Y:0
+											Width:40
+											Height:PARENT_BOTTOM
+											Align:Right
+								Container@EARNED_THIS_MIN_GRAPH_TEMPLATE:
+									X:0
+									Y:0
+									Width:PARENT_RIGHT-100
+									Height:PARENT_BOTTOM-50
+									Children:
+										LineGraph@EARNED_THIS_MIN_GRAPH:
+											X:0
+											Y:0
+											Width:PARENT_RIGHT
+											Height:PARENT_BOTTOM
+											ValueFormat:${0}
+											XAxisValueFormat:{0}
+											YAxisValueFormat:${0:F0}
+											XAxisSize:20
+											YAxisSize:10
+											XAxisLabel:m
+											YAxisLabel:$
+											LabelFont:TinyBold
+											AxisFont:Bold
\ No newline at end of file
diff --git a/mods/ra/chrome/ingame.yaml b/mods/ra/chrome/ingame.yaml
index cad3bc4f1d..da33fa2c65 100644
--- a/mods/ra/chrome/ingame.yaml
+++ b/mods/ra/chrome/ingame.yaml
@@ -227,657 +227,4 @@ Container@INGAME_ROOT:
 					X:20
 					Y:205
 					Width:170
-					Height:40
-Container@OBSERVER_ROOT:
-	Visible:true
-	Logic:IngameObserverChromeLogic
-	Children:
-		WorldInteractionController@INTERACTION_CONTROLLER:
-			X:0
-			Y:0
-			Width:WINDOW_RIGHT
-			Height:WINDOW_BOTTOM
-		ViewportScrollController:
-			X:0
-			Y:0
-			Width:WINDOW_RIGHT
-			Height:WINDOW_BOTTOM
-		Timer@GAME_TIMER:
-			X: WINDOW_RIGHT/2
-			Y: 0-10
-		Background@POSTGAME_BG:
-			X:(WINDOW_RIGHT - WIDTH)/2
-			Y:(WINDOW_BOTTOM - HEIGHT)/2
-			Width:400
-			Height:100
-			Background:dialog4
-			Visible:false
-			Children:
-				Label@TEXT:
-					X:(PARENT_RIGHT - WIDTH)/2
-					Y:0
-					Width:200
-					Height:80
-					Align:Center
-				Button@POSTGAME_OBSERVE:
-					X:10
-					Y:(PARENT_BOTTOM - HEIGHT - 10)
-					Width:150
-					Height:25
-					Font:Bold
-					Text:Observe
-				Button@POSTGAME_QUIT:
-					X:(PARENT_RIGHT - WIDTH - 10)
-					Y:(PARENT_BOTTOM - HEIGHT - 10)
-					Width:150
-					Height:25
-					Font:Bold
-					Text:Leave
-		SupportPowerBin@INGAME_POWERS_BIN:
-			X:0
-			Y:25
-		Button@INGAME_OPTIONS_BUTTON:
-			X:0
-			Y:0
-			Width:160
-			Height:25
-			Text:Options (ESC)
-			Font:Bold
-			Key:escape
-		Button@INGAME_STATS_BUTTON:
-			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
-		DropDownButton@SHROUD_SELECTOR:
-			Logic:ObserverShroudSelectorLogic
-			X:WINDOW_RIGHT-250
-			Y:260
-			Width:240
-			Height:25
-			Font:Bold
-			Visible:true
-		WorldTooltip:
-		Background@INGAME_OPTIONS_BG:
-			X:(WINDOW_RIGHT - WIDTH)/2
-			Y:(WINDOW_BOTTOM - HEIGHT)/2
-			Width:300
-			Height:295
-			Visible:false
-			Children:
-				Label@LABEL_TITLE:
-					X:(PARENT_RIGHT - WIDTH)/2
-					Y:20
-					Width:250
-					Height:25
-					Text:Options
-					Align:Center
-					Font:Bold
-				Button@RESUME:
-					X:(PARENT_RIGHT - WIDTH)/2
-					Y:60
-					Width:160
-					Height:25
-					Text:Resume
-					Font:Bold
-					Key:escape
-				Button@SETTINGS:
-					X:(PARENT_RIGHT - WIDTH)/2
-					Y:100
-					Width:160
-					Height:25
-					Text:Settings
-					Font:Bold
-				Button@MUSIC:
-					X:(PARENT_RIGHT - WIDTH)/2
-					Y:140
-					Width:160
-					Height:25
-					Text:Music
-					Font:Bold
-				Button@SURRENDER:
-					X:(PARENT_RIGHT - WIDTH)/2
-					Y:180
-					Width:160
-					Height:25
-					Text:Surrender
-					Font:Bold
-				Button@DISCONNECT:
-					X:(PARENT_RIGHT - WIDTH)/2
-					Y:220
-					Width:160
-					Height:25
-					Text:Abort Mission
-					Font:Bold
-		Background@PERF_BG:
-			ClickThrough:true
-			Background:dialog4
-			Logic:PerfDebugLogic
-			X:10
-			Y:WINDOW_BOTTOM - 250
-			Width: 210
-			Height: 250
-			Children:
-				PerfGraph@GRAPH:
-					X:5
-					Y:5
-					Width:200
-					Height:200
-				Label@TEXT:
-					X:20
-					Y:205
-					Width:170
-					Height:40
-		Container@OBSERVER_STATS:
-			Logic:ObserverStatsLogic
-			X:25
-			Y:50
-			Width:950
-			Height:500
-			Visible:false
-			Children:
-				Background@BACKGROUND:
-					Width:PARENT_RIGHT
-					Height:PARENT_BOTTOM
-					Background:dialog
-					Children:
-						Label@TITLE:
-							X:0
-							Y:15
-							Width:PARENT_RIGHT
-							Height:25
-							Font:Bold
-							Align:Center
-							Text:Statistics
-						DropDownButton@STATS_DROPDOWN:
-							X:PARENT_RIGHT-200
-							Y:15
-							Width:185
-							Height:25
-							Font:Bold
-						Container@BASIC_STATS_HEADERS:
-							X:0
-							Y:0
-							Width:PARENT_RIGHT
-							Height:PARENT_BOTTOM
-							Children:
-								Label@PLAYER_HEADER:
-									X:85
-									Y:40
-									Width:160
-									Height:25
-									Font:Bold
-									Text:Player
-								Label@CASH_HEADER:
-									X:245
-									Y:40
-									Width:80
-									Height:25
-									Font:Bold
-									Text:Cash
-								Label@EARNED_MIN_HEADER:
-									X:325
-									Y:40
-									Width:60
-									Height:25
-									Font:Bold
-									Text:Earned/min
-								Label@POWER_HEADER:
-									X:425
-									Y:40
-									Width:80
-									Height:25
-									Font:Bold
-									Text:Power
-								Label@KILLS_HEADER:
-									X:505
-									Y:40
-									Width:40
-									Height:25
-									Font:Bold
-									Text:Kills
-									Align:Right
-								Label@DEATHS_HEADER:
-									X:565
-									Y:40
-									Width:40
-									Height:25
-									Font:Bold
-									Text:Deaths
-									Align:Right
-								Label@ACTIONS_MIN_HEADER:
-									X:665
-									Y:40
-									Width:40
-									Height:25
-									Font:Bold
-									Text:Actions/min
-									Align:Right
-						Container@ECONOMY_STATS_HEADERS:
-							X:0
-							Y:0
-							Width:PARENT_RIGHT
-							Height:PARENT_BOTTOM
-							Children:
-								Label@PLAYER_HEADER:
-									X:85
-									Y:40
-									Width:160
-									Height:25
-									Font:Bold
-									Text:Player
-								Label@CASH_HEADER:
-									X:245
-									Y:40
-									Width:80
-									Height:25
-									Font:Bold
-									Text:Cash
-								Label@EARNED_MIN_HEADER:
-									X:325
-									Y:40
-									Width:60
-									Height:25
-									Font:Bold
-									Text:Earned/min
-								Label@EARNED_THIS_MIN_HEADER:
-									X:425
-									Y:40
-									Width:60
-									Height:25
-									Font:Bold
-									Text:Earned this min
-								Label@ASSETS_HEADER:
-									X:565
-									Y:40
-									Width:60
-									Height:25
-									Font:Bold
-									Text:Assets
-								Label@EARNED_HEADER:
-									X:645
-									Y:40
-									Width:60
-									Height:25
-									Font:Bold
-									Text:Earned
-								Label@SPENT_HEADER:
-									X:725
-									Y:40
-									Width:60
-									Height:25
-									Font:Bold
-									Text:Spent
-								Label@HARVESTERS_HEADER:
-									X:805
-									Y:40
-									Width:60
-									Height:25
-									Font:Bold
-									Text:Harvesters
-									Align:Right
-						Container@PRODUCTION_STATS_HEADERS:
-							X:0
-							Y:0
-							Width:PARENT_RIGHT
-							Height:PARENT_BOTTOM
-							Children:
-								Label@PLAYER_HEADER:
-									X:85
-									Y:40
-									Width:160
-									Height:25
-									Font:Bold
-									Text:Player
-								Label@PRODUCTION_HEADER:
-									X:245
-									Y:40
-									Width:320
-									Height:25
-									Font:Bold
-									Text:Production
-								Label@SUPPORT_POWERS_HEADER:
-									X:565
-									Y:40
-									Width:320
-									Height:25
-									Font:Bold
-									Text:Support Powers
-						Container@COMBAT_STATS_HEADERS:
-							X:0
-							Y:0
-							Width:PARENT_RIGHT
-							Height:PARENT_BOTTOM
-							Children:
-								Label@PLAYER_HEADER:
-									X:85
-									Y:40
-									Width:160
-									Height:25
-									Font:Bold
-									Text:Player
-								Label@CONTROL_HEADER:
-									X:245
-									Y:40
-									Width:60
-									Height:25
-									Font:Bold
-									Text:Control
-								Label@KILLS_COST_HEADER:
-									X:325
-									Y:40
-									Width:60
-									Height:25
-									Font:Bold
-									Text:Kills
-								Label@DEATHS_COST_HEADER:
-									X:405
-									Y:40
-									Width:60
-									Height:25
-									Font:Bold
-									Text:Deaths
-								Label@UNITS_KILLED_HEADER:
-									X:505
-									Y:40
-									Width:40
-									Height:25
-									Font:Bold
-									Text:Units Killed
-									Align:Right
-								Label@UNITS_DEAD_HEADER:
-									X:605
-									Y:40
-									Width:40
-									Height:25
-									Font:Bold
-									Text:Units Lost
-									Align:Right
-								Label@BUILDINGS_KILLED_HEADER:
-									X:725
-									Y:40
-									Width:40
-									Height:25
-									Font:Bold
-									Text:Bldg Killed
-									Align:Right
-								Label@BUILDINGS_DEAD_HEADER:
-									X:825
-									Y:40
-									Width:40
-									Height:25
-									Font:Bold
-									Text:Bldg Lost
-									Align:Right
-						Container@EARNED_THIS_MIN_GRAPH_HEADERS:
-							X:0
-							Y:0
-							Width:PARENT_RIGHT
-							Height:PARENT_BOTTOM
-							Children:
-								Label@EARNED_THIS_MIN_HEADER:
-									X:0
-									Y:40
-									Width:PARENT_RIGHT
-									Height:25
-									Font:Bold
-									Text:Earnings received each minute
-									Align:Center
-						ScrollPanel@PLAYER_STATS_PANEL:
-							X:25
-							Y:70
-							Width:PARENT_RIGHT-50
-							Height:PARENT_BOTTOM-45-50
-							ItemSpacing:5
-							Children:
-								ScrollItem@TEAM_TEMPLATE:
-									X:0
-									Y:0
-									Width:PARENT_RIGHT-35
-									Height:25
-									Children:
-										Label@TEAM:
-											X:0
-											Y:0
-											Width:PARENT_RIGHT
-											Height:PARENT_BOTTOM
-											Font:Bold
-								ScrollItem@BASIC_PLAYER_TEMPLATE:
-									X:0
-									Y:0
-									Width:PARENT_RIGHT-35
-									Height:25
-									Children:
-										Image@FLAG:
-											X:20
-											Y:5
-											Width:35
-											Height:PARENT_BOTTOM-5
-											ImageName:random
-											ImageCollection:flags
-										Label@PLAYER:
-											X:55
-											Y:0
-											Width:160
-											Height:PARENT_BOTTOM
-											Font:Bold
-										Label@CASH:
-											X:215
-											Y:0
-											Width:80
-											Height:PARENT_BOTTOM
-										Label@EARNED_MIN:
-											X:295
-											Y:0
-											Width:60
-											Height:PARENT_BOTTOM
-										Label@POWER:
-											X:395
-											Y:0
-											Width:80
-											Height:PARENT_BOTTOM
-										Label@KILLS:
-											X:475
-											Y:0
-											Width:40
-											Height:PARENT_BOTTOM
-											Align:Right
-										Label@DEATHS:
-											X:535
-											Y:0
-											Width:40
-											Height:PARENT_BOTTOM
-											Align:Right
-										Label@ACTIONS_MIN:
-											X:635
-											Y:0
-											Width:40
-											Height:PARENT_BOTTOM
-											Align:Right
-								ScrollItem@ECONOMY_PLAYER_TEMPLATE:
-									X:0
-									Y:0
-									Width:PARENT_RIGHT-35
-									Height:25
-									Children:
-										Image@FLAG:
-											X:20
-											Y:5
-											Width:35
-											Height:PARENT_BOTTOM-5
-											ImageName:random
-											ImageCollection:flags
-										Label@PLAYER:
-											X:55
-											Y:0
-											Width:160
-											Height:PARENT_BOTTOM
-											Font:Bold
-										Label@CASH:
-											X:215
-											Y:0
-											Width:80
-											Height:PARENT_BOTTOM
-										Label@EARNED_MIN:
-											X:295
-											Y:0
-											Width:60
-											Height:PARENT_BOTTOM
-										Label@EARNED_THIS_MIN:
-											X:395
-											Y:0
-											Width:60
-											Height:PARENT_BOTTOM
-										Label@ASSETS:
-											X:535
-											Y:0
-											Width:60
-											Height:PARENT_BOTTOM
-										Label@EARNED:
-											X:615
-											Y:0
-											Width:60
-											Height:PARENT_BOTTOM
-										Label@SPENT:
-											X:695
-											Y:0
-											Width:60
-											Height:PARENT_BOTTOM
-										Label@HARVESTERS:
-											X:775
-											Y:0
-											Width:60
-											Height:PARENT_BOTTOM
-											Align:Right
-								ScrollItem@PRODUCTION_PLAYER_TEMPLATE:
-									X:0
-									Y:0
-									Width:PARENT_RIGHT-35
-									Height:25
-									Children:
-										Image@FLAG:
-											X:20
-											Y:5
-											Width:35
-											Height:PARENT_BOTTOM-5
-											ImageName:random
-											ImageCollection:flags
-										Label@PLAYER:
-											X:55
-											Y:0
-											Width:160
-											Height:PARENT_BOTTOM
-											Font:Bold
-										ObserverProductionIcons@PRODUCTION_ICONS:
-											X:215
-											Y:0
-											Width:320
-											Height:PARENT_BOTTOM
-										ObserverSupportPowerIcons@SUPPORT_POWER_ICONS:
-											X:535
-											Y:0
-											Width:320
-											Height:PARENT_BOTTOM
-								ScrollItem@COMBAT_PLAYER_TEMPLATE:
-									X:0
-									Y:0
-									Width:PARENT_RIGHT-35
-									Height:25
-									Children:
-										Image@FLAG:
-											X:20
-											Y:5
-											Width:35
-											Height:PARENT_BOTTOM-5
-											ImageName:random
-											ImageCollection:flags
-										Label@PLAYER:
-											X:55
-											Y:0
-											Width:160
-											Height:PARENT_BOTTOM
-											Font:Bold
-										Label@CONTROL:
-											X:215
-											Y:0
-											Width:60
-											Height:PARENT_BOTTOM
-										Label@KILLS_COST:
-											X:295
-											Y:0
-											Width:60
-											Height:PARENT_BOTTOM
-										Label@DEATHS_COST:
-											X:375
-											Y:0
-											Width:60
-											Height:PARENT_BOTTOM
-										Label@UNITS_KILLED:
-											X:475
-											Y:0
-											Width:40
-											Height:PARENT_BOTTOM
-											Align:Right
-										Label@UNITS_DEAD:
-											X:575
-											Y:0
-											Width:40
-											Height:PARENT_BOTTOM
-											Align:Right
-										Label@BUILDINGS_KILLED:
-											X:695
-											Y:0
-											Width:40
-											Height:PARENT_BOTTOM
-											Align:Right
-										Label@BUILDINGS_DEAD:
-											X:795
-											Y:0
-											Width:40
-											Height:PARENT_BOTTOM
-											Align:Right
-								Container@EARNED_THIS_MIN_GRAPH_TEMPLATE:
-									X:0
-									Y:0
-									Width:PARENT_RIGHT-100
-									Height:PARENT_BOTTOM-50
-									Children:
-										LineGraph@EARNED_THIS_MIN_GRAPH:
-											X:0
-											Y:0
-											Width:PARENT_RIGHT
-											Height:PARENT_BOTTOM
-											ValueFormat:${0}
-											XAxisValueFormat:{0}
-											YAxisValueFormat:${0:F0}
-											XAxisSize:20
-											YAxisSize:10
-											XAxisLabel:m
-											YAxisLabel:$
-											LabelFont:TinyBold
-											AxisFont:Bold
-Background@FMVPLAYER:
-	Width:WINDOW_RIGHT
-	Height:WINDOW_BOTTOM
-	Background:dialog4
-	Children:
-		VqaPlayer@PLAYER:
-			X:0
-			Y:0
-			Width:WINDOW_RIGHT
-			Height:WINDOW_BOTTOM
+					Height:40
\ No newline at end of file
diff --git a/mods/ra/chrome/lobby.yaml b/mods/ra/chrome/lobby.yaml
index 353b85f3e0..3b85458a1a 100644
--- a/mods/ra/chrome/lobby.yaml
+++ b/mods/ra/chrome/lobby.yaml
@@ -432,70 +432,4 @@ Background@SERVER_LOBBY:
 			Width:120
 			Height:25
 			Text:Start Game
-			Font:Bold
-Background@COLOR_CHOOSER:
-	Logic:ColorPickerLogic
-	Background:dialog2
-	Width:310
-	Height:120
-	Children:
-		Button@SAVE_BUTTON:
-			X:210
-			Y:85
-			Width:90
-			Height:25
-			Text:Save
-			Font:Bold
-		Button@RANDOM_BUTTON:
-			X:115
-			Y:85
-			Width:90
-			Height:25
-			Text:Random
-			Font:Bold
-		ShpImage@FACT:
-			X:220
-			Y:10
-			Image:fact
-			Palette:colorpicker
-		Label@HUE_LABEL:
-			X:0
-			Y:5
-			Width:40
-			Height:20
-			Align: Right
-			Text: Hue:
-		Slider@HUE:
-			X:43
-			Y:10
-			Width:160
-			Height:20
-			Ticks:5
-		Label@SAT_LABEL:
-			X:0
-			Y:30
-			Width:40
-			Height:20
-			Align: Right
-			Text: Sat:	
-		Slider@SAT:
-			X:43
-			Y:35
-			Width:160
-			Height:20
-			Ticks:5
-		Label@LUM_LABEL:
-			X:0
-			Y:55
-			Width:40
-			Height:20
-			Align: Right
-			Text: Lum:	
-		Slider@LUM:
-			X:43
-			Y:60
-			Width:160
-			Height:20
-			Ticks:5
-			MinimumValue: 0.2
-			MaximumValue: 1
+			Font:Bold
\ No newline at end of file
diff --git a/mods/ra/mod.yaml b/mods/ra/mod.yaml
index 01fe43e4ab..bbe96b670d 100644
--- a/mods/ra/mod.yaml
+++ b/mods/ra/mod.yaml
@@ -56,9 +56,12 @@ ChromeLayout:
 	mods/ra/chrome/gameinit.yaml
 	mods/ra/chrome/ingame.yaml
 	mods/ra/chrome/ingame-chat.yaml
+	mods/ra/chrome/ingame-observer.yaml
+	mods/ra/chrome/ingame-fmvplayer.yaml
 	mods/ra/chrome/mainmenu.yaml
 	mods/ra/chrome/settings.yaml
 	mods/ra/chrome/lobby.yaml
+	mods/ra/chrome/color-picker.yaml
 	mods/ra/chrome/map-chooser.yaml
 	mods/ra/chrome/create-server.yaml
 	mods/ra/chrome/serverbrowser.yaml