Miscellenaous Tweaks

31 files changed, 491 insertions, 465 deletions

diff --git a/customizations/team_menu/teammenu.res b/customizations/team_menu/teammenu.res
index 8c5a434..f301526 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,11 +62,11 @@
 
 	"SelectTeamLabel"
 	{
-		"ControlName"	"CExLabel"
+		"ControlName"	"Label"
 		"fieldName"		"SelectTeamLabel"
 		"xpos"			"0"
 		"ypos"			"15"
-		"zpos"			"6"
+		"zpos"			"1"
 		"wide"			"255"
 		"tall"			"30"
 		"labelText"		"#TF_SelectATeam"
@@ -74,7 +74,7 @@
 		"font"			"CerbeticaBold32"
 		"visible"		"1"
 		"enabled"		"1"
-		"fgcolor"		"TanLight"
+		"fgcolor_override"	"TanLight"
 	}
 
 	"teambutton0"
@@ -91,7 +91,7 @@
 		"visible"		"1"
 		"enabled"		"1"
 		"tabPosition"	"3"
-		"labelText"		"&3. BLU"	[$WIN32]
+		"labelText"		"&3. BLU"
 		"textAlignment"	"west"
 		"dulltext"		"0"
 		"brighttext"	"0"
@@ -132,14 +132,13 @@
 		"visible"		"1"
 		"enabled"		"1"
 		"tabPosition"	"3"
-		"labelText"		"&4. RED"	[$WIN32]
+		"labelText"		"&4. RED"
 		"textAlignment"	"west"
 		"dulltext"		"0"
 		"brighttext"	"0"
 		"command"		"jointeam red"
 		"team"			"4"		// Red Team
 		"font"			"CerbeticaBold20"
-
 		"defaultFgColor_override" 	"255 255 255 128"
 		"armedFgColor_override"		"235 226 202 255"
 		"depressedFgColor_override" "255 255 255 128"
@@ -180,7 +179,6 @@
 		"brighttext"	"0"
 		"paintborder"	"0"
 		"command"		"jointeam auto"
-
 		"font"			"CerbeticaBold20"
 		"defaultFgColor_override" 	"255 255 255 128"
 		"armedFgColor_override"		"235 226 202 255"
@@ -216,13 +214,12 @@
 		"visible"		"1"
 		"enabled"		"1"
 		"tabPosition"	"3"
-		"labelText"		"&2. Spectate"	[$WIN32]
+		"labelText"		"&2. Spectate"
 		"textAlignment"	"west"
 		"dulltext"		"0"
 		"brighttext"	"0"
 		"paintborder"	"0"
 		"command"		"jointeam spectate"
-
 		"font"			"CerbeticaBold20"
 		"defaultFgColor_override" 	"255 255 255 128"
 		"armedFgColor_override"		"235 226 202 255"
@@ -288,7 +285,7 @@
 		"fieldName"		"RedCount"
 		"xpos"			"-10"
 		"ypos"			"c45"
-		"zpos"			"3"
+		"zpos"			"1"
 		"wide"			"255"
 		"tall"			"30"
 		"autoResize"	"0"
@@ -369,7 +366,7 @@
 		"dulltext"		"0"
 		"brighttext"	"0"
 		"font"			"CerbeticaBold12"
-		"fgcolor"		"235 226 202 255"
+		"fgcolor"		"TanLight"
 		"centerwrap"	"1"
 	}
 
@@ -391,7 +388,7 @@
 		"dulltext"		"0"
 		"brighttext"	"0"
 		"font"			"CerbeticaBold12"
-		"fgcolor"		"0 0 0 200"
+		"fgcolor"		"TransparentBlack"
 		"centerwrap"	"1"
 
 		"pin_to_sibling"		"TeamsFullLabel"
diff --git a/resource/ui/classloadoutpanel.res b/resource/ui/classloadoutpanel.res
index 72f80f7..0adacc6 100644
--- a/resource/ui/classloadoutpanel.res
+++ b/resource/ui/classloadoutpanel.res
@@ -84,7 +84,7 @@
 			"enabled"		"1"
 			"tabPosition"	"0"
 			"labelText"		"M"
-			"font"			"CustomIcons18"
+			"font"			"CustomIcons"
 			"textAlignment"	"center"
 			"dulltext"		"0"
 			"brighttext"	"0"
@@ -92,11 +92,8 @@
 			"sound_depressed"	"UI/buttonclick.wav"
 			"sound_released"	"UI/buttonclickrelease.wav"
 			"paintbackground"	"0"
-			"fgcolor"					"TanLight"
-			"defaultFgColor_override" 	"TanLight"
-			"armedFgColor_override"		"TanDark"
-			"depressedFgColor_override" "TanDark"
-			"selectedFgColor_override" 	"TanDark"
+			"image_drawcolor"	"TanLight"
+			"image_armedcolor"	"ColorCyan"
 		}
 	}
 
@@ -339,7 +336,6 @@
 
 		"sound_depressed"	"UI/buttonclick.wav"
 		"sound_released"	"UI/buttonclickrelease.wav"
-
 		"keyboardinputenabled"	"0"
 		"paintbackground"		"1"
 	}
diff --git a/resource/ui/compstats.res b/resource/ui/compstats.res
index 59b933a..0a5e4cc 100644
--- a/resource/ui/compstats.res
+++ b/resource/ui/compstats.res
@@ -170,9 +170,9 @@
 					"font"				"MarlettSmall"
 					"textAlignment"		"west"
 
-					"defaultFgColor_override" 	"TanDark"
+					"defaultFgColor_override"	"TanDark"
 					"armedFgColor_override"		"TanDark"
-					"selectedFgColor_override" 	"TanDark"
+					"selectedFgColor_override"	"TanDark"
 				}
 
 				"ResultButton"
@@ -195,7 +195,7 @@
 
 					"defaultFgColor_override" 	"TanDark"
 					"armedFgColor_override"		"Orange"
-					"selectedFgColor_override" "TanLight"
+					"selectedFgColor_override"	"TanLight"
 
 					"image_selectedcolor"	"White"
 					"image_armedcolor"		"Transparent"
diff --git a/resource/ui/craftingpanel.res b/resource/ui/craftingpanel.res
index 0153f9e..5874fdf 100644
--- a/resource/ui/craftingpanel.res
+++ b/resource/ui/craftingpanel.res
@@ -46,7 +46,7 @@
 			"model_tall"			"35"
 			"text_center"			"1"
 			"name_only"				"1"
-			"text_forcesize"	 	"3"
+			"text_forcesize"		"3"
 			"noitem_use_fullpanel" 	"1"
 
 			"inset_eq_x"			"2"
diff --git a/resource/ui/disguisestatuspanel.res b/resource/ui/disguisestatuspanel.res
index a0ceb2a..a7749ff 100644
--- a/resource/ui/disguisestatuspanel.res
+++ b/resource/ui/disguisestatuspanel.res
@@ -167,7 +167,7 @@
 		"visible"			"1"
 		"enabled"			"1"
 		"HealthBonusPosAdj"	"10"
-		"HealthDeathWarning"	"0.49"
+		"HealthDeathWarning"		"0.49"
 		"TFFont"					"HudFontSmall"
 		"HealthDeathWarningColor"	"HUDDeathWarning"
 		"TextColor"					"HudOffWhite"
diff --git a/resource/ui/hudaccountpanel.res b/resource/ui/hudaccountpanel.res
index ac5a751..59dc5b5 100644
--- a/resource/ui/hudaccountpanel.res
+++ b/resource/ui/hudaccountpanel.res
@@ -16,19 +16,19 @@
 
 	"AccountBG"
 	{
-		"ControlName"		"CTFImagePanel"
-		"fieldName"			"AccountBG"
-		"xpos"				"5"
-		"ypos"				"103"
-		"zpos"				"0"
-		"wide"				"84"
-		"tall"				"42"
-		"visible"			"0"
-		"enabled"			"0"
-		"image"				"../hud/misc_ammo_area_blue"
-		"scaleImage"		"1"
-		"teambg_2"			"../hud/misc_ammo_area_red"
-		"teambg_3"			"../hud/misc_ammo_area_blue"
+		"ControlName"	"CTFImagePanel"
+		"fieldName"		"AccountBG"
+		"xpos"			"5"
+		"ypos"			"103"
+		"zpos"			"0"
+		"wide"			"84"
+		"tall"			"42"
+		"visible"		"0"
+		"enabled"		"0"
+		"image"			"../hud/misc_ammo_area_blue"
+		"scaleImage"	"1"
+		"teambg_2"		"../hud/misc_ammo_area_red"
+		"teambg_3"		"../hud/misc_ammo_area_blue"
 	}
 
 	"MetalIcon"
diff --git a/resource/ui/hudarenaclasslayout.res b/resource/ui/hudarenaclasslayout.res
index defd6dd..3985604 100644
--- a/resource/ui/hudarenaclasslayout.res
+++ b/resource/ui/hudarenaclasslayout.res
@@ -19,9 +19,9 @@
 		"teambg_3"		"../hud/color_panel_blu"
 		"paintborder"	"0"
 
-		"src_corner_height"		"23"			// pixels inside the image
+		"src_corner_height"		"23"
 		"src_corner_width"		"23"
-		"draw_corner_width"		"0"				// screen size of the corners ( and sides ), proportional
+		"draw_corner_width"		"0"
 		"draw_corner_height" 	"0"
 	}
 
@@ -44,10 +44,9 @@
 		"teambg_3"		"../hud/color_panel_clear"
 		"paintborder"	"0"
 
-		"src_corner_height"		"23"			// pixels inside the image
+		"src_corner_height"		"23"
 		"src_corner_width"		"23"
-
-		"draw_corner_width"		"0"				// screen size of the corners ( and sides ), proportional
+		"draw_corner_width"		"0"
 		"draw_corner_height" 	"0"
 	}
 
diff --git a/resource/ui/hudarenateammenu.res b/resource/ui/hudarenateammenu.res
index d8dfd5b..9f46458 100644
--- a/resource/ui/hudarenateammenu.res
+++ b/resource/ui/hudarenateammenu.res
@@ -73,7 +73,7 @@
 		"font"			"CerbeticaBold28"
 		"visible"		"1"
 		"enabled"		"1"
-		"fgcolor"		"TanLight"
+		"fgcolor_override"	"TanLight"
 	}
 
 	"teambutton2"
@@ -156,6 +156,13 @@
 		"selectedBgColor_override"	"TanDarker"
 	}
 
+	"CancelButton"
+	{
+		"ControlName"	"CExButton"
+		"fieldName"		"CancelButton"
+		"wide"			"0"
+	}
+
 	"SpecBG"
 	{
 		"ControlName"	"ImagePanel"
@@ -220,11 +227,4 @@
 		"fieldName"		"spectate"
 		"xpos"			"9999"
 	}
-
-	"CancelButton"
-	{
-		"ControlName"	"CExButton"
-		"fieldName"		"CancelButton"
-		"wide"			"0"
-	}
 }
\ No newline at end of file
diff --git a/resource/ui/huditemattributetracker.res b/resource/ui/huditemattributetracker.res
index 3336b15..6ae1b3e 100644
--- a/resource/ui/huditemattributetracker.res
+++ b/resource/ui/huditemattributetracker.res
@@ -24,7 +24,7 @@
 		"tall"			"20"
 		"proportionaltoparent"	"1"
 
-		"border"	"NoBorder"	//QuestStatusBorder
+		"border"	"NoBorder"
 		"paintborder"	"2"
 
 		"Header"
@@ -38,7 +38,7 @@
 			"tall"			"18"
 			"zpos"			"4"
 			"textinsetx"	"5"
-			"fgcolor_override"		"255 255 255 255"	//235 226 202 255
+			"fgcolor_override"		"255 255 255 255"
 			"font"			"AchievementTracker_Name"
 			//"wrap"			"1"
 			"TextAlignment"		"north-east"
@@ -56,7 +56,7 @@
 			"tall"			"f0"
 			"zpos"			"4"
 			"textinsetx"	"5"
-			"fgcolor_override"		"255 255 255 255"	//235 226 202 255
+			"fgcolor_override"		"255 255 255 255"
 			"font"			"QuestObjectiveTracker_Desc"
 			//"wrap"			"1"
 			"TextAlignment"		"north-east"
@@ -72,8 +72,8 @@
 			"zpos"			"0"
 			"wide"			"o1"
 			"tall"			"p0.8"
-			"visible"		"0"	//1
-			"enabled"		"0"	//1
+			"visible"		"0"
+			"enabled"		"0"
 			"image"			"tf2_folder_icon"
 			"scaleImage"	"1"
 			"proportionaltoparent"	"1"
diff --git a/resource/ui/hudmannvsmachinestatus.res b/resource/ui/hudmannvsmachinestatus.res
index 3b8f1cb..831752d 100644
--- a/resource/ui/hudmannvsmachinestatus.res
+++ b/resource/ui/hudmannvsmachinestatus.res
@@ -183,6 +183,7 @@
 		"fieldName"			"VictorySplash"
 		"xpos"				"0"
 		"ypos"				"0"
+		//"zpos"			"102"
 		"wide"				"f0"
 		"tall"				"480"
 		"visible"			"0"
diff --git a/resource/ui/hudmatchstatus.res b/resource/ui/hudmatchstatus.res
index 00a3408..4555cd0 100644
--- a/resource/ui/hudmatchstatus.res
+++ b/resource/ui/hudmatchstatus.res
@@ -203,6 +203,7 @@
 		"zpos"				"0"
 		"wide"				"365"
 		"tall"				"28"
+		"visible"			"0"
 		"proportionaltoaparent"	"1"
 		"border"			"NoBorder"
 	}
diff --git a/resource/ui/hudmatchsummary.res b/resource/ui/hudmatchsummary.res
index e0dbce4..3901f7d 100644
--- a/resource/ui/hudmatchsummary.res
+++ b/resource/ui/hudmatchsummary.res
@@ -36,7 +36,8 @@
 		"AnimRedTeamLabel12v12YPos"			"47"
 		"AnimStatsContainer12v12YPos"		"-10"
 
-		if_large {
+		if_large
+		{
 			"AnimBlueMedalsYPos"			"50"
 			"AnimRedMedalsYPos"				"50"
 		}
@@ -56,7 +57,8 @@
 		"border"		"MainMenuBGBorder"
 		"proportionaltoparent"	"1"
 
-		if_uses_xp {
+		if_uses_xp
+		{
 			"visible"		"1"
 		}
 	}
@@ -78,7 +80,8 @@
 		"show_sources_when_hidden"	"1"
 		"instantly_update"	"0"
 
-		if_uses_placement {
+		if_uses_placement
+		{
 			"show_model"	"0"
 		}
 	}
@@ -99,7 +102,8 @@
 		"show_progress"	"0"
 		"instantly_update"	"0"
 
-		if_uses_xp {
+		if_uses_xp
+		{
 			"visible"		"0"
 		}
 	}
@@ -253,7 +257,8 @@
 					"border"		"DarkBlueTeamBorder"
 					"bgcolor_override"	"70 130 180 153"
 
-					if_large {
+					if_large
+					{
 						"ypos"		"39"
 					}
 				}
@@ -274,7 +279,8 @@
 					"visible"		"1"
 					"enabled"		"1"
 
-					if_large {
+					if_large
+					{
 						"ypos"		"41"
 					}
 
@@ -297,7 +303,8 @@
 					"visible"		"1"
 					"enabled"		"1"
 
-					if_large {
+					if_large
+					{
 						"ypos"		"43"
 					}
 				}
@@ -318,7 +325,8 @@
 					"visible"		"1"
 					"enabled"		"1"
 
-					if_large {
+					if_large
+					{
 						"ypos"		"41"
 					}
 				}
@@ -344,7 +352,8 @@
 					"pin_corner_to_sibling"	"PIN_TOPLEFT"
 					"pin_to_sibling_corner"	"PIN_TOPLEFT"
 
-					if_large {
+					if_large
+					{
 						"ypos"		"42"
 					}
 				}
@@ -362,7 +371,8 @@
 					"image"			"../hud/team_blue"
 					"scaleImage"	"1"
 
-					if_large {
+					if_large
+					{
 						"ypos"		"29"
 					}
 				}
@@ -398,7 +408,8 @@
 					"scaleImage"	"1"
 					"color_outline"	"HudTimerProgressInActive"
 
-					if_large {
+					if_large
+					{
 						"ypos"		"40"
 					}
 				}
@@ -415,7 +426,8 @@
 					"PaintBackgroundType"	"2"
 					"bgcolor_override"	"TextColor"
 
-					if_large {
+					if_large
+					{
 						"ypos"		"38"
 					}
 				}
@@ -431,7 +443,8 @@
 					"visible"		"1"
 					"enabled"		"1"
 
-					if_large {
+					if_large
+					{
 						"ypos"		"77"
 						"tall"		"340"
 					}
@@ -462,7 +475,8 @@
 						"stats_width"	"s.08"
 						"horiz_inset"	"0"
 
-						if_large {
+						if_large
+						{
 							"tall"		"340"
 							"linegap"	"0"
 						}
@@ -483,7 +497,8 @@
 					"enabled"		"1"
 					"border"		"TFFatLineBorderClearBG"
 
-					if_large {
+					if_large
+					{
 						"ypos"		"57"
 						"tall"		"360"
 					}
@@ -539,7 +554,8 @@
 					"visible"		"1"
 					"enabled"		"1"
 
-					if_large {
+					if_large
+					{
 						"ypos"		"41"
 					}
 				}
@@ -583,7 +599,8 @@
 					"visible"		"1"
 					"enabled"		"1"
 
-					if_large {
+					if_large
+					{
 						"ypos"		"41"
 					}
 				}
@@ -623,7 +640,8 @@
 					"image"			"../hud/team_red"
 					"scaleImage"	"1"
 
-					if_large {
+					if_large
+					{
 						"ypos"		"20"
 					}
 				}
@@ -659,7 +677,8 @@
 					"scaleImage"	"1"
 					"color_outline"	"HudTimerProgressInActive"
 
-					if_large {
+					if_large
+					{
 						"ypos"		"40"
 					}
 				}
@@ -676,7 +695,8 @@
 					"PaintBackgroundType"	"2"
 					"bgcolor_override"	"TextColor"
 
-					if_large {
+					if_large
+					{
 						"ypos"		"38"
 					}
 				}
@@ -692,7 +712,8 @@
 					"visible"		"1"
 					"enabled"		"1"
 
-					if_large {
+					if_large
+					{
 						"ypos"		"77"
 						"tall"		"340"
 					}
@@ -723,7 +744,8 @@
 						"stats_width"	"s.08"
 						"horiz_inset"	"0"
 
-						if_large {
+						if_large
+						{
 							"tall"		"340"
 							"linegap"	"0"
 						}
@@ -744,7 +766,8 @@
 					"enabled"		"1"
 					"border"		"TFFatLineBorderClearBG"
 
-					if_large {
+					if_large
+					{
 						"ypos"		"57"
 						"tall"		"360"
 					}
@@ -762,7 +785,8 @@
 				"visible"		"1"
 				"enabled"		"1"
 
-				if_large {
+				if_large
+				{
 					"visible"	"0"
 				}
 
@@ -872,7 +896,8 @@
 				"visible"		"1"
 				"enabled"		"1"
 
-				if_large {
+				if_large
+				{
 					"visible"	"0"
 				}
 
diff --git a/resource/ui/hudmenutauntselection.res b/resource/ui/hudmenutauntselection.res
index 7b8c595..390abf0 100644
--- a/resource/ui/hudmenutauntselection.res
+++ b/resource/ui/hudmenutauntselection.res
@@ -188,10 +188,10 @@
 		"brighttext"	"0"
 	}
 
-	"NumberLabel1BG"
+	"NumberLabel1Shadow"
 	{
 		"ControlName"	"CExLabel"
-		"fieldName"		"NumberLabel1BG"
+		"fieldName"		"NumberLabel1Shadow"
 		"font"			"CerbeticaBold20"
 		"fgcolor"		"TransparentBlack"
 		"xpos"			"-2"
@@ -286,10 +286,10 @@
 		"brighttext"	"0"
 	}
 
-	"NumberLabel2BG"
+	"NumberLabel2Shadow"
 	{
 		"ControlName"	"CExLabel"
-		"fieldName"		"NumberLabel2BG"
+		"fieldName"		"NumberLabel2Shadow"
 		"font"			"CerbeticaBold20"
 		"fgcolor"		"TransparentBlack"
 		"xpos"			"-2"
@@ -384,10 +384,10 @@
 		"brighttext"	"0"
 	}
 
-	"NumberLabel3BG"
+	"NumberLabel3Shadow"
 	{
 		"ControlName"	"CExLabel"
-		"fieldName"		"NumberLabel3BG"
+		"fieldName"		"NumberLabel3Shadow"
 		"font"			"CerbeticaBold20"
 		"fgcolor"		"TransparentBlack"
 		"xpos"			"-2"
@@ -482,10 +482,10 @@
 		"brighttext"	"0"
 	}
 
-	"NumberLabel4BG"
+	"NumberLabel4Shadow"
 	{
 		"ControlName"	"CExLabel"
-		"fieldName"		"NumberLabel4BG"
+		"fieldName"		"NumberLabel4Shadow"
 		"font"			"CerbeticaBold20"
 		"fgcolor"		"TransparentBlack"
 		"xpos"			"-2"
@@ -580,10 +580,10 @@
 		"brighttext"	"0"
 	}
 
-	"NumberLabel5BG"
+	"NumberLabel5Shadow"
 	{
 		"ControlName"	"CExLabel"
-		"fieldName"		"NumberLabel5BG"
+		"fieldName"		"NumberLabel5Shadow"
 		"font"			"CerbeticaBold20"
 		"fgcolor"		"TransparentBlack"
 		"xpos"			"-2"
@@ -678,10 +678,10 @@
 		"brighttext"	"0"
 	}
 
-	"NumberLabel6BG"
+	"NumberLabel6Shadow"
 	{
 		"ControlName"	"CExLabel"
-		"fieldName"		"NumberLabel6BG"
+		"fieldName"		"NumberLabel6Shadow"
 		"font"			"CerbeticaBold20"
 		"fgcolor"		"TransparentBlack"
 		"xpos"			"-2"
@@ -776,10 +776,10 @@
 		"brighttext"	"0"
 	}
 
-	"NumberLabel7BG"
+	"NumberLabel7Shadow"
 	{
 		"ControlName"	"CExLabel"
-		"fieldName"		"NumberLabel7BG"
+		"fieldName"		"NumberLabel7Shadow"
 		"font"			"CerbeticaBold20"
 		"fgcolor"		"TransparentBlack"
 		"ypos"			"-2"
@@ -874,10 +874,10 @@
 		"brighttext"	"0"
 	}
 
-	"NumberLabel8BG"
+	"NumberLabel8Shadow"
 	{
 		"ControlName"	"CExLabel"
-		"fieldName"		"NumberLabel8BG"
+		"fieldName"		"NumberLabel8Shadow"
 		"font"			"CerbeticaBold20"
 		"fgcolor"		"TransparentBlack"
 		"xpos"			"-2"
diff --git a/resource/ui/hudobjectiveflagpanel.res b/resource/ui/hudobjectiveflagpanel.res
index 533bd44..2480861 100644
--- a/resource/ui/hudobjectiveflagpanel.res
+++ b/resource/ui/hudobjectiveflagpanel.res
@@ -12,7 +12,8 @@
 		"visible"		"1"
 		"enabled"		"1"
 
-		"if_hybrid" {
+		"if_hybrid"
+		{
 			"zpos"		"-1"
 		}
 	}
@@ -31,15 +32,18 @@
 		"fillcolor"		"70 130 180 153"
 		"scaleImage"	"1"
 
-		"if_hybrid" {
+		"if_hybrid"
+		{
 			"visible"	"0"
 		}
 
-		"if_mvm" {
+		"if_mvm"
+		{
 			"visible"	"0"
 		}
 
-		"if_specialdelivery" {
+		"if_specialdelivery"
+		{
 			"visible"	"0"
 		}
 	}
@@ -58,15 +62,18 @@
 		"fillcolor"		"205 50 50 153"
 		"scaleImage"	"1"
 
-		"if_hybrid" {
+		"if_hybrid"
+		{
 			"visible"	"0"
 		}
 
-		"if_mvm" {
+		"if_mvm"
+		{
 			"visible"	"0"
 		}
 
-		"if_specialdelivery" {
+		"if_specialdelivery"
+		{
 			"visible"	"0"
 		}
 	}
diff --git a/resource/ui/hudobjectivetimepanel.res b/resource/ui/hudobjectivetimepanel.res
index 6cb80f9..cee5983 100644
--- a/resource/ui/hudobjectivetimepanel.res
+++ b/resource/ui/hudobjectivetimepanel.res
@@ -18,7 +18,8 @@
 		"draw_corner_width"	"0"
 		"draw_corner_height" "0"
 
-		if_match {
+		if_match
+		{
 			"visible"		"0"
 		}
 	}
@@ -40,7 +41,8 @@
 		"color_warning"		"TimerProgress.Warning"
 		"percent_warning"	"0.75"
 
-		if_match {
+		if_match
+		{
 			"visible"		"0"
 		}
 	}
diff --git a/resource/ui/hudtournament.res b/resource/ui/hudtournament.res
index 53a3236..45ef262 100644
--- a/resource/ui/hudtournament.res
+++ b/resource/ui/hudtournament.res
@@ -761,6 +761,13 @@
 		}
 	}
 
+	"TournamentReadyHintIcon"
+	{
+		"ControlName"	"CExLabel"
+		"fieldName"		"TournamentReadyHintIcon"
+		"wide"			"0"
+	}
+
 	"CountdownBG"
 	{
 		"ControlName"	"ScalableImagePanel"
diff --git a/resource/ui/hudtournamentsetup.res b/resource/ui/hudtournamentsetup.res
index fd78ec0..d150b62 100644
--- a/resource/ui/hudtournamentsetup.res
+++ b/resource/ui/hudtournamentsetup.res
@@ -61,7 +61,7 @@
 
 	"TournamentNameEdit"
 	{
-		"ControlName"	"Label"
+		"ControlName"	"TextEntry"
 		"fieldName"		"TournamentNameEdit"
 		"xpos"			"30"
 		"ypos"			"27"
diff --git a/resource/ui/itemquickswitch.res b/resource/ui/itemquickswitch.res
index 149eec9..9ec2a6e 100644
--- a/resource/ui/itemquickswitch.res
+++ b/resource/ui/itemquickswitch.res
@@ -62,13 +62,6 @@
 		"xpos"			"9999"
 	}
 
-	"NoItemsLabel"
-	{
-		"ControlName"	"CExLabel"
-		"fieldName"		"NoItemsLabel"
-		"xpos"			"9999"
-	}
-
 	"TopLine"
 	{
 		"ControlName"	"ImagePanel"
@@ -129,6 +122,13 @@
 		}
 	}
 
+	"NoItemsLabel"
+	{
+		"ControlName"	"CExLabel"
+		"fieldName"		"NoItemsLabel"
+		"xpos"			"9999"
+	}
+
 	"loadout_preset_panel"
 	{
 		"ControlName"	"CLoadoutPresetPanel"
diff --git a/resource/ui/mapinfomenu.res b/resource/ui/mapinfomenu.res
index f0b5d4d..fc690c9 100644
--- a/resource/ui/mapinfomenu.res
+++ b/resource/ui/mapinfomenu.res
@@ -28,7 +28,7 @@
 		"pinCorner"		"0"
 		"visible"		"0"
 		"enabled"		"0"
-		"fillcolor"		"0 0 0 100"
+		"fillcolor"		"TransparentBlack"
 	}
 
 	"MapInfoTitle"
@@ -107,13 +107,6 @@
 	{
 		"ControlName"	"CExButton"
 		"fieldName"		"MapInfoContinue"
-		"xpos"			"9999"
-	}
-
-	"MapInfoContinue2"
-	{
-		"ControlName"	"CExButton"
-		"fieldName"		"MapInfoContinue2"
 		"xpos"			"c-60"
 		"ypos"			"c96"
 		"zpos"			"6"
diff --git a/resource/ui/matchmakingdashboardcasualcriteria.res b/resource/ui/matchmakingdashboardcasualcriteria.res
index 7f810b3..f97828d 100644
--- a/resource/ui/matchmakingdashboardcasualcriteria.res
+++ b/resource/ui/matchmakingdashboardcasualcriteria.res
@@ -44,6 +44,23 @@
 		"proportionaltoparent"	"1"
 	}
 
+	"ToolTipButtonHack"
+	{
+		"ControlName"	"EditablePanel"
+		"fieldName"		"ToolTipButtonHack"
+		"xpos"			"cs-0.5"
+		"ypos"			"rs1-8"
+		"zpos"			"101"
+		"wide"			"f20"
+		"tall"			"20"
+		"visible"		"0"
+		"enabled"		"1"
+		"mouseinputenabled"	"1"
+		"eatmouseinput"	"0"
+		"showtooltipswhenmousedisabled"	"1"
+		"proportionaltoparent" "1"
+	}
+
 	"QueueButton"
 	{
 		"ControlName"	"CExButton"
diff --git a/resource/ui/mvmcreditspendpanel.res b/resource/ui/mvmcreditspendpanel.res
index 50f8193..950b67e 100644
--- a/resource/ui/mvmcreditspendpanel.res
+++ b/resource/ui/mvmcreditspendpanel.res
@@ -24,7 +24,7 @@
 		"wide"				"190"
 		"tall"				"42"
 		"visible"			"1"
-		"bgcolor_override"	"20 20 20 200"
+		"bgcolor_override"	"TransparentBlack"
 	}
 
 	"UpgradesLabel"
diff --git a/resource/ui/mvmscoreboard.res b/resource/ui/mvmscoreboard.res
index 00b6f7e..367d7e9 100644
--- a/resource/ui/mvmscoreboard.res
+++ b/resource/ui/mvmscoreboard.res
@@ -47,10 +47,10 @@
 		"draw_corner_height" 	"0"
 	}
 
-	"ScoreboardBackground"
+	"PlayerListBG"
 	{
 		"ControlName"		"ImagePanel"
-		"fieldName"			"ScoreboardBackground"
+		"fieldName"			"PlayerListBG"
 		"xpos"				"c-270"
 		"ypos"				"244"
 		"zpos"				"-1"
@@ -59,7 +59,7 @@
 		"pinCorner"			"0"
 		"visible"			"1"
 		"enabled"			"1"
-		"fillcolor"			"0 0 0 200"
+		"fillcolor"			"TransparentBlack"
 	}
 
 	"MvMPlayerList"
diff --git a/resource/ui/objectivestatusescort.res b/resource/ui/objectivestatusescort.res
index 4838e16..c88eb19 100644
--- a/resource/ui/objectivestatusescort.res
+++ b/resource/ui/objectivestatusescort.res
@@ -413,8 +413,6 @@
 			"if_multiple_trains"
 			{
 				"xpos"		"9999"
-				"wide"		"5"
-				"tall"		"10"
 			}
 
 			"if_multiple_trains_top"
@@ -486,33 +484,31 @@
 
 			"if_multiple_trains"
 			{
-				"xpos"			"22"
-				"wide"			"8"
-				"tall"			"8"
+				"xpos"		"22"
 			}
 
 			"if_multiple_trains_top"
 			{
-				"ypos"			"46"
+				"ypos"		"46"
 			}
 
 			"if_multiple_trains_bottom"
 			{
-				"ypos"			"83"
+				"ypos"		"83"
 			}
 		}
 
 		"EscortTeardrop"
 		{
-			"ControlName"		"EditablePanel"
-			"fieldName"			"EscortTeardrop"
-			"xpos"				"9999"
-			"ypos"				"9999"
-			"zpos"				"10"
-			"wide"				"50"
-			"tall"				"42"
-			"visible"			"0"
-			"enabled"			"0"
+			"ControlName"	"EditablePanel"
+			"fieldName"		"EscortTeardrop"
+			"xpos"			"9999"
+			"ypos"			"9999"
+			"zpos"			"10"
+			"wide"			"50"
+			"tall"			"42"
+			"visible"		"0"
+			"enabled"		"0"
 
 			"if_multiple_trains"
 			{
@@ -536,10 +532,6 @@
 				"scaleImage"	"1"
 				"icon"			"cappoint_progressbar_teardrop"
 				"iconColor"		"White"
-
-				"if_multiple_trains"
-				{
-				}
 			}
 
 			"ProgressText"
diff --git a/resource/ui/spectatortournament.res b/resource/ui/spectatortournament.res
index 51be4c4..309bea5 100644
--- a/resource/ui/spectatortournament.res
+++ b/resource/ui/spectatortournament.res
@@ -2,13 +2,13 @@
 {
 	"specgui"
 	{
-		"ControlName"	"Frame"
-		"fieldName"		"specgui"
-		"wide"			"f0"
-		"tall"			"480"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"enabled"		"1"
+		"ControlName"			"Frame"
+		"fieldName"				"specgui"
+		"wide"					"f0"
+		"tall"					"480"
+		"autoResize"			"0"
+		"pinCorner"				"0"
+		"enabled"				"1"
 
 		"team1_player_base_offset_x"	"0"
 		"team1_player_base_y"			"255"
@@ -32,182 +32,216 @@
 
 			"classimage"
 			{
-				"ControlName"	"CTFClassImage"
-				"fieldName"		"classimage"
-				"xpos"			"27"
-				"ypos"			"0"
-				"zpos"			"2"
-				"wide"			"18"
-				"tall"			"18"
-				"visible"		"1"
-				"enabled"		"1"
-				"team1_image"	"../hud/class_scoutred"
-				"scaleImage"	"1"
+				"ControlName"		"CTFClassImage"
+				"fieldName"			"classimage"
+				"xpos"				"27"
+				"ypos"				"0"
+				"zpos"				"2"
+				"wide"				"18"
+				"tall"				"18"
+				"visible"			"1"
+				"enabled"			"1"
+				"image"				"../hud/class_scoutred"
+				"scaleImage"		"1"
 			}
 
 			"classimagebg"
 			{
-				"ControlName"	"Panel"
-				"fieldName"		"classimagebg"
-				"xpos"			"9999"
-				"ypos"			"9999"
-				"zpos"			"2"
-				"wide"			"9999"
-				"tall"			"9999"
-				"visible"		"0"
-				"enabled"		"1"
-				"bgcolor_override"		"Black"
+				"ControlName"		"Panel"
+				"fieldName"			"classimagebg"
+				"xpos"				"9999"
+				"ypos"				"9999"
+				"zpos"				"2"
+				"wide"				"9999"
+				"tall"				"9999"
+				"visible"			"0"
+				"enabled"			"1"
+				"bgcolor_override"	"Black"
 				"PaintBackgroundType"	"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"
-			}
-
 			"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"
-				"fieldName"		"playername"
-				"font"			"Cerbetica14"
-				"xpos"			"54"
-				"ypos"			"0"
-				"zpos"			"5"
-				"wide"			"80"
-				"tall"			"16"
-				"autoResize"	"0"
-				"pinCorner"		"0"
-				"visible"		"1"
-				"labelText"		"%playername%"
-				"textAlignment"	"west"
-				"fgcolor"		"TanLight"
+				"ControlName"		"CExLabel"
+				"fieldName"			"playername"
+				"font"				"Cerbetica14"
+				"xpos"				"54"
+				"ypos"				"0"
+				"zpos"				"5"
+				"wide"				"80"
+				"tall"				"16"
+				"autoResize"		"0"
+				"pinCorner"			"0"
+				"visible"			"1"
+				"labelText"			"%playername%"
+				"textAlignment"		"west"
+				"fgcolor"			"TanLight"
 			}
 
 			"HealthIcon"
 			{
-				"ControlName"	"EditablePanel"
-				"fieldName"		"HealthIcon"
-				"xpos"			"0"
-				"ypos"			"0"
-				"zpos"			"3"
-				"wide"			"26"
-				"tall"			"17"
-				"visible" 		"1"
-				"enabled" 		"1"
-				"HealthBonusPosAdj" 		"10"
-				"HealthDeathWarning" 		"0.49"
+				"ControlName"		"EditablePanel"
+				"fieldName"			"HealthIcon"
+				"xpos"				"0"
+				"ypos"				"0"
+				"zpos"				"3"
+				"wide"				"26"
+				"tall"				"17"
+				"HealthBonusPosAdj"			"10"
+				"HealthDeathWarning"		"0.49"
+				"HealthDeathWarningColor"	"HUDDeathWarning"
 				"TFFont" 					"HudFontSmallest"
-				"HealthDeathWarningColor" 	"HUDDeathWarning"
 				"TextColor" 				"HudOffWhite"
 			}
 
+			"PanelBG"
+			{
+				"ControlName"		"ImagePanel"
+				"fieldName"			"PanelBG"
+				"xpos"				"0"
+				"ypos"				"0"
+				"zpos"				"-1"
+				"wide"				"160"
+				"tall"				"0"
+				"autoResize"		"0"
+				"pinCorner"			"0"
+				"visible"			"1"
+				"enabled"			"1"
+				"fillcolor"			"15 15 15 50"
+			}
+
+			"respawntime"
+			{
+				"ControlName"		"CExLabel"
+				"fieldName"			"respawntime"
+				"font"				"Cerbetica12"
+				"xpos"				"5"
+				"ypos"				"3"
+				"zpos"				"5"
+				"wide"				"23"
+				"tall"				"10"
+				"autoResize"		"0"
+				"pinCorner"			"0"
+				"visible"			"1"
+				"labelText"			"%respawntime%"
+				"textAlignment"		"west"
+				"fgcolor"			"255 20 175 255"
+			}
+
+			"respawntimeBG"
+			{
+				"ControlName"		"CExLabel"
+				"fieldName"			"respawntimeBG"
+				"font"				"Cerbetica12"
+				"xpos"				"6"
+				"ypos"				"4"
+				"zpos"				"5"
+				"wide"				"23"
+				"tall"				"10"
+				"autoResize"		"0"
+				"pinCorner"			"0"
+				"visible"			"1"
+				"labelText"			"%respawntime%"
+				"textAlignment"		"west"
+				"fgcolor"			"TransparentBlack"
+			}
+
 			"ReadyBG"
 			{
 				"ControlName"		"ScalableImagePanel"
@@ -228,76 +262,40 @@
 				"visible"			"0"
 			}
 
-			"respawntime"
-			{
-				"ControlName"	"CExLabel"
-				"fieldName"		"respawntime"
-				"font"			"Cerbetica12"
-				"xpos"			"5"
-				"ypos"			"3"
-				"zpos"			"5"
-				"wide"			"23"
-				"tall"			"10"
-				"autoResize"	"0"
-				"pinCorner"		"0"
-				"visible"		"1"
-				"labelText"		"%respawntime%"
-				"textAlignment"	"west"
-				"fgcolor"		"255 20 175 255"
-			}
-
-			"respawntimeBG"
-			{
-				"ControlName"	"CExLabel"
-				"fieldName"		"respawntimeBG"
-				"font"			"Cerbetica12"
-				"xpos"			"6"
-				"ypos"			"4"
-				"zpos"			"5"
-				"wide"			"23"
-				"tall"			"10"
-				"autoResize"	"0"
-				"pinCorner"		"0"
-				"visible"		"1"
-				"labelText"		"%respawntime%"
-				"textAlignment"	"west"
-				"fgcolor"		"TransparentBlack"
-			}
-
 			"chargeamount"
 			{
-				"ControlName"	"CExLabel"
-				"fieldName"		"chargeamount"
-				"font"			"Cerbetica12"
-				"xpos"			"126"
-				"ypos"			"2"
-				"zpos"			"6"
-				"wide"			"25"
-				"tall"			"13"
-				"autoResize"	"0"
-				"pinCorner"		"0"
-				"visible"		"1"
-				"labelText"		"%chargeamount%"
-				"textAlignment"	"east"
-				"fgcolor"		"0 255 255 255"
+				"ControlName"		"CExLabel"
+				"fieldName"			"chargeamount"
+				"font"				"Cerbetica12"
+				"xpos"				"126"
+				"ypos"				"2"
+				"zpos"				"6"
+				"wide"				"25"
+				"tall"				"13"
+				"autoResize"		"0"
+				"pinCorner"			"0"
+				"visible"			"1"
+				"labelText"			"%chargeamount%"
+				"textAlignment"		"east"
+				"fgcolor"			"0 255 255 255"
 			}
 
 			"chargeamountBG"
 			{
-				"ControlName"	"CExLabel"
-				"fieldName"		"chargeamountBG"
-				"font"			"Cerbetica12"
-				"xpos"			"127"
-				"ypos"			"3"
-				"zpos"			"6"
-				"wide"			"25"
-				"tall"			"13"
-				"autoResize"	"0"
-				"pinCorner"		"0"
-				"visible"		"1"
-				"labelText"		"%chargeamount%"
-				"textAlignment"	"east"
-				"fgcolor"		"TransparentBlack"
+				"ControlName"		"CExLabel"
+				"fieldName"			"chargeamountBG"
+				"font"				"Cerbetica12"
+				"xpos"				"127"
+				"ypos"				"3"
+				"zpos"				"6"
+				"wide"				"25"
+				"tall"				"13"
+				"autoResize"		"0"
+				"pinCorner"			"0"
+				"visible"			"1"
+				"labelText"			"%chargeamount%"
+				"textAlignment"		"east"
+				"fgcolor"			"TransparentBlack"
 			}
 		}
 	}
@@ -309,14 +307,6 @@
 		"visible"		"0"
 		"tall"			"0"
 	}
-	"BottomBar"
-	{
-		"ControlName"	"Frame"
-		"fieldName"		"BottomBar"
-		"visible"		"0"
-		"ypos"			"100"
-		"tall"			"0"
-	}
 	"bottombarblank"
 	{
 		"ControlName"	"Panel"
@@ -425,31 +415,31 @@
 	}
 	"itempanel"
 	{
-		"ControlName"	"CItemModelPanel"
-		"fieldName"		"itempanel"
-		"xpos"			"r249"
-		"ypos"			"c50"
-		"zpos"			"10"
-		"wide"			"240"
-		"tall"			"100"
-		"visible"		"0"
+		"ControlName"			"CItemModelPanel"
+		"fieldName"				"itempanel"
+		"xpos"					"r249"
+		"ypos"					"c50"
+		"zpos"					"10"
+		"wide"					"240"
+		"tall"					"100"
+		"visible"				"0"
 		"bgcolor_override"		"255 255 255 0"
 		"PaintBackgroundType"	"0"
 
-		"model_ypos"		"20"
-		"model_center_x"	"1"
-		"model_wide"		"90"
-		"model_tall"		"60"
+		"model_ypos"			"20"
+		"model_center_x"		"1"
+		"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"
-		"resize_to_text"	"1"
-		"text_forcesize"	"2"
+		"max_text_height"		"100"
+		"padding_height"		"10"
+		"resize_to_text"		"1"
+		"text_forcesize"		"2"
 
 		"ItemBackground"
 		{
@@ -485,9 +475,9 @@
 
 		"itemmodelpanel"
 		{
-			"fieldName"		"itemmodelpanel"
-			"useparentbg"	"1"
+			"fieldName"				"itemmodelpanel"
 			"use_item_rendertarget" "0"
+			"useparentbg"			"1"
 			"inventory_image_type"	"1"
 		}
 
diff --git a/resource/ui/statsummary.res b/resource/ui/statsummary.res
index b9f3bc8..a57cc73 100644
--- a/resource/ui/statsummary.res
+++ b/resource/ui/statsummary.res
@@ -310,7 +310,7 @@
 			"labelText"		"#StatSummary_Label_PerformanceReport"
 			"textAlignment"	"west"
 			"xpos"			"c-285"
-			"ypos"			"170"
+			"ypos"			"185"
 			"wide"			"300"
 			"tall"			"20"
 			"autoResize"	"0"
@@ -424,7 +424,7 @@
 		{
 			"ControlName"	"Label"
 			"fieldName"		"ClassLabel1"
-			"font"			"ScoreboardSmall"
+			"font"			"CerbeticaBold12"
 			"labelText"		"%class1%"
 			"textAlignment"	"west"
 			"xpos"			"c+34"
@@ -543,7 +543,7 @@
 		{
 			"ControlName"	"Label"
 			"fieldName"		"ClassLabel2"
-			"font"			"ScoreboardSmall"
+			"font"			"CerbeticaBold12"
 			"labelText"		"%class2%"
 			"textAlignment"	"west"
 			"xpos"			"c+34"
@@ -662,7 +662,7 @@
 		{
 			"ControlName"	"Label"
 			"fieldName"		"ClassLabel3"
-			"font"			"ScoreboardSmall"
+			"font"			"CerbeticaBold12"
 			"labelText"		"%class3%"
 			"textAlignment"	"west"
 			"xpos"			"c+34"
@@ -781,7 +781,7 @@
 		{
 			"ControlName"	"Label"
 			"fieldName"		"ClassLabel4"
-			"font"			"ScoreboardSmall"
+			"font"			"CerbeticaBold12"
 			"labelText"		"%class4%"
 			"textAlignment"	"west"
 			"xpos"			"c+34"
@@ -900,7 +900,7 @@
 		{
 			"ControlName"	"Label"
 			"fieldName"		"ClassLabel5"
-			"font"			"ScoreboardSmall"
+			"font"			"CerbeticaBold12"
 			"labelText"		"%class5%"
 			"textAlignment"	"west"
 			"xpos"			"c+34"
@@ -1019,7 +1019,7 @@
 		{
 			"ControlName"	"Label"
 			"fieldName"		"ClassLabel6"
-			"font"			"ScoreboardSmall"
+			"font"			"CerbeticaBold12"
 			"labelText"		"%class6%"
 			"textAlignment"	"west"
 			"xpos"			"c+34"
@@ -1138,7 +1138,7 @@
 		{
 			"ControlName"	"Label"
 			"fieldName"		"ClassLabel7"
-			"font"			"ScoreboardSmall"
+			"font"			"CerbeticaBold12"
 			"labelText"		"%class7%"
 			"textAlignment"	"west"
 			"xpos"			"c+34"
@@ -1257,7 +1257,7 @@
 		{
 			"ControlName"	"Label"
 			"fieldName"		"ClassLabel8"
-			"font"			"ScoreboardSmall"
+			"font"			"CerbeticaBold12"
 			"labelText"		"%class8%"
 			"textAlignment"	"west"
 			"xpos"			"c+34"
@@ -1376,7 +1376,7 @@
 		{
 			"ControlName"	"Label"
 			"fieldName"		"ClassLabel9"
-			"font"			"ScoreboardSmall"
+			"font"			"CerbeticaBold12"
 			"labelText"		"%class9%"
 			"textAlignment"	"west"
 			"xpos"			"c+34"
@@ -1970,12 +1970,12 @@
 		"ControlName"	"CTFImagePanel"
 		"fieldName"		"TipImage"
 		"xpos"			"9999"
-		"ypos"			"9999"
+		"ypos"			"270"
 		"zpos"			"12"
 		"wide"			"35"
 		"tall"			"35"
 		"visible"		"0"
-		"enabled"		"0"
+		"enabled"		"1"
 		"image"			""
 		"scaleImage"	"1"
 	}
@@ -1987,14 +1987,14 @@
 		"labelText"		"%tiptext%"
 		"textAlignment"	"west"
 		"xpos"			"9999"
-		"ypos"			"9999"
+		"ypos"			"263"
 		"zpos"			"12"
 		"wide"			"350"
 		"tall"			"48"
 		"autoResize"	"0"
 		"pinCorner"		"0"
-		"visible"		"0"
-		"enabled"		"0"
+		"visible"		"1"
+		"enabled"		"1"
 		"wrap"			"1"
 	}
 
@@ -2002,7 +2002,7 @@
 	{
 		"ControlName"	"Button"
 		"fieldName"		"NextTipButton"
-		"xpos"			"c-248"
+		"xpos"			"9999"
 		"ypos"			"310"
 		"zpos"			"6"
 		"wide"			"90"
@@ -2017,6 +2017,8 @@
 		"dulltext"		"0"
 		"brighttext"	"0"
 		"Command"		"nexttip"
+		"border_default"	"ButtonHover"
+		"border_armed"		"ButtonHover"
 	}
 
 	"ResetStatsButton" [$WIN32]
@@ -2038,6 +2040,8 @@
 		"dulltext"		"0"
 		"brighttext"	"0"
 		"Command"		"resetstatsbutton"
+		"border_default"	"ButtonHover"
+		"border_armed"		"ButtonHover"
 	}
 
 	"CloseButton" [$WIN32]
@@ -2052,12 +2056,14 @@
 		"autoResize"	"0"
 		"pinCorner"		"2"
 		"visible"		"0"
-		"enabled"		"1"
+		"enabled"		"0"
 		"tabPosition"	"0"
 		"labelText"		"#TF_Close"
 		"textAlignment"	"center"
 		"dulltext"		"0"
 		"brighttext"	"0"
 		"Command"		"vguicancel"
+		"border_default"	"ButtonHover"
+		"border_armed"		"ButtonHover"
 	}
 }
\ No newline at end of file
diff --git a/resource/ui/statsummary_embedded.res b/resource/ui/statsummary_embedded.res
index a799ac0..ce83766 100644
--- a/resource/ui/statsummary_embedded.res
+++ b/resource/ui/statsummary_embedded.res
@@ -170,61 +170,61 @@
 
 			"BarChartComboA"
 			{
-				"ControlName"	"ComboBox"
-				"fieldName"		"BarChartComboA"
-				"xpos"			"c-285"
-				"ypos"			"212"
-				"zpos"			"10"
-				"wide"			"154"
-				"tall"			"14"
-				"autoResize"	"0"
-				"pinCorner"		"0"
-				"visible"		"1"
-				"enabled"		"1"
-				"tabPosition"	"1"
-				"textHidden"	"0"
-				"editable"		"0"
-				"maxchars"		"-1"
+				"ControlName"		"ComboBox"
+				"fieldName"			"BarChartComboA"
+				"xpos"				"c-285"
+				"ypos"				"212"
+				"zpos"				"10"
+				"wide"				"154"
+				"tall"				"14"
+				"autoResize"		"0"
+				"pinCorner"			"0"
+				"visible"			"1"
+				"enabled"			"1"
+				"tabPosition"		"1"
+				"textHidden"		"0"
+				"editable"			"0"
+				"maxchars"			"-1"
 				"NumericInputOnly"	"0"
 				"unicode"			"0"
 			}
 			"BarChartComboB"
 			{
-				"ControlName"	"ComboBox"
-				"fieldName"		"BarChartComboB"
-				"xpos"			"c-127"
-				"ypos"			"212"
-				"zpos"			"10"
-				"wide"			"154"
-				"tall"			"14"
-				"autoResize"	"0"
-				"pinCorner"		"0"
-				"visible"		"1"
-				"enabled"		"1"
-				"tabPosition"	"1"
-				"textHidden"	"0"
-				"editable"		"0"
-				"maxchars"		"-1"
+				"ControlName"		"ComboBox"
+				"fieldName"			"BarChartComboB"
+				"xpos"				"c-127"
+				"ypos"				"212"
+				"zpos"				"10"
+				"wide"				"154"
+				"tall"				"14"
+				"autoResize"		"0"
+				"pinCorner"			"0"
+				"visible"			"1"
+				"enabled"			"1"
+				"tabPosition"		"1"
+				"textHidden"		"0"
+				"editable"			"0"
+				"maxchars"			"-1"
 				"NumericInputOnly"	"0"
 				"unicode"			"0"
 			}
 			"ClassCombo"
 			{
-				"ControlName"	"ComboBox"
-				"fieldName"		"ClassCombo"
-				"xpos"			"c+124"
-				"ypos"			"212"
-				"zpos"			"10"
-				"wide"			"167"
-				"tall"			"14"
-				"autoResize"	"0"
-				"pinCorner"		"0"
-				"visible"		"1"
-				"enabled"		"1"
-				"tabPosition"	"1"
-				"textHidden"	"0"
-				"editable"		"0"
-				"maxchars"		"-1"
+				"ControlName"		"ComboBox"
+				"fieldName"			"ClassCombo"
+				"xpos"				"c+124"
+				"ypos"				"212"
+				"zpos"				"10"
+				"wide"				"167"
+				"tall"				"14"
+				"autoResize"		"0"
+				"pinCorner"			"0"
+				"visible"			"1"
+				"enabled"			"1"
+				"tabPosition"		"1"
+				"textHidden"		"0"
+				"editable"			"0"
+				"maxchars"			"-1"
 				"NumericInputOnly"	"0"
 				"unicode"			"0"
 			}
diff --git a/resource/ui/steamworkshopdialog.res b/resource/ui/steamworkshopdialog.res
index a204f33..c17184b 100644
--- a/resource/ui/steamworkshopdialog.res
+++ b/resource/ui/steamworkshopdialog.res
@@ -405,8 +405,8 @@
 				"labelText"			"#TF_SteamWorkshop_View"
 				"command"			"view"
 
-				"image_drawcolor"			"TanLight"
-				"image_disabledcolor" 		"ColorBlack"
+				"image_drawcolor"		"TanLight"
+				"image_disabledcolor" 	"ColorBlack"
 
 				"SubImage"
 				{
diff --git a/resource/ui/tankprogressbar.res b/resource/ui/tankprogressbar.res
index 3b3fecf..d5e9353 100644
--- a/resource/ui/tankprogressbar.res
+++ b/resource/ui/tankprogressbar.res
@@ -65,7 +65,7 @@
 		"src_corner_width"		"22"
 
 		"draw_corner_width"		"5"				// screen size of the corners ( and sides ), proportional
-		"draw_corner_height" 	"5"
+		"draw_corner_height"	"5"
 	}
 
 	"ProgressBarBG2"
diff --git a/resource/ui/textwindow.res b/resource/ui/textwindow.res
index 3edb7f6..2deb02c 100644
--- a/resource/ui/textwindow.res
+++ b/resource/ui/textwindow.res
@@ -57,7 +57,8 @@
 	{
 		"ControlName"		"TextEntry"
 		"fieldName"			"TextMessage"
-		"xpos"				"9999"
+		"visible"			"0"
+		"enabled"			"0"
 	}
 
 	"TFTextMessage"
@@ -69,7 +70,7 @@
 		"ypos"				"c-90"
 		"zpos"				"1"
 		"wide"				"340"
-		"tall"				"181"
+		"tall"				"180"
 		"autoResize"		"3"
 		"pinCorner"			"0"
 		"visible"			"1"
@@ -139,22 +140,13 @@
 		"ControlName"		"ImagePanel"
 		"fieldName"			"ShadedBar"
 		"xpos"				"9999"
-		"ypos"				"9999"
-		"zpos"				"5"
-		"wide"				"f0"
-		"tall"				"50"
-		"visible"			"1"
-		"enabled"			"1"
-		"tabPosition"		"0"
-		"image"				"loadout_bottom_gradient"
-		"tileImage"			"1"
-		"PaintBackgroundType"	"0"
 	}
 
 	"MessageTitle"
 	{
 		"ControlName"		"Label"
 		"fieldName"			"MessageTitle"
-		"xpos"				"9999"
+		"visible"			"0"
+		"enabled"			"0"
 	}
 }
\ No newline at end of file
diff --git a/resource/ui/wavestatuspanel.res b/resource/ui/wavestatuspanel.res
index cb14130..54a9b4a 100644
--- a/resource/ui/wavestatuspanel.res
+++ b/resource/ui/wavestatuspanel.res
@@ -75,7 +75,8 @@
 		"PaintBackgroundType"	"2"
 		"bgcolor_override"		"TanLight"
 
-		if_verbose {
+		if_verbose
+		{
 			"visible"		"1"
 		}
 	}
@@ -96,7 +97,8 @@
 		"textAlignment"		"west"
 		"labelText"			"#TF_MVM_Support"
 
-		if_verbose {
+		if_verbose
+		{
 			"visible"		"1"
 		}
 	}
@@ -144,7 +146,6 @@
 		"fieldName"			"ProgressBarBG"
 		"xpos"				"210"
 		"ypos"				"19"
-		"ypos_minmode"		"9"
 		"zpos"				"3"
 		"wide"				"180"
 		"tall"				"12"
diff --git a/resource/ui/winpanel.res b/resource/ui/winpanel.res
index b7f8e1c..00c23eb 100644
--- a/resource/ui/winpanel.res
+++ b/resource/ui/winpanel.res
@@ -51,7 +51,7 @@
 			"textAlignment"		"west"
 			"xpos"				"4"
 			"ypos"				"13"
-			"zpos"				"10"
+			"zpos"				"3"
 			"wide"				"75"
 			"tall"				"28"
 			"autoResize"		"0"
@@ -125,7 +125,7 @@
 			"textAlignment"		"east"
 			"xpos"				"122"
 			"ypos"				"13"
-			"zpos"				"1"
+			"zpos"				"3"
 			"wide"				"75"
 			"tall"				"28"
 			"autoResize"		"0"