Pushed out new scoreboards (both 6s and 9s)

3 files changed, 628 insertions, 567 deletions

diff --git a/resource/ui/MvMScoreboard.res b/resource/ui/MvMScoreboard.res
index 878e858..d0a0dda 100644
--- a/resource/ui/MvMScoreboard.res
+++ b/resource/ui/MvMScoreboard.res
@@ -4,7 +4,7 @@
 	{
 		"ControlName"		"CWaveStatusPanel"
 		"fieldName"			"WaveStatusPanel"
-		"xpos"				"100"
+		"xpos"				"c-300"
 		"ypos"				"8"
 		"zpos"				"0"
 		"wide"				"600"
@@ -19,11 +19,11 @@
 	{
 		"ControlName"		"ImagePanel"
 		"fieldName"		"ScoreboardBackground"
-		"xpos"			"98"
-		"ypos"			"71"
+		"xpos"			"c-270"
+		"ypos"			"244"
 		"zpos"			"-1"
-		"wide"			"545"
-		"tall"			"288"
+		"wide"			"540"
+		"tall"			"500"
 		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
@@ -36,9 +36,9 @@
 		"font"			"Cerbetica24"
 		"labelText"		"%popfile%"
 		"textAlignment"	"center"
-		"xpos"			"118"
-		"ypos"			"c145"
-		"wide"			"290"
+		"xpos"			"c-270"
+		"ypos"			"c-30"
+		"wide"			"270"
 		"tall"			"30"
 		"fgcolor"		"tanlight"
 	}
@@ -47,10 +47,10 @@
 	{
 		"ControlName"	"EditablePanel"
 		"fieldName"		"DifficultyContainer"
-		"xpos"			"430"
-		"ypos"			"c150"
-		"wide"			"150"
-		"tall"			"50"
+		"xpos"			"c0"
+		"ypos"			"c-30"
+		"wide"			"270"
+		"tall"			"30"
 		"visible"		"1"
 		
 		"DifficultyLabel"
@@ -62,8 +62,8 @@
 			"textAlignment"	"center"
 			"xpos"			"0"
 			"ypos"			"-6"
-			"wide"			"150"
-			"tall"			"30"
+			"wide"			"0"
+			"tall"			"0" //disable
 			"fgcolor"		"tanlight"
 		}
 		
@@ -71,13 +71,13 @@
 		{
 			"ControlName"	"CExLabel"
 			"fieldName"		"DifficultyValue"
-			"font"			"Cerbetica16"
+			"font"			"Cerbetica24"
 			"labelText"		"%difficultyvalue%"
 			"textAlignment"	"center"
 			"xpos"			"0"
-			"ypos"			"16"
-			"wide"			"150"
-			"tall"			"20"
+			"ypos"			"0"
+			"wide"			"270"
+			"tall"			"30"
 			"fgcolor"		"tanlight"
 		}
 	}
@@ -106,12 +106,12 @@
 	
 	"MvMPlayerList"
 	{
-		"ControlName"	"SectionedListPanel"
+		"ControlName"	"SectionedLsistPanel"
 		"fieldName"		"MvMPlayerList"
-		"xpos"			"110"
-		"ypos"			"79"
+		"xpos"			"c-260"
+		"ypos"			"248"
 		"wide"			"520"
-		"tall"			"150"
+		"tall"			"148"
 		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
@@ -126,9 +126,9 @@
 	{
 		"ControlName"	"EditablePanel"
 		"fieldName"		"CreditStatsContainer"
-		"xpos"			"163"
-		"ypos"			"220"
-		"wide"			"400"
+		"xpos"			"c-190"
+		"ypos"			"70"
+		"wide"			"480"
 		"tall"			"205"
 		"visible"		"1"
 		
diff --git a/resource/ui/ScoreBoard-9s.res b/resource/ui/ScoreBoard-9s.res
index 2b8efa8..e32379e 100644
--- a/resource/ui/ScoreBoard-9s.res
+++ b/resource/ui/ScoreBoard-9s.res
@@ -13,28 +13,24 @@
 		"visible"			"1"
 		"enabled"			"1"
 		"tabPosition"		"0"
-		"medal_width"		"14"
-		"avatar_width"		"50"	
-		"name_width"		"70"
-		"name_width_minmode""51"
+		"avatar_width"		"54"
+		"medal_width"		"14"		
+		"name_width"		"80"
+		"name_width_minmode""60"
 		"status_width"		"15"	
 		"nemesis_width"		"15"	
 		"class_width"		"15"	
 		"score_width"		"24"
-		"ping_width"		"24"
-		"stats_width"		"30"
-		"killstreak_width"	"20"
+		"ping_width"		"24"	
 	}
 	"BlueScoreBG"
 	{
 		"ControlName"		"ImagePanel"
 		"fieldName"		"BlueScoreBG"
-		"xpos"			"c-230"
-		"xpos_minmode"  "c65"
-		"ypos"			"96"
-		"ypos_minmode"  "54"
+		"xpos"			"c-270"
+		"ypos"			"144"
+		"ypos_minmode"  "239"
 		"wide"			"270"
-		"wide_minmode"	"240"
 		"tall"			"25"
 		"autoResize"	"0"
 		"pinCorner"		"0"
@@ -52,12 +48,10 @@
 	{
 		"ControlName"		"ImagePanel"
 		"fieldName"		"RedScoreBG"
-		"xpos"			"c40"
-		"xpos_minmode" 	"c65"
-		"ypos"			"96"
-		"ypos_minmode"  "240"
+		"xpos"			"c0"
+		"ypos"			"144"
+		"ypos_minmode"  "239"
 		"wide"			"270"
-		"wide_minmode"  "240"
 		"tall"			"25"
 		"autoResize"	"0"
 		"pinCorner"		"0"
@@ -93,13 +87,12 @@
 	{
 		"ControlName"		"ImagePanel"
 		"fieldName"		"ScoreboardBackground"
-		"xpos"			"c-230"
-		"xpos_minmode"  "9999"
-		"ypos"			"121"
-		"ypos_minmode"  "9999"
+		"xpos"			"c-270"
+		"ypos"			"169"
+		"ypos_minmode"  "264"
 		"zpos"			"-1"
 		"wide"			"540"
-		"tall"			"244"
+		"tall"			"500"
 		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
@@ -110,6 +103,27 @@
 			"visible"	"0"
 		}
 	}
+	
+	"MvMScoreboardBackground"
+	{
+		"ControlName"		"ImagePanel"
+		"fieldName"		"MvMScoreboardBackground"
+		"xpos"			"c-270"
+		"ypos"			"244"
+		"zpos"			"-1"
+		"wide"			"540"
+		"tall"			"500"
+		"pinCorner"		"0"
+		"visible"		"0"
+		"enabled"		"0"
+		"fillcolor"		"0 0 0 100"
+		
+		if_mvm
+		{
+			"visible"	"0"
+		}		
+	}
+	
 	"Red6sBackground"
 	{
 		"ControlName"		"ImagePanel"
@@ -120,10 +134,10 @@
 		"ypos_minmode"	"265"
 		"zpos"			"-1"
 		"wide_minmode"	"240"
-		"tall"			"142"
+		"tall"			"100"
 		"pinCorner"		"0"
-		"visible"		"1"
-		"enabled"		"1"
+		"visible"		"0"
+		"enabled"		"0"
 		"fillcolor"		"0 0 0 100"
 		
 		if_mvm
@@ -139,13 +153,13 @@
 		"xpos"			"9999"
 		"xpos_minmode"	"c65"
 		"ypos"			"9999"
-		"ypos_minmode"	"79"
+		"ypos_minmode"	"121"
 		"zpos"			"-1"
 		"wide"			"240"
-		"tall"			"142"
+		"tall"			"100"
 		"pinCorner"		"0"
-		"visible"		"1"
-		"enabled"		"1"
+		"visible"		"0"
+		"enabled"		"0"
 		"fillcolor"		"0 0 0 100"
 		
 		if_mvm
@@ -161,11 +175,10 @@
 		"font"			"Cerbetica32"
 		"labelText"		"%blueteamname%"
 		"textAlignment"		"west"
-		"xpos"			"c-228"
-		"xpos_minmode"	"c67"
-		"ypos"			"92"
-		"ypos_minmode"	"50"
-		"wide"			"140"
+		"xpos"			"c-268"
+		"ypos"			"138"
+		"ypos_minmode"	"233"
+		"wide"			"200"
 		"tall"			"34"
 		"autoResize"		"0"
 		"pinCorner"		"0"
@@ -181,13 +194,12 @@
 	{
 		"ControlName"		"CExLabel"
 		"fieldName"		"BlueTeamScore"
-		"font"			"Cerbetica56"
+		"font"			"CerbeticaBold36"
 		"labelText"		"%blueteamscore%"
 		"textAlignment"		"east"
-		"xpos"			"c-71"
-		"xpos_minmode"	"c197"
-		"ypos"			"68"
-		"ypos_minmode"	"26"
+		"xpos"			"c-106"
+		"ypos"			"128"
+		"ypos_minmode"	"223"
 		"zpos"			"4"
 		"wide"			"100"
 		"tall"			"55"
@@ -205,14 +217,13 @@
 	{
 		"ControlName"		"CExLabel"
 		"fieldName"		"BlueTeamScoreDropshadow"
-		"font"			"Cerbetica56"
+		"font"			"CerbeticaBold36"
 		"fgcolor"		"Black"
 		"labelText"		"%blueteamscore%"
 		"textAlignment"		"east"
-		"xpos"			"c-69"
-		"xpos_minmode"	"c199"
-		"ypos"			"70" 
-		"ypos_minmode"	"28"
+		"xpos"			"c-105"
+		"ypos"			"129" 
+		"ypos_minmode"	"224"
 		"zpos"			"4"
 		"wide"			"100"
 		"tall"			"55"
@@ -233,10 +244,9 @@
 		"font"			"Cerbetica14"
 		"labelText"		"%blueteamplayercount%"
 		"textAlignment"		"west"
-		"xpos"			"c-65"
-		"xpos_minmode"	"c212"
-		"ypos"			"99"
-		"ypos_minmode"	"57"
+		"xpos"			"c-270"
+		"ypos"			"122"
+		"ypos_minmode"	"217"
 		"wide"			"100"
 		"tall"			"29"
 		"autoResize"		"0"
@@ -256,13 +266,11 @@
 		"font"			"Cerbetica32"
 		"labelText"		"%redteamname%"
 		"textAlignment"		"east"
-		"textAlignment_minmode"	"west"
-		"xpos"			"c168"
-		"xpos_minmode"	"c67"
-		"ypos"			"92"
-		"ypos_minmode"	"236"
-		"wide"			"140"
-		"tall"			"34"
+		"xpos"			"c68"
+		"ypos"			"138"
+		"ypos_minmode"	"233"
+		"wide"			"200"
+		"tall"			"35"
 		"autoResize"	"0"
 		"pinCorner"		"0"
 		"visible"		"1"
@@ -272,19 +280,17 @@
 		{
 			"visible"		"0"
 		}
-	}							
+	}
 	"RedTeamScore"
 	{
 		"ControlName"		"CExLabel"
 		"fieldName"		"RedTeamScore"
-		"font"			"Cerbetica56"
+		"font"			"CerbeticaBold36"
 		"labelText"		"%redteamscore%"
 		"textAlignment"		"west"
-		"textAlignment_minmode"		"east"
-		"xpos"			"c51"
-		"xpos_minmode"	"c197"
-		"ypos"			"68"
-		"ypos_minmode"	"211"
+		"xpos"			"c6"
+		"ypos"			"128"
+		"ypos_minmode"	"223"
 		"zpos"			"4"
 		"wide"			"100"
 		"tall"			"55"
@@ -304,15 +310,13 @@
 	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"RedTeamScoreDropshadow"
-		"font"			"Cerbetica56"
+		"font"			"CerbeticaBold36"
 		"fgcolor"		"Black"
 		"labelText"		"%redteamscore%"
 		"textAlignment"		"west"
-		"textAlignment_minmode"	"east"
-		"xpos"			"c53"
-		"xpos_minmode"	"c199"
-		"ypos"			"70"
-		"ypos_minmode"	"213"
+		"xpos"			"c7"
+		"ypos"			"129"
+		"ypos_minmode"	"224"
 		"zpos"			"4"
 		"wide"			"100"
 		"tall"			"55"
@@ -333,11 +337,9 @@
 		"font"			"Cerbetica14"
 		"labelText"		"%redteamplayercount%"
 		"textAlignment"		"east"
-		"textAlignment_minmode" "west"
-		"xpos"			"c12"
-		"xpos_minmode"	"c212"
-		"ypos"			"99"
-		"ypos_minmode"	"243"
+		"xpos"			"c140"
+		"ypos"			"122"
+		"ypos_minmode"	"217"
 		"wide"			"130"
 		"tall"			"29"
 		"autoResize"	"0"
@@ -354,11 +356,11 @@
 	{
 		"ControlName"		"CExLabel"
 		"fieldName"		"ServerLabel"
-		"font"			"Cerbetica12"
+		"font"			"Cerbetica14"
 		"labelText"		"%server%"
 		"textAlignment"		"west"
-		"xpos"			"c-360"
-		"ypos"			"68"
+		"xpos"			"-34"
+		"ypos"			"2"
 		"zpos"			"999"
 		"wide"			"600"
 		"tall"			"20"
@@ -366,48 +368,35 @@
 		"pinCorner"		"0"
 		"visible"		"1"	[$WIN32]
 		"enabled"		"1"
-		
-		if_mvm
-		{
-			"ypos"			"68"
-		}
 	}
 	"ServerTimeLeft"
 	{
 		"ControlName"		"CExLabel"
 		"fieldName"		"ServerTimeLeft"
-		"font"			"Cerbetica12"
+		"font"			"Cerbetica14"
 		"labelText"		"%servertimeleft%"
 		"textAlignment"		"west"
-		"xpos"			"c-360"
-		"ypos"			"80"
+		"xpos"			"2"
+		"ypos"			"16"
 		"zpos"			"999"
 		"wide"			"600"
 		"tall"			"20"
 		"autoResize"	"0"
 		"pinCorner"		"0"
 		"visible"		"1"	[$WIN32]
-		"visible"		"0"	[$X360]
 		"enabled"		"1"
-		
-		if_mvm
-		{
-			"ypos"			"80"
-		}
 	}							
 	"BluePlayerList"
 	{
 		"ControlName"	"SectionedListPanel"
 		"fieldName"		"BluePlayerList"
-		"xpos"			"c-225"
-		"xpos_minmode"	"c68"
-		"ypos"			"125"
-		"ypos_minmode"	"80"
+		"xpos"			"c-270"
+		"ypos"			"166"
+		"ypos_minmode"	"264"
 		"zpos"			"20"
-		"wide"			"260"
-		"wide_minmode"	"235"
-		"tall"			"240"
-		"tall_minmode"	"141"
+		"wide"			"270"
+		"tall"			"236"
+		"tall_minmode"	"140"
 		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
@@ -425,15 +414,13 @@
 	{
 		"ControlName"	"SectionedListPanel"
 		"fieldName"		"RedPlayerList"
-		"xpos"			"c45"
-		"xpos_minmode"  "c68"
-		"ypos"			"125"
-		"ypos_minmode"  "265"
+		"xpos"			"c0"
+		"ypos"			"166"
+		"ypos_minmode"	"264"
 		"zpos"			"20"
-		"wide"			"260"
-		"wide_minmode"  "235"
-		"tall"			"240"
-		"tall_minmode"	"141"
+		"wide"			"270"
+		"tall"			"236"
+		"tall_minmode"	"140"
 		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
@@ -477,39 +464,30 @@
 	{
 		"ControlName"		"CExLabel"
 		"fieldName"		"Spectators"
-		"font"			"Cerbetica12"
+		"font"			"Cerbetica11"
 		"labelText"		"%spectators%"
 		"textAlignment"		"west"
-		"xpos"			"c-230"
-		"xpos_minmode"	"c65"
-		"ypos"			"360"
-		"ypos_minmode"	"402"
-		"zpos"			"4"
-		"wide"			"540"
-		"wide_minmode"	"240"
+		"xpos"			"c-266"
+		"ypos"			"402"
+		"zpos"			"900"
+		"wide"			"541"
 		"tall"			"20"
 		"autoResize"		"0"
 		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
-		
-		if_mvm
-		{
-			"ypos"		"444"
-		}
 	}	
 	"SpectatorsInQueue"
 	{
 		"ControlName"		"CExLabel"
 		"fieldName"		"SpectatorsInQueue"
-		"font"			"Cerbetica12"
+		"font"			"Cerbetica11"
 		"labelText"		"%waitingtoplay%"
 		"textAlignment"		"west"
-		"xpos"			"c-230"
-		"xpos_minmode"	"c65"
-		"ypos"			"372"	
+		"xpos"			"2"
+		"ypos"			"42"	
 		"zpos"			"4"
-		"wide"			"424"
+		"wide"			"600"
 		"tall"			"20"
 		"autoResize"		"0"
 		"pinCorner"		"0"
@@ -521,21 +499,43 @@
 			"visible"		"0"
 		}
 	}							
+	"SpecBackground"
+	{
+		"ControlName"		"ImagePanel"
+		"fieldName"		"SpecBackground"
+		"xpos"			"c-270"
+		"ypos"			"405"	
+		"zpos"			"2"
+		"wide"			"540"
+		"tall"			"84"
+		"autoResize"	"0"
+		"pinCorner"		"0"
+		"visible"		"1"
+		"enabled"		"1"
+		"tabPosition"	"0"	
+		"fillcolor"		"32 32 32 125"
+		"PaintBackgroundType"	"0"
+		
+		if_mvm
+		{
+			"visible"		"1"
+		}
+	}
 	"StatsBackground"
 	{
 		"ControlName"		"ImagePanel"
 		"fieldName"		"StatsBackground"
-		"xpos"			"c-360"
-		"ypos"			"96"	
+		"xpos"			"c-270"
+		"ypos"			"418"	
 		"zpos"			"2"
-		"wide"			"116"
-		"tall"			"268"
+		"wide"			"540"
+		"tall"			"64"
 		"autoResize"	"0"
 		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
 		"tabPosition"	"0"	
-		"fillcolor"		"32 32 32 75"
+		"fillcolor"		"32 32 32 125"
 		"PaintBackgroundType"	"0"
 		
 		if_mvm
@@ -632,18 +632,17 @@
 			"visible"		"0"
 		}
 	}
-	
 	"MapName"
 	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"mapname"
-		"font"			"Cerbetica20"
+		"font"			"Cerbetica14"
 		"labelText"		"%mapname%"
-		"textAlignment"		"center"
-		"xpos"			"c-360"
-		"ypos"			"332"	
+		"textAlignment"		"west"
+		"xpos"			"3"
+		"ypos"			"30"	
 		"zpos"			"3"
-		"wide"			"116"
+		"wide"			"480"
 		"tall"			"20"
 		"autoResize"	"0"
 		"pinCorner"		"0"
@@ -867,10 +866,10 @@
 	{
 		"ControlName"		"EditablePanel"
 		"fieldName"		"LocalPlayerStatsPanel"
-		"xpos"			"c-388"
-		"ypos"			"96"
-		"zpos"			"3"
-		"wide"			"166"
+		"xpos"			"c-270"
+		"ypos"			"416"
+		"zpos"			"10"
+		"wide"			"540"
 		"tall"			"268"
 		"autoResize"	"0"
 		"pinCorner"		"0"
@@ -889,11 +888,11 @@
 			"font"			"Cerbetica48"
 			"labelText"		":"
 			"textAlignment"	"center"
-			"xpos"			"28"
-			"ypos"			"5"
+			"xpos"			"0"
+			"ypos"			"-2	w	"
 			"zpos"			"3"
-			"wide"			"116"
-			"tall"			"48"
+			"wide"			"540"
+			"tall"			"64"
 			"autoResize"	"0"
 			"pinCorner"		"0"
 			"visible"		"1"
@@ -923,8 +922,8 @@
 			"font"			"Cerbetica14"
 			"labelText"		"#TF_ScoreBoard_AssistsLabel"
 			"textAlignment"		"west"
-			"xpos"			"40"
-			"ypos"			"60"
+			"xpos"			"4"
+			"ypos"			"2"
 			"zpos"			"3"
 			"wide"			"95"
 			"tall"			"20"
@@ -940,8 +939,8 @@
 			"font"			"Cerbetica14"
 			"labelText"		"#TF_ScoreBoard_DestructionLabel"
 			"textAlignment"		"west"
-			"xpos"			"40"
-			"ypos"			"72"	[$WIN32]
+			"xpos"			"4"
+			"ypos"			"16"	[$WIN32]
 			"zpos"			"3"
 			"wide"			"95"
 			"tall"			"20"
@@ -949,7 +948,7 @@
 			"pinCorner"		"0"
 			"visible"		"1"
 			"enabled"		"1"
-		}
+		}												
 		"Kills"
 		{
 			"ControlName"		"CExLabel"
@@ -957,8 +956,8 @@
 			"font"			"Cerbetica48"
 			"labelText"		"%kills%"
 			"textAlignment"		"east"
-			"xpos"			"7"
-			"ypos"			"5"
+			"xpos"			"9999"
+			"ypos"			"9999"
 			"zpos"			"3"
 			"wide"			"70"
 			"tall"			"55"
@@ -966,16 +965,16 @@
 			"pinCorner"		"0"
 			"visible"		"1"
 			"enabled"		"1"
-		}			
+		}
 		"Kills2"
 		{
 			"ControlName"		"CExLabel"
-			"fieldName"		"Kills"
+			"fieldName"		"Kills2"
 			"font"			"Cerbetica48"
 			"labelText"		"%kills%"
 			"textAlignment"		"east"
-			"xpos"			"7"
-			"ypos"			"5"
+			"xpos"			"188"
+			"ypos"			"6"
 			"zpos"			"3"
 			"wide"			"70"
 			"tall"			"55"
@@ -983,7 +982,8 @@
 			"pinCorner"		"0"
 			"visible"		"1"
 			"enabled"		"1"
-		}
+			"fgcolor_override" "TanLight"
+		}		
 		"Deaths"
 		{
 			"ControlName"		"CExLabel"
@@ -991,8 +991,8 @@
 			"font"			"Cerbetica48"
 			"labelText"		"%deaths%"
 			"textAlignment"		"west"
-			"xpos"			"96"
-			"ypos"			"5"
+			"xpos"			"9999"
+			"ypos"			"9999"
 			"zpos"			"3"
 			"wide"			"70"
 			"tall"			"55"
@@ -1000,16 +1000,17 @@
 			"pinCorner"		"0"
 			"visible"		"1"
 			"enabled"		"1"
-		}		
+			"alpha" 		"0"
+		}
 		"Deaths2"
 		{
 			"ControlName"		"CExLabel"
-			"fieldName"		"Deaths"
+			"fieldName"		"Deaths2"
 			"font"			"Cerbetica48"
 			"labelText"		"%deaths%"
 			"textAlignment"		"west"
-			"xpos"			"96"
-			"ypos"			"5"
+			"xpos"			"282"
+			"ypos"			"6"
 			"zpos"			"3"
 			"wide"			"70"
 			"tall"			"55"
@@ -1017,6 +1018,7 @@
 			"pinCorner"		"0"
 			"visible"		"1"
 			"enabled"		"1"
+			"fgcolor_override" "TanLight"
 		}			
 
 		"GameType"
@@ -1036,7 +1038,7 @@
 			"visible"		"0"
 			"enabled"		"0"
 			"fgcolor"		"185 177 153 255"
-		}
+		}							
 		"Assists"
 		{
 			"ControlName"		"CExLabel"
@@ -1044,8 +1046,8 @@
 			"font"			"Cerbetica14"
 			"labelText"		"%assists%"
 			"textAlignment"		"west"
-			"xpos"			"100"
-			"ypos"			"60"	[$WIN32]
+			"xpos"			"9999"
+			"ypos"			"9999"	[$WIN32]
 			"zpos"			"3"
 			"wide"			"35"
 			"tall"			"20"
@@ -1053,16 +1055,16 @@
 			"pinCorner"		"0"
 			"visible"		"1"
 			"enabled"		"1"
-		}		
+		}
 		"Assists2"
 		{
 			"ControlName"		"CExLabel"
-			"fieldName"		"Assists"
+			"fieldName"		"Assists2"
 			"font"			"Cerbetica14"
 			"labelText"		"%assists%"
 			"textAlignment"		"west"
-			"xpos"			"100"
-			"ypos"			"60"	[$WIN32]
+			"xpos"			"70"
+			"ypos"			"2"	[$WIN32]
 			"zpos"			"3"
 			"wide"			"35"
 			"tall"			"20"
@@ -1070,16 +1072,34 @@
 			"pinCorner"		"0"
 			"visible"		"1"
 			"enabled"		"1"
-		}			
-		"Destruction2"
+			"fgcolor_override" "TanLight"
+		}		
+		"Destruction"
 		{
 			"ControlName"		"CExLabel"
 			"fieldName"		"Destruction"
 			"font"			"Cerbetica14"
 			"labelText"		"%destruction%"
 			"textAlignment"		"west"
-			"xpos"			"100"
-			"ypos"			"72"	[$WIN32]
+			"xpos"			"9999"
+			"ypos"			"9999"	[$WIN32]
+			"zpos"			"3"
+			"wide"			"0"
+			"tall"			"0"
+			"autoResize"	"0"
+			"pinCorner"		"0"
+			"visible"		"0"
+			"enabled"		"0"
+		}
+		"Destruction2"
+		{
+			"ControlName"		"CExLabel"
+			"fieldName"		"Destruction2"
+			"font"			"Cerbetica14"
+			"labelText"		"%destruction%"
+			"textAlignment"		"west"
+			"xpos"			"70"
+			"ypos"			"16"	[$WIN32]
 			"zpos"			"3"
 			"wide"			"35"
 			"tall"			"20"
@@ -1087,7 +1107,8 @@
 			"pinCorner"		"0"
 			"visible"		"1"
 			"enabled"		"1"
-		}			
+			"fgcolor_override" "TanLight"		
+		}					
 		"CapturesLabel"
 		{
 			"ControlName"		"CExLabel"
@@ -1095,8 +1116,8 @@
 			"font"			"Cerbetica14"
 			"labelText"		"#TF_ScoreBoard_CapturesLabel"
 			"textAlignment"		"west"
-			"xpos"			"40"	
-			"ypos"			"84"	
+			"xpos"			"4"	
+			"ypos"			"30"	
 			"zpos"			"3"
 			"wide"			"100"
 			"tall"			"20"
@@ -1112,8 +1133,8 @@
 			"font"			"Cerbetica14"
 			"labelText"		"#TF_ScoreBoard_DefensesLabel"
 			"textAlignment"		"west"
-			"xpos"			"40"	
-			"ypos"			"96"	
+			"xpos"			"4"	
+			"ypos"			"44"	
 			"zpos"			"3"
 			"wide"			"100"
 			"tall"			"20"
@@ -1129,8 +1150,8 @@
 			"font"			"Cerbetica14"
 			"labelText"		"#TF_ScoreBoard_DominationLabel"
 			"textAlignment"		"west"
-			"xpos"			"40"
-			"ypos"			"108"	
+			"xpos"			"102"
+			"ypos"			"2"	
 			"zpos"			"3"
 			"wide"			"100"
 			"tall"			"20"
@@ -1146,8 +1167,8 @@
 			"font"			"Cerbetica14"
 			"labelText"		"#TF_ScoreBoard_RevengeLabel"
 			"textAlignment"		"west"
-			"xpos"			"40"
-			"ypos"			"120"	
+			"xpos"			"102"
+			"ypos"			"16"	
 			"zpos"			"3"
 			"wide"			"100"
 			"tall"			"20"
@@ -1155,7 +1176,7 @@
 			"pinCorner"		"0"
 			"visible"		"1"
 			"enabled"		"1"
-		}
+		}						
 		"Captures"
 		{
 			"ControlName"		"CExLabel"
@@ -1163,8 +1184,8 @@
 			"font"			"Cerbetica14"
 			"labelText"		"%captures%"
 			"textAlignment"		"west"
-			"xpos"			"100"	
-			"ypos"			"84"	
+			"xpos"			"9999"	
+			"ypos"			"9999"	
 			"zpos"			"3"
 			"wide"			"35"
 			"tall"			"20"
@@ -1172,16 +1193,16 @@
 			"pinCorner"		"0"
 			"visible"		"1"
 			"enabled"		"1"
-		}		
+		}
 		"Captures2"
 		{
 			"ControlName"		"CExLabel"
-			"fieldName"		"Captures"
+			"fieldName"		"Captures2"
 			"font"			"Cerbetica14"
 			"labelText"		"%captures%"
 			"textAlignment"		"west"
-			"xpos"			"100"	
-			"ypos"			"84"	
+			"xpos"			"70"	
+			"ypos"			"30"	
 			"zpos"			"3"
 			"wide"			"35"
 			"tall"			"20"
@@ -1189,7 +1210,8 @@
 			"pinCorner"		"0"
 			"visible"		"1"
 			"enabled"		"1"
-		}
+			"fgcolor_override" "TanLight"	
+		}			
 		"Defenses"
 		{
 			"ControlName"		"CExLabel"
@@ -1197,8 +1219,8 @@
 			"font"			"Cerbetica14"
 			"labelText"		"%defenses%"
 			"textAlignment"		"west"
-			"xpos"			"100"	[$WIN32]
-			"ypos"			"96"	[$WIN32]
+			"xpos"			"9999"	[$WIN32]
+			"ypos"			"9999"	[$WIN32]
 			"zpos"			"3"
 			"wide"			"35"
 			"tall"			"20"
@@ -1206,16 +1228,16 @@
 			"pinCorner"		"0"
 			"visible"		"1"
 			"enabled"		"1"
-		}		
+		}
 		"Defenses2"
 		{
 			"ControlName"		"CExLabel"
-			"fieldName"		"Defenses"
+			"fieldName"		"Defenses2"
 			"font"			"Cerbetica14"
 			"labelText"		"%defenses%"
 			"textAlignment"		"west"
-			"xpos"			"100"	[$WIN32]
-			"ypos"			"96"	[$WIN32]
+			"xpos"			"70"	[$WIN32]
+			"ypos"			"44"	[$WIN32]
 			"zpos"			"3"
 			"wide"			"35"
 			"tall"			"20"
@@ -1223,7 +1245,8 @@
 			"pinCorner"		"0"
 			"visible"		"1"
 			"enabled"		"1"
-		}
+			"fgcolor_override" "TanLight"	
+		}			
 		"Domination"
 		{
 			"ControlName"		"CExLabel"
@@ -1240,16 +1263,16 @@
 			"pinCorner"		"0"
 			"visible"		"1"
 			"enabled"		"1"
-		}		
+		}
 		"Domination2"
 		{
 			"ControlName"		"CExLabel"
-			"fieldName"		"Domination"
+			"fieldName"		"Domination2"
 			"font"			"Cerbetica14"
 			"labelText"		"%dominations%"
 			"textAlignment"		"west"
-			"xpos"			"100"	
-			"ypos"			"108"	
+			"xpos"			"168"	
+			"ypos"			"2"	
 			"zpos"			"3"
 			"wide"			"35"
 			"tall"			"20"
@@ -1257,7 +1280,8 @@
 			"pinCorner"		"0"
 			"visible"		"1"
 			"enabled"		"1"
-		}
+			"fgcolor_override" "TanLight"	
+		}			
 		"Revenge"
 		{
 			"ControlName"		"CExLabel"
@@ -1265,8 +1289,8 @@
 			"font"			"Cerbetica14"
 			"labelText"		"%Revenge%"
 			"textAlignment"		"west"
-			"xpos"			"100"	
-			"ypos"			"120"	
+			"xpos"			"9999"	
+			"ypos"			"9999"	
 			"zpos"			"3"
 			"wide"			"35"
 			"tall"			"20"
@@ -1274,16 +1298,16 @@
 			"pinCorner"		"0"
 			"visible"		"1"
 			"enabled"		"1"
-		}		
-		"Revenge2"
+		}
+		"Revenge2"	
 		{
 			"ControlName"		"CExLabel"
-			"fieldName"		"Revenge"
+			"fieldName"		"Revenge2"
 			"font"			"Cerbetica14"
 			"labelText"		"%Revenge%"
 			"textAlignment"		"west"
-			"xpos"			"100"	
-			"ypos"			"120"	
+			"xpos"			"168"	
+			"ypos"			"16"	
 			"zpos"			"3"
 			"wide"			"35"
 			"tall"			"20"
@@ -1291,7 +1315,8 @@
 			"pinCorner"		"0"
 			"visible"		"1"
 			"enabled"		"1"
-		}			
+			"fgcolor_override" "TanLight"				
+		}				
 		"HealingLabel"
 		{
 			"ControlName"		"CExLabel"
@@ -1299,8 +1324,8 @@
 			"font"			"Cerbetica14"
 			"labelText"		"#TF_ScoreBoard_HealingLabel"
 			"textAlignment"		"west"
-			"xpos"			"40"	
-			"ypos"			"132"	
+			"xpos"			"102"	
+			"ypos"			"30"	
 			"zpos"			"3"
 			"wide"			"95"	
 			"tall"			"20"
@@ -1316,8 +1341,8 @@
 			"font"			"Cerbetica14"
 			"labelText"		"#TF_ScoreBoard_InvulnLabel"
 			"textAlignment"		"west"
-			"xpos"			"40"	
-			"ypos"			"144"	
+			"xpos"			"102"	
+			"ypos"			"44"	
 			"zpos"			"3"
 			"wide"			"95"
 			"tall"			"20"
@@ -1333,8 +1358,8 @@
 			"font"			"Cerbetica14"
 			"labelText"		"#TF_ScoreBoard_TeleportsLabel"
 			"textAlignment"		"west"
-			"xpos"			"40"	
-			"ypos"			"156"	
+			"xpos"			"342"	
+			"ypos"			"2"	
 			"zpos"			"3"
 			"wide"			"95"	
 			"tall"			"20"
@@ -1350,8 +1375,8 @@
 			"font"			"Cerbetica14"
 			"labelText"		"#TF_ScoreBoard_HeadshotsLabel"
 			"textAlignment"		"west"
-			"xpos"			"40"	
-			"ypos"			"168"	
+			"xpos"			"342"	
+			"ypos"			"16"	
 			"zpos"			"3"
 			"wide"			"95"	
 			"tall"			"20"
@@ -1367,8 +1392,8 @@
 			"font"			"Cerbetica14"
 			"labelText"		"%healing%"
 			"textAlignment"		"west"
-			"xpos"			"100"	
-			"ypos"			"132"	
+			"xpos"			"9999"	
+			"ypos"			"9999"	
 			"zpos"			"3"
 			"wide"			"35"
 			"tall"			"20"
@@ -1380,12 +1405,12 @@
 		"Healing2"
 		{
 			"ControlName"	"CExLabel"
-			"fieldName"		"Healing"
+			"fieldName"		"Healing2"
 			"font"			"Cerbetica14"
 			"labelText"		"%healing%"
 			"textAlignment"		"west"
-			"xpos"			"100"	
-			"ypos"			"132"	
+			"xpos"			"168"	
+			"ypos"			"30"	
 			"zpos"			"3"
 			"wide"			"35"
 			"tall"			"20"
@@ -1393,7 +1418,8 @@
 			"pinCorner"		"0"
 			"visible"		"1"
 			"enabled"		"1"
-		}		
+			"fgcolor_override" "TanLight"							
+		}			
 		"Invuln"
 		{
 			"ControlName"		"CExLabel"
@@ -1401,8 +1427,8 @@
 			"font"			"Cerbetica14"
 			"labelText"		"%invulns%"
 			"textAlignment"		"west"
-			"xpos"			"100"	
-			"ypos"			"144"	
+			"xpos"			"9999"	
+			"ypos"			"9999"	
 			"zpos"			"3"
 			"wide"			"35"
 			"tall"			"20"
@@ -1414,12 +1440,12 @@
 		"Invuln2"
 		{
 			"ControlName"		"CExLabel"
-			"fieldName"		"Invuln"
+			"fieldName"		"Invuln2"
 			"font"			"Cerbetica14"
 			"labelText"		"%invulns%"
 			"textAlignment"		"west"
-			"xpos"			"100"	
-			"ypos"			"144"	
+			"xpos"			"168"	
+			"ypos"			"44"	
 			"zpos"			"3"
 			"wide"			"35"
 			"tall"			"20"
@@ -1427,7 +1453,8 @@
 			"pinCorner"		"0"
 			"visible"		"1"
 			"enabled"		"1"
-		}
+			"fgcolor_override" "TanLight"							
+		}			
 		"Teleports"
 		{
 			"ControlName"		"CExLabel"
@@ -1444,16 +1471,16 @@
 			"pinCorner"		"0"
 			"visible"		"1"
 			"enabled"		"1"
-		}			
+		}
 		"Teleports2"
 		{
 			"ControlName"		"CExLabel"
-			"fieldName"		"Teleports"
+			"fieldName"		"Teleports2"
 			"font"			"Cerbetica14"
 			"labelText"		"%teleports%"
 			"textAlignment"		"west"
-			"xpos"			"100"	[$WIN32]
-			"ypos"			"156"	[$WIN32]
+			"xpos"			"408"	[$WIN32]
+			"ypos"			"2"	[$WIN32]
 			"zpos"			"3"
 			"wide"			"35"
 			"tall"			"20"
@@ -1461,7 +1488,7 @@
 			"pinCorner"		"0"
 			"visible"		"1"
 			"enabled"		"1"
-		}
+		}				
 		"Headshots"
 		{
 			"ControlName"		"CExLabel"
@@ -1469,8 +1496,8 @@
 			"font"			"Cerbetica14"
 			"labelText"		"%headshots%"
 			"textAlignment"		"west"
-			"xpos"			"100"	
-			"ypos"			"168"	
+			"xpos"			"9999"	
+			"ypos"			"9999"	
 			"zpos"			"3"
 			"wide"			"35"
 			"tall"			"20"
@@ -1478,16 +1505,16 @@
 			"pinCorner"		"0"
 			"visible"		"1"
 			"enabled"		"1"
-		}		
+		}
 		"Headshots2"
 		{
 			"ControlName"		"CExLabel"
-			"fieldName"		"Headshots"
+			"fieldName"		"Headshots2"
 			"font"			"Cerbetica14"
 			"labelText"		"%headshots%"
 			"textAlignment"		"west"
-			"xpos"			"100"	
-			"ypos"			"168"	
+			"xpos"			"408"	
+			"ypos"			"16"	
 			"zpos"			"3"
 			"wide"			"35"
 			"tall"			"20"
@@ -1495,7 +1522,7 @@
 			"pinCorner"		"0"
 			"visible"		"1"
 			"enabled"		"1"
-		}		
+		}			
 		"BackstabsLabel"
 		{
 			"ControlName"		"CExLabel"
@@ -1503,8 +1530,8 @@
 			"font"			"Cerbetica14"
 			"labelText"		"#TF_ScoreBoard_BackstabsLabel"
 			"textAlignment"		"west"
-			"xpos"			"40"
-			"ypos"			"180"
+			"xpos"			"342"
+			"ypos"			"30"
 			"zpos"			"3"
 			"wide"			"95"
 			"tall"			"20"
@@ -1520,8 +1547,8 @@
 			"font"			"Cerbetica14"
 			"labelText"		"%backstabs%"
 			"textAlignment"		"west"	
-			"xpos"			"100"
-			"ypos"			"180"
+			"xpos"			"9999"
+			"ypos"			"9999"
 			"zpos"			"3"
 			"wide"			"35"
 			"tall"			"20"
@@ -1533,12 +1560,12 @@
 		"Backstabs2"
 		{
 			"ControlName"		"CExLabel"
-			"fieldName"		"Backstabs"
+			"fieldName"		"Backstabs2"
 			"font"			"Cerbetica14"
 			"labelText"		"%backstabs%"
-			"textAlignment"		"west"	
-			"xpos"			"100"
-			"ypos"			"180"
+			"textAlignment"	"west"	
+			"xpos"			"408"
+			"ypos"			"30"
 			"zpos"			"3"
 			"wide"			"35"
 			"tall"			"20"
@@ -1554,8 +1581,8 @@
 			"font"			"Cerbetica14"
 			"labelText"		"#TF_ScoreBoard_BonusLabel"
 			"textAlignment"		"west"
-			"xpos"			"40"
-			"ypos"			"192"
+			"xpos"			"342"
+			"ypos"			"44"
 			"zpos"			"3"
 			"wide"			"95"
 			"tall"			"20"
@@ -1571,8 +1598,8 @@
 			"font"			"Cerbetica14"
 			"labelText"		"%bonus%"
 			"textAlignment"		"west"		[$WIN32]
-			"xpos"			"100"
-			"ypos"			"192"
+			"xpos"			"9999"
+			"ypos"			"9999"
 			"zpos"			"3"
 			"wide"			"95"
 			"tall"			"20"
@@ -1584,12 +1611,12 @@
 		"Bonus2"
 		{
 			"ControlName"		"CExLabel"
-			"fieldName"		"Bonus"
+			"fieldName"		"Bonus2"
 			"font"			"Cerbetica14"
 			"labelText"		"%bonus%"
 			"textAlignment"		"west"		[$WIN32]
-			"xpos"			"100"
-			"ypos"			"192"
+			"xpos"			"408"
+			"ypos"			"44"
 			"zpos"			"3"
 			"wide"			"95"
 			"tall"			"20"
@@ -1605,8 +1632,8 @@
 			"font"			"Cerbetica14"
 			"labelText"		"#TF_Scoreboard_Support"
 			"textAlignment"	"west"
-			"xpos"			"40"	[$WIN32]
-			"ypos"			"204"	[$WIN32]
+			"xpos"			"440"	[$WIN32]
+			"ypos"			"2"	[$WIN32]
 			"zpos"			"3"
 			"wide"			"95"
 			"tall"			"20"
@@ -1622,8 +1649,8 @@
 			"font"			"Cerbetica14"
 			"labelText"		"%support%"
 			"textAlignment"	"west"		
-			"xpos"			"100"	
-			"ypos"			"204"	
+			"xpos"			"9999"	
+			"ypos"			"9999"	
 			"zpos"			"3"
 			"wide"			"35"
 			"tall"			"20"
@@ -1635,12 +1662,12 @@
 		"Support2"
 		{
 			"ControlName"	"CExLabel"
-			"fieldName"		"Support"
+			"fieldName"		"Support2"
 			"font"			"Cerbetica14"
 			"labelText"		"%support%"
 			"textAlignment"	"west"		
-			"xpos"			"100"	
-			"ypos"			"204"	
+			"xpos"			"502a"	
+			"ypos"			"2"	
 			"zpos"			"3"
 			"wide"			"35"
 			"tall"			"20"
@@ -1648,6 +1675,7 @@
 			"pinCorner"		"0"
 			"visible"		"1"
 			"enabled"		"1"
+			"fgcolor_override"	"TanLight"
 		}
 		"DamageLabel"
 		{
@@ -1656,8 +1684,8 @@
 			"font"			"Cerbetica14"
 			"labelText"		"#TF_Scoreboard_Damage"
 			"textAlignment"	"west"
-			"xpos"			"40"	
-			"ypos"			"216"	
+			"xpos"			"440"	
+			"ypos"			"16"	
 			"zpos"			"3"
 			"wide"			"95"
 			"tall"			"20"
@@ -1673,8 +1701,8 @@
 			"font"			"Cerbetica14"
 			"labelText"		"%damage%"
 			"textAlignment"	"west"		
-			"xpos"			"100"	
-			"ypos"			"216"
+			"xpos"			"9999"	
+			"ypos"			"9999"
 			"zpos"			"3"
 			"wide"			"35"
 			"tall"			"20"
@@ -1686,12 +1714,12 @@
 		"Damage2"
 		{
 			"ControlName"	"CExLabel"
-			"fieldName"		"Damage"
+			"fieldName"		"Damage2"
 			"font"			"Cerbetica14"
 			"labelText"		"%damage%"
 			"textAlignment"	"west"		
-			"xpos"			"100"	
-			"ypos"			"216"
+			"xpos"			"502"	
+			"ypos"			"16"
 			"zpos"			"3"
 			"wide"			"35"
 			"tall"			"20"
@@ -1699,7 +1727,7 @@
 			"pinCorner"		"0"
 			"visible"		"1"
 			"enabled"		"1"
-		}
+		}	
 	}
 
 
@@ -1861,14 +1889,16 @@
 			"dulltext"		"0"
 			"brighttext"	"0"
 		}
+		
+		
 	}				
 	
 	"MvMScoreboard"
 	{
 		"ControlName"		"CTFHudMannVsMachineScoreboard"
 		"fieldName"			"MvMScoreboard"
-		"xpos"				"100"
-		"ypos"				"5"
+		"xpos"				"0"
+		"ypos"				"0"
 		"zpos"				"10"
 		"wide"				"f0"
 		"tall"				"480"
diff --git a/resource/ui/ScoreBoard.res b/resource/ui/ScoreBoard.res
index ffbec76..01952e5 100644
--- a/resource/ui/ScoreBoard.res
+++ b/resource/ui/ScoreBoard.res
@@ -13,28 +13,24 @@
 		"visible"			"1"
 		"enabled"			"1"
 		"tabPosition"		"0"
-		"medal_width"		"14"
-		"avatar_width"		"50"	
-		"name_width"		"70"
-		"name_width_minmode""51"
+		"avatar_width"		"54"
+		"medal_width"		"14"		
+		"name_width"		"80"
+		"name_width_minmode""60"
 		"status_width"		"15"	
 		"nemesis_width"		"15"	
 		"class_width"		"15"	
 		"score_width"		"24"
-		"ping_width"		"24"
-		"stats_width"		"30"
-		"killstreak_width"	"20"
+		"ping_width"		"24"	
 	}
 	"BlueScoreBG"
 	{
 		"ControlName"		"ImagePanel"
 		"fieldName"		"BlueScoreBG"
-		"xpos"			"c-230"
-		"xpos_minmode"  "c65"
-		"ypos"			"96"
-		"ypos_minmode"  "96"
+		"xpos"			"c-270"
+		"ypos"			"144"
+		"ypos_minmode"  "279"
 		"wide"			"270"
-		"wide_minmode"	"240"
 		"tall"			"25"
 		"autoResize"	"0"
 		"pinCorner"		"0"
@@ -52,12 +48,10 @@
 	{
 		"ControlName"		"ImagePanel"
 		"fieldName"		"RedScoreBG"
-		"xpos"			"c40"
-		"xpos_minmode" 	"c65"
-		"ypos"			"96"
-		"ypos_minmode"  "240"
+		"xpos"			"c0"
+		"ypos"			"144"
+		"ypos_minmode"  "279"
 		"wide"			"270"
-		"wide_minmode"  "240"
 		"tall"			"25"
 		"autoResize"	"0"
 		"pinCorner"		"0"
@@ -93,13 +87,12 @@
 	{
 		"ControlName"		"ImagePanel"
 		"fieldName"		"ScoreboardBackground"
-		"xpos"			"c-230"
-		"xpos_minmode"  "9999"
-		"ypos"			"121"
-		"ypos_minmode"  "9999"
+		"xpos"			"c-270"
+		"ypos"			"169"
+		"ypos_minmode"  "304"
 		"zpos"			"-1"
 		"wide"			"540"
-		"tall"			"244"
+		"tall"			"500"
 		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
@@ -110,6 +103,27 @@
 			"visible"	"0"
 		}
 	}
+	
+	"MvMScoreboardBackground"
+	{
+		"ControlName"		"ImagePanel"
+		"fieldName"		"MvMScoreboardBackground"
+		"xpos"			"c-270"
+		"ypos"			"244"
+		"zpos"			"-1"
+		"wide"			"540"
+		"tall"			"500"
+		"pinCorner"		"0"
+		"visible"		"0"
+		"enabled"		"0"
+		"fillcolor"		"0 0 0 100"
+		
+		if_mvm
+		{
+			"visible"	"0"
+		}		
+	}
+	
 	"Red6sBackground"
 	{
 		"ControlName"		"ImagePanel"
@@ -122,8 +136,8 @@
 		"wide_minmode"	"240"
 		"tall"			"100"
 		"pinCorner"		"0"
-		"visible"		"1"
-		"enabled"		"1"
+		"visible"		"0"
+		"enabled"		"0"
 		"fillcolor"		"0 0 0 100"
 		
 		if_mvm
@@ -144,8 +158,8 @@
 		"wide"			"240"
 		"tall"			"100"
 		"pinCorner"		"0"
-		"visible"		"1"
-		"enabled"		"1"
+		"visible"		"0"
+		"enabled"		"0"
 		"fillcolor"		"0 0 0 100"
 		
 		if_mvm
@@ -161,11 +175,10 @@
 		"font"			"Cerbetica32"
 		"labelText"		"%blueteamname%"
 		"textAlignment"		"west"
-		"xpos"			"c-228"
-		"xpos_minmode"	"c67"
-		"ypos"			"92"
-		"ypos_minmode"	"92"
-		"wide"			"140"
+		"xpos"			"c-268"
+		"ypos"			"138"
+		"ypos_minmode"	"273"
+		"wide"			"200"
 		"tall"			"34"
 		"autoResize"		"0"
 		"pinCorner"		"0"
@@ -181,13 +194,12 @@
 	{
 		"ControlName"		"CExLabel"
 		"fieldName"		"BlueTeamScore"
-		"font"			"Cerbetica56"
+		"font"			"CerbeticaBold36"
 		"labelText"		"%blueteamscore%"
 		"textAlignment"		"east"
-		"xpos"			"c-71"
-		"xpos_minmode"	"c197"
-		"ypos"			"68"
-		"ypos_minmode"	"68"
+		"xpos"			"c-106"
+		"ypos"			"128"
+		"ypos_minmode"	"263"
 		"zpos"			"4"
 		"wide"			"100"
 		"tall"			"55"
@@ -205,14 +217,13 @@
 	{
 		"ControlName"		"CExLabel"
 		"fieldName"		"BlueTeamScoreDropshadow"
-		"font"			"Cerbetica56"
+		"font"			"CerbeticaBold36"
 		"fgcolor"		"Black"
 		"labelText"		"%blueteamscore%"
 		"textAlignment"		"east"
-		"xpos"			"c-69"
-		"xpos_minmode"	"c199"
-		"ypos"			"70" 
-		"ypos_minmode"	"70"
+		"xpos"			"c-105"
+		"ypos"			"129" 
+		"ypos_minmode"	"264"
 		"zpos"			"4"
 		"wide"			"100"
 		"tall"			"55"
@@ -233,10 +244,9 @@
 		"font"			"Cerbetica14"
 		"labelText"		"%blueteamplayercount%"
 		"textAlignment"		"west"
-		"xpos"			"c-65"
-		"xpos_minmode"	"c212"
-		"ypos"			"99"
-		"ypos_minmode"	"99"
+		"xpos"			"c-270"
+		"ypos"			"122"
+		"ypos_minmode"	"257"
 		"wide"			"100"
 		"tall"			"29"
 		"autoResize"		"0"
@@ -256,13 +266,11 @@
 		"font"			"Cerbetica32"
 		"labelText"		"%redteamname%"
 		"textAlignment"		"east"
-		"textAlignment_minmode"	"west"
-		"xpos"			"c168"
-		"xpos_minmode"	"c67"
-		"ypos"			"92"
-		"ypos_minmode"	"236"
-		"wide"			"140"
-		"tall"			"34"
+		"xpos"			"c68"
+		"ypos"			"138"
+		"ypos_minmode"	"273"
+		"wide"			"200"
+		"tall"			"35"
 		"autoResize"	"0"
 		"pinCorner"		"0"
 		"visible"		"1"
@@ -272,19 +280,17 @@
 		{
 			"visible"		"0"
 		}
-	}							
+	}
 	"RedTeamScore"
 	{
 		"ControlName"		"CExLabel"
 		"fieldName"		"RedTeamScore"
-		"font"			"Cerbetica56"
+		"font"			"CerbeticaBold36"
 		"labelText"		"%redteamscore%"
 		"textAlignment"		"west"
-		"textAlignment_minmode"		"east"
-		"xpos"			"c51"
-		"xpos_minmode"	"c197"
-		"ypos"			"68"
-		"ypos_minmode"	"211"
+		"xpos"			"c6"
+		"ypos"			"128"
+		"ypos_minmode"	"263"
 		"zpos"			"4"
 		"wide"			"100"
 		"tall"			"55"
@@ -304,15 +310,13 @@
 	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"RedTeamScoreDropshadow"
-		"font"			"Cerbetica56"
+		"font"			"CerbeticaBold36"
 		"fgcolor"		"Black"
 		"labelText"		"%redteamscore%"
 		"textAlignment"		"west"
-		"textAlignment_minmode"	"east"
-		"xpos"			"c53"
-		"xpos_minmode"	"c199"
-		"ypos"			"70"
-		"ypos_minmode"	"213"
+		"xpos"			"c7"
+		"ypos"			"129"
+		"ypos_minmode"	"264"
 		"zpos"			"4"
 		"wide"			"100"
 		"tall"			"55"
@@ -333,11 +337,9 @@
 		"font"			"Cerbetica14"
 		"labelText"		"%redteamplayercount%"
 		"textAlignment"		"east"
-		"textAlignment_minmode" "west"
-		"xpos"			"c12"
-		"xpos_minmode"	"c212"
-		"ypos"			"99"
-		"ypos_minmode"	"243"
+		"xpos"			"c140"
+		"ypos"			"122"
+		"ypos_minmode"	"257"
 		"wide"			"130"
 		"tall"			"29"
 		"autoResize"	"0"
@@ -354,11 +356,11 @@
 	{
 		"ControlName"		"CExLabel"
 		"fieldName"		"ServerLabel"
-		"font"			"Cerbetica12"
+		"font"			"Cerbetica14"
 		"labelText"		"%server%"
 		"textAlignment"		"west"
-		"xpos"			"c-360"
-		"ypos"			"68"
+		"xpos"			"-34"
+		"ypos"			"2"
 		"zpos"			"999"
 		"wide"			"600"
 		"tall"			"20"
@@ -366,48 +368,35 @@
 		"pinCorner"		"0"
 		"visible"		"1"	[$WIN32]
 		"enabled"		"1"
-		
-		if_mvm
-		{
-			"ypos"			"68"
-		}
 	}
 	"ServerTimeLeft"
 	{
 		"ControlName"		"CExLabel"
 		"fieldName"		"ServerTimeLeft"
-		"font"			"Cerbetica12"
+		"font"			"Cerbetica14"
 		"labelText"		"%servertimeleft%"
 		"textAlignment"		"west"
-		"xpos"			"c-360"
-		"ypos"			"80"
+		"xpos"			"2"
+		"ypos"			"16"
 		"zpos"			"999"
 		"wide"			"600"
 		"tall"			"20"
 		"autoResize"	"0"
 		"pinCorner"		"0"
 		"visible"		"1"	[$WIN32]
-		"visible"		"0"	[$X360]
 		"enabled"		"1"
-		
-		if_mvm
-		{
-			"ypos"			"80"
-		}
 	}							
 	"BluePlayerList"
 	{
 		"ControlName"	"SectionedListPanel"
 		"fieldName"		"BluePlayerList"
-		"xpos"			"c-225"
-		"xpos_minmode"	"c68"
-		"ypos"			"125"
-		"ypos_minmode"	"123"
+		"xpos"			"c-270"
+		"ypos"			"166"
+		"ypos_minmode"	"304"
 		"zpos"			"20"
-		"wide"			"260"
-		"wide_minmode"	"235"
-		"tall"			"240"
-		"tall_minmode"	"96"
+		"wide"			"270"
+		"tall"			"236"
+		"tall_minmode"	"98"
 		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
@@ -415,7 +404,6 @@
 		"autoresize"	"3"
 		"linespacing"	"14"
 		"fgcolor"		"blue"
-
 		
 		if_mvm
 		{
@@ -426,15 +414,13 @@
 	{
 		"ControlName"	"SectionedListPanel"
 		"fieldName"		"RedPlayerList"
-		"xpos"			"c45"
-		"xpos_minmode"  "c68"
-		"ypos"			"125"
-		"ypos_minmode"  "266"
+		"xpos"			"c0"
+		"ypos"			"166"
+		"ypos_minmode"	"304"
 		"zpos"			"20"
-		"wide"			"260"
-		"wide_minmode"  "235"
-		"tall"			"240"
-		"tall_minmode"	"96"
+		"wide"			"270"
+		"tall"			"236"
+		"tall_minmode"	"98"
 		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
@@ -478,38 +464,30 @@
 	{
 		"ControlName"		"CExLabel"
 		"fieldName"		"Spectators"
-		"font"			"Cerbetica12"
+		"font"			"Cerbetica11"
 		"labelText"		"%spectators%"
 		"textAlignment"		"west"
-		"xpos"			"c-230"
-		"xpos_minmode"	"c65"
-		"ypos"			"360"
-		"zpos"			"4"
-		"wide"			"540"
-		"wide_minmode"	"240"
+		"xpos"			"c-266"
+		"ypos"			"402"
+		"zpos"			"900"
+		"wide"			"541"
 		"tall"			"20"
 		"autoResize"		"0"
 		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
-		
-		if_mvm
-		{
-			"ypos"		"444"
-		}
 	}	
 	"SpectatorsInQueue"
 	{
 		"ControlName"		"CExLabel"
 		"fieldName"		"SpectatorsInQueue"
-		"font"			"Cerbetica12"
+		"font"			"Cerbetica11"
 		"labelText"		"%waitingtoplay%"
 		"textAlignment"		"west"
-		"xpos"			"c-230"
-		"xpos_minmode"	"c65"
-		"ypos"			"372"	
+		"xpos"			"2"
+		"ypos"			"42"	
 		"zpos"			"4"
-		"wide"			"424"
+		"wide"			"600"
 		"tall"			"20"
 		"autoResize"		"0"
 		"pinCorner"		"0"
@@ -521,21 +499,43 @@
 			"visible"		"0"
 		}
 	}							
+	"SpecBackground"
+	{
+		"ControlName"		"ImagePanel"
+		"fieldName"		"SpecBackground"
+		"xpos"			"c-270"
+		"ypos"			"405"	
+		"zpos"			"2"
+		"wide"			"540"
+		"tall"			"84"
+		"autoResize"	"0"
+		"pinCorner"		"0"
+		"visible"		"1"
+		"enabled"		"1"
+		"tabPosition"	"0"	
+		"fillcolor"		"32 32 32 125"
+		"PaintBackgroundType"	"0"
+		
+		if_mvm
+		{
+			"visible"		"1"
+		}
+	}
 	"StatsBackground"
 	{
 		"ControlName"		"ImagePanel"
 		"fieldName"		"StatsBackground"
-		"xpos"			"c-360"
-		"ypos"			"96"	
+		"xpos"			"c-270"
+		"ypos"			"418"	
 		"zpos"			"2"
-		"wide"			"116"
-		"tall"			"268"
+		"wide"			"540"
+		"tall"			"64"
 		"autoResize"	"0"
 		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
 		"tabPosition"	"0"	
-		"fillcolor"		"32 32 32 75"
+		"fillcolor"		"32 32 32 125"
 		"PaintBackgroundType"	"0"
 		
 		if_mvm
@@ -636,13 +636,13 @@
 	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"mapname"
-		"font"			"Cerbetica20"
+		"font"			"Cerbetica14"
 		"labelText"		"%mapname%"
-		"textAlignment"		"center"
-		"xpos"			"c-360"
-		"ypos"			"332"	
+		"textAlignment"		"west"
+		"xpos"			"3"
+		"ypos"			"30"	
 		"zpos"			"3"
-		"wide"			"116"
+		"wide"			"480"
 		"tall"			"20"
 		"autoResize"	"0"
 		"pinCorner"		"0"
@@ -866,10 +866,10 @@
 	{
 		"ControlName"		"EditablePanel"
 		"fieldName"		"LocalPlayerStatsPanel"
-		"xpos"			"c-388"
-		"ypos"			"96"
-		"zpos"			"3"
-		"wide"			"166"
+		"xpos"			"c-270"
+		"ypos"			"416"
+		"zpos"			"10"
+		"wide"			"540"
 		"tall"			"268"
 		"autoResize"	"0"
 		"pinCorner"		"0"
@@ -888,11 +888,11 @@
 			"font"			"Cerbetica48"
 			"labelText"		":"
 			"textAlignment"	"center"
-			"xpos"			"28"
-			"ypos"			"5"
+			"xpos"			"0"
+			"ypos"			"-2	w	"
 			"zpos"			"3"
-			"wide"			"116"
-			"tall"			"48"
+			"wide"			"540"
+			"tall"			"64"
 			"autoResize"	"0"
 			"pinCorner"		"0"
 			"visible"		"1"
@@ -922,8 +922,8 @@
 			"font"			"Cerbetica14"
 			"labelText"		"#TF_ScoreBoard_AssistsLabel"
 			"textAlignment"		"west"
-			"xpos"			"40"
-			"ypos"			"60"
+			"xpos"			"4"
+			"ypos"			"2"
 			"zpos"			"3"
 			"wide"			"95"
 			"tall"			"20"
@@ -939,8 +939,8 @@
 			"font"			"Cerbetica14"
 			"labelText"		"#TF_ScoreBoard_DestructionLabel"
 			"textAlignment"		"west"
-			"xpos"			"40"
-			"ypos"			"72"	[$WIN32]
+			"xpos"			"4"
+			"ypos"			"16"	[$WIN32]
 			"zpos"			"3"
 			"wide"			"95"
 			"tall"			"20"
@@ -948,7 +948,7 @@
 			"pinCorner"		"0"
 			"visible"		"1"
 			"enabled"		"1"
-		}
+		}												
 		"Kills"
 		{
 			"ControlName"		"CExLabel"
@@ -956,8 +956,8 @@
 			"font"			"Cerbetica48"
 			"labelText"		"%kills%"
 			"textAlignment"		"east"
-			"xpos"			"7"
-			"ypos"			"5"
+			"xpos"			"9999"
+			"ypos"			"9999"
 			"zpos"			"3"
 			"wide"			"70"
 			"tall"			"55"
@@ -965,16 +965,16 @@
 			"pinCorner"		"0"
 			"visible"		"1"
 			"enabled"		"1"
-		}			
+		}
 		"Kills2"
 		{
 			"ControlName"		"CExLabel"
-			"fieldName"		"Kills"
+			"fieldName"		"Kills2"
 			"font"			"Cerbetica48"
 			"labelText"		"%kills%"
 			"textAlignment"		"east"
-			"xpos"			"7"
-			"ypos"			"5"
+			"xpos"			"188"
+			"ypos"			"6"
 			"zpos"			"3"
 			"wide"			"70"
 			"tall"			"55"
@@ -982,7 +982,8 @@
 			"pinCorner"		"0"
 			"visible"		"1"
 			"enabled"		"1"
-		}
+			"fgcolor_override" "TanLight"
+		}		
 		"Deaths"
 		{
 			"ControlName"		"CExLabel"
@@ -990,8 +991,8 @@
 			"font"			"Cerbetica48"
 			"labelText"		"%deaths%"
 			"textAlignment"		"west"
-			"xpos"			"96"
-			"ypos"			"5"
+			"xpos"			"9999"
+			"ypos"			"9999"
 			"zpos"			"3"
 			"wide"			"70"
 			"tall"			"55"
@@ -999,16 +1000,17 @@
 			"pinCorner"		"0"
 			"visible"		"1"
 			"enabled"		"1"
-		}		
+			"alpha" 		"0"
+		}
 		"Deaths2"
 		{
 			"ControlName"		"CExLabel"
-			"fieldName"		"Deaths"
+			"fieldName"		"Deaths2"
 			"font"			"Cerbetica48"
 			"labelText"		"%deaths%"
 			"textAlignment"		"west"
-			"xpos"			"96"
-			"ypos"			"5"
+			"xpos"			"282"
+			"ypos"			"6"
 			"zpos"			"3"
 			"wide"			"70"
 			"tall"			"55"
@@ -1016,6 +1018,7 @@
 			"pinCorner"		"0"
 			"visible"		"1"
 			"enabled"		"1"
+			"fgcolor_override" "TanLight"
 		}			
 
 		"GameType"
@@ -1035,7 +1038,7 @@
 			"visible"		"0"
 			"enabled"		"0"
 			"fgcolor"		"185 177 153 255"
-		}
+		}							
 		"Assists"
 		{
 			"ControlName"		"CExLabel"
@@ -1043,8 +1046,8 @@
 			"font"			"Cerbetica14"
 			"labelText"		"%assists%"
 			"textAlignment"		"west"
-			"xpos"			"100"
-			"ypos"			"60"	[$WIN32]
+			"xpos"			"9999"
+			"ypos"			"9999"	[$WIN32]
 			"zpos"			"3"
 			"wide"			"35"
 			"tall"			"20"
@@ -1052,16 +1055,16 @@
 			"pinCorner"		"0"
 			"visible"		"1"
 			"enabled"		"1"
-		}		
+		}
 		"Assists2"
 		{
 			"ControlName"		"CExLabel"
-			"fieldName"		"Assists"
+			"fieldName"		"Assists2"
 			"font"			"Cerbetica14"
 			"labelText"		"%assists%"
 			"textAlignment"		"west"
-			"xpos"			"100"
-			"ypos"			"60"	[$WIN32]
+			"xpos"			"70"
+			"ypos"			"2"	[$WIN32]
 			"zpos"			"3"
 			"wide"			"35"
 			"tall"			"20"
@@ -1069,16 +1072,34 @@
 			"pinCorner"		"0"
 			"visible"		"1"
 			"enabled"		"1"
-		}			
-		"Destruction2"
+			"fgcolor_override" "TanLight"
+		}		
+		"Destruction"
 		{
 			"ControlName"		"CExLabel"
 			"fieldName"		"Destruction"
 			"font"			"Cerbetica14"
 			"labelText"		"%destruction%"
 			"textAlignment"		"west"
-			"xpos"			"100"
-			"ypos"			"72"	[$WIN32]
+			"xpos"			"9999"
+			"ypos"			"9999"	[$WIN32]
+			"zpos"			"3"
+			"wide"			"0"
+			"tall"			"0"
+			"autoResize"	"0"
+			"pinCorner"		"0"
+			"visible"		"0"
+			"enabled"		"0"
+		}
+		"Destruction2"
+		{
+			"ControlName"		"CExLabel"
+			"fieldName"		"Destruction2"
+			"font"			"Cerbetica14"
+			"labelText"		"%destruction%"
+			"textAlignment"		"west"
+			"xpos"			"70"
+			"ypos"			"16"	[$WIN32]
 			"zpos"			"3"
 			"wide"			"35"
 			"tall"			"20"
@@ -1086,7 +1107,8 @@
 			"pinCorner"		"0"
 			"visible"		"1"
 			"enabled"		"1"
-		}			
+			"fgcolor_override" "TanLight"		
+		}					
 		"CapturesLabel"
 		{
 			"ControlName"		"CExLabel"
@@ -1094,8 +1116,8 @@
 			"font"			"Cerbetica14"
 			"labelText"		"#TF_ScoreBoard_CapturesLabel"
 			"textAlignment"		"west"
-			"xpos"			"40"	
-			"ypos"			"84"	
+			"xpos"			"4"	
+			"ypos"			"30"	
 			"zpos"			"3"
 			"wide"			"100"
 			"tall"			"20"
@@ -1111,8 +1133,8 @@
 			"font"			"Cerbetica14"
 			"labelText"		"#TF_ScoreBoard_DefensesLabel"
 			"textAlignment"		"west"
-			"xpos"			"40"	
-			"ypos"			"96"	
+			"xpos"			"4"	
+			"ypos"			"44"	
 			"zpos"			"3"
 			"wide"			"100"
 			"tall"			"20"
@@ -1128,8 +1150,8 @@
 			"font"			"Cerbetica14"
 			"labelText"		"#TF_ScoreBoard_DominationLabel"
 			"textAlignment"		"west"
-			"xpos"			"40"
-			"ypos"			"108"	
+			"xpos"			"102"
+			"ypos"			"2"	
 			"zpos"			"3"
 			"wide"			"100"
 			"tall"			"20"
@@ -1145,8 +1167,8 @@
 			"font"			"Cerbetica14"
 			"labelText"		"#TF_ScoreBoard_RevengeLabel"
 			"textAlignment"		"west"
-			"xpos"			"40"
-			"ypos"			"120"	
+			"xpos"			"102"
+			"ypos"			"16"	
 			"zpos"			"3"
 			"wide"			"100"
 			"tall"			"20"
@@ -1154,7 +1176,7 @@
 			"pinCorner"		"0"
 			"visible"		"1"
 			"enabled"		"1"
-		}
+		}						
 		"Captures"
 		{
 			"ControlName"		"CExLabel"
@@ -1162,8 +1184,8 @@
 			"font"			"Cerbetica14"
 			"labelText"		"%captures%"
 			"textAlignment"		"west"
-			"xpos"			"100"	
-			"ypos"			"84"	
+			"xpos"			"9999"	
+			"ypos"			"9999"	
 			"zpos"			"3"
 			"wide"			"35"
 			"tall"			"20"
@@ -1171,16 +1193,16 @@
 			"pinCorner"		"0"
 			"visible"		"1"
 			"enabled"		"1"
-		}		
+		}
 		"Captures2"
 		{
 			"ControlName"		"CExLabel"
-			"fieldName"		"Captures"
+			"fieldName"		"Captures2"
 			"font"			"Cerbetica14"
 			"labelText"		"%captures%"
 			"textAlignment"		"west"
-			"xpos"			"100"	
-			"ypos"			"84"	
+			"xpos"			"70"	
+			"ypos"			"30"	
 			"zpos"			"3"
 			"wide"			"35"
 			"tall"			"20"
@@ -1188,7 +1210,8 @@
 			"pinCorner"		"0"
 			"visible"		"1"
 			"enabled"		"1"
-		}
+			"fgcolor_override" "TanLight"	
+		}			
 		"Defenses"
 		{
 			"ControlName"		"CExLabel"
@@ -1196,8 +1219,8 @@
 			"font"			"Cerbetica14"
 			"labelText"		"%defenses%"
 			"textAlignment"		"west"
-			"xpos"			"100"	[$WIN32]
-			"ypos"			"96"	[$WIN32]
+			"xpos"			"9999"	[$WIN32]
+			"ypos"			"9999"	[$WIN32]
 			"zpos"			"3"
 			"wide"			"35"
 			"tall"			"20"
@@ -1205,16 +1228,16 @@
 			"pinCorner"		"0"
 			"visible"		"1"
 			"enabled"		"1"
-		}		
+		}
 		"Defenses2"
 		{
 			"ControlName"		"CExLabel"
-			"fieldName"		"Defenses"
+			"fieldName"		"Defenses2"
 			"font"			"Cerbetica14"
 			"labelText"		"%defenses%"
 			"textAlignment"		"west"
-			"xpos"			"100"	[$WIN32]
-			"ypos"			"96"	[$WIN32]
+			"xpos"			"70"	[$WIN32]
+			"ypos"			"44"	[$WIN32]
 			"zpos"			"3"
 			"wide"			"35"
 			"tall"			"20"
@@ -1222,7 +1245,8 @@
 			"pinCorner"		"0"
 			"visible"		"1"
 			"enabled"		"1"
-		}
+			"fgcolor_override" "TanLight"	
+		}			
 		"Domination"
 		{
 			"ControlName"		"CExLabel"
@@ -1239,16 +1263,16 @@
 			"pinCorner"		"0"
 			"visible"		"1"
 			"enabled"		"1"
-		}		
+		}
 		"Domination2"
 		{
 			"ControlName"		"CExLabel"
-			"fieldName"		"Domination"
+			"fieldName"		"Domination2"
 			"font"			"Cerbetica14"
 			"labelText"		"%dominations%"
 			"textAlignment"		"west"
-			"xpos"			"100"	
-			"ypos"			"108"	
+			"xpos"			"168"	
+			"ypos"			"2"	
 			"zpos"			"3"
 			"wide"			"35"
 			"tall"			"20"
@@ -1256,7 +1280,8 @@
 			"pinCorner"		"0"
 			"visible"		"1"
 			"enabled"		"1"
-		}
+			"fgcolor_override" "TanLight"	
+		}			
 		"Revenge"
 		{
 			"ControlName"		"CExLabel"
@@ -1264,8 +1289,8 @@
 			"font"			"Cerbetica14"
 			"labelText"		"%Revenge%"
 			"textAlignment"		"west"
-			"xpos"			"100"	
-			"ypos"			"120"	
+			"xpos"			"9999"	
+			"ypos"			"9999"	
 			"zpos"			"3"
 			"wide"			"35"
 			"tall"			"20"
@@ -1273,16 +1298,16 @@
 			"pinCorner"		"0"
 			"visible"		"1"
 			"enabled"		"1"
-		}		
-		"Revenge2"
+		}
+		"Revenge2"	
 		{
 			"ControlName"		"CExLabel"
-			"fieldName"		"Revenge"
+			"fieldName"		"Revenge2"
 			"font"			"Cerbetica14"
 			"labelText"		"%Revenge%"
 			"textAlignment"		"west"
-			"xpos"			"100"	
-			"ypos"			"120"	
+			"xpos"			"168"	
+			"ypos"			"16"	
 			"zpos"			"3"
 			"wide"			"35"
 			"tall"			"20"
@@ -1290,7 +1315,8 @@
 			"pinCorner"		"0"
 			"visible"		"1"
 			"enabled"		"1"
-		}			
+			"fgcolor_override" "TanLight"				
+		}				
 		"HealingLabel"
 		{
 			"ControlName"		"CExLabel"
@@ -1298,8 +1324,8 @@
 			"font"			"Cerbetica14"
 			"labelText"		"#TF_ScoreBoard_HealingLabel"
 			"textAlignment"		"west"
-			"xpos"			"40"	
-			"ypos"			"132"	
+			"xpos"			"102"	
+			"ypos"			"30"	
 			"zpos"			"3"
 			"wide"			"95"	
 			"tall"			"20"
@@ -1315,8 +1341,8 @@
 			"font"			"Cerbetica14"
 			"labelText"		"#TF_ScoreBoard_InvulnLabel"
 			"textAlignment"		"west"
-			"xpos"			"40"	
-			"ypos"			"144"	
+			"xpos"			"102"	
+			"ypos"			"44"	
 			"zpos"			"3"
 			"wide"			"95"
 			"tall"			"20"
@@ -1332,8 +1358,8 @@
 			"font"			"Cerbetica14"
 			"labelText"		"#TF_ScoreBoard_TeleportsLabel"
 			"textAlignment"		"west"
-			"xpos"			"40"	
-			"ypos"			"156"	
+			"xpos"			"342"	
+			"ypos"			"2"	
 			"zpos"			"3"
 			"wide"			"95"	
 			"tall"			"20"
@@ -1349,8 +1375,8 @@
 			"font"			"Cerbetica14"
 			"labelText"		"#TF_ScoreBoard_HeadshotsLabel"
 			"textAlignment"		"west"
-			"xpos"			"40"	
-			"ypos"			"168"	
+			"xpos"			"342"	
+			"ypos"			"16"	
 			"zpos"			"3"
 			"wide"			"95"	
 			"tall"			"20"
@@ -1366,8 +1392,8 @@
 			"font"			"Cerbetica14"
 			"labelText"		"%healing%"
 			"textAlignment"		"west"
-			"xpos"			"100"	
-			"ypos"			"132"	
+			"xpos"			"9999"	
+			"ypos"			"9999"	
 			"zpos"			"3"
 			"wide"			"35"
 			"tall"			"20"
@@ -1379,12 +1405,12 @@
 		"Healing2"
 		{
 			"ControlName"	"CExLabel"
-			"fieldName"		"Healing"
+			"fieldName"		"Healing2"
 			"font"			"Cerbetica14"
 			"labelText"		"%healing%"
 			"textAlignment"		"west"
-			"xpos"			"100"	
-			"ypos"			"132"	
+			"xpos"			"168"	
+			"ypos"			"30"	
 			"zpos"			"3"
 			"wide"			"35"
 			"tall"			"20"
@@ -1392,7 +1418,8 @@
 			"pinCorner"		"0"
 			"visible"		"1"
 			"enabled"		"1"
-		}		
+			"fgcolor_override" "TanLight"							
+		}			
 		"Invuln"
 		{
 			"ControlName"		"CExLabel"
@@ -1400,8 +1427,8 @@
 			"font"			"Cerbetica14"
 			"labelText"		"%invulns%"
 			"textAlignment"		"west"
-			"xpos"			"100"	
-			"ypos"			"144"	
+			"xpos"			"9999"	
+			"ypos"			"9999"	
 			"zpos"			"3"
 			"wide"			"35"
 			"tall"			"20"
@@ -1413,12 +1440,12 @@
 		"Invuln2"
 		{
 			"ControlName"		"CExLabel"
-			"fieldName"		"Invuln"
+			"fieldName"		"Invuln2"
 			"font"			"Cerbetica14"
 			"labelText"		"%invulns%"
 			"textAlignment"		"west"
-			"xpos"			"100"	
-			"ypos"			"144"	
+			"xpos"			"168"	
+			"ypos"			"44"	
 			"zpos"			"3"
 			"wide"			"35"
 			"tall"			"20"
@@ -1426,7 +1453,8 @@
 			"pinCorner"		"0"
 			"visible"		"1"
 			"enabled"		"1"
-		}
+			"fgcolor_override" "TanLight"							
+		}			
 		"Teleports"
 		{
 			"ControlName"		"CExLabel"
@@ -1443,16 +1471,16 @@
 			"pinCorner"		"0"
 			"visible"		"1"
 			"enabled"		"1"
-		}			
+		}
 		"Teleports2"
 		{
 			"ControlName"		"CExLabel"
-			"fieldName"		"Teleports"
+			"fieldName"		"Teleports2"
 			"font"			"Cerbetica14"
 			"labelText"		"%teleports%"
 			"textAlignment"		"west"
-			"xpos"			"100"	[$WIN32]
-			"ypos"			"156"	[$WIN32]
+			"xpos"			"408"	[$WIN32]
+			"ypos"			"2"	[$WIN32]
 			"zpos"			"3"
 			"wide"			"35"
 			"tall"			"20"
@@ -1460,7 +1488,7 @@
 			"pinCorner"		"0"
 			"visible"		"1"
 			"enabled"		"1"
-		}
+		}				
 		"Headshots"
 		{
 			"ControlName"		"CExLabel"
@@ -1468,8 +1496,8 @@
 			"font"			"Cerbetica14"
 			"labelText"		"%headshots%"
 			"textAlignment"		"west"
-			"xpos"			"100"	
-			"ypos"			"168"	
+			"xpos"			"9999"	
+			"ypos"			"9999"	
 			"zpos"			"3"
 			"wide"			"35"
 			"tall"			"20"
@@ -1477,16 +1505,16 @@
 			"pinCorner"		"0"
 			"visible"		"1"
 			"enabled"		"1"
-		}		
+		}
 		"Headshots2"
 		{
 			"ControlName"		"CExLabel"
-			"fieldName"		"Headshots"
+			"fieldName"		"Headshots2"
 			"font"			"Cerbetica14"
 			"labelText"		"%headshots%"
 			"textAlignment"		"west"
-			"xpos"			"100"	
-			"ypos"			"168"	
+			"xpos"			"408"	
+			"ypos"			"16"	
 			"zpos"			"3"
 			"wide"			"35"
 			"tall"			"20"
@@ -1494,7 +1522,7 @@
 			"pinCorner"		"0"
 			"visible"		"1"
 			"enabled"		"1"
-		}		
+		}			
 		"BackstabsLabel"
 		{
 			"ControlName"		"CExLabel"
@@ -1502,8 +1530,8 @@
 			"font"			"Cerbetica14"
 			"labelText"		"#TF_ScoreBoard_BackstabsLabel"
 			"textAlignment"		"west"
-			"xpos"			"40"
-			"ypos"			"180"
+			"xpos"			"342"
+			"ypos"			"30"
 			"zpos"			"3"
 			"wide"			"95"
 			"tall"			"20"
@@ -1519,8 +1547,8 @@
 			"font"			"Cerbetica14"
 			"labelText"		"%backstabs%"
 			"textAlignment"		"west"	
-			"xpos"			"100"
-			"ypos"			"180"
+			"xpos"			"9999"
+			"ypos"			"9999"
 			"zpos"			"3"
 			"wide"			"35"
 			"tall"			"20"
@@ -1532,12 +1560,12 @@
 		"Backstabs2"
 		{
 			"ControlName"		"CExLabel"
-			"fieldName"		"Backstabs"
+			"fieldName"		"Backstabs2"
 			"font"			"Cerbetica14"
 			"labelText"		"%backstabs%"
-			"textAlignment"		"west"	
-			"xpos"			"100"
-			"ypos"			"180"
+			"textAlignment"	"west"	
+			"xpos"			"408"
+			"ypos"			"30"
 			"zpos"			"3"
 			"wide"			"35"
 			"tall"			"20"
@@ -1553,8 +1581,8 @@
 			"font"			"Cerbetica14"
 			"labelText"		"#TF_ScoreBoard_BonusLabel"
 			"textAlignment"		"west"
-			"xpos"			"40"
-			"ypos"			"192"
+			"xpos"			"342"
+			"ypos"			"44"
 			"zpos"			"3"
 			"wide"			"95"
 			"tall"			"20"
@@ -1570,8 +1598,8 @@
 			"font"			"Cerbetica14"
 			"labelText"		"%bonus%"
 			"textAlignment"		"west"		[$WIN32]
-			"xpos"			"100"
-			"ypos"			"192"
+			"xpos"			"9999"
+			"ypos"			"9999"
 			"zpos"			"3"
 			"wide"			"95"
 			"tall"			"20"
@@ -1583,12 +1611,12 @@
 		"Bonus2"
 		{
 			"ControlName"		"CExLabel"
-			"fieldName"		"Bonus"
+			"fieldName"		"Bonus2"
 			"font"			"Cerbetica14"
 			"labelText"		"%bonus%"
 			"textAlignment"		"west"		[$WIN32]
-			"xpos"			"100"
-			"ypos"			"192"
+			"xpos"			"408"
+			"ypos"			"44"
 			"zpos"			"3"
 			"wide"			"95"
 			"tall"			"20"
@@ -1604,8 +1632,8 @@
 			"font"			"Cerbetica14"
 			"labelText"		"#TF_Scoreboard_Support"
 			"textAlignment"	"west"
-			"xpos"			"40"	[$WIN32]
-			"ypos"			"204"	[$WIN32]
+			"xpos"			"440"	[$WIN32]
+			"ypos"			"2"	[$WIN32]
 			"zpos"			"3"
 			"wide"			"95"
 			"tall"			"20"
@@ -1621,8 +1649,8 @@
 			"font"			"Cerbetica14"
 			"labelText"		"%support%"
 			"textAlignment"	"west"		
-			"xpos"			"100"	
-			"ypos"			"204"	
+			"xpos"			"9999"	
+			"ypos"			"9999"	
 			"zpos"			"3"
 			"wide"			"35"
 			"tall"			"20"
@@ -1634,12 +1662,12 @@
 		"Support2"
 		{
 			"ControlName"	"CExLabel"
-			"fieldName"		"Support"
+			"fieldName"		"Support2"
 			"font"			"Cerbetica14"
 			"labelText"		"%support%"
 			"textAlignment"	"west"		
-			"xpos"			"100"	
-			"ypos"			"204"	
+			"xpos"			"502a"	
+			"ypos"			"2"	
 			"zpos"			"3"
 			"wide"			"35"
 			"tall"			"20"
@@ -1647,6 +1675,7 @@
 			"pinCorner"		"0"
 			"visible"		"1"
 			"enabled"		"1"
+			"fgcolor_override"	"TanLight"
 		}
 		"DamageLabel"
 		{
@@ -1655,8 +1684,8 @@
 			"font"			"Cerbetica14"
 			"labelText"		"#TF_Scoreboard_Damage"
 			"textAlignment"	"west"
-			"xpos"			"40"	
-			"ypos"			"216"	
+			"xpos"			"440"	
+			"ypos"			"16"	
 			"zpos"			"3"
 			"wide"			"95"
 			"tall"			"20"
@@ -1672,8 +1701,8 @@
 			"font"			"Cerbetica14"
 			"labelText"		"%damage%"
 			"textAlignment"	"west"		
-			"xpos"			"100"	
-			"ypos"			"216"
+			"xpos"			"9999"	
+			"ypos"			"9999"
 			"zpos"			"3"
 			"wide"			"35"
 			"tall"			"20"
@@ -1685,12 +1714,12 @@
 		"Damage2"
 		{
 			"ControlName"	"CExLabel"
-			"fieldName"		"Damage"
+			"fieldName"		"Damage2"
 			"font"			"Cerbetica14"
 			"labelText"		"%damage%"
 			"textAlignment"	"west"		
-			"xpos"			"100"	
-			"ypos"			"216"
+			"xpos"			"502"	
+			"ypos"			"16"
 			"zpos"			"3"
 			"wide"			"35"
 			"tall"			"20"
@@ -1698,7 +1727,7 @@
 			"pinCorner"		"0"
 			"visible"		"1"
 			"enabled"		"1"
-		}
+		}	
 	}
 
 
@@ -1860,14 +1889,16 @@
 			"dulltext"		"0"
 			"brighttext"	"0"
 		}
+		
+		
 	}				
 	
 	"MvMScoreboard"
 	{
 		"ControlName"		"CTFHudMannVsMachineScoreboard"
 		"fieldName"			"MvMScoreboard"
-		"xpos"				"100"
-		"ypos"				"5"
+		"xpos"				"0"
+		"ypos"				"0"
 		"zpos"				"10"
 		"wide"				"f0"
 		"tall"				"480"