Merge pull request #160 from raysfire/dev

v2020.1230

5 files changed, 584 insertions, 987 deletions

diff --git a/customizations/main_menu/mainmenuoverride-classic.res b/customizations/main_menu/mainmenuoverride-classic.res
index 4e80008..8bfb28b 100644
--- a/customizations/main_menu/mainmenuoverride-classic.res
+++ b/customizations/main_menu/mainmenuoverride-classic.res
@@ -17,6 +17,7 @@
 		"button_x_offset"	"-285"
 		"button_y"			"120"
 		"button_y_delta"	"5"
+		
 		"button_kv"
 		{
 			"xpos"			"0"
@@ -55,24 +56,6 @@
 				"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"
-				"image_depressedcolor" "72 255 255 255"
-
-				"SubImage"
-				{
-					"ControlName"	"ImagePanel"
-					"fieldName"		"SubImage"
-					"xpos"			"6"
-					"ypos"			"6"
-					"zpos"			"1"
-					"wide"			"14"
-					"tall"			"14"
-					"visible"		"1"
-					"enabled"		"1"
-					"scaleImage"	"1"
-				}
 			}
 		}
 
@@ -163,17 +146,30 @@
 
 	"Background"
 	{
-		"ControlName"	"ImagePanel"
+		"ControlName"	"ScalableImagePanel"
 		"fieldName"		"Background"
-		"xpos"			"0"
+		"xpos"			"cs-0.5"
 		"ypos"			"0"
 		"zpos"			"-200"
-		"wide"			"0"
-		"tall"			"0"
+		"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"
+		}
 	}
 
 	"TFLogoImage"
@@ -235,45 +231,22 @@
 		"visible"		"1"
 		"enabled"		"1"
 		"tabPosition"	"0"
-		"textinsetx"	"25"
-		"labelText"		""
-		"use_proportional_insets" "1"
-		"font"			"HudFontSmallBold"
-		"command"		"open_rank_type_menu"
-		"textAlignment"	"west"
+		"labelText"		"v"
+		"font"			"CustomIcons"
+		"textAlignment"	"center"
 		"dulltext"		"0"
 		"brighttext"	"0"
 		"default"		"1"
-		"sound_depressed"	"UI/buttonclick.wav"
-		"sound_released"	"vo/null.mp3"
 		"actionsignallevel" "1"
-		"proportionaltoparent"	"1"
-
+		"command"			"open_rank_type_menu"
+		"paintbackground"	"0"
+		
 		"sound_depressed"	"UI/buttonclick.wav"
 		"sound_released"	"UI/buttonclickrelease.wav"
-		"paintbackground"	"0"
-		"paintborder"		"0"
-		"image_drawcolor"	"235 226 202 255"
-		"image_armedcolor"	"72 255 255 255"
-
-		"SubImage"
-		{
-			"ControlName"	"ImagePanel"
-			"fieldName"		"SubImage"
-			"xpos"			"cs-0.5"
-			"ypos"			"cs-0.5"
-			"zpos"			"1"
-			"wide"			"f2"
-			"tall"			"f2"
-			"visible"		"1"
-			"enabled"		"1"
-			"scaleImage"	"1"
-			"image"			"glyph_options"
-
-			"proportionaltoparent"	"1"
-			"mouseinputenabled"	"0"
-			"keyboardinputenabled" "0"
-		}
+		
+		"defaultFgColor_override" 	"TanLight"
+		"armedFgColor_override" 	"ColorCyan"
+		"depressedFgColor_override" "TanLight"
 	}
 
 	"RankTooltipPanel"
@@ -301,7 +274,7 @@
 		"ypos"			"250"
 		"zpos"			"0"
 		"wide"			"170"
-		"tall"			"60"
+		"tall"			"56"
 		"visible"		"1"
 		"proportionaltoparent"	"1"
 		"mouseinputenabled"	"0"
@@ -327,7 +300,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"
@@ -465,70 +438,58 @@
 		}
 	}
 
-	"WatchStreamButton"
+	"QuestLogButton"
 	{
-		"ControlName"	"CExImageButton"
-		"fieldName"		"WatchStreamButton"
-		"xpos"			"r28"
+		"ControlName"	"EditablePanel"
+		"fieldName"		"QuestLogButton"
+		"xpos"			"rs1-10"
 		"ypos"			"65"
-		"zpos"			"0"
+		"zpos"			"1"
 		"wide"			"20"
 		"tall"			"20"
 		"autoResize"	"0"
-		"pinCorner"		"0"
+		"pinCorner"		"3"
 		"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"
 
-		"SubImage"
+		"SubButton"
 		{
-			"ControlName"	"ImagePanel"
-			"fieldName"		"SubImage"
-			"xpos"			"2"
-			"ypos"			"2"
-			"zpos"			"1"
-			"wide"			"18"
-			"tall"			"18"
-			"visible"		"1"
-			"enabled"		"1"
-			"scaleImage"	"1"
+			"ControlName"		"CExImageButton"
+			"fieldName"			"SubButton"
+			"xpos"				"0"
+			"ypos"				"0"
+			"wide"				"20"
+			"tall"				"20"
+			"autoResize"		"0"
+			"pinCorner"			"3"
+			"visible"			"1"
+			"enabled"			"1"
+			"tabPosition"		"0"
+			"labelText"			"r"
+			"font"				"CustomIcons"
+			"command"			"questlog"
 			"proportionaltoparent"	"1"
-			"image"			"icon_resume"
-			"drawcolor_override" "235 226 202 255"
-		}
-	}
+			"textAlignment"		"center"
+			"default"			"1"
+			"actionsignallevel" "2"
+			"paintbackground"	"0"
+			"paintborder"		"0"
+			"sound_depressed"	"UI/buttonclick.wav"
+			"sound_released"	"UI/buttonclickrelease.wav"
 
-	"StreamListPanel"
-	{
-		"ControlName"	"CTFStreamListPanel"
-		"fieldName"		"StreamListPanel"
-		"xpos"			"r330"
-		"ypos"			"65"
-		"zpos"			"1"
-		"wide"			"300"
-		"tall"			"325"
-		"visible"		"0"
-		"PaintBackgroundType"	"0"
-		"paintbackground"		"2"
-		"bgcolor_override"		"DarkGrey"
+			"defaultFgColor_override"	"235 226 202 255"
+			"armedFgColor_override"		"72 255 255 255"
+		}
 	}
 
-	"QuestLogButton"
+	"MOTD_ShowButtonPanel"
 	{
 		"ControlName"	"EditablePanel"
-		"fieldName"		"QuestLogButton"
-		"xpos"			"r28"
+		"fieldName"		"MOTD_ShowButtonPanel"
+		"xpos"			"rs1-10"
 		"ypos"			"90"
-		"zpos"			"1"
+		"zpos"			"0"
 		"wide"			"20"
 		"tall"			"20"
 		"autoResize"	"0"
@@ -539,23 +500,23 @@
 
 		"SubButton"
 		{
-			"ControlName"	"CExImageButton"
-			"fieldName"		"SubButton"
-			"xpos"			"0"
-			"ypos"			"0"
-			"wide"			"20"
-			"tall"			"20"
-			"autoResize"	"0"
-			"pinCorner"		"3"
-			"visible"		"1"
-			"enabled"		"1"
-			"tabPosition"	"0"
-			"labelText"		"x"
-			"font"			"CustomIcons"
-			"command"		"questlog"
-			"proportionaltoparent"	"1"
-			"textAlignment"	"center"
-			"default"		"1"
+			"ControlName"		"CExImageButton"
+			"fieldName"			"SubButton"
+			"xpos"				"0"
+			"ypos"				"0"
+			"wide"				"20"
+			"tall"				"20"
+			"autoResize"		"0"
+			"pinCorner"			"3"
+			"visible"			"1"
+			"enabled"			"1"
+			"tabPosition"		"0"
+			"labelText"			"o"
+			"font"				"CustomIcons"
+			"command"			"motd_show"
+			"use_proportional_insets" "1"
+			"textAlignment"		"center"
+			"default"			"1"
 			"actionsignallevel" "2"
 			"paintbackground"	"0"
 			"paintborder"		"0"
@@ -567,40 +528,34 @@
 		}
 	}
 
-	"MOTD_ShowButtonPanel"
+	"RefreshHUDButton"
 	{
 		"ControlName"	"EditablePanel"
-		"fieldName"		"MOTD_ShowButtonPanel"
-		"xpos"			"r28"
+		"fieldName"		"RefreshHUDButton"
+		"xpos"			"rs1-09"
 		"ypos"			"115"
-		"zpos"			"0"
+		"zpos"			"1"
 		"wide"			"20"
 		"tall"			"20"
-		"autoResize"	"0"
-		"pinCorner"		"3"
 		"visible"		"1"
-		"enabled"		"1"
-		"tabPosition"	"0"
-
-		"MOTD_ShowButtonPanel_SB"
+		
+		"SubButton"
 		{
-			"ControlName"	"CExImageButton"
-			"fieldName"		"MOTD_ShowButtonPanel_SB"
-			"xpos"			"0"
-			"ypos"			"0"
-			"wide"			"20"
-			"tall"			"20"
-			"autoResize"	"0"
-			"pinCorner"		"3"
-			"visible"		"1"
-			"enabled"		"1"
-			"tabPosition"	"0"
-			"labelText"		"o"
-			"font"			"CustomIcons"
-			"command"		"motd_show"
+			"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"
+			"textAlignment"		"center"
+			"default"			"1"
 			"actionsignallevel" "2"
 			"paintbackground"	"0"
 			"paintborder"		"0"
@@ -672,42 +627,22 @@
 			"visible"		"1"
 			"enabled"		"1"
 			"tabPosition"	"0"
-			"labeltext"		""
-			"font"			""
+			"labeltext"		"("
+			"font"			"CustomIcons"
 			"textAlignment"	"center"
 			"dulltext"		"0"
 			"brighttext"	"0"
 			"default"		"0"
 			"actionsignallevel"	"2"
-
-			"sound_depressed"	"UI/buttonclick.wav"
-			"sound_released"	"UI/buttonclickrelease.wav"
 			"Command"			"motd_hide"
 			"paintbackground"	"0"
-
-			//"defaultFgColor_override" "TanLight"
-			//"armedFgColor_override" "TanDarker"
-			"defaultFgColor_override" "Blank"
-			"armedFgColor_override" "Blank"
-			"depressedFgColor_override" "Blank"
-
-			"image_drawcolor"	"TanLight"
-			"image_armedcolor"	"255 0 0 255"
-
-			"SubImage"
-			{
-				"ControlName"	"ImagePanel"
-				"fieldName"		"SubImage"
-				"xpos"			"0"
-				"ypos"			"0"
-				"zpos"			"1"
-				"wide"			"14"
-				"tall"			"14"
-				"visible"		"1"
-				"enabled"		"1"
-				"image"			"replay/thumbnails/close"
-				"scaleImage"	"1"
-			}
+			
+			"sound_depressed"	"UI/buttonclick.wav"
+			"sound_released"	"UI/buttonclickrelease.wav"
+			
+			"defaultFgColor_override" 	"TanLight"
+			"armedFgColor_override" 	"255 0 0 255"
+			"depressedFgColor_override" "TanLight"
 		}
 
 		"MOTD_HeaderIcon"
@@ -729,7 +664,7 @@
 		{
 			"ControlName"	"CExLabel"
 			"fieldName"		"MOTD_TitleLabel"
-			"font"			"FontRegular14"
+			"font"			"HudFontSmall"
 			"labelText"		"%motdtitle%"
 			"textAlignment"	"west"
 			"xpos"			"10"
@@ -748,7 +683,7 @@
 		{
 			"ControlName"	"CExLabel"
 			"fieldName"		"MOTD_Label"
-			"font"			"FontRegular12"
+			"font"			"HudFontSmallest"
 			"labelText"		"%motddate%"
 			"textAlignment"	"north-west"
 			"xpos"			"10"
@@ -832,7 +767,7 @@
 				{
 					"ControlName"	"CExLabel"
 					"fieldName"		"MOTD_TextLabel"
-					"font"			"FontRegular12"
+					"font"			"HudFontSmallest"
 					"labelText"		"%motdtext%"
 					"textAlignment"	"north-west"
 					"xpos"			"0"
@@ -899,7 +834,7 @@
 			"enabled"		"1"
 			"tabPosition"	"0"
 			"labelText"		""
-			"font"			"FontRegular12"
+			"font"			"HudFontSmallest"
 			"textAlignment"	"center"
 			"dulltext"		"0"
 			"brighttext"	"0"
@@ -944,7 +879,7 @@
 			"enabled"		"1"
 			"tabPosition"	"0"
 			"labelText"		""
-			"font"			"FontRegular12"
+			"font"			"HudFontSmallest"
 			"textAlignment"	"center"
 			"dulltext"		"0"
 			"brighttext"	"0"
@@ -981,7 +916,7 @@
 		"fieldName"		"Notifications_Panel"
 		"xpos"			"r240"
 		"ypos"			"60"
-		"zpos"			"1"
+		"zpos"			"100"
 		"wide"			"210"
 		"tall"			"80"
 		"visible"		"0"
@@ -1004,39 +939,22 @@
 			"visible"		"1"
 			"enabled"		"1"
 			"tabPosition"	"0"
-			"labeltext"		""
-			"font"			"HudFontSmallBold"
+			"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"
-			"paintbackground"	"0"
-
-			"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"			"255 0 0 255"
-
-			"SubImage"
-			{
-				"ControlName"	"ImagePanel"
-				"fieldName"		"SubImage"
-				"xpos"			"0"
-				"ypos"			"0"
-				"zpos"			"1"
-				"wide"			"14"
-				"tall"			"14"
-				"visible"		"1"
-				"enabled"		"1"
-				"image"			"replay/thumbnails/close"
-				"scaleImage"	"1"
-			}
+			
+			"defaultFgColor_override" 	"235 226 202 255"
+			"armedFgColor_override" 	"255 0 0 255"
+			"depressedFgColor_override" "235 226 202 255"
 		}
 
 		"Notifications_TitleLabel"
@@ -1097,14 +1015,14 @@
 	"FriendsContainer"
 	{
 		"ControlName"	"EditablePanel"
-		"fieldname"		"FriendsContainer"
+		"fieldName"		"FriendsContainer"
 		"xpos"			"80"
 		"ypos"			"285"
 		"zpos"			"5"
 		"wide"			"190"
 		"tall"			"180"
 		"visible"		"1"
-		"border"			"NoBorder"
+		"border"		"NoBorder"
 		"bgcolor_override"	"Transparent"
 
 		"TitleLabel"
@@ -1126,7 +1044,7 @@
 		"InnerShadow"
 		{
 			"ControlName"	"EditablePanel"
-			"fieldname"		"InnerShadow"
+			"fieldName"		"InnerShadow"
 			"xpos"			"cs-0.5"
 			"ypos"			"30"
 			"zpos"			"501"
@@ -1144,7 +1062,7 @@
 		"SteamFriendsList"
 		{
 			"ControlName"	"CSteamFriendsListPanel"
-			"fieldname"		"SteamFriendsList"
+			"fieldName"		"SteamFriendsList"
 			"xpos"			"cs-0.5"
 			"ypos"			"30"
 			"zpos"			"500"
@@ -1202,7 +1120,7 @@
 		"BelowDarken"
 		{
 			"ControlName"	"EditablePanel"
-			"fieldname"		"BelowDarken"
+			"fieldName"		"BelowDarken"
 			"xpos"			"cs-0.5"
 			"ypos"			"30"
 			"zpos"			"499"
@@ -1221,7 +1139,7 @@
 		"ControlName"	"CExLabel"
 		"fieldName"		"VersionLabel"
 		"font"			"HudFontSmall"
-		"labelText"		"v2020.0808"
+		"labelText"		"v2020.1230"
 		"xpos"			"r135"
 		"ypos"			"r15"
 		"wide"			"130"
@@ -1237,7 +1155,7 @@
 	"CharacterSetupButton"
 	{
 		"ControlName"	"CExImageButton"
-		"fieldname"		"CharacterSetupButton"
+		"fieldName"		"CharacterSetupButton"
 		"xpos"			"90"
 		"ypos"			"75"
 		"zpos"			"11"
@@ -1266,7 +1184,7 @@
 	"GeneralStoreButton"
 	{
 		"ControlName"	"CExImageButton"
-		"fieldname"		"GeneralStoreButton"
+		"fieldName"		"GeneralStoreButton"
 		"xpos"			"90"
 		"ypos"			"95"
 		"zpos"			"11"
@@ -1295,7 +1213,7 @@
 	"SteamWorkshopButton"
 	{
 		"ControlName"	"CExImageButton"
-		"fieldname"		"SteamWorkshopButton"
+		"fieldName"		"SteamWorkshopButton"
 		"xpos"			"90"
 		"ypos"			"115"
 		"zpos"			"11"
@@ -1436,37 +1354,18 @@
 			"visible"		"1"
 			"enabled"		"1"
 			"tabPosition"	"0"
-			"textinsetx"	"0"
-			"font"			"FontRegular20"
+			"font"			"CustomIcons"
 			"use_proportional_insets" "1"
 			"textAlignment"	"center"
-			"dulltext"		"0"
-			"brighttext"	"0"
-			"default"		"1"
-
+			"default"			"1"
+			"actionsignallevel" "2"
+			"paintbackground"	"0"
+			"paintborder"		"0"
 			"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"
-			}
+			"defaultFgColor_override"	"235 226 202 255"
+			"armedFgColor_override"		"72 255 255 255"
 		}
 	}
 
@@ -1474,13 +1373,17 @@
 	{
 		"ControlName"	"EditablePanel"
 		"fieldname"		"ConsoleButton"
-		"xpos"			"110"
-		"ypos"			"200"
+		"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"
@@ -1494,37 +1397,18 @@
 			"visible"		"1"
 			"enabled"		"1"
 			"tabPosition"	"0"
-			"textinsetx"	"0"
-			"font"			"FontRegular20"
+			"font"			"CustomIcons"
 			"use_proportional_insets" "1"
 			"textAlignment"	"center"
-			"dulltext"		"0"
-			"brighttext"	"0"
 			"default"		"1"
-
+			"actionsignallevel" "2"
+			"paintbackground"	"0"
+			"paintborder"		"0"
 			"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"
-			}
+			"defaultFgColor_override"	"235 226 202 255"
+			"armedFgColor_override"		"72 255 255 255"
 		}
 	}
 
@@ -1532,13 +1416,17 @@
 	{
 		"ControlName"	"EditablePanel"
 		"fieldname"		"ReplayButton"
-		"xpos"			"130"
-		"ypos"			"200"
+		"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"
@@ -1552,37 +1440,18 @@
 			"visible"		"1"
 			"enabled"		"1"
 			"tabPosition"	"0"
-			"textinsetx"	"0"
-			"font"			"HudFontMediumSecondary"
+			"font"			"CustomIcons"
 			"use_proportional_insets" "1"
 			"textAlignment"	"center"
-			"dulltext"		"0"
-			"brighttext"	"0"
 			"default"		"1"
-
+			"actionsignallevel" "2"
+			"paintbackground"	"0"
+			"paintborder"		"0"
 			"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"
-			}
+			"defaultFgColor_override"	"235 226 202 255"
+			"armedFgColor_override"		"72 255 255 255"
 		}
 	}
 
@@ -1590,13 +1459,17 @@
 	{
 		"ControlName"	"EditablePanel"
 		"fieldname"		"ReportBugButton"
-		"xpos"			"150"
-		"ypos"			"200"
+		"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"
@@ -1610,37 +1483,18 @@
 			"visible"		"1"
 			"enabled"		"1"
 			"tabPosition"	"0"
-			"textinsetx"	"0"
-			"font"			"FontRegular20"
+			"font"			"CustomIcons"
 			"use_proportional_insets" "1"
 			"textAlignment"	"center"
-			"dulltext"		"0"
-			"brighttext"	"0"
 			"default"		"1"
-
+			"actionsignallevel" "2"
+			"paintbackground"	"0"
+			"paintborder"		"0"
 			"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"
-			}
+			"defaultFgColor_override"	"235 226 202 255"
+			"armedFgColor_override"		"72 255 255 255"
 		}
 	}
 
@@ -1648,13 +1502,17 @@
 	{
 		"ControlName"	"EditablePanel"
 		"fieldname"		"CoachPlayersButton"
-		"xpos"			"170"
-		"ypos"			"200"
+		"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"
@@ -1668,37 +1526,18 @@
 			"visible"		"1"
 			"enabled"		"1"
 			"tabPosition"	"0"
-			"textinsetx"	"0"
-			"font"			"HudFontMediumSecondary"
+			"font"			"CustomIcons"
 			"use_proportional_insets" "1"
 			"textAlignment"	"center"
-			"dulltext"		"0"
-			"brighttext"	"0"
 			"default"		"1"
-
+			"actionsignallevel" "2"
+			"paintbackground"	"0"
+			"paintborder"		"0"
 			"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"
-			}
+			"defaultFgColor_override"	"235 226 202 255"
+			"armedFgColor_override"		"72 255 255 255"
 		}
 	}
 
@@ -1706,13 +1545,17 @@
 	{
 		"ControlName"	"EditablePanel"
 		"fieldname"		"RequestCoachButton"
-		"xpos"			"190"
-		"ypos"			"200"
+		"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"
@@ -1726,37 +1569,18 @@
 			"visible"		"1"
 			"enabled"		"1"
 			"tabPosition"	"0"
-			"textinsetx"	"0"
-			"font"			"FontRegular20"
+			"font"			"CustomIcons"
 			"use_proportional_insets" "1"
 			"textAlignment"	"center"
-			"dulltext"		"0"
-			"brighttext"	"0"
 			"default"		"1"
-
+			"actionsignallevel" "2"
+			"paintbackground"	"0"
+			"paintborder"		"0"
 			"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"
-			}
+			"defaultFgColor_override"	"235 226 202 255"
+			"armedFgColor_override"		"72 255 255 255"
 		}
 	}
 
@@ -1764,13 +1588,17 @@
 	{
 		"ControlName"	"EditablePanel"
 		"fieldname"		"CallVoteButton"
-		"xpos"			"210"
-		"ypos"			"200"
+		"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"
@@ -1784,37 +1612,18 @@
 			"visible"		"1"
 			"enabled"		"1"
 			"tabPosition"	"0"
-			"textinsetx"	"0"
-			"font"			"FontRegular20"
+			"font"			"CustomIcons"
 			"use_proportional_insets" "1"
 			"textAlignment"	"center"
-			"dulltext"		"0"
-			"brighttext"	"0"
 			"default"		"1"
-
+			"actionsignallevel" "2"
+			"paintbackground"	"0"
+			"paintborder"		"0"
 			"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"
-			}
+			"defaultFgColor_override"	"235 226 202 255"
+			"armedFgColor_override"		"72 255 255 255"
 		}
 	}
 
@@ -1822,13 +1631,17 @@
 	{
 		"ControlName"	"EditablePanel"
 		"fieldname"		"MutePlayersButton"
-		"xpos"			"230"
-		"ypos"			"200"
+		"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"
@@ -1842,37 +1655,18 @@
 			"visible"		"1"
 			"enabled"		"1"
 			"tabPosition"	"0"
-			"textinsetx"	"0"
-			"font"			"FontRegular20"
+			"font"			"CustomIcons"
 			"use_proportional_insets" "1"
 			"textAlignment"	"center"
-			"dulltext"		"0"
-			"brighttext"	"0"
 			"default"		"1"
-
+			"actionsignallevel" "2"
+			"paintbackground"	"0"
+			"paintborder"		"0"
 			"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"
-			}
+			"defaultFgColor_override"	"235 226 202 255"
+			"armedFgColor_override"		"72 255 255 255"
 		}
 	}
 
@@ -1880,13 +1674,17 @@
 	{
 		"ControlName"	"EditablePanel"
 		"fieldname"		"ReportPlayerButton"
-		"xpos"			"250"
-		"ypos"			"200"
+		"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"
@@ -1900,37 +1698,18 @@
 			"visible"		"1"
 			"enabled"		"1"
 			"tabPosition"	"0"
-			"textinsetx"	"0"
-			"font"			"FontRegular20"
+			"font"			"CustomIcons"
 			"use_proportional_insets" "1"
 			"textAlignment"	"center"
-			"dulltext"		"0"
-			"brighttext"	"0"
 			"default"		"1"
-
+			"actionsignallevel" "2"
+			"paintbackground"	"0"
+			"paintborder"		"0"
 			"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"
-			}
+			"defaultFgColor_override"	"235 226 202 255"
+			"armedFgColor_override"		"72 255 255 255"
 		}
 	}
 
@@ -1963,32 +1742,4 @@
 		"bgcolor_override"		"ColorCyan"
 		"PaintBackgroundType"	"2"
 	}
-
-	"icon_generator"
-	{
-		"ControlName"	"CEmbeddedItemModelPanel"
-		"fieldName"		"icon_generator"
-		"xpos"			"0"
-		"ypos"			"0"
-		"zpos"			"1"
-		"wide"			"300"
-		"tall"			"300"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"1"
-		"enabled"		"1"
-		"useparentbg"	"1"
-		"inset_eq_x"	"2"
-		"inset_eq_y"	"2"
-		"fov"			"54"
-		"start_framed"	"1"
-		"disable_manipulation"	"1"
-
-		"model"
-		{
-			"angles_x"		"10"
-			"angles_y"		"130"
-			"angles_z"		"0"
-		}
-	}
 }
\ No newline at end of file
diff --git a/customizations/main_menu/mainmenuoverride.res b/customizations/main_menu/mainmenuoverride.res
index d17f3c3..a29766d 100644
--- a/customizations/main_menu/mainmenuoverride.res
+++ b/customizations/main_menu/mainmenuoverride.res
@@ -17,6 +17,7 @@
 		"button_x_offset"	"-285"
 		"button_y"			"120"
 		"button_y_delta"	"5"
+		
 		"button_kv"
 		{
 			"xpos"			"0"
@@ -55,24 +56,6 @@
 				"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"
-				"image_depressedcolor" "72 255 255 255"
-
-				"SubImage"
-				{
-					"ControlName"	"ImagePanel"
-					"fieldName"		"SubImage"
-					"xpos"			"6"
-					"ypos"			"6"
-					"zpos"			"1"
-					"wide"			"14"
-					"tall"			"14"
-					"visible"		"1"
-					"enabled"		"1"
-					"scaleImage"	"1"
-				}
 			}
 		}
 
@@ -163,17 +146,30 @@
 
 	"Background"
 	{
-		"ControlName"	"ImagePanel"
+		"ControlName"	"ScalableImagePanel"
 		"fieldName"		"Background"
-		"xpos"			"0"
+		"xpos"			"cs-0.5"
 		"ypos"			"0"
 		"zpos"			"-200"
-		"wide"			"0"
-		"tall"			"0"
+		"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"
@@ -208,21 +204,6 @@
 
 		"image_drawcolor"	"235 226 202 255"
 		"image_armedcolor"	"72 255 255 255"
-
-		"SubImage"
-		{
-			"ControlName"	"ImagePanel"
-			"fieldName"		"SubImage"
-			"xpos"			"16"
-			"ypos"			"6"
-			"zpos"			"1"
-			"wide"			"0"
-			"tall"			"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"scaleImage"	"1"
-			"image"			"glyph_quit"
-		}
 	}
 
 	"TFLogoImage"
@@ -276,7 +257,6 @@
 		"fieldName"		"CycleRankTypeButton"
 		"xpos"			"270"
 		"ypos"			"cs-0.5-33"
-		"zpos"			"1"
 		"wide"			"15"
 		"tall"			"15"
 		"autoResize"	"0"
@@ -284,45 +264,22 @@
 		"visible"		"1"
 		"enabled"		"1"
 		"tabPosition"	"0"
-		"textinsetx"	"25"
-		"labelText"		""
-		"use_proportional_insets" "1"
-		"font"			"HudFontSmallBold"
-		"command"		"open_rank_type_menu"
-		"textAlignment"	"west"
+		"labelText"		"v"
+		"font"			"CustomIcons"
+		"textAlignment"	"center"
 		"dulltext"		"0"
 		"brighttext"	"0"
 		"default"		"1"
-		"sound_depressed"	"UI/buttonclick.wav"
-		"sound_released"	"vo/null.mp3"
 		"actionsignallevel" "1"
-		"proportionaltoparent"	"1"
-
+		"command"			"open_rank_type_menu"
+		"paintbackground"	"0"
+		
 		"sound_depressed"	"UI/buttonclick.wav"
 		"sound_released"	"UI/buttonclickrelease.wav"
-		"paintbackground"	"0"
-		"paintborder"		"0"
-		"image_drawcolor"	"235 226 202 255"
-		"image_armedcolor"	"72 255 255 255"
-
-		"SubImage"
-		{
-			"ControlName"	"ImagePanel"
-			"fieldName"		"SubImage"
-			"xpos"			"cs-0.5"
-			"ypos"			"cs-0.5"
-			"zpos"			"1"
-			"wide"			"f2"
-			"tall"			"f2"
-			"visible"		"1"
-			"enabled"		"1"
-			"scaleImage"	"1"
-			"image"			"glyph_options"
-
-			"proportionaltoparent"	"1"
-			"mouseinputenabled"	"0"
-			"keyboardinputenabled" "0"
-		}
+		
+		"defaultFgColor_override" 	"235 226 202 255"
+		"armedFgColor_override" 	"72 255 255 255"
+		"depressedFgColor_override" "235 226 202 255"
 	}
 
 	"RankTooltipPanel"
@@ -514,70 +471,58 @@
 		}
 	}
 
-	"WatchStreamButton"
+	"QuestLogButton"
 	{
-		"ControlName"	"CExImageButton"
-		"fieldName"		"WatchStreamButton"
-		"xpos"			"r28"
+		"ControlName"	"EditablePanel"
+		"fieldName"		"QuestLogButton"
+		"xpos"			"rs1-10"
 		"ypos"			"65"
-		"zpos"			"0"
+		"zpos"			"1"
 		"wide"			"20"
 		"tall"			"20"
 		"autoResize"	"0"
-		"pinCorner"		"0"
+		"pinCorner"		"3"
 		"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"
 
-		"SubImage"
+		"SubButton"
 		{
-			"ControlName"	"ImagePanel"
-			"fieldName"		"SubImage"
-			"xpos"			"2"
-			"ypos"			"2"
-			"zpos"			"1"
-			"wide"			"18"
-			"tall"			"18"
-			"visible"		"1"
-			"enabled"		"1"
-			"scaleImage"	"1"
+			"ControlName"		"CExImageButton"
+			"fieldName"			"SubButton"
+			"xpos"				"0"
+			"ypos"				"0"
+			"wide"				"20"
+			"tall"				"20"
+			"autoResize"		"0"
+			"pinCorner"			"3"
+			"visible"			"1"
+			"enabled"			"1"
+			"tabPosition"		"0"
+			"labelText"			"r"
+			"font"				"CustomIcons"
+			"command"			"questlog"
 			"proportionaltoparent"	"1"
-			"image"			"icon_resume"
-			"drawcolor_override" "235 226 202 255"
-		}
-	}
+			"textAlignment"		"center"
+			"default"			"1"
+			"actionsignallevel" "2"
+			"paintbackground"	"0"
+			"paintborder"		"0"
+			"sound_depressed"	"UI/buttonclick.wav"
+			"sound_released"	"UI/buttonclickrelease.wav"
 
-	"StreamListPanel"
-	{
-		"ControlName"	"CTFStreamListPanel"
-		"fieldName"		"StreamListPanel"
-		"xpos"			"r330"
-		"ypos"			"65"
-		"zpos"			"1"
-		"wide"			"300"
-		"tall"			"325"
-		"visible"		"0"
-		"PaintBackgroundType"	"0"
-		"paintbackground"		"2"
-		"bgcolor_override"		"DarkGrey"
+			"defaultFgColor_override"	"235 226 202 255"
+			"armedFgColor_override"		"72 255 255 255"
+		}
 	}
 
-	"QuestLogButton"
+	"MOTD_ShowButtonPanel"
 	{
 		"ControlName"	"EditablePanel"
-		"fieldName"		"QuestLogButton"
-		"xpos"			"r28"
+		"fieldName"		"MOTD_ShowButtonPanel"
+		"xpos"			"rs1-10"
 		"ypos"			"90"
-		"zpos"			"1"
+		"zpos"			"0"
 		"wide"			"20"
 		"tall"			"20"
 		"autoResize"	"0"
@@ -588,23 +533,23 @@
 
 		"SubButton"
 		{
-			"ControlName"	"CExImageButton"
-			"fieldName"		"SubButton"
-			"xpos"			"0"
-			"ypos"			"0"
-			"wide"			"20"
-			"tall"			"20"
-			"autoResize"	"0"
-			"pinCorner"		"3"
-			"visible"		"1"
-			"enabled"		"1"
-			"tabPosition"	"0"
-			"labelText"		"x"
-			"font"			"CustomIcons"
-			"command"		"questlog"
-			"proportionaltoparent"	"1"
-			"textAlignment"	"center"
-			"default"		"1"
+			"ControlName"		"CExImageButton"
+			"fieldName"			"SubButton"
+			"xpos"				"0"
+			"ypos"				"0"
+			"wide"				"20"
+			"tall"				"20"
+			"autoResize"		"0"
+			"pinCorner"			"3"
+			"visible"			"1"
+			"enabled"			"1"
+			"tabPosition"		"0"
+			"labelText"			"o"
+			"font"				"CustomIcons"
+			"command"			"motd_show"
+			"use_proportional_insets" "1"
+			"textAlignment"		"center"
+			"default"			"1"
 			"actionsignallevel" "2"
 			"paintbackground"	"0"
 			"paintborder"		"0"
@@ -616,40 +561,34 @@
 		}
 	}
 
-	"MOTD_ShowButtonPanel"
+	"RefreshHUDButton"
 	{
 		"ControlName"	"EditablePanel"
-		"fieldName"		"MOTD_ShowButtonPanel"
-		"xpos"			"r28"
+		"fieldName"		"RefreshHUDButton"
+		"xpos"			"rs1-09"
 		"ypos"			"115"
-		"zpos"			"0"
+		"zpos"			"1"
 		"wide"			"20"
 		"tall"			"20"
-		"autoResize"	"0"
-		"pinCorner"		"3"
 		"visible"		"1"
-		"enabled"		"1"
-		"tabPosition"	"0"
-
-		"MOTD_ShowButtonPanel_SB"
+		
+		"SubButton"
 		{
-			"ControlName"	"CExImageButton"
-			"fieldName"		"MOTD_ShowButtonPanel_SB"
-			"xpos"			"0"
-			"ypos"			"0"
-			"wide"			"20"
-			"tall"			"20"
-			"autoResize"	"0"
-			"pinCorner"		"3"
-			"visible"		"1"
-			"enabled"		"1"
-			"tabPosition"	"0"
-			"labelText"		"o"
-			"font"			"CustomIcons"
-			"command"		"motd_show"
+			"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"
+			"textAlignment"		"center"
+			"default"			"1"
 			"actionsignallevel" "2"
 			"paintbackground"	"0"
 			"paintborder"		"0"
@@ -721,42 +660,22 @@
 			"visible"		"1"
 			"enabled"		"1"
 			"tabPosition"	"0"
-			"labeltext"		""
-			"font"			""
+			"labeltext"		"("
+			"font"			"CustomIcons"
 			"textAlignment"	"center"
 			"dulltext"		"0"
 			"brighttext"	"0"
 			"default"		"0"
 			"actionsignallevel"	"2"
-
-			"sound_depressed"	"UI/buttonclick.wav"
-			"sound_released"	"UI/buttonclickrelease.wav"
 			"Command"			"motd_hide"
 			"paintbackground"	"0"
-
-			//"defaultFgColor_override" "TanLight"
-			//"armedFgColor_override" "TanDarker"
-			"defaultFgColor_override" "Blank"
-			"armedFgColor_override" "Blank"
-			"depressedFgColor_override" "Blank"
-
-			"image_drawcolor"	"TanLight"
-			"image_armedcolor"	"255 0 0 255"
-
-			"SubImage"
-			{
-				"ControlName"	"ImagePanel"
-				"fieldName"		"SubImage"
-				"xpos"			"0"
-				"ypos"			"0"
-				"zpos"			"1"
-				"wide"			"14"
-				"tall"			"14"
-				"visible"		"1"
-				"enabled"		"1"
-				"image"			"replay/thumbnails/close"
-				"scaleImage"	"1"
-			}
+			
+			"sound_depressed"	"UI/buttonclick.wav"
+			"sound_released"	"UI/buttonclickrelease.wav"
+			
+			"defaultFgColor_override" 	"TanLight"
+			"armedFgColor_override" 	"255 0 0 255"
+			"depressedFgColor_override" "TanLight"
 		}
 
 		"MOTD_HeaderIcon"
@@ -1030,7 +949,7 @@
 		"fieldName"		"Notifications_Panel"
 		"xpos"			"c-120"
 		"ypos"			"80"
-		"zpos"			"1"
+		"zpos"			"100"
 		"wide"			"210"
 		"tall"			"80"
 		"visible"		"0"
@@ -1053,39 +972,22 @@
 			"visible"		"1"
 			"enabled"		"1"
 			"tabPosition"	"0"
-			"labeltext"		""
-			"font"			"HudFontSmallBold"
+			"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"
-			"paintbackground"	"0"
-
-			"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"			"255 0 0 255"
-
-			"SubImage"
-			{
-				"ControlName"	"ImagePanel"
-				"fieldName"		"SubImage"
-				"xpos"			"0"
-				"ypos"			"0"
-				"zpos"			"1"
-				"wide"			"14"
-				"tall"			"14"
-				"visible"		"1"
-				"enabled"		"1"
-				"image"			"replay/thumbnails/close"
-				"scaleImage"	"1"
-			}
+			
+			"defaultFgColor_override" 	"235 226 202 255"
+			"armedFgColor_override" 	"255 0 0 255"
+			"depressedFgColor_override" "235 226 202 255"
 		}
 
 		"Notifications_TitleLabel"
@@ -1116,7 +1018,7 @@
 			"wide"			"210"
 			"tall"			"135"
 			"PaintBackgroundType"	"2"
-			"fgcolor_override"		"TextColor"
+			"fgcolor_override"	"TextColor"
 
 			"Notifications_Control"
 			{
@@ -1146,14 +1048,14 @@
 	"FriendsContainer"
 	{
 		"ControlName"	"EditablePanel"
-		"fieldname"		"FriendsContainer"
+		"fieldName"		"FriendsContainer"
 		"xpos"			"40"
 		"ypos"			"270"
 		"zpos"			"5"
 		"wide"			"260"
 		"tall"			"150"
 		"visible"		"1"
-		"border"			"NoBorder"
+		"border"		"NoBorder"
 		"bgcolor_override"	"Transparent"
 
 		"TitleLabel"
@@ -1175,7 +1077,7 @@
 		"InnerShadow"
 		{
 			"ControlName"	"EditablePanel"
-			"fieldname"		"InnerShadow"
+			"fieldName"		"InnerShadow"
 			"xpos"			"0"
 			"ypos"			"0"
 			"zpos"			"501"
@@ -1193,7 +1095,7 @@
 		"SteamFriendsList"
 		{
 			"ControlName"	"CSteamFriendsListPanel"
-			"fieldname"		"SteamFriendsList"
+			"fieldName"		"SteamFriendsList"
 			"xpos"			"0"
 			"ypos"			"0"
 			"zpos"			"500"
@@ -1251,7 +1153,7 @@
 		"BelowDarken"
 		{
 			"ControlName"	"EditablePanel"
-			"fieldname"		"BelowDarken"
+			"fieldName"		"BelowDarken"
 			"xpos"			"0"
 			"ypos"			"0"
 			"zpos"			"499"
@@ -1270,7 +1172,7 @@
 		"ControlName"	"CExLabel"
 		"fieldName"		"VersionLabel"
 		"font"			"HudFontSmall"
-		"labelText"		"v2020.0808"
+		"labelText"		"v2020.1230"
 		"xpos"			"r135"
 		"ypos"			"r15"
 		"wide"			"130"
@@ -1286,7 +1188,7 @@
 	"CharacterSetupButton"
 	{
 		"ControlName"	"CExImageButton"
-		"fieldname"		"CharacterSetupButton"
+		"fieldName"		"CharacterSetupButton"
 		"xpos"			"30"
 		"ypos"			"82"
 		"zpos"			"11"
@@ -1315,7 +1217,7 @@
 	"GeneralStoreButton"
 	{
 		"ControlName"	"CExImageButton"
-		"fieldname"		"GeneralStoreButton"
+		"fieldName"		"GeneralStoreButton"
 		"xpos"			"30"
 		"ypos"			"102"
 		"zpos"			"11"
@@ -1344,7 +1246,7 @@
 	"SteamWorkshopButton"
 	{
 		"ControlName"	"CExImageButton"
-		"fieldname"		"SteamWorkshopButton"
+		"fieldName"		"SteamWorkshopButton"
 		"xpos"			"30"
 		"ypos"			"122"
 		"zpos"			"11"
@@ -1485,37 +1387,18 @@
 			"visible"		"1"
 			"enabled"		"1"
 			"tabPosition"	"0"
-			"textinsetx"	"0"
-			"font"			"HudFontMediumSecondary"
+			"font"			"CustomIcons"
 			"use_proportional_insets" "1"
 			"textAlignment"	"center"
-			"dulltext"		"0"
-			"brighttext"	"0"
-			"default"		"1"
-
+			"default"			"1"
+			"actionsignallevel" "2"
+			"paintbackground"	"0"
+			"paintborder"		"0"
 			"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"
-			}
+			"defaultFgColor_override"	"235 226 202 255"
+			"armedFgColor_override"		"72 255 255 255"
 		}
 	}
 
@@ -1523,13 +1406,17 @@
 	{
 		"ControlName"	"EditablePanel"
 		"fieldname"		"ConsoleButton"
-		"xpos"			"124"
-		"ypos"			"62"
+		"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"
@@ -1543,37 +1430,18 @@
 			"visible"		"1"
 			"enabled"		"1"
 			"tabPosition"	"0"
-			"textinsetx"	"0"
-			"font"			"HudFontMediumSecondary"
+			"font"			"CustomIcons"
 			"use_proportional_insets" "1"
 			"textAlignment"	"center"
-			"dulltext"		"0"
-			"brighttext"	"0"
 			"default"		"1"
-
+			"actionsignallevel" "2"
+			"paintbackground"	"0"
+			"paintborder"		"0"
 			"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"
-			}
+			"defaultFgColor_override"	"235 226 202 255"
+			"armedFgColor_override"		"72 255 255 255"
 		}
 	}
 
@@ -1581,13 +1449,17 @@
 	{
 		"ControlName"	"EditablePanel"
 		"fieldname"		"ReplayButton"
-		"xpos"			"144"
-		"ypos"			"62"
+		"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"
@@ -1601,37 +1473,18 @@
 			"visible"		"1"
 			"enabled"		"1"
 			"tabPosition"	"0"
-			"textinsetx"	"0"
-			"font"			"HudFontMediumSecondary"
+			"font"			"CustomIcons"
 			"use_proportional_insets" "1"
 			"textAlignment"	"center"
-			"dulltext"		"0"
-			"brighttext"	"0"
 			"default"		"1"
-
+			"actionsignallevel" "2"
+			"paintbackground"	"0"
+			"paintborder"		"0"
 			"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"
-			}
+			"defaultFgColor_override"	"235 226 202 255"
+			"armedFgColor_override"		"72 255 255 255"
 		}
 	}
 
@@ -1639,13 +1492,17 @@
 	{
 		"ControlName"	"EditablePanel"
 		"fieldname"		"ReportBugButton"
-		"xpos"			"164"
-		"ypos"			"62"
+		"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"
@@ -1659,37 +1516,18 @@
 			"visible"		"1"
 			"enabled"		"1"
 			"tabPosition"	"0"
-			"textinsetx"	"0"
-			"font"			"HudFontMediumSecondary"
+			"font"			"CustomIcons"
 			"use_proportional_insets" "1"
 			"textAlignment"	"center"
-			"dulltext"		"0"
-			"brighttext"	"0"
 			"default"		"1"
-
+			"actionsignallevel" "2"
+			"paintbackground"	"0"
+			"paintborder"		"0"
 			"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"
-			}
+			"defaultFgColor_override"	"235 226 202 255"
+			"armedFgColor_override"		"72 255 255 255"
 		}
 	}
 
@@ -1697,13 +1535,17 @@
 	{
 		"ControlName"	"EditablePanel"
 		"fieldname"		"CoachPlayersButton"
-		"xpos"			"184"
-		"ypos"			"62"
+		"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"
@@ -1717,37 +1559,18 @@
 			"visible"		"1"
 			"enabled"		"1"
 			"tabPosition"	"0"
-			"textinsetx"	"0"
-			"font"			"HudFontMediumSecondary"
+			"font"			"CustomIcons"
 			"use_proportional_insets" "1"
 			"textAlignment"	"center"
-			"dulltext"		"0"
-			"brighttext"	"0"
 			"default"		"1"
-
+			"actionsignallevel" "2"
+			"paintbackground"	"0"
+			"paintborder"		"0"
 			"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"
-			}
+			"defaultFgColor_override"	"235 226 202 255"
+			"armedFgColor_override"		"72 255 255 255"
 		}
 	}
 
@@ -1755,13 +1578,17 @@
 	{
 		"ControlName"	"EditablePanel"
 		"fieldname"		"RequestCoachButton"
-		"xpos"			"204"
-		"ypos"			"62"
+		"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"
@@ -1775,37 +1602,18 @@
 			"visible"		"1"
 			"enabled"		"1"
 			"tabPosition"	"0"
-			"textinsetx"	"0"
-			"font"			"HudFontMediumSecondary"
+			"font"			"CustomIcons"
 			"use_proportional_insets" "1"
 			"textAlignment"	"center"
-			"dulltext"		"0"
-			"brighttext"	"0"
 			"default"		"1"
-
+			"actionsignallevel" "2"
+			"paintbackground"	"0"
+			"paintborder"		"0"
 			"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"
-			}
+			"defaultFgColor_override"	"235 226 202 255"
+			"armedFgColor_override"		"72 255 255 255"
 		}
 	}
 
@@ -1813,13 +1621,17 @@
 	{
 		"ControlName"	"EditablePanel"
 		"fieldname"		"CallVoteButton"
-		"xpos"			"224"
-		"ypos"			"62"
+		"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"
@@ -1833,37 +1645,18 @@
 			"visible"		"1"
 			"enabled"		"1"
 			"tabPosition"	"0"
-			"textinsetx"	"0"
-			"font"			"HudFontMediumSecondary"
+			"font"			"CustomIcons"
 			"use_proportional_insets" "1"
 			"textAlignment"	"center"
-			"dulltext"		"0"
-			"brighttext"	"0"
 			"default"		"1"
-
+			"actionsignallevel" "2"
+			"paintbackground"	"0"
+			"paintborder"		"0"
 			"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"
-			}
+			"defaultFgColor_override"	"235 226 202 255"
+			"armedFgColor_override"		"72 255 255 255"
 		}
 	}
 
@@ -1871,13 +1664,17 @@
 	{
 		"ControlName"	"EditablePanel"
 		"fieldname"		"MutePlayersButton"
-		"xpos"			"244"
-		"ypos"			"62"
+		"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"
@@ -1891,37 +1688,18 @@
 			"visible"		"1"
 			"enabled"		"1"
 			"tabPosition"	"0"
-			"textinsetx"	"0"
-			"font"			"HudFontMediumSecondary"
+			"font"			"CustomIcons"
 			"use_proportional_insets" "1"
 			"textAlignment"	"center"
-			"dulltext"		"0"
-			"brighttext"	"0"
 			"default"		"1"
-
+			"actionsignallevel" "2"
+			"paintbackground"	"0"
+			"paintborder"		"0"
 			"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"
-			}
+			"defaultFgColor_override"	"235 226 202 255"
+			"armedFgColor_override"		"72 255 255 255"
 		}
 	}
 
@@ -1929,13 +1707,17 @@
 	{
 		"ControlName"	"EditablePanel"
 		"fieldname"		"ReportPlayerButton"
-		"xpos"			"264"
-		"ypos"			"62"
+		"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"
@@ -1949,37 +1731,18 @@
 			"visible"		"1"
 			"enabled"		"1"
 			"tabPosition"	"0"
-			"textinsetx"	"0"
-			"font"			"HudFontMediumSecondary"
+			"font"			"CustomIcons"
 			"use_proportional_insets" "1"
 			"textAlignment"	"center"
-			"dulltext"		"0"
-			"brighttext"	"0"
 			"default"		"1"
-
+			"actionsignallevel" "2"
+			"paintbackground"	"0"
+			"paintborder"		"0"
 			"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"
-			}
+			"defaultFgColor_override"	"235 226 202 255"
+			"armedFgColor_override"		"72 255 255 255"
 		}
 	}
 
@@ -1993,36 +1756,7 @@
 		"wide"			"260"
 		"tall"			"370"
 		"visible"		"1"
-		"enabled"		"1"
-		"bgcolor_override"		"25 25 25 168"
+		"bgcolor_override"	"25 25 25 168"
 		"PaintBackgroundType"	"2"
 	}
-
-	"icon_generator"
-	{
-		"ControlName"	"CEmbeddedItemModelPanel"
-		"fieldName"		"icon_generator"
-		"xpos"			"0"
-		"ypos"			"0"
-		"zpos"			"1"
-		"wide"			"300"
-		"tall"			"300"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"1"
-		"enabled"		"1"
-		"useparentbg"	"1"
-		"inset_eq_x"	"2"
-		"inset_eq_y"	"2"
-		"fov"			"54"
-		"start_framed"	"1"
-		"disable_manipulation"	"1"
-
-		"model"
-		{
-			"angles_x"		"10"
-			"angles_y"		"130"
-			"angles_z"		"0"
-		}
-	}
-}
\ No newline at end of file
+}
diff --git a/customizations/player_model/hudplayerclass-left.res b/customizations/player_model/hudplayerclass-left.res
index efe75e4..ab0c98f 100644
--- a/customizations/player_model/hudplayerclass-left.res
+++ b/customizations/player_model/hudplayerclass-left.res
@@ -131,4 +131,9 @@
 			}
 		}
 	}
+	
+	"CarryingWeapon"
+	{
+		"xpos"					"100"
+	}
 }
\ No newline at end of file
diff --git a/customizations/player_model/hudplayerclass.res b/customizations/player_model/hudplayerclass.res
index 8c32909..d476dab 100644
--- a/customizations/player_model/hudplayerclass.res
+++ b/customizations/player_model/hudplayerclass.res
@@ -196,4 +196,111 @@
 			}
 		}
 	}
+	
+	"CarryingWeapon"
+	{
+		"ControlName"			"EditablePanel"
+		"fieldName"				"CarryingWeapon"
+		"xpos"					"r250"
+		"ypos"					"r20"
+		"zpos"					"100"
+		"wide"					"500"
+		"tall"	 				"28"
+		"bgcolor_override"		"Transparent"
+		"PaintBackgroundType"	"2"
+
+		"CarryingBackground"
+		{
+			"ControlName"			"CTFImagePanel"
+			"fieldName"				"CarryingBackground"
+			"xpos"					"0"
+			"ypos"					"0"
+			"zpos"					"0"
+			"wide"					"p1"
+			"tall"	 				"f0"
+			"autoResize"			"0"
+			"pinCorner"				"0"
+			"visible"				"1"
+			"enabled"				"1"
+			"image"					"../hud/color_panel_brown"
+			"scaleImage"			"1"
+			"teambg_1"				"../hud/color_panel_brown"
+			"teambg_2"				"../hud/color_panel_red"
+			"teambg_3"				"../hud/color_panel_blu"
+			"proportionaltoparent"	"1"
+
+			"src_corner_height"		"23"
+			"src_corner_width"		"23"
+			"draw_corner_width"		"5"
+			"draw_corner_height" 	"5"
+		}
+
+		"CarryingLabel"
+		{
+			"ControlName"		"CExLabel"
+			"fieldName"			"CarryingLabel"
+			"font"				"ReplayBrowserSmallest"
+			"xpos"				"5"
+			"ypos"				"3"
+			"zpos"				"1"
+			"wide"				"200"
+			"tall"	 			"f0"
+			"autoResize"		"0"
+			"pinCorner"			"0"
+			"visible"			"1"
+			"enabled"			"1"
+			"textAlignment"		"North-West"
+			"dulltext"			"0"
+			"brighttext"		"0"
+			"proportionaltoparent"	"1"
+			"auto_wide_tocontents"	"1"
+			"labelText"			"%carrying%"
+		}
+
+		"CarryingLabelDropShadow"
+		{
+			"ControlName"		"CExLabel"
+			"fieldName"			"CarryingLabelDropShadow"
+			"font"				"ReplayBrowserSmallest"
+			"xpos"				"p0.011"
+			"ypos"				"p0.12"
+			"zpos"				"0"
+			"wide"				"200"
+			"tall"	 			"f0"
+			"autoResize"		"0"
+			"pinCorner"			"0"
+			"visible"			"0"
+			"enabled"			"0"
+			"textAlignment"		"North-West"
+			"dulltext"			"0"
+			"brighttext"		"0"
+			"proportionaltoparent"	"1"
+			"auto_wide_tocontents"	"1"
+			"fgcolor_override"	"Black"
+			"labelText"			"%carrying%"
+		}
+
+		"OwnerLabel"
+		{
+			"ControlName"		"Label"
+			"fieldName"			"OwnerLabel"
+			"font"				"FontStoreOriginalPrice"
+			"xpos"				"5"
+			"ypos"				"14"
+			"zpos"				"0"
+			"wide"				"200"
+			"tall"	 			"f0"
+			"wide_minmode"		"0"
+			"tall_minmode"		"0"
+			"autoResize"		"0"
+			"pinCorner"			"0"
+			"visible"			"1"
+			"enabled"			"1"
+			"textAlignment"		"North-West"
+			"dulltext"			"0"
+			"brighttext"		"0"
+			"proportionaltoparent"	"1"
+			"auto_wide_tocontents"	"1"
+		}
+	}
 }
\ No newline at end of file
diff --git a/customizations/scoreboards/scoreboard.res b/customizations/scoreboards/scoreboard.res
index 6e764f4..ad97352 100644
--- a/customizations/scoreboards/scoreboard.res
+++ b/customizations/scoreboards/scoreboard.res
@@ -38,7 +38,7 @@
 		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
-		"fillcolor"		"70 130 180 153"
+		"fillcolor"		"Blue"
 		"scaleImage"	"1"
 
 		if_mvm
@@ -73,7 +73,7 @@
 		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
-		"fillcolor"		"205 50 50 153"
+		"fillcolor"		"Red"
 		"scaleImage"	"1"
 
 		if_mvm