Merge pull request #149 from raysfire/dev

v2020.0808

1 files changed, 247 insertions, 311 deletions

diff --git a/customizations/main_menu/mainmenuoverride-classic.res b/customizations/main_menu/mainmenuoverride-classic.res
index 757c621..4e80008 100644
--- a/customizations/main_menu/mainmenuoverride-classic.res
+++ b/customizations/main_menu/mainmenuoverride-classic.res
@@ -40,7 +40,7 @@
 				"tabPosition"	"0"
 				"textinsetx"	"25"
 				"use_proportional_insets" "1"
-				"font"			"CerbeticaBold16"
+				"font"			"Cerbetica16"
 				"textAlignment"	"west"
 				"dulltext"		"0"
 				"brighttext"	"0"
@@ -176,36 +176,6 @@
 		"scaleImage"	"1"
 	}
 
-	"MainMenuSideBG"
-	{
-		"ControlName"	"EditablePanel"
-		"fieldName"		"MainMenuSideBG"
-		"xpos"			"75"
-		"ypos"			"0"
-		"zpos"			"-1"
-		"wide"			"200"
-		"tall"			"f0"
-		"visible"		"1"
-		"enabled"		"1"
-		"bgcolor_override"		"25 25 25 255"
-		"PaintBackgroundType"	"2"
-	}
-
-	"MainMenuSideBGOuter"
-	{
-		"ControlName"	"EditablePanel"
-		"fieldName"		"MainMenuSideBGOuter"
-		"xpos"			"72"
-		"ypos"			"0"
-		"zpos"			"-2"
-		"wide"			"205"
-		"tall"			"f0"
-		"visible"		"1"
-		"enabled"		"1"
-		"bgcolor_override"		"72 255 255 255"
-		"PaintBackgroundType"	"2"
-	}
-
 	"TFLogoImage"
 	{
 		"ControlName"	"ImagePanel"
@@ -214,9 +184,9 @@
 		"ypos"			"35"
 		"wide"			"180"
 		"tall"			"46"
-		"visible"		"0"
-		"enabled"		"0"
-		"image"			"replay/thumbnails/tflogo"
+		"visible"		"1"
+		"enabled"		"1"
+		"image"			"../logo/tf2_logo_black"
 		"scaleImage"	"1"
 		"command"		"engine play vo/heavy_battlecry02.mp3"
 	}
@@ -235,19 +205,13 @@
 		"scaleImage"	"1"
 	}
 
-	"DashboardDimmer"
-	{
-		"wide"			"0"
-		"tall"			"0"
-	}
-
 	"RankModelPanel"
 	{
 		"ControlName"	"CPvPRankPanel"
 		"fieldName"		"RankModelPanel"
 		"xpos"			"150"
 		"ypos"			"cs-0.46"
-		"zpos"			"1"
+		"zpos"			"0"
 		"wide"			"170"
 		"tall"			"800"
 		"visible"		"0"
@@ -263,7 +227,7 @@
 		"fieldName"		"CycleRankTypeButton"
 		"xpos"			"250"
 		"ypos"			"cs-0.5-10"
-		"zpos"			"2"
+		"zpos"			"1"
 		"wide"			"15"
 		"tall"			"15"
 		"autoResize"	"0"
@@ -337,7 +301,7 @@
 		"ypos"			"250"
 		"zpos"			"0"
 		"wide"			"170"
-		"tall"			"100"
+		"tall"			"60"
 		"visible"		"1"
 		"proportionaltoparent"	"1"
 		"mouseinputenabled"	"0"
@@ -380,11 +344,26 @@
 		"tall"			"30"
 		"visible"		"1"
 		"enabled"		"1"
-		"image"			"replay\thumbnails\raysfox"
+		"image"			"replay\thumbnails\nogc"
 		"scaleImage"	"1"
 		"proportionaltoparent" "1"
 	}
 
+	"RankBorder"
+	{
+		"ControlName"	"EditablePanel"
+		"fieldName"		"RankBorder"
+		"xpos"			"30"
+		"ypos"			"57"
+		"zpos"			"-55"
+		"wide"			"260"
+		"tall"			"198"
+		"visible"		"0"
+		"PaintBackgroundType"	"2"
+		"border"		"MainMenuBGBorder"
+		"proportionaltoparent"	"1"
+	}
+
 	"TooltipPanel"
 	{
 		"ControlName"			"EditablePanel"
@@ -396,7 +375,7 @@
 		"tall"					"50"
 		"visible"				"0"
 		"PaintBackgroundType"	"2"
-		"border"				"CyanBorder"
+		"border"				"CyanBorderThick"
 
 		"TipSubLabel"
 		{
@@ -422,11 +401,11 @@
 		{
 			"ControlName"	"CExLabel"
 			"fieldName"		"TipLabel"
-			"font"			"HudFontSmallBold"
+			"font"			"HudFontSmallest"
 			"labelText"		"%tiptext%"
 			"textAlignment"	"center"
-			"xpos"			"10"
-			"ypos"			"3"
+			"xpos"			"5"
+			"ypos"			"0"
 			"zpos"			"3"
 			"wide"			"140"
 			"tall"			"30"
@@ -444,31 +423,17 @@
 	{
 		"ControlName"		"EditablePanel"
 		"fieldName"			"Notifications_ShowButtonPanel"
-		"xpos"				"227"
-		"ypos"				"425"
-		"zpos"				"10"
+		"xpos"				"r28"
+		"ypos"				"40"
+		"zpos"				"0"
 		"wide"				"20"
-		"tall"				"25"
+		"tall"				"20"
 		"autoResize"		"0"
 		"pinCorner"			"3"
 		"visible"			"1"
 		"enabled"			"1"
-
-		"SubImage"
-		{
-			"ControlName"		"ImagePanel"
-			"fieldName"			"SubImage"
-			"xpos"				"16"
-			"ypos"				"0"
-			"zpos"				"3"
-			"wide"				"16"
-			"tall"				"16"
-			"visible"			"0"
-			"enabled"			"0"
-			"image"				"glyph_achievements"
-			"scaleImage"		"1"
-			"drawcolor" 		"210 125 33 255"
-		}
+		"tabPosition"		"0"
+		"bgcolor_override"	"Transparent"
 
 		"Notifications_ShowButtonPanel_SB"
 		{
@@ -476,114 +441,69 @@
 			"fieldName"			"Notifications_ShowButtonPanel_SB"
 			"xpos"				"0"
 			"ypos"				"0"
-			"zpos"				"5"
-			"wide"				"15"
-			"tall"				"15"
+			"wide"				"20"
+			"tall"				"20"
 			"autoResize"		"0"
 			"pinCorner"			"3"
 			"visible"			"1"
 			"enabled"			"1"
 			"tabPosition"		"0"
-			"labelText"			""
-			"font"				""
+			"labelText"			"k"
+			"font"				"CustomIcons"
+			"Command"			"noti_show"
+			"use_proportional_insets" "1"
 			"textAlignment"		"center"
-			"dulltext"			"0"
-			"brighttext"		"0"
 			"default"			"1"
 			"actionsignallevel"	"2"
-			"Command"			"noti_show"
-
+			"paintbackground"	"0"
+			"paintborder"		"0"
 			"sound_depressed"	"UI/buttonclick.wav"
 			"sound_released"	"UI/buttonclickrelease.wav"
-			"paintbackground"	"0"
-
-			"image_drawcolor"			"235 226 202 255"
-			"image_armedcolor"			"72 255 255 255"
 
-			"defaultFgColor_override" 	"235 226 202 255"
+			"defaultFgColor_override"	"235 226 202 255"
 			"armedFgColor_override"		"72 255 255 255"
-
-			"SubImage"
-			{
-				"ControlName"	"ImagePanel"
-				"fieldName"		"SubImage"
-				"xpos"			"0"
-				"ypos"			"0"
-				"zpos"			"1"
-				"wide"			"16"
-				"tall"			"16"
-				"visible"		"1"
-				"enabled"		"1"
-				"scaleImage"	"1"
-				"image"			"replay/thumbnails/alert"
-			}
 		}
 	}
 
 	"WatchStreamButton"
 	{
-		"ControlName"	"EditablePanel"
+		"ControlName"	"CExImageButton"
 		"fieldName"		"WatchStreamButton"
 		"xpos"			"r28"
 		"ypos"			"65"
 		"zpos"			"0"
-		"wide"			"30"
-		"tall"			"24"
+		"wide"			"20"
+		"tall"			"20"
 		"autoResize"	"0"
-		"pinCorner"		"3"
+		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
 		"tabPosition"	"0"
+		"labelText"		""
+		"Command"		"engine hud_reloadscheme"
+		
+		"defaultBgColor_override" "Transparent"
+		"armedBgColor_override" "Transparent"
+		"depressedBgColor_override" "Transparent"
+		
+		"image_drawcolor"	"235 226 202 255"
+		"image_armedcolor"	"72 255 255 255"
 
-		"SubButton"
+		"SubImage"
 		{
-			"ControlName"	"CExImageButton"
-			"fieldName"		"SubButton"
-			"xpos"			"0"
-			"ypos"			"0"
-			"wide"			"30"
-			"tall"			"24"
-			"autoResize"	"0"
-			"pinCorner"		"3"
+			"ControlName"	"ImagePanel"
+			"fieldName"		"SubImage"
+			"xpos"			"2"
+			"ypos"			"2"
+			"zpos"			"1"
+			"wide"			"18"
+			"tall"			"18"
 			"visible"		"1"
 			"enabled"		"1"
-			"tabPosition"	"0"
-			"textinsetx"	"0"
-			"labelText"		""
-			"use_proportional_insets" "1"
-			"font"			""
-			"command"		"watch_stream"
-			"textAlignment"	"center"
-			"dulltext"		"0"
-			"brighttext"	"0"
-			"default"		"1"
-			"actionsignallevel" "2"
-			"sound_depressed"	"UI/buttonclick.wav"
-			"sound_released"	"UI/buttonclickrelease.wav"
-
-			"paintbackground"	"0"
-			"paintborder"		"0"
-
-			"defaultFgColor_override"	"235 226 202 255"
-			"armedFgColor_override"		"72 255 255 255"
-
-			"image_drawcolor"	"235 226 202 255"
-			"image_armedcolor"	"72 255 255 255"
-
-			"SubImage"
-			{
-				"ControlName"	"ImagePanel"
-				"fieldName"		"SubImage"
-				"xpos"			"2"
-				"ypos"			"0"
-				"zpos"			"1"
-				"wide"			"20"
-				"tall"			"20"
-				"visible"		"1"
-				"enabled"		"1"
-				"scaleImage"	"1"
-				"image"			"replay/thumbnails/twitch"
-			}
+			"scaleImage"	"1"
+			"proportionaltoparent"	"1"
+			"image"			"icon_resume"
+			"drawcolor_override" "235 226 202 255"
 		}
 	}
 
@@ -609,8 +529,8 @@
 		"xpos"			"r28"
 		"ypos"			"90"
 		"zpos"			"1"
-		"wide"			"30"
-		"tall"			"24"
+		"wide"			"20"
+		"tall"			"20"
 		"autoResize"	"0"
 		"pinCorner"		"3"
 		"visible"		"1"
@@ -623,49 +543,27 @@
 			"fieldName"		"SubButton"
 			"xpos"			"0"
 			"ypos"			"0"
-			"wide"			"30"
-			"tall"			"24"
+			"wide"			"20"
+			"tall"			"20"
 			"autoResize"	"0"
 			"pinCorner"		"3"
 			"visible"		"1"
 			"enabled"		"1"
 			"tabPosition"	"0"
-			"textinsetx"	"0"
-			"labelText"		""
-			"font"			""
+			"labelText"		"x"
+			"font"			"CustomIcons"
 			"command"		"questlog"
+			"proportionaltoparent"	"1"
 			"textAlignment"	"center"
-			"dulltext"		"0"
-			"brighttext"	"0"
 			"default"		"1"
-			"sound_depressed"	"UI/buttonclick.wav"
-			"sound_released"	"UI/buttonclickrelease.wav"
 			"actionsignallevel" "2"
-			"proportionaltoparent"	"1"
-
 			"paintbackground"	"0"
 			"paintborder"		"0"
-
-			"image_drawcolor"	"235 226 202 255"
-			"image_armedcolor"	"72 255 255 255"
+			"sound_depressed"	"UI/buttonclick.wav"
+			"sound_released"	"UI/buttonclickrelease.wav"
 
 			"defaultFgColor_override"	"235 226 202 255"
 			"armedFgColor_override"		"72 255 255 255"
-
-			"SubImage"
-			{
-				"ControlName"	"ImagePanel"
-				"fieldName"		"SubImage"
-				"xpos"			"5"
-				"ypos"			"3"
-				"zpos"			"1"
-				"wide"			"14"
-				"tall"			"14"
-				"visible"		"1"
-				"enabled"		"1"
-				"scaleImage"	"1"
-				"image"			"replay/thumbnails/contracts"
-			}
 		}
 	}
 
@@ -675,9 +573,9 @@
 		"fieldName"		"MOTD_ShowButtonPanel"
 		"xpos"			"r28"
 		"ypos"			"115"
-		"zpos"			"1"
-		"wide"			"30"
-		"tall"			"24"
+		"zpos"			"0"
+		"wide"			"20"
+		"tall"			"20"
 		"autoResize"	"0"
 		"pinCorner"		"3"
 		"visible"		"1"
@@ -690,49 +588,27 @@
 			"fieldName"		"MOTD_ShowButtonPanel_SB"
 			"xpos"			"0"
 			"ypos"			"0"
-			"wide"			"30"
-			"tall"			"24"
+			"wide"			"20"
+			"tall"			"20"
 			"autoResize"	"0"
 			"pinCorner"		"3"
 			"visible"		"1"
 			"enabled"		"1"
 			"tabPosition"	"0"
-			"textinsetx"	"0"
-			"labelText"		""
-			"font"			""
+			"labelText"		"o"
+			"font"			"CustomIcons"
 			"command"		"motd_show"
+			"use_proportional_insets" "1"
 			"textAlignment"	"center"
-			"dulltext"		"0"
-			"brighttext"	"0"
 			"default"		"1"
-			"sound_depressed"	"UI/buttonclick.wav"
-			"sound_released"	"UI/buttonclickrelease.wav"
 			"actionsignallevel" "2"
-			"proportionaltoparent"	"1"
-
 			"paintbackground"	"0"
 			"paintborder"		"0"
-
-			"image_drawcolor"	"235 226 202 255"
-			"image_armedcolor"	"72 255 255 255"
+			"sound_depressed"	"UI/buttonclick.wav"
+			"sound_released"	"UI/buttonclickrelease.wav"
 
 			"defaultFgColor_override"	"235 226 202 255"
 			"armedFgColor_override"		"72 255 255 255"
-
-			"SubImage"
-			{
-				"ControlName"	"ImagePanel"
-				"fieldName"		"SubImage"
-				"xpos"			"5"
-				"ypos"			"3"
-				"zpos"			"1"
-				"wide"			"14"
-				"tall"			"14"
-				"visible"		"1"
-				"enabled"		"1"
-				"scaleImage"	"1"
-				"image"			"replay/thumbnails/motd"
-			}
 		}
 	}
 
@@ -1103,15 +979,16 @@
 	{
 		"ControlName"	"EditablePanel"
 		"fieldName"		"Notifications_Panel"
-		"xpos"			"c0"
-		"ypos"			"102"
+		"xpos"			"r240"
+		"ypos"			"60"
 		"zpos"			"1"
 		"wide"			"210"
 		"tall"			"80"
 		"visible"		"0"
 		"PaintBackgroundType"	"2"
-		"paintbackground"		"0"
-		"border"				"MainMenuHighlightBorder"
+		"paintbackground"		"1"
+		"border"				"NoBorder"
+		"bgcolor_override"		"DarkGrey"
 
 		"Notifications_CloseButton"
 		{
@@ -1144,7 +1021,7 @@
 			"depressedFgColor_override"	"72 255 255 255"
 
 			"image_drawcolor"			"235 226 202 255"
-			"image_armedcolor"			"72 255 255 255"
+			"image_armedcolor"			"255 0 0 255"
 
 			"SubImage"
 			{
@@ -1177,7 +1054,7 @@
 			"pinCorner"		"0"
 			"visible"		"1"
 			"enabled"		"1"
-			"fgcolor_override"	"46 43 42 255"
+			"fgcolor_override"	"TanLight"
 			"wrap"				"1"
 		}
 
@@ -1343,54 +1220,26 @@
 	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"VersionLabel"
-		"font"			"CerbeticaBold20"
-		"labelText"		"rayshud v2020.0415"
-		"xpos"			"112"
-		"ypos"			"35"
-		"wide"			"150"
-		"tall"			"20"
+		"font"			"HudFontSmall"
+		"labelText"		"v2020.0808"
+		"xpos"			"r135"
+		"ypos"			"r15"
+		"wide"			"130"
+		"tall"			"10"
 		"autoResize"	"0"
 		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
+		"textAlignment"	"east"
 		"fgcolor_override"	"TanLight"
 	}
 
-	"GeneralStoreButton"
-	{
-		"ControlName"	"CExImageButton"
-		"fieldname"		"GeneralStoreButton"
-		"xpos"			"90"
-		"ypos"			"70"
-		"zpos"			"11"
-		"wide"			"100"
-		"tall"			"16"
-		"visible"		"1"
-		"enabled"		"1"
-		"labeltext"		"#StoreTitle"
-		"command" 		"engine open_store"
-		"font"			"CerbeticaBold16"
-		"textAlignment"	"west"
-		"textinsetx"	"0"
-		"sound_depressed"	"UI/buttonclick.wav"
-		"sound_released"	"UI/buttonclickrelease.wav"
-
-		"border_default"	"NoBorder"
-		"border_armed"		"NoBorder"
-
-		"defaultFgColor_override" 	"TanLight"
-		"armedFgColor_override" 	"ColorCyan"
-
-		"defaultBgColor_override" 	"Transparent"
-		"armedBgColor_override" 	"25 25 25 148"
-	}
-
 	"CharacterSetupButton"
 	{
 		"ControlName"	"CExImageButton"
 		"fieldname"		"CharacterSetupButton"
 		"xpos"			"90"
-		"ypos"			"90"
+		"ypos"			"75"
 		"zpos"			"11"
 		"wide"			"50"
 		"tall"			"16"
@@ -1398,7 +1247,7 @@
 		"enabled"		"1"
 		"labeltext"		"#MMenu_CharacterSetup"
 		"command"		"engine open_charinfo"
-		"font"			"CerbeticaBold16"
+		"font"			"Cerbetica16"
 		"textAlignment"	"west"
 		"textinsetx"	"0"
 		"sound_depressed"	"UI/buttonclick.wav"
@@ -1414,21 +1263,20 @@
 		"armedBgColor_override" 	"25 25 25 148"
 	}
 
-	"Replay"
+	"GeneralStoreButton"
 	{
 		"ControlName"	"CExImageButton"
-		"fieldname"		"Replay"
+		"fieldname"		"GeneralStoreButton"
 		"xpos"			"90"
-		"ypos"			"110"
+		"ypos"			"95"
 		"zpos"			"11"
-		"wide"			"50"
+		"wide"			"100"
 		"tall"			"16"
 		"visible"		"1"
 		"enabled"		"1"
-		"AllCaps"		"1"
-		"labeltext"		"#MMenu_Replays"
-		"command"		"engine replay_reloadbrowser"
-		"font"			"CerbeticaBold16"
+		"labeltext"		"#StoreTitle"
+		"command" 		"engine open_store"
+		"font"			"Cerbetica16"
 		"textAlignment"	"west"
 		"textinsetx"	"0"
 		"sound_depressed"	"UI/buttonclick.wav"
@@ -1444,21 +1292,21 @@
 		"armedBgColor_override" 	"25 25 25 148"
 	}
 
-	"WorkshopSteamButton"
+	"SteamWorkshopButton"
 	{
 		"ControlName"	"CExImageButton"
-		"fieldname"		"WorkshopSteamButton"
+		"fieldname"		"SteamWorkshopButton"
 		"xpos"			"90"
-		"ypos"			"130"
+		"ypos"			"115"
 		"zpos"			"11"
 		"wide"			"70"
 		"tall"			"16"
 		"visible"		"1"
 		"enabled"		"1"
 		"AllCaps"		"1"
-		"labeltext"		"#MMenu_Tooltip_Workshop"
+		"labeltext"		"#MMenu_SteamWorkshop"
 		"command"		"engine OpenSteamWorkshopDialog"
-		"font"			"CerbeticaBold16"
+		"font"			"Cerbetica16"
 		"textAlignment"	"west"
 		"textinsetx"	"0"
 		"sound_depressed"	"UI/buttonclick.wav"
@@ -1479,7 +1327,7 @@
 		"ControlName"	"CExImageButton"
 		"fieldName"		"SettingButton"
 		"xpos"			"90"
-		"ypos"			"150"
+		"ypos"			"135"
 		"zpos"			"11"
 		"wide"			"50"
 		"tall"			"16"
@@ -1488,7 +1336,7 @@
 		"AllCaps"		"1"
 		"labeltext"		"#MMenu_Tooltip_Options"
 		"command"		"OpenOptionsDialog"
-		"font"			"CerbeticaBold16"
+		"font"			"Cerbetica16"
 		"textAlignment"	"west"
 		"textinsetx"	"0"
 		"sound_depressed"	"UI/buttonclick.wav"
@@ -1509,7 +1357,7 @@
 		"ControlName"	"CExImageButton"
 		"fieldName"		"AdvSettingsButton"
 		"xpos"			"90"
-		"ypos"			"170"
+		"ypos"			"155"
 		"zpos"			"11"
 		"wide"			"120"
 		"tall"			"16"
@@ -1518,7 +1366,7 @@
 		"AllCaps"		"1"
 		"labeltext"		"#MMenu_Tooltip_AdvOptions"
 		"command"		"OpenTF2Options"
-		"font"			"CerbeticaBold16"
+		"font"			"Cerbetica16"
 		"textAlignment"	"west"
 		"textinsetx"	"0"
 		"sound_depressed"	"UI/buttonclick.wav"
@@ -1538,8 +1386,8 @@
 	{
 		"ControlName"	"CExImageButton"
 		"fieldName"		"MinmodeToggle"
-		"xpos"			"91"
-		"ypos"			"190"
+		"xpos"			"90"
+		"ypos"			"175"
 		"zpos"			"11"
 		"wide"			"100"
 		"tall"			"16"
@@ -1548,7 +1396,7 @@
 		"AllCaps"		"1"
 		"labeltext"		"MINMODE TOGGLE"
 		"command"		"engine incrementvar cl_hud_minmode 0 1 1"
-		"font"			"CerbeticaBold16"
+		"font"			"Cerbetica16"
 		"textAlignment"	"west"
 		"textinsetx"	"0"
 		"sound_depressed"	"UI/buttonclick.wav"
@@ -1564,15 +1412,15 @@
 		"armedBgColor_override" 	"25 25 25 148"
 	}
 
-	"SteamWorkshopButton"
+	"AchievementsButton"
 	{
 		"ControlName"	"EditablePanel"
-		"fieldname"		"SteamWorkshopButton"
-		"xpos"			"165"
-		"ypos"			"62"
+		"fieldname"		"AchievementsButton"
+		"xpos"			"90"
+		"ypos"			"200"
 		"zpos"			"12"
-		"wide"			"0"
-		"tall"			"0"
+		"wide"			"20"
+		"tall"			"20"
 		"visible"		"1"
 
 		"SubButton"
@@ -1589,7 +1437,7 @@
 			"enabled"		"1"
 			"tabPosition"	"0"
 			"textinsetx"	"0"
-			"font"			"CustomIcons20"
+			"font"			"FontRegular20"
 			"use_proportional_insets" "1"
 			"textAlignment"	"center"
 			"dulltext"		"0"
@@ -1622,12 +1470,12 @@
 		}
 	}
 
-	"ReportBugButton"
+	"ConsoleButton"
 	{
 		"ControlName"	"EditablePanel"
-		"fieldname"		"ReportBugButton"
-		"xpos"			"90"
-		"ypos"			"220"
+		"fieldname"		"ConsoleButton"
+		"xpos"			"110"
+		"ypos"			"200"
 		"zpos"			"12"
 		"wide"			"20"
 		"tall"			"20"
@@ -1647,7 +1495,7 @@
 			"enabled"		"1"
 			"tabPosition"	"0"
 			"textinsetx"	"0"
-			"font"			"CustomIcons20"
+			"font"			"FontRegular20"
 			"use_proportional_insets" "1"
 			"textAlignment"	"center"
 			"dulltext"		"0"
@@ -1680,12 +1528,12 @@
 		}
 	}
 
-	"AchievementsButton"
+	"ReplayButton"
 	{
 		"ControlName"	"EditablePanel"
-		"fieldname"		"AchievementsButton"
-		"xpos"			"110"
-		"ypos"			"220"
+		"fieldname"		"ReplayButton"
+		"xpos"			"130"
+		"ypos"			"200"
 		"zpos"			"12"
 		"wide"			"20"
 		"tall"			"20"
@@ -1705,7 +1553,7 @@
 			"enabled"		"1"
 			"tabPosition"	"0"
 			"textinsetx"	"0"
-			"font"			"CustomIcons20"
+			"font"			"HudFontMediumSecondary"
 			"use_proportional_insets" "1"
 			"textAlignment"	"center"
 			"dulltext"		"0"
@@ -1738,12 +1586,12 @@
 		}
 	}
 
-	"ConsoleButton"
+	"ReportBugButton"
 	{
 		"ControlName"	"EditablePanel"
-		"fieldname"		"ConsoleButton"
-		"xpos"			"130"
-		"ypos"			"220"
+		"fieldname"		"ReportBugButton"
+		"xpos"			"150"
+		"ypos"			"200"
 		"zpos"			"12"
 		"wide"			"20"
 		"tall"			"20"
@@ -1763,7 +1611,7 @@
 			"enabled"		"1"
 			"tabPosition"	"0"
 			"textinsetx"	"0"
-			"font"			"CustomIcons20"
+			"font"			"FontRegular20"
 			"use_proportional_insets" "1"
 			"textAlignment"	"center"
 			"dulltext"		"0"
@@ -1796,12 +1644,12 @@
 		}
 	}
 
-	"ReportPlayerButton"
+	"CoachPlayersButton"
 	{
 		"ControlName"	"EditablePanel"
-		"fieldname"		"ReportPlayerButton"
-		"xpos"			"150"
-		"ypos"			"220"
+		"fieldname"		"CoachPlayersButton"
+		"xpos"			"170"
+		"ypos"			"200"
 		"zpos"			"12"
 		"wide"			"20"
 		"tall"			"20"
@@ -1821,7 +1669,65 @@
 			"enabled"		"1"
 			"tabPosition"	"0"
 			"textinsetx"	"0"
-			"font"			"CustomIcons20"
+			"font"			"HudFontMediumSecondary"
+			"use_proportional_insets" "1"
+			"textAlignment"	"center"
+			"dulltext"		"0"
+			"brighttext"	"0"
+			"default"		"1"
+
+			"sound_depressed"	"UI/buttonclick.wav"
+			"sound_released"	"UI/buttonclickrelease.wav"
+
+			"border_default"	""
+			"border_armed"		""
+			"paintbackground"	"0"
+
+			"image_drawcolor"	"235 226 202 255"
+			"image_armedcolor"	"72 255 255 255"
+
+			"SubImage"
+			{
+				"ControlName"	"ImagePanel"
+				"fieldName"		"SubImage"
+				"xpos"			"2"
+				"ypos"			"2"
+				"zpos"			"1"
+				"wide"			"15"
+				"tall"			"15"
+				"visible"		"1"
+				"enabled"		"1"
+				"scaleImage"	"1"
+			}
+		}
+	}
+
+	"RequestCoachButton"
+	{
+		"ControlName"	"EditablePanel"
+		"fieldname"		"RequestCoachButton"
+		"xpos"			"190"
+		"ypos"			"200"
+		"zpos"			"12"
+		"wide"			"20"
+		"tall"			"20"
+		"visible"		"1"
+
+		"SubButton"
+		{
+			"ControlName"	"CExImageButton"
+			"fieldName"		"SubButton"
+			"xpos"			"0"
+			"ypos"			"0"
+			"wide"			"20"
+			"tall"			"20"
+			"autoResize"	"0"
+			"pinCorner"		"3"
+			"visible"		"1"
+			"enabled"		"1"
+			"tabPosition"	"0"
+			"textinsetx"	"0"
+			"font"			"FontRegular20"
 			"use_proportional_insets" "1"
 			"textAlignment"	"center"
 			"dulltext"		"0"
@@ -1858,8 +1764,8 @@
 	{
 		"ControlName"	"EditablePanel"
 		"fieldname"		"CallVoteButton"
-		"xpos"			"170"
-		"ypos"			"220"
+		"xpos"			"210"
+		"ypos"			"200"
 		"zpos"			"12"
 		"wide"			"20"
 		"tall"			"20"
@@ -1879,7 +1785,7 @@
 			"enabled"		"1"
 			"tabPosition"	"0"
 			"textinsetx"	"0"
-			"font"			"CustomIcons20"
+			"font"			"FontRegular20"
 			"use_proportional_insets" "1"
 			"textAlignment"	"center"
 			"dulltext"		"0"
@@ -1916,8 +1822,8 @@
 	{
 		"ControlName"	"EditablePanel"
 		"fieldname"		"MutePlayersButton"
-		"xpos"			"190"
-		"ypos"			"220"
+		"xpos"			"230"
+		"ypos"			"200"
 		"zpos"			"12"
 		"wide"			"20"
 		"tall"			"20"
@@ -1937,7 +1843,7 @@
 			"enabled"		"1"
 			"tabPosition"	"0"
 			"textinsetx"	"0"
-			"font"			"CustomIcons20"
+			"font"			"FontRegular20"
 			"use_proportional_insets" "1"
 			"textAlignment"	"center"
 			"dulltext"		"0"
@@ -1970,12 +1876,12 @@
 		}
 	}
 
-	"RequestCoachButton"
+	"ReportPlayerButton"
 	{
 		"ControlName"	"EditablePanel"
-		"fieldname"		"RequestCoachButton"
-		"xpos"			"210"
-		"ypos"			"220"
+		"fieldname"		"ReportPlayerButton"
+		"xpos"			"250"
+		"ypos"			"200"
 		"zpos"			"12"
 		"wide"			"20"
 		"tall"			"20"
@@ -1995,7 +1901,7 @@
 			"enabled"		"1"
 			"tabPosition"	"0"
 			"textinsetx"	"0"
-			"font"			"CustomIcons20"
+			"font"			"FontRegular20"
 			"use_proportional_insets" "1"
 			"textAlignment"	"center"
 			"dulltext"		"0"
@@ -2028,6 +1934,36 @@
 		}
 	}
 
+	"BGPanel1"
+	{
+		"ControlName"	"EditablePanel"
+		"fieldName"		"BGPanel1"
+		"xpos"			"75"
+		"ypos"			"0"
+		"zpos"			"-1"
+		"wide"			"200"
+		"tall"			"f0"
+		"visible"		"1"
+		"enabled"		"1"
+		"bgcolor_override"		"25 25 25 255"
+		"PaintBackgroundType"	"2"
+	}
+
+	"BGPanel2"
+	{
+		"ControlName"	"EditablePanel"
+		"fieldName"		"BGPanel2"
+		"xpos"			"72"
+		"ypos"			"0"
+		"zpos"			"-2"
+		"wide"			"205"
+		"tall"			"f0"
+		"visible"		"1"
+		"enabled"		"1"
+		"bgcolor_override"		"ColorCyan"
+		"PaintBackgroundType"	"2"
+	}
+
 	"icon_generator"
 	{
 		"ControlName"	"CEmbeddedItemModelPanel"