20171209 - Classic Main Menu to use new icons

- More formatting tweaks to the clientscheme and 4:3 files
- Fixed developmental issues with the main menu

3 files changed, 270 insertions, 316 deletions

diff --git a/customizations/4;3 Ratio/ScoreBoard.res b/customizations/4;3 Ratio/ScoreBoard.res
index 5ee9390..b2befab 100644
--- a/customizations/4;3 Ratio/ScoreBoard.res
+++ b/customizations/4;3 Ratio/ScoreBoard.res
@@ -14,107 +14,104 @@
 		"enabled"			"1"
 		"tabPosition"		"0"
 		"avatar_width"		"54"
-		"medal_width"		"14"		
+		"medal_width"		"14"
 		"name_width"		"0"
 		"name_width_short"	"65"
 		"spacer"			"5"
-		"status_width"		"15"	
-		"nemesis_width"		"15"	
-		"class_width"		"20"	
+		"status_width"		"15"
+		"nemesis_width"		"15"
+		"class_width"		"20"
 		"score_width"		"20"
-		"ping_width"		"20"	
+		"ping_width"		"20"
 		"killstreak_width"	"15"
 		"killstreak_image_width" "15"
 	}
 	"BlueScoreBG"
 	{
 		"ControlName"		"ImagePanel"
-		"fieldName"		"BlueScoreBG"
-		"xpos"			"c-270"
-		"ypos"			"144"
-		"ypos_minmode"  "279"
-		"wide"			"270"
-		"tall"			"25"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"1"
-		"enabled"		"1"
-		"fillcolor"		"70 130 180 153"
+		"fieldName"			"BlueScoreBG"
+		"xpos"				"c-270"
+		"ypos"				"144"
+		"ypos_minmode"  	"279"
+		"wide"				"270"
+		"tall"				"25"
+		"autoResize"		"0"
+		"pinCorner"			"0"
+		"visible"			"1"
+		"enabled"			"1"
+		"fillcolor"			"70 130 180 153"
 		"scaleImage"		"1"
 		
-		if_mvm
-		{
+		if_mvm {
 			"visible"		"0"
 		}
 	}
 	"BlueLeaderAvatar"
 	{
 		"ControlName"		"CAvatarImagePanel"
-		"fieldName"		"BlueLeaderAvatar"
-		"xpos"			"c-295"
-		"ypos"			"144"
-		"ypos_minmode"	"279"
-		"zpos"			"5"
-		"wide"			"25"
-		"tall"			"25"
-		"visible"		"0"
-		"enabled"		"1"
-		"image"			""
-		"scaleImage"	"1"	
-		"color_outline"	"52 48 45 255"
+		"fieldName"			"BlueLeaderAvatar"
+		"xpos"				"c-295"
+		"ypos"				"144"
+		"ypos_minmode"		"279"
+		"zpos"				"5"
+		"wide"				"25"
+		"tall"				"25"
+		"visible"			"0"
+		"enabled"			"1"
+		"image"				""
+		"scaleImage"		"1"	
+		"color_outline"		"52 48 45 255"
 	}
 	"RedScoreBG"
 	{
 		"ControlName"		"ImagePanel"
-		"fieldName"		"RedScoreBG"
-		"xpos"			"c0"
-		"ypos"			"144"
-		"ypos_minmode"  "279"
-		"wide"			"270"
-		"tall"			"25"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"1"
-		"enabled"		"1"
-		"fillcolor"		"205 50 50 153"
+		"fieldName"			"RedScoreBG"
+		"xpos"				"c0"
+		"ypos"				"144"
+		"ypos_minmode"  	"279"
+		"wide"				"270"
+		"tall"				"25"
+		"autoResize"		"0"
+		"pinCorner"			"0"
+		"visible"			"1"
+		"enabled"			"1"
+		"fillcolor"			"205 50 50 153"
 		"scaleImage"		"1"
 		
-		if_mvm
-		{
+		if_mvm {
 			"visible"		"0"
 		}
 	}
 	"RedLeaderAvatar"
 	{
 		"ControlName"		"CAvatarImagePanel"
-		"fieldName"		"RedLeaderAvatar"
-		"xpos"			"c270"
-		"ypos"			"144"
-		"ypos_minmode"	"279"
-		"zpos"			"5"
-		"wide"			"25"
-		"tall"			"25"
-		"visible"		"0"
-		"enabled"		"1"
-		"image"			""
-		"scaleImage"	"1"	
-		"color_outline"	"52 48 45 255"
+		"fieldName"			"RedLeaderAvatar"
+		"xpos"				"c270"
+		"ypos"				"144"
+		"ypos_minmode"		"279"
+		"zpos"				"5"
+		"wide"				"25"
+		"tall"				"25"
+		"visible"			"0"
+		"enabled"			"1"
+		"image"				""
+		"scaleImage"		"1"	
+		"color_outline"		"52 48 45 255"
 	}
 	"MainBG"
 	{
 		"ControlName"		"ImagePanel"
-		"fieldName"		"MainBG"
-		"xpos"			"0"
-		"ypos"			"0"
-		"zpos"			"-1"
-		"wide"			"9999"
-		"tall"			"9999"
-		"pinCorner"		"0"
-		"visible"		"0"
-		"enabled"		"0"
+		"fieldName"			"MainBG"
+		"xpos"				"0"
+		"ypos"				"0"
+		"zpos"				"-1"
+		"wide"				"9999"
+		"tall"				"9999"
+		"pinCorner"			"0"
+		"visible"			"0"
+		"enabled"			"0"
 		
-		if_mvm
-		{
+		if_mvm {
 			"visible"		"0"
 		}
 	}
diff --git a/customizations/4;3 Ratio/SpectatorTournament.res b/customizations/4;3 Ratio/SpectatorTournament.res
index 3755013..c961535 100644
--- a/customizations/4;3 Ratio/SpectatorTournament.res
+++ b/customizations/4;3 Ratio/SpectatorTournament.res
@@ -2,14 +2,14 @@
 {
 	"specgui"
 	{
-		"ControlName"		"Frame"
+		"ControlName"	"Frame"
 		"fieldName"		"specgui"
 		"wide"			"f0"
 		"tall"			"480"
 		"autoResize"	"0"
 		"pinCorner"		"0"
 		"enabled"		"1"
-				
+	
 		"team1_player_base_offset_x"		"0"
 		"team1_player_base_y"				"220"
 		"team1_player_delta_x"				"0"
@@ -18,133 +18,130 @@
 		"team2_player_base_y"				"240"
 		"team2_player_delta_x"				"0"
 		"team2_player_delta_y"				"16"
-		
+	
 		"playerpanels_kv"
 		{
 			"visible"		"0"
 			"wide"			"156"
 			"tall"			"16"
 			"zpos"			"1"
-		
-
-			
 			"color_ready"	"0 255 0 220"
 			"color_notready"	"0 0 0 220"
 			
 			"tabPosition"	"0"
 			
 			"PanelBackground"
-			{
-			"ControlName" 	"ImagePanel"
-			"fieldName" 	"PanelBackground"
-			"xpos" 			"0"
-			"ypos"			"0"
-			"zpos" 			"-1"
-			"wide" 			"160"
-			"tall" 			"0"
-			"autoResize" 	"0"
-			"pinCorner"		"0"
-			"visible" 		"1"
-			"enabled" 		"1"
-			"fillcolor" 	"15 15 15 50"
+				{
+				"ControlName" 	"ImagePanel"
+				"fieldName" 	"PanelBackground"
+				"xpos" 			"0"
+				"ypos"			"0"
+				"zpos" 			"-1"
+				"wide" 			"160"
+				"tall" 			"0"
+				"autoResize" 	"0"
+				"pinCorner"		"0"
+				"visible" 		"1"
+				"enabled" 		"1"
+				"fillcolor" 	"15 15 15 50"
 			}
 			
 			"PanelLeftFringe"
-			{
-			"ControlName" 	"ImagePanel"
-			"fieldName" 	"PanelLeftFringe"
-			"xpos" 			"0"
-			"ypos"			"0"
-			"zpos" 			"-1"
-			"wide" 			"52"
-			"tall" 			"18"
-			"autoResize" 	"0"
-			"pinCorner"		"0"
-			"visible" 		"1"
-			"enabled" 		"1"
-			"fillcolor" 	"15 15 15 64"
-			}			
+				{
+				"ControlName" 	"ImagePanel"
+				"fieldName" 	"PanelLeftFringe"
+				"xpos" 			"0"
+				"ypos"			"0"
+				"zpos" 			"-1"
+				"wide" 			"52"
+				"tall" 			"18"
+				"autoResize" 	"0"
+				"pinCorner"		"0"
+				"visible" 		"1"
+				"enabled" 		"1"
+				"fillcolor" 	"15 15 15 64"
+			}
 			
 			"PanelLeftHalf"
-			{
-			"ControlName" 	"ImagePanel"
-			"fieldName" 	"PanelLeftHalf"
-			"xpos" 			"0"
-			"ypos"			"0"
-			"zpos" 			"-1"
-			"wide" 			"49"
-			"tall" 			"18"
-			"autoResize" 	"0"
-			"pinCorner"		"0"
-			"visible" 		"1"
-			"enabled" 		"1"
-			"fillcolor" 	"15 15 15 128"
+				{
+				"ControlName" 	"ImagePanel"
+				"fieldName" 	"PanelLeftHalf"
+				"xpos" 			"0"
+				"ypos"			"0"
+				"zpos" 			"-1"
+				"wide" 			"49"
+				"tall" 			"18"
+				"autoResize" 	"0"
+				"pinCorner"		"0"
+				"visible" 		"1"
+				"enabled" 		"1"
+				"fillcolor" 	"15 15 15 128"
 			}
 			
 			"PanelLeftFull"
-			{
-			"ControlName" 	"ImagePanel"
-			"fieldName" 	"PanelLeftFull"
-			"xpos" 			"0"
-			"ypos"			"0"
-			"zpos" 			"-1"
-			"wide" 			"26"
-			"tall" 			"18"
-			"autoResize" 	"0"
-			"pinCorner"		"0"
-			"visible" 		"1"
-			"enabled" 		"1"
-			"fillcolor" 	"15 15 15 110"
+				{
+				"ControlName" 	"ImagePanel"
+				"fieldName" 	"PanelLeftFull"
+				"xpos" 			"0"
+				"ypos"			"0"
+				"zpos" 			"-1"
+				"wide" 			"26"
+				"tall" 			"18"
+				"autoResize" 	"0"
+				"pinCorner"		"0"
+				"visible" 		"1"
+				"enabled" 		"1"
+				"fillcolor" 	"15 15 15 110"
 			}
 			
 			"PanelFull"
-			{
-			"ControlName" 	"ImagePanel"
-			"fieldName" 	"PanelFull"
-			"xpos" 			"0"
-			"ypos"			"0"
-			"zpos" 			"-1"
-			"wide" 			"160"
-			"tall" 			"18"
-			"autoResize" 	"0"
-			"pinCorner"		"0"
-			"visible" 		"1"
-			"enabled" 		"1"
-			"fillcolor" 	"15 15 15 100"
+				{
+				"ControlName" 	"ImagePanel"
+				"fieldName" 	"PanelFull"
+				"xpos" 			"0"
+				"ypos"			"0"
+				"zpos" 			"-1"
+				"wide" 			"160"
+				"tall" 			"18"
+				"autoResize" 	"0"
+				"pinCorner"		"0"
+				"visible" 		"1"
+				"enabled" 		"1"
+				"fillcolor" 	"15 15 15 100"
 			}
 			
 			"PanelBottom"
 			{
-			"ControlName" 	"ImagePanel"
-			"fieldName" 	"PanelBottom"
-			"xpos" 			"0"
-			"ypos"			"15"
-			"zpos" 			"-1"
-			"wide" 			"160"
-			"tall" 			"4"
-			"autoResize" 	"0"
-			"pinCorner"		"0"
-			"visible" 		"0"
-			"enabled" 		"0"
-			"fillcolor" 	"15 15 15 255"
+				"ControlName" 	"ImagePanel"
+				"fieldName" 	"PanelBottom"
+				"xpos" 			"0"
+				"ypos"			"15"
+				"zpos" 			"-1"
+				"wide" 			"160"
+				"tall" 			"4"
+				"autoResize" 	"0"
+				"pinCorner"		"0"
+				"visible" 		"0"
+				"enabled" 		"0"
+				"fillcolor" 	"15 15 15 255"
 			}
 			
 			"PanelRight"
 			{
-			"ControlName" 	"ImagePanel"
-			"fieldName" 	"PanelRight"
-			"xpos" 			"157"
-			"ypos"			"0"
-			"zpos" 			"-1"
-			"wide" 			"4"
-			"tall" 			"16"
-			"autoResize" 	"0"
-			"pinCorner"		"0"
-			"visible" 		"0"
-			"enabled" 		"0"
-			"fillcolor" 	"15 15 15 255"
+				"ControlName" 	"ImagePanel"
+				"fieldName" 	"PanelRight"
+				"xpos" 			"157"
+				"ypos"			"0"
+				"zpos" 			"-1"
+				"wide" 			"4"
+				"tall" 			"16"
+				"autoResize" 	"0"
+				"pinCorner"		"0"
+				"visible" 		"0"
+				"enabled" 		"0"
+				"fillcolor" 	"15 15 15 255"
 			}
-		
+			
 			"playername"
 			{
 				"ControlName"	"CExLabel"
@@ -161,7 +158,6 @@
 				"labelText"		"%playername%"
 				"textAlignment"	"west"
 				"fgcolor"		"235 226 202 255"
-			
 			}
 			
 			"classimage"
@@ -175,14 +171,13 @@
 				"tall"			"18"
 				"visible"		"1"
 				"enabled"		"1"
-				"team1_image"			"../hud/class_scoutred"
+				"team1_image"	"../hud/class_scoutred"
 				"scaleImage"	"1"	
-				
 			}
 			
 			"classimagebg"
 			{
-				"ControlName"		"Panel"
+				"ControlName"	"Panel"
 				"fieldName"		"classimagebg"
 				"xpos"			"9999"
 				"ypos"			"9999"
@@ -193,30 +188,29 @@
 				"enabled"		"1"
 				"bgcolor_override"		"Black"
 				"PaintBackgroundType"	"0"
-				
 			}
 			
 			"HealthIcon"
-				{
-					"ControlName" "EditablePanel"
-					"fieldName" "HealthIcon"
-					"xpos" "0"
-					"ypos" "0"
-					"zpos" "3"
-					"wide" "24"
-					"tall" "14"
-					"visible" "1"
-					"enabled" "1"
-					"HealthBonusPosAdj" "10"
-					"HealthDeathWarning" "0.49"
-					"TFFont" "HudFontSmallest"
-					"HealthDeathWarningColor" "HUDDeathWarning"
-					"TextColor" "HudOffWhite"
-				}
+			{
+				"ControlName" "EditablePanel"
+				"fieldName" "HealthIcon"
+				"xpos" "0"
+				"ypos" "0"
+				"zpos" "3"
+				"wide" "24"
+				"tall" "14"
+				"visible" "1"
+				"enabled" "1"
+				"HealthBonusPosAdj" "10"
+				"HealthDeathWarning" "0.49"
+				"TFFont" "HudFontSmallest"
+				"HealthDeathWarningColor" "HUDDeathWarning"
+				"TextColor" "HudOffWhite"
+			}
 			
 			"ReadyBG"
 			{
-				"ControlName"		"ScalableImagePanel"
+				"ControlName"	"ScalableImagePanel"
 				"fieldName"		"ReadyBG"
 				"xpos"			"0"
 				"ypos"			"0"
@@ -229,17 +223,16 @@
 				"enabled"		"1"
 				"image"			"../HUD/tournament_panel_brown"
 
-				"src_corner_height"	"22"				// pixels inside the image
+				"src_corner_height"	"22"			// pixels inside the image
 				"src_corner_width"	"22"
 			
 				"draw_corner_width"	"3"				// screen size of the corners ( and sides ), proportional
-				"draw_corner_height" 	"3"
-				
+				"draw_corner_height" "3"
 			}
 			
 			"ReadyImage"
 			{
-				"ControlName"		"ImagePanel"
+				"ControlName"	"ImagePanel"
 				"fieldName"		"ReadyImage"
 				"xpos"			"32"
 				"ypos"			"8"
@@ -251,8 +244,7 @@
 				"visible"		"0"
 				"enabled"		"1"
 				"image"			"hud/checkmark"
-				"scaleImage"		"1"
-
+				"scaleImage"	"1"
 			}
 			
 			"respawntime"
@@ -271,7 +263,6 @@
 				"labelText"		"%respawntime%"
 				"textAlignment"	"west"
 				"fgcolor"		"255 20 175 255"
-				
 			}
 			"respawntimeBG"
 			{
@@ -289,7 +280,6 @@
 				"labelText"		"%respawntime%"
 				"textAlignment"	"west"
 				"fgcolor"		"TransparentBlack"
-				
 			}
 			"healthcover"
 			{
@@ -307,7 +297,6 @@
 				"labelText"		"%respawntime%"
 				"textAlignment"	"west"
 				"fgcolor"		"15 15 15 110"
-				
 			}
 			
 			"chargeamount"
@@ -362,9 +351,7 @@
 				"textAlignment"	"north-west"
 				//"fgcolor"		"235 226 202 255"
 			}
-			
 		}
-		
 	}
 
 	"topbar"
@@ -384,14 +371,14 @@
 	}
 	"bottombarblank"
 	{
-		"ControlName"		"Panel"
+		"ControlName"	"Panel"
 		"fieldName"		"bottombarblank"
 		"visible"		"0"
 		"ypos"			"480"
 	}
 	"ReinforcementsLabel"
 	{
-		"ControlName"		"CExLabel"
+		"ControlName"	"CExLabel"
 		"fieldName"		"ReinforcementsLabel"
 		"xpos"			"c-300"	[$WIN32]
 		"ypos"			"50"	[$WIN32]
@@ -405,9 +392,8 @@
 		"textAlignment"		"center"
 		"font"			"Cerbetica24"
 		
-		if_mvm
-		{
-		"ypos"			"68"	[$WIN32]
+		if_mvm {
+			"ypos"		"68"	[$WIN32]
 		}
 		
 	}
@@ -429,63 +415,62 @@
 		"wrap"			"1"
 		"centerwrap"	"1"
 	
-		if_mvm
-		{
-			"visible"		"1"
+		if_mvm {
+			"visible"	"1"
 		}	
 	}
 	"MapLabel"
 	{
-		"ControlName"		"CExLabel"
+		"ControlName"	"CExLabel"
 		"fieldName"		"MapLabel"
 		"visible"		"0"
 	}
 	"ClassOrTeamLabel"
 	{
-		"ControlName"		"CExLabel"
+		"ControlName"	"CExLabel"
 		"fieldName"		"ClassOrTeamLabel"
 		"visible"		"0"
 	}
 	"SwitchCamModeKeyLabel"
 	{
-		"ControlName"		"CExLabel"
+		"ControlName"	"CExLabel"
 		"fieldName"		"SwitchCamModeKeyLabel"
 		"visible"		"0"
 		
 	}
 	"SwitchCamModeLabel"
 	{
-		"ControlName"		"CExLabel"
+		"ControlName"	"CExLabel"
 		"fieldName"		"SwitchCamModeLabel"
 		"visible"		"0"
 	}
 	"CycleTargetFwdKeyLabel"
 	{
-		"ControlName"		"CExLabel"
+		"ControlName"	"CExLabel"
 		"fieldName"		"CycleTargetFwdKeyLabel"
 		"visible"		"0"
 	}
 	"CycleTargetFwdLabel"
 	{
-		"ControlName"		"CExLabel"
+		"ControlName"	"CExLabel"
 		"fieldName"		"CycleTargetFwdLabel"
 		"visible"		"0"
 	}
 	"CycleTargetRevKeyLabel"
 	{
-		"ControlName"		"CExLabel"
+		"ControlName"	"CExLabel"
 		"fieldName"		"CycleTargetRevKeyLabel"
 		"visible"		"0"
 	}
 	"CycleTargetRevLabel"
 	{
-		"ControlName"		"CExLabel"
+		"ControlName"	"CExLabel"
 		"fieldName"		"CycleTargetRevLabel"
 		"visible"		"0"
 	}
 	"TipLabel"
 	{
-		"ControlName"		"CExLabel"
+		"ControlName"	"CExLabel"
 		"fieldName"		"TipLabel"
 		"visible"		"0"
 	}
@@ -507,10 +492,10 @@
 		"model_wide"		"90"
 		"model_tall"		"60"
 		
-		"text_xpos"		"10"
-		"text_ypos"		"10"
-		"text_wide"		"220"
-		"text_center"	"1"
+		"text_xpos"			"10"
+		"text_ypos"			"10"
+		"text_wide"			"220"
+		"text_center"		"1"
 		
 		"max_text_height"	"100"
 		"padding_height"	"10"
@@ -556,7 +541,7 @@
 		}
 		
 		"ItemLabel"
-		{	
+		{
 			"ControlName"	"Label"
 			"fieldName"		"ItemLabel"
 			"font"			"Cerbetica12"
@@ -574,7 +559,7 @@
 			"dulltext"		"0"
 			"brighttext"	"0"
 		}
-	}	
+	}
 	"spectator_extras"
 	{
 		"ControlName"	"EditablePanel"
@@ -587,5 +572,5 @@
 		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
-	}	
-}
+	}
+}
\ No newline at end of file
diff --git a/customizations/Classic Main Menu/resource/ui/mainmenuoverride.res b/customizations/Classic Main Menu/resource/ui/mainmenuoverride.res
index 8fa7027..6c22382 100644
--- a/customizations/Classic Main Menu/resource/ui/mainmenuoverride.res
+++ b/customizations/Classic Main Menu/resource/ui/mainmenuoverride.res
@@ -568,7 +568,7 @@
 				"tall"			"20"
 				"visible"		"1"
 				"enabled"		"1"
-				"image"			"button_MOTD"
+				"image"			"replay/thumbnails/buttons/motd"
 				"scaleImage"	"1"
 			}
 		}
@@ -929,7 +929,7 @@
 		"pinCorner"		"3"
 		"visible"		"1"
 		"enabled"		"1"
-				
+	
 		"SubImage"
 		{
 			"ControlName"	"ImagePanel"
@@ -1034,7 +1034,7 @@
 				"tall"			"20"
 				"visible"		"0"
 				"enabled"		"0"
-				"image"			"button_Alert"
+				"image"			"replay/thumbnails/buttons/alert"
 				"scaleImage"	"1"
 			}
 		}
@@ -1830,67 +1830,91 @@
 		}
 	}
 	
-	"ReportBugButton"
+	"WatchStreamButton"
 	{
 		"ControlName"	"EditablePanel"
-		"fieldName"		"ReportBugButton"
+		"fieldName"		"WatchStreamButton"
 		"xpos"			"130"
 		"ypos"			"220"
 		"zpos"			"1"
 		"wide"			"20"
-		"tall"			"20"
+		"tall"			"25"
+		"autoResize"	"0"
+		"pinCorner"		"3"
 		"visible"		"1"
+		"enabled"		"1"
+		"tabPosition"	"0"
 
 		"SubButton"
 		{
 			"ControlName"	"CExImageButton"
 			"fieldName"		"SubButton"
-			"xpos"			"0"
+			"xpos"			"-3"
 			"ypos"			"0"
 			"wide"			"20"
 			"tall"			"20"
+			"zpos"			"5"
 			"autoResize"	"0"
 			"pinCorner"		"3"
 			"visible"		"1"
 			"enabled"		"1"
 			"tabPosition"	"0"
-			"textinsetx"	"100"
-			"use_proportional_insets" "1"
-			"font"			"HudFontSmallBold"
-			"textAlignment"	"west"
+			"labelText"		""
+			"font"			""
+			"command"		"watch_stream"
+			"textAlignment"	"center"
 			"dulltext"		"0"
 			"brighttext"	"0"
 			"default"		"1"
+
 			"sound_depressed"	"UI/buttonclick.wav"
 			"sound_released"	"UI/buttonclickrelease.wav"
-			
-			"border_default"	""
-			"border_armed"		""
+
+			"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"	"Button Color"
-			
+			"image_armedcolor"	"72 255 255 255"
+
 			"SubImage"
 			{
 				"ControlName"	"ImagePanel"
 				"fieldName"		"SubImage"
-				"xpos"			"4"
-				"ypos"			"4"
+				"xpos"			"2"
+				"ypos"			"0"
 				"zpos"			"1"
-				"wide"			"12"
-				"tall"			"12"
+				"wide"			"20"
+				"tall"			"20"
 				"visible"		"1"
 				"enabled"		"1"
-				"image"			"glyph_bug"
 				"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"		"NoBorde"
+	}
 	
 	"ReportPlayerButton"
 	{
@@ -2086,119 +2110,67 @@
 		"ypos"			"220"
 		"zpos"			"1"
 		"wide"			"20"
-		"tall"			"20"
+		"tall"			"25"
 		"autoResize"	"0"
 		"pinCorner"		"3"
 		"visible"		"1"
 		"enabled"		"1"
 		"tabPosition"	"0"
-
+		
 		"SubButton"
 		{
 			"ControlName"	"CExImageButton"
 			"fieldName"		"SubButton"
-			"xpos"			"0"
+			"xpos"			"-3"
 			"ypos"			"0"
-			"wide"			"f0"
-			"tall"			"f0"
+			"wide"			"20"
+			"tall"			"20"
+			"zpos"			"5"
 			"autoResize"	"0"
 			"pinCorner"		"3"
 			"visible"		"1"
 			"enabled"		"1"
 			"tabPosition"	"0"
-			"textinsetx"	"25"
 			"labelText"		""
-			"use_proportional_insets" "1"
-			"font"			"HudFontSmallBold"
+			"font"			""
 			"command"		"questlog"
-			"textAlignment"	"west"
+			"textAlignment"	"center"
 			"dulltext"		"0"
 			"brighttext"	"0"
 			"default"		"1"
+
 			"sound_depressed"	"UI/buttonclick.wav"
 			"sound_released"	"UI/buttonclickrelease.wav"
+
 			"actionsignallevel" "2"
 			"proportionaltoparent"	"1"
-				
-			"sound_depressed"	"UI/buttonclick.wav"
-			"sound_released"	"UI/buttonclickrelease.wav"
+
 			"paintbackground"	"0"
 			"paintborder"		"0"
+			
+			"defaultFgColor_override" "TanLight"
+			"armedFgColor_override" "Button Color"
+			"depressedFgColor_override" "Button Color"
+
 			"image_drawcolor"	"235 226 202 255"
-			"image_armedcolor"	"255 255 255 255"
+			"image_armedcolor"	"72 255 255 255"
 
 			"SubImage"
 			{
 				"ControlName"	"ImagePanel"
 				"fieldName"		"SubImage"
-				"xpos"			"cs-0.5"
-				"ypos"			"cs-0.5"
+				"xpos"			"2"
+				"ypos"			"0"
 				"zpos"			"1"
-				"wide"			"f0"
-				"tall"			"f0"
-				"visible"		"1"
-				"enabled"		"1"
-				"scaleImage"	"1"
-				"image"			"button_quests"
-
-				"proportionaltoparent"	"1"
-				"mouseinputenabled"	"0"
-				"keyboardinputenabled" "0"
-			}		
-		}
-		
-		"NotificationsContainer"
-		{
-			"ControlName"	"EditablePanel"
-			"fieldName"		"NotificationsContainer"
-			"xpos"			"rs1"
-			"ypos"			"0"
-			"zpos"			"10"
-			"wide"			"16"
-			"tall"			"16"
-			"visible"		"0"
-			"proportionaltoparent"	"1"
-			"mouseinputenabled"	"0"
-			"keyboardinputenabled" "0"
-
-			"SubImage"
-			{
-				"ControlName"	"ImagePanel"
-				"fieldName"		"SubImage"
-				"xpos"			"cs-0.5"
-				"ypos"			"cs-0.5"
-				"zpos"			"3"
 				"wide"			"16"
 				"tall"			"16"
 				"visible"		"1"
 				"enabled"		"1"
-				"image"			"glyph_achievements"
 				"scaleImage"	"1"
-				"drawcolor" "210 125 33 255"
-				"proportionaltoparent"	"1"
-			}				
-		
-			"Notifications_CountLabel"
-			{
-				"ControlName"	"CExLabel"
-				"fieldName"		"Notifications_CountLabel"
-				"font"			"HudFontSmallestBold"
-				"labelText"		"%noticount%"
-				"textAlignment"	"center"
-				"xpos"			"cs-0.5"
-				"ypos"			"cs-0.5"
-				"zpos"			"4"
-				"wide"			"16"
-				"tall"			"16"
-				"autoResize"	"0"
-				"pinCorner"		"0"
-				"visible"		"1"
-				"enabled"		"1"
-				"fgcolor_override"	"255 255 255 255"
-				"proportionaltoparent"	"1"
+				"image"			"replay/thumbnails/buttons/contracts"
 			}
 		}
-	}			
+	}		
 	
 	"BackToReplaysButton"
 	{