Merge pull request #149 from raysfire/dev

v2020.0808

4 files changed, 166 insertions, 175 deletions

diff --git a/customizations/team_menu/classselection-center.res b/customizations/team_menu/classselection-center.res
index e545202..c2c587f 100644
--- a/customizations/team_menu/classselection-center.res
+++ b/customizations/team_menu/classselection-center.res
@@ -2,11 +2,7 @@
 {
 	"SelectClassLabel"
 	{
-		"xpos"			"30"
-		"ypos"			"r40"
-		"wide"			"450"
-		"textAlignment"	"west"
-		"font"			"CerbeticaBold32"
+		"visible"		"0"
 	}
 
 	"SidePanelBG"
@@ -19,78 +15,78 @@
 	"scout"
 	{
 		"xpos"			"c81"
-		"ypos"			"180"
+		"ypos"			"164"
 	}
 
 	"soldier"
 	{
 		"xpos"			"c80"
-		"ypos"			"196"
+		"ypos"			"180"
 	}
 
 	"pyro"
 	{
 		"xpos"			"c80"
-		"ypos"			"212"
+		"ypos"			"196"
 	}
 
 	"demoman"
 	{
 		"xpos"			"c80"
-		"ypos"			"232"
+		"ypos"			"212"
 	}
 
 	"heavyweapons"
 	{
 		"xpos"			"c80"
-		"ypos"			"248"
+		"ypos"			"232"
 	}
 
 	"engineer"
 	{
 		"xpos"			"c80"
-		"ypos"			"264"
+		"ypos"			"248"
 	}
 
 	"medic"
 	{
 		"xpos"			"c80"
-		"ypos"			"284"
+		"ypos"			"264"
 	}
 
 	"sniper"
 	{
 		"xpos"			"c80"
-		"ypos"			"300"
+		"ypos"			"284"
 	}
 
 	"spy"
 	{
 		"xpos"			"c80"
-		"ypos"			"316"
+		"ypos"			"300"
 	}
 
 	"random"
 	{
 		"xpos"			"c80"
-		"ypos"			"c100"
+		"ypos"			"c80"
 	}
 
-	"EditLoadoutButton" [$WIN32]
+	"EditLoadoutButton"
 	{
 		"xpos"			"c80"
-		"ypos"			"c120"
+		"ypos"			"c100"
 	}
 
-	"CancelButton" [$WIN32]
+	"CancelButton"
 	{
 		"xpos"			"c180"
-		"ypos"			"c100"
+		"ypos"			"c80"
 	}
 	"numScout"
 	{
 		"xpos"			"c158"
-		"ypos"			"180"
+		"ypos"			"164"
 		"wide"			"100"
 		"tall"			"12"
 		"textAlignment"	"center"
@@ -99,7 +95,7 @@
 	"numSoldier"
 	{
 		"xpos"			"c158"
-		"ypos"			"196"
+		"ypos"			"180"
 		"wide"			"100"
 		"tall"			"12"
 		"textAlignment"	"center"
@@ -108,7 +104,7 @@
 	"numPyro"
 	{
 		"xpos"			"c158"
-		"ypos"			"212"
+		"ypos"			"196"
 		"wide"			"100"
 		"tall"			"12"
 		"textAlignment"	"center"
@@ -117,7 +113,7 @@
 	"numDemoman"
 	{
 		"xpos"			"c158"
-		"ypos"			"232"
+		"ypos"			"212"
 		"wide"			"100"
 		"tall"			"12"
 		"textAlignment"	"center"
@@ -126,7 +122,7 @@
 	"numHeavy"
 	{
 		"xpos"			"c158"
-		"ypos"			"248"
+		"ypos"			"232"
 		"wide"			"100"
 		"tall"			"12"
 		"textAlignment"	"center"
@@ -135,7 +131,7 @@
 	"numEngineer"
 	{
 		"xpos"			"c158"
-		"ypos"			"264"
+		"ypos"			"248"
 		"wide"			"100"
 		"tall"			"12"
 		"textAlignment"	"center"
@@ -144,7 +140,7 @@
 	"numMedic"
 	{
 		"xpos"			"c158"
-		"ypos"			"284"
+		"ypos"			"264"
 		"wide"			"100"
 		"tall"			"12"
 		"textAlignment"	"center"
@@ -153,7 +149,7 @@
 	"numSniper"
 	{
 		"xpos"			"c158"
-		"ypos"			"300"
+		"ypos"			"284"
 		"wide"			"100"
 		"tall"			"12"
 		"textAlignment"	"center"
@@ -162,7 +158,7 @@
 	"numSpy"
 	{
 		"xpos"			"c158"
-		"ypos"			"316"
+		"ypos"			"300"
 		"wide"			"100"
 		"tall"			"12"
 		"textAlignment"	"center"
diff --git a/customizations/team_menu/classselection.res b/customizations/team_menu/classselection.res
index f203e95..6ec2ea4 100644
--- a/customizations/team_menu/classselection.res
+++ b/customizations/team_menu/classselection.res
@@ -56,7 +56,7 @@
 		"tall"			"30"
 		"labelText"		"#TF_SelectAClass"
 		"textAlignment"	"center"
-		"font"			"CerbeticaBold32"
+		"font"			"Cerbetica32"
 		"visible"		"0"
 		"enabled"		"0"
 		"fgcolor"		"TanLight"
@@ -80,7 +80,7 @@
 		"textAlignment"		"west"
 		"Command"			"joinclass scout"
 		"Default"			"1"
-		"font"				"CerbeticaBold16"
+		"font"				"Cerbetica16"
 		"scaleImage"		"1"
 		"paintbackground"	"0"
 
@@ -117,7 +117,7 @@
 		"textAlignment"		"west"
 		"Command"			"joinclass soldier"
 		"Default"			"0"
-		"font"				"CerbeticaBold16"
+		"font"				"Cerbetica16"
 		"scaleImage"		"1"
 		"paintbackground"	"0"
 
@@ -154,7 +154,7 @@
 		"textAlignment"		"west"
 		"Command"			"joinclass pyro"
 		"Default"			"0"
-		"font"				"CerbeticaBold16"
+		"font"				"Cerbetica16"
 		"scaleImage"		"1"
 		"paintbackground"	"0"
 
@@ -191,7 +191,7 @@
 		"textAlignment"		"west"
 		"Command"			"joinclass demoman"
 		"Default"			"0"
-		"font"				"CerbeticaBold16"
+		"font"				"Cerbetica16"
 		"scaleImage"		"1"
 		"paintbackground"	"0"
 
@@ -228,7 +228,7 @@
 		"textAlignment"		"west"
 		"Command"			"joinclass heavyweapons"
 		"Default"			"0"
-		"font"				"CerbeticaBold16"
+		"font"				"Cerbetica16"
 		"scaleImage"		"1"
 		"paintbackground"	"0"
 
@@ -265,7 +265,7 @@
 		"textAlignment"		"west"
 		"Command"			"joinclass engineer"
 		"Default"			"0"
-		"font"				"CerbeticaBold16"
+		"font"				"Cerbetica16"
 		"scaleImage"		"1"
 		"paintbackground"	"0"
 
@@ -302,7 +302,7 @@
 		"textAlignment"		"west"
 		"Command"			"joinclass medic"
 		"Default"			"0"
-		"font"				"CerbeticaBold16"
+		"font"				"Cerbetica16"
 		"scaleImage"		"1"
 		"paintbackground"	"0"
 
@@ -339,7 +339,7 @@
 		"textAlignment"		"west"
 		"Command"			"joinclass sniper"
 		"Default"			"0"
-		"font"				"CerbeticaBold16"
+		"font"				"Cerbetica16"
 		"scaleImage"		"1"
 		"paintbackground"	"0"
 
@@ -376,7 +376,7 @@
 		"textAlignment"		"west"
 		"Command"			"joinclass spy"
 		"Default"			"0"
-		"font"				"CerbeticaBold16"
+		"font"				"Cerbetica16"
 		"scaleImage"		"1"
 		"paintbackground"	"0"
 
@@ -400,7 +400,7 @@
 		"ControlName"		"CExButton"
 		"fieldName"			"random"
 		"xpos"				"30"
-		"ypos"				"r48"
+		"ypos"				"431"
 		"zpos"				"6"
 		"wide"				"80"
 		"tall"				"16"
@@ -412,7 +412,7 @@
 		"labelText"			"(&R)  RANDOM"
 		"textAlignment"		"west"
 		"Command"			"joinclass random"
-		"font"				"CerbeticaBold16"
+		"font"				"Cerbetica16"
 		"paintbackground"	"0"
 
 		"fgcolor"					"235 226 202 255"
@@ -424,14 +424,18 @@
 		"sound_depressed"	"UI/buttonclick.wav"
 		"sound_released"	"UI/buttonclickrelease.wav"
 		"sound_armed"		"UI/buttonrollover.wav"
+
+		"stayselectedonclick"	"1"
+		"selectonhover"			"1"
+		"keyboardinputenabled"	"0"
 	}
 
 	"CancelButton" [$WIN32]
 	{
 		"ControlName"	"CExButton"
 		"fieldName"		"CancelButton"
-		"xpos"			"30"
-		"ypos"			"r28"
+		"xpos"			"130"
+		"ypos"			"431"
 		"zpos"			"6"
 		"wide"			"80"
 		"tall"			"16"
@@ -443,7 +447,7 @@
 		"labelText"		"(&Q)  CANCEL"
 		"textAlignment"	"west"
 		"Command"		"vguicancel"
-		"font"			"CerbeticaBold16"
+		"font"			"Cerbetica16"
 		"paintbackground" "0"
 
 		"fgcolor"					"235 226 202 255"
@@ -461,8 +465,8 @@
 	{
 		"ControlName"	"CExButton"
 		"fieldName"		"EditLoadoutButton"
-		"xpos"			"125"
-		"ypos"			"r28"
+		"xpos"			"30"
+		"ypos"			"450"
 		"zpos"			"6"
 		"wide"			"110"
 		"tall"			"16"
@@ -475,7 +479,7 @@
 		"labelText"		"(&E)  EDIT LOADOUT"
 		"textAlignment"	"west"
 		"Command"		"openloadout"
-		"font"			"CerbeticaBold16"
+		"font"			"Cerbetica16"
 
 		"fgcolor"					"235 226 202 255"
 		"defaultFgColor_override"	"235 226 202 255"
@@ -514,7 +518,7 @@
 		"paintbackground""0"
 		"textAlignment"	"center"
 		"Command"		"resetclass"
-		"font"			"CerbeticaBold16"
+		"font"			"Cerbetica16"
 	}
 
 	"MenuBG"
@@ -741,7 +745,7 @@
 		"tabPosition"	"0"
 		"labelText"		"%numScout%"
 		"textAlignment"	"center"
-		"font"			"CerbeticaBold16"
+		"font"			"Cerbetica16"
 		"fgcolor"		"235 226 202 255"
 	}
 
@@ -761,7 +765,7 @@
 		"tabPosition"	"0"
 		"labelText"		"%numSoldier%"
 		"textAlignment"	"center"
-		"font"			"CerbeticaBold16"
+		"font"			"Cerbetica16"
 		"fgcolor"		"235 226 202 255"
 	}
 
@@ -781,7 +785,7 @@
 		"tabPosition"	"0"
 		"labelText"		"%numPyro%"
 		"textAlignment"	"center"
-		"font"			"CerbeticaBold16"
+		"font"			"Cerbetica16"
 		"fgcolor"		"235 226 202 255"
 	}
 
@@ -801,7 +805,7 @@
 		"tabPosition"	"0"
 		"labelText"		"%numDemoman%"
 		"textAlignment"	"center"
-		"font"			"CerbeticaBold16"
+		"font"			"Cerbetica16"
 		"fgcolor"		"235 226 202 255"
 	}
 
@@ -821,7 +825,7 @@
 		"tabPosition"	"0"
 		"labelText"		"%numHeavy%"
 		"textAlignment"	"center"
-		"font"			"CerbeticaBold16"
+		"font"			"Cerbetica16"
 		"fgcolor"		"235 226 202 255"
 	}
 
@@ -841,7 +845,7 @@
 		"tabPosition"	"0"
 		"labelText"		"%numEngineer%"
 		"textAlignment"	"center"
-		"font"			"CerbeticaBold16"
+		"font"			"Cerbetica16"
 		"fgcolor"		"235 226 202 255"
 	}
 
@@ -861,7 +865,7 @@
 		"tabPosition"	"0"
 		"labelText"		"%numMedic%"
 		"textAlignment"	"center"
-		"font"			"CerbeticaBold16"
+		"font"			"Cerbetica16"
 		"fgcolor"		"235 226 202 255"
 	}
 
@@ -881,7 +885,7 @@
 		"tabPosition"	"0"
 		"labelText"		"%numSniper%"
 		"textAlignment"	"center"
-		"font"			"CerbeticaBold16"
+		"font"			"Cerbetica16"
 		"fgcolor"		"235 226 202 255"
 	}
 
@@ -901,7 +905,7 @@
 		"tabPosition"	"0"
 		"labelText"		"%numSpy%"
 		"textAlignment"	"center"
-		"font"			"CerbeticaBold16"
+		"font"			"Cerbetica16"
 		"fgcolor"		"235 226 202 255"
 	}
 
diff --git a/customizations/team_menu/teammenu-center.res b/customizations/team_menu/teammenu-center.res
index e6940ed..3ffe965 100644
--- a/customizations/team_menu/teammenu-center.res
+++ b/customizations/team_menu/teammenu-center.res
@@ -46,12 +46,11 @@
 	"teambutton0"
 	{
 		"xpos"			"c-110"
-		"ypos"			"210"
+		"ypos"			"c-20"
 		"wide"			"110"
 		"tall"			"40"
-		"labelText"		"&3. Blue Team"	[$WIN32]
-		"textAlignment"	"center"
-		"font"			"CerbeticaBold16"
+		"textAlignment"	"north"
+		"font"			"Cerbetica16"
 	}
 
 	"BlueTeamBG"
@@ -65,12 +64,11 @@
 	"teambutton1"
 	{
 		"xpos"			"c0"
-		"ypos"			"210"
+		"ypos"			"c-20"
 		"wide"			"110"
 		"tall"			"40"
-		"labelText"		"&4. Red Team"	[$WIN32]
-		"textAlignment"	"center"
-		"font"			"CerbeticaBold16"
+		"textAlignment"	"north"
+		"font"			"Cerbetica16"
 	}
 
 	"RedTeamBG"
@@ -87,9 +85,8 @@
 		"ypos"			"c-40"
 		"wide"			"220"
 		"tall"			"20"
-		"labelText"		"&1. Auto-Join"
 		"textAlignment"	"center"
-		"font"			"CerbeticaBold16"
+		"font"			"Cerbetica16"
 	}
 
 	"AutoJoinBG"
@@ -104,9 +101,8 @@
 		"ypos"			"c20"
 		"wide"			"220"
 		"tall"			"20"
-		"labelText"		"&2. Spectate"	[$WIN32]
 		"textAlignment"	"center"
-		"font"			"CerbeticaBold16"
+		"font"			"Cerbetica16"
 	}
 
 	"SpectateBG"
@@ -117,60 +113,56 @@
 
 	"BlueCount"
 	{
-		"xpos"			"c-157"
-		"ypos"			"c-10"
-		"wide"			"90"
-		"font"			"Cerbetica14"
+		"xpos"			"c-115"
+		"ypos"			"c-15"
+		"wide"			"48"
+		"tall"			"40"
+		"font"			"HudFontSmall"
+		"textAlignment"	"east"
 		"fgcolor"		"255 255 255 175"
 	}
 	"BlueCountPlayers"
 	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"BlueCountPlayers"
-		"xpos"			"c-120"
-		"ypos"			"c-10"
+		"xpos"			"c-60"
+		"ypos"			"c-15"
 		"zpos"			"1"
-		"wide"			"90"
-		"tall"			"30"
-		"autoResize"	"0"
-		"pinCorner"		"0"
+		"wide"			"55"
+		"tall"			"40"
 		"visible"		"1"
 		"enabled"		"1"
 		"labelText"		"players"
-		"textAlignment"	"east"
-		"dulltext"		"0"
-		"brighttext"	"1"
-		"font"			"Cerbetica14"
+		"textAlignment"	"west"
+		"font"			"HudFontSmall"
 		"fgcolor"		"255 255 255 175"
 	}
 
 	"RedCount"
 	{
-		"xpos"			"c-51"
-		"ypos"			"c-10"
-		"wide"			"90"
+		"xpos"			"c0"
+		"ypos"			"c-15"
+		"wide"			"43"
+		"tall"			"40"
 		"labelText"		"%redcount%"
-		"font"			"Cerbetica14"
+		"font"			"HudFontSmall"
+		"textAlignment"	"east"
 		"fgcolor"		"255 255 255 175"
 	}
 	"RedCountPlayers"
 	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"RedCountPlayers"
-		"xpos"			"c-14"
-		"ypos"			"c-10"
+		"xpos"			"c50"
+		"ypos"			"c-15"
 		"zpos"			"1"
-		"wide"			"90"
-		"tall"			"30"
-		"autoResize"	"0"
-		"pinCorner"		"0"
+		"wide"			"55"
+		"tall"			"40"
 		"visible"		"1"
 		"enabled"		"1"
 		"labelText"		"players"
-		"textAlignment"	"east"
-		"dulltext"		"0"
-		"brighttext"	"1"
-		"font"			"Cerbetica14"
+		"textAlignment"	"west"
+		"font"			"HudFontSmall"
 		"fgcolor"		"255 255 255 175"
 	}
 }
\ No newline at end of file
diff --git a/customizations/team_menu/teammenu.res b/customizations/team_menu/teammenu.res
index 8c5a434..9368fb8 100644
--- a/customizations/team_menu/teammenu.res
+++ b/customizations/team_menu/teammenu.res
@@ -2,7 +2,7 @@
 {
 	"team"
 	{
-		"ControlName"	"ImagePanel"
+		"ControlName"	"CTeamMenu"
 		"fieldName"		"team"
 		"xpos"			"0"
 		"ypos"			"0"
@@ -62,19 +62,19 @@
 
 	"SelectTeamLabel"
 	{
-		"ControlName"	"CExLabel"
+		"ControlName"	"Label"
 		"fieldName"		"SelectTeamLabel"
 		"xpos"			"0"
 		"ypos"			"15"
-		"zpos"			"6"
+		"zpos"			"1"
 		"wide"			"255"
 		"tall"			"30"
 		"labelText"		"#TF_SelectATeam"
 		"textAlignment"	"center"
-		"font"			"CerbeticaBold32"
+		"font"			"Cerbetica32"
 		"visible"		"1"
 		"enabled"		"1"
-		"fgcolor"		"TanLight"
+		"fgcolor_override"	"TanLight"
 	}
 
 	"teambutton0"
@@ -91,13 +91,13 @@
 		"visible"		"1"
 		"enabled"		"1"
 		"tabPosition"	"3"
-		"labelText"		"&3. BLU"	[$WIN32]
-		"textAlignment"	"west"
+		"labelText"		"#TF_BlueTeam_Name"
+		"textAlignment"	"center"
 		"dulltext"		"0"
 		"brighttext"	"0"
 		"command"		"jointeam blue"
 		"team"			"3"		// Blue Team
-		"font"			"CerbeticaBold20"
+		"font"			"Cerbetica20"
 		"defaultFgColor_override" 	"255 255 255 128"
 		"armedFgColor_override"		"235 226 202 255"
 		"depressedFgColor_override" "255 255 255 128"
@@ -132,14 +132,13 @@
 		"visible"		"1"
 		"enabled"		"1"
 		"tabPosition"	"3"
-		"labelText"		"&4. RED"	[$WIN32]
-		"textAlignment"	"west"
+		"labelText"		"#TF_RedTeam_Name"
+		"textAlignment"	"center"
 		"dulltext"		"0"
 		"brighttext"	"0"
 		"command"		"jointeam red"
 		"team"			"4"		// Red Team
-		"font"			"CerbeticaBold20"
-
+		"font"			"Cerbetica20"
 		"defaultFgColor_override" 	"255 255 255 128"
 		"armedFgColor_override"		"235 226 202 255"
 		"depressedFgColor_override" "255 255 255 128"
@@ -174,14 +173,13 @@
 		"visible"		"1"
 		"enabled"		"1"
 		"tabPosition"	"3"
-		"labelText"		"&1. Auto-Join"
-		"textAlignment"	"west"
+		"labelText"		"#TF_Random"
+		"textAlignment"	"center"
 		"dulltext"		"0"
 		"brighttext"	"0"
 		"paintborder"	"0"
 		"command"		"jointeam auto"
-
-		"font"			"CerbeticaBold20"
+		"font"			"Cerbetica20"
 		"defaultFgColor_override" 	"255 255 255 128"
 		"armedFgColor_override"		"235 226 202 255"
 		"depressedFgColor_override" "255 255 255 128"
@@ -216,14 +214,13 @@
 		"visible"		"1"
 		"enabled"		"1"
 		"tabPosition"	"3"
-		"labelText"		"&2. Spectate"	[$WIN32]
-		"textAlignment"	"west"
+		"labelText"		"#TF_Spectate"
+		"textAlignment"	"center"
 		"dulltext"		"0"
 		"brighttext"	"0"
 		"paintborder"	"0"
 		"command"		"jointeam spectate"
-
-		"font"			"CerbeticaBold20"
+		"font"			"Cerbetica20"
 		"defaultFgColor_override" 	"255 255 255 128"
 		"armedFgColor_override"		"235 226 202 255"
 		"depressedFgColor_override" "255 255 255 128"
@@ -264,11 +261,11 @@
 	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"BlueCount"
-		"xpos"			"-10"
+		"xpos"			"0"
 		"ypos"			"c5"
 		"zpos"			"1"
 		"zpos"			"3"
-		"wide"			"255"
+		"wide"			"245"
 		"tall"			"30"
 		"autoResize"	"0"
 		"pinCorner"		"0"
@@ -278,7 +275,7 @@
 		"textAlignment"	"east"
 		"dulltext"		"0"
 		"brighttext"	"1"
-		"font"			"CerbeticaBold20"
+		"font"			"Cerbetica20"
 		"fgcolor"		"242 242 242 255"
 	}
 
@@ -286,10 +283,10 @@
 	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"RedCount"
-		"xpos"			"-10"
+		"xpos"			"0"
 		"ypos"			"c45"
-		"zpos"			"3"
-		"wide"			"255"
+		"zpos"			"1"
+		"wide"			"245"
 		"tall"			"30"
 		"autoResize"	"0"
 		"pinCorner"		"0"
@@ -299,58 +296,10 @@
 		"textAlignment"	"east"
 		"dulltext"		"0"
 		"brighttext"	"1"
-		"font"			"CerbeticaBold20"
+		"font"			"Cerbetica20"
 		"fgcolor"		"242 242 242 255"
 	}
 
-	"HighlanderLabel"
-	{
-		"ControlName"	"CExLabel"
-		"fieldName"		"HighlanderLabel"
-		"xpos"			"0"
-		"ypos"			"c95"
-		"zpos"			"6"
-		"wide"			"255"
-		"tall"			"50"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"0"
-		"enabled"		"0"
-		"labelText"		"#TF_Highlander_Mode"
-		"textAlignment"	"Center"
-		"dulltext"		"0"
-		"brighttext"	"0"
-		"font"			"CerbeticaBold16"
-		"fgcolor"		"235 226 202 255"
-		"centerwrap"	"1"
-	}
-
-	"HighlanderLabelShadow"
-	{
-		"ControlName"	"CExLabel"
-		"fieldName"		"HighlanderLabelShadow"
-		"xpos"			"-1"
-		"ypos"			"-1"
-		"zpos"			"6"
-		"wide"			"255"
-		"tall"			"50"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"0"
-		"enabled"		"0"
-		"labelText"		"#TF_Highlander_Mode"
-		"textAlignment"	"Center"
-		"dulltext"		"0"
-		"brighttext"	"0"
-		"font"			"CerbeticaBold16"
-		"fgcolor"		"0 0 0 200"
-		"centerwrap"	"1"
-
-		"pin_to_sibling"		"HighlanderLabel"
-		"pin_corner_to_sibling"	"PIN_TOPLEFT"
-		"pin_to_sibling_corner"	"PIN_TOPLEFT"
-	}
-
 	"TeamsFullLabel"
 	{
 		"ControlName"	"CExLabel"
@@ -368,8 +317,8 @@
 		"textAlignment"	"center"
 		"dulltext"		"0"
 		"brighttext"	"0"
-		"font"			"CerbeticaBold12"
-		"fgcolor"		"235 226 202 255"
+		"font"			"Cerbetica12"
+		"fgcolor"		"TanLight"
 		"centerwrap"	"1"
 	}
 
@@ -390,8 +339,8 @@
 		"textAlignment"	"center"
 		"dulltext"		"0"
 		"brighttext"	"0"
-		"font"			"CerbeticaBold12"
-		"fgcolor"		"0 0 0 200"
+		"font"			"Cerbetica12"
+		"fgcolor"		"TransparentBlack"
 		"centerwrap"	"1"
 
 		"pin_to_sibling"		"TeamsFullLabel"
@@ -405,4 +354,54 @@
 		"fieldName"		"CancelButton"
 		"wide"			"0"
 	}
+
+	"teambutton0SC"
+	{
+		"ControlName"	"CExButton"
+		"fieldName"		"teambutton0SC"
+		"wide"			"0"
+		"tall"			"0"
+		"visible"		"1"
+		"enabled"		"1"
+		"labelText"		"&3"
+		"command"		"jointeam blue"
+		"team"			"3"
+	}
+
+	"teambutton1SC"
+	{
+		"ControlName"	"CExButton"
+		"fieldName"		"teambutton1SC"
+		"wide"			"0"
+		"tall"			"0"
+		"visible"		"1"
+		"enabled"		"1"
+		"labelText"		"&4"
+		"command"		"jointeam red"
+		"team"			"4"
+	}
+
+	"teambutton2SC"
+	{
+		"ControlName"	"CExButton"
+		"fieldName"		"teambutton2SC"
+		"wide"			"0"
+		"tall"			"0"
+		"visible"		"1"
+		"enabled"		"1"
+		"labelText"		"&1"
+		"command"		"jointeam auto"
+	}
+
+	"teambutton3SC"
+	{
+		"ControlName"	"CExButton"
+		"fieldName"		"teambutton3SC"
+		"wide"			"0"
+		"tall"			"0"
+		"visible"		"1"
+		"enabled"		"1"
+		"labelText"		"&2"
+		"command"		"jointeam spectate"
+	}
 }
\ No newline at end of file