Updated customizations

3 files changed, 284 insertions, 1605 deletions

diff --git a/#customizations/mainmenuoverride-classic.res b/#customizations/mainmenuoverride-classic.res
index 69c7c6a..205869a 100644
--- a/#customizations/mainmenuoverride-classic.res
+++ b/#customizations/mainmenuoverride-classic.res
@@ -1,209 +1,8 @@
 "Resource/UI/MainMenuOverride.res"
 {
-	MainMenuOverride
-	{
-		"fieldName"		"MainMenuOverride"
-		"visible"		"1"
-		"enabled"		"1"
-		"xpos"			"0"
-		"ypos"			"0"
-		"zpos"			"0"
-		"wide"			"f0"
-		"tall"			"480"
-
-		"update_url"	"http://store.steampowered.com/news/?filter=updates&appids=440"
-		"blog_url"		"http://www.teamfortress.com/"
-
-		"button_x_offset"	"-285"
-		"button_y"			"120"
-		"button_y_delta"	"5"
-
-		"button_kv"
-		{
-			"xpos"			"0"
-			"ypos"			"150"
-			"wide"			"250"
-			"tall"			"26"
-			"visible"		"1"
-
-			"SubButton"
-			{
-				"ControlName"	"CExImageButton"
-				"fieldName"		"SubButton"
-				"xpos"			"0"
-				"ypos"			"0"
-				"wide"			"250"
-				"tall"			"26"
-				"autoResize"	"0"
-				"pinCorner"		"3"
-				"visible"		"1"
-				"enabled"		"1"
-				"tabPosition"	"0"
-				"textinsetx"	"25"
-				"use_proportional_insets" "1"
-				"font"			"Cerbetica16"
-				"textAlignment"	"west"
-				"dulltext"		"0"
-				"brighttext"	"0"
-				"default"		"1"
-				"sound_depressed"	"UI/buttonclick.wav"
-				"sound_released"	"UI/buttonclickrelease.wav"
-
-				"border_default"	""
-				"border_armed"		""
-				"paintbackground"	"0"
-
-				"defaultFgColor_override"	"235 226 202 255"
-				"armedFgColor_override"		"72 255 255 255"
-				"depressedFgColor_override" "72 255 255 255"
-			}
-		}
-
-		"SaxxySettings"
-		{
-			"xpos"			"0"
-			"ypos"			"0"
-			"zpos"			"-101"
-			"wide"			"f0"
-			"tall"			"480"
-
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-
-			"flashbounds_x"	"50"
-			"flashbounds_y"	"65"
-			"flashbounds_w"	"250"
-			"flashbounds_h"	"120"
-
-			"flashstartsize_min"	"8"
-			"flashstartsize_max"	"12"
-
-			"flash_maxscale"		"4"
-
-			"flash_lifelength_min"	".1"
-			"flash_lifelength_max"	".2"
-
-			"curtain_anim_duration"		"4.0"
-			"curtain_open_time"		"2.8"
-			"flash_start_time"		"4.0"
-
-			"initial_freakout_duration"		"15.0"
-			"clap_sound_duration"	"10.0"
-
-			"CameraFlashSettings"
-			{
-				"visible"		"1"
-				"enabled"		"1"
-				"tileImage"		"0"
-				"scaleImage"	"1"
-				"zpos"			"9"
-			}
-		}
-	}
-
-	"mouseoveritempanel"
-	{
-		"ControlName"	"CItemModelPanel"
-		"fieldName"		"mouseoveritempanel"
-		"xpos"			"c-70"
-		"ypos"			"270"
-		"zpos"			"100"
-		"wide"			"300"
-		"tall"			"300"
-		"visible"		"0"
-		"bgcolor_override"		"Transparent"
-		"noitem_textcolor"		"117 107 94 255"
-		"PaintBackgroundType"	"2"
-		"paintborder"	"1"
-		"border"		"MainMenuBGBorder"
-
-		"text_ypos"			"20"
-		"text_center"		"1"
-		"model_hide"		"1"
-		"resize_to_text"	"1"
-		"padding_height"	"15"
-
-		"attriblabel"
-		{
-			"font"			"ItemFontAttribLarge"
-			"xpos"			"0"
-			"ypos"			"30"
-			"zpos"			"2"
-			"wide"			"140"
-			"tall"			"60"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"labelText"		"%attriblist%"
-			"textAlignment"	"center"
-			"fgcolor"		"117 107 94 255"
-			"centerwrap"	"1"
-		}
-	}
-
-	"Background"
-	{
-		"ControlName"	"ScalableImagePanel"
-		"fieldName"		"Background"
-		"xpos"			"cs-0.5"
-		"ypos"			"0"
-		"zpos"			"-200"
-		"wide"			"o1.6"
-		"tall"			"f0"
-		"visible"		"0"
-		"enabled"		"1"
-		"image"			""
-		"scaleImage"	"1"
-		"proportionaltoparent"	"1"
-
-		if_wider
-		{
-			"wide"		"f0"
-			"tall"		"o0.628"
-		}
-
-		if_taller
-		{
-			"wide"		"o1.6"
-			"tall"		"f0"
-		}
-	}
-
 	"HudName"
 	{
-		"ControlName"	"CExImageButton"
-		"fieldName"		"HudName"
 		"xpos"			"9999"
-		"ypos"			"58"
-		"zpos"			"1"
-		"wide"			"56"
-		"tall"			"25"
-		"autoResize"	"0"
-		"pinCorner"		"3"
-		"visible"		"1"
-		"enabled"		"1"
-		"tabPosition"	"0"
-		"labelText"		"rayshud"
-		"font"			"HudFontMediumSecondary"
-		"textAlignment"	"west"
-		"textinsetx"	"0"
-		"use_proportional_insets" "1"
-		"dulltext"		"0"
-		"brighttext"	"0"
-		"default"		"1"
-		"paintbackground""0"
-		"sound_depressed"	""
-		"sound_released"	"UI/wooo_tree.wav"
-
-		"defaultFgColor_override" "235 226 202 255"
-		"armedFgColor_override" "72 255 255 255"
-		"depressedFgColor_override" "72 255 255 255"
-
-		"image_drawcolor"	"235 226 202 255"
-		"image_armedcolor"	"72 255 255 255"
 	}
 
 	"TFLogoImage"
@@ -223,745 +22,75 @@
 
 	"RankModelPanel"
 	{
-		"ControlName"	"CPvPRankPanel"
-		"fieldName"		"RankModelPanel"
 		"xpos"			"150"
-		"ypos"			"cs-0.46"
-		"zpos"			"0"
-		"wide"			"170"
-		"tall"			"800"
-		"visible"		"0"
-		"proportionaltoparent"	"1"
-		"mouseinputenabled"	"1"
-		"matchgroup"	"MatchGroup_Casual_12v12"
-		"show_progress"	"0"
+		"ypos"			"c-135"
 	}
 
 	"CycleRankTypeButton"
 	{
-		"ControlName"	"CExImageButton"
-		"fieldName"		"CycleRankTypeButton"
 		"xpos"			"250"
-		"ypos"			"cs-0.5-10"
+		"ypos"			"cs-0.4-10"
 		"zpos"			"1"
-		"wide"			"15"
-		"tall"			"15"
-		"autoResize"	"0"
-		"pinCorner"		"3"
-		"visible"		"1"
-		"enabled"		"1"
-		"tabPosition"	"0"
-		"labelText"		"v"
-		"font"			"CustomIcons"
-		"textAlignment"	"center"
-		"dulltext"		"0"
-		"brighttext"	"0"
-		"default"		"1"
-		"actionsignallevel" "1"
-		"command"			"open_rank_type_menu"
-		"paintbackground"	"0"
-
-		"sound_depressed"	"UI/buttonclick.wav"
-		"sound_released"	"UI/buttonclickrelease.wav"
-
-		"defaultFgColor_override" 	"TanLight"
-		"armedFgColor_override" 	"ColorCyan"
-		"depressedFgColor_override" "TanLight"
-	}
-
-	"RankTooltipPanel"
-	{
-		"ControlName"	"ImagePanel"
-		"fieldName"		"RankTooltipPanel"
-		"xpos"			"c-285"
-		"ypos"			"99"
-		"zpos"			"-1"
-		"wide"			"0"
-		"tall"			"8"
-		"visible"		"1"
-		"proportionaltoparent"	"1"
-		"mouseinputenabled"	"1"
-		"image"			"info"
-		"scaleImage"	"1"
-		"alpha"			"75"
 	}
 
 	"RankPanel"
 	{
-		"ControlName"	"CPvPRankPanel"
-		"fieldName"		"RankPanel"
 		"xpos"			"50"
 		"ypos"			"250"
-		"zpos"			"0"
-		"wide"			"170"
 		"tall"			"56"
-		"visible"		"1"
-		"proportionaltoparent"	"1"
-		"mouseinputenabled"	"0"
-		"matchgroup"	"MatchGroup_Casual_12v12"
-		"xp_source_notification_center_x"	"350"
-		"show_model"	"0"
 	}
 
 	"NoGCMessage"
 	{
-		"ControlName"	"Label"
-		"fieldName"		"NoGCMessage"
-		"xpos"			"50"
-		"ypos"			"250"
-		"zpos"			"2"
-		"wide"			"225"
-		"tall"			"100"
-		"visible"		"1"
-		"proportionaltoparent"	"1"
-		"mouseinputenabled"	"0"
-		"wrap"			"1"
-		"textinsetx"	"40"
-		"textinsety"	"10"
-
-		"font"				"HudFontSmallestBold"
-		"fgcolor_override"	"TanLight"
-		"labelText"			"#TF_MM_NoGC_Rank"
-		"textAlignment"		"north-west"
-		"use_proportional_insets"	"1"
+		"xpos"			"75"
+		"ypos"			"240"
+		"wide"			"200"
+		"textinsetx"	"15"
+		"textinsety"	"5"
+		//"font"				"HudFontSmallestBold"
 	}
 
 	"NoGCImage"
 	{
-		"ControlName"	"ImagePanel"
-		"fieldName"		"NoGCImage"
 		"xpos"			"210"
-		"ypos"			"275"
-		"zpos"			"2"
-		"wide"			"30"
-		"tall"			"30"
-		"visible"		"1"
-		"enabled"		"1"
-		"image"			"replay\thumbnails\raysfox\shock"
-		"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"
-		"fieldName"				"TooltipPanel"
-		"xpos"					"0"
-		"ypos"					"0"
-		"zpos"					"10000"
-		"wide"					"150"
-		"tall"					"50"
-		"visible"				"0"
-		"PaintBackgroundType"	"2"
-		"border"				"CyanBorderThick"
-
-		"TipSubLabel"
-		{
-			"ControlName"	"ImagePanel"
-			"fieldName"		"TipSubLabel"
-			"font"			"HudFontSmall"
-			"labelText"		"%tipsubtext%"
-			"textAlignment"	"center"
-			"xpos"			"0"
-			"ypos"			"0"
-			"zpos"			"2"
-			"wide"			"250"
-			"tall"			"50"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"fillcolor"		"DarkGrey"
-			"wrap"			"1"
-		}
-
-		"TipLabel"
-		{
-			"ControlName"	"CExLabel"
-			"fieldName"		"TipLabel"
-			"font"			"HudFontSmallest"
-			"labelText"		"%tiptext%"
-			"textAlignment"	"center"
-			"xpos"			"5"
-			"ypos"			"0"
-			"zpos"			"3"
-			"wide"			"140"
-			"tall"			"30"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"allcaps"		"1"
-			"fgcolor"		"TanLight"
-			"auto_wide_tocontents" "1"
-		}
+		"ypos"			"260"
 	}
 
 	"Notifications_ShowButtonPanel"
 	{
-		"ControlName"		"EditablePanel"
-		"fieldName"			"Notifications_ShowButtonPanel"
 		"xpos"				"r28"
 		"ypos"				"40"
-		"zpos"				"0"
-		"wide"				"20"
-		"tall"				"20"
-		"autoResize"		"0"
-		"pinCorner"			"3"
-		"visible"			"1"
-		"enabled"			"1"
-		"tabPosition"		"0"
-		"bgcolor_override"	"Transparent"
-
-		"Notifications_ShowButtonPanel_SB"
-		{
-			"ControlName"		"CExImageButton"
-			"fieldName"			"Notifications_ShowButtonPanel_SB"
-			"xpos"				"0"
-			"ypos"				"0"
-			"wide"				"20"
-			"tall"				"20"
-			"autoResize"		"0"
-			"pinCorner"			"3"
-			"visible"			"1"
-			"enabled"			"1"
-			"tabPosition"		"0"
-			"labelText"			"k"
-			"font"				"CustomIcons"
-			"Command"			"noti_show"
-			"use_proportional_insets" "1"
-			"textAlignment"		"center"
-			"default"			"1"
-			"actionsignallevel"	"2"
-			"paintbackground"	"0"
-			"paintborder"		"0"
-			"sound_depressed"	"UI/buttonclick.wav"
-			"sound_released"	"UI/buttonclickrelease.wav"
-
-			"defaultFgColor_override"	"235 226 202 255"
-			"armedFgColor_override"		"72 255 255 255"
-		}
-	}
-
-	"MOTD_Panel"
-	{
-		"ControlName"	"EditablePanel"
-		"fieldName"		"MOTD_Panel"
-		"xpos"			"r330"
-		"ypos"			"65"
-		"zpos"			"100"
-		"wide"			"300"
-		"tall"			"350"
-		"visible"		"0"
-		"PaintBackgroundType"	"0"
-		"paintbackground"		"1"
-		"border"				"NoBorder"
-		"bgcolor_override"		"DarkGrey"
-
-		"MOTD_HeaderContainer"
-		{
-			"ControlName"	"EditablePanel"
-			"fieldName"		"MOTD_HeaderContainer"
-			"xpos"			"0"
-			"ypos"			"0"
-			"wide"			"300"
-			"tall"			"22"
-			"visible"		"1"
-
-			"MOTD_HeaderLabel"
-			{
-				"ControlName"	"CExLabel"
-				"fieldName"		"MOTD_HeaderLabel"
-				"font"			"HudFontSmallBold"
-				"textAlignment"	"center"
-				"labelText"		"%motdheader%"
-				"xpos"			"0"
-				"ypos"			"0"
-				"wide"			"300"
-				"tall"			"24"
-				"autoResize"	"0"
-				"pinCorner"		"0"
-				"visible"		"1"
-				"enabled"		"1"
-				"PaintBackgroundType" "0"
-				"fgcolor_override"	"TanLight"
-				"bgcolor_override"	"25 25 25 255"
-			}
-		}
-
-		"MOTD_CloseButton"
-		{
-			"ControlName"	"CExImageButton"
-			"fieldName"		"MOTD_CloseButton"
-			"xpos"			"282"
-			"ypos"			"4"
-			"zpos"			"10"
-			"wide"			"14"
-			"tall"			"14"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"tabPosition"	"0"
-			"labeltext"		"("
-			"font"			"CustomIcons"
-			"textAlignment"	"center"
-			"dulltext"		"0"
-			"brighttext"	"0"
-			"default"		"0"
-			"actionsignallevel"	"2"
-			"Command"			"motd_hide"
-			"paintbackground"	"0"
-
-			"sound_depressed"	"UI/buttonclick.wav"
-			"sound_released"	"UI/buttonclickrelease.wav"
-
-			"defaultFgColor_override" 	"TanLight"
-			"armedFgColor_override" 	"255 0 0 255"
-			"depressedFgColor_override" "TanLight"
-		}
-
-		"MOTD_HeaderIcon"
-		{
-			"ControlName"	"ImagePanel"
-			"fieldName"		"MOTD_HeaderIcon"
-			"xpos"			"265"
-			"ypos"			"25"
-			"zpos"			"100"
-			"wide"			"25"
-			"tall"			"25"
-			"visible"		"0"
-			"enabled"		"1"
-			"image"			"class_icons/filter_all_motd"
-			"scaleImage"	"1"
-		}
-
-		"MOTD_TitleLabel"
-		{
-			"ControlName"	"CExLabel"
-			"fieldName"		"MOTD_TitleLabel"
-			"font"			"HudFontSmall"
-			"labelText"		"%motdtitle%"
-			"textAlignment"	"west"
-			"xpos"			"10"
-			"ypos"			"25"
-			"wide"			"250"
-			"tall"			"15"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"fgcolor_override"	"White"
-			"wrap"			"1"
-		}
-
-		"MOTD_Label"
-		{
-			"ControlName"	"CExLabel"
-			"fieldName"		"MOTD_Label"
-			"font"			"HudFontSmallest"
-			"labelText"		"%motddate%"
-			"textAlignment"	"north-west"
-			"xpos"			"10"
-			"ypos"			"38"
-			"wide"			"300"
-			"tall"			"15"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"fgcolor_override"	"White"
-		}
-
-		"MOTD_TitleImageBg"
-		{
-			"ControlName"	"ImagePanel"
-			"fieldName"		"MOTD_TitleImageBg"
-			"xpos"			"cs-0.5"
-			"ypos"			"55"
-			"zpos"			"99"
-			"wide"			"250"
-			"tall"			"150"
-			"visible"		"1"
-			"enabled"		"1"
-			"image"			"item_bg"
-			"scaleImage"	"1"
-			"proportionaltoparent" "1"
-		}
-
-		"MOTD_TitleImageContainer"
-		{
-			"ControlName"	"EditablePanel"
-			"fieldName"		"MOTD_TitleImageContainer"
-			"xpos"			"cs-0.5"
-			"ypos"			"55"
-			"zpos"			"100"
-			"wide"			"250"
-			"tall"			"150"
-			"visible"		"1"
-			"proportionaltoparent" "1"
-
-			"MOTD_TitleImage"
-			{
-				"ControlName"	"ImagePanel"
-				"fieldName"		"MOTD_TitleImage"
-				"xpos"			"0"
-				"ypos"			"0"
-				"zpos"			"100"
-				"wide"			"250"
-				"tall"			"250"
-				"visible"		"1"
-				"enabled"		"1"
-				"image"			"class_icons/filter_all"
-				"scaleImage"	"0"
-			}
-		}
-
-		"MOTD_TextScroller"
-		{
-			"ControlName"	"ScrollableEditablePanel"
-			"fieldName"		"MOTD_TextScroller"
-			"xpos"			"20"
-			"ypos"			"220"
-			"wide"			"280"
-			"tall"			"110"
-			"PaintBackgroundType"	"2"
-			"fgcolor_override"	"117 107 94 255"
-
-			"MOTD_TextPanel"
-			{
-				"ControlName"	"EditablePanel"
-				"fieldName"		"MOTD_TextPanel"
-				"xpos"			"0"
-				"ypos"			"0"
-				"wide"			"250"
-				"tall"			"300"
-				"visible"		"1"
-				"PaintBackgroundType"	"2"
-
-				"MOTD_TextLabel"
-				{
-					"ControlName"	"CExLabel"
-					"fieldName"		"MOTD_TextLabel"
-					"font"			"HudFontSmallest"
-					"labelText"		"%motdtext%"
-					"textAlignment"	"north-west"
-					"xpos"			"0"
-					"ypos"			"0"
-					"wide"			"250"
-					"tall"			"300"
-					"autoResize"	"0"
-					"pinCorner"		"0"
-					"visible"		"1"
-					"enabled"		"1"
-					"fgcolor_override"	"White"
-					"wrap"			"1"
-				}
-			}
-		}
-
-		"MOTD_URLButton"
-		{
-			"ControlName"	"CExButton"
-			"fieldName"		"MOTD_URLButton"
-			"xpos"			"75"
-			"ypos"			"rs1.4"
-			"wide"			"150"
-			"tall"			"15"
-			"autoResize"	"0"
-			"pinCorner"		"3"
-			"visible"		"1"
-			"enabled"		"1"
-			"tabPosition"	"0"
-			"labelText"		"#MMenu_MOTD_URL"
-			"textinsetx"	"20"
-			"use_proportional_insets" "1"
-			"font"			"HudFontSmallestBold"
-			"textAlignment"	"center"
-			"dulltext"		"0"
-			"brighttext"	"0"
-			"default"		"1"
-			"command"		"motd_viewurl"
-			"proportionaltoparent" "1"
-			"actionsignallevel"	"2"
-
-			"sound_depressed"	"UI/buttonclick.wav"
-			"sound_released"	"UI/buttonclickrelease.wav"
-
-			"defaultFgColor_override" "White"
-			"defaultBgColor_override" "Black"
-			"armedFgColor_override" "Black"
-			"armedBgColor_override" "White"
-			"depressedFgColor_override" "White"
-		}
-
-		"MOTD_PrevButton"
-		{
-			"ControlName"	"CExImageButton"
-			"fieldName"		"MOTD_PrevButton"
-			"xpos"			"12"
-			"ypos"			"336"
-			"zpos"			"1"
-			"wide"			"20"
-			"tall"			"20"
-			"autoResize"	"0"
-			"pinCorner"		"3"
-			"visible"		"0"
-			"enabled"		"1"
-			"tabPosition"	"0"
-			"labelText"		""
-			"font"			"HudFontSmallest"
-			"textAlignment"	"center"
-			"dulltext"		"0"
-			"brighttext"	"0"
-			"default"		"1"
-			"Command"		"motd_prev"
-			"actionsignallevel"	"2"
-
-			"sound_depressed"	"UI/buttonclick.wav"
-			"sound_released"	"UI/buttonclickrelease.wav"
-			"paintbackground" "0"
-
-			"image_drawcolor"	"235 226 202 255"
-			"image_armedcolor"	"White"
-			"SubImage"
-			{
-				"ControlName"	"ImagePanel"
-				"fieldName"		"SubImage"
-				"xpos"			"0"
-				"ypos"			"0"
-				"zpos"			"1"
-				"wide"			"20"
-				"tall"			"20"
-				"visible"		"1"
-				"enabled"		"1"
-				"image"			"blog_back"
-				"scaleImage"	"1"
-			}
-		}
-
-		"MOTD_NextButton"
-		{
-			"ControlName"	"CExImageButton"
-			"fieldName"		"MOTD_NextButton"
-			"xpos"			"267"
-			"ypos"			"336"
-			"zpos"			"1"
-			"wide"			"20"
-			"tall"			"20"
-			"autoResize"	"0"
-			"pinCorner"		"3"
-			"visible"		"0"
-			"enabled"		"1"
-			"tabPosition"	"0"
-			"labelText"		""
-			"font"			"HudFontSmallest"
-			"textAlignment"	"center"
-			"dulltext"		"0"
-			"brighttext"	"0"
-			"default"		"1"
-			"Command"		"motd_next"
-			"actionsignallevel"	"2"
-
-			"sound_depressed"	"UI/buttonclick.wav"
-			"sound_released"	"UI/buttonclickrelease.wav"
-			"paintbackground" "0"
-
-			"image_drawcolor"	"235 226 202 255"
-			"image_armedcolor"	"White"
-			"SubImage"
-			{
-				"ControlName"	"ImagePanel"
-				"fieldName"		"SubImage"
-				"xpos"			"0"
-				"ypos"			"0"
-				"zpos"			"1"
-				"wide"			"20"
-				"tall"			"20"
-				"visible"		"1"
-				"enabled"		"1"
-				"image"			"blog_forward"
-				"scaleImage"	"1"
-			}
-		}
 	}
 
 	"Notifications_Panel"
 	{
-		"ControlName"	"EditablePanel"
-		"fieldName"		"Notifications_Panel"
 		"xpos"			"r240"
 		"ypos"			"60"
-		"zpos"			"100"
-		"wide"			"210"
-		"tall"			"80"
-		"visible"		"0"
-		"PaintBackgroundType"	"2"
-		"paintbackground"		"1"
-		"border"				"NoBorder"
-		"bgcolor_override"		"DarkGrey"
-
-		"Notifications_CloseButton"
-		{
-			"ControlName"	"CExImageButton"
-			"fieldName"		"Notifications_CloseButton"
-			"xpos"			"186"
-			"ypos"			"8"
-			"zpos"			"10"
-			"wide"			"14"
-			"tall"			"14"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"tabPosition"	"0"
-			"labeltext"		"("
-			"font"			"CustomIcons"
-			"textAlignment"	"center"
-			"dulltext"		"0"
-			"brighttext"	"0"
-			"default"		"0"
-			"actionsignallevel"	"2"
-			"Command"			"noti_hide"
-			"paintbackground"	"0"
-
-			"sound_depressed"	"UI/buttonclick.wav"
-			"sound_released"	"UI/buttonclickrelease.wav"
-
-			"defaultFgColor_override" 	"235 226 202 255"
-			"armedFgColor_override" 	"255 0 0 255"
-			"depressedFgColor_override" "235 226 202 255"
-		}
-
-		"Notifications_TitleLabel"
-		{
-			"ControlName"	"CExLabel"
-			"fieldName"		"Notifications_TitleLabel"
-			"font"			"HudFontSmallBold"
-			"labelText"		"%notititle%"
-			"textAlignment"	"north-west"
-			"xpos"			"12"
-			"ypos"			"8"
-			"wide"			"250"
-			"tall"			"20"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"fgcolor_override"	"TanLight"
-			"wrap"				"1"
-		}
-
-		"Notifications_Scroller"
-		{
-			"ControlName"	"ScrollableEditablePanel"
-			"fieldName"		"Notifications_Scroller"
-			"xpos"			"8"
-			"ypos"			"25"
-			"wide"			"210"
-			"tall"			"135"
-			"PaintBackgroundType"	"2"
-			"fgcolor_override"		"TextColor"
-
-			"Notifications_Control"
-			{
-				"ControlName"	"CMainMenuNotificationsControl"
-				"fieldName"		"Notifications_Control"
-				"xpos"			"0"
-				"ypos"			"0"
-				"wide"			"220"
-				"tall"			"135"
-				"visible"		"1"
-			}
-		}
-	}
-
-	"CompetitiveAccessInfoPanel"
-	{
-		"ControlName"	"CCompetitiveAccessInfoPanel"
-		"fieldName"		"CompetitiveAccessInfoPanel"
-		"xpos"			"cs-0.5"
-		"ypos"			"cs-0.5"
-		"zpos"			"1000"
-		"wide"			"f0"
-		"tall"			"f0"
-		"visible"		"0"
 	}
 
 	"FriendsContainer"
 	{
-		"ControlName"	"EditablePanel"
-		"fieldName"		"FriendsContainer"
 		"xpos"			"80"
 		"ypos"			"285"
-		"zpos"			"5"
 		"wide"			"190"
 		"tall"			"180"
-		"visible"		"1"
-		"border"		"NoBorder"
-		"bgcolor_override"	"Transparent"
-
-		"TitleLabel"
-		{
-			"ControlName"	"CExLabel"
-			"fieldName"		"TitleLabel"
-			"font"			"HudFontSmallBold"
-			"labelText"		"#TF_Competitive_Friends"
-			"textAlignment"	"center"
-			"xpos"			"0"
-			"ypos"			"0"
-			"wide"			"260"
-			"tall"			"20"
-			"visible"		"0"
-			"enabled"		"0"
-			"fgcolor_override"	"TanLight"
-		}
 
 		"InnerShadow"
 		{
-			"ControlName"	"EditablePanel"
-			"fieldName"		"InnerShadow"
 			"xpos"			"cs-0.5"
 			"ypos"			"30"
-			"zpos"			"501"
 			"wide"			"180"
 			"tall"			"180"
-			"visible"		"1"
-			"PaintBackgroundType"	"0"
-			"proportionaltoparent"	"1"
-			"mouseinputenabled"	"0"
-
-			"paintborder"	"1"
-			"border"		"InnerShadowBorder"
 		}
 
 		"SteamFriendsList"
 		{
-			"ControlName"	"CSteamFriendsListPanel"
-			"fieldName"		"SteamFriendsList"
 			"xpos"			"cs-0.5"
 			"ypos"			"30"
 			"zpos"			"500"
 			"wide"			"180"
 			"tall"			"180"
 			"visible"		"1"
-			"proportionaltoparent"	"1"
-
 			"columns_count"	"2"
 			"inset_x"		"10"
 			"inset_y"		"5"
@@ -974,618 +103,95 @@
 				"wide"			"70"
 				"tall"			"20"
 			}
-
-			"ScrollBar"
-			{
-				"ControlName"	"ScrollBar"
-				"FieldName"		"ScrollBar"
-				"xpos"			"rs1-1"
-				"ypos"			"0"
-				"tall"			"f0"
-				"wide"			"5"
-				"zpos"			"1000"
-				"nobuttons"		"1"
-				"proportionaltoparent"	"1"
-
-				"Slider"
-				{
-					"fgcolor_override"	"TanLight"
-				}
-
-				"UpButton"
-				{
-					"ControlName"	"Button"
-					"FieldName"		"UpButton"
-					"visible"		"0"
-				}
-
-				"DownButton"
-				{
-					"ControlName"	"Button"
-					"FieldName"		"DownButton"
-					"visible"		"0"
-				}
-			}
 		}
 
 		"BelowDarken"
 		{
-			"ControlName"	"EditablePanel"
-			"fieldName"		"BelowDarken"
 			"xpos"			"cs-0.5"
 			"ypos"			"30"
-			"zpos"			"499"
 			"wide"			"180"
 			"tall"			"180"
-			"visible"		"1"
-			"PaintBackgroundType"	"0"
-			"proportionaltoparent"	"1"
-			"mouseinputenabled"	"0"
-			"bgcolor_override"	"0 0 0 100"
 		}
 	}
 
 	"CharacterSetupButton"
 	{
-		"ControlName"	"CExImageButton"
-		"fieldName"		"CharacterSetupButton"
 		"xpos"			"90"
-		"ypos"			"75"
-		"zpos"			"11"
+		"ypos"			"85"
 		"wide"			"50"
 		"tall"			"16"
-		"visible"		"1"
-		"enabled"		"1"
-		"labeltext"		"#MMenu_CharacterSetup"
-		"command"		"engine open_charinfo"
-		"font"			"Cerbetica16"
-		"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"
 	}
 
 	"GeneralStoreButton"
 	{
-		"ControlName"	"CExImageButton"
-		"fieldName"		"GeneralStoreButton"
 		"xpos"			"90"
-		"ypos"			"95"
-		"zpos"			"11"
+		"ypos"			"105"
 		"wide"			"100"
 		"tall"			"16"
-		"visible"		"1"
-		"enabled"		"1"
-		"labeltext"		"#StoreTitle"
-		"command" 		"engine open_store"
-		"font"			"Cerbetica16"
-		"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"
 	}
 
 	"SteamWorkshopButton"
 	{
-		"ControlName"	"CExImageButton"
-		"fieldName"		"SteamWorkshopButton"
 		"xpos"			"90"
-		"ypos"			"115"
-		"zpos"			"11"
+		"ypos"			"125"
 		"wide"			"70"
 		"tall"			"16"
-		"visible"		"1"
-		"enabled"		"1"
-		"AllCaps"		"1"
-		"labeltext"		"#MMenu_SteamWorkshop"
-		"command"		"engine OpenSteamWorkshopDialog"
-		"font"			"Cerbetica16"
-		"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"
 	}
 
 	"SettingButton"
 	{
-		"ControlName"	"CExImageButton"
-		"fieldName"		"SettingButton"
 		"xpos"			"90"
-		"ypos"			"135"
-		"zpos"			"11"
+		"ypos"			"145"
 		"wide"			"50"
 		"tall"			"16"
-		"visible"		"1"
-		"enabled"		"1"
-		"AllCaps"		"1"
-		"labeltext"		"#MMenu_Tooltip_Options"
-		"command"		"OpenOptionsDialog"
-		"font"			"Cerbetica16"
-		"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"
 	}
 
 	"AdvSettingsButton"
 	{
-		"ControlName"	"CExImageButton"
-		"fieldName"		"AdvSettingsButton"
 		"xpos"			"90"
-		"ypos"			"155"
-		"zpos"			"11"
+		"ypos"			"165"
 		"wide"			"120"
 		"tall"			"16"
-		"visible"		"1"
-		"enabled"		"1"
-		"AllCaps"		"1"
-		"labeltext"		"#MMenu_Tooltip_AdvOptions"
-		"command"		"OpenTF2Options"
-		"font"			"Cerbetica16"
-		"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"
 	}
 
 	"MinmodeToggle"
 	{
-		"ControlName"	"CExImageButton"
-		"fieldName"		"MinmodeToggle"
 		"xpos"			"90"
-		"ypos"			"175"
-		"zpos"			"11"
+		"ypos"			"185"
 		"wide"			"100"
 		"tall"			"16"
-		"visible"		"1"
-		"enabled"		"1"
-		"AllCaps"		"1"
-		"labeltext"		"MINMODE TOGGLE"
-		"command"		"engine incrementvar cl_hud_minmode 0 1 1"
-		"font"			"Cerbetica16"
-		"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"
 	}
 
 	"AchievementsButton"
 	{
-		"ControlName"	"EditablePanel"
-		"fieldname"		"AchievementsButton"
 		"xpos"			"90"
-		"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"
-			"font"			"CustomIcons"
-			"use_proportional_insets" "1"
-			"textAlignment"	"center"
-			"default"			"1"
-			"actionsignallevel" "2"
-			"paintbackground"	"0"
-			"paintborder"		"0"
-			"sound_depressed"	"UI/buttonclick.wav"
-			"sound_released"	"UI/buttonclickrelease.wav"
-
-			"defaultFgColor_override"	"235 226 202 255"
-			"armedFgColor_override"		"72 255 255 255"
-		}
-	}
-
-	"ConsoleButton"
-	{
-		"ControlName"	"EditablePanel"
-		"fieldname"		"ConsoleButton"
-		"xpos"			"20"
-		"ypos"			"0"
-		"zpos"			"12"
-		"wide"			"20"
-		"tall"			"20"
-		"visible"		"1"
-
-		"pin_to_sibling"			"AchievementsButton"
-		"pin_corner_to_sibling" 	"PIN_TOPRIGHT"
-		"pin_to_sibling_corner" 	"PIN_TOPRIGHT"
-
-		"SubButton"
-		{
-			"ControlName"	"CExImageButton"
-			"fieldName"		"SubButton"
-			"xpos"			"0"
-			"ypos"			"0"
-			"wide"			"20"
-			"tall"			"20"
-			"autoResize"	"0"
-			"pinCorner"		"3"
-			"visible"		"1"
-			"enabled"		"1"
-			"tabPosition"	"0"
-			"font"			"CustomIcons"
-			"use_proportional_insets" "1"
-			"textAlignment"	"center"
-			"default"		"1"
-			"actionsignallevel" "2"
-			"paintbackground"	"0"
-			"paintborder"		"0"
-			"sound_depressed"	"UI/buttonclick.wav"
-			"sound_released"	"UI/buttonclickrelease.wav"
-
-			"defaultFgColor_override"	"235 226 202 255"
-			"armedFgColor_override"		"72 255 255 255"
-		}
-	}
-
-	"ReplayButton"
-	{
-		"ControlName"	"EditablePanel"
-		"fieldname"		"ReplayButton"
-		"xpos"			"20"
-		"ypos"			"0"
-		"zpos"			"12"
-		"wide"			"20"
-		"tall"			"20"
-		"visible"		"1"
-
-		"pin_to_sibling"			"ConsoleButton"
-		"pin_corner_to_sibling" 	"PIN_TOPRIGHT"
-		"pin_to_sibling_corner" 	"PIN_TOPRIGHT"
-
-		"SubButton"
-		{
-			"ControlName"	"CExImageButton"
-			"fieldName"		"SubButton"
-			"xpos"			"0"
-			"ypos"			"0"
-			"wide"			"20"
-			"tall"			"20"
-			"autoResize"	"0"
-			"pinCorner"		"3"
-			"visible"		"1"
-			"enabled"		"1"
-			"tabPosition"	"0"
-			"font"			"CustomIcons"
-			"use_proportional_insets" "1"
-			"textAlignment"	"center"
-			"default"		"1"
-			"actionsignallevel" "2"
-			"paintbackground"	"0"
-			"paintborder"		"0"
-			"sound_depressed"	"UI/buttonclick.wav"
-			"sound_released"	"UI/buttonclickrelease.wav"
-
-			"defaultFgColor_override"	"235 226 202 255"
-			"armedFgColor_override"		"72 255 255 255"
-		}
+		"ypos"			"205"
 	}
-
-	"ReportBugButton"
-	{
-		"ControlName"	"EditablePanel"
-		"fieldname"		"ReportBugButton"
-		"xpos"			"20"
-		"ypos"			"0"
-		"zpos"			"12"
-		"wide"			"20"
-		"tall"			"20"
-		"visible"		"1"
-
-		"pin_to_sibling"			"ReplayButton"
-		"pin_corner_to_sibling" 	"PIN_TOPRIGHT"
-		"pin_to_sibling_corner" 	"PIN_TOPRIGHT"
-
-		"SubButton"
-		{
-			"ControlName"	"CExImageButton"
-			"fieldName"		"SubButton"
-			"xpos"			"0"
-			"ypos"			"0"
-			"wide"			"20"
-			"tall"			"20"
-			"autoResize"	"0"
-			"pinCorner"		"3"
-			"visible"		"1"
-			"enabled"		"1"
-			"tabPosition"	"0"
-			"font"			"CustomIcons"
-			"use_proportional_insets" "1"
-			"textAlignment"	"center"
-			"default"		"1"
-			"actionsignallevel" "2"
-			"paintbackground"	"0"
-			"paintborder"		"0"
-			"sound_depressed"	"UI/buttonclick.wav"
-			"sound_released"	"UI/buttonclickrelease.wav"
-
-			"defaultFgColor_override"	"235 226 202 255"
-			"armedFgColor_override"		"72 255 255 255"
-		}
-	}
-
-	"CoachPlayersButton"
-	{
-		"ControlName"	"EditablePanel"
-		"fieldname"		"CoachPlayersButton"
-		"xpos"			"20"
-		"ypos"			"0"
-		"zpos"			"12"
-		"wide"			"20"
-		"tall"			"20"
-		"visible"		"1"
-
-		"pin_to_sibling"			"ReportBugButton"
-		"pin_corner_to_sibling" 	"PIN_TOPRIGHT"
-		"pin_to_sibling_corner" 	"PIN_TOPRIGHT"
-
-		"SubButton"
-		{
-			"ControlName"	"CExImageButton"
-			"fieldName"		"SubButton"
-			"xpos"			"0"
-			"ypos"			"0"
-			"wide"			"20"
-			"tall"			"20"
-			"autoResize"	"0"
-			"pinCorner"		"3"
-			"visible"		"1"
-			"enabled"		"1"
-			"tabPosition"	"0"
-			"font"			"CustomIcons"
-			"use_proportional_insets" "1"
-			"textAlignment"	"center"
-			"default"		"1"
-			"actionsignallevel" "2"
-			"paintbackground"	"0"
-			"paintborder"		"0"
-			"sound_depressed"	"UI/buttonclick.wav"
-			"sound_released"	"UI/buttonclickrelease.wav"
-
-			"defaultFgColor_override"	"235 226 202 255"
-			"armedFgColor_override"		"72 255 255 255"
-		}
-	}
-
-	"RequestCoachButton"
-	{
-		"ControlName"	"EditablePanel"
-		"fieldname"		"RequestCoachButton"
-		"xpos"			"20"
-		"ypos"			"0"
-		"zpos"			"12"
-		"wide"			"20"
-		"tall"			"20"
-		"visible"		"1"
-
-		"pin_to_sibling"			"CoachPlayersButton"
-		"pin_corner_to_sibling" 	"PIN_TOPRIGHT"
-		"pin_to_sibling_corner" 	"PIN_TOPRIGHT"
-
-		"SubButton"
-		{
-			"ControlName"	"CExImageButton"
-			"fieldName"		"SubButton"
-			"xpos"			"0"
-			"ypos"			"0"
-			"wide"			"20"
-			"tall"			"20"
-			"autoResize"	"0"
-			"pinCorner"		"3"
-			"visible"		"1"
-			"enabled"		"1"
-			"tabPosition"	"0"
-			"font"			"CustomIcons"
-			"use_proportional_insets" "1"
-			"textAlignment"	"center"
-			"default"		"1"
-			"actionsignallevel" "2"
-			"paintbackground"	"0"
-			"paintborder"		"0"
-			"sound_depressed"	"UI/buttonclick.wav"
-			"sound_released"	"UI/buttonclickrelease.wav"
-
-			"defaultFgColor_override"	"235 226 202 255"
-			"armedFgColor_override"		"72 255 255 255"
-		}
-	}
-
-	"CallVoteButton"
-	{
-		"ControlName"	"EditablePanel"
-		"fieldname"		"CallVoteButton"
-		"xpos"			"20"
-		"ypos"			"0"
-		"zpos"			"12"
-		"wide"			"20"
-		"tall"			"20"
-		"visible"		"1"
-
-		"pin_to_sibling"			"RequestCoachButton"
-		"pin_corner_to_sibling" 	"PIN_TOPRIGHT"
-		"pin_to_sibling_corner" 	"PIN_TOPRIGHT"
-
-		"SubButton"
-		{
-			"ControlName"	"CExImageButton"
-			"fieldName"		"SubButton"
-			"xpos"			"0"
-			"ypos"			"0"
-			"wide"			"20"
-			"tall"			"20"
-			"autoResize"	"0"
-			"pinCorner"		"3"
-			"visible"		"1"
-			"enabled"		"1"
-			"tabPosition"	"0"
-			"font"			"CustomIcons"
-			"use_proportional_insets" "1"
-			"textAlignment"	"center"
-			"default"		"1"
-			"actionsignallevel" "2"
-			"paintbackground"	"0"
-			"paintborder"		"0"
-			"sound_depressed"	"UI/buttonclick.wav"
-			"sound_released"	"UI/buttonclickrelease.wav"
-
-			"defaultFgColor_override"	"235 226 202 255"
-			"armedFgColor_override"		"72 255 255 255"
-		}
-	}
-
-	"MutePlayersButton"
-	{
-		"ControlName"	"EditablePanel"
-		"fieldname"		"MutePlayersButton"
-		"xpos"			"20"
-		"ypos"			"0"
-		"zpos"			"12"
-		"wide"			"20"
-		"tall"			"20"
-		"visible"		"1"
-
-		"pin_to_sibling"			"CallVoteButton"
-		"pin_corner_to_sibling" 	"PIN_TOPRIGHT"
-		"pin_to_sibling_corner" 	"PIN_TOPRIGHT"
-
-		"SubButton"
-		{
-			"ControlName"	"CExImageButton"
-			"fieldName"		"SubButton"
-			"xpos"			"0"
-			"ypos"			"0"
-			"wide"			"20"
-			"tall"			"20"
-			"autoResize"	"0"
-			"pinCorner"		"3"
-			"visible"		"1"
-			"enabled"		"1"
-			"tabPosition"	"0"
-			"font"			"CustomIcons"
-			"use_proportional_insets" "1"
-			"textAlignment"	"center"
-			"default"		"1"
-			"actionsignallevel" "2"
-			"paintbackground"	"0"
-			"paintborder"		"0"
-			"sound_depressed"	"UI/buttonclick.wav"
-			"sound_released"	"UI/buttonclickrelease.wav"
-
-			"defaultFgColor_override"	"235 226 202 255"
-			"armedFgColor_override"		"72 255 255 255"
-		}
-	}
-
-	"ReportPlayerButton"
-	{
-		"ControlName"	"EditablePanel"
-		"fieldname"		"ReportPlayerButton"
-		"xpos"			"20"
-		"ypos"			"0"
-		"zpos"			"12"
-		"wide"			"20"
-		"tall"			"20"
-		"visible"		"1"
-
-		"pin_to_sibling"			"MutePlayersButton"
-		"pin_corner_to_sibling" 	"PIN_TOPRIGHT"
-		"pin_to_sibling_corner" 	"PIN_TOPRIGHT"
-
-		"SubButton"
-		{
-			"ControlName"	"CExImageButton"
-			"fieldName"		"SubButton"
-			"xpos"			"0"
-			"ypos"			"0"
-			"wide"			"20"
-			"tall"			"20"
-			"autoResize"	"0"
-			"pinCorner"		"3"
-			"visible"		"1"
-			"enabled"		"1"
-			"tabPosition"	"0"
-			"font"			"CustomIcons"
-			"use_proportional_insets" "1"
-			"textAlignment"	"center"
-			"default"		"1"
-			"actionsignallevel" "2"
-			"paintbackground"	"0"
-			"paintborder"		"0"
-			"sound_depressed"	"UI/buttonclick.wav"
-			"sound_released"	"UI/buttonclickrelease.wav"
-
-			"defaultFgColor_override"	"235 226 202 255"
-			"armedFgColor_override"		"72 255 255 255"
-		}
-	}
-
+	
 	"BGPanel1"
 	{
 		"ControlName"	"EditablePanel"
@@ -1597,7 +203,7 @@
 		"tall"			"f0"
 		"visible"		"1"
 		"enabled"		"1"
-		"bgcolor_override"		"25 25 25 255"
+		"bgcolor_override"		"DarkGrey"
 		"PaintBackgroundType"	"2"
 	}
 
diff --git a/#customizations/scoreboard-minimal.res b/#customizations/scoreboard-minimal.res
index cfde065..b657264 100644
--- a/#customizations/scoreboard-minimal.res
+++ b/#customizations/scoreboard-minimal.res
@@ -1,80 +1,210 @@
 "Resource/UI/Scoreboard.res"
 {
-	"scores"
-	{
-		"medal_width"	"18"
-	}
 	"BlueScoreBG"
 	{
-		"ypos"			"279"
-	}
-	"BlueLeaderAvatar"
-	{
-		"ypos"			"279"
-	}
-	"RedScoreBG"
-	{
-		"ypos"			"279"
-	}
-	"RedLeaderAvatar"
-	{
-		"ypos"			"279"
-	}
-	"ScoreboardBackground"
-	{
-		"ypos"			"304"
-	}
-	"Red6sBackground"
-	{
-		"xpos"			"c65"
-		"ypos"			"265"
-		"zpos"			"240"
-	}
-	"Blue6sBackground"
-	{
-		"xpos"			"c65"
-		"ypos"			"121"
-	}
-	"BlueTeamName"
-	{
-		"ypos"			"279"
-	}
-	"BlueTeamScore"
-	{
-		"ypos"			"278"
-	}
-	"BlueTeamScoreDropshadow"
-	{
 		"ypos"			"280"
 	}
-	"BlueTeamPlayerCount"
-	{
-		"ypos"			"265"
-	}
-	"RedTeamName"
-	{
-		"ypos"			"279"
-	}
-	"RedTeamScore"
-	{
-		"ypos"			"278"
-	}
-	"RedTeamScoreDropshadow"
-	{
-		"ypos"			"280"
-	}
-	"RedTeamPlayerCount"
-	{
-		"ypos"			"265"
-	}
 	"BluePlayerList"
 	{
-		"ypos"			"304"
-		"tall"			"98"
+		"ypos"			"305"
 	}
 	"RedPlayerList"
 	{
-		"ypos"			"304"
-		"tall"			"98"
+		"ypos"			"305"
+	}
+	
+	"ClassImage"
+	{
+		"ControlName"	"ImagePanel"
+		"fieldName"		"ClassImage"
+		"xpos"			"0"
+		"ypos"			"0"
+		"zpos"			"3"
+		"wide"			"92"
+		"tall"			"92"
+		"visible"		"1"
+		"enabled"		"1"
+		"image"			"../hud/class_scoutred"
+		"scaleImage"	"1"
+
+		"pin_to_sibling"		"LocalPlayerStatsPanel"
+		"pin_corner_to_sibling"	"PIN_TOPLEFT"
+		"pin_to_sibling_corner"	"PIN_TOPRIGHT"
+
+		if_mvm
+		{
+			"visible"		"1"
+		}
+	}
+
+	"classmodelpanel"
+	{
+		"ypos"				"50"
+		"pin_to_sibling"		"RedPlayerList"
+		"pin_corner_to_sibling"	"PIN_TOPLEFT"
+		"pin_to_sibling_corner"	"PIN_TOPRIGHT"
+	}
+	
+	"SideBG"
+	{
+		"ControlName"	"EditablePanel"
+		"fieldName"		"SideBG"
+		"xpos"			"5"
+		"ypos"			"285"
+		"zpos"			"0"
+		"wide"			"150"
+		"tall"			"190"
+		"visible"		"1"
+		"enabled"		"1"
+		"bgcolor_override"	"TransparentBlack"
+		"PaintBackgroundType"	"2"
+
+		//"pin_to_sibling"			"BlueScoreBG"
+		//"pin_corner_to_sibling"	"PIN_TOPRIGHT"
+		//"pin_to_sibling_corner"	"PIN_TOPLEFT"
+
+		if_mvm
+		{
+			"visible"	"0"
+		}
+	}
+	
+	"LocalPlayerStatsPanel"
+	{	
+		"ControlName"	"EditablePanel"
+		"fieldName"		"LocalPlayerStatsPanel"
+		"xpos"			"0"
+		"ypos"			"0"
+		"zpos"			"10"
+		"wide"			"150"
+		"tall"			"190"
+		"autoResize"	"0"
+		"pinCorner"		"0"
+		"visible"		"1"
+		"enabled"		"1"
+		"pin_to_sibling"		"SideBG"
+		"pin_corner_to_sibling"	"PIN_TOPLEFT"
+		"pin_to_sibling_corner"	"PIN_TOPLEFT"
+
+		"KillsLabel"
+		{
+			"ControlName"	"CExLabel"
+			"fieldName"		"KillsLabel"
+			"font"			"HudFontGiantBold"
+			"labelText"		":"
+			"textAlignment"	"center"
+			"xpos"			"70"
+			"ypos"			"-10"
+			"zpos"			"3"
+			"wide"			"15"
+			"tall"			"65"
+			"autoResize"	"0"
+			"pinCorner"		"0"
+			"visible"		"1"	
+			"enabled"		"1"
+		}
+
+		"AssistsLabel"
+		{
+			"xpos"			"40"
+			"ypos"			"50"
+		}
+
+		"DestructionLabel"
+		{
+			"xpos"			"9999"
+		}
+
+		"CapturesLabel"
+		{
+			"xpos"			"9999"
+		}
+
+		"DominationLabel"
+		{
+			"xpos"			"9999"
+		}
+
+		"DefensesLabel"
+		{
+			"xpos"			"9999"
+		}
+		
+		"RevengeLabel"
+		{
+			"pin_to_sibling"		"DefensesLabel"
+			"pin_corner_to_sibling"	"PIN_TOPLEFT"
+			"pin_to_sibling_corner"	"PIN_BOTTOMLEFT"
+		}
+		
+		"HealingLabel"
+		{
+			"xpos"			"0"
+			"ypos"			"2"
+
+			"pin_to_sibling"		"AssistsLabel"
+			"pin_corner_to_sibling"	"PIN_TOPLEFT"
+			"pin_to_sibling_corner"	"PIN_BOTTOMLEFT"
+		}
+		
+		"InvulnLabel"
+		{
+			"xpos"			"9999"
+		}
+		
+		"TeleportsLabel"
+		{
+			"xpos"			"0"
+			"ypos"			"2"
+
+			"pin_to_sibling"		"HealingLabel"
+			"pin_corner_to_sibling"	"PIN_TOPLEFT"
+			"pin_to_sibling_corner"	"PIN_BOTTOMLEFT"
+		}
+		
+		"HeadshotsLabel"
+		{
+			"xpos"			"0"
+			"ypos"			"2"
+
+			"pin_to_sibling"		"TeleportsLabel"
+			"pin_corner_to_sibling"	"PIN_TOPLEFT"
+			"pin_to_sibling_corner"	"PIN_BOTTOMLEFT"
+		}
+		
+		"BackstabsLabel"
+		{
+			"xpos"			"0"
+			"ypos"			"2"
+
+			"pin_to_sibling"		"HeadshotsLabel"
+			"pin_corner_to_sibling"	"PIN_TOPLEFT"
+			"pin_to_sibling_corner"	"PIN_BOTTOMLEFT"
+		}
+		
+		"BonusLabel"
+		{
+			"xpos"			"9999"
+		}
+		
+		"SupportLabel"
+		{
+			"xpos"			"0"
+			"ypos"			"2"
+
+			"pin_to_sibling"		"BackstabsLabel"
+			"pin_corner_to_sibling"	"PIN_TOPLEFT"
+			"pin_to_sibling_corner"	"PIN_BOTTOMLEFT"
+		}
+		
+		"DamageLabel"
+		{
+			"xpos"			"0"
+			"ypos"			"2"
+
+			"pin_to_sibling"		"SupportLabel"
+			"pin_corner_to_sibling"	"PIN_TOPLEFT"
+			"pin_to_sibling_corner"	"PIN_BOTTOMLEFT"
+		}
 	}
 }
\ No newline at end of file
diff --git a/#customizations/teammenu-center.res b/#customizations/teammenu-center.res
index 3ffe965..75724be 100644
--- a/#customizations/teammenu-center.res
+++ b/#customizations/teammenu-center.res
@@ -1,168 +1,111 @@
 "Resource/UI/TeamMenu.res"
 {
-	"MainBG"
-	{
-		"fillcolor"		"0 0 0 0"
-	}
 	"SidePanelBG"
 	{
-		"fillcolor"		"0 0 0 0"
-	}
-	"AutojoinBackground"
-	{
-		"xpos"			"c-110"
-		"ypos"			"c-40"
-		"wide"			"220"
-		"tall"			"20"
-	}
-	"SpectateBackground"
-	{
-		"xpos"			"c-110"
-		"ypos"			"c20"
-		"wide"			"220"
-		"tall"			"20"
-	}
-
-	"mapname"
-	{
-		"xpos"			"c-100"
-		"ypos"			"c-100"
-		"wide"			"200"
+		"fillcolor"		"Transparent"
 	}
 
 	"SelectTeamLabel"
 	{
-		"xpos"			"30"
-		"ypos"			"c200"
-		"wide"			"450"
-		"textAlignment"	"west"
+		"xpos"			"0"
+		"wide"			"f0"
 	}
-
-	"SelectTeamLabel"
-	{
-		"visible"		"0"
-	}
-
+	
 	"teambutton0"
 	{
-		"xpos"			"c-110"
-		"ypos"			"c-20"
-		"wide"			"110"
-		"tall"			"40"
-		"textAlignment"	"north"
-		"font"			"Cerbetica16"
-	}
-
-	"BlueTeamBG"
-	{
-		"xpos"			"c-110"
-		"ypos"			"c-20"
-		"wide"			"110"
-		"tall"			"40"
+		"xpos"			"0"
+		"ypos"			"5"
+		"wide"			"127"
+		"tall"			"30"
+		"textAlignment"	"east"
+		"textinsetx"	"15"
+		
+		"pin_to_sibling"			"teambutton2"
+		"pin_corner_to_sibling"		"PIN_TOPLEFT"
+		"pin_to_sibling_corner"		"PIN_BOTTOMLEFT"
 	}
 
 	"teambutton1"
 	{
-		"xpos"			"c0"
-		"ypos"			"c-20"
-		"wide"			"110"
-		"tall"			"40"
-		"textAlignment"	"north"
-		"font"			"Cerbetica16"
-	}
-
-	"RedTeamBG"
-	{
-		"xpos"			"c0"
-		"ypos"			"c-20"
-		"wide"			"110"
-		"tall"			"40"
+		"xpos"			"0"
+		"ypos"			"5"
+		"wide"			"127"
+		"tall"			"30"
+		"textAlignment"	"west"
+		"textinsetx"	"15"
+		
+		"pin_to_sibling"			"teambutton2"
+		"pin_corner_to_sibling"		"PIN_TOPRIGHT"
+		"pin_to_sibling_corner"		"PIN_BOTTOMRIGHT"
 	}
 
 	"teambutton2"
 	{
-		"xpos"			"c-110"
-		"ypos"			"c-40"
-		"wide"			"220"
-		"tall"			"20"
+		"xpos"			"0"
+		"ypos"			"15"
+		"wide"			"255"
+		"tall"			"30"
 		"textAlignment"	"center"
-		"font"			"Cerbetica16"
-	}
-
-	"AutoJoinBG"
-	{
-		"visible"		"0"
-		"enabled"		"0"
+		
+		"pin_to_sibling"			"SelectTeamLabel"
+		"pin_corner_to_sibling"		"PIN_CENTER_TOP"
+		"pin_to_sibling_corner"		"PIN_CENTER_BOTTOM"
 	}
 
 	"teambutton3"
 	{
-		"xpos"			"c-110"
-		"ypos"			"c20"
-		"wide"			"220"
-		"tall"			"20"
+		"xpos"			"0"
+		"ypos"			"5"
+		"zpos"			"1"
+		"wide"			"255"
+		"tall"			"30"
 		"textAlignment"	"center"
-		"font"			"Cerbetica16"
-	}
-
-	"SpectateBG"
-	{
-		"visible"		"0"
-		"enabled"		"0"
+		
+		"pin_to_sibling"			"teambutton0"
+		"pin_corner_to_sibling"		"PIN_TOPLEFT"
+		"pin_to_sibling_corner"		"PIN_BOTTOMLEFT"
 	}
 
 	"BlueCount"
 	{
-		"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-60"
-		"ypos"			"c-15"
-		"zpos"			"1"
-		"wide"			"55"
-		"tall"			"40"
+		"fieldName"		"BlueCount"
+		"xpos"			"0"
+		"ypos"			"0"
+		"zpos"			"2"
+		"zpos"			"3"
+		"wide"			"20"
+		"tall"			"30"
+		"autoResize"	"0"
+		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
-		"labelText"		"players"
-		"textAlignment"	"west"
-		"font"			"HudFontSmall"
-		"fgcolor"		"255 255 255 175"
+		"labelText"		"%bluecount%"
+		"textAlignment"	"east"
+		
+		"pin_to_sibling"		"teambutton0"
+		"pin_corner_to_sibling"	"PIN_TOPLEFT"
+		"pin_to_sibling_corner"	"PIN_TOPLEFT"
 	}
 
 	"RedCount"
 	{
-		"xpos"			"c0"
-		"ypos"			"c-15"
-		"wide"			"43"
-		"tall"			"40"
-		"labelText"		"%redcount%"
-		"font"			"HudFontSmall"
-		"textAlignment"	"east"
-		"fgcolor"		"255 255 255 175"
-	}
-	"RedCountPlayers"
-	{
 		"ControlName"	"CExLabel"
-		"fieldName"		"RedCountPlayers"
-		"xpos"			"c50"
-		"ypos"			"c-15"
-		"zpos"			"1"
-		"wide"			"55"
-		"tall"			"40"
+		"fieldName"		"RedCount"
+		"xpos"			"0"
+		"ypos"			"0"
+		"zpos"			"3"
+		"wide"			"20"
+		"tall"			"30"
+		"autoResize"	"0"
+		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
-		"labelText"		"players"
+		"labelText"		"%redcount%"
 		"textAlignment"	"west"
-		"font"			"HudFontSmall"
-		"fgcolor"		"255 255 255 175"
+		
+		"pin_to_sibling"		"teambutton1"
+		"pin_corner_to_sibling"	"PIN_TOPRIGHT"
+		"pin_to_sibling_corner"	"PIN_TOPRIGHT"
 	}
 }
\ No newline at end of file