Visual Tweaks, Bug Fixes (see notes)

- Added the missing player effect and health cluster icons
- Visual tweaks to the scoreboard, team/class select, freezecam, item test
- Updated the main menu to use the new Player Mute menu
- Fixed the Overtime label overlapping with the server time limit
- Removed unused font definitions

19 files changed, 217 insertions, 448 deletions

diff --git a/resource/gamemenu.res b/resource/gamemenu.res
index 521d3e8..2ccd3d9 100644
--- a/resource/gamemenu.res
+++ b/resource/gamemenu.res
@@ -46,7 +46,7 @@
 	"MutePlayersButton"
 	{
 		"label"			""
-		"command"		"OpenPlayerListDialog"
+		"command"		"OpenMutePlayerDialog"
 		"OnlyInGame"	"1"
 		"subimage"		"glyph_muted"
 		"tooltip"		"#MMenu_MutePlayers"
diff --git a/resource/scheme/clientscheme_fonts.res b/resource/scheme/clientscheme_fonts.res
index 4578dd8..fab7d55 100644
--- a/resource/scheme/clientscheme_fonts.res
+++ b/resource/scheme/clientscheme_fonts.res
@@ -3,22 +3,22 @@ Scheme
 	Fonts
 	{
 		// CUSTOM
-		"CerbeticaBold72"
+		"Cerbetica72"
 		{
 			"1"
 			{
-				"name"			"Cerbetica Bold"
+				"name"			"Cerbetica_edited"
 				"tall"			"72"
 				"additive"		"0"
 				"antialias"		"1"
 			}
 		}
-		"CerbeticaBold64"
+		"CerbeticaBold72"
 		{
 			"1"
 			{
 				"name"			"Cerbetica Bold"
-				"tall" 		 	"64"
+				"tall"			"72"
 				"additive"		"0"
 				"antialias"		"1"
 			}
@@ -44,72 +44,42 @@ Scheme
 				"outline"	 	"1"
 			}
 		}
-		"CerbeticaBold50"
-		{
-			"1"
-			{
-				"name"			"Cerbetica Bold"
-				"tall" 		 	"50"
-				"additive"		"0"
-				"antialias"		"1"
-			}
-		}
-		"CerbeticaBold48"
-		{
-			"1"
-			{
-				"name"			"Cerbetica Bold"
-				"tall" 		 	"48"
-				"additive"		"0"
-				"antialias"		"1"
-			}
-		}
-		"CerbeticaBold46"
-		{
-			"1"
-			{
-				"name"			"Cerbetica Bold"
-				"tall" 		 	"46"
-				"additive"		"0"
-				"antialias"		"1"
-			}
-		}
-		"CerbeticaBold44"
+		"Cerbetica48"
 		{
 			"1"
 			{
-				"name"			"Cerbetica Bold"
-				"tall" 		 	"44"
+				"name"			"Cerbetica_edited"
+				"tall"			"48"
 				"additive"		"0"
 				"antialias"		"1"
 			}
 		}
-		"CerbeticaBold42"
+		"CerbeticaBold40"
 		{
 			"1"
 			{
 				"name"			"Cerbetica Bold"
-				"tall"			"42"
+				"tall"			"40"
 				"additive"		"0"
 				"antialias"		"1"
 			}
 		}
-		"CerbeticaBold37"
+		"Cerbetica40"
 		{
 			"1"
 			{
-				"name"			"Cerbetica Bold"
-				"tall"			"37"
+				"name"			"Cerbetica_edited"
+				"tall"			"40"
 				"additive"		"0"
 				"antialias"		"1"
 			}
 		}
-		"CerbeticaBold36"
+		"Cerbetica32"
 		{
 			"1"
 			{
-				"name"			"Cerbetica Bold"
-				"tall"			"36"
+				"name"			"Cerbetica_edited"
+				"tall"			"32"
 				"additive"		"0"
 				"antialias"		"1"
 			}
@@ -145,375 +115,172 @@ Scheme
 				"antialias"		"1"
 			}
 		}
-		"CerbeticaBold27"
+		"Cerbetica26"
 		{
 			"1"
 			{
-				"name"			"Cerbetica Bold"
-				"tall"			"27"
+				"name"			"Cerbetica_edited"
+				"tall"			"26"
 				"additive"		"0"
 				"antialias"		"1"
 			}
 		}
-		"CerbeticaBold24"
+		"Cerbetica24"
 		{
 			"1"
 			{
-				"name"			"Cerbetica Bold"
+				"name"			"Cerbetica_edited"
 				"tall"			"24"
 				"additive"		"0"
 				"antialias"		"1"
 			}
 		}
-		"CerbeticaBoldOutline24"
-		{
-			"1"
-			{
-				"name"			"Cerbetica Bold"
-				"tall" 		 	"24"
-				"additive"	 	"0"
-				"antialias"	 	"1"
-				"outline"	 	"1"
-			}
-		}
-		"CerbeticaBold22"
-		{
-			"1"
-			{
-				"name"			"Cerbetica Bold"
-				"tall"			"22"
-				"additive"		"0"
-				"antialias"		"1"
-			}
-		}
-		"CerbeticaBold20"
-		{
-			"1"
-			{
-				"name"			"Cerbetica Bold"
-				"tall"			"20"
-				"additive"		"0"
-				"antialias"		"1"
-			}
-		}
-		"CerbeticaBold18"
-		{
-			"1"
-			{
-				"name"			"Cerbetica Bold"
-				"tall"			"18"
-				"additive"		"0"
-				"antialias"		"1"
-			}
-		}
-		"CerbeticaBold17"
-		{
-			"1"
-			{
-				"name"			"Cerbetica Bold"
-				"tall"			"17"
-				"additive"		"0"
-				"antialias"		"1"
-			}
-		}
-		"CerbeticaBold16"
+		"CerbeticaBold24"
 		{
 			"1"
 			{
 				"name"			"Cerbetica Bold"
-				"tall"			"16"
+				"tall"			"24"
 				"additive"		"0"
 				"antialias"		"1"
 			}
 		}
-		"CerbeticaBoldOutline16"
+		"CerbeticaBoldOutline24"
 		{
 			"1"
 			{
 				"name"			"Cerbetica Bold"
-				"tall"			"16"
+				"tall" 		 	"24"
 				"additive"	 	"0"
 				"antialias"	 	"1"
 				"outline"	 	"1"
 			}
 		}
-		"CerbeticaBold15"
-		{
-			"1"
-			{
-				"name"			"Cerbetica Bold"
-				"tall"			"15"
-				"additive"		"0"
-				"antialias"		"1"
-			}
-		}
-		"CerbeticaBold14"
-		{
-			"1"
-			{
-				"name"			"Cerbetica Bold"
-				"tall"			"14"
-				"additive"		"0"
-				"antialias"		"1"
-			}
-		}
-		"CerbeticaBold13"
-		{
-			"1"
-			{
-				"name"			"Cerbetica Bold"
-				"tall"			"13"
-				"additive"		"0"
-				"antialias"		"1"
-			}
-		}
-		"CerbeticaBold12"
-		{
-			"1"
-			{
-				"name"			"Cerbetica Bold"
-				"tall"			"12"
-				"additive"		"0"
-				"antialias"		"1"
-			}
-		}
-		"CerbeticaBold10"
-		{
-			"1"
-			{
-				"name"			"Cerbetica Bold"
-				"tall"			"10"
-				"additive"		"0"
-				"antialias"		"1"
-			}
-		}
-		"CerbeticaBold8"
-		{
-			"1"
-			{
-				"name"			"Cerbetica Bold"
-				"tall"			"8"
-				"additive"		"0"
-				"antialias"		"1"
-			}
-		}
-		"Cerbetica72"
-		{
-			"1"
-			{
-				"name"			"Cerbetica_edited"
-				"tall"			"72"
-				"additive"		"0"
-				"antialias"		"1"
-			}
-		}
-		"Cerbetica60"
-		{
-			"1"
-			{
-				"name"			"Cerbetica_edited"
-				"tall"			"60"
-				"additive"		"0"
-				"antialias"		"1"
-			}
-		}
-		"Cerbetica56"
-		{
-			"1"
-			{
-				"name"			"Cerbetica_edited"
-				"tall"			"56"
-				"additive"		"0"
-				"antialias"		"1"
-			}
-		}
-		"Cerbetica55"
-		{
-			"1"
-			{
-				"name"			"Cerbetica_edited"
-				"tall"			"55"
-				"additive"		"0"
-				"antialias"		"1"
-			}
-		}
-
-		"Cerbetica54"
-		{
-			"1"
-			{
-				"name"			"Cerbetica_edited"
-				"tall"			"54"
-				"additive"		"0"
-				"antialias"		"1"
-			}
-		}
-		"Cerbetica52"
-		{
-			"1"
-			{
-				"name"			"Cerbetica_edited"
-				"tall"			"52"
-				"additive"		"0"
-				"antialias"		"1"
-			}
-		}
-		"Cerbetica48"
-		{
-			"1"
-			{
-				"name"			"Cerbetica_edited"
-				"tall"			"48"
-				"additive"		"0"
-				"antialias"		"1"
-			}
-		}
-		"Cerbetica44"
-		{
-			"1"
-			{
-				"name"			"Cerbetica_edited"
-				"tall"			"44"
-				"additive"		"0"
-				"antialias"		"1"
-			}
-		}
-		"Cerbetica40"
+		"Cerbetica22"
 		{
 			"1"
 			{
 				"name"			"Cerbetica_edited"
-				"tall"			"40"
+				"tall"			"22"
 				"additive"		"0"
 				"antialias"		"1"
 			}
 		}
-		"Cerbetica36"
+		"CerbeticaBold22"
 		{
 			"1"
 			{
-				"name"			"Cerbetica_edited"
-				"tall"			"36"
+				"name"			"Cerbetica Bold"
+				"tall"			"22"
 				"additive"		"0"
 				"antialias"		"1"
 			}
 		}
-		"Cerbetica32"
+		"Cerbetica20"
 		{
 			"1"
 			{
 				"name"			"Cerbetica_edited"
-				"tall"			"32"
+				"tall"			"20"
 				"additive"		"0"
 				"antialias"		"1"
 			}
 		}
-		"Cerbetica28"
+		"CerbeticaBold20"
 		{
 			"1"
 			{
-				"name"			"Cerbetica_edited"
-				"tall"			"26"
+				"name"			"Cerbetica Bold"
+				"tall"			"20"
 				"additive"		"0"
 				"antialias"		"1"
 			}
 		}
-		"Cerbetica26"
+		"Cerbetica18"
 		{
 			"1"
 			{
 				"name"			"Cerbetica_edited"
-				"tall"			"26"
+				"tall"			"18"
 				"additive"		"0"
 				"antialias"		"1"
 			}
 		}
-		"Cerbetica24"
+		"CerbeticaBold18"
 		{
 			"1"
 			{
-				"name"			"Cerbetica_edited"
-				"tall"			"24"
+				"name"			"Cerbetica Bold"
+				"tall"			"18"
 				"additive"		"0"
 				"antialias"		"1"
 			}
 		}
-		"CerbeticaOutline24"
-		{
-			"1"
-			{
-				"name"			"Cerbetica_edited"
-				"tall"			"24"
-				"additive"	 	"0"
-				"antialias"	 	"1"
-				"outline"	 	"1"
-			}
-		}
-		"Cerbetica22"
+		"Cerbetica16"
 		{
 			"1"
 			{
 				"name"			"Cerbetica_edited"
-				"tall"			"22"
+				"tall"			"16"
 				"additive"		"0"
 				"antialias"		"1"
 			}
 		}
-		"Cerbetica20"
+		"CerbeticaBold16"
 		{
 			"1"
 			{
-				"name"			"Cerbetica_edited"
-				"tall"			"20"
+				"name"			"Cerbetica Bold"
+				"tall"			"16"
 				"additive"		"0"
 				"antialias"		"1"
 			}
 		}
-		"Cerbetica18"
+		"CerbeticaBold15"
 		{
 			"1"
 			{
-				"name"			"Cerbetica_edited"
-				"tall"			"18"
+				"name"			"Cerbetica Bold"
+				"tall"			"15"
 				"additive"		"0"
 				"antialias"		"1"
 			}
 		}
-		"Cerbetica16"
+		"Cerbetica14"
 		{
 			"1"
 			{
 				"name"			"Cerbetica_edited"
-				"tall"			"16"
+				"tall"			"14"
 				"additive"		"0"
 				"antialias"		"1"
 			}
 		}
-		"Cerbetica15"
+		"CerbeticaBold14"
 		{
 			"1"
 			{
-				"name"			"Cerbetica_edited"
-				"tall"			"15"
+				"name"			"Cerbetica Bold"
+				"tall"			"14"
 				"additive"		"0"
 				"antialias"		"1"
 			}
 		}
-		"Cerbetica14"
+		"Cerbetica12"
 		{
 			"1"
 			{
 				"name"			"Cerbetica_edited"
-				"tall"			"14"
+				"tall"			"12"
 				"additive"		"0"
 				"antialias"		"1"
 			}
 		}
-		"Cerbetica12"
+		"CerbeticaBold12"
 		{
 			"1"
 			{
-				"name"			"Cerbetica_edited"
+				"name"			"Cerbetica Bold"
 				"tall"			"12"
 				"additive"		"0"
 				"antialias"		"1"
@@ -559,16 +326,6 @@ Scheme
 				"antialias"		"1"
 			}
 		}
-		"Cerbetica7"
-		{
-			"1"
-			{
-				"name"			"Cerbetica_edited"
-				"tall"			"7"
-				"additive"		"0"
-				"antialias" 	"1"
-			}
-		}
 
 		// DEFAULT
 		"Default"
@@ -1060,7 +817,7 @@ Scheme
 			"1"
 			{
 				"name"			"Cerbetica_edited"
-				"tall"			"11"
+				"tall"			"12"
 				"weight"		"500"
 				"additive"		"0"
 				"antialias" 	"1"
@@ -1071,7 +828,7 @@ Scheme
 			"1"
 			{
 				"name"			"Cerbetica_edited"
-				"tall"			"11"
+				"tall"			"12"
 				"weight"		"500"
 				"additive"		"0"
 				"antialias" 	"1"
@@ -1082,8 +839,8 @@ Scheme
 		{
 			"1"
 			{
-				"name"			"Cerbetica_edited"
-				"tall"			"11"
+				"name"			"Cerbetica Bold"
+				"tall"			"12"
 				"weight"		"500"
 				"additive"		"0"
 				"antialias" 	"1"
@@ -1095,7 +852,7 @@ Scheme
 			"1"
 			{
 				"name"			"Cerbetica_edited"
-				"tall"			"4"
+				"tall"			"6"
 				"weight"		"500"
 				"additive"		"0"
 				"antialias"		"1"
@@ -1617,7 +1374,7 @@ Scheme
 			"1"
 			{
 				"name"			"Cerbetica_edited"
-				"tall"			"8"
+				"tall"			"9"
 				"weight"		"400"
 				"additive"		"0"
 				"antialias" 	"1"
diff --git a/resource/ui/charinfoloadoutsubpanel.res b/resource/ui/charinfoloadoutsubpanel.res
index 4a97712..a12b20a 100644
--- a/resource/ui/charinfoloadoutsubpanel.res
+++ b/resource/ui/charinfoloadoutsubpanel.res
@@ -42,7 +42,7 @@
 		"wide"				"60"
 		"tall"				"120"
 		"autoResize"		"0"
-		"pinCorner"			"2"
+		"pinCorner"			"0"
 		"visible"			"1"
 		"enabled"			"1"
 		"tabPosition"		"0"
@@ -68,7 +68,7 @@
 		"wide"				"60"
 		"tall"				"120"
 		"autoResize"		"0"
-		"pinCorner"			"2"
+		"pinCorner"			"0"
 		"visible"			"1"
 		"enabled"			"1"
 		"tabPosition"		"0"
@@ -94,7 +94,7 @@
 		"wide"				"60"
 		"tall"				"120"
 		"autoResize"		"0"
-		"pinCorner"			"2"
+		"pinCorner"			"0"
 		"visible"			"1"
 		"enabled"			"1"
 		"tabPosition"		"0"
@@ -120,7 +120,7 @@
 		"wide"				"60"
 		"tall"				"120"
 		"autoResize"		"0"
-		"pinCorner"			"2"
+		"pinCorner"			"0"
 		"visible"			"1"
 		"enabled"			"1"
 		"tabPosition"		"0"
@@ -146,7 +146,7 @@
 		"wide"				"60"
 		"tall"				"120"
 		"autoResize"		"0"
-		"pinCorner"			"2"
+		"pinCorner"			"0"
 		"visible"			"1"
 		"enabled"			"1"
 		"tabPosition"		"0"
@@ -172,7 +172,7 @@
 		"wide"				"60"
 		"tall"				"120"
 		"autoResize"		"0"
-		"pinCorner"			"2"
+		"pinCorner"			"0"
 		"visible"			"1"
 		"enabled"			"1"
 		"tabPosition"		"0"
@@ -198,7 +198,7 @@
 		"wide"				"60"
 		"tall"				"120"
 		"autoResize"		"0"
-		"pinCorner"			"2"
+		"pinCorner"			"0"
 		"visible"			"1"
 		"enabled"			"1"
 		"tabPosition"		"0"
@@ -224,7 +224,7 @@
 		"wide"				"60"
 		"tall"				"120"
 		"autoResize"		"0"
-		"pinCorner"			"2"
+		"pinCorner"			"0"
 		"visible"			"1"
 		"enabled"			"1"
 		"tabPosition"		"0"
@@ -250,7 +250,7 @@
 		"wide"				"60"
 		"tall"				"120"
 		"autoResize"		"0"
-		"pinCorner"			"2"
+		"pinCorner"			"0"
 		"visible"			"1"
 		"enabled"			"1"
 		"tabPosition"		"0"
diff --git a/resource/ui/classloadoutpanel.res b/resource/ui/classloadoutpanel.res
index 0adacc6..4f82713 100644
--- a/resource/ui/classloadoutpanel.res
+++ b/resource/ui/classloadoutpanel.res
@@ -219,7 +219,7 @@
 		"noitem_textcolor"		"TextColor"
 		"PaintBackgroundType"	"2"
 		"paintborder"		"1"
-		"text_ypos"			"0"
+		"text_ypos"			"15"
 		"text_center"		"1"
 		"model_hide"		"1"
 		"resize_to_text"	"1"
@@ -229,8 +229,8 @@
 		{
 			"font"			"ItemFontAttribLarge"
 			"xpos"			"0"
-			"ypos"			"30"
-			"zpos"			"101"
+			"ypos"			"0"
+			"zpos"			"2"
 			"wide"			"140"
 			"tall"			"60"
 			"autoResize"	"0"
@@ -250,7 +250,7 @@
 		"fieldName"		"PassiveAttribsLabel"
 		"font"			"ItemFontAttribLarge"
 		"xpos"			"c-135"
-		"ypos"			"128"
+		"ypos"			"125"
 		"zpos"			"0"
 		"wide"			"270"
 		"tall"			"240"
diff --git a/resource/ui/disguise_menu/hudmenuspydisguise.res b/resource/ui/disguise_menu/hudmenuspydisguise.res
index cb32874..d2aab9e 100644
--- a/resource/ui/disguise_menu/hudmenuspydisguise.res
+++ b/resource/ui/disguise_menu/hudmenuspydisguise.res
@@ -2,26 +2,28 @@
 {
 	"MainBackground"
 	{
-		"ControlName"		"EditablePanel"
+		"ControlName"		"CIconPanel"
 		"fieldName"			"MainBackground"
-		"xpos"				"0"
-		"ypos"				"20"
-		"zpos"				"1"
-		"wide"				"100"
-		"tall"				"150"
+		"xpos"				"9999"
+		"ypos"				"9999"
+		"zpos"				"0"
+		"wide"				"470"
+		"tall"				"170"
 		"visible"			"1"
 		"enabled"			"1"
-		"paintbackground" 	"0"
+		"scaleImage"		"1"
+		"icon"				"hud_menu_bg"
+		"iconColor"			"White"
 	}
 
 	"TitleLabel"
 	{
 		"ControlName"		"CExLabel"
 		"fieldName"			"TitleLabel"
-		"font"				"CerbeticaBold32"
+		"font"				"CerbeticaBold28"
 		"xpos"				"10"
 		"ypos"				"0"
-		"zpos"				"2"
+		"zpos"				"3"
 		"wide"				"380"
 		"tall"				"30"
 		"autoResize"		"0"
@@ -29,7 +31,7 @@
 		"visible"			"1"
 		"enabled"			"1"
 		"labelText"			"#Hud_Menu_Disguise_Title"
-		"textAlignment"		"Left"
+		"textAlignment"		"west"
 		"dulltext"			"0"
 		"brighttext"		"0"
 	}
@@ -38,11 +40,11 @@
 	{
 		"ControlName"		"CExLabel"
 		"fieldName"			"TitleLabelDropshadow"
-		"font"				"CerbeticaBold32"
+		"font"				"CerbeticaBold28"
 		"fgcolor"			"TransparentBlack"
 		"xpos"				"-2"
 		"ypos"				"-2"
-		"zpos"				"1"
+		"zpos"				"3"
 		"wide"				"380"
 		"tall"				"30"
 		"autoResize"		"0"
@@ -50,7 +52,7 @@
 		"visible"			"1"
 		"enabled"			"1"
 		"labelText"			"#Hud_Menu_Disguise_Title"
-		"textAlignment"		"Left"
+		"textAlignment"		"west"
 		"dulltext"			"1"
 		"brighttext"		"0"
 
@@ -63,18 +65,18 @@
 	{
 		"ControlName"		"CExLabel"
 		"fieldName"			"ToggleLabel"
-		"font"				"Cerbetica12"
+		"font"				"TextTooltipFont"
 		"xpos"				"0"
-		"ypos"				"175"
+		"ypos"				"165"
 		"zpos"				"2"
-		"wide"				"200"
+		"wide"				"100"
 		"tall"				"15"
 		"autoResize"		"0"
 		"pinCorner"			"0"
 		"visible"			"1"
 		"enabled"			"1"
 		"labelText"			"#Hud_Menu_Spy_Minus_Toggle"
-		"textAlignment"		"Left"
+		"textAlignment"		"center"
 		"dulltext"			"0"
 		"brighttext"		"0"
 	}
@@ -86,8 +88,8 @@
 		"font"				"SpectatorKeyHints"
 		"xpos"				"9999"
 		"ypos"				"9999"
-		"zpos"				"1"
-		"wide"				"200"
+		"zpos"				"2"
+		"wide"				"300"
 		"tall"				"13"
 		"autoResize"		"0"
 		"pinCorner"			"0"
@@ -104,7 +106,7 @@
 		"ControlName"		"EditablePanel"
 		"fieldName"			"class_item_red_1"
 		"xpos"				"10"
-		"ypos"				"30"
+		"ypos"				"25"
 		"zpos"				"2"
 		"wide"				"80"
 		"tall"				"16"
@@ -116,7 +118,7 @@
 		"ControlName"		"EditablePanel"
 		"fieldName"			"class_item_blue_1"
 		"xpos"				"10"
-		"ypos"				"30"
+		"ypos"				"25"
 		"zpos"				"2"
 		"wide"				"80"
 		"tall"				"16"
@@ -128,7 +130,7 @@
 		"ControlName"		"EditablePanel"
 		"fieldName"			"class_item_red_2"
 		"xpos"				"10"
-		"ypos"				"45"
+		"ypos"				"40"
 		"zpos"				"2"
 		"wide"				"80"
 		"tall"				"16"
@@ -140,7 +142,7 @@
 		"ControlName"		"EditablePanel"
 		"fieldName"			"class_item_blue_2"
 		"xpos"				"10"
-		"ypos"				"45"
+		"ypos"				"40"
 		"zpos"				"2"
 		"wide"				"80"
 		"tall"				"16"
@@ -152,7 +154,7 @@
 		"ControlName"		"EditablePanel"
 		"fieldName"			"class_item_red_3"
 		"xpos"				"10"
-		"ypos"				"60"
+		"ypos"				"55"
 		"zpos"				"2"
 		"wide"				"80"
 		"tall"				"16"
@@ -164,7 +166,7 @@
 		"ControlName"		"EditablePanel"
 		"fieldName"			"class_item_blue_3"
 		"xpos"				"10"
-		"ypos"				"60"
+		"ypos"				"55"
 		"zpos"				"2"
 		"wide"				"80"
 		"tall"				"16"
@@ -176,7 +178,7 @@
 		"ControlName"		"EditablePanel"
 		"fieldName"			"class_item_red_4"
 		"xpos"				"10"
-		"ypos"				"75"
+		"ypos"				"70"
 		"zpos"				"2"
 		"wide"				"80"
 		"tall"				"16"
@@ -188,7 +190,7 @@
 		"ControlName"		"EditablePanel"
 		"fieldName"			"class_item_blue_4"
 		"xpos"				"10"
-		"ypos"				"75"
+		"ypos"				"70"
 		"zpos"				"2"
 		"wide"				"80"
 		"tall"				"16"
@@ -200,7 +202,7 @@
 		"ControlName"		"EditablePanel"
 		"fieldName"			"class_item_red_5"
 		"xpos"				"10"
-		"ypos"				"90"
+		"ypos"				"85"
 		"zpos"				"2"
 		"wide"				"80"
 		"tall"				"16"
@@ -212,7 +214,7 @@
 		"ControlName"		"EditablePanel"
 		"fieldName"			"class_item_blue_5"
 		"xpos"				"10"
-		"ypos"				"90"
+		"ypos"				"85"
 		"zpos"				"2"
 		"wide"				"80"
 		"tall"				"16"
@@ -224,7 +226,7 @@
 		"ControlName"		"EditablePanel"
 		"fieldName"			"class_item_red_6"
 		"xpos"				"10"
-		"ypos"				"105"
+		"ypos"				"100"
 		"zpos"				"2"
 		"wide"				"80"
 		"tall"				"16"
@@ -236,7 +238,7 @@
 		"ControlName"		"EditablePanel"
 		"fieldName"			"class_item_blue_6"
 		"xpos"				"10"
-		"ypos"				"105"
+		"ypos"				"100"
 		"zpos"				"2"
 		"wide"				"80"
 		"tall"				"16"
@@ -248,7 +250,7 @@
 		"ControlName"		"EditablePanel"
 		"fieldName"			"class_item_red_7"
 		"xpos"				"10"
-		"ypos"				"120"
+		"ypos"				"115"
 		"zpos"				"2"
 		"wide"				"80"
 		"tall"				"16"
@@ -260,7 +262,7 @@
 		"ControlName"		"EditablePanel"
 		"fieldName"			"class_item_blue_7"
 		"xpos"				"10"
-		"ypos"				"120"
+		"ypos"				"115"
 		"zpos"				"2"
 		"wide"				"80"
 		"tall"				"16"
@@ -272,7 +274,7 @@
 		"ControlName"		"EditablePanel"
 		"fieldName"			"class_item_red_8"
 		"xpos"				"10"
-		"ypos"				"135"
+		"ypos"				"130"
 		"zpos"				"2"
 		"wide"				"80"
 		"tall"				"16"
@@ -284,7 +286,7 @@
 		"ControlName"		"EditablePanel"
 		"fieldName"			"class_item_blue_8"
 		"xpos"				"10"
-		"ypos"				"135"
+		"ypos"				"130"
 		"zpos"				"2"
 		"wide"				"80"
 		"tall"				"16"
@@ -296,7 +298,7 @@
 		"ControlName"		"EditablePanel"
 		"fieldName"			"class_item_red_9"
 		"xpos"				"10"
-		"ypos"				"150"
+		"ypos"				"145"
 		"zpos"				"2"
 		"wide"				"80"
 		"tall"				"16"
@@ -308,7 +310,7 @@
 		"ControlName"		"EditablePanel"
 		"fieldName"			"class_item_blue_9"
 		"xpos"				"10"
-		"ypos"				"150"
+		"ypos"				"145"
 		"zpos"				"2"
 		"wide"				"80"
 		"tall"				"16"
@@ -338,7 +340,7 @@
 		"font"				"CerbeticaBold20"
 		"fgcolor"			"White"
 		"xpos"				"10"
-		"ypos"				"45"
+		"ypos"				"40"
 		"zpos"				"5"
 		"wide"				"15"
 		"tall"				"15"
@@ -375,7 +377,7 @@
 		"font"				"CerbeticaBold20"
 		"fgcolor"			"White"
 		"xpos"				"10"
-		"ypos"				"90"
+		"ypos"				"85"
 		"zpos"				"5"
 		"wide"				"15"
 		"tall"				"15"
@@ -412,7 +414,7 @@
 		"font"				"CerbeticaBold20"
 		"fgcolor"			"White"
 		"xpos"				"10"
-		"ypos"				"135"
+		"ypos"				"130"
 		"zpos"				"5"
 		"wide"				"15"
 		"tall"				"15"
@@ -431,10 +433,10 @@
 		"ControlName"		"EditablePanel"
 		"fieldName"			"MenuBG"
 		"xpos"				"0"
-		"ypos"				"20"
+		"ypos"				"22"
 		"zpos"				"1"
 		"wide"				"100"
-		"tall"				"155"
+		"tall"				"145"
 		"visible"			"1"
 		"enabled"			"1"
 		"bgcolor_override"	"TransparentBlack"
diff --git a/resource/ui/econ/inspectionpanel.res b/resource/ui/econ/inspectionpanel.res
index 58cd2e1..a13250f 100644
--- a/resource/ui/econ/inspectionpanel.res
+++ b/resource/ui/econ/inspectionpanel.res
@@ -218,12 +218,11 @@
 		"wide"			"300"
 		"tall"			"100"
 		"zpos"			"100"
-		//"paintborder"	"0"
-		"border"		"NoBorder"
-		"mouseinputenabled"	"1"
-		"proportionaltoparent"	"1"
 		"visible"		"0"
 		"bgcolor_override"	"DarkerGrey"
+		"border"				"NoBorder"
+		"mouseinputenabled"		"1"
+		"proportionaltoparent"	"1"
 
 		"fixed_item"
 		{
diff --git a/resource/ui/freezepanel_basic.res b/resource/ui/freezepanel_basic.res
index ff8e67d..ff7cc5f 100644
--- a/resource/ui/freezepanel_basic.res
+++ b/resource/ui/freezepanel_basic.res
@@ -139,7 +139,7 @@
 			"ControlName"	"Label"
 			"fieldName"		"FreezeLabel"
 			"font"			"Cerbetica12"
-			"xpos"			"40"
+			"xpos"			"25"
 			"ypos"			"15"
 			"zpos"			"1"
 			"wide"			"198"
@@ -149,7 +149,7 @@
 			"visible"		"1"
 			"enabled"		"1"
 			"labelText"		"#FreezePanel_Killer"
-			"textAlignment"	"west"
+			"textAlignment"	"center"
 			"dulltext"		"0"
 			"brighttext"	"0"
 		}
diff --git a/resource/ui/freezepanelkillerhealth.res b/resource/ui/freezepanelkillerhealth.res
index 4359cb8..b35f8d5 100644
--- a/resource/ui/freezepanelkillerhealth.res
+++ b/resource/ui/freezepanelkillerhealth.res
@@ -40,10 +40,10 @@
 		"enabled"		"0"
 	}
 
-	"PlayerStatusHealthValueFreezePanel"
+	"GuiPlayerHealth"
 	{
 		"ControlName"	"CExLabel"
-		"fieldName"		"PlayerStatusHealthValueFreezePanel"
+		"fieldName"		"GuiPlayerHealth"
 		"xpos"			"3"
 		"ypos"			"3"
 		"zpos"			"5"
@@ -56,10 +56,10 @@
 		"labeltext"		"%Health%"
 	}
 
-	"PlayerStatusHealthValueFreezePanelShadow"
+	"GuiPlayerHealthShadow"
 	{
 		"ControlName"	"CExLabel"
-		"fieldName"		"PlayerStatusHealthValueFreezePanelShadow"
+		"fieldName"		"GuiPlayerHealthShadow"
 		"xpos"			"4"
 		"ypos"			"4"
 		"zpos"			"5"
diff --git a/resource/ui/hudmediccharge.res b/resource/ui/hudmediccharge.res
index f1a6c5a..e08076c 100644
--- a/resource/ui/hudmediccharge.res
+++ b/resource/ui/hudmediccharge.res
@@ -218,6 +218,20 @@
 		"pin_to_sibling_corner"	"PIN_TOPRIGHT"
 	}
 
+	"HealthClusterIcon"
+	{
+		"ControlName"	"ImagePanel"
+		"fieldName"		"HealthClusterIcon"
+		"xpos"			"0"
+		"ypos"			"0"
+		"wide"			"25"
+		"tall"			"25"
+		"visible"		"0"
+		"enabled"		"0"
+		"image"			"../hud/ico_health_cluster"
+		"scaleImage"	"1"
+	}
+
 	"ResistIconAnchor"
 	{
 		"ControlName"		"EditablePanel"
diff --git a/resource/ui/hudobjectivetimepanel.res b/resource/ui/hudobjectivetimepanel.res
index cee5983..aaea503 100644
--- a/resource/ui/hudobjectivetimepanel.res
+++ b/resource/ui/hudobjectivetimepanel.res
@@ -82,7 +82,7 @@
 		"ControlName"		"CExLabel"
 		"fieldName"			"OvertimeLabel"
 		"xpos"				"25"
-		"ypos"				"20"
+		"ypos"				"32"
 		"zpos"				"5"
 		"wide"				"50"
 		"tall"				"24"
diff --git a/resource/ui/itemrenameconfirmationdialog.res b/resource/ui/itemrenameconfirmationdialog.res
index 44b96a1..ef39d95 100644
--- a/resource/ui/itemrenameconfirmationdialog.res
+++ b/resource/ui/itemrenameconfirmationdialog.res
@@ -74,11 +74,13 @@
 		"text_ypos"			"100"		// Hide it off the bottom
 		"text_center"		"1"
 		"name_only"			"1"
+		"paint_icon_hide"	"1"
 
 		"itemmodelpanel"
 		{
 			"use_item_rendertarget" "0"
 			"allow_rot"				"0"
+			"inventory_image_type"	"1"
 		}
 	}
 	"SubjectBG"
diff --git a/resource/ui/mapinfomenu.res b/resource/ui/mapinfomenu.res
index ea7cd16..af4f992 100644
--- a/resource/ui/mapinfomenu.res
+++ b/resource/ui/mapinfomenu.res
@@ -46,7 +46,7 @@
 		"enabled"		"1"
 		"labelText"		"%mapname%"
 		"textAlignment"	"center"
-		"font"			"Cerbetica24"
+		"font"			"HudFontMedium"
 		"fgcolor"		"TanLight"
 	}
 
@@ -123,7 +123,7 @@
 		"brighttext"	"0"
 		"command"		"continue"
 		"default"		"1"
-		"font"			"Cerbetica24"
+		"font"			"HudFontMedium"
 		"paintbackground"	"0"
 
 		"fgcolor"					"TanLight"
@@ -158,7 +158,7 @@
 		"dulltext"		"0"
 		"brighttext"	"0"
 		"command"		"back"
-		"font"			"Cerbetica24"
+		"font"			"HudFontMedium"
 		"paintbackground"	"0"
 
 		"fgcolor"					"TanLight"
diff --git a/resource/ui/spectatorguihealth.res b/resource/ui/spectatorguihealth.res
index 2a09454..7966917 100644
--- a/resource/ui/spectatorguihealth.res
+++ b/resource/ui/spectatorguihealth.res
@@ -42,10 +42,10 @@
 		"scaleImage"	"1"
 	}
 
-	"PlayerStatusHealthValue"
+	"GuiPlayerHealth"
 	{
 		"ControlName"	"CExLabel"
-		"fieldName"		"PlayerStatusHealthValue"
+		"fieldName"		"GuiPlayerHealth"
 		"xpos"			"2"
 		"ypos"			"19"
 		"zpos"			"5"
@@ -59,10 +59,10 @@
 		"fgcolor"		"Health Normal"
 	}
 
-	"PlayerStatusHealthValueShadow"
+	"GuiPlayerHealthShadow"
 	{
 		"ControlName"	"CExLabel"
-		"fieldName"		"PlayerStatusHealthValueShadow"
+		"fieldName"		"GuiPlayerHealthShadow"
 		"xpos"			"-1"
 		"ypos"			"-1"
 		"zpos"			"5"
@@ -75,7 +75,7 @@
 		"font"			"CerbeticaBold16"
 		"fgcolor"		"TransparentBlack"
 
-		"pin_to_sibling"		"PlayerStatusHealthValue"
+		"pin_to_sibling"		"GuiPlayerHealth"
 		"pin_corner_to_sibling"	"PIN_TOPLEFT"
 		"pin_to_sibling_corner"	"PIN_TOPLEFT"
 	}
diff --git a/resource/ui/spectatortournamentguihealth.res b/resource/ui/spectatortournamentguihealth.res
index 9fa2ee1..92aebb2 100644
--- a/resource/ui/spectatortournamentguihealth.res
+++ b/resource/ui/spectatortournamentguihealth.res
@@ -38,10 +38,10 @@
 		"image"			""
 	}
 
-	"PlayerStatusHealthValueSpectator"
+	"GuiPlayerHealth"
 	{
 		"ControlName"	"CExLabel"
-		"fieldName"		"PlayerStatusHealthValueSpectator"
+		"fieldName"		"GuiPlayerHealth"
 		"xpos"			"0"
 		"ypos"			"0"
 		"zpos"			"5"
@@ -55,10 +55,10 @@
 		"fgcolor"		"Spec Health Normal"
 	}
 
-	"PlayerStatusHealthValueSpectatorBG"
+	"GuiPlayerHealthShadow"
 	{
 		"ControlName"	"CExLabel"
-		"fieldName"		"PlayerStatusHealthValueSpectatorBG"
+		"fieldName"		"GuiPlayerHealthShadow"
 		"xpos"			"2"
 		"ypos"			"2"
 		"zpos"			"4"
@@ -69,6 +69,10 @@
 		"labelText"		"%Health%"
 		"textAlignment"	"center"
 		"font"			"CerbeticaBold16"
-		"fgcolor"		"0 0 0 100"
+		"fgcolor"		"TransparentBlack"
+
+		"pin_to_sibling"		"GuiPlayerHealth"
+		"pin_corner_to_sibling"	"PIN_TOPLEFT"
+		"pin_to_sibling_corner"	"PIN_TOPLEFT"
 	}
 }
\ No newline at end of file
diff --git a/resource/ui/targetid.res b/resource/ui/targetid.res
index 2735424..af5ba4b 100644
--- a/resource/ui/targetid.res
+++ b/resource/ui/targetid.res
@@ -9,11 +9,9 @@
 		"zpos"				"6"
 		"wide"				"600"
 		"tall"				"14"
-		"autoResize"		"0"
-		"pinCorner"			"0"
 		"visible"			"1"
 		"enabled"			"1"
-		"fillcolor"			"0 0 0 220"
+		"fillcolor"			"TransparentBlack"
 	}
 
 	"TargetBackground2"
@@ -54,18 +52,16 @@
 
 	"TargetIDBG_Spec_Blue"
 	{
-		"ControlName"		"ScalableImagePanel"
+		"ControlName"		"ImagePanel"
 		"fieldName"			"TargetIDBG_Spec_Blue"
 		"xpos"				"0"
 		"ypos"				"43"
 		"zpos"				"6"
 		"wide"				"252"
 		"tall"	 			"10"
-		"autoResize"		"0"
-		"pinCorner"			"0"
 		"visible"			"0"
 		"enabled"			"1"
-		"image"				"../hud/color_panel_blu"
+		"fillcolor"			"0 28 162 255"
 
 		"src_corner_height"		"23"
 		"src_corner_width"		"23"
@@ -75,18 +71,16 @@
 
 	"TargetIDBG_Spec_Red"
 	{
-		"ControlName"		"ScalableImagePanel"
+		"ControlName"		"ImagePanel"
 		"fieldName"			"TargetIDBG_Spec_Red"
 		"xpos"				"0"
 		"ypos"				"43"
 		"zpos"				"6"
 		"wide"				"252"
 		"tall"	 			"10"
-		"autoResize"		"0"
-		"pinCorner"			"0"
 		"visible"			"0"
 		"enabled"			"1"
-		"image"				"../hud/color_panel_red"
+		"fillcolor"			"192 28 0 255"
 
 		"src_corner_height"		"23"
 		"src_corner_width"		"23"
@@ -207,8 +201,8 @@
 		"scaleImage"		"1"
 
 		"pin_to_sibling"		"KillStreakAnchor"
-		"pin_corner_to_sibling" "1"
-		"pin_to_sibling_corner" "1"
+		"pin_corner_to_sibling" "PIN_TOPRIGHT"
+		"pin_to_sibling_corner" "PIN_TOPRIGHT"
 	}
 
 	"MoveableSubPanel"
diff --git a/resource/ui/testitemroot.res b/resource/ui/testitemroot.res
index 5253019..5d04e8e 100644
--- a/resource/ui/testitemroot.res
+++ b/resource/ui/testitemroot.res
@@ -70,7 +70,7 @@
 			"ControlName"			"CheckButton"
 			"fieldName"				"ClassCheckBox0"
 			"labelText"				"#IT_Classes_All"
-			"Font"					"ItemFontAttribSmall"
+			"Font"					"HudFontSmallestBold"
 			"textAlignment"			"west"
 			"xpos"					"45"
 			"ypos"					"15"
@@ -83,14 +83,14 @@
 			"enabled"				"1"
 			"dulltext"				"0"
 			"brighttext"			"0"
-			"disabledfgcolor2_override"	"TextColor"
+			"disabledfgcolor2_override"	"ItemFlags"
 		}
 		"ClassCheckBox1"
 		{
 			"ControlName"			"CheckButton"
 			"fieldName"				"ClassCheckBox1"
 			"labelText"				"#TF_Class_Name_Scout"
-			"Font"					"ItemFontAttribSmall"
+			"Font"					"HudFontSmallestBold"
 			"textAlignment"			"west"
 			"xpos"					"145"
 			"ypos"					"15"
@@ -103,14 +103,14 @@
 			"enabled"				"1"
 			"dulltext"				"0"
 			"brighttext"			"0"
-			"disabledfgcolor2_override"	"TextColor"
+			"disabledfgcolor2_override"	"ItemFlags"
 		}
 		"ClassCheckBox2"
 		{
 			"ControlName"	"CheckButton"
 			"fieldName"		"ClassCheckBox2"
 			"labelText"		"#TF_Class_Name_Sniper"
-			"Font"			"ItemFontAttribSmall"
+			"Font"			"HudFontSmallestBold"
 			"textAlignment"	"west"
 			"xpos"			"220"
 			"ypos"			"15"
@@ -123,14 +123,14 @@
 			"enabled"		"1"
 			"dulltext"		"0"
 			"brighttext"	"0"
-			"disabledfgcolor2_override"	"TextColor"
+			"disabledfgcolor2_override"	"ItemFlags"
 		}
 		"ClassCheckBox3"
 		{
 			"ControlName"	"CheckButton"
 			"fieldName"		"ClassCheckBox3"
 			"labelText"		"#TF_Class_Name_Soldier"
-			"Font"			"ItemFontAttribSmall"
+			"Font"			"HudFontSmallestBold"
 			"textAlignment"	"west"
 			"xpos"			"295"
 			"ypos"			"15"
@@ -150,7 +150,7 @@
 			"ControlName"	"CheckButton"
 			"fieldName"		"ClassCheckBox4"
 			"labelText"		"#TF_Class_Name_Demoman"
-			"Font"			"ItemFontAttribSmall"
+			"Font"			"HudFontSmallestBold"
 			"textAlignment"	"west"
 			"xpos"			"145"
 			"ypos"			"40"
@@ -170,7 +170,7 @@
 			"ControlName"	"CheckButton"
 			"fieldName"		"ClassCheckBox5"
 			"labelText"		"#TF_Class_Name_Medic"
-			"Font"			"ItemFontAttribSmall"
+			"Font"			"HudFontSmallestBold"
 			"textAlignment"	"west"
 			"xpos"			"220"
 			"ypos"			"40"
@@ -190,7 +190,7 @@
 			"ControlName"	"CheckButton"
 			"fieldName"		"ClassCheckBox6"
 			"labelText"		"#TF_Class_Name_HWGuy"
-			"Font"			"ItemFontAttribSmall"
+			"Font"			"HudFontSmallestBold"
 			"textAlignment"	"west"
 			"xpos"			"295"
 			"ypos"			"40"
@@ -210,7 +210,7 @@
 			"ControlName"	"CheckButton"
 			"fieldName"		"ClassCheckBox7"
 			"labelText"		"#TF_Class_Name_Pyro"
-			"Font"			"ItemFontAttribSmall"
+			"Font"			"HudFontSmallestBold"
 			"textAlignment"	"west"
 			"xpos"			"145"
 			"ypos"			"65"
@@ -230,7 +230,7 @@
 			"ControlName"	"CheckButton"
 			"fieldName"		"ClassCheckBox8"
 			"labelText"		"#TF_Class_Name_Spy"
-			"Font"			"ItemFontAttribSmall"
+			"Font"			"HudFontSmallestBold"
 			"textAlignment"	"west"
 			"xpos"			"220"
 			"ypos"			"65"
@@ -250,7 +250,7 @@
 			"ControlName"	"CheckButton"
 			"fieldName"		"ClassCheckBox9"
 			"labelText"		"#TF_Class_Name_Engineer"
-			"Font"			"ItemFontAttribSmall"
+			"Font"			"HudFontSmallestBold"
 			"textAlignment"	"west"
 			"xpos"			"295"
 			"ypos"			"65"
@@ -318,7 +318,7 @@
 		{
 			"ControlName"	"CExLabel"
 			"fieldName"		"TestItemEntry0"
-			"font"			"ItemFontAttribSmall"
+			"font"			"HudFontSmallestBold"
 			"labelText"		"#IT_TestingSlot_Empty"
 			"textAlignment"	"center"
 			"xpos"			"95"
@@ -330,7 +330,7 @@
 			"pinCorner"		"0"
 			"visible"		"1"
 			"enabled"		"1"
-			"fgcolor_override" "200 80 60 255"
+			"fgcolor_override" "LightRed"
 			"bgcolor_override" "24 24 24 128"
 		}
 		"TestItemButton0"
@@ -385,7 +385,7 @@
 		{
 			"ControlName"	"CExLabel"
 			"fieldName"		"TestingHeadgearLabel"
-			"font"			"HudFontSmallest"
+			"font"			"HudFontSmallestBold"
 			"labelText"		"#IT_TestingSlot_Headgear"
 			"textAlignment"	"east"
 			"xpos"			"0"
@@ -402,7 +402,7 @@
 		{
 			"ControlName"	"CExLabel"
 			"fieldName"		"TestItemEntry1"
-			"font"			"ItemFontAttribSmall"
+			"font"			"HudFontSmallestBold"
 			"labelText"		"#IT_TestingSlot_Empty"
 			"textAlignment"	"center"
 			"xpos"			"95"
@@ -414,7 +414,7 @@
 			"pinCorner"		"0"
 			"visible"		"1"
 			"enabled"		"1"
-			"fgcolor_override" "200 80 60 255"
+			"fgcolor_override" "LightRed"
 			"bgcolor_override" "24 24 24 128"
 		}
 		"TestItemButton1"
@@ -469,7 +469,7 @@
 		{
 			"ControlName"	"CExLabel"
 			"fieldName"		"TestingMisc1Label"
-			"font"			"HudFontSmallest"
+			"font"			"HudFontSmallestBold"
 			"labelText"		"#IT_TestingSlot_Misc1"
 			"textAlignment"	"east"
 			"xpos"			"0"
@@ -486,7 +486,7 @@
 		{
 			"ControlName"	"CExLabel"
 			"fieldName"		"TestItemEntry2"
-			"font"			"ItemFontAttribSmall"
+			"font"			"HudFontSmallestBold"
 			"labelText"		"#IT_TestingSlot_Empty"
 			"textAlignment"	"center"
 			"xpos"			"95"
@@ -498,7 +498,7 @@
 			"pinCorner"		"0"
 			"visible"		"1"
 			"enabled"		"1"
-			"fgcolor_override" "200 80 60 255"
+			"fgcolor_override" "LightRed"
 			"bgcolor_override" "24 24 24 128"
 		}
 		"TestItemButton2"
@@ -553,7 +553,7 @@
 		{
 			"ControlName"	"CExLabel"
 			"fieldName"		"TestingMisc2Label"
-			"font"			"HudFontSmallest"
+			"font"			"HudFontSmallestBold"
 			"labelText"		"#IT_TestingSlot_Misc2"
 			"textAlignment"	"east"
 			"xpos"			"0"
@@ -570,7 +570,7 @@
 		{
 			"ControlName"	"CExLabel"
 			"fieldName"		"TestItemEntry3"
-			"font"			"ItemFontAttribSmall"
+			"font"			"HudFontSmallestBold"
 			"labelText"		"#IT_TestingSlot_Empty"
 			"textAlignment"	"center"
 			"xpos"			"95"
@@ -582,7 +582,7 @@
 			"pinCorner"		"0"
 			"visible"		"1"
 			"enabled"		"1"
-			"fgcolor_override" "200 80 60 255"
+			"fgcolor_override" "LightRed"
 			"bgcolor_override" "24 24 24 128"
 		}
 		"TestItemButton3"
@@ -670,7 +670,7 @@
 			"ControlName"	"CheckButton"
 			"fieldName"		"AutoAddBotsCheckBox"
 			"labelText"		"#IT_Bot_AutoAdd"
-			"Font"			"ItemFontAttribSmall"
+			"Font"			"HudFontSmallestBold"
 			"textAlignment"	"west"
 			"xpos"			"10"
 			"ypos"			"20"
@@ -691,7 +691,7 @@
 			"ControlName"	"CheckButton"
 			"fieldName"		"AutoAddBotsCheckBox"
 			"labelText"		"#IT_Bot_BlueTeam"
-			"Font"			"ItemFontAttribSmall"
+			"Font"			"HudFontSmallestBold"
 			"textAlignment"	"west"
 			"xpos"			"110"
 			"ypos"			"20"
@@ -736,7 +736,7 @@
 		{
 			"ControlName"		"ComboBox"
 			"fieldName"			"BotSelectionComboBox"
-			"Font"				"HudFontSmallest"
+			"Font"				"HudFontSmallestBold"
 			"xpos"				"95"
 			"ypos"				"45"
 			"zpos"				"1"
diff --git a/resource/ui/textwindow.res b/resource/ui/textwindow.res
index 6d8c379..4a4e509 100644
--- a/resource/ui/textwindow.res
+++ b/resource/ui/textwindow.res
@@ -49,7 +49,7 @@
 		"textAlignment"		"center"
 		"dulltext"			"0"
 		"brighttext"		"0"
-		"font"				"Cerbetica24"
+		"font"				"HudFontMedium"
 		"fgcolor"			"TanLight"
 	}
 
@@ -118,7 +118,7 @@
 		"wrap"				"0"
 		"command"			"okay"
 		"default"			"1"
-		"font"				"Cerbetica24"
+		"font"				"HudFontMedium"
 		"paintbackground"	"0"
 
 		"fgcolor"					"TanLight"
diff --git a/resource/ui/wavestatuspanel.res b/resource/ui/wavestatuspanel.res
index 54a9b4a..e1a1df9 100644
--- a/resource/ui/wavestatuspanel.res
+++ b/resource/ui/wavestatuspanel.res
@@ -45,8 +45,8 @@
 		"fieldName"			"WaveCountLabelShadow"
 		"font"				"CerbeticaBold16"
 		"fgcolor"			"TransparentBlack"
-		"xpos"				"-2"
-		"ypos"				"-2"
+		"xpos"				"-1"
+		"ypos"				"-1"
 		"zpos"				"3"
 		"wide"				"200"
 		"tall"				"15"
diff --git a/resource/ui/winpanel.res b/resource/ui/winpanel.res
index 00c23eb..b06b977 100644
--- a/resource/ui/winpanel.res
+++ b/resource/ui/winpanel.res
@@ -64,7 +64,7 @@
 		{
 			"ControlName"		"CExLabel"
 			"fieldName"			"BlueTeamScore"
-			"font"				"Cerbetica48"
+			"font"				"CerbeticaBold40"
 			"labelText"			"%blueteamscore%"
 			"textAlignment"		"east"
 			"xpos"				"15"
@@ -81,7 +81,7 @@
 		{
 			"ControlName"		"CExLabel"
 			"fieldName"			"BlueTeamScoreDropshadow"
-			"font"				"Cerbetica48"
+			"font"				"CerbeticaBold40"
 			"fgcolor"			"TransparentBlack"
 			"labelText"			"%blueteamscore%"
 			"textAlignment"		"east"
@@ -138,7 +138,7 @@
 		{
 			"ControlName"		"CExLabel"
 			"fieldName"			"RedTeamScore"
-			"font"				"Cerbetica48"
+			"font"				"CerbeticaBold40"
 			"labelText"			"%redteamscore%"
 			"textAlignment"		"west"
 			"xpos"				"105"
@@ -155,7 +155,7 @@
 		{
 			"ControlName"		"CExLabel"
 			"fieldName"			"RedTeamScoreDropshadow"
-			"font"				"Cerbetica48"
+			"font"				"CerbeticaBold40"
 			"fgcolor"			"TransparentBlack"
 			"labelText"			"%redteamscore%"
 			"textAlignment"		"west"
@@ -208,21 +208,18 @@
 	}
 	"WinPanelBG2"
 	{
-		"ControlName"	"ImagePanel"
+		"ControlName"	"EditablePanel"
 		"fieldName"		"WinPanelBG2"
 		"xpos"			"0"
 		"ypos"			"55"
-		"zpos"			"0"
+		"zpos"			"-3"
 		"wide"			"300"
 		"tall"			"152"
 		"visible"		"1"
 		"enabled"		"1"
-		"scaleImage"	"1"
-		"fillcolor"		"0 0 0 250"
-		"src_corner_height" 	"3"
-		"src_corner_width" 		"3"
-		"draw_corner_width" 	"0"
-		"draw_corner_height" 	"0"
+		"paintborder"	"0"
+		"bgcolor_override"		"0 0 0 250"
+		"PaintBackgroundType"	"2"
 	}
 	"WinningTeamLabel"
 	{
@@ -256,8 +253,8 @@
 		"tall"			"40"
 		"autoResize"	"0"
 		"pinCorner"		"0"
-		"visible"		"1"
-		"enabled"		"1"
+		"visible"		"0"
+		"enabled"		"0"
 		"labelText"		"%WinningTeamLabel%"
 		"textAlignment"	"Center"
 		"dulltext"		"0"
@@ -321,7 +318,7 @@
 	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"DetailsLabel"
-		"font"			"Cerbetica9"
+		"font"			"ScoreboardVerySmall"
 		"xpos"			"10"
 		"ypos"			"82"
 		"zpos"			"1"
@@ -347,7 +344,7 @@
 	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"TopPlayerLabel"
-		"font"			"Cerbetica9"
+		"font"			"ScoreboardVerySmall"
 		"xpos"			"15"
 		"ypos"			"100"
 		"zpos"			"3"
@@ -366,7 +363,7 @@
 	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"PointsThisRoundLabel"
-		"font"			"Cerbetica9"
+		"font"			"ScoreboardVerySmall"
 		"xpos"			"45"
 		"ypos"			"100"
 		"zpos"			"3"
@@ -655,7 +652,7 @@
 	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"KillStreakLeaderLabel"
-		"font"			"Cerbetica9"
+		"font"			"ScoreboardVerySmall"
 		"xpos"			"15"
 		"ypos"			"164"
 		"zpos"			"3"
@@ -675,7 +672,7 @@
 	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"KillStreakMaxCountLabel"
-		"font"			"Cerbetica9"
+		"font"			"ScoreboardVerySmall"
 		"xpos"			"116"
 		"ypos"			"0"
 		"zpos"			"3"