Merge pull request #149 from raysfire/dev

v2020.0808

12 files changed, 718 insertions, 806 deletions

diff --git a/customizations/Backgrounds/background_upward.vtf b/customizations/Backgrounds/background_upward.vtf
deleted file mode 100644
index 6eae25d..0000000
--- a/customizations/Backgrounds/background_upward.vtf
+++ /dev/null
diff --git a/customizations/Backgrounds/background_upward_widescreen.vtf b/customizations/Backgrounds/background_upward_widescreen.vtf
deleted file mode 100644
index 6eae25d..0000000
--- a/customizations/Backgrounds/background_upward_widescreen.vtf
+++ /dev/null
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"
diff --git a/customizations/main_menu/mainmenuoverride.res b/customizations/main_menu/mainmenuoverride.res
index 692c2b7..d17f3c3 100644
--- a/customizations/main_menu/mainmenuoverride.res
+++ b/customizations/main_menu/mainmenuoverride.res
@@ -40,7 +40,7 @@
 				"tabPosition"	"0"
 				"textinsetx"	"25"
 				"use_proportional_insets" "1"
-				"font"			"CerbeticaBold16"
+				"font"			"Cerbetica16"
 				"textAlignment"	"west"
 				"dulltext"		"0"
 				"brighttext"	"0"
@@ -176,21 +176,6 @@
 		"scaleImage"	"1"
 	}
 
-	"MainMenuSideBG"
-	{
-		"ControlName"	"EditablePanel"
-		"fieldName"		"MainMenuSideBG"
-		"xpos"			"30"
-		"ypos"			"57"
-		"zpos"			"-55"
-		"wide"			"260"
-		"tall"			"370"
-		"visible"		"1"
-		"enabled"		"1"
-		"bgcolor_override"		"25 25 25 148"
-		"PaintBackgroundType"	"2"
-	}
-
 	"HudName"
 	{
 		"ControlName"	"CExImageButton"
@@ -206,7 +191,7 @@
 		"enabled"		"1"
 		"tabPosition"	"0"
 		"labelText"		"rayshud"
-		"font"			"Cerbetica20"
+		"font"			"HudFontMediumSecondary"
 		"textAlignment"	"west"
 		"textinsetx"	"0"
 		"use_proportional_insets" "1"
@@ -269,12 +254,6 @@
 		"scaleImage"	"1"
 	}
 
-	"DashboardDimmer"
-	{
-		"wide"			"0"
-		"tall"			"0"
-	}
-
 	"RankModelPanel"
 	{
 		"ControlName"	"CPvPRankPanel"
@@ -371,7 +350,7 @@
 		"ypos"			"205"
 		"zpos"			"0"
 		"wide"			"170"
-		"tall"			"100"
+		"tall"			"50"
 		"visible"		"1"
 		"proportionaltoparent"	"1"
 		"mouseinputenabled"	"0"
@@ -397,7 +376,7 @@
 		"textinsety"	"10"
 
 		"font"				"HudFontSmallestBold"
-		"fgcolor_override"	"235 226 202 255"
+		"fgcolor_override"	"TanLight"
 		"labelText"			"#TF_MM_NoGC_Rank"
 		"textAlignment"		"north-west"
 		"use_proportional_insets"	"1"
@@ -414,7 +393,7 @@
 		"tall"			"30"
 		"visible"		"1"
 		"enabled"		"1"
-		"image"			"replay\thumbnails\raysfox"
+		"image"			"replay\thumbnails\nogc"
 		"scaleImage"	"1"
 		"proportionaltoparent" "1"
 	}
@@ -445,7 +424,7 @@
 		"tall"					"50"
 		"visible"				"0"
 		"PaintBackgroundType"	"2"
-		"border"				"CyanBorder"
+		"border"				"CyanBorderThick"
 
 		"TipSubLabel"
 		{
@@ -471,11 +450,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"
@@ -495,29 +474,15 @@
 		"fieldName"			"Notifications_ShowButtonPanel"
 		"xpos"				"295"
 		"ypos"				"62"
-		"zpos"				"1"
+		"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"
 		{
@@ -525,114 +490,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"
 		}
 	}
 
@@ -658,8 +578,8 @@
 		"xpos"			"r28"
 		"ypos"			"90"
 		"zpos"			"1"
-		"wide"			"30"
-		"tall"			"24"
+		"wide"			"20"
+		"tall"			"20"
 		"autoResize"	"0"
 		"pinCorner"		"3"
 		"visible"		"1"
@@ -672,49 +592,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"
-			}
 		}
 	}
 
@@ -724,9 +622,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"
@@ -739,49 +637,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"
-			}
 		}
 	}
 
@@ -902,7 +778,7 @@
 		{
 			"ControlName"	"CExLabel"
 			"fieldName"		"MOTD_TitleLabel"
-			"font"			"FontRegular14"
+			"font"			"HudFontSmall"
 			"labelText"		"%motdtitle%"
 			"textAlignment"	"west"
 			"xpos"			"10"
@@ -921,7 +797,7 @@
 		{
 			"ControlName"	"CExLabel"
 			"fieldName"		"MOTD_Label"
-			"font"			"FontRegular12"
+			"font"			"HudFontSmallest"
 			"labelText"		"%motddate%"
 			"textAlignment"	"north-west"
 			"xpos"			"10"
@@ -1005,7 +881,7 @@
 				{
 					"ControlName"	"CExLabel"
 					"fieldName"		"MOTD_TextLabel"
-					"font"			"FontRegular12"
+					"font"			"HudFontSmallest"
 					"labelText"		"%motdtext%"
 					"textAlignment"	"north-west"
 					"xpos"			"0"
@@ -1072,7 +948,7 @@
 			"enabled"		"1"
 			"tabPosition"	"0"
 			"labelText"		""
-			"font"			"FontRegular12"
+			"font"			"HudFontSmallest"
 			"textAlignment"	"center"
 			"dulltext"		"0"
 			"brighttext"	"0"
@@ -1117,7 +993,7 @@
 			"enabled"		"1"
 			"tabPosition"	"0"
 			"labelText"		""
-			"font"			"FontRegular12"
+			"font"			"HudFontSmallest"
 			"textAlignment"	"center"
 			"dulltext"		"0"
 			"brighttext"	"0"
@@ -1322,20 +1198,20 @@
 			"ypos"			"0"
 			"zpos"			"500"
 			"wide"			"242"
-			"tall"			"180"
+			"tall"			"150"
 			"visible"		"1"
 			"proportionaltoparent"	"1"
 
-			"columns_count"	"3"
+			"columns_count"	"2"
 			"inset_x"		"10"
 			"inset_y"		"5"
 			"row_gap"		"5"
-			"column_gap"	"20"
+			"column_gap"	"5"
 			"restrict_width"	"0"
 
 			"friendpanel_kv"
 			{
-				"wide"			"60"
+				"wide"			"110"
 				"tall"			"20"
 			}
 
@@ -1393,11 +1269,11 @@
 	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"VersionLabel"
-		"font"			"Cerbetica14"
-		"labelText"		"v2020.0415"
-		"xpos"			"r85"
+		"font"			"HudFontSmall"
+		"labelText"		"v2020.0808"
+		"xpos"			"r135"
 		"ypos"			"r15"
-		"wide"			"80"
+		"wide"			"130"
 		"tall"			"10"
 		"autoResize"	"0"
 		"pinCorner"		"0"
@@ -1420,7 +1296,7 @@
 		"enabled"		"1"
 		"labeltext"		"#MMenu_CharacterSetup"
 		"command"		"engine open_charinfo"
-		"font"			"Cerbetica16"
+		"font"			"HudFontSmallishBold"
 		"textAlignment"	"west"
 		"textinsetx"	"25"
 		"sound_depressed"	"UI/buttonclick.wav"
@@ -1449,7 +1325,7 @@
 		"enabled"		"1"
 		"labeltext"		"#StoreTitle"
 		"command" 		"engine open_store"
-		"font"			"Cerbetica16"
+		"font"			"HudFontSmallishBold"
 		"textAlignment"	"west"
 		"textinsetx"	"25"
 		"sound_depressed"	"UI/buttonclick.wav"
@@ -1465,10 +1341,10 @@
 		"armedBgColor_override" 	"25 25 25 148"
 	}
 
-	"Replay"
+	"SteamWorkshopButton"
 	{
 		"ControlName"	"CExImageButton"
-		"fieldname"		"Replay"
+		"fieldname"		"SteamWorkshopButton"
 		"xpos"			"30"
 		"ypos"			"122"
 		"zpos"			"11"
@@ -1477,9 +1353,9 @@
 		"visible"		"1"
 		"enabled"		"1"
 		"AllCaps"		"1"
-		"labeltext"		"#MMenu_Replays"
-		"command" 		"engine replay_reloadbrowser"
-		"font"			"Cerbetica16"
+		"labeltext"		"#MMenu_SteamWorkshop"
+		"command"		"engine OpenSteamWorkshopDialog"
+		"font"			"HudFontSmallishBold"
 		"textAlignment"	"west"
 		"textinsetx"	"25"
 		"sound_depressed"	"UI/buttonclick.wav"
@@ -1509,7 +1385,7 @@
 		"AllCaps"		"1"
 		"labeltext"		"#MMenu_Tooltip_Options"
 		"command"		"OpenOptionsDialog"
-		"font"			"Cerbetica16"
+		"font"			"HudFontSmallishBold"
 		"textAlignment"	"west"
 		"textinsetx"	"25"
 		"sound_depressed"	"UI/buttonclick.wav"
@@ -1539,7 +1415,7 @@
 		"AllCaps"		"1"
 		"labeltext"		"#MMenu_Tooltip_AdvOptions"
 		"command"		"OpenTF2Options"
-		"font"			"Cerbetica16"
+		"font"			"HudFontSmallishBold"
 		"textAlignment"	"west"
 		"textinsetx"	"25"
 		"sound_depressed"	"UI/buttonclick.wav"
@@ -1569,7 +1445,7 @@
 		"AllCaps"		"1"
 		"labeltext"		"MINMODE TOGGLE"
 		"command"		"engine incrementvar cl_hud_minmode 0 1 1"
-		"font"			"Cerbetica16"
+		"font"			"HudFontSmallishBold"
 		"textAlignment"	"west"
 		"textinsetx"	"25"
 		"sound_depressed"	"UI/buttonclick.wav"
@@ -1585,11 +1461,11 @@
 		"armedBgColor_override" 	"25 25 25 148"
 	}
 
-	"SteamWorkshopButton"
+	"AchievementsButton"
 	{
 		"ControlName"	"EditablePanel"
-		"fieldname"		"SteamWorkshopButton"
-		"xpos"			"105"
+		"fieldname"		"AchievementsButton"
+		"xpos"			"104"
 		"ypos"			"62"
 		"zpos"			"12"
 		"wide"			"20"
@@ -1610,7 +1486,7 @@
 			"enabled"		"1"
 			"tabPosition"	"0"
 			"textinsetx"	"0"
-			"font"			"CustomIcons20"
+			"font"			"HudFontMediumSecondary"
 			"use_proportional_insets" "1"
 			"textAlignment"	"center"
 			"dulltext"		"0"
@@ -1643,10 +1519,10 @@
 		}
 	}
 
-	"ReportBugButton"
+	"ConsoleButton"
 	{
 		"ControlName"	"EditablePanel"
-		"fieldname"		"ReportBugButton"
+		"fieldname"		"ConsoleButton"
 		"xpos"			"124"
 		"ypos"			"62"
 		"zpos"			"12"
@@ -1668,7 +1544,7 @@
 			"enabled"		"1"
 			"tabPosition"	"0"
 			"textinsetx"	"0"
-			"font"			"CustomIcons20"
+			"font"			"HudFontMediumSecondary"
 			"use_proportional_insets" "1"
 			"textAlignment"	"center"
 			"dulltext"		"0"
@@ -1701,10 +1577,10 @@
 		}
 	}
 
-	"AchievementsButton"
+	"ReplayButton"
 	{
 		"ControlName"	"EditablePanel"
-		"fieldname"		"AchievementsButton"
+		"fieldname"		"ReplayButton"
 		"xpos"			"144"
 		"ypos"			"62"
 		"zpos"			"12"
@@ -1726,7 +1602,7 @@
 			"enabled"		"1"
 			"tabPosition"	"0"
 			"textinsetx"	"0"
-			"font"			"CustomIcons20"
+			"font"			"HudFontMediumSecondary"
 			"use_proportional_insets" "1"
 			"textAlignment"	"center"
 			"dulltext"		"0"
@@ -1759,10 +1635,10 @@
 		}
 	}
 
-	"ConsoleButton"
+	"ReportBugButton"
 	{
 		"ControlName"	"EditablePanel"
-		"fieldname"		"ConsoleButton"
+		"fieldname"		"ReportBugButton"
 		"xpos"			"164"
 		"ypos"			"62"
 		"zpos"			"12"
@@ -1784,7 +1660,7 @@
 			"enabled"		"1"
 			"tabPosition"	"0"
 			"textinsetx"	"0"
-			"font"			"CustomIcons20"
+			"font"			"HudFontMediumSecondary"
 			"use_proportional_insets" "1"
 			"textAlignment"	"center"
 			"dulltext"		"0"
@@ -1817,10 +1693,10 @@
 		}
 	}
 
-	"ReportPlayerButton"
+	"CoachPlayersButton"
 	{
 		"ControlName"	"EditablePanel"
-		"fieldname"		"ReportPlayerButton"
+		"fieldname"		"CoachPlayersButton"
 		"xpos"			"184"
 		"ypos"			"62"
 		"zpos"			"12"
@@ -1842,7 +1718,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"			"204"
+		"ypos"			"62"
+		"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"			"HudFontMediumSecondary"
 			"use_proportional_insets" "1"
 			"textAlignment"	"center"
 			"dulltext"		"0"
@@ -1879,7 +1813,7 @@
 	{
 		"ControlName"	"EditablePanel"
 		"fieldname"		"CallVoteButton"
-		"xpos"			"204"
+		"xpos"			"224"
 		"ypos"			"62"
 		"zpos"			"12"
 		"wide"			"20"
@@ -1900,7 +1834,7 @@
 			"enabled"		"1"
 			"tabPosition"	"0"
 			"textinsetx"	"0"
-			"font"			"CustomIcons20"
+			"font"			"HudFontMediumSecondary"
 			"use_proportional_insets" "1"
 			"textAlignment"	"center"
 			"dulltext"		"0"
@@ -1937,7 +1871,7 @@
 	{
 		"ControlName"	"EditablePanel"
 		"fieldname"		"MutePlayersButton"
-		"xpos"			"224"
+		"xpos"			"244"
 		"ypos"			"62"
 		"zpos"			"12"
 		"wide"			"20"
@@ -1958,7 +1892,7 @@
 			"enabled"		"1"
 			"tabPosition"	"0"
 			"textinsetx"	"0"
-			"font"			"CustomIcons20"
+			"font"			"HudFontMediumSecondary"
 			"use_proportional_insets" "1"
 			"textAlignment"	"center"
 			"dulltext"		"0"
@@ -1991,11 +1925,11 @@
 		}
 	}
 
-	"RequestCoachButton"
+	"ReportPlayerButton"
 	{
 		"ControlName"	"EditablePanel"
-		"fieldname"		"RequestCoachButton"
-		"xpos"			"244"
+		"fieldname"		"ReportPlayerButton"
+		"xpos"			"264"
 		"ypos"			"62"
 		"zpos"			"12"
 		"wide"			"20"
@@ -2016,7 +1950,7 @@
 			"enabled"		"1"
 			"tabPosition"	"0"
 			"textinsetx"	"0"
-			"font"			"CustomIcons20"
+			"font"			"HudFontMediumSecondary"
 			"use_proportional_insets" "1"
 			"textAlignment"	"center"
 			"dulltext"		"0"
@@ -2049,6 +1983,21 @@
 		}
 	}
 
+	"BGPanel1"
+	{
+		"ControlName"	"EditablePanel"
+		"fieldName"		"BGPanel1"
+		"xpos"			"30"
+		"ypos"			"57"
+		"zpos"			"-55"
+		"wide"			"260"
+		"tall"			"370"
+		"visible"		"1"
+		"enabled"		"1"
+		"bgcolor_override"		"25 25 25 168"
+		"PaintBackgroundType"	"2"
+	}
+
 	"icon_generator"
 	{
 		"ControlName"	"CEmbeddedItemModelPanel"
diff --git a/customizations/player_health/hudplayerhealth-broesel.res b/customizations/player_health/hudplayerhealth-broesel.res
index ec1ed8c..6351d22 100644
--- a/customizations/player_health/hudplayerhealth-broesel.res
+++ b/customizations/player_health/hudplayerhealth-broesel.res
@@ -100,14 +100,14 @@
 	{
 		"xpos"			"-18"
 		"ypos"			"12"
-		"font"			"CerbeticaBold24"
-		"font_minmode"	"CerbeticaBold24"
+		"font"			"Cerbetica24"
+		"font_minmode"	"Cerbetica24"
 	}
 
 	"PlayerStatusHealthValueShadow"
 	{
-		"font"			"CerbeticaBold24"
-		"font_minmode"	"CerbeticaBold24"
+		"font"			"Cerbetica24"
+		"font_minmode"	"Cerbetica24"
 	}
 
 	"PlayerStatusAnchor"
@@ -291,6 +291,12 @@
 		"tall"			"32"
 	}
 
+	"PlayerStatusHookBleedImage"
+	{
+		"wide"			"32"
+		"tall"			"32"
+	}
+
 	"PlayerStatusSlowed"
 	{
 		"wide"			"32"
diff --git a/customizations/player_health/hudplayerhealth-cross.res b/customizations/player_health/hudplayerhealth-cross.res
index 3dfb351..2febbec 100644
--- a/customizations/player_health/hudplayerhealth-cross.res
+++ b/customizations/player_health/hudplayerhealth-cross.res
@@ -353,4 +353,12 @@
 		"wide_minmode"	"24"
 		"tall_minmode"	"24"
 	}
+
+	"PlayerStatusHookBleedImage"
+	{
+		"wide"			"32"
+		"tall"			"32"
+		"wide_minmode"	"24"
+		"tall_minmode"	"24"
+	}
 }
\ No newline at end of file
diff --git a/customizations/player_health/hudplayerhealth.res b/customizations/player_health/hudplayerhealth.res
index 8d24e6b..b514365 100644
--- a/customizations/player_health/hudplayerhealth.res
+++ b/customizations/player_health/hudplayerhealth.res
@@ -77,8 +77,8 @@
 		"enabled"		"1"
 		"labelText"		"%Health%"
 		"textAlignment"	"center"
-		"font"			"CerbeticaBold56"
-		"font_minmode"	"CerbeticaBold32"
+		"font"			"Cerbetica56"
+		"font_minmode"	"Cerbetica32"
 		"fgcolor"		"Health Normal"
 	}
 
@@ -95,8 +95,8 @@
 		"enabled"		"1"
 		"labelText"		"%Health%"
 		"textAlignment"	"center"
-		"font"			"CerbeticaBold56"
-		"font_minmode"	"CerbeticaBold32"
+		"font"			"Cerbetica56"
+		"font_minmode"	"Cerbetica32"
 		"fgcolor"		"0 0 0 200"
 
 		"pin_to_sibling"		"PlayerStatusHealthValue"
@@ -118,8 +118,10 @@
 	{
 		"ControlName"	"EditablePanel"
 		"fieldName"		"PlayerStatusAnchor"
-		"xpos"			"0"
-		"ypos"			"10"
+		"xpos"			"10"
+		"ypos"			"5"
+		"xpos_minmode"	"5"
+		"ypos_minmode"	"15"
 		"wide"			"23"
 		"tall"			"23"
 		"visible"		"1"
@@ -441,6 +443,7 @@
 		"visible"		"1"
 		"enabled"		"1"
 		"scaleImage"	"1"
+		"image"			""
 		"fgcolor"		"117 107 94 255"
 		"pin_to_sibling"		"PlayerStatusAnchor"
 		"pin_corner_to_sibling"	"1"
@@ -693,4 +696,23 @@
 		"pin_corner_to_sibling"	"1"
 		"pin_to_sibling_corner"	"1"
 	}
+
+	"PlayerStatusHookBleedImage"
+	{
+		"ControlName"	"ImagePanel"
+		"fieldName"		"PlayerStatusHookBleedImage"
+		"xpos"			"0"
+		"ypos"			"0"
+		"zpos"			"8"
+		"wide"			"23"
+		"tall"			"23"
+		"visible"		"1"
+		"enabled"		"1"
+		"scaleImage"	"1"
+		"image"			"../vgui/bleed_drop_grapple"
+		"fgcolor"		"117 107 94 255"
+		"pin_to_sibling"		"PlayerStatusAnchor"
+		"pin_corner_to_sibling"	"1"
+		"pin_to_sibling_corner"	"1"
+	}
 }
\ No newline at end of file
diff --git a/customizations/scoreboards/scoreboard.res b/customizations/scoreboards/scoreboard.res
index 9ec0e5f..6e764f4 100644
--- a/customizations/scoreboards/scoreboard.res
+++ b/customizations/scoreboards/scoreboard.res
@@ -126,7 +126,7 @@
 		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
-		"fillcolor"		"0 0 0 100"
+		"fillcolor"		"TransparentBlack"
 
 		if_mvm
 		{
@@ -195,7 +195,7 @@
 	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"BlueTeamName"
-		"font"			"Cerbetica32"
+		"font"			"HudFontMediumBig"
 		"labelText"		"%blueteamname%"
 		"textAlignment"	"west"
 		"xpos"			"c-265"
@@ -216,7 +216,7 @@
 	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"BlueTeamScore"
-		"font"			"CerbeticaBold32"
+		"font"			"Cerbetica32"
 		"labelText"		"%blueteamscore%"
 		"textAlignment"	"east"
 		"xpos"			"c-106"
@@ -238,7 +238,7 @@
 	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"BlueTeamScoreDropshadow"
-		"font"			"CerbeticaBold32"
+		"font"			"Cerbetica32"
 		"fgcolor"		"0 0 0 200"
 		"labelText"		"%blueteamscore%"
 		"textAlignment"	"east"
@@ -261,7 +261,7 @@
 	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"BlueTeamPlayerCount"
-		"font"			"Cerbetica14"
+		"font"			"HudFontSmall"
 		"labelText"		"%blueteamplayercount%"
 		"textAlignment"	"west"
 		"xpos"			"c-270"
@@ -282,7 +282,7 @@
 	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"RedTeamName"
-		"font"			"Cerbetica32"
+		"font"			"HudFontMediumBig"
 		"labelText"		"%redteamname%"
 		"textAlignment"	"east"
 		"xpos"			"c45"
@@ -303,7 +303,7 @@
 	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"RedTeamScore"
-		"font"			"CerbeticaBold32"
+		"font"			"Cerbetica32"
 		"labelText"		"%redteamscore%"
 		"textAlignment"	"west"
 		"xpos"			"c6"
@@ -326,7 +326,7 @@
 	{
 		"ControlName"		"CExLabel"
 		"fieldName"			"RedTeamScoreDropshadow"
-		"font"				"CerbeticaBold32"
+		"font"				"Cerbetica32"
 		"fgcolor"			"0 0 0 200"
 		"labelText"			"%redteamscore%"
 		"textAlignment"		"west"
@@ -350,7 +350,7 @@
 	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"RedTeamPlayerCount"
-		"font"			"Cerbetica14"
+		"font"			"HudFontSmall"
 		"labelText"		"%redteamplayercount%"
 		"textAlignment"	"east"
 		"xpos"			"c170"
@@ -372,11 +372,11 @@
 	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"ServerLabel"
-		"font"			"Cerbetica14"
+		"font"			"HudFontSmall"
 		"labelText"		"%server%"
 		"textAlignment"	"west"
-		"xpos"			"-34"
-		"ypos"			"14"
+		"xpos"			"5"
+		"ypos"			"20"
 		"zpos"			"999"
 		"wide"			"600"
 		"tall"			"20"
@@ -389,11 +389,11 @@
 	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"ServerTimeValue"
-		"font"			"Cerbetica20"
+		"font"			"HudFontMediumSecondary"
 		"labelText"		"%servertime%"
 		"textAlignment"	"west"
-		"xpos"			"2"
-		"ypos"			"2"
+		"xpos"			"5"
+		"ypos"			"5"
 		"zpos"			"999"
 		"wide"			"600"
 		"tall"			"20"
@@ -477,7 +477,7 @@
 	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"Spectators"
-		"font"			"Cerbetica11"
+		"font"			"HudFontSmallest"
 		"labelText"		"%spectators%"
 		"textAlignment"	"west"
 		"xpos"			"c-266"
@@ -495,12 +495,12 @@
 	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"SpectatorsInQueue"
-		"font"			"Cerbetica11"
+		"font"			"HudFontSmallest"
 		"labelText"		"%waitingtoplay%"
 		"textAlignment"	"west"
-		"xpos"			"2"
-		"ypos"			"42"
-		"zpos"			"4"
+		"xpos"			"5"
+		"ypos"			"50"
+		"zpos"			"999"
 		"wide"			"600"
 		"tall"			"20"
 		"autoResize"	"0"
@@ -577,11 +577,11 @@
 	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"mapname"
-		"font"			"Cerbetica14"
+		"font"			"HudFontSmall"
 		"labelText"		"%mapname%"
 		"textAlignment"	"west"
-		"xpos"			"3"
-		"ypos"			"25"
+		"xpos"			"5"
+		"ypos"			"35"
 		"zpos"			"3"
 		"wide"			"480"
 		"tall"			"20"
@@ -617,7 +617,7 @@
 	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"PlayerScoreLabel"
-		"font"			"Cerbetica20"
+		"font"			"HudFontMediumSecondary"
 		"labelText"		"%playerscore%"
 		"textAlignment"	"center"
 		"xpos"			"c-368"
@@ -870,7 +870,7 @@
 		{
 			"ControlName"	"CExLabel"
 			"fieldName"		"KillsLabel"
-			"font"			"Cerbetica48"
+			"font"			"HudFontGiantBold"
 			"labelText"		":"
 			"textAlignment"	"center"
 			"xpos"			"0"
@@ -887,7 +887,7 @@
 		{
 			"ControlName"	"CExLabel"
 			"fieldName"		"Kills"
-			"font"			"Cerbetica48"
+			"font"			"HudFontGiantBold"
 			"labelText"		"%kills%"
 			"textAlignment"	"east"
 			"xpos"			"9999"
@@ -904,7 +904,7 @@
 		{
 			"ControlName"	"CExLabel"
 			"fieldName"		"Kills2"
-			"font"			"Cerbetica48"
+			"font"			"HudFontGiantBold"
 			"labelText"		"%kills%"
 			"textAlignment"	"east"
 			"xpos"			"188"
@@ -923,7 +923,7 @@
 		{
 			"ControlName"	"CExLabel"
 			"fieldName"		"DeathsLabel"
-			"font"			"Cerbetica24"
+			"font"			"HudFontMedium"
 			"labelText"		"#TF_ScoreBoard_DeathsLabel"
 			"textAlignment"	"east"
 			"xpos"			"9999"
@@ -940,7 +940,7 @@
 		{
 			"ControlName"	"CExLabel"
 			"fieldName"		"Deaths"
-			"font"			"Cerbetica48"
+			"font"			"HudFontGiantBold"
 			"labelText"		"%deaths%"
 			"textAlignment"	"west"
 			"xpos"			"9999"
@@ -957,7 +957,7 @@
 		{
 			"ControlName"	"CExLabel"
 			"fieldName"		"Deaths2"
-			"font"			"Cerbetica48"
+			"font"			"HudFontGiantBold"
 			"labelText"		"%deaths%"
 			"textAlignment"	"west"
 			"xpos"			"282"
@@ -975,7 +975,7 @@
 		{
 			"ControlName"	"CExLabel"
 			"fieldName"		"gametype"
-			"font"			"Cerbetica12"
+			"font"			"HudFontSmallest"
 			"labelText"		"%gametype%"
 			"textAlignment"	"center"
 			"xpos"			"28"
@@ -993,7 +993,7 @@
 		{
 			"ControlName"	"CExLabel"
 			"fieldName"		"AssistsLabel"
-			"font"			"Cerbetica14"
+			"font"			"HudFontSmall"
 			"labelText"		"#TF_ScoreBoard_AssistsLabel"
 			"textAlignment"	"west"
 			"xpos"			"4"
@@ -1010,7 +1010,7 @@
 		{
 			"ControlName"	"CExLabel"
 			"fieldName"		"Assists"
-			"font"			"Cerbetica14"
+			"font"			"HudFontSmall"
 			"labelText"		"%assists%"
 			"textAlignment"	"west"
 			"xpos"			"9999"
@@ -1027,7 +1027,7 @@
 		{
 			"ControlName"	"CExLabel"
 			"fieldName"		"Assists2"
-			"font"			"Cerbetica14"
+			"font"			"HudFontSmall"
 			"labelText"		"%assists%"
 			"textAlignment"	"west"
 			"xpos"			"70"
@@ -1046,7 +1046,7 @@
 		{
 			"ControlName"	"CExLabel"
 			"fieldName"		"DestructionLabel"
-			"font"			"Cerbetica14"
+			"font"			"HudFontSmall"
 			"labelText"		"#TF_ScoreBoard_DestructionLabel"
 			"textAlignment"	"west"
 			"xpos"			"4"
@@ -1063,7 +1063,7 @@
 		{
 			"ControlName"	"CExLabel"
 			"fieldName"		"Destruction"
-			"font"			"Cerbetica14"
+			"font"			"HudFontSmall"
 			"labelText"		"%destruction%"
 			"textAlignment"	"west"
 			"xpos"			"9999"
@@ -1080,7 +1080,7 @@
 		{
 			"ControlName"	"CExLabel"
 			"fieldName"		"Destruction2"
-			"font"			"Cerbetica14"
+			"font"			"HudFontSmall"
 			"labelText"		"%destruction%"
 			"textAlignment"	"west"
 			"xpos"			"70"
@@ -1099,7 +1099,7 @@
 		{
 			"ControlName"	"CExLabel"
 			"fieldName"		"RevengeLabel"
-			"font"			"Cerbetica14"
+			"font"			"HudFontSmall"
 			"labelText"		"#TF_ScoreBoard_RevengeLabel"
 			"textAlignment"	"west"
 			"xpos"			"102"
@@ -1117,7 +1117,7 @@
 		{
 			"ControlName"	"CExLabel"
 			"fieldName"		"CapturesLabel"
-			"font"			"Cerbetica14"
+			"font"			"HudFontSmall"
 			"labelText"		"#TF_ScoreBoard_CapturesLabel"
 			"textAlignment"	"west"
 			"xpos"			"4"
@@ -1134,7 +1134,7 @@
 		{
 			"ControlName"	"CExLabel"
 			"fieldName"		"Captures"
-			"font"			"Cerbetica14"
+			"font"			"HudFontSmall"
 			"labelText"		"%captures%"
 			"textAlignment"	"west"
 			"xpos"			"9999"
@@ -1151,7 +1151,7 @@
 		{
 			"ControlName"	"CExLabel"
 			"fieldName"		"Captures2"
-			"font"			"Cerbetica14"
+			"font"			"HudFontSmall"
 			"labelText"		"%captures%"
 			"textAlignment"	"west"
 			"xpos"			"70"
@@ -1170,7 +1170,7 @@
 		{
 			"ControlName"	"CExLabel"
 			"fieldName"		"DefensesLabel"
-			"font"			"Cerbetica14"
+			"font"			"HudFontSmall"
 			"labelText"		"#TF_ScoreBoard_DefensesLabel"
 			"textAlignment"	"west"
 			"xpos"			"4"
@@ -1187,7 +1187,7 @@
 		{
 			"ControlName"	"CExLabel"
 			"fieldName"		"Defenses"
-			"font"			"Cerbetica14"
+			"font"			"HudFontSmall"
 			"labelText"		"%defenses%"
 			"textAlignment"	"west"
 			"xpos"			"9999"
@@ -1204,7 +1204,7 @@
 		{
 			"ControlName"	"CExLabel"
 			"fieldName"		"Defenses2"
-			"font"			"Cerbetica14"
+			"font"			"HudFontSmall"
 			"labelText"		"%defenses%"
 			"textAlignment"	"west"
 			"xpos"			"70"
@@ -1222,7 +1222,7 @@
 		{
 			"ControlName"	"CExLabel"
 			"fieldName"		"DominationLabel"
-			"font"			"Cerbetica14"
+			"font"			"HudFontSmall"
 			"labelText"		"#TF_ScoreBoard_DominationLabel"
 			"textAlignment"	"west"
 			"xpos"			"102"
@@ -1239,7 +1239,7 @@
 		{
 			"ControlName"	"CExLabel"
 			"fieldName"		"Domination"
-			"font"			"Cerbetica14"
+			"font"			"HudFontSmall"
 			"labelText"		"%dominations%"
 			"textAlignment"	"west"
 			"xpos"			"100"
@@ -1256,7 +1256,7 @@
 		{
 			"ControlName"	"CExLabel"
 			"fieldName"		"Domination2"
-			"font"			"Cerbetica14"
+			"font"			"HudFontSmall"
 			"labelText"		"%dominations%"
 			"textAlignment"	"west"
 			"xpos"			"168"
@@ -1274,7 +1274,7 @@
 		{
 			"ControlName"	"CExLabel"
 			"fieldName"		"Revenge"
-			"font"			"Cerbetica14"
+			"font"			"HudFontSmall"
 			"labelText"		"%Revenge%"
 			"textAlignment"	"west"
 			"xpos"			"9999"
@@ -1291,7 +1291,7 @@
 		{
 			"ControlName"	"CExLabel"
 			"fieldName"		"Revenge2"
-			"font"			"Cerbetica14"
+			"font"			"HudFontSmall"
 			"labelText"		"%Revenge%"
 			"textAlignment"	"west"
 			"xpos"			"168"
@@ -1309,7 +1309,7 @@
 		{
 			"ControlName"	"CExLabel"
 			"fieldName"		"HealingLabel"
-			"font"			"Cerbetica14"
+			"font"			"HudFontSmall"
 			"labelText"		"#TF_ScoreBoard_HealingLabel"
 			"textAlignment"	"west"
 			"xpos"			"102"
@@ -1326,7 +1326,7 @@
 		{
 			"ControlName"	"CExLabel"
 			"fieldName"		"Healing"
-			"font"			"Cerbetica14"
+			"font"			"HudFontSmall"
 			"labelText"		"%healing%"
 			"textAlignment"	"west"
 			"xpos"			"9999"
@@ -1343,7 +1343,7 @@
 		{
 			"ControlName"	"CExLabel"
 			"fieldName"		"Healing2"
-			"font"			"Cerbetica14"
+			"font"			"HudFontSmall"
 			"labelText"		"%healing%"
 			"textAlignment"	"west"
 			"xpos"			"168"
@@ -1361,7 +1361,7 @@
 		{
 			"ControlName"	"CExLabel"
 			"fieldName"		"InvulnLabel"
-			"font"			"Cerbetica14"
+			"font"			"HudFontSmall"
 			"labelText"		"#TF_ScoreBoard_InvulnLabel"
 			"textAlignment"	"west"
 			"xpos"			"102"
@@ -1378,7 +1378,7 @@
 		{
 			"ControlName"	"CExLabel"
 			"fieldName"		"Invuln"
-			"font"			"Cerbetica14"
+			"font"			"HudFontSmall"
 			"labelText"		"%invulns%"
 			"textAlignment"	"west"
 			"xpos"			"9999"
@@ -1395,7 +1395,7 @@
 		{
 			"ControlName"	"CExLabel"
 			"fieldName"		"Invuln2"
-			"font"			"Cerbetica14"
+			"font"			"HudFontSmall"
 			"labelText"		"%invulns%"
 			"textAlignment"	"west"
 			"xpos"			"168"
@@ -1413,7 +1413,7 @@
 		{
 			"ControlName"	"CExLabel"
 			"fieldName"		"TeleportsLabel"
-			"font"			"Cerbetica14"
+			"font"			"HudFontSmall"
 			"labelText"		"#TF_ScoreBoard_TeleportsLabel"
 			"textAlignment"	"west"
 			"xpos"			"342"
@@ -1430,7 +1430,7 @@
 		{
 			"ControlName"	"CExLabel"
 			"fieldName"		"Teleports"
-			"font"			"Cerbetica14"
+			"font"			"HudFontSmall"
 			"labelText"		"%teleports%"
 			"textAlignment"	"west"
 			"xpos"			"100"
@@ -1447,7 +1447,7 @@
 		{
 			"ControlName"	"CExLabel"
 			"fieldName"		"Teleports2"
-			"font"			"Cerbetica14"
+			"font"			"HudFontSmall"
 			"labelText"		"%teleports%"
 			"textAlignment"	"west"
 			"xpos"			"408"
@@ -1464,7 +1464,7 @@
 		{
 			"ControlName"	"CExLabel"
 			"fieldName"		"HeadshotsLabel"
-			"font"			"Cerbetica14"
+			"font"			"HudFontSmall"
 			"labelText"		"#TF_ScoreBoard_HeadshotsLabel"
 			"textAlignment"	"west"
 			"xpos"			"342"
@@ -1481,7 +1481,7 @@
 		{
 			"ControlName"	"CExLabel"
 			"fieldName"		"Headshots"
-			"font"			"Cerbetica14"
+			"font"			"HudFontSmall"
 			"labelText"		"%headshots%"
 			"textAlignment"	"west"
 			"xpos"			"9999"
@@ -1498,7 +1498,7 @@
 		{
 			"ControlName"	"CExLabel"
 			"fieldName"		"Headshots2"
-			"font"			"Cerbetica14"
+			"font"			"HudFontSmall"
 			"labelText"		"%headshots%"
 			"textAlignment"	"west"
 			"xpos"			"408"
@@ -1515,7 +1515,7 @@
 		{
 			"ControlName"	"CExLabel"
 			"fieldName"		"BackstabsLabel"
-			"font"			"Cerbetica14"
+			"font"			"HudFontSmall"
 			"labelText"		"#TF_ScoreBoard_BackstabsLabel"
 			"textAlignment"	"west"
 			"xpos"			"342"
@@ -1532,7 +1532,7 @@
 		{
 			"ControlName"	"CExLabel"
 			"fieldName"		"Backstabs"
-			"font"			"Cerbetica14"
+			"font"			"HudFontSmall"
 			"labelText"		"%backstabs%"
 			"textAlignment"	"west"
 			"xpos"			"9999"
@@ -1549,7 +1549,7 @@
 		{
 			"ControlName"	"CExLabel"
 			"fieldName"		"Backstabs2"
-			"font"			"Cerbetica14"
+			"font"			"HudFontSmall"
 			"labelText"		"%backstabs%"
 			"textAlignment"	"west"
 			"xpos"			"408"
@@ -1566,7 +1566,7 @@
 		{
 			"ControlName"	"CExLabel"
 			"fieldName"		"BonusLabel"
-			"font"			"Cerbetica14"
+			"font"			"HudFontSmall"
 			"labelText"		"#TF_ScoreBoard_BonusLabel"
 			"textAlignment"	"west"
 			"xpos"			"342"
@@ -1583,7 +1583,7 @@
 		{
 			"ControlName"	"CExLabel"
 			"fieldName"		"Bonus"
-			"font"			"Cerbetica14"
+			"font"			"HudFontSmall"
 			"labelText"		"%bonus%"
 			"textAlignment"	"west"
 			"xpos"			"9999"
@@ -1600,7 +1600,7 @@
 		{
 			"ControlName"	"CExLabel"
 			"fieldName"		"Bonus2"
-			"font"			"Cerbetica14"
+			"font"			"HudFontSmall"
 			"labelText"		"%bonus%"
 			"textAlignment"	"west"
 			"xpos"			"408"
@@ -1617,7 +1617,7 @@
 		{
 			"ControlName"	"CExLabel"
 			"fieldName"		"SupportLabel"
-			"font"			"Cerbetica14"
+			"font"			"HudFontSmall"
 			"labelText"		"#TF_Scoreboard_Support"
 			"textAlignment"	"west"
 			"xpos"			"440"
@@ -1634,7 +1634,7 @@
 		{
 			"ControlName"	"CExLabel"
 			"fieldName"		"Support"
-			"font"			"Cerbetica14"
+			"font"			"HudFontSmall"
 			"labelText"		"%support%"
 			"textAlignment"	"west"
 			"xpos"			"9999"
@@ -1651,7 +1651,7 @@
 		{
 			"ControlName"	"CExLabel"
 			"fieldName"		"Support2"
-			"font"			"Cerbetica14"
+			"font"			"HudFontSmall"
 			"labelText"		"%support%"
 			"textAlignment"	"west"
 			"xpos"			"502"
@@ -1669,7 +1669,7 @@
 		{
 			"ControlName"	"CExLabel"
 			"fieldName"		"DamageLabel"
-			"font"			"Cerbetica14"
+			"font"			"HudFontSmall"
 			"labelText"		"#TF_Scoreboard_Damage"
 			"textAlignment"	"west"
 			"xpos"			"440"
@@ -1686,7 +1686,7 @@
 		{
 			"ControlName"	"CExLabel"
 			"fieldName"		"Damage"
-			"font"			"Cerbetica14"
+			"font"			"HudFontSmall"
 			"labelText"		"%damage%"
 			"textAlignment"	"west"
 			"xpos"			"9999"
@@ -1703,7 +1703,7 @@
 		{
 			"ControlName"	"CExLabel"
 			"fieldName"		"Damage2"
-			"font"			"Cerbetica14"
+			"font"			"HudFontSmall"
 			"labelText"		"%damage%"
 			"textAlignment"	"west"
 			"xpos"			"502"
diff --git a/customizations/team_menu/classselection-center.res b/customizations/team_menu/classselection-center.res
index e545202..c2c587f 100644
--- a/customizations/team_menu/classselection-center.res
+++ b/customizations/team_menu/classselection-center.res
@@ -2,11 +2,7 @@
 {
 	"SelectClassLabel"
 	{
-		"xpos"			"30"
-		"ypos"			"r40"
-		"wide"			"450"
-		"textAlignment"	"west"
-		"font"			"CerbeticaBold32"
+		"visible"		"0"
 	}
 
 	"SidePanelBG"
@@ -19,78 +15,78 @@
 	"scout"
 	{
 		"xpos"			"c81"
-		"ypos"			"180"
+		"ypos"			"164"
 	}
 
 	"soldier"
 	{
 		"xpos"			"c80"
-		"ypos"			"196"
+		"ypos"			"180"
 	}
 
 	"pyro"
 	{
 		"xpos"			"c80"
-		"ypos"			"212"
+		"ypos"			"196"
 	}
 
 	"demoman"
 	{
 		"xpos"			"c80"
-		"ypos"			"232"
+		"ypos"			"212"
 	}
 
 	"heavyweapons"
 	{
 		"xpos"			"c80"
-		"ypos"			"248"
+		"ypos"			"232"
 	}
 
 	"engineer"
 	{
 		"xpos"			"c80"
-		"ypos"			"264"
+		"ypos"			"248"
 	}
 
 	"medic"
 	{
 		"xpos"			"c80"
-		"ypos"			"284"
+		"ypos"			"264"
 	}
 
 	"sniper"
 	{
 		"xpos"			"c80"
-		"ypos"			"300"
+		"ypos"			"284"
 	}
 
 	"spy"
 	{
 		"xpos"			"c80"
-		"ypos"			"316"
+		"ypos"			"300"
 	}
 
 	"random"
 	{
 		"xpos"			"c80"
-		"ypos"			"c100"
+		"ypos"			"c80"
 	}
 
-	"EditLoadoutButton" [$WIN32]
+	"EditLoadoutButton"
 	{
 		"xpos"			"c80"
-		"ypos"			"c120"
+		"ypos"			"c100"
 	}
 
-	"CancelButton" [$WIN32]
+	"CancelButton"
 	{
 		"xpos"			"c180"
-		"ypos"			"c100"
+		"ypos"			"c80"
 	}
 	"numScout"
 	{
 		"xpos"			"c158"
-		"ypos"			"180"
+		"ypos"			"164"
 		"wide"			"100"
 		"tall"			"12"
 		"textAlignment"	"center"
@@ -99,7 +95,7 @@
 	"numSoldier"
 	{
 		"xpos"			"c158"
-		"ypos"			"196"
+		"ypos"			"180"
 		"wide"			"100"
 		"tall"			"12"
 		"textAlignment"	"center"
@@ -108,7 +104,7 @@
 	"numPyro"
 	{
 		"xpos"			"c158"
-		"ypos"			"212"
+		"ypos"			"196"
 		"wide"			"100"
 		"tall"			"12"
 		"textAlignment"	"center"
@@ -117,7 +113,7 @@
 	"numDemoman"
 	{
 		"xpos"			"c158"
-		"ypos"			"232"
+		"ypos"			"212"
 		"wide"			"100"
 		"tall"			"12"
 		"textAlignment"	"center"
@@ -126,7 +122,7 @@
 	"numHeavy"
 	{
 		"xpos"			"c158"
-		"ypos"			"248"
+		"ypos"			"232"
 		"wide"			"100"
 		"tall"			"12"
 		"textAlignment"	"center"
@@ -135,7 +131,7 @@
 	"numEngineer"
 	{
 		"xpos"			"c158"
-		"ypos"			"264"
+		"ypos"			"248"
 		"wide"			"100"
 		"tall"			"12"
 		"textAlignment"	"center"
@@ -144,7 +140,7 @@
 	"numMedic"
 	{
 		"xpos"			"c158"
-		"ypos"			"284"
+		"ypos"			"264"
 		"wide"			"100"
 		"tall"			"12"
 		"textAlignment"	"center"
@@ -153,7 +149,7 @@
 	"numSniper"
 	{
 		"xpos"			"c158"
-		"ypos"			"300"
+		"ypos"			"284"
 		"wide"			"100"
 		"tall"			"12"
 		"textAlignment"	"center"
@@ -162,7 +158,7 @@
 	"numSpy"
 	{
 		"xpos"			"c158"
-		"ypos"			"316"
+		"ypos"			"300"
 		"wide"			"100"
 		"tall"			"12"
 		"textAlignment"	"center"
diff --git a/customizations/team_menu/classselection.res b/customizations/team_menu/classselection.res
index f203e95..6ec2ea4 100644
--- a/customizations/team_menu/classselection.res
+++ b/customizations/team_menu/classselection.res
@@ -56,7 +56,7 @@
 		"tall"			"30"
 		"labelText"		"#TF_SelectAClass"
 		"textAlignment"	"center"
-		"font"			"CerbeticaBold32"
+		"font"			"Cerbetica32"
 		"visible"		"0"
 		"enabled"		"0"
 		"fgcolor"		"TanLight"
@@ -80,7 +80,7 @@
 		"textAlignment"		"west"
 		"Command"			"joinclass scout"
 		"Default"			"1"
-		"font"				"CerbeticaBold16"
+		"font"				"Cerbetica16"
 		"scaleImage"		"1"
 		"paintbackground"	"0"
 
@@ -117,7 +117,7 @@
 		"textAlignment"		"west"
 		"Command"			"joinclass soldier"
 		"Default"			"0"
-		"font"				"CerbeticaBold16"
+		"font"				"Cerbetica16"
 		"scaleImage"		"1"
 		"paintbackground"	"0"
 
@@ -154,7 +154,7 @@
 		"textAlignment"		"west"
 		"Command"			"joinclass pyro"
 		"Default"			"0"
-		"font"				"CerbeticaBold16"
+		"font"				"Cerbetica16"
 		"scaleImage"		"1"
 		"paintbackground"	"0"
 
@@ -191,7 +191,7 @@
 		"textAlignment"		"west"
 		"Command"			"joinclass demoman"
 		"Default"			"0"
-		"font"				"CerbeticaBold16"
+		"font"				"Cerbetica16"
 		"scaleImage"		"1"
 		"paintbackground"	"0"
 
@@ -228,7 +228,7 @@
 		"textAlignment"		"west"
 		"Command"			"joinclass heavyweapons"
 		"Default"			"0"
-		"font"				"CerbeticaBold16"
+		"font"				"Cerbetica16"
 		"scaleImage"		"1"
 		"paintbackground"	"0"
 
@@ -265,7 +265,7 @@
 		"textAlignment"		"west"
 		"Command"			"joinclass engineer"
 		"Default"			"0"
-		"font"				"CerbeticaBold16"
+		"font"				"Cerbetica16"
 		"scaleImage"		"1"
 		"paintbackground"	"0"
 
@@ -302,7 +302,7 @@
 		"textAlignment"		"west"
 		"Command"			"joinclass medic"
 		"Default"			"0"
-		"font"				"CerbeticaBold16"
+		"font"				"Cerbetica16"
 		"scaleImage"		"1"
 		"paintbackground"	"0"
 
@@ -339,7 +339,7 @@
 		"textAlignment"		"west"
 		"Command"			"joinclass sniper"
 		"Default"			"0"
-		"font"				"CerbeticaBold16"
+		"font"				"Cerbetica16"
 		"scaleImage"		"1"
 		"paintbackground"	"0"
 
@@ -376,7 +376,7 @@
 		"textAlignment"		"west"
 		"Command"			"joinclass spy"
 		"Default"			"0"
-		"font"				"CerbeticaBold16"
+		"font"				"Cerbetica16"
 		"scaleImage"		"1"
 		"paintbackground"	"0"
 
@@ -400,7 +400,7 @@
 		"ControlName"		"CExButton"
 		"fieldName"			"random"
 		"xpos"				"30"
-		"ypos"				"r48"
+		"ypos"				"431"
 		"zpos"				"6"
 		"wide"				"80"
 		"tall"				"16"
@@ -412,7 +412,7 @@
 		"labelText"			"(&R)  RANDOM"
 		"textAlignment"		"west"
 		"Command"			"joinclass random"
-		"font"				"CerbeticaBold16"
+		"font"				"Cerbetica16"
 		"paintbackground"	"0"
 
 		"fgcolor"					"235 226 202 255"
@@ -424,14 +424,18 @@
 		"sound_depressed"	"UI/buttonclick.wav"
 		"sound_released"	"UI/buttonclickrelease.wav"
 		"sound_armed"		"UI/buttonrollover.wav"
+
+		"stayselectedonclick"	"1"
+		"selectonhover"			"1"
+		"keyboardinputenabled"	"0"
 	}
 
 	"CancelButton" [$WIN32]
 	{
 		"ControlName"	"CExButton"
 		"fieldName"		"CancelButton"
-		"xpos"			"30"
-		"ypos"			"r28"
+		"xpos"			"130"
+		"ypos"			"431"
 		"zpos"			"6"
 		"wide"			"80"
 		"tall"			"16"
@@ -443,7 +447,7 @@
 		"labelText"		"(&Q)  CANCEL"
 		"textAlignment"	"west"
 		"Command"		"vguicancel"
-		"font"			"CerbeticaBold16"
+		"font"			"Cerbetica16"
 		"paintbackground" "0"
 
 		"fgcolor"					"235 226 202 255"
@@ -461,8 +465,8 @@
 	{
 		"ControlName"	"CExButton"
 		"fieldName"		"EditLoadoutButton"
-		"xpos"			"125"
-		"ypos"			"r28"
+		"xpos"			"30"
+		"ypos"			"450"
 		"zpos"			"6"
 		"wide"			"110"
 		"tall"			"16"
@@ -475,7 +479,7 @@
 		"labelText"		"(&E)  EDIT LOADOUT"
 		"textAlignment"	"west"
 		"Command"		"openloadout"
-		"font"			"CerbeticaBold16"
+		"font"			"Cerbetica16"
 
 		"fgcolor"					"235 226 202 255"
 		"defaultFgColor_override"	"235 226 202 255"
@@ -514,7 +518,7 @@
 		"paintbackground""0"
 		"textAlignment"	"center"
 		"Command"		"resetclass"
-		"font"			"CerbeticaBold16"
+		"font"			"Cerbetica16"
 	}
 
 	"MenuBG"
@@ -741,7 +745,7 @@
 		"tabPosition"	"0"
 		"labelText"		"%numScout%"
 		"textAlignment"	"center"
-		"font"			"CerbeticaBold16"
+		"font"			"Cerbetica16"
 		"fgcolor"		"235 226 202 255"
 	}
 
@@ -761,7 +765,7 @@
 		"tabPosition"	"0"
 		"labelText"		"%numSoldier%"
 		"textAlignment"	"center"
-		"font"			"CerbeticaBold16"
+		"font"			"Cerbetica16"
 		"fgcolor"		"235 226 202 255"
 	}
 
@@ -781,7 +785,7 @@
 		"tabPosition"	"0"
 		"labelText"		"%numPyro%"
 		"textAlignment"	"center"
-		"font"			"CerbeticaBold16"
+		"font"			"Cerbetica16"
 		"fgcolor"		"235 226 202 255"
 	}
 
@@ -801,7 +805,7 @@
 		"tabPosition"	"0"
 		"labelText"		"%numDemoman%"
 		"textAlignment"	"center"
-		"font"			"CerbeticaBold16"
+		"font"			"Cerbetica16"
 		"fgcolor"		"235 226 202 255"
 	}
 
@@ -821,7 +825,7 @@
 		"tabPosition"	"0"
 		"labelText"		"%numHeavy%"
 		"textAlignment"	"center"
-		"font"			"CerbeticaBold16"
+		"font"			"Cerbetica16"
 		"fgcolor"		"235 226 202 255"
 	}
 
@@ -841,7 +845,7 @@
 		"tabPosition"	"0"
 		"labelText"		"%numEngineer%"
 		"textAlignment"	"center"
-		"font"			"CerbeticaBold16"
+		"font"			"Cerbetica16"
 		"fgcolor"		"235 226 202 255"
 	}
 
@@ -861,7 +865,7 @@
 		"tabPosition"	"0"
 		"labelText"		"%numMedic%"
 		"textAlignment"	"center"
-		"font"			"CerbeticaBold16"
+		"font"			"Cerbetica16"
 		"fgcolor"		"235 226 202 255"
 	}
 
@@ -881,7 +885,7 @@
 		"tabPosition"	"0"
 		"labelText"		"%numSniper%"
 		"textAlignment"	"center"
-		"font"			"CerbeticaBold16"
+		"font"			"Cerbetica16"
 		"fgcolor"		"235 226 202 255"
 	}
 
@@ -901,7 +905,7 @@
 		"tabPosition"	"0"
 		"labelText"		"%numSpy%"
 		"textAlignment"	"center"
-		"font"			"CerbeticaBold16"
+		"font"			"Cerbetica16"
 		"fgcolor"		"235 226 202 255"
 	}
 
diff --git a/customizations/team_menu/teammenu-center.res b/customizations/team_menu/teammenu-center.res
index e6940ed..3ffe965 100644
--- a/customizations/team_menu/teammenu-center.res
+++ b/customizations/team_menu/teammenu-center.res
@@ -46,12 +46,11 @@
 	"teambutton0"
 	{
 		"xpos"			"c-110"
-		"ypos"			"210"
+		"ypos"			"c-20"
 		"wide"			"110"
 		"tall"			"40"
-		"labelText"		"&3. Blue Team"	[$WIN32]
-		"textAlignment"	"center"
-		"font"			"CerbeticaBold16"
+		"textAlignment"	"north"
+		"font"			"Cerbetica16"
 	}
 
 	"BlueTeamBG"
@@ -65,12 +64,11 @@
 	"teambutton1"
 	{
 		"xpos"			"c0"
-		"ypos"			"210"
+		"ypos"			"c-20"
 		"wide"			"110"
 		"tall"			"40"
-		"labelText"		"&4. Red Team"	[$WIN32]
-		"textAlignment"	"center"
-		"font"			"CerbeticaBold16"
+		"textAlignment"	"north"
+		"font"			"Cerbetica16"
 	}
 
 	"RedTeamBG"
@@ -87,9 +85,8 @@
 		"ypos"			"c-40"
 		"wide"			"220"
 		"tall"			"20"
-		"labelText"		"&1. Auto-Join"
 		"textAlignment"	"center"
-		"font"			"CerbeticaBold16"
+		"font"			"Cerbetica16"
 	}
 
 	"AutoJoinBG"
@@ -104,9 +101,8 @@
 		"ypos"			"c20"
 		"wide"			"220"
 		"tall"			"20"
-		"labelText"		"&2. Spectate"	[$WIN32]
 		"textAlignment"	"center"
-		"font"			"CerbeticaBold16"
+		"font"			"Cerbetica16"
 	}
 
 	"SpectateBG"
@@ -117,60 +113,56 @@
 
 	"BlueCount"
 	{
-		"xpos"			"c-157"
-		"ypos"			"c-10"
-		"wide"			"90"
-		"font"			"Cerbetica14"
+		"xpos"			"c-115"
+		"ypos"			"c-15"
+		"wide"			"48"
+		"tall"			"40"
+		"font"			"HudFontSmall"
+		"textAlignment"	"east"
 		"fgcolor"		"255 255 255 175"
 	}
 	"BlueCountPlayers"
 	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"BlueCountPlayers"
-		"xpos"			"c-120"
-		"ypos"			"c-10"
+		"xpos"			"c-60"
+		"ypos"			"c-15"
 		"zpos"			"1"
-		"wide"			"90"
-		"tall"			"30"
-		"autoResize"	"0"
-		"pinCorner"		"0"
+		"wide"			"55"
+		"tall"			"40"
 		"visible"		"1"
 		"enabled"		"1"
 		"labelText"		"players"
-		"textAlignment"	"east"
-		"dulltext"		"0"
-		"brighttext"	"1"
-		"font"			"Cerbetica14"
+		"textAlignment"	"west"
+		"font"			"HudFontSmall"
 		"fgcolor"		"255 255 255 175"
 	}
 
 	"RedCount"
 	{
-		"xpos"			"c-51"
-		"ypos"			"c-10"
-		"wide"			"90"
+		"xpos"			"c0"
+		"ypos"			"c-15"
+		"wide"			"43"
+		"tall"			"40"
 		"labelText"		"%redcount%"
-		"font"			"Cerbetica14"
+		"font"			"HudFontSmall"
+		"textAlignment"	"east"
 		"fgcolor"		"255 255 255 175"
 	}
 	"RedCountPlayers"
 	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"RedCountPlayers"
-		"xpos"			"c-14"
-		"ypos"			"c-10"
+		"xpos"			"c50"
+		"ypos"			"c-15"
 		"zpos"			"1"
-		"wide"			"90"
-		"tall"			"30"
-		"autoResize"	"0"
-		"pinCorner"		"0"
+		"wide"			"55"
+		"tall"			"40"
 		"visible"		"1"
 		"enabled"		"1"
 		"labelText"		"players"
-		"textAlignment"	"east"
-		"dulltext"		"0"
-		"brighttext"	"1"
-		"font"			"Cerbetica14"
+		"textAlignment"	"west"
+		"font"			"HudFontSmall"
 		"fgcolor"		"255 255 255 175"
 	}
 }
\ No newline at end of file
diff --git a/customizations/team_menu/teammenu.res b/customizations/team_menu/teammenu.res
index 8c5a434..9368fb8 100644
--- a/customizations/team_menu/teammenu.res
+++ b/customizations/team_menu/teammenu.res
@@ -2,7 +2,7 @@
 {
 	"team"
 	{
-		"ControlName"	"ImagePanel"
+		"ControlName"	"CTeamMenu"
 		"fieldName"		"team"
 		"xpos"			"0"
 		"ypos"			"0"
@@ -62,19 +62,19 @@
 
 	"SelectTeamLabel"
 	{
-		"ControlName"	"CExLabel"
+		"ControlName"	"Label"
 		"fieldName"		"SelectTeamLabel"
 		"xpos"			"0"
 		"ypos"			"15"
-		"zpos"			"6"
+		"zpos"			"1"
 		"wide"			"255"
 		"tall"			"30"
 		"labelText"		"#TF_SelectATeam"
 		"textAlignment"	"center"
-		"font"			"CerbeticaBold32"
+		"font"			"Cerbetica32"
 		"visible"		"1"
 		"enabled"		"1"
-		"fgcolor"		"TanLight"
+		"fgcolor_override"	"TanLight"
 	}
 
 	"teambutton0"
@@ -91,13 +91,13 @@
 		"visible"		"1"
 		"enabled"		"1"
 		"tabPosition"	"3"
-		"labelText"		"&3. BLU"	[$WIN32]
-		"textAlignment"	"west"
+		"labelText"		"#TF_BlueTeam_Name"
+		"textAlignment"	"center"
 		"dulltext"		"0"
 		"brighttext"	"0"
 		"command"		"jointeam blue"
 		"team"			"3"		// Blue Team
-		"font"			"CerbeticaBold20"
+		"font"			"Cerbetica20"
 		"defaultFgColor_override" 	"255 255 255 128"
 		"armedFgColor_override"		"235 226 202 255"
 		"depressedFgColor_override" "255 255 255 128"
@@ -132,14 +132,13 @@
 		"visible"		"1"
 		"enabled"		"1"
 		"tabPosition"	"3"
-		"labelText"		"&4. RED"	[$WIN32]
-		"textAlignment"	"west"
+		"labelText"		"#TF_RedTeam_Name"
+		"textAlignment"	"center"
 		"dulltext"		"0"
 		"brighttext"	"0"
 		"command"		"jointeam red"
 		"team"			"4"		// Red Team
-		"font"			"CerbeticaBold20"
-
+		"font"			"Cerbetica20"
 		"defaultFgColor_override" 	"255 255 255 128"
 		"armedFgColor_override"		"235 226 202 255"
 		"depressedFgColor_override" "255 255 255 128"
@@ -174,14 +173,13 @@
 		"visible"		"1"
 		"enabled"		"1"
 		"tabPosition"	"3"
-		"labelText"		"&1. Auto-Join"
-		"textAlignment"	"west"
+		"labelText"		"#TF_Random"
+		"textAlignment"	"center"
 		"dulltext"		"0"
 		"brighttext"	"0"
 		"paintborder"	"0"
 		"command"		"jointeam auto"
-
-		"font"			"CerbeticaBold20"
+		"font"			"Cerbetica20"
 		"defaultFgColor_override" 	"255 255 255 128"
 		"armedFgColor_override"		"235 226 202 255"
 		"depressedFgColor_override" "255 255 255 128"
@@ -216,14 +214,13 @@
 		"visible"		"1"
 		"enabled"		"1"
 		"tabPosition"	"3"
-		"labelText"		"&2. Spectate"	[$WIN32]
-		"textAlignment"	"west"
+		"labelText"		"#TF_Spectate"
+		"textAlignment"	"center"
 		"dulltext"		"0"
 		"brighttext"	"0"
 		"paintborder"	"0"
 		"command"		"jointeam spectate"
-
-		"font"			"CerbeticaBold20"
+		"font"			"Cerbetica20"
 		"defaultFgColor_override" 	"255 255 255 128"
 		"armedFgColor_override"		"235 226 202 255"
 		"depressedFgColor_override" "255 255 255 128"
@@ -264,11 +261,11 @@
 	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"BlueCount"
-		"xpos"			"-10"
+		"xpos"			"0"
 		"ypos"			"c5"
 		"zpos"			"1"
 		"zpos"			"3"
-		"wide"			"255"
+		"wide"			"245"
 		"tall"			"30"
 		"autoResize"	"0"
 		"pinCorner"		"0"
@@ -278,7 +275,7 @@
 		"textAlignment"	"east"
 		"dulltext"		"0"
 		"brighttext"	"1"
-		"font"			"CerbeticaBold20"
+		"font"			"Cerbetica20"
 		"fgcolor"		"242 242 242 255"
 	}
 
@@ -286,10 +283,10 @@
 	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"RedCount"
-		"xpos"			"-10"
+		"xpos"			"0"
 		"ypos"			"c45"
-		"zpos"			"3"
-		"wide"			"255"
+		"zpos"			"1"
+		"wide"			"245"
 		"tall"			"30"
 		"autoResize"	"0"
 		"pinCorner"		"0"
@@ -299,58 +296,10 @@
 		"textAlignment"	"east"
 		"dulltext"		"0"
 		"brighttext"	"1"
-		"font"			"CerbeticaBold20"
+		"font"			"Cerbetica20"
 		"fgcolor"		"242 242 242 255"
 	}
 
-	"HighlanderLabel"
-	{
-		"ControlName"	"CExLabel"
-		"fieldName"		"HighlanderLabel"
-		"xpos"			"0"
-		"ypos"			"c95"
-		"zpos"			"6"
-		"wide"			"255"
-		"tall"			"50"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"0"
-		"enabled"		"0"
-		"labelText"		"#TF_Highlander_Mode"
-		"textAlignment"	"Center"
-		"dulltext"		"0"
-		"brighttext"	"0"
-		"font"			"CerbeticaBold16"
-		"fgcolor"		"235 226 202 255"
-		"centerwrap"	"1"
-	}
-
-	"HighlanderLabelShadow"
-	{
-		"ControlName"	"CExLabel"
-		"fieldName"		"HighlanderLabelShadow"
-		"xpos"			"-1"
-		"ypos"			"-1"
-		"zpos"			"6"
-		"wide"			"255"
-		"tall"			"50"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"0"
-		"enabled"		"0"
-		"labelText"		"#TF_Highlander_Mode"
-		"textAlignment"	"Center"
-		"dulltext"		"0"
-		"brighttext"	"0"
-		"font"			"CerbeticaBold16"
-		"fgcolor"		"0 0 0 200"
-		"centerwrap"	"1"
-
-		"pin_to_sibling"		"HighlanderLabel"
-		"pin_corner_to_sibling"	"PIN_TOPLEFT"
-		"pin_to_sibling_corner"	"PIN_TOPLEFT"
-	}
-
 	"TeamsFullLabel"
 	{
 		"ControlName"	"CExLabel"
@@ -368,8 +317,8 @@
 		"textAlignment"	"center"
 		"dulltext"		"0"
 		"brighttext"	"0"
-		"font"			"CerbeticaBold12"
-		"fgcolor"		"235 226 202 255"
+		"font"			"Cerbetica12"
+		"fgcolor"		"TanLight"
 		"centerwrap"	"1"
 	}
 
@@ -390,8 +339,8 @@
 		"textAlignment"	"center"
 		"dulltext"		"0"
 		"brighttext"	"0"
-		"font"			"CerbeticaBold12"
-		"fgcolor"		"0 0 0 200"
+		"font"			"Cerbetica12"
+		"fgcolor"		"TransparentBlack"
 		"centerwrap"	"1"
 
 		"pin_to_sibling"		"TeamsFullLabel"
@@ -405,4 +354,54 @@
 		"fieldName"		"CancelButton"
 		"wide"			"0"
 	}
+
+	"teambutton0SC"
+	{
+		"ControlName"	"CExButton"
+		"fieldName"		"teambutton0SC"
+		"wide"			"0"
+		"tall"			"0"
+		"visible"		"1"
+		"enabled"		"1"
+		"labelText"		"&3"
+		"command"		"jointeam blue"
+		"team"			"3"
+	}
+
+	"teambutton1SC"
+	{
+		"ControlName"	"CExButton"
+		"fieldName"		"teambutton1SC"
+		"wide"			"0"
+		"tall"			"0"
+		"visible"		"1"
+		"enabled"		"1"
+		"labelText"		"&4"
+		"command"		"jointeam red"
+		"team"			"4"
+	}
+
+	"teambutton2SC"
+	{
+		"ControlName"	"CExButton"
+		"fieldName"		"teambutton2SC"
+		"wide"			"0"
+		"tall"			"0"
+		"visible"		"1"
+		"enabled"		"1"
+		"labelText"		"&1"
+		"command"		"jointeam auto"
+	}
+
+	"teambutton3SC"
+	{
+		"ControlName"	"CExButton"
+		"fieldName"		"teambutton3SC"
+		"wide"			"0"
+		"tall"			"0"
+		"visible"		"1"
+		"enabled"		"1"
+		"labelText"		"&2"
+		"command"		"jointeam spectate"
+	}
 }
\ No newline at end of file