Updated Customizations

- Updated customization files
- Fixed unused color being called

1 files changed, 600 insertions, 681 deletions

diff --git a/customizations/Main Menu/Classic/resource/ui/mainmenuoverride.res b/customizations/Main Menu/Classic/resource/ui/mainmenuoverride.res
index aaa0f01..78f0523 100644
--- a/customizations/Main Menu/Classic/resource/ui/mainmenuoverride.res
+++ b/customizations/Main Menu/Classic/resource/ui/mainmenuoverride.res
@@ -11,7 +11,6 @@
 		"wide"			"f0"
 		"tall"			"f0"
 
-	//	"bgcolor_override"	"0 0 0 100"
 		"update_url"	"http://store.steampowered.com/news/?filter=updates&appids=440"
 		"blog_url"		"http://www.teamfortress.com/"
 		
@@ -53,8 +52,8 @@
 				"border_armed"		""
 				"paintbackground"	"0"
 				
-				"defaultFgColor_override" "TanLight"
-				"armedFgColor_override" "Button Color"
+				"defaultFgColor_override"	"TanLight"
+				"armedFgColor_override"		"Button Color"
 				"depressedFgColor_override" "Button Color"
 				
 				"image_drawcolor"	"TanLight"
@@ -131,8 +130,8 @@
 		"wide"			"300"
 		"tall"			"300"
 		"visible"		"0"
-		"bgcolor_override"		"0 0 0 0"
-		"noitem_textcolor"		"117 107 94 255"
+		"bgcolor_override"		"Transparent"
+		"noitem_textcolor"		"TextColor"
 		"PaintBackgroundType"	"2"
 		"paintborder"	"1"
 		"border"		"MainMenuBGBorder"
@@ -157,7 +156,7 @@
 			"enabled"		"1"
 			"labelText"		"%attriblist%"
 			"textAlignment"	"center"
-			"fgcolor"		"117 107 94 255"
+			"fgcolor"		"TextColor"
 			"centerwrap"	"1"
 		}
 	}
@@ -177,10 +176,10 @@
 		"image"			""
 	}
 	
-	"SidePanelBG"
+	"MainMenuSideBG"
 	{
 		"ControlName"	"ImagePanel"
-		"fieldName"		"SidePanelBG"
+		"fieldName"		"MainMenuSideBG"
 		"xpos"			"75"
 		"ypos"			"0"
 		"zpos"			"0"
@@ -191,62 +190,21 @@
 		"scaleImage"	"1"
 		"fillcolor"		"25 25 25 255"
 	}
-	"SidePanelLeftStripe"
+	
+	"MainMenuSideBGOuter"
 	{
 		"ControlName"	"ImagePanel"
-		"fieldName"		"SidePanelLeftStripe"
+		"fieldName"		"MainMenuSideBGOuter"
 		"xpos"			"77"
 		"ypos"			"0"
-		"zpos"			"0"
-		"wide"			"2"
-		"tall"			"f0"
-		"visible"		"1"
-		"enabled"		"1"
-		"scaleImage"	"1"
-		"fillcolor"		"Base Color"
-	}
-	"SidePanelRightStripe"
-	{
-		"ControlName"	"ImagePanel"
-		"fieldName"		"SidePanelRightStripe"
-		"xpos"			"271"
-		"ypos"			"0"
-		"zpos"			"0"
-		"wide"			"2"
+		"zpos"			"-1"
+		"wide"			"204"
 		"tall"			"f0"
 		"visible"		"1"
 		"enabled"		"1"
 		"scaleImage"	"1"
 		"fillcolor"		"Base Color"
 	}
-	"TFLogoImage"
-	{
-		"ControlName"	"ImagePanel"
-		"fieldName"		"TFLogoImage"
-		"xpos"			"86"
-		"ypos"			"35"
-		"zpos"			"100"
-		"wide"			"180"
-		"tall"			"46"
-		"visible"		"0"
-		"enabled"		"0"
-		"image"			"replay/thumbnails/tflogo"
-		"scaleImage"	"1"
-	}
-	
-	"TFCharacterImage"
-	{
-		//"ControlName"	"ImagePanel"
-		"fieldName"		"TFCharacterImage"
-		"xpos"			"c-250"
-		"ypos"			"-80"
-		"zpos"			"-99"
-		"wide"			"600"
-		"tall"			"600"
-		"visible"		"0"
-		"enabled"		"0"
-		"scaleImage"	"1"
-	}
 
 	"RankModelPanel"
 	{
@@ -335,7 +293,7 @@
 		"scaleImage"	"1"	
 		"alpha"			"75"
 	}
-
+	
 	"RankPanel"
 	{
 		"ControlName"	"CPvPRankPanel"
@@ -410,16 +368,16 @@
 
 	"TooltipPanel"
 	{
-		"ControlName"	"EditablePanel"
-		"fieldName"		"TooltipPanel"
-		"xpos"			"9999"
-		"ypos"			"9999"
-		"zpos"			"2"
-		"wide"			"150"
-		"tall"			"50"
-		"visible"		"0"
+		"ControlName"			"EditablePanel"
+		"fieldName"				"TooltipPanel"
+		"xpos"					"9999"
+		"ypos"					"9999"
+		"zpos"					"2"
+		"wide"					"150"
+		"tall"					"50"
+		"visible"				"0"
 		"PaintBackgroundType"	"2"
-		"border"		"MainMenuBGBorder"
+		"border"				"MainMenuBGBorder"
 		
 		"TipSubLabel"
 		{
@@ -437,7 +395,7 @@
 			"pinCorner"		"0"
 			"visible"		"1"
 			"enabled"		"1"
-			"fgcolor_override"	"117 107 94 255"
+			"fgcolor_override"	"TextColor"
 			"wrap"			"1"
 		}
 		
@@ -461,13 +419,99 @@
 			"auto_wide_tocontents" "1"
 		}
 	}
+
+	"Notifications_ShowButtonPanel"
+	{
+		"ControlName"		"EditablePanel"
+		"fieldName"			"Notifications_ShowButtonPanel"
+		"xpos"				"227"
+		"ypos"				"425"
+		"zpos"				"10"
+		"wide"				"20"
+		"tall"				"25"
+		"autoResize"		"0"
+		"pinCorner"			"3"
+		"visible"			"1"
+		"enabled"			"1"
+
+		"SubImage"
+		{
+			"ControlName"		"ImagePanel"
+			"fieldName"			"SubImage"
+			"xpos"				"16"
+			"ypos"				"0"
+			"zpos"				"3"
+			"wide"				"16"
+			"tall"				"16"
+			"visible"			"0"
+			"enabled"			"0"
+			"image"				"glyph_achievements"
+			"scaleImage"		"1"
+			"drawcolor" 		"210 125 33 255"
+		}
+
+		"Notifications_ShowButtonPanel_SB"
+		{
+			"ControlName"		"CExImageButton"
+			"fieldName"			"Notifications_ShowButtonPanel_SB"
+			"xpos"				"0"
+			"ypos"				"0"
+			"zpos"				"5"
+			"wide"				"24"
+			"tall"				"24"
+			"autoResize"		"0"
+			"pinCorner"			"3"
+			"visible"			"1"
+			"enabled"			"1"
+			"tabPosition"		"0"
+			"labelText"			"r"
+			"font"				""
+			"textAlignment"		"center"
+			"dulltext"			"0"
+			"brighttext"		"0"
+			"default"			"1"
+			"actionsignallevel"	"2"
+			
+			"Command"			"noti_show"
+			"fgcolor_override" 	"235 226 202 255"
+			
+			"sound_depressed"	"UI/buttonclick.wav"
+			"sound_released"	"UI/buttonclickrelease.wav"
+			
+			"border_default"	""
+			"border_armed"		""
+			"paintbackground"	"0"
+			
+			"defaultFgColor_override" 	"TanLight"
+			"armedFgColor_override"		"Button Color"
+			"depressedFgColor_override"	"Button Color"
+			
+			"image_drawcolor"			"235 226 202 255"
+			"image_armedcolor"			"72 255 255 255"
+			
+			"SubImage"
+			{
+				"ControlName"	"ImagePanel"
+				"fieldName"		"SubImage"
+				"xpos"			"0"
+				"ypos"			"0"
+				"zpos"			"1"
+				"wide"			"20"
+				"tall"			"20"
+				"visible"		"0"
+				"enabled"		"0"
+				"scaleImage"	"1"
+				"image"			"replay/thumbnails/alert"
+			}
+		}
+	}
 	
-	"MOTD_ShowButtonPanel"
+	"QuestLogButton"
 	{
 		"ControlName"	"EditablePanel"
-		"fieldName"		"MOTD_ShowButtonPanel"
-		"xpos"			"9999"
-		"ypos"			"9999"
+		"fieldName"		"QuestLogButton"
+		"xpos"			"90"
+		"ypos"			"220"
 		"zpos"			"1"
 		"wide"			"20"
 		"tall"			"20"
@@ -475,132 +519,104 @@
 		"pinCorner"		"3"
 		"visible"		"1"
 		"enabled"		"1"
+		"tabPosition"	"0"
 		
-		"MOTD_ShowButtonPanel_SB"
+		"SubButton"
 		{
 			"ControlName"	"CExImageButton"
-			"fieldName"		"MOTD_ShowButtonPanel_SB"
-			"xpos"			"0"
+			"fieldName"		"SubButton"
+			"xpos"			"-3"
 			"ypos"			"0"
-			"zpos"			"1"
-			"wide"			"32"
-			"tall"			"32"
+			"wide"			"20"
+			"tall"			"20"
+			"zpos"			"5"
 			"autoResize"	"0"
 			"pinCorner"		"3"
 			"visible"		"1"
 			"enabled"		"1"
 			"tabPosition"	"0"
 			"labelText"		""
-			"font"			"HudFontSmallestBold"
+			"font"			""
+			"command"		"questlog"
 			"textAlignment"	"center"
 			"dulltext"		"0"
 			"brighttext"	"0"
 			"default"		"1"
-			"Command"		"motd_show"
 			"sound_depressed"	"UI/buttonclick.wav"
 			"sound_released"	"UI/buttonclickrelease.wav"
-			"paintbackground" "0"
-			"image_drawcolor"	"TanLight"
-			"image_armedcolor"	"255 255 255 255"
-
+			"actionsignallevel" "2"
+			"proportionaltoparent"	"1"
+			
+			"paintbackground"	"0"
+			"paintborder"		"0"
+			
+			"defaultFgColor_override"	"TanLight"
+			"armedFgColor_override"		"Button Color"
+			"depressedFgColor_override"	"Button Color"
+			
+			"image_drawcolor"	"235 226 202 255"
+			"image_armedcolor"	"72 255 255 255"
+			
 			"SubImage"
 			{
 				"ControlName"	"ImagePanel"
 				"fieldName"		"SubImage"
-				"xpos"			"0"
+				"xpos"			"2"
 				"ypos"			"0"
 				"zpos"			"1"
-				"wide"			"20"
-				"tall"			"20"
+				"wide"			"16"
+				"tall"			"16"
 				"visible"		"1"
 				"enabled"		"1"
-				"image"			"replay/thumbnails/motd"
 				"scaleImage"	"1"
+				"image"			"replay/thumbnails/contracts"
 			}
 		}
 	}
 	
-	"MOTD_Panel"
-	{
-		"ControlName"	"EditablePanel"
-		"fieldName"		"MOTD_Panel"
-		"xpos"			"0"
-		"ypos"			"0"
-		"zpos"			"0"
-		"wide"			"0"
-		"tall"			"0"
-		"visible"		"0"
-		"PaintBackgroundType"	"2"
-		"paintbackground"		"0"
-		"border"				""
-	}
-
-	"Notifications_ShowButtonPanel"
+	"WatchStreamButton"
 	{
 		"ControlName"	"EditablePanel"
-		"fieldName"		"Notifications_ShowButtonPanel"
-		"xpos"			"227"
-		"ypos"			"425"
-		"zpos"			"10"
+		"fieldName"		"WatchStreamButton"
+		"xpos"			"110"
+		"ypos"			"219"
+		"zpos"			"1"
 		"wide"			"20"
-		"tall"			"25"
-		"autoResize"	"0"
-		"pinCorner"		"3"
+		"tall"			"20"
 		"visible"		"1"
-		"enabled"		"1"
 
-		"SubImage"
-		{
-			"ControlName"	"ImagePanel"
-			"fieldName"		"SubImage"
-			"xpos"			"16"
-			"ypos"			"0"
-			"zpos"			"3"
-			"wide"			"16"
-			"tall"			"16"
-			"visible"		"0"
-			"enabled"		"0"
-			"image"			"glyph_achievements"
-			"scaleImage"	"1"
-			"drawcolor" 	"210 125 33 255"
-		}
-
-		"Notifications_ShowButtonPanel_SB"
+		"SubButton"
 		{
 			"ControlName"	"CExImageButton"
-			"fieldName"		"Notifications_ShowButtonPanel_SB"
-			"xpos"			"0"
+			"fieldName"		"SubButton"
+			"xpos"			"-3"
 			"ypos"			"0"
+			"wide"			"20"
+			"tall"			"20"
 			"zpos"			"5"
-			"wide"			"24"
-			"tall"			"24"
 			"autoResize"	"0"
 			"pinCorner"		"3"
 			"visible"		"1"
 			"enabled"		"1"
 			"tabPosition"	"0"
+			"labelText"		""
 			"font"			""
-			"labelText"		"r"
+			"command"		"watch_stream"
 			"textAlignment"	"center"
 			"dulltext"		"0"
 			"brighttext"	"0"
 			"default"		"1"
-			"actionsignallevel" "2"
-			
-			"Command"		"noti_show"
-			
-			"fgcolor_override" 	"235 226 202 255"
-			
 			"sound_depressed"	"UI/buttonclick.wav"
 			"sound_released"	"UI/buttonclickrelease.wav"
+			"actionsignallevel" "2"
+			"proportionaltoparent"	"1"
 			
-			"border_default"	""
-			"border_armed"		""
 			"paintbackground"	"0"
+			"paintborder"		"0"
 			
-			"defaultFgColor_override" "TanLight"
-			"armedFgColor_override" "72 255 255 255"
-			"depressedFgColor_override" "72 255 255 255"
+			"defaultFgColor_override"	"TanLight"
+			"armedFgColor_override"		"Button Color"
+			"depressedFgColor_override"	"Button Color"
 			
 			"image_drawcolor"	"235 226 202 255"
 			"image_armedcolor"	"72 255 255 255"
@@ -609,19 +625,50 @@
 			{
 				"ControlName"	"ImagePanel"
 				"fieldName"		"SubImage"
-				"xpos"			"0"
+				"xpos"			"2"
 				"ypos"			"0"
 				"zpos"			"1"
 				"wide"			"20"
 				"tall"			"20"
-				"visible"		"0"
-				"enabled"		"0"
-				"image"			"replay/thumbnails/alert"
+				"visible"		"1"
+				"enabled"		"1"
 				"scaleImage"	"1"
+				"image"			"replay/thumbnails/twitch"
 			}
 		}
 	}
-
+	
+	"StreamListPanel"
+	{
+		"ControlName"	"CTFStreamListPanel"
+		"fieldName"		"StreamListPanel"
+		"xpos"			"300"
+		"ypos"			"90"
+		"zpos"			"1"
+		"wide"			"300"
+		"tall"			"325"
+		"visible"		"0"
+		"PaintBackgroundType"	"0"
+		"paintbackground"	"2"
+		"bgcolor_override"	"25 25 25 230"
+		"border"		"NoBorder"
+	}
+	
+	"MOTD_Panel"
+	{
+		"ControlName"	"EditablePanel"
+		"fieldName"		"MOTD_Panel"
+		"xpos"			"0"
+		"ypos"			"0"
+		"zpos"			"0"
+		"wide"			"0"
+		"tall"			"0"
+		"visible"		"0"
+		"PaintBackgroundType"	"2"
+		"paintbackground"		"0"
+		"border"				""
+	}
+	
 	"Notifications_Panel"
 	{
 		"ControlName"	"EditablePanel"
@@ -657,19 +704,17 @@
 			"brighttext"	"0"
 			"default"		"0"
 			"actionsignallevel"	"2"
-
+			"Command"			"noti_hide"
 			"sound_depressed"	"UI/buttonclick.wav"
 			"sound_released"	"UI/buttonclickrelease.wav"
-			"Command"			"noti_hide"
 			"paintbackground"	"0"
 			
-			"defaultFgColor_override" "TanLight"
-			"armedFgColor_override" "Button Color"
-			"depressedFgColor_override" "Button Color"
+			"defaultFgColor_override"	"TanLight"
+			"armedFgColor_override"		"Button Color"
+			"depressedFgColor_override"	"Button Color"
+			"image_drawcolor"			"TanLight"
+			"image_armedcolor"			"Button Color"
 			
-			"image_drawcolor"	"TanLight"
-			"image_armedcolor"	"Button Color"
-
 			"SubImage"
 			{
 				"ControlName"	"ImagePanel"
@@ -681,11 +726,11 @@
 				"tall"			"14"
 				"visible"		"1"
 				"enabled"		"1"
-				"image"			"close_button"
+				"image"			"replay/thumbnails/close"
 				"scaleImage"	"1"
-			}				
-		}		
-	
+			}
+		}
+		
 		"Notifications_TitleLabel"
 		{
 			"ControlName"	"CExLabel"
@@ -701,7 +746,7 @@
 			"pinCorner"		"0"
 			"visible"		"1"
 			"enabled"		"1"
-			"fgcolor_override"	"46 43 42 255"
+			"fgcolor_override"	"TanDarker"
 			"wrap"			"1"
 		}
 		
@@ -714,7 +759,7 @@
 			"wide"			"210"
 			"tall"			"135"
 			"PaintBackgroundType"	"2"
-			"fgcolor_override"	"117 107 94 255"
+			"fgcolor_override"	"TextColor"
 			
 			"Notifications_Control"
 			{
@@ -729,44 +774,196 @@
 		}
 	}
 	
-	"StoreHasNewItemsImage"
+	"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"			"295"
+		"zpos"			"5"
+		"wide"			"190"
+		"tall"			"180"
+		"visible"		"1"
+		"border"			"NoBorder"
+		"bgcolor_override"	"0 0 0 0"
+
+		"TitleLabel"
+		{
+			"ControlName"	"CExLabel"
+			"fieldName"		"TitleLabel"
+			"font"			"HudFontSmallBold"
+			"labelText"		"#TF_Competitive_Friends"
+			"textAlignment"	"west"
+			"xpos"			"12"
+			"ypos"			"0"
+			"wide"			"f0"
+			"tall"			"30"
+			"autoResize"	"0"
+			"pinCorner"		"0"
+			"visible"		"0"
+			"enabled"		"0"
+			"textinsetx"	"0"
+			"fgcolor_override"	"235 227 203 255"
+		}
+
+		"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"
+			"row_gap"		"5"
+			"column_gap"	"20"
+			"restrict_width"	"0"
+
+			"friendpanel_kv"
+			{
+				"wide"		"70"
+				"tall"		"20"
+			}
+
+			"ScrollBar"
+			{
+				"ControlName"	"ScrollBar"
+				"FieldName"		"ScrollBar"
+				"xpos"			"rs1-1"
+				"ypos"			"0"
+				"tall"			"f0"
+				"wide"			"5" // This gets slammed from client schme.  GG.
+				"zpos"			"1000"
+				"nobuttons"		"1"
+				"proportionaltoparent"	"1"
+
+				"Slider"
+				{
+					"fgcolor_override"	"TanDark"
+				}
+		
+				"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"
+		}
+	}
+	
+	"TFLogoImage"
 	{
 		"ControlName"	"ImagePanel"
-		"fieldName"		"StoreHasNewItemsImage"
-		"xpos"			"c-59"
-		"ypos"			"245"
-		"zpos"			"13"
-		"wide"			"0"
-		"tall"			"0"
+		"fieldName"		"TFLogoImage"
+		"xpos"			"86"
+		"ypos"			"35"
+		"zpos"			"100"
+		"wide"			"180"
+		"tall"			"46"
 		"visible"		"0"
 		"enabled"		"0"
-		"image"			"../vgui/new"
+		"image"			"replay/thumbnails/tflogo"
 		"scaleImage"	"1"
+		"command"		"engine play vo/heavy_battlecry03.mp3"
 	}
-	"CustomizeLabel"
+	
+	"TFCharacterImage"
+	{
+		//"ControlName"	"ImagePanel"
+		"fieldName"		"TFCharacterImage"
+		"xpos"			"c-250"
+		"ypos"			"-80"
+		"zpos"			"-99"
+		"wide"			"600"
+		"tall"			"600"
+		"visible"		"0"
+		"enabled"		"0"
+		"scaleImage"	"1"
+	}
+	
+	"VersionLabel"
 	{
 		"ControlName"	"CExLabel"
-		"fieldName"		"CustomizeLabel"
-		"font"			"HudFontSmallBold"
-		"labelText"		"#MMenu_Customize"
-		"textAlignment"	"west"
-		"xpos"			"c-278"
-		"ypos"			"226"
-		"wide"			"140"
-		"tall"			"30"
+		"fieldName"		"VersionLabel"
+		"font"			"CerbeticaBold20"
+		"labelText"		"rayshud v2018.1220"
+		"xpos"			"112"
+		"ypos"			"35"
+		"wide"			"130"
+		"tall"			"20"
 		"autoResize"	"0"
 		"pinCorner"		"0"
-		"visible"		"0"
-		"enabled"		"0"
-		"fgcolor_override"	"235 227 203 255"
+		"visible"		"1"
+		"enabled"		"1"
+		"fgcolor_override"	"White"
 	}
-
-	"GeneralStoreButton"
+	
+	"CharacterSetupButton"
 	{
 		"ControlName"	"EditablePanel"
-		"fieldname"		"GeneralStoreButton"
+		"fieldname"		"CharacterSetupButton"
 		"xpos"			"80"
-		"ypos"			"60"
+		"ypos"			"80"
 		"zpos"			"11"
 		"wide"			"190"
 		"tall"			"16"
@@ -785,10 +982,10 @@
 			"visible"		"1"
 			"enabled"		"1"
 			"tabPosition"	"0"
-			"textinsetx"	"25"
-			"use_proportional_insets" "1"
 			"font"			"CerbeticaBold16"
 			"textAlignment"	"west"
+			"textinsetx"	"25"
+			"use_proportional_insets" "1"
 			"dulltext"		"0"
 			"brighttext"	"0"
 			"default"		"1"
@@ -805,6 +1002,7 @@
 			
 			"image_drawcolor"	"117 107 94 255"
 			"image_armedcolor"	"235 226 202 255"
+			
 			"SubImage"
 			{
 				"ControlName"	"ImagePanel"
@@ -817,15 +1015,16 @@
 				"visible"		"0"
 				"enabled"		"0"
 				"scaleImage"	"0"
-			}		
+			}
 		}
 	}
-	"CharacterSetupButton"
+	
+	"GeneralStoreButton"
 	{
 		"ControlName"	"EditablePanel"
-		"fieldname"		"CharacterSetupButton"
+		"fieldname"		"GeneralStoreButton"
 		"xpos"			"80"
-		"ypos"			"80"
+		"ypos"			"60"
 		"zpos"			"11"
 		"wide"			"190"
 		"tall"			"16"
@@ -858,12 +1057,13 @@
 			"border_armed"		""
 			"paintbackground"	"0"
 			
-			"defaultFgColor_override" "TanLight"
-			"armedFgColor_override" "Button Color"
-			"depressedFgColor_override" "Button Color"
+			"defaultFgColor_override"	"TanLight"
+			"armedFgColor_override"		"Button Color"
+			"depressedFgColor_override"	"Button Color"
 			
 			"image_drawcolor"	"117 107 94 255"
 			"image_armedcolor"	"235 226 202 255"
+			
 			"SubImage"
 			{
 				"ControlName"	"ImagePanel"
@@ -876,20 +1076,22 @@
 				"visible"		"0"
 				"enabled"		"0"
 				"scaleImage"	"0"
-			}		
+			}
 		}
 	}
-	"ReplayBrowserButton"
+	
+	"SettingsButton"
 	{
 		"ControlName"	"EditablePanel"
-		"fieldname"		"ReplayBrowserButton"
+		"fieldName"		"SettingsButton"
 		"xpos"			"80"
-		"ypos"			"100"
+		"ypos"			"140"
 		"zpos"			"11"
 		"wide"			"190"
 		"tall"			"16"
 		"visible"		"1"
 		"PaintBackgroundType"	"2"
+		
 		"SubButton"
 		{
 			"ControlName"	"CExImageButton"
@@ -903,10 +1105,10 @@
 			"visible"		"1"
 			"enabled"		"1"
 			"tabPosition"	"0"
-			"textinsetx"	"25"
-			"use_proportional_insets" "1"
 			"font"			"CerbeticaBold16"
 			"textAlignment"	"west"
+			"textinsetx"	"25"
+			"use_proportional_insets" "1"
 			"dulltext"		"0"
 			"brighttext"	"0"
 			"default"		"1"
@@ -917,12 +1119,13 @@
 			"border_armed"		""
 			"paintbackground"	"0"
 			
-			"defaultFgColor_override" "TanLight"
-			"armedFgColor_override" "Button Color"
-			"depressedFgColor_override" "Button Color"
+			"defaultFgColor_override"	"TanLight"
+			"armedFgColor_override"		"Button Color"
+			"depressedFgColor_override"	"Button Color"
+			
+			"image_drawcolor"	"117 107 94 255"
+			"image_armedcolor"	"235 226 202 255"
 			
-			"image_drawcolor"	"TanLight"
-			"image_armedcolor"	"Button Color"
 			"SubImage"
 			{
 				"ControlName"	"ImagePanel"
@@ -935,15 +1138,16 @@
 				"visible"		"0"
 				"enabled"		"0"
 				"scaleImage"	"0"
-			}		
+			}
 		}
 	}
-	"SteamWorkshopButton"
+	
+	"TF2SettingsButton"
 	{
 		"ControlName"	"EditablePanel"
-		"fieldname"		"SteamWorkshopButton"
+		"fieldName"		"TF2SettingsButton"
 		"xpos"			"80"
-		"ypos"			"120"
+		"ypos"			"160"
 		"zpos"			"11"
 		"wide"			"190"
 		"tall"			"16"
@@ -966,7 +1170,6 @@
 			"textinsetx"	"25"
 			"use_proportional_insets" "1"
 			"font"			"CerbeticaBold16"
-			"labelText"		"WORKSHOP"
 			"textAlignment"	"west"
 			"dulltext"		"0"
 			"brighttext"	"0"
@@ -978,9 +1181,9 @@
 			"border_armed"		""
 			"paintbackground"	"0"
 			
-			"defaultFgColor_override" "TanLight"
-			"armedFgColor_override" "Button Color"
-			"depressedFgColor_override" "Button Color"
+			"defaultFgColor_override"	"TanLight"
+			"armedFgColor_override"		"Button Color"
+			"depressedFgColor_override"	"Button Color"
 			
 			"image_drawcolor"	"117 107 94 255"
 			"image_armedcolor"	"235 226 202 255"	
@@ -1000,199 +1203,126 @@
 		}
 	}
 	
-	"SettingsButton"
+	"AchievementsButton"
 	{
 		"ControlName"	"EditablePanel"
-		"fieldName"		"SettingsButton"
-		"xpos"			"80"
-		"ypos"			"140"
-		"zpos"			"11"
-		"wide"			"190"
-		"tall"			"16"
+		"fieldname"		"AchievementsButton"
+		"xpos"			"130"
+		"ypos"			"221"
+		"zpos"			"2"
+		"wide"			"20"
+		"tall"			"20"
 		"visible"		"1"
-		"PaintBackgroundType"	"2"
 		
 		"SubButton"
 		{
 			"ControlName"	"CExImageButton"
 			"fieldName"		"SubButton"
-			"xpos"			"-10"
+			"xpos"			"0"
 			"ypos"			"0"
-			"wide"			"200"
-			"tall"			"16"
+			"wide"			"20"
+			"tall"			"20"
 			"autoResize"	"0"
 			"pinCorner"		"3"
 			"visible"		"1"
 			"enabled"		"1"
 			"tabPosition"	"0"
-			"textinsetx"	"25"
+			"textinsetx"	"100"
 			"use_proportional_insets" "1"
-			"font"			"CerbeticaBold16"
-			"labelText"		"Options"
+			"font"			"HudFontSmallBold"
 			"textAlignment"	"west"
 			"dulltext"		"0"
 			"brighttext"	"0"
 			"default"		"1"
+			
 			"sound_depressed"	"UI/buttonclick.wav"
 			"sound_released"	"UI/buttonclickrelease.wav"
 			
+			"paintbackground"	"0"
 			"border_default"	""
 			"border_armed"		""
-			"paintbackground"	"0"
 			
 			"defaultFgColor_override" "TanLight"
 			"armedFgColor_override" "Button Color"
 			"depressedFgColor_override" "Button Color"
 			
-			"image_drawcolor"	"117 107 94 255"
-			"image_armedcolor"	"235 226 202 255"
+			"image_drawcolor"	"235 226 202 255"
+			"image_armedcolor"	"72 255 255 255"
+			
 			"SubImage"
 			{
 				"ControlName"	"ImagePanel"
 				"fieldName"		"SubImage"
-				"xpos"			"0"
+				"xpos"			"2"
 				"ypos"			"0"
-				"zpos"			"0"
-				"wide"			"0"
-				"tall"			"0"
-				"visible"		"0"
-				"enabled"		"0"
-				"scaleImage"	"0"
+				"zpos"			"1"
+				"wide"			"15"
+				"tall"			"15"
+				"visible"		"1"
+				"enabled"		"1"
+				"scaleImage"	"1"
+				"image"			"glyph_achievements"
 			}
 		}
 	}
-
-	"FriendsContainer"
+	
+	"QuitButton"
 	{
-		"ControlName"	"EditablePanel"
-		"fieldname"		"FriendsContainer"
+		"ControlName"	"CExImageButton"
+		"fieldName"		"QuitButton"
 		"xpos"			"80"
-		"ypos"			"295"
-		"zpos"			"5"
+		"ypos"			"200"
+		"zpos"			"1"
 		"wide"			"190"
-		"tall"			"180"
+		"tall"			"16"
+		"autoResize"	"0"
+		"pinCorner"		"3"
 		"visible"		"1"
-		"border"			"NoBorder"
-		"bgcolor_override"	"0 0 0 0"
-
-		"TitleLabel"
-		{
-			"ControlName"	"CExLabel"
-			"fieldName"		"TitleLabel"
-			"font"			"HudFontSmallBold"
-			"labelText"		"#TF_Competitive_Friends"
-			"textAlignment"	"west"
-			"xpos"			"12"
-			"ypos"			"0"
-			"wide"			"f0"
-			"tall"			"30"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"0"
-			"enabled"		"0"
-			"textinsetx"	"0"
-			"fgcolor_override"	"235 227 203 255"
-		}
-
-		"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"
-			"row_gap"		"5"
-			"column_gap"	"20"
-			"restrict_width"	"0"
-
-			"friendpanel_kv"
-			{
-				"wide"		"70"
-				"tall"		"20"
-			}
-
-			"ScrollBar"
-			{
-				"ControlName"	"ScrollBar"
-				"FieldName"		"ScrollBar"
-				"xpos"			"rs1-1"
-				"ypos"			"0"
-				"tall"			"f0"
-				"wide"			"5" // This gets slammed from client schme.  GG.
-				"zpos"			"1000"
-				"nobuttons"		"1"
-				"proportionaltoparent"	"1"
-
-				"Slider"
-				{
-					"fgcolor_override"	"TanDark"
-				}
+		"enabled"		"1"
+		"tabPosition"	"0"
+		"labelText"		"Quit"
+		"font"			"CerbeticaBold16"
+		"textAlignment"	"west"
+		"textinsetx"	"15"
+		"use_proportional_insets" "1"
+		"dulltext"		"0"
+		"brighttext"	"0"
+		"default"		"1"
+		"paintbackground""0"
+		"Command"		"engine replay_confirmquit"
 		
-				"UpButton"
-				{
-					"ControlName"	"Button"
-					"FieldName"		"UpButton"
-					"visible"		"0"
-				}
+		"defaultFgColor_override" "TanLight"
+		"armedFgColor_override" "Button Color"
+		"depressedFgColor_override" "Button Color"		
 		
-				"DownButton"
-				{
-					"ControlName"	"Button"
-					"FieldName"		"DownButton"
-					"visible"		"0"
-				}
-			}
-		}
-
-		"BelowDarken"
+		"sound_depressed"	"UI/buttonclick.wav"
+		"sound_released"	"UI/buttonclickrelease.wav"
+		
+		"image_drawcolor"	"TanLight"
+		"image_armedcolor"	"Button Color"
+		
+		"SubImage"
 		{
-			"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"
+			"ControlName"	"ImagePanel"
+			"fieldName"		"SubImage"
+			"xpos"			"16"
+			"ypos"			"6"
+			"zpos"			"1"
+			"wide"			"0"
+			"tall"			"0"
+			"visible"		"1"
+			"enabled"		"1"
+			"scaleImage"	"1"
+			"image"			"glyph_quit"
 		}
 	}
 	
-	"TF2SettingsButton"
+	"ReplayButton"
 	{
 		"ControlName"	"EditablePanel"
-		"fieldName"		"TF2SettingsButton"
+		"fieldname"		"ReplayButton"
 		"xpos"			"80"
-		"ypos"			"160"
+		"ypos"			"100"
 		"zpos"			"11"
 		"wide"			"190"
 		"tall"			"16"
@@ -1215,14 +1345,12 @@
 			"textinsetx"	"25"
 			"use_proportional_insets" "1"
 			"font"			"CerbeticaBold16"
-			"labelText"		"Adv. Options"
 			"textAlignment"	"west"
 			"dulltext"		"0"
 			"brighttext"	"0"
 			"default"		"1"
 			"sound_depressed"	"UI/buttonclick.wav"
 			"sound_released"	"UI/buttonclickrelease.wav"
-			
 			"border_default"	""
 			"border_armed"		""
 			"paintbackground"	"0"
@@ -1231,8 +1359,9 @@
 			"armedFgColor_override" "Button Color"
 			"depressedFgColor_override" "Button Color"
 			
-			"image_drawcolor"	"117 107 94 255"
-			"image_armedcolor"	"235 226 202 255"	
+			"image_drawcolor"	"TanLight"
+			"image_armedcolor"	"Button Color"
+			
 			"SubImage"
 			{
 				"ControlName"	"ImagePanel"
@@ -1249,105 +1378,6 @@
 		}
 	}
 	
-	"MinmodeToggle"
-	{
-		"ControlName"	"CExImageButton"
-		"fieldName"		"MinmodeToggle"
-		"xpos"			"80"
-		"ypos"			"180"
-		"zpos"			"1"
-		"wide"			"190"
-		"tall"			"16"
-		"autoResize"	"0"
-		"pinCorner"		"3"
-		"visible"		"1"
-		"enabled"		"1"
-		"tabPosition"	"0"
-		"labelText"		"Minmode Toggle"
-		"font"			"CerbeticaBold16"
-		"textAlignment"	"west"
-		"textinsetx"	"15"
-		"use_proportional_insets" "1"
-		"dulltext"		"0"
-		"brighttext"	"0"
-		"default"		"1"
-		"paintbackground" "0"
-		"Command"		"engine incrementvar cl_hud_minmode 0 1 1"
-		
-		"defaultFgColor_override" "TanLight"
-		"armedFgColor_override" "Button Color"
-		"depressedFgColor_override" "Button Color"
-		
-		"sound_depressed"	"UI/buttonclick.wav"
-		"sound_released"	"UI/buttonclickrelease.wav"
-		
-		"image_drawcolor"	"235 226 202 255"
-		"SubImage"
-		{
-			"ControlName"	"ImagePanel"
-			"fieldName"		"SubImage"
-			"xpos"			"16"
-			"ypos"			"6"
-			"zpos"			"1"
-			"wide"			"0"
-			"tall"			"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"scaleImage"	"1"
-			"image"			"glyph_options"
-		}			
-	}
-
-	"QuitButton"
-	{
-		"ControlName"	"CExImageButton"
-		"fieldName"		"QuitButton"
-		"xpos"			"80"
-		"ypos"			"200"
-		"zpos"			"1"
-		"wide"			"190"
-		"tall"			"16"
-		"autoResize"	"0"
-		"pinCorner"		"3"
-		"visible"		"1"
-		"enabled"		"1"
-		"tabPosition"	"0"
-		"labelText"		"Quit"
-		"font"			"CerbeticaBold16"
-		"textAlignment"	"west"
-		"textinsetx"	"15"
-		"use_proportional_insets" "1"
-		"dulltext"		"0"
-		"brighttext"	"0"
-		"default"		"1"
-		"paintbackground""0"
-		"Command"		"engine replay_confirmquit"
-		
-		"defaultFgColor_override" "TanLight"
-		"armedFgColor_override" "Button Color"
-		"depressedFgColor_override" "Button Color"		
-		
-		"sound_depressed"	"UI/buttonclick.wav"
-		"sound_released"	"UI/buttonclickrelease.wav"
-		
-		"image_drawcolor"	"TanLight"
-		"image_armedcolor"	"Button Color"
-		"SubImage"
-		{
-			"ControlName"	"ImagePanel"
-			"fieldName"		"SubImage"
-			"xpos"			"16"
-			"ypos"			"6"
-			"zpos"			"1"
-			"wide"			"0"
-			"tall"			"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"scaleImage"	"1"
-			"image"			"glyph_quit"
-		}				
-	}
-	
 	"DisconnectButton"
 	{
 		"ControlName"	"CExImageButton"
@@ -1397,42 +1427,39 @@
 			"enabled"		"1"
 			"scaleImage"	"1"
 			"image"			"glyph_quit"
-		}				
+		}
 	}
 	
-	"QuestLogButton"
+	"SteamWorkshopButton"
 	{
 		"ControlName"	"EditablePanel"
-		"fieldName"		"QuestLogButton"
-		"xpos"			"90"
-		"ypos"			"220"
-		"zpos"			"1"
-		"wide"			"20"
-		"tall"			"20"
-		"autoResize"	"0"
-		"pinCorner"		"3"
+		"fieldname"		"SteamWorkshopButton"
+		"xpos"			"80"
+		"ypos"			"120"
+		"zpos"			"11"
+		"wide"			"190"
+		"tall"			"16"
 		"visible"		"1"
-		"enabled"		"1"
-		"tabPosition"	"0"
+		"PaintBackgroundType"	"2"
 		
 		"SubButton"
 		{
 			"ControlName"	"CExImageButton"
 			"fieldName"		"SubButton"
-			"xpos"			"-3"
+			"xpos"			"-10"
 			"ypos"			"0"
-			"wide"			"20"
-			"tall"			"20"
-			"zpos"			"5"
+			"wide"			"200"
+			"tall"			"16"
 			"autoResize"	"0"
 			"pinCorner"		"3"
 			"visible"		"1"
 			"enabled"		"1"
 			"tabPosition"	"0"
-			"labelText"		""
-			"font"			""
-			"command"		"questlog"
-			"textAlignment"	"center"
+			"labelText"		"WORKSHOP"
+			"font"			"CerbeticaBold16"
+			"textAlignment"	"west"
+			"textinsetx"	"25"
+			"use_proportional_insets" "1"
 			"dulltext"		"0"
 			"brighttext"	"0"
 			"default"		"1"
@@ -1440,123 +1467,39 @@
 			"sound_depressed"	"UI/buttonclick.wav"
 			"sound_released"	"UI/buttonclickrelease.wav"
 
-			"actionsignallevel" "2"
-			"proportionaltoparent"	"1"
+			"border_default"	""
+			"border_armed"		""
 
 			"paintbackground"	"0"
-			"paintborder"		"0"
 			
 			"defaultFgColor_override" "TanLight"
 			"armedFgColor_override" "Button Color"
 			"depressedFgColor_override" "Button Color"
 
-			"image_drawcolor"	"235 226 202 255"
-			"image_armedcolor"	"72 255 255 255"
-
-			"SubImage"
-			{
-				"ControlName"	"ImagePanel"
-				"fieldName"		"SubImage"
-				"xpos"			"2"
-				"ypos"			"0"
-				"zpos"			"1"
-				"wide"			"16"
-				"tall"			"16"
-				"visible"		"1"
-				"enabled"		"1"
-				"scaleImage"	"1"
-				"image"			"replay/thumbnails/contracts"
-			}
-		}
-	}
-	
-	"WatchStreamButton"
-	{
-		"ControlName"	"EditablePanel"
-		"fieldName"		"WatchStreamButton"
-		"xpos"			"110"
-		"ypos"			"219"
-		"zpos"			"1"
-		"wide"			"20"
-		"tall"			"20"
-		"visible"		"1"
-
-		"SubButton"
-		{
-			"ControlName"	"CExImageButton"
-			"fieldName"		"SubButton"
-			"xpos"			"-3"
-			"ypos"			"0"
-			"wide"			"20"
-			"tall"			"20"
-			"zpos"			"5"
-			"autoResize"	"0"
-			"pinCorner"		"3"
-			"visible"		"1"
-			"enabled"		"1"
-			"tabPosition"	"0"
-			"labelText"		""
-			"font"			""
-			"command"		"watch_stream"
-			"textAlignment"	"center"
-			"dulltext"		"0"
-			"brighttext"	"0"
-			"default"		"1"
-
-			"sound_depressed"	"UI/buttonclick.wav"
-			"sound_released"	"UI/buttonclickrelease.wav"
-
-			"actionsignallevel" "2"
-			"proportionaltoparent"	"1"
-
-			"paintbackground"	"0"
-			"paintborder"		"0"
+			"image_drawcolor"	"117 107 94 255"
+			"image_armedcolor"	"235 226 202 255"
 			
-			"defaultFgColor_override" "TanLight"
-			"armedFgColor_override" "Button Color"
-			"depressedFgColor_override" "Button Color"
-
-			"image_drawcolor"	"235 226 202 255"
-			"image_armedcolor"	"72 255 255 255"
-
 			"SubImage"
 			{
 				"ControlName"	"ImagePanel"
 				"fieldName"		"SubImage"
-				"xpos"			"2"
+				"xpos"			"0"
 				"ypos"			"0"
-				"zpos"			"1"
-				"wide"			"20"
-				"tall"			"20"
-				"visible"		"1"
-				"enabled"		"1"
-				"scaleImage"	"1"
-				"image"			"replay/thumbnails/twitch"
+				"zpos"			"0"
+				"wide"			"0"
+				"tall"			"0"
+				"visible"		"0"
+				"enabled"		"0"
+				"scaleImage"	"0"
 			}
 		}
 	}
-
-	"StreamListPanel"
-	{
-		"ControlName"	"CTFStreamListPanel"
-		"fieldName"		"StreamListPanel"
-		"xpos"			"300"
-		"ypos"			"90"
-		"zpos"			"1"
-		"wide"			"300"
-		"tall"			"325"
-		"visible"		"0"
-		"PaintBackgroundType"	"0"
-		"paintbackground"	"2"
-		"bgcolor_override"	"25 25 25 230"
-		"border"		"NoBorde"
-	}
 	
-	"AchievementsButton"
+	"CallVoteButton"
 	{
 		"ControlName"	"EditablePanel"
-		"fieldName"		"AchievementsButton"
-		"xpos"			"130"
+		"fieldname"		"CallVoteButton"
+		"xpos"			"170"
 		"ypos"			"221"
 		"zpos"			"2"
 		"wide"			"20"
@@ -1583,11 +1526,13 @@
 			"dulltext"		"0"
 			"brighttext"	"0"
 			"default"		"1"
+
 			"sound_depressed"	"UI/buttonclick.wav"
 			"sound_released"	"UI/buttonclickrelease.wav"
-			
+
 			"border_default"	""
 			"border_armed"		""
+
 			"paintbackground"	"0"
 			
 			"defaultFgColor_override" "TanLight"
@@ -1613,18 +1558,18 @@
 			}
 		}
 	}
-	
-	"ReportPlayerButton"
+
+	"MutePlayersButton"
 	{
 		"ControlName"	"EditablePanel"
-		"fieldname"		"ReportPlayerButton"
-		"xpos"			"150"
+		"fieldname"		"MutePlayersButton"
+		"xpos"			"190"
 		"ypos"			"221"
 		"zpos"			"2"
 		"wide"			"20"
 		"tall"			"20"
 		"visible"		"1"
-
+		
 		"SubButton"
 		{
 			"ControlName"	"CExImageButton"
@@ -1647,9 +1592,10 @@
 			"default"		"1"
 			"sound_depressed"	"UI/buttonclick.wav"
 			"sound_released"	"UI/buttonclickrelease.wav"
-			
+
 			"border_default"	""
 			"border_armed"		""
+
 			"paintbackground"	"0"
 			
 			"defaultFgColor_override" "TanLight"
@@ -1675,18 +1621,18 @@
 			}
 		}
 	}
-	
-	"CallVoteButton"
+
+	"ReportPlayerButton"
 	{
 		"ControlName"	"EditablePanel"
-		"fieldname"		"CallVoteButton"
-		"xpos"			"170"
+		"fieldname"		"ReportPlayerButton"
+		"xpos"			"150"
 		"ypos"			"221"
 		"zpos"			"2"
 		"wide"			"20"
 		"tall"			"20"
 		"visible"		"1"
-
+		
 		"SubButton"
 		{
 			"ControlName"	"CExImageButton"
@@ -1707,11 +1653,13 @@
 			"dulltext"		"0"
 			"brighttext"	"0"
 			"default"		"1"
+
 			"sound_depressed"	"UI/buttonclick.wav"
 			"sound_released"	"UI/buttonclickrelease.wav"
-			
+
 			"border_default"	""
 			"border_armed"		""
+
 			"paintbackground"	"0"
 			
 			"defaultFgColor_override" "TanLight"
@@ -1738,97 +1686,85 @@
 		}
 	}
 	
-	"MutePlayersButton"
+	"BackToReplaysButton"
 	{
-		"ControlName"	"EditablePanel"
-		"fieldname"		"MutePlayersButton"
-		"xpos"			"190"
-		"ypos"			"221"
-		"zpos"			"2"
-		"wide"			"20"
-		"tall"			"20"
-		"visible"		"1"
-
-		"SubButton"
+		"ControlName"			"CExImageButton"
+		"fieldName"				"BackToReplaysButton"
+		"xpos"					"c-300"
+		"ypos"					"437"
+		"zpos"					"1"
+		"wide"					"170"
+		"tall"					"25"
+		"autoResize"			"0"
+		"pinCorner"				"3"
+		"visible"				"0"
+		"enabled"				"1"
+		"tabPosition"			"0"
+		"labelText"				"#GameUI_GameMenu_ExitReplay"
+		"font"					"HudFontSmallBold"
+		"textAlignment"			"west"
+		"textinsetx"			"35"
+		"use_proportional_insets" "1"
+		"dulltext"				"0"
+		"brighttext"			"0"
+		"default"				"1"
+		"Command"				"exitreplayeditor"
+	
+		"sound_depressed"		"UI/buttonclick.wav"
+		"sound_released"		"UI/buttonclickrelease.wav"
+		
+		"image_drawcolor"		"TanLight"
+		"image_armedcolor"		"Button Color"
+		"SubImage"
 		{
-			"ControlName"	"CExImageButton"
-			"fieldName"		"SubButton"
-			"xpos"			"0"
-			"ypos"			"0"
-			"wide"			"20"
-			"tall"			"20"
-			"autoResize"	"0"
-			"pinCorner"		"3"
-			"visible"		"1"
-			"enabled"		"1"
-			"tabPosition"	"0"
-			"textinsetx"	"100"
-			"use_proportional_insets" "1"
-			"font"			"HudFontSmallBold"
-			"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" "TanLight"
-			"armedFgColor_override" "Button Color"
-			"depressedFgColor_override" "Button Color"
-
-			"image_drawcolor"	"235 226 202 255"
-			"image_armedcolor"	"72 255 255 255"
-			
-			"SubImage"
-			{
-				"ControlName"	"ImagePanel"
-				"fieldName"		"SubImage"
-				"xpos"			"2"
-				"ypos"			"0"
-				"zpos"			"1"
-				"wide"			"15"
-				"tall"			"15"
-				"visible"		"1"
-				"enabled"		"1"
-				"scaleImage"	"1"
-				"image"			"glyph_achievements"
-			}
+			"ControlName"				"ImagePanel"
+			"fieldName"					"SubImage"
+			"xpos"						"16"
+			"ypos"						"6"
+			"zpos"						"1"
+			"wide"						"14"
+			"tall"						"14"
+			"visible"					"1"
+			"enabled"					"1"
+			"scaleImage"				"1"
+			"image"						"glyph_quit"
 		}
 	}
 	
-	"BackToReplaysButton"
+	"MinmodeToggle"
 	{
 		"ControlName"	"CExImageButton"
-		"fieldName"		"BackToReplaysButton"
-		"xpos"			"c-300"
-		"ypos"			"437"
+		"fieldName"		"MinmodeToggle"
+		"xpos"			"80"
+		"ypos"			"180"
 		"zpos"			"1"
-		"wide"			"170"
-		"tall"			"25"
+		"wide"			"190"
+		"tall"			"16"
 		"autoResize"	"0"
 		"pinCorner"		"3"
-		"visible"		"0"
+		"visible"		"1"
 		"enabled"		"1"
 		"tabPosition"	"0"
-		"labelText"		"#GameUI_GameMenu_ExitReplay"
-		"font"			"HudFontSmallBold"
+		"font"			"CerbeticaBold16"
 		"textAlignment"	"west"
-		"textinsetx"	"35"
+		"labelText"		"Minmode Toggle"
+		"textinsetx"	"15"
 		"use_proportional_insets" "1"
 		"dulltext"		"0"
 		"brighttext"	"0"
 		"default"		"1"
-		"Command"		"exitreplayeditor"
-	
 		"sound_depressed"	"UI/buttonclick.wav"
 		"sound_released"	"UI/buttonclickrelease.wav"
+		"paintbackground" "0"
+		"Command"		"engine incrementvar cl_hud_minmode 0 1 1"
+
 		
-		"image_drawcolor"	"TanLight"
-		"image_armedcolor"	"Button Color"
+		"defaultFgColor_override" "TanLight"
+		"armedFgColor_override" "Button Color"
+		"depressedFgColor_override" "Button Color"
+		
+		
+		"image_drawcolor"	"235 226 202 255"
 		"SubImage"
 		{
 			"ControlName"	"ImagePanel"
@@ -1836,32 +1772,15 @@
 			"xpos"			"16"
 			"ypos"			"6"
 			"zpos"			"1"
-			"wide"			"14"
-			"tall"			"14"
+			"wide"			"0"
+			"tall"			"0"
 			"visible"		"1"
 			"enabled"		"1"
 			"scaleImage"	"1"
-			"image"			"glyph_quit"
+			"image"			"glyph_options"
 		}
 	}
 
-	"VersionNumber"
-	{
-		"ControlName"	"CExLabel"
-		"fieldname"		"VersionNumber"
-		"font"			"CerbeticaBold20"
-		"labelText"		"rayshud v2018.1220"
-		"xpos"			"112"
-		"ypos"			"35"
-		"wide"			"130"
-		"tall"			"20"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"1"
-		"enabled"		"1"
-		"fgcolor_override"	"255 255 255 255"
-	}
-
 	"icon_generator"
 	{
 		"ControlName"	"CEmbeddedItemModelPanel"