Add a mission objectives GUI panel

2014-07-27 13:25:58 +02:00
parent 2c22e5099f
commit 8cec848a0f
46 changed files with 1252 additions and 886 deletions
--- a/mods/cnc/chrome/ingame-debug.yaml
+++ b/mods/cnc/chrome/ingame-debug.yaml
@@ -3,122 +3,110 @@ Container@DEBUG_PANEL:
 	Width: PARENT_RIGHT
 	Height: PARENT_BOTTOM
 	Children:
-		Label@TITLE:
-			Width: PARENT_RIGHT
-			Y: 0-25
-			Font: BigBold
-			Contrast: true
+		Label@CHEATS_TITLE:
+			Y: 25
+			Font: Bold
+			Text: Cheats
 			Align: Center
-			Text: Debug Options
-		Background@bg:
 			Width: PARENT_RIGHT
-			Height: PARENT_BOTTOM
-			Background: panel-black
-			Children:
-				Label@CHEATS_TITLE:
-					Y: 25
-					Font: Bold
-					Text: Cheats
-					Align: Center
-					Width: PARENT_RIGHT
-				Checkbox@INSTANT_BUILD:
-					X: 45
-					Y: 45
-					Width: 200
-					Height: 20
-					Font: Regular
-					Text: Instant Build Speed
-				Checkbox@ENABLE_TECH:
-					X: 45
-					Y: 75
-					Width: 200
-					Height: 20
-					Font: Regular
-					Text: Build Everything
-				Checkbox@BUILD_ANYWHERE:
-					X: 45
-					Y: 105
-					Width: 200
-					Height: 20
-					Font: Regular
-					Text: Build Anywhere
-				Checkbox@UNLIMITED_POWER:
-					X: 290
-					Y: 45
-					Width: 200
-					Height: 20
-					Font: Regular
-					Text: Unlimited Power
-				Checkbox@INSTANT_CHARGE:
-					X: 290
-					Y: 75
-					Width: 200
-					Height: 20
-					Font: Regular
-					Text: Instant Charge Time
-				Checkbox@DISABLE_SHROUD:
-					X: 290
-					Y: 105
-					Height: 20
-					Width: 200
-					Font: Regular
-					Text: Disable Shroud & Fog
-				Button@GIVE_CASH:
-					X: 90
-					Y: 145
-					Width: 140
-					Height: 35
-					Text: Give $20,000
-				Button@GROW_RESOURCES:
-					X: 271
-					Y: 145
-					Width: 140
-					Height: 35
-					Text: Grow Resources
-				Button@GIVE_EXPLORATION:
-					X: 90
-					Y: 195
-					Width: 140
-					Height: 35
-					Text: Clear Shroud
-				Button@RESET_EXPLORATION:
-					X: 271
-					Y: 195
-					Width: 140
-					Height: 35
-					Text: Reset Shroud
-				Label@VISUALIZATIONS_TITLE:
-					Y: 255
-					Font: Bold
-					Text: Visualizations
-					Align: Center
-					Width: PARENT_RIGHT
-				Checkbox@SHOW_UNIT_PATHS:
-					X: 45
-					Y: 285
-					Width: 200
-					Height: 20
-					Font: Regular
-					Text: Show Unit Paths
-				Checkbox@SHOW_ASTAR:
-					X: 45
-					Y: 315
-					Height: 20
-					Width: 200
-					Font: Regular
-					Text: Show A* Cost
-				Checkbox@SHOW_COMBATOVERLAY:
-					X: 290
-					Y: 285
-					Height: 20
-					Width: 200
-					Font: Regular
-					Text: Show Combat Geometry
-				Checkbox@SHOW_GEOMETRY:
-					X: 290
-					Y: 315
-					Height: 20
-					Width: 200
-					Font: Regular
-					Text: Show Render Geometry
+		Checkbox@INSTANT_BUILD:
+			X: 45
+			Y: 45
+			Width: 200
+			Height: 20
+			Font: Regular
+			Text: Instant Build Speed
+		Checkbox@ENABLE_TECH:
+			X: 45
+			Y: 75
+			Width: 200
+			Height: 20
+			Font: Regular
+			Text: Build Everything
+		Checkbox@BUILD_ANYWHERE:
+			X: 45
+			Y: 105
+			Width: 200
+			Height: 20
+			Font: Regular
+			Text: Build Anywhere
+		Checkbox@UNLIMITED_POWER:
+			X: 290
+			Y: 45
+			Width: 200
+			Height: 20
+			Font: Regular
+			Text: Unlimited Power
+		Checkbox@INSTANT_CHARGE:
+			X: 290
+			Y: 75
+			Width: 200
+			Height: 20
+			Font: Regular
+			Text: Instant Charge Time
+		Checkbox@DISABLE_SHROUD:
+			X: 290
+			Y: 105
+			Height: 20
+			Width: 200
+			Font: Regular
+			Text: Disable Shroud & Fog
+		Button@GIVE_CASH:
+			X: 90
+			Y: 145
+			Width: 140
+			Height: 35
+			Text: Give $20,000
+		Button@GROW_RESOURCES:
+			X: 271
+			Y: 145
+			Width: 140
+			Height: 35
+			Text: Grow Resources
+		Button@GIVE_EXPLORATION:
+			X: 90
+			Y: 195
+			Width: 140
+			Height: 35
+			Text: Clear Shroud
+		Button@RESET_EXPLORATION:
+			X: 271
+			Y: 195
+			Width: 140
+			Height: 35
+			Text: Reset Shroud
+		Label@VISUALIZATIONS_TITLE:
+			Y: 255
+			Font: Bold
+			Text: Visualizations
+			Align: Center
+			Width: PARENT_RIGHT
+		Checkbox@SHOW_UNIT_PATHS:
+			X: 45
+			Y: 285
+			Width: 200
+			Height: 20
+			Font: Regular
+			Text: Show Unit Paths
+		Checkbox@SHOW_ASTAR:
+			X: 45
+			Y: 315
+			Height: 20
+			Width: 200
+			Font: Regular
+			Text: Show A* Cost
+		Checkbox@SHOW_COMBATOVERLAY:
+			X: 290
+			Y: 285
+			Height: 20
+			Width: 200
+			Font: Regular
+			Text: Show Combat Geometry
+		Checkbox@SHOW_GEOMETRY:
+			X: 290
+			Y: 315
+			Height: 20
+			Width: 200
+			Font: Regular
+			Text: Show Render Geometry

--- a/mods/cnc/chrome/ingame-info.yaml
+++ b/mods/cnc/chrome/ingame-info.yaml
@@ -0,0 +1,55 @@
+Container@GAME_INFO_PANEL:
+	X: (WINDOW_RIGHT - WIDTH) / 2
+	Y: (WINDOW_BOTTOM - HEIGHT) / 2
+	Width: 512
+	Height: 375
+	Logic: GameInfoLogic
+	Visible: False
+	Children:
+		Label@TITLE:
+			Width: PARENT_RIGHT
+			Y: 0 - 20
+			Text: Game Information
+			Align: Center
+			Font: BigBold
+			Contrast: true
+		Label@TITLE_NO_TABS:
+			Width: PARENT_RIGHT
+			Y: 15
+			Text: Game Information
+			Align: Center
+			Font: BigBold
+			Contrast: true
+		Container@TAB_CONTAINER:
+			Children:
+				Button@BUTTON1:
+					Y: 5
+					Width: 140
+					Height: 35
+					Visible: False
+				Button@BUTTON2:
+					X: 150
+					Y: 5
+					Width: 140
+					Height: 35
+					Visible: False
+				Button@BUTTON3:
+					X: 300
+					Y: 5
+					Width: 140
+					Height: 35
+					Visible: False
+		Background@BACKGROUND:
+			Y: 39
+			Width: PARENT_RIGHT
+			Height: PARENT_BOTTOM
+			Background: panel-black
+			Children:
+				Container@STATS_PANEL:
+				Container@MAP_PANEL:
+					Width: PARENT_RIGHT
+					Height: PARENT_BOTTOM
+				Container@OBJECTIVES_PANEL:
+				Container@DEBUG_PANEL:
+					Width: PARENT_RIGHT
+					Height: PARENT_BOTTOM
--- a/mods/cnc/chrome/ingame-infobriefing.yaml
+++ b/mods/cnc/chrome/ingame-infobriefing.yaml
@@ -0,0 +1,32 @@
+Container@MAP_PANEL:
+	Height:	PARENT_BOTTOM
+	Width: PARENT_RIGHT
+	Logic: GameInfoBriefingLogic
+	Children:
+		Background@PREVIEW_BG:
+			X: (PARENT_RIGHT - WIDTH) / 2
+			Y: 15
+			Width: 324
+			Height: 160
+			Background: panel-gray
+			Children:
+				MapPreview@MAP_PREVIEW:
+					Width: 320
+					Height: 156
+					X: 2
+					Y: 2
+					IgnoreMouseOver: True
+					IgnoreMouseInput: True
+					ShowSpawnPoints: False
+		ScrollPanel@MAP_DESCRIPTION_PANEL:
+			X: 15
+			Y: 190
+			Width: 482
+			Height: 170
+			Children:
+				Label@MAP_DESCRIPTION:
+					X: 5
+					Y: 195
+					Width: 452
+					Height: 160
+
--- a/mods/cnc/chrome/ingame-infoobjectives.yaml
+++ b/mods/cnc/chrome/ingame-infoobjectives.yaml
@@ -0,0 +1,40 @@
+Container@MISSION_OBJECTIVES:
+	Height:	PARENT_BOTTOM
+	Width: PARENT_RIGHT
+	Logic: GameInfoObjectivesLogic
+	Children:
+		Label@MISSION:
+			X: 15
+			Y: 15
+			Width: 80
+			Height: 20
+			Font: MediumBold
+			Text: Mission:
+		Label@MISSION_STATUS:
+			X: 95
+			Y: 15
+			Width: PARENT_RIGHT - 110
+			Height: 20
+			Font: MediumBold
+		ScrollPanel@OBJECTIVES_PANEL:
+			X: 15
+			Y: 50
+			Width: 482
+			Height: 310
+			ItemSpacing: 35
+			Children:
+				Container@OBJECTIVE_TEMPLATE:
+					Children:
+						Label@OBJECTIVE_TYPE:
+							X: 10
+							Y: 0 - 20
+							Height: 20
+							Width: 70
+							Align: Center
+						Checkbox@OBJECTIVE_STATUS:
+							X: 90
+							Y: 0 - 20
+							Width: PARENT_RIGHT - 100
+							Height: 20
+							Disabled: True
+							TextColorDisabled: 255,255,255
--- a/mods/cnc/chrome/ingame-infostats.yaml
+++ b/mods/cnc/chrome/ingame-infostats.yaml
@@ -0,0 +1,108 @@
+Container@SKIRMISH_STATS:
+	Height:	PARENT_BOTTOM
+	Width: PARENT_RIGHT
+	Logic: GameInfoStatsLogic
+	Children:
+		Label@STATS_OBJECTIVE:
+			X: 15
+			Y: 10
+			Width: 85
+			Height: 25
+			Font: MediumBold
+			Text: Mission:
+		Label@STATS_STATUS:
+			X: 100
+			Y: 10
+			Width: PARENT_RIGHT - 10
+			Height: 25
+			Font: MediumBold
+		Checkbox@STATS_CHECKBOX:
+			X: 15
+			Y: 45
+			Width: 482
+			Height: 20
+			Font: Bold
+			Text: Destroy all opposition!
+			Disabled: yes
+			TextColorDisabled: 255,255,255
+		Container@STATS_HEADERS:
+			X: 17
+			Y: 80
+			Width: 393
+			Children:
+				Label@NAME:
+					X: 10
+					Width: 150
+					Height: 25
+					Text: Player
+					Font: Bold
+				Label@RACE:
+					X: 150
+					Width: 80
+					Height: 25
+					Text: Faction
+					Font: Bold
+					Align: Center
+				Label@STANCE:
+					X: 240
+					Width: 70
+					Height: 25
+					Text: Team
+					Font: Bold
+					Align: Center
+				Label@KILLS:
+					X: 310
+					Width: 70
+					Height: 25
+					Text: Kills
+					Font: Bold
+					Align: Center
+				Label@DEATHS:
+					X: 380
+					Width: 70
+					Height: 25
+					Text: Deaths
+					Font: Bold
+					Align: Center
+		ScrollPanel@PLAYER_LIST:
+			X: 15
+			Y: 105
+			Width: 482
+			Height: 250
+			ItemSpacing: 5
+			Children:
+				Container@PLAYER_TEMPLATE:
+					Width: PARENT_RIGHT-27
+					Height: 25
+					X: 2
+					Y: 0
+					Children:
+						Label@NAME:
+							X: 10
+							Width: 150
+							Height: 25
+						Image@FACTIONFLAG:
+							X: 159
+							Y: 6
+							Width: 32
+							Height: 16
+						Label@FACTION:
+							X: 195
+							Width: 40
+							Height: 25
+						Label@TEAM:
+							X: 240
+							Width: 70
+							Height: 25
+							Align: Center
+						Label@KILLS:
+							X: 310
+							Width: 70
+							Height: 25
+							Align: Center
+						Label@DEATHS:
+							X: 380
+							Width: 70
+							Height: 25
+							Align: Center
+
--- a/mods/cnc/chrome/ingame-menu.yaml
+++ b/mods/cnc/chrome/ingame-menu.yaml
@@ -1,27 +1,7 @@
-Container@INGAME_MENU_PANEL:
-	X: (WINDOW_RIGHT - WIDTH)/2
-	Y: (WINDOW_BOTTOM - HEIGHT)/2
-	Width: 512
-	Height: 370
-	Children:
-		Button@OBJECTIVES_BUTTON:
-			Y: PARENT_BOTTOM - 1
-			Width: 140
-			Height: 35
-			Text: Objectives
-			Visible: false
-		Button@DEBUG_BUTTON:
-			X: 150
-			Y: PARENT_BOTTOM - 1
-			Width: 140
-			Height: 35
-			Text: Debug
-			Visible: false
-
 Container@INGAME_MENU:
 	Width: WINDOW_RIGHT
 	Height: WINDOW_BOTTOM
-	Logic: CncIngameMenuLogic
+	Logic: IngameMenuLogic
 	Children:
 		Image@EVA:
 			X: WINDOW_RIGHT-128-43
@@ -46,31 +26,31 @@ Container@INGAME_MENU:
 			Width: 740
 			Height: 35
 			Children:
-				Button@QUIT_BUTTON:
+				Button@ABORT_MISSION:
 					X: 0
 					Y: 0
 					Width: 140
 					Height: 35
 					Text: Abort Mission
-				Button@SURRENDER_BUTTON:
+				Button@SURRENDER:
 					X: 150
 					Y: 0
 					Width: 140
 					Height: 35
 					Text: Surrender
-				Button@MUSIC_BUTTON:
+				Button@MUSIC:
 					X: 300
 					Y: 0
 					Width: 140
 					Height: 35
 					Text: Music
-				Button@SETTINGS_BUTTON:
+				Button@SETTINGS:
 					X: 450
 					Y: 0
 					Width: 140
 					Height: 35
 					Text: Settings
-				Button@RESUME_BUTTON:
+				Button@RESUME:
 					Key: escape
 					X: 600
 					Y: 0
--- a/mods/cnc/chrome/objectives.yaml
+++ b/mods/cnc/chrome/objectives.yaml
@@ -1,120 +0,0 @@
-Container@CONQUEST_OBJECTIVES:
-	Logic: CncConquestObjectivesLogic
-	Width: PARENT_RIGHT
-	Height: PARENT_BOTTOM
-	Children:
-		Label@TITLE:
-			Width: PARENT_RIGHT
-			Y: 0-25
-			Font: BigBold
-			Contrast: true
-			Align: Center
-		Background@bg:
-			Width: PARENT_RIGHT
-			Height: PARENT_BOTTOM
-			Background: panel-black
-			Children:
-				Label@PRIMARY:
-					X: 15
-					Y: 10
-					Width: 482
-					Height: 25
-					Font: MediumBold
-					Text: Primary Objectives:
-				Label@STATUS:
-					X: 190
-					Y: 10
-					Width: 482
-					Height: 25
-					Font: MediumBold
-					Text: Incomplete
-				Checkbox@1:
-					X: 25
-					Y: 45
-					Width: 482
-					Height: 20
-					Font: Bold
-					Text: Crush all opposition!
-					Disabled: yes
-				Container@LABEL_CONTAINER:
-					X: 17
-					Y: 80
-					Width: 393
-					Children:
-						Label@NAME:
-							X: 10
-							Width: 150
-							Height: 25
-							Text: Player
-							Align: Center
-							Font: Bold
-						Label@RACE:
-							X: 150
-							Width: 80
-							Height: 25
-							Text: Faction
-							Font: Bold
-							Align: Center
-						Label@STANCE:
-							X: 240
-							Width: 70
-							Height: 25
-							Text: Team
-							Font: Bold
-							Align: Center
-						Label@KILLS:
-							X: 310
-							Width: 70
-							Height: 25
-							Text: Kills
-							Font: Bold
-							Align: Center
-						Label@DEATHS:
-							X: 380
-							Width: 70
-							Height: 25
-							Text: Deaths
-							Font: Bold
-							Align: Center
-				ScrollPanel@PLAYER_LIST:
-					X: 15
-					Y: 105
-					Width: 482
-					Height: 250
-					ItemSpacing: 5
-					Children:
-						Container@PLAYER_TEMPLATE:
-							Width: PARENT_RIGHT-27
-							Height: 25
-							X: 2
-							Y: 0
-							Children:
-								Label@NAME:
-									X: 10
-									Width: 150
-									Height: 25
-								Image@FACTIONFLAG:
-									X: 159
-									Y: 6
-									Width: 32
-									Height: 16
-								Label@FACTION:
-									X: 195
-									Width: 40
-									Height: 25
-								Label@TEAM:
-									X: 240
-									Width: 70
-									Height: 25
-									Align: Center
-								Label@KILLS:
-									X: 310
-									Width: 70
-									Height: 25
-									Align: Center
-								Label@DEATHS:
-									X: 380
-									Width: 70
-									Height: 25
-									Align: Center
-
--- a/mods/cnc/mod.yaml
+++ b/mods/cnc/mod.yaml
@@ -88,13 +88,16 @@ ChromeLayout:
 	mods/cnc/chrome/replaybrowser.yaml
 	mods/cnc/chrome/ingame.yaml
 	mods/cnc/chrome/ingame-chat.yaml
-	mods/cnc/chrome/ingame-debug.yaml
 	mods/cnc/chrome/ingame-menu.yaml
+	mods/cnc/chrome/ingame-debug.yaml
+	mods/cnc/chrome/ingame-info.yaml
+	mods/cnc/chrome/ingame-infobriefing.yaml
+	mods/cnc/chrome/ingame-infoobjectives.yaml
+	mods/cnc/chrome/ingame-infostats.yaml
 	mods/cnc/chrome/music.yaml
 	mods/cnc/chrome/settings.yaml
 	mods/cnc/chrome/credits.yaml
 	mods/cnc/chrome/dialogs.yaml
-	mods/cnc/chrome/objectives.yaml
 	mods/cnc/chrome/tooltips.yaml
 	mods/cnc/chrome/irc.yaml
 	mods/cnc/chrome/assetbrowser.yaml
--- a/mods/cnc/rules/world.yaml
+++ b/mods/cnc/rules/world.yaml
@@ -8,6 +8,7 @@ World:
 	LoadWidgetAtGameStart:
 		Widget: INGAME_ROOT
 	MenuPaletteEffect:
+		MenuEffect: Desaturated
 	CloakPaletteEffect:
 	ScreenShaker:
 	NukePaletteEffect:
@@ -185,7 +186,7 @@ World:
 	PathFinder:
 	ValidateOrder:
 	DebugPauseState:
-	ConquestObjectivesPanel:
-		ObjectivesPanel: CONQUEST_OBJECTIVES
+	ObjectivesPanel:
+		PanelName: SKIRMISH_STATS
 	RadarPings:

--- a/mods/d2k/chrome/ingame-menu.yaml
+++ b/mods/d2k/chrome/ingame-menu.yaml
@@ -0,0 +1,61 @@
+Container@INGAME_MENU:
+	Width: WINDOW_RIGHT
+	Height: WINDOW_BOTTOM
+	Logic: IngameMenuLogic
+	Children:
+		Label@VERSION_LABEL:
+			X: WINDOW_RIGHT - 10
+			Y: WINDOW_BOTTOM - 20
+			Align: Right
+			Font: Regular
+			Contrast: True
+		Background@MENU_BUTTONS:
+			X: 100
+			Y: (WINDOW_BOTTOM - HEIGHT)/2
+			Width: 200
+			Height: 295
+			Children:
+				Label@LABEL_TITLE:
+					X: (PARENT_RIGHT - WIDTH)/2
+					Y: 20
+					Width: 200
+					Height: 30
+					Text: Options
+					Align: Center
+					Font: Bold
+				Button@RESUME:
+					X: (PARENT_RIGHT - WIDTH)/2
+					Y: 60
+					Width: 140
+					Height: 30
+					Text: Resume
+					Font: Bold
+					Key: escape
+				Button@SETTINGS:
+					X: (PARENT_RIGHT - WIDTH)/2
+					Y: 100
+					Width: 140
+					Height: 30
+					Text: Settings
+					Font: Bold
+				Button@MUSIC:
+					X: (PARENT_RIGHT - WIDTH)/2
+					Y: 140
+					Width: 140
+					Height: 30
+					Text: Music
+					Font: Bold
+				Button@SURRENDER:
+					X: (PARENT_RIGHT - WIDTH)/2
+					Y: 180
+					Width: 140
+					Height: 30
+					Text: Surrender
+					Font: Bold
+				Button@ABORT_MISSION:
+					X: (PARENT_RIGHT - WIDTH)/2
+					Y: 220
+					Width: 140
+					Height: 30
+					Text: Abort Mission
+					Font: Bold
--- a/mods/d2k/chrome/ingame-observer.yaml
+++ b/mods/d2k/chrome/ingame-observer.yaml
@@ -1,6 +1,10 @@
 Container@OBSERVER_WIDGETS:
 	Children:
-		Button@OBSERVER_STATS_BUTTON:
+		MenuButton@OBSERVER_STATS_BUTTON:
+			Logic: OrderButtonsChromeLogic
+			MenuContainer: INGAME_OBSERVERSTATS_BG
+			HideIngameUI: False
+			Pause: False
 			X: 162
 			Y: 0
 			Width: 160
--- a/mods/d2k/chrome/ingame-player.yaml
+++ b/mods/d2k/chrome/ingame-player.yaml
@@ -3,7 +3,10 @@ Container@PLAYER_WIDGETS:
 		LogicKeyListener@CONTROLGROUP_KEYHANDLER:
 			Logic: ControlGroupLogic
 		LogicTicker@SIDEBAR_TICKER:
-		Button@INGAME_DIPLOMACY_BUTTON:
+		MenuButton@DIPLOMACY_BUTTON:
+			Logic: OrderButtonsChromeLogic
+			MenuContainer: INGAME_DIPLOMACY_BG
+			HideIngameUI: False
 			X: 162
 			Y: 0
 			Width: 160
@@ -11,24 +14,16 @@ Container@PLAYER_WIDGETS:
 			Text: Diplomacy (P)
 			Font: Bold
 			Key: p
-		Button@INGAME_DEBUG_BUTTON:
+		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
-		Button@OBJECTIVES_BUTTON:
-			X: 486
-			Y: 0
-			Width: 160
-			Height: 25
-			Text: Objectives (O)
-			Visible: false
-			Font: Bold
-			Key: o
 		SlidingContainer@INGAME_RADAR_BIN:
 			X: WINDOW_RIGHT-215
 			Y: 0
--- a/mods/d2k/chrome/ingame.yaml
+++ b/mods/d2k/chrome/ingame.yaml
@@ -46,7 +46,8 @@ Container@INGAME_ROOT:
 			Y: 34
 			Order: Descending
 		Container@PLAYER_ROOT:
-		Button@INGAME_OPTIONS_BUTTON:
+		MenuButton@OPTIONS_BUTTON:
+			Logic: OrderButtonsChromeLogic
 			X: 0
 			Y: 0
 			Width: 160
--- a/mods/d2k/mod.yaml
+++ b/mods/d2k/mod.yaml
@@ -61,7 +61,11 @@ ChromeLayout:
 	mods/ra/chrome/ingame-chat.yaml
 	mods/ra/chrome/ingame-diplomacy.yaml
 	mods/ra/chrome/ingame-fmvplayer.yaml
-	mods/ra/chrome/ingame-menu.yaml
+	mods/d2k/chrome/ingame-menu.yaml
+	mods/ra/chrome/ingame-info.yaml
+	mods/ra/chrome/ingame-infobriefing.yaml
+	mods/ra/chrome/ingame-infoobjectives.yaml
+	mods/ra/chrome/ingame-infostats.yaml
 	mods/d2k/chrome/ingame-observer.yaml
 	mods/ra/chrome/ingame-observerstats.yaml
 	mods/d2k/chrome/ingame-player.yaml
@@ -152,6 +156,9 @@ Fonts:
 	Title:
 		Font:mods/d2k/Dune2k.ttf
 		Size:32
+	MediumBold:
+		Font:FreeSansBold.ttf
+		Size:18
 	BigBold:
 		Font:FreeSansBold.ttf
 		Size:24
--- a/mods/d2k/rules/world.yaml
+++ b/mods/d2k/rules/world.yaml
@@ -189,4 +189,6 @@ World:
 	ValidateOrder:
 	DebugPauseState:
 	RadarPings:
+	ObjectivesPanel:
+		PanelName: SKIRMISH_STATS

--- a/mods/ra/chrome/ingame-debug.yaml
+++ b/mods/ra/chrome/ingame-debug.yaml
@@ -1,110 +1,117 @@
-Background@INGAME_DEBUG_BG:
+Container@DEBUG_PANEL:
 	Logic: DebugMenuLogic
-	X: (WINDOW_RIGHT - WIDTH)/2
-	Y: (WINDOW_BOTTOM - HEIGHT)/2
-	Width: 350
-	Height: 475
+	Y: 20
+	Width: PARENT_RIGHT
+	Height: PARENT_BOTTOM
 	Children:
-		Label@LABEL_TITLE:
-			X: (PARENT_RIGHT - WIDTH)/2
-			Y: 20
-			Width: 250
-			Height: 25
+		Label@LABLE_TITLE:
+			Y: 25
+			Font: Bold
 			Text: Debug Options
 			Align: Center
-			Font: Bold
-		Checkbox@DISABLE_SHROUD:
-			X: 30
-			Y: 50
-			Height: 20
-			Width: PARENT_RIGHT - 30
-			Text: Disable Shroud & Fog
-		Button@GIVE_EXPLORATION:
-			X: 30
-			Y: 80
-			Width: 120
-			Height: 25
-			Text: Give Exploration
-		Button@RESET_EXPLORATION:
-			X: 200
-			Y: 80
-			Width: 120
-			Height: 25
-			Text: Reset Exploration
-		Checkbox@SHOW_UNIT_PATHS:
-			X: 30
-			Y: 110
-			Width: PARENT_RIGHT - 30
-			Height: 20
-			Text: Show Unit Paths
-		Button@GIVE_CASH:
-			X: 30
-			Y: 140
-			Width: 135
-			Height: 20
-			Text: Give $20000 Cash
-			Height: 25
-		Button@GROW_RESOURCES:
-			X: 185
-			Y: 140
-			Width: 135
-			Height: 20
-			Text: Grow Resources
-			Height: 25
+			Width: PARENT_RIGHT
 		Checkbox@INSTANT_BUILD:
-			X: 30
-			Y: 170
-			Width: PARENT_RIGHT - 30
+			X: 45
+			Y: 45
+			Width: 200
 			Height: 20
+			Font: Regular
 			Text: Instant Build Speed
-		Checkbox@INSTANT_CHARGE:
-			X: 30
-			Y: 200
-			Width: PARENT_RIGHT - 30
-			Height: 20
-			Text: Support Powers Charge Instantly
 		Checkbox@ENABLE_TECH:
-			X: 30
-			Y: 230
-			Width: PARENT_RIGHT - 30
+			X: 45
+			Y: 75
+			Width: 200
 			Height: 20
+			Font: Regular
 			Text: Build Everything
-		Checkbox@UNLIMITED_POWER:
-			X: 30
-			Y: 260
-			Width: PARENT_RIGHT - 30
-			Height: 20
-			Text: Unlimited Power
 		Checkbox@BUILD_ANYWHERE:
-			X: 30
-			Y: 290
-			Width: PARENT_RIGHT - 30
+			X: 45
+			Y: 105
+			Width: 200
 			Height: 20
+			Font: Regular
 			Text: Build Anywhere
-		Checkbox@SHOW_ASTAR:
-			X: 30
-			Y: 320
-			Width: PARENT_RIGHT - 30
+		Checkbox@UNLIMITED_POWER:
+			X: 290
+			Y: 45
+			Width: 200
 			Height: 20
+			Font: Regular
+			Text: Unlimited Power
+		Checkbox@INSTANT_CHARGE:
+			X: 290
+			Y: 75
+			Width: 200
+			Height: 20
+			Font: Regular
+			Text: Instant Charge Time
+		Checkbox@DISABLE_SHROUD:
+			X: 290
+			Y: 105
+			Height: 20
+			Width: 200
+			Font: Regular
+			Text: Disable Shroud & Fog
+		Button@GIVE_CASH:
+			X: 90
+			Y: 150
+			Width: 140
+			Height: 30
+			Font: Bold
+			Text: Give $20,000
+		Button@GROW_RESOURCES:
+			X: 271
+			Y: 150
+			Width: 140
+			Height: 30
+			Font: Bold
+			Text: Grow Resources
+		Button@GIVE_EXPLORATION:
+			X: 90
+			Y: 200
+			Width: 140
+			Height: 30
+			Font: Bold
+			Text: Clear Shroud
+		Button@RESET_EXPLORATION:
+			X: 271
+			Y: 200
+			Width: 140
+			Height: 30
+			Font: Bold
+			Text: Reset Shroud
+		Label@VISUALIZATIONS_TITLE:
+			Y: 255
+			Font: Bold
+			Text: Visualizations
+			Align: Center
+			Width: PARENT_RIGHT
+		Checkbox@SHOW_UNIT_PATHS:
+			X: 45
+			Y: 285
+			Width: 200
+			Height: 20
+			Font: Regular
+			Text: Show Unit Paths
+		Checkbox@SHOW_ASTAR:
+			X: 45
+			Y: 315
+			Height: 20
+			Width: 200
+			Font: Regular
 			Text: Show A* Cost
 		Checkbox@SHOW_COMBATOVERLAY:
-			X: 30
-			Y: 350
+			X: 290
+			Y: 285
 			Height: 20
 			Width: 200
+			Font: Regular
 			Text: Show Combat Geometry
 		Checkbox@SHOW_GEOMETRY:
-			X: 30
-			Y: 380
+			X: 290
+			Y: 315
 			Height: 20
 			Width: 200
+			Font: Regular
 			Text: Show Render Geometry
-		Button@CLOSE:
-			X: 30
-			Y: 420
-			Width: PARENT_RIGHT - 60
-			Height: 25
-			Text: Close
-			Key: escape
-			Font: Bold

--- a/mods/ra/chrome/ingame-info.yaml
+++ b/mods/ra/chrome/ingame-info.yaml
@@ -0,0 +1,64 @@
+Container@GAME_INFO_PANEL:
+	X: (WINDOW_RIGHT - WIDTH) / 2
+	Y: (WINDOW_BOTTOM - HEIGHT) / 2
+	Width: 522
+	Height: 455
+	Logic: GameInfoLogic
+	Visible: False
+	Children:
+		Background@BACKGROUND:
+			Width: PARENT_RIGHT
+			Height: PARENT_BOTTOM
+		Background@BACKGROUND_NO_TABS:
+			Y: 25
+			Width: PARENT_RIGHT
+			Height: PARENT_BOTTOM - 25
+		Label@TITLE:
+			Y: 20
+			Width: PARENT_RIGHT
+			Height: 25
+			Align: Center
+			Font: Bold
+		Label@TITLE_NO_TABS:
+			Y: 45
+			Width: PARENT_RIGHT
+			Height: 25
+			Align: Center
+			Font: Bold
+		Container@TAB_CONTAINER:
+			X: (PARENT_RIGHT - WIDTH) / 2
+			Width: 360
+			Height: 25
+			Children:
+				Button@BUTTON1:
+					Y: 50
+					Width: 120
+					Height: 25
+					Font: Bold
+					Visible: False
+				Button@BUTTON2:
+					X: 120
+					Y: 50
+					Width: 120
+					Height: 25
+					Font: Bold
+					Visible: False
+				Button@BUTTON3:
+					X: 240
+					Y: 50
+					Width: 120
+					Height: 25
+					Font: Bold
+					Visible: False
+		Container@STATS_PANEL:
+			Y: 65
+		Container@MAP_PANEL:
+			Y: 65
+			Width: PARENT_RIGHT
+			Height: PARENT_BOTTOM
+		Container@OBJECTIVES_PANEL:
+			Y: 65
+		Container@DEBUG_PANEL:
+			Y: 65
+			Width: PARENT_RIGHT
+			Height: PARENT_BOTTOM
--- a/mods/ra/chrome/ingame-infobriefing.yaml
+++ b/mods/ra/chrome/ingame-infobriefing.yaml
@@ -0,0 +1,32 @@
+Container@MAP_PANEL:
+	Height:	PARENT_BOTTOM
+	Width: PARENT_RIGHT
+	Logic: GameInfoBriefingLogic
+	Children:
+		Background@PREVIEW_BG:
+			X: (PARENT_RIGHT - WIDTH) / 2
+			Y: 20
+			Width: 324
+			Height: 160
+			Background: panel-gray
+			Children:
+				MapPreview@MAP_PREVIEW:
+					Width: 320
+					Height: 156
+					X: 2
+					Y: 2
+					IgnoreMouseOver: True
+					IgnoreMouseInput: True
+					ShowSpawnPoints: False
+		ScrollPanel@MAP_DESCRIPTION_PANEL:
+			X: 20
+			Y: 195
+			Width: 482
+			Height: 175
+			Children:
+				Label@MAP_DESCRIPTION:
+					X: 5
+					Y: 180
+					Width: 452
+					Height: 145
+
--- a/mods/ra/chrome/ingame-infoobjectives.yaml
+++ b/mods/ra/chrome/ingame-infoobjectives.yaml
@@ -0,0 +1,40 @@
+Container@MISSION_OBJECTIVES:
+	Height:	PARENT_BOTTOM
+	Width: PARENT_RIGHT
+	Logic: GameInfoObjectivesLogic
+	Children:
+		Label@MISSION:
+			X: 20
+			Y: 20
+			Width: 80
+			Height: 25
+			Font: MediumBold
+			Text: Mission:
+		Label@MISSION_STATUS:
+			X: 100
+			Y: 20
+			Width: PARENT_RIGHT - 120
+			Height: 25
+			Font: MediumBold
+		ScrollPanel@OBJECTIVES_PANEL:
+			X: 20
+			Y: 60
+			Width: 482
+			Height: 310
+			ItemSpacing: 35
+			Children:
+				Container@OBJECTIVE_TEMPLATE:
+					Children:
+						Label@OBJECTIVE_TYPE:
+							X: 10
+							Y: 0 - 20
+							Height: 20
+							Width: 70
+							Align: Center
+						Checkbox@OBJECTIVE_STATUS:
+							X: 90
+							Y: 0 - 20
+							Width: PARENT_RIGHT - 100
+							Height: 20
+							Disabled: True
+							TextColorDisabled: 255,255,255
--- a/mods/ra/chrome/ingame-infostats.yaml
+++ b/mods/ra/chrome/ingame-infostats.yaml
@@ -0,0 +1,108 @@
+Container@SKIRMISH_STATS:
+	Height:	PARENT_BOTTOM
+	Width: PARENT_RIGHT
+	Logic: GameInfoStatsLogic
+	Children:
+		Label@MISSION:
+			X: 20
+			Y: 20
+			Width: 482
+			Height: 25
+			Font: MediumBold
+			Text: Mission:
+		Label@STATS_STATUS:
+			X: 100
+			Y: 20
+			Width: PARENT_RIGHT - 10
+			Height: 25
+			Font: MediumBold
+		Checkbox@STATS_CHECKBOX:
+			X: 20
+			Y: 55
+			Width: 482
+			Height: 20
+			Font: Bold
+			Text: Destroy all opposition!
+			Disabled: yes
+			TextColorDisabled: 255,255,255
+		Container@STATS_HEADERS:
+			X: 22
+			Y: 80
+			Width: 393
+			Children:
+				Label@NAME:
+					X: 10
+					Width: 150
+					Height: 25
+					Text: Player
+					Font: Bold
+				Label@RACE:
+					X: 150
+					Width: 80
+					Height: 25
+					Text: Faction
+					Font: Bold
+					Align: Center
+				Label@STANCE:
+					X: 240
+					Width: 70
+					Height: 25
+					Text: Team
+					Font: Bold
+					Align: Center
+				Label@KILLS:
+					X: 310
+					Width: 70
+					Height: 25
+					Text: Kills
+					Font: Bold
+					Align: Center
+				Label@DEATHS:
+					X: 380
+					Width: 70
+					Height: 25
+					Text: Deaths
+					Font: Bold
+					Align: Center
+		ScrollPanel@PLAYER_LIST:
+			X: 20
+			Y: 105
+			Width: 482
+			Height: 265
+			ItemSpacing: 5
+			Children:
+				Container@PLAYER_TEMPLATE:
+					Width: PARENT_RIGHT-27
+					Height: 25
+					X: 2
+					Y: 0
+					Children:
+						Label@NAME:
+							X: 10
+							Width: 150
+							Height: 25
+						Image@FACTIONFLAG:
+							X: 159
+							Y: 6
+							Width: 32
+							Height: 16
+						Label@FACTION:
+							X: 195
+							Width: 40
+							Height: 25
+						Label@TEAM:
+							X: 240
+							Width: 70
+							Height: 25
+							Align: Center
+						Label@KILLS:
+							X: 310
+							Width: 70
+							Height: 25
+							Align: Center
+						Label@DEATHS:
+							X: 380
+							Width: 70
+							Height: 25
+							Align: Center
+
--- a/mods/ra/chrome/ingame-menu.yaml
+++ b/mods/ra/chrome/ingame-menu.yaml
@@ -1,52 +1,74 @@
-Background@INGAME_OPTIONS_BG:
-	X: (WINDOW_RIGHT - WIDTH)/2
-	Y: (WINDOW_BOTTOM - HEIGHT)/2
-	Width: 300
-	Height: 295
+Container@INGAME_MENU:
+	Width: WINDOW_RIGHT
+	Height: WINDOW_BOTTOM
 	Logic: IngameMenuLogic
 	Children:
-		Label@LABEL_TITLE:
-			X: (PARENT_RIGHT - WIDTH)/2
-			Y: 20
-			Width: 250
+		Background@BORDER:
+			X: 0 - 15
+			Y: 0 - 15
+			Width: WINDOW_RIGHT + 30
+			Height: WINDOW_BOTTOM + 30
+			Background: mainmenu-border
+		Image@LOGO:
+			X: WINDOW_RIGHT - 296
+			Y: 30
+			ImageCollection: logos
+			ImageName: logo
+		Label@VERSION_LABEL:
+			X: WINDOW_RIGHT - 296
+			Y: 296 - 20
+			Width: 296 - 20
 			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
-
+			Font: Regular
+			Contrast: True
+		Background@MENU_BUTTONS:
+			X: 100
+			Y: (WINDOW_BOTTOM - HEIGHT)/2
+			Width: 200
+			Height: 295
+			Children:
+				Label@LABEL_TITLE:
+					X: (PARENT_RIGHT - WIDTH)/2
+					Y: 20
+					Width: 200
+					Height: 30
+					Text: Options
+					Align: Center
+					Font: Bold
+				Button@RESUME:
+					X: (PARENT_RIGHT - WIDTH)/2
+					Y: 60
+					Width: 140
+					Height: 30
+					Text: Resume
+					Font: Bold
+					Key: escape
+				Button@SETTINGS:
+					X: (PARENT_RIGHT - WIDTH)/2
+					Y: 100
+					Width: 140
+					Height: 30
+					Text: Settings
+					Font: Bold
+				Button@MUSIC:
+					X: (PARENT_RIGHT - WIDTH)/2
+					Y: 140
+					Width: 140
+					Height: 30
+					Text: Music
+					Font: Bold
+				Button@SURRENDER:
+					X: (PARENT_RIGHT - WIDTH)/2
+					Y: 180
+					Width: 140
+					Height: 30
+					Text: Surrender
+					Font: Bold
+				Button@ABORT_MISSION:
+					X: (PARENT_RIGHT - WIDTH)/2
+					Y: 220
+					Width: 140
+					Height: 30
+					Text: Abort Mission
+					Font: Bold
--- a/mods/ra/chrome/ingame-objectives.yaml
+++ b/mods/ra/chrome/ingame-objectives.yaml
@@ -1,98 +0,0 @@
-Background@MISSION_OBJECTIVES:
-	Logic: MissionObjectivesLogic
-	X: 25
-	Y: 50
-	Width: 512
-	Height: 530
-	Visible: false
-	Background: dialog
-	Children:
-		Label@TITLE:
-			X: 0
-			Y: 15
-			Width: PARENT_RIGHT
-			Height: 25
-			Font: Bold
-			Align: Center
-			Text: Objectives
-		Label@PRIMARY_OBJECTIVE_HEADER:
-			X: 40
-			Y: 40
-			Width: 300
-			Height: 25
-			Font: Bold
-			Text: Primary Objectives
-		Label@PRIMARY_STATUS_HEADER:
-			X: 350
-			Y: 40
-			Width: 122
-			Height: 25
-			Font: Bold
-			Text: Status
-		ScrollPanel@PRIMARY_OBJECTIVES:
-			X: 25
-			Y: 70
-			Width: PARENT_RIGHT-50
-			Height: 200
-			ItemSpacing: 20
-			Children:
-				Container@PRIMARY_OBJECTIVE_TEMPLATE:
-					X: 15
-					Y: 0
-					Width: PARENT_RIGHT
-					Children:
-						Label@PRIMARY_OBJECTIVE:
-							X: 0
-							Y: 0
-							Width: 300
-							Height: PARENT_BOTTOM
-							Font: Regular
-							WordWrap: True
-						Label@PRIMARY_STATUS:
-							X: 310
-							Y: 0
-							Width: 122
-							Height: PARENT_BOTTOM
-							Font: Bold
-							WordWrap: True
-		Label@SECONDARY_OBJECTIVE_HEADER:
-			X: 40
-			Y: 275
-			Width: 300
-			Height: 25
-			Font: Bold
-			Text: Secondary Objectives
-		Label@SECONDARY_STATUS_HEADER:
-			X: 350
-			Y: 275
-			Width: 122
-			Height: 25
-			Font: Bold
-			Text: Status
-		ScrollPanel@SECONDARY_OBJECTIVES:
-			X: 25
-			Y: 305
-			Width: PARENT_RIGHT-50
-			Height: 200
-			ItemSpacing: 20
-			Children:
-				Container@SECONDARY_OBJECTIVE_TEMPLATE:
-					X: 15
-					Y: 0
-					Width: PARENT_RIGHT
-					Children:
-						Label@SECONDARY_OBJECTIVE:
-							X: 0
-							Y: 0
-							Width: 300
-							Height: PARENT_BOTTOM
-							Font: Regular
-							WordWrap: True
-						Label@SECONDARY_STATUS:
-							X: 310
-							Y: 0
-							Width: 122
-							Height: PARENT_BOTTOM
-							Font: Bold
-							WordWrap: True
-
--- a/mods/ra/chrome/ingame-observer.yaml
+++ b/mods/ra/chrome/ingame-observer.yaml
@@ -21,8 +21,8 @@ Container@OBSERVER_WIDGETS:
 					Font: Bold
 					Contrast: true
 		MenuButton@OPTIONS_BUTTON:
-			MenuContainer: INGAME_OPTIONS_BG
-			HideIngameUI: false
+			MenuContainer: INGAME_MENU
+			HideIngameUI: true
 			Pause: false
 			X: 0
 			Y: 0
--- a/mods/ra/chrome/ingame-player.yaml
+++ b/mods/ra/chrome/ingame-player.yaml
@@ -3,15 +3,6 @@ Container@PLAYER_WIDGETS:
 		LogicKeyListener@CONTROLGROUP_KEYHANDLER:
 			Logic: ControlGroupLogic
 		LogicTicker@SIDEBAR_TICKER:
-		Button@OBJECTIVES_BUTTON:
-			X: 486
-			Y: 0
-			Width: 160
-			Height: 25
-			Text: Objectives (O)
-			Visible: false
-			Font: Bold
-			Key: o
 		Container@SUPPORT_POWERS:
 			Logic: SupportPowerBinLogic
 			X: 10
@@ -106,9 +97,6 @@ Container@PLAYER_WIDGETS:
 									ImageCollection: order-icons
 						MenuButton@DEBUG_BUTTON:
 							Logic: AddRaceSuffixLogic
-							MenuContainer: INGAME_DEBUG_BG
-							HideIngameUI: false
-							Pause: false
 							Key: escape Shift
 							X: 128
 							Width: 28
@@ -144,8 +132,6 @@ Container@PLAYER_WIDGETS:
 									ImageName: diplomacy
 						MenuButton@OPTIONS_BUTTON:
 							Logic: AddRaceSuffixLogic
-							MenuContainer: INGAME_OPTIONS_BG
-							HideIngameUI: false
 							Key: escape
 							X: 192
 							Width: 28
--- a/mods/ra/mod.yaml
+++ b/mods/ra/mod.yaml
@@ -74,8 +74,11 @@ ChromeLayout:
 	mods/ra/chrome/ingame-chat.yaml
 	mods/ra/chrome/ingame-diplomacy.yaml
 	mods/ra/chrome/ingame-fmvplayer.yaml
+	mods/ra/chrome/ingame-info.yaml
+	mods/ra/chrome/ingame-infobriefing.yaml
+	mods/ra/chrome/ingame-infoobjectives.yaml
+	mods/ra/chrome/ingame-infostats.yaml
 	mods/ra/chrome/ingame-menu.yaml
-	mods/ra/chrome/ingame-objectives.yaml
 	mods/ra/chrome/ingame-observer.yaml
 	mods/ra/chrome/ingame-observerstats.yaml
 	mods/ra/chrome/ingame-player.yaml
@@ -169,6 +172,9 @@ Fonts:
 	Title:
 		Font:mods/ra/ZoodRangmah.ttf
 		Size:48
+	MediumBold:
+		Font:FreeSansBold.ttf
+		Size:18
 	BigBold:
 		Font:FreeSansBold.ttf
 		Size:24
--- a/mods/ra/rules/world.yaml
+++ b/mods/ra/rules/world.yaml
@@ -174,4 +174,6 @@ World:
 	DebugPauseState:
 	RadarPings:
 	StartGameNotification:
+	ObjectivesPanel:
+		PanelName: SKIRMISH_STATS

--- a/mods/ts/chrome/ingame-player.yaml
+++ b/mods/ts/chrome/ingame-player.yaml
@@ -3,7 +3,10 @@ Container@PLAYER_WIDGETS:
 		LogicKeyListener@CONTROLGROUP_KEYHANDLER:
 			Logic: ControlGroupLogic
 		LogicTicker@SIDEBAR_TICKER:
-		Button@INGAME_DIPLOMACY_BUTTON:
+		MenuButton@DIPLOMACY_BUTTON:
+			Logic: OrderButtonsChromeLogic
+			MenuContainer: INGAME_DIPLOMACY_BG
+			HideIngameUI: False
 			X: 162
 			Y: 0
 			Width: 160
@@ -11,7 +14,9 @@ Container@PLAYER_WIDGETS:
 			Text: Diplomacy (P)
 			Font: Bold
 			Key: p
-		Button@INGAME_DEBUG_BUTTON:
+		MenuButton@DEBUG_BUTTON:
+			Logic: OrderButtonsChromeLogic
+			MenuContainer: INGAME_MENU
 			X: 324
 			Y: 0
 			Width: 160
@@ -20,15 +25,6 @@ Container@PLAYER_WIDGETS:
 			Visible: false
 			Font: Bold
 			Key: escape Shift
-		Button@OBJECTIVES_BUTTON:
-			X: 486
-			Y: 0
-			Width: 160
-			Height: 25
-			Text: Objectives (O)
-			Visible: false
-			Font: Bold
-			Key: o
 		SlidingContainer@INGAME_RADAR_BIN:
 			X: WINDOW_RIGHT-215
 			Y: 0
--- a/mods/ts/chrome/ingame.yaml
+++ b/mods/ts/chrome/ingame.yaml
@@ -46,7 +46,9 @@ Container@INGAME_ROOT:
 			Y: 34
 			Order: Descending
 		Container@PLAYER_ROOT:
-		Button@INGAME_OPTIONS_BUTTON:
+		MenuButton@OPTIONS_BUTTON:
+			Logic: OrderButtonsChromeLogic
+			MenuContainer: INGAME_MENU
 			X: 0
 			Y: 0
 			Width: 160
--- a/mods/ts/mod.yaml
+++ b/mods/ts/mod.yaml
@@ -104,7 +104,10 @@ ChromeLayout:
 	mods/ra/chrome/ingame-diplomacy.yaml
 	mods/ra/chrome/ingame-fmvplayer.yaml
 	mods/ra/chrome/ingame-menu.yaml
-	mods/ra/chrome/ingame-objectives.yaml
+	mods/ra/chrome/ingame-info.yaml
+	mods/ra/chrome/ingame-infobriefing.yaml
+	mods/ra/chrome/ingame-infoobjectives.yaml
+	mods/ra/chrome/ingame-infostats.yaml
 	mods/ra/chrome/ingame-observer.yaml
 	mods/ra/chrome/ingame-observerstats.yaml
 	mods/ts/chrome/ingame-player.yaml