Main Menu Updates, More Bug Fixes

- Updated various main menu and store pages.
- Updated the look of the TargetID and Friends list.
- Fixed the position of the count of players on the payload
- Fixed the size of the badge seen on the post match screen.
- Fixed the item effect meter not being properly centered in minmode.
- Removed icons from the abandon panels.
- Updated font definitions throughout the hud.

56 files changed, 380 insertions, 415 deletions

diff --git a/resource/scheme/clientscheme_colors.res b/resource/scheme/clientscheme_colors.res
index c29043b..d3904ba 100644
--- a/resource/scheme/clientscheme_colors.res
+++ b/resource/scheme/clientscheme_colors.res
@@ -90,10 +90,10 @@ Scheme
 		"PartyMember6"							"255 133 255 255"
 
 		"White"									"242 242 242 255"
-		"Red"									"192 28 0 140"
-		"RedSolid"								"192 28 0 255"
-		"Blue"									"0 28 162 140"
-		"BlueSolid"								"0 28 162 255"
+		"Red"									"158 64 61 140"
+		"RedSolid"								"158 64 61 255"
+		"Blue"									"72 112 125 140"
+		"BlueSolid"								"72 112 125 255"
 		"Yellow"								"251 235 202 255"
 		"TransparentYellow"						"251 235 202 140"
 		"BrightYellow"							"251 235 0 255"
diff --git a/resource/scheme/clientscheme_fonts.res b/resource/scheme/clientscheme_fonts.res
index 216ba3c..e9c6cf5 100644
--- a/resource/scheme/clientscheme_fonts.res
+++ b/resource/scheme/clientscheme_fonts.res
@@ -717,7 +717,7 @@ Scheme
 			"1"
 			{
 				"name"			"Cerbetica_edited"
-				"tall"			"24"
+				"tall"			"20"
 				"weight"		"500"
 				"additive"		"0"
 				"antialias" 	"1"
@@ -1192,7 +1192,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"			"Cerbetica Bold"
+				"name"			"Cerbetica_edited"
 				"tall"			"24"
 				"antialias" 	"1"
 				"weight"		"500"
@@ -1203,7 +1203,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"			"Cerbetica Bold"
+				"name"			"Cerbetica_edited"
 				"tall"			"24"
 				"antialias" 	"1"
 				"weight"		"500"
@@ -1215,7 +1215,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"			"Cerbetica Bold"
+				"name"			"Cerbetica_edited"
 				"tall"			"24"
 				"antialias" 	"1"
 				"weight"		"900"
@@ -1226,7 +1226,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"			"Cerbetica Bold"
+				"name"			"Cerbetica_edited"
 				"tall"			"24"
 				"antialias" 	"1"
 				"weight"		"900"
@@ -1238,7 +1238,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"			"Cerbetica Bold"
+				"name"			"Cerbetica_edited"
 				"tall"			"16"
 				"antialias" 	"1"
 				"weight"		"900"
@@ -2152,7 +2152,7 @@ Scheme
 			"1"
 			{
 				"name"			"Cerbetica_edited"
-				"tall"			"7"
+				"tall"			"8"
 				"weight"		"0"
 				"additive"		"1"
 				"antialias" 	"1"
diff --git a/resource/ui/charinfoloadoutsubpanel.res b/resource/ui/charinfoloadoutsubpanel.res
index a12b20a..c1e14ad 100644
--- a/resource/ui/charinfoloadoutsubpanel.res
+++ b/resource/ui/charinfoloadoutsubpanel.res
@@ -295,7 +295,7 @@
 	{
 		"ControlName"		"CExLabel"
 		"fieldName"			"ShowBackpackLabel"
-		"font"				"CerbeticaBold16"
+		"font"				"HudFontSmall"
 		"labelText"			"#BackpackTitle"
 		"textAlignment"		"north"
 		"xpos"				"0"
@@ -343,7 +343,7 @@
 	{
 		"ControlName"		"CExLabel"
 		"fieldName"			"ShowCraftingLabel"
-		"font"				"CerbeticaBold16"
+		"font"				"HudFontSmall"
 		"labelText"			"#CraftingExplanation_Title"
 		"textAlignment"		"north"
 		"xpos"				"0"
@@ -392,7 +392,7 @@
 	{
 		"ControlName"		"CExLabel"
 		"fieldName"			"ShowArmoryLabel"
-		"font"				"CerbeticaBold16"
+		"font"				"HudFontSmall"
 		"labelText"			"#Armory"
 		"textAlignment"		"north"
 		"xpos"				"0"
@@ -440,7 +440,7 @@
 	{
 		"ControlName"		"CExLabel"
 		"fieldName"			"ShowTradeLabel"
-		"font"				"CerbeticaBold16"
+		"font"				"HudFontSmall"
 		"labelText"			"#TradingExplanation_Title"
 		"textAlignment"		"north"
 		"xpos"				"0"
@@ -490,7 +490,7 @@
 	{
 		"ControlName"		"CExLabel"
 		"fieldName"			"ShowPaintkitsLabel"
-		"font"				"CerbeticaBold16"
+		"font"				"HudFontSmall"
 		"labelText"			"#PaintkitTitle"
 		"textAlignment"		"north"
 		"xpos"				"0"
@@ -531,11 +531,11 @@
 	{
 		"ControlName"		"CExLabel"
 		"fieldName"			"ItemsLabel"
-		"font"				"HudFontSmall"
+		"font"				"HudFontSmallest"
 		"labelText"			"classname"
 		"textAlignment"		"north"
 		"xpos"				"0"
-		"ypos"				"220"
+		"ypos"				"215"
 		"zpos"				"1"
 		"wide"				"300"
 		"tall"				"30"
diff --git a/resource/ui/charinfopanel.res b/resource/ui/charinfopanel.res
index 24d09ae..b701091 100644
--- a/resource/ui/charinfopanel.res
+++ b/resource/ui/charinfopanel.res
@@ -20,7 +20,7 @@
 		"outoffocus_bgcolor_override"	"27 27 27 0"
 
 		"title"			"#CharInfoAndSetup"
-		"title_font"	"HudFontSmallBold"
+		"title_font"	"HudFontMediumBold"
 		"titletextinsetX"	"40"
 		"titletextinsetY"	"0"
 		"titlebarfgcolor_override"				"HudOffWhite"
@@ -154,14 +154,14 @@
 		"ypos"			"437"
 		"zpos"			"2"
 		"wide"			"100"
-		"tall"			"25"
+		"tall"			"20"
 		"autoResize"	"0"
 		"pinCorner"		"3"
 		"visible"		"1"
 		"enabled"		"1"
 		"tabPosition"	"0"
 		"labelText"		"Back (&Q)"
-		"font"			"HudFontSmallBold"
+		"font"			"HudFontSmall"
 		"textAlignment"	"center"
 		"dulltext"		"0"
 		"brighttext"	"0"
diff --git a/resource/ui/classloadoutpanel.res b/resource/ui/classloadoutpanel.res
index 4f82713..05adec9 100644
--- a/resource/ui/classloadoutpanel.res
+++ b/resource/ui/classloadoutpanel.res
@@ -296,7 +296,7 @@
 		"xpos"			"0"
 		"ypos"			"0"
 		"zpos"			"100"
-		"wide"			"140"
+		"wide"			"100"
 		"tall"			"75"
 		"autoResize"	"1"
 		"visible"		"0"
diff --git a/resource/ui/compstats.res b/resource/ui/compstats.res
index c3edd51..1b18085 100644
--- a/resource/ui/compstats.res
+++ b/resource/ui/compstats.res
@@ -56,7 +56,7 @@
 			"ControlName"		"CExButton"
 			"fieldName"			"ShowLeaderboardsButton"
 			"xpos"				"rs1-10"
-			"ypos"				"38"
+			"ypos"				"40"
 			"zpos"				"0"
 			"wide"				"p0.45"
 			"tall"				"15"
@@ -65,7 +65,7 @@
 			"actionsignallevel"	"2"
 			"command"			"show_leaderboards"
 			"labeltext"			"#TF_Competitive_ViewLeaderboards"
-			"font"				"FontBold12"
+			"font"				"HudFontSmallest"
 			"fgcolor_override"	"TanLight"
 			"textAlignment"		"center"
 			"sound_depressed"	"UI/buttonclick.wav"
@@ -77,7 +77,7 @@
 			"ControlName"		"Button"
 			"fieldName"			"ShowMatchHistoryButton"
 			"xpos"				"10"
-			"ypos"				"38"
+			"ypos"				"40"
 			"zpos"				"0"
 			"wide"				"p0.45"
 			"tall"				"15"
@@ -86,7 +86,7 @@
 			"actionsignallevel"	"2"
 			"command"			"show_match_history"
 			"labeltext"			"#TF_Competitive_ViewMatches"
-			"font"				"FontBold12"
+			"font"				"HudFontSmallest"
 			"fgcolor_override"	"TanLight"
 			"textAlignment"		"center"
 			"sound_depressed"	"UI/buttonclick.wav"
diff --git a/resource/ui/controlpointcountdown.res b/resource/ui/controlpointcountdown.res
index 55a1a21..5c01488 100644
--- a/resource/ui/controlpointcountdown.res
+++ b/resource/ui/controlpointcountdown.res
@@ -4,7 +4,7 @@
 	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"CapCountdownLabel"
-		"font"			"Cerbetica16"
+		"font"			"HudFontSmallishBold"
 		"xpos"			"0"
 		"ypos"			"0"
 		"zpos"			"1"
diff --git a/resource/ui/controlpointicon.res b/resource/ui/controlpointicon.res
index ec16c9e..ef975a3 100644
--- a/resource/ui/controlpointicon.res
+++ b/resource/ui/controlpointicon.res
@@ -33,7 +33,7 @@
 		"xpos"			"0"
 		"ypos"			"0"
 		"zpos"			"3"
-		"wide"			"7"
+		"wide"			"8"
 		"tall"			"16"
 		"visible"		"0"
 		"enabled"		"1"
@@ -45,9 +45,9 @@
 	{
 		"ControlName"	"Label"
 		"fieldName"		"CapNumPlayers"
-		"font"			"Cerbetica14"
+		"font"			"HudFontSmallest"
 		"xpos"			"11"
-		"ypos"			"0"
+		"ypos"			"1"
 		"zpos"			"4"
 		"wide"			"16"
 		"tall"			"26"
diff --git a/resource/ui/disguise_menu/heavy_red.res b/resource/ui/disguise_menu/heavy_red.res
index 86c6454..17198ba 100644
--- a/resource/ui/disguise_menu/heavy_red.res
+++ b/resource/ui/disguise_menu/heavy_red.res
@@ -4,11 +4,11 @@
 	{
 		"ControlName"		"CExLabel"
 		"fieldName"			"ItemName"
-		"font"				"CerbeticaBold14"
+		"font"				"HudFontSmall"
 		"xpos"				"20"
 		"ypos"				"0"
 		"zpos"				"1"
-		"wide"				"45"
+		"wide"				"55"
 		"tall"				"20"
 		"autoResize"		"0"
 		"pinCorner"			"0"
@@ -56,7 +56,7 @@
 	{
 		"ControlName"		"CExLabel"
 		"fieldName"			"NumberLabel"
-		"font"				"CerbeticaBold14"
+		"font"				"HudFontSmall"
 		"fgcolor"			"HUDRedTeamSolid"
 		"xpos"				"5"
 		"ypos"				"3"
@@ -77,7 +77,7 @@
 	{
 		"ControlName"		"CExLabel"
 		"fieldName"			"NumberLabel"
-		"font"				"CerbeticaBold14"
+		"font"				"HudFontSmall"
 		"fgcolor"			"HUDRedTeamSolid"
 		"xpos"				"5"
 		"ypos"				"3"
diff --git a/resource/ui/disguisestatuspanel.res b/resource/ui/disguisestatuspanel.res
index a7749ff..2aa04d2 100644
--- a/resource/ui/disguisestatuspanel.res
+++ b/resource/ui/disguisestatuspanel.res
@@ -37,7 +37,7 @@
 		"tall"				"30"
 		"visible"			"1"
 		"enabled"			"1"
-		"bgcolor_override"	"HudBlack"
+		"bgcolor_override"	"TransparentBlack"
 		"PaintBackgroundType"	"0"
 	}
 
@@ -69,7 +69,7 @@
 	{
 		"ControlName"		"Label"
 		"fieldName"			"DisguiseNameLabel"
-		"font"				"Cerbetica14"
+		"font"				"HudFontSmall"
 		"xpos"				"35"
 		"ypos"				"0"
 		"zpos"				"1"
@@ -89,7 +89,7 @@
 	{
 		"ControlName"		"Label"
 		"fieldName"			"DisguiseNameLabelShadow"
-		"font"				"Cerbetica14"
+		"font"				"HudFontSmall"
 		"xpos"				"-1"
 		"ypos"				"-1"
 		"zpos"				"1"
@@ -97,8 +97,8 @@
 		"tall"				"15"
 		"autoResize"		"0"
 		"pinCorner"			"0"
-		"visible"			"1"
-		"enabled"			"1"
+		"visible"			"0"
+		"enabled"			"0"
 		"labelText"			"%disguisename%"
 		"textAlignment"		"west"
 		"dulltext"			"0"
@@ -114,7 +114,7 @@
 	{
 		"ControlName"		"Label"
 		"fieldName"			"WeaponNameLabel"
-		"font"				"Cerbetica14"
+		"font"				"HudFontSmallest"
 		"xpos"				"35"
 		"ypos"				"15"
 		"zpos"				"1"
@@ -134,7 +134,7 @@
 	{
 		"ControlName"		"Label"
 		"fieldName"			"WeaponNameLabelShadow"
-		"font"				"Cerbetica14"
+		"font"				"HudFontSmallest"
 		"xpos"				"-1"
 		"ypos"				"-1"
 		"zpos"				"1"
@@ -142,8 +142,8 @@
 		"tall"				"15"
 		"autoResize"		"0"
 		"pinCorner"			"0"
-		"visible"			"1"
-		"enabled"			"1"
+		"visible"			"0"
+		"enabled"			"0"
 		"labelText"			"%weaponname%"
 		"textAlignment"		"west"
 		"dulltext"			"0"
diff --git a/resource/ui/econ/backpackpanel.res b/resource/ui/econ/backpackpanel.res
index 413a411..386f5f0 100644
--- a/resource/ui/econ/backpackpanel.res
+++ b/resource/ui/econ/backpackpanel.res
@@ -63,7 +63,7 @@
 				"paintborder"		"1"
 				"textAlignment"		"center"
 				"labelText"			"%page%"
-				"font"				"HudFontSmallestBold"
+				"font"				"HudFontSmallest"
 				"sound_depressed"	"UI/buttonclick.wav"
 				"sound_released"	"UI/buttonclickrelease.wav"
 			}
@@ -157,18 +157,18 @@
 	{
 		"ControlName"		"CExLabel"
 		"fieldName"			"CaratLabel"
-		"font"				"Cerbetica16"
+		"font"				"HudFontMediumSmallSecondary"
 		"labelText"			">>"
 		"textAlignment"		"west"
 		"xpos"				"c-290"
-		"ypos"				"26"
+		"ypos"				"12"
 		"zpos"				"1"
 		"wide"				"20"
 		"tall"				"16"
 		"autoResize"		"1"
 		"pinCorner"			"0"
-		"visible"			"0"
-		"enabled"			"0"
+		"visible"			"1"
+		"enabled"			"1"
 		"fgcolor_override"	"ColorPurple"
 	}
 
@@ -179,7 +179,7 @@
 		"font"				"HudFontMediumBold"
 		"labelText"			"#ClassBeingEquipped"
 		"textAlignment"		"west"
-		"xpos"				"c-280"
+		"xpos"				"c-270"
 		"ypos"				"10"
 		"zpos"				"1"
 		"wide"				"370"
@@ -283,7 +283,6 @@
 	{
 		"ControlName"		"TextEntry"
 		"fieldName"			"NameFilterTextEntry"
-		"font"				"HudFontSmallest"
 		"xpos"				"c117"
 		"ypos"				"15"
 		"wide"				"168"
@@ -297,10 +296,9 @@
 		"editable"			"1"
 		"unicode"			"1"
 		"fgcolor_override"	"TanLight"
-		"bgcolor_override"	"15 15 15 255"
-		"paintbackgroundtype" "0"
-		"border_default"	"ButtonHover"
-		"border_armed"		"ButtonHover"
+		"bgcolor_override"	"DarkerGrey"
+		"paintbackgroundtype" "2"
+		"font"				"HudFontSmallest"
 	}
 
 	"SortByComboBox"
@@ -334,11 +332,11 @@
 
 	"mouseoveritempanel"
 	{
-		"ControlName"		"CItemModelPanel"
+		"ControlName"		"EditablePanel"
 		"fieldName"			"mouseoveritempanel"
 		"xpos"				"c-70"
 		"ypos"				"270"
-		"zpos"				"100"
+		"zpos"				"102"
 		"wide"				"300"
 		"tall"				"300"
 		"visible"			"0"
@@ -346,7 +344,6 @@
 		"noitem_textcolor"	"TextColor"
 		"PaintBackgroundType"	"2"
 		"paintborder"		"1"
-		"text_ypos"			"10"
 		"text_center"		"1"
 		"model_hide"		"1"
 		"resize_to_text"	"1"
@@ -357,7 +354,7 @@
 			"font"			"ItemFontAttribLarge"
 			"xpos"			"0"
 			"ypos"			"30"
-			"zpos"			"101"
+			"zpos"			"2"
 			"wide"			"140"
 			"tall"			"60"
 			"autoResize"	"0"
@@ -406,7 +403,7 @@
 		"ypos"			"40"
 		"zpos"			"1"
 		"wide"			"25"
-		"tall"			"13"
+		"tall"			"15"
 		"autoResize"	"0"
 		"pinCorner"		"0"
 		"visible"		"1"
@@ -420,21 +417,13 @@
 		"Command"		"prevpage"
 		"sound_depressed"	"UI/buttonclick.wav"
 		"sound_released"	"UI/buttonclickrelease.wav"
-
-		"defaultBgColor_override"	"25 25 25 255"
-		"armedBgColor_override"		"35 35 35 255"
-		"depressedBgColor_override"	"25 25 25 255"
-
-		"defaultFgColor_override"	"TanLight"
-		"armedFgColor_override" 	"ColorCyan"
-		"depressedFgColor_override" "TanDark"
 	}
 
 	"CurPageLabel"
 	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"CurPageLabel"
-		"font"			"HudFontSmallestBold"
+		"font"			"HudFontSmall"
 		"labelText"		"%backpackpage%"
 		"textAlignment"	"center"
 		"xpos"			"c-260"
@@ -457,7 +446,7 @@
 		"ypos"			"40"
 		"zpos"			"1"
 		"wide"			"25"
-		"tall"			"13"
+		"tall"			"15"
 		"autoResize"	"0"
 		"pinCorner"		"0"
 		"visible"		"1"
@@ -465,21 +454,12 @@
 		"tabPosition"	"0"
 		"labelText"		"&D"
 		"font"			"MenuArrows"
-		"fgcolor"		"TanLight"
 		"textAlignment"	"center"
 		"dulltext"		"0"
 		"brighttext"	"0"
 		"Command"		"nextpage"
 		"sound_depressed"	"UI/buttonclick.wav"
 		"sound_released"	"UI/buttonclickrelease.wav"
-
-		"defaultBgColor_override"	"25 25 25 255"
-		"armedBgColor_override"		"35 35 35 255"
-		"depressedBgColor_override"	"25 25 25 255"
-
-		"defaultFgColor_override"	"TanLight"
-		"armedFgColor_override" 	"ColorCyan"
-		"depressedFgColor_override" "TanDark"
 	}
 
 	"DragToNextPageButton"
@@ -545,7 +525,7 @@
 		"enabled"		"1"
 		"tabPosition"	"0"
 		"labelText"		"#Cancel"
-		"font"			"HudFontSmallBold"
+		"font"			"HudFontSmall"
 		"textAlignment"	"center"
 		"textinsetx"	"50"
 		"dulltext"		"0"
@@ -863,6 +843,7 @@
 			"enabled"		"1"
 			"tabPosition"	"0"
 			"labeltext"		""
+			"font"			"HudFontSmall"
 			"textAlignment"	"center"
 			"dulltext"		"0"
 			"brighttext"	"0"
diff --git a/resource/ui/econ/confirmapplypaintcandialog.res b/resource/ui/econ/confirmapplypaintcandialog.res
index 1767a92..b162d70 100644
--- a/resource/ui/econ/confirmapplypaintcandialog.res
+++ b/resource/ui/econ/confirmapplypaintcandialog.res
@@ -40,7 +40,7 @@
 			"font"			"ItemFontAttribLarge"
 			"xpos"			"0"
 			"ypos"			"30"
-			"zpos"			"101"
+			"zpos"			"2"
 			"wide"			"140"
 			"tall"			"60"
 			"autoResize"	"0"
diff --git a/resource/ui/econ/confirmapplystrangepartapplicationdialog.res b/resource/ui/econ/confirmapplystrangepartapplicationdialog.res
index 3c8c1fa..db74b25 100644
--- a/resource/ui/econ/confirmapplystrangepartapplicationdialog.res
+++ b/resource/ui/econ/confirmapplystrangepartapplicationdialog.res
@@ -40,7 +40,7 @@
 			"font"			"ItemFontAttribLarge"
 			"xpos"			"0"
 			"ypos"			"30"
-			"zpos"			"101"
+			"zpos"			"2"
 			"wide"			"140"
 			"tall"			"60"
 			"autoResize"	"0"
diff --git a/resource/ui/econ/confirmapplyteamcolorpaintcandialog.res b/resource/ui/econ/confirmapplyteamcolorpaintcandialog.res
index 507eb6a..cac4cf7 100644
--- a/resource/ui/econ/confirmapplyteamcolorpaintcandialog.res
+++ b/resource/ui/econ/confirmapplyteamcolorpaintcandialog.res
@@ -40,7 +40,7 @@
 			"font"			"ItemFontAttribLarge"
 			"xpos"			"0"
 			"ypos"			"30"
-			"zpos"			"101"
+			"zpos"			"2"
 			"wide"			"140"
 			"tall"			"60"
 			"autoResize"	"0"
diff --git a/resource/ui/econ/confirmdialogabandonnopenalty.res b/resource/ui/econ/confirmdialogabandonnopenalty.res
index 2ff68fb..6c66fb1 100644
--- a/resource/ui/econ/confirmdialogabandonnopenalty.res
+++ b/resource/ui/econ/confirmdialogabandonnopenalty.res
@@ -48,8 +48,8 @@
 		"wide"					"40"
 		"tall"					"40"
 		"image"					"pve/mvm_timeout_active_large"
-		"visible"				"1"
-		"enabled"				"1"
+		"visible"				"0"
+		"enabled"				"0"
 		"scaleImage"			"1"
 	}
 
diff --git a/resource/ui/econ/confirmdialogabandonpenalty.res b/resource/ui/econ/confirmdialogabandonpenalty.res
index b72db7d..f6aee8c 100644
--- a/resource/ui/econ/confirmdialogabandonpenalty.res
+++ b/resource/ui/econ/confirmdialogabandonpenalty.res
@@ -48,8 +48,8 @@
 		"wide"					"40"
 		"tall"					"40"
 		"image"					"pve/mvm_timeout_active_large"
-		"visible"				"1"
-		"enabled"				"1"
+		"visible"				"0"
+		"enabled"				"0"
 		"scaleImage"			"1"
 	}
 
diff --git a/resource/ui/econ/inspectionpanel.res b/resource/ui/econ/inspectionpanel.res
index a13250f..0569e6a 100644
--- a/resource/ui/econ/inspectionpanel.res
+++ b/resource/ui/econ/inspectionpanel.res
@@ -120,7 +120,7 @@
 		"ControlName"		"CNavigationPanel"
 		"fieldName"			"TeamNavPanel"
 		"xpos"				"cs-0.5"
-		"ypos"				"55"
+		"ypos"				"p.7-16"
 		"zpos"				"100"
 		"wide"				"60"
 		"tall"				"25"
@@ -157,7 +157,7 @@
 			"sound_armed"			"UI/buttonrollover.wav"
 			"paintbackground"		"0"
 			"paintbackgroundtype"	"0"
-			"defaultBgColor_Override"	"ColorBlack"
+			"defaultBgColor_Override"	"0 0 0 255"
 			"paintborder"			"0"
 			"image_drawcolor"		"255 255 255 77"
 			"image_armedcolor"		"255 255 255 128"
@@ -214,15 +214,16 @@
 		"ControlName"	"EditablePanel"
 		"fieldName"		"PaintkitPreviewContainer"
 		"xpos"			"cs-0.5"
-		"ypos"			"p.68"
+		"ypos"			"p.7"
 		"wide"			"300"
 		"tall"			"100"
 		"zpos"			"100"
-		"visible"		"0"
+		"visible"		"1"
 		"bgcolor_override"	"DarkerGrey"
-		"border"				"NoBorder"
+		"PaintBackgroundType"	"2"
 		"mouseinputenabled"		"1"
 		"proportionaltoparent"	"1"
+		"paintborder"			"0"
 
 		"fixed_item"
 		{
@@ -254,7 +255,7 @@
 			"enabled"		"1"
 			"tabPosition"	"0"
 			"labeltext"		""
-			"font"			"HudFontSmallBold"
+			"font"			"Cerbetica12"
 			"textAlignment"	"center"
 			"dulltext"		"0"
 			"brighttext"	"0"
@@ -397,7 +398,7 @@
 		{
 			"ControlName"	"CExLabel"
 			"fieldName"		"ItemLabel"
-			"font"			"Cerbetica12"
+			"font"			"HudFontSmallest"
 			"labelText"		"#TF_ItemPreview_ItemPreview"
 			"textAlignment"	"west"
 			"xpos"			"8"
@@ -499,7 +500,7 @@
 		{
 			"ControlName"	"Button"
 			"fieldName"		"NewSeedButton"
-			"font"			"HudFontSmallest"
+			"font"			"Cerbetica12"
 			"xpos"			"8"
 			"ypos"			"75"
 
@@ -597,7 +598,7 @@
 			"wide"			"75"
 			"tall"			"20"
 			"labelText"		"#TF_ItemAd_ViewOnMarket"
-			"font"			"Cerbetica10"
+			"font"			"Cerbetica12"
 			"textinsetx"	"0"
 			"textAlignment"	"center"
 			"proportionaltoparent"	"1"
diff --git a/resource/ui/econ/itemmodelpanel.res b/resource/ui/econ/itemmodelpanel.res
index 3689124..dbca196 100644
--- a/resource/ui/econ/itemmodelpanel.res
+++ b/resource/ui/econ/itemmodelpanel.res
@@ -78,7 +78,7 @@
 		{
 			"ControlName"	"CExLabel"
 			"fieldName"		"namelabel"
-			"font"			"ItemFontNameLarge"
+			"font"			"ItemFontNameLarger"
 			"xpos"			"0"
 			"ypos"			"0"
 			"zpos"			"2"
diff --git a/resource/ui/econ/notificationtoastcontainer.res b/resource/ui/econ/notificationtoastcontainer.res
index 562c9f1..b41c85e 100644
--- a/resource/ui/econ/notificationtoastcontainer.res
+++ b/resource/ui/econ/notificationtoastcontainer.res
@@ -12,7 +12,7 @@
 		"visible"		"1"
 		"enabled"		"1"
 		"bgcolor_override"	"DarkGrey"
-		"border"			"CyanBorderThick"
+		"border"			"CyanBorder"
 	}
 
 	"HelpTextLabel"
@@ -32,7 +32,7 @@
 		"wrap"			"1"
 		"labelText"		""
 		"textAlignment"	"North"
-		"font"			"TFFontSmall"
+		"font"			"ItemFontNameSmall"
 		"textinsetx"	"2"
 		"textinsety"	"7"
 	}
diff --git a/resource/ui/econ/store/v2/storehome_base.res b/resource/ui/econ/store/v2/storehome_base.res
index f1b0d62..ff48e5f 100644
--- a/resource/ui/econ/store/v2/storehome_base.res
+++ b/resource/ui/econ/store/v2/storehome_base.res
@@ -185,7 +185,7 @@
 			"autoResize"		"0"
 			"PaintBackgroundType" "2"
 			"border"			"NoBorder"
-			"bgcolor_override"	"35 35 35 255"
+			"bgcolor_override"	"DarkGrey"
 		}
 
 		"attriblabel"
@@ -295,7 +295,7 @@
 		"ControlName"		"CNavigationPanel"
 		"fieldName"			"ItemCategoryTabs"
 		"xpos"				"c-230"
-		"ypos"				"30"
+		"ypos"				"31"
 		"zpos"				"0"
 		"wide"				"430"
 		"tall"				"25"
@@ -321,8 +321,8 @@
 			"tabPosition"		"0"
 			"textAlignment"		"center"
 			"scaleImage"		"1"
-			"font"				"Cerbetica16"
-			"fgcolor"			"124 114 99 255"
+			"font"				"Cerbetica12"
+			"fgcolor"			"TanDark"
 
 			"defaultBgColor_override"	"25 25 25 255"
 			"defaultFgColor_override"	"124 114 99 255"
@@ -417,11 +417,11 @@
 	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"BackpackSpaceLabel"
-		"font"			"Cerbetica14"
+		"font"			"Cerbetica12"
 		"labelText"		"%freebackpackspace%"
 		"textAlignment"	"west"
-		"xpos"			"c-230"
-		"ypos"			"310"
+		"xpos"			"c-237"
+		"ypos"			"315"
 		"zpos"			"10"
 		"wide"			"160"
 		"tall"			"20"
@@ -435,10 +435,10 @@
 	{
 		"ControlName"	"CExButton"
 		"fieldName"		"CartButton"
-		"font"			"HudFontSmallBold"
+		"font"			"Cerbetica14"
 		"labelText"		"%storecart%"
 		"textAlignment"	"east"
-		"xpos"			"c-230"
+		"xpos"			"c-238"
 		"ypos"			"334"
 		"zpos"			"12"
 		"wide"			"56"
@@ -448,6 +448,7 @@
 		"PaintBackgroundType"	"2"
 		"textinsetx"	"15"
 		"Command"		"viewcart"
+		"defaultBgColor_override" "TanDarker"
 		"sound_depressed"	"UI/buttonclick.wav"
 		"sound_released"	"UI/buttonclickrelease.wav"
 	}
@@ -456,7 +457,7 @@
 	{
 		"ControlName"	"ImagePanel"
 		"fieldName"		"CartImage"
-		"xpos"			"c-225"
+		"xpos"			"c-233"
 		"ypos"			"336"
 		"zpos"			"13"
 		"wide"			"24"
@@ -482,7 +483,7 @@
 		"enabled"		"1"
 		"tabPosition"	"0"
 		"labelText"		"#Store_BrowseTheStore"
-		"font"			"HudFontSmallBold"
+		"font"			"Cerbetica14"
 		"textAlignment"	"center"
 		"dulltext"		"0"
 		"brighttext"	"0"
@@ -507,7 +508,7 @@
 		"enabled"		"1"
 		"tabPosition"	"0"
 		"labelText"		"#Store_MarketPlace"
-		"font"			"HudFontSmallBold"
+		"font"			"Cerbetica14"
 		"textAlignment"	"center"
 		"dulltext"		"0"
 		"brighttext"	"0"
@@ -608,16 +609,17 @@
 	{
 		"ControlName"	"EditablePanel"
 		"fieldName"		"Wall"
-		"xpos"			"0"
+		"xpos"			"c-250"
 		"ypos"			"55"
 		"zpos"			"-5"
-		"wide"			"f0"
-		"tall"			"f0"
+		"wide"			"505"
+		"tall"			"260"
 		"autoResize"	"0"
 		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
 		"paintbackground"	"1"
-		"bgcolor_override"	"0 0 0 100"
+		"bgcolor_override"	"DarkerGrey"
+		"PaintBackgroundType"	"2"
 	}
 }
\ No newline at end of file
diff --git a/resource/ui/econ/store/v2/storepage.res b/resource/ui/econ/store/v2/storepage.res
index 6f894cf..af24210 100644
--- a/resource/ui/econ/store/v2/storepage.res
+++ b/resource/ui/econ/store/v2/storepage.res
@@ -33,7 +33,7 @@
 		"item_backdrop_right_margin"		"11"
 		"item_backdrop_top_margin"			"9"
 		"item_backdrop_bottom_margin"		"42"
-		"item_backdrop_paintbackgroundtype"	"2"
+		"item_backdrop_paintbackgroundtype"	"0"
 		"item_panel_bgcolor"			"Grey"
 		"item_panel_bgcolor_mouseover"	"156 146 128 255"
 		"item_panel_bgcolor_selected"	"176 166 148 255"
@@ -199,7 +199,7 @@
 		{
 			"defaultFgColor_override"	"TanLight"
 			"defaultBgColor_override"	"15 15 15 255"
-			"armedFgColor_override"		"15 255 255 255 255"
+			"armedFgColor_override"		"15 255 255 255"
 			"armedBgColor_override"		"15 15 15 255"
 			"paintbackgroundtype"		"2"
 		}
@@ -240,7 +240,7 @@
 		{
 			"defaultFgColor_override"	"TanLight"
 			"defaultBgColor_override"	"15 15 15 255"
-			"armedFgColor_override"		"15 255 255 255 255"
+			"armedFgColor_override"		"15 255 255 255"
 			"armedBgColor_override"		"15 15 15 255"
 			"paintbackgroundtype"		"2"
 		}
@@ -314,7 +314,7 @@
 		"ypos"			"170"
 		"zpos"			"100"
 		"wide"			"200"
-		"tall"			"40"
+		"tall"			"20"
 		"autoResize"	"1"
 		"pinCorner"		"0"
 		"visible"		"0"
@@ -325,13 +325,14 @@
 		"paintborder"	"1"
 		"textinsetx"	"100"
 		"border"		"LoadoutItemPopupBorder"
+		"fgcolor"		"White"
 	}
 
 	"PrevPageButton"
 	{
 		"ControlName"	"CExButton"
 		"fieldName"		"PrevPageButton"
-		"xpos"			"c210"
+		"xpos"			"c190"
 		"ypos"			"280"
 		"zpos"			"5"
 		"wide"			"20"
@@ -349,17 +350,16 @@
 		"Command"		"prevpage"
 		"sound_depressed"	"UI/buttonclick.wav"
 		"sound_released"	"UI/buttonclickrelease.wav"
-		"defaultBgColor_override" "DarkerGrey"
 	}
 
 	"CurPageLabel"
 	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"CurPageLabel"
-		"font"			"HudFontSmallBold"
+		"font"			"Cerbetica14"
 		"labelText"		"%backpackpage%"
 		"textAlignment"	"center"
-		"xpos"			"c230"
+		"xpos"			"c220"
 		"ypos"			"280"
 		"zpos"			"5"
 		"wide"			"40"
@@ -393,7 +393,6 @@
 		"Command"		"nextpage"
 		"sound_depressed"	"UI/buttonclick.wav"
 		"sound_released"	"UI/buttonclickrelease.wav"
-		"defaultBgColor_override" "DarkerGrey"
 	}
 
 	"PriceLabel"
@@ -432,7 +431,7 @@
 		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
-		"fgcolor"		"StoreDarkTan"
+		"fgcolor"		"White"
 	}
 
 	"SubcategoryFiltersLabel"
@@ -451,7 +450,7 @@
 		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
-		"fgcolor"		"StoreDarkTan"
+		"fgcolor"		"White"
 	}
 
 	"SortFilterLabel"
@@ -470,7 +469,7 @@
 		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
-		"fgcolor"		"StoreDarkTan"
+		"fgcolor"		"White"
 	}
 
 	"ClassFilterLabel"
@@ -489,7 +488,7 @@
 		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
-		"fgcolor"		"StoreDarkTan"
+		"fgcolor"		"White"
 	}
 
 	"ClassFilterNavPanel"
@@ -698,11 +697,11 @@
 	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"BackpackSpaceLabel"
-		"font"			"Cerbetica14"
+		"font"			"Cerbetica12"
 		"labelText"		"%freebackpackspace%"
 		"textAlignment"	"west"
-		"xpos"			"c-292"
-		"ypos"			"277"
+		"xpos"			"c-300"
+		"ypos"			"315"
 		"zpos"			"0"
 		"wide"			"200"
 		"tall"			"20"
@@ -716,11 +715,11 @@
 	{
 		"ControlName"	"CExButton"
 		"fieldName"		"CartButton"
-		"font"			"HudFontSmallBold"
+		"font"			"Cerbetica14"
 		"labelText"		"%storecart%"
 		"textAlignment"	"east"
-		"xpos"			"c-292"
-		"ypos"			"299"
+		"xpos"			"c-300"
+		"ypos"			"334"
 		"zpos"			"12"
 		"wide"			"56"
 		"tall"			"24"
@@ -728,9 +727,8 @@
 		"enabled"		"1"
 		"PaintBackgroundType"	"2"
 		"textinsetx"	"15"
-
 		"Command"		"viewcart"
-		"font"			"HudFontSmallBold"
+		"defaultBgColor_override" "TanDarker"
 		"sound_depressed"	"UI/buttonclick.wav"
 		"sound_released"	"UI/buttonclickrelease.wav"
 	}
@@ -739,8 +737,8 @@
 	{
 		"ControlName"	"ImagePanel"
 		"fieldName"		"CartImage"
-		"xpos"			"c-289"
-		"ypos"			"302"
+		"xpos"			"c-295"
+		"ypos"			"336"
 		"zpos"			"13"
 		"wide"			"24"
 		"tall"			"20"
diff --git a/resource/ui/econ/store/v2/storepanel.res b/resource/ui/econ/store/v2/storepanel.res
index c2373bd..eb0545a 100644
--- a/resource/ui/econ/store/v2/storepanel.res
+++ b/resource/ui/econ/store/v2/storepanel.res
@@ -91,7 +91,7 @@
 	"FooterLine"
 	{
 		"ControlName"	"EditablePanel"
-		"fieldName"		"HeaderLine"
+		"fieldName"		"FooterLine"
 		"xpos"			"0"
 		"ypos"			"420"
 		"zpos"			"2"
@@ -109,7 +109,7 @@
 		"fieldName"		"Sheet"
 		"tabxindent"	"80"
 		"tabxdelta"		"10"
-		"tabwidth"		"240"
+		"tabxfittotext"	"1"
 		"tabheight"		"20"
 		"yoffset"		"14"
 		"transition_time" "0"
@@ -135,16 +135,15 @@
 		{
 			"textinsetx"		"25"
 			"textAlignment"		"center"
-			"font"				"Cerbetica20"
-			"ypos"				"50"
+			"font"				"Cerbetica14"
 			"selectedcolor"		"TanLight"
 			"unselectedcolor"	"TanDark"
-			"paintbackground"	"1"
-			"defaultBgColor_override"		"25 25 25 255"
+			"defaultBgColor_override"	"25 25 25 255"
+			"paintbackground"		"1"
+			"activeborder_override"	"CyanBorderTabs"
+			"normalborder_override" "CyanBorderTabsInactive"
 			"unselectedBgColor_override"	"10 10 10 255"
-			"activeborder_override"			"CyanBorderTabs"
 			"depressedBgColor_override"		"10 10 10 255"
-			"normalborder_override" 		"CyanBorderTabsInactive"
 		}
 	}
 
@@ -155,15 +154,15 @@
 		"xpos"				"c-300"
 		"ypos"				"437"
 		"zpos"				"2"
-		"wide"				"100"
+		"wide"				"130"
 		"tall"				"25"
 		"autoResize"		"0"
 		"pinCorner"			"3"
 		"visible"			"1"
 		"enabled"			"1"
 		"tabPosition"		"0"
-		"labelText"			"<< Back (&Q)"
-		"font"				"HudFontSmallBold"
+		"labelText"			"Exit Store (&Q)"
+		"font"				"Cerbetica14"
 		"textAlignment"		"center"
 		"dulltext"			"0"
 		"brighttext"		"0"
@@ -222,7 +221,7 @@
 		"zpos"				"5"
 		"wide"				"70"
 		"tall"				"100"
-		"font"				"Cerbetica10"
+		"font"				"Cerbetica8"
 		"wrap"				"1"
 		"labelText"			"#Store_ConfirmStampDonationAddTitle"
 		"visible"			"0"
@@ -243,7 +242,7 @@
 		"enabled"			"1"
 		"tabPosition"		"0"
 		"labelText"			"#Store_Checkout"
-		"font"				"HudFontSmallBold"
+		"font"				"Cerbetica14"
 		"textAlignment"		"center"
 		"dulltext"			"0"
 		"brighttext"		"0"
diff --git a/resource/ui/econ/store/v2/storepreviewitempanel.res b/resource/ui/econ/store/v2/storepreviewitempanel.res
index 8beec68..432d3d5 100644
--- a/resource/ui/econ/store/v2/storepreviewitempanel.res
+++ b/resource/ui/econ/store/v2/storepreviewitempanel.res
@@ -168,7 +168,7 @@
 				{
 					"ControlName"	"CExLabel"
 					"fieldName"		"ItemLevelInfoLabel"
-					"font"			"FontStoreOriginalPrice"
+					"font"			"HudFontSmallest"
 					"labelText"		"%item_level_info%"
 					"textAlignment"	"north-west"
 					"wide"			"228"
@@ -185,7 +185,7 @@
 				{
 					"ControlName"	"CExLabel"
 					"fieldName"		"RestrictionsLabel"
-					"font"			"FontStoreOriginalPrice"
+					"font"			"HudFontSmallest"
 					"labelText"		"#Store_ItemDesc_Restrictions"
 					"textAlignment"	"north-west"
 					"wide"			"228"
@@ -202,7 +202,7 @@
 				{
 					"ControlName"	"CExLabel"
 					"fieldName"		"RestrictionsTextLabel"
-					"font"			"FontStoreOriginalPrice"
+					"font"			"HudFontSmallest"
 					"labelText"		"#Store_HolidayRestrictionText"
 					"textAlignment"	"north-west"
 					"wide"			"228"
@@ -219,7 +219,7 @@
 				{
 					"ControlName"	"CExLabel"
 					"fieldName"		"UsedByLabel"
-					"font"			"FontStoreOriginalPrice"
+					"font"			"HudFontSmallest"
 					"labelText"		"#Store_ItemDesc_UsedBy"
 					"textAlignment"	"north-west"
 					"wide"			"228"
@@ -236,7 +236,7 @@
 				{
 					"ControlName"	"CExLabel"
 					"fieldName"		"UsedByTextLabel"
-					"font"			"FontStoreOriginalPrice"
+					"font"			"HudFontSmallest"
 					"labelText"		"%used_by_classes%"
 					"textAlignment"	"north-west"
 					"wide"			"228"
@@ -252,7 +252,7 @@
 				{
 					"ControlName"	"CExLabel"
 					"fieldName"		"SlotLabel"
-					"font"			"FontStoreOriginalPrice"
+					"font"			"HudFontSmallest"
 					"labelText"		"#Store_ItemDesc_Slot"
 					"textAlignment"	"north-west"
 					"wide"			"228"
@@ -269,7 +269,7 @@
 				{
 					"ControlName"	"CExLabel"
 					"fieldName"		"SlotTextLabel"
-					"font"			"FontStoreOriginalPrice"
+					"font"			"HudFontSmallest"
 					"labelText"		"%slot%"
 					"textAlignment"	"north-west"
 					"wide"			"228"
@@ -285,7 +285,7 @@
 				{
 					"ControlName"	"CExLabel"
 					"fieldName"		"PriceLabel"
-					"font"			"CerbeticaBold14"
+					"font"			"HudFontSmall"
 					"textAlignment"	"north-west"
 					"wide"			"228"
 					"tall"			"25"
@@ -301,7 +301,7 @@
 				{
 					"ControlName"	"CExLabel"
 					"fieldName"		"ArmoryTextLabel"
-					"font"			"FontStoreOriginalPrice"
+					"font"			"HudFontSmallest"
 					"textAlignment"	"north-west"
 					"wide"			"228"
 					"tall"			"10"
@@ -317,7 +317,7 @@
 				{
 					"ControlName"	"CExLabel"
 					"fieldName"		"AttributesLabel"
-					"font"			"FontStoreOriginalPrice"
+					"font"			"HudFontSmallest"
 					"textAlignment"	"north-west"
 					"wide"			"228"
 					"tall"			"10"
@@ -341,7 +341,7 @@
 					"enabled"		"1"
 					"tabPosition"	"0"
 					"labelText"		"#Store_ItemDesc_ItemWikiPage"
-					"font"			"CerbeticaBold12"
+					"font"			"HudFontSmall"
 					"textAlignment"	"center"
 					"dulltext"		"0"
 					"brighttext"	"0"
@@ -354,7 +354,7 @@
 				{
 					"ControlName"	"CExLabel"
 					"fieldName"		"TradableLabel"
-					"font"			"FontStoreOriginalPrice"
+					"font"			"HudFontSmallest"
 					"labelText"		"#Store_ItemDesc_Tradable"
 					"textAlignment"	"north-west"
 					"wide"			"205"
@@ -371,7 +371,7 @@
 				{
 					"ControlName"	"CExLabel"
 					"fieldName"		"TradableTextLabel"
-					"font"			"FontStoreOriginalPrice"
+					"font"			"HudFontSmallest"
 					"labelText"		"%tradable%"
 					"textAlignment"	"north-west"
 					"wide"			"205"
@@ -387,7 +387,7 @@
 				{
 					"ControlName"	"CExLabel"
 					"fieldName"		"GiftableLabel"
-					"font"			"FontStoreOriginalPrice"
+					"font"			"HudFontSmallest"
 					"labelText"		"#Store_ItemDesc_Giftable"
 					"textAlignment"	"north-west"
 					"wide"			"205"
@@ -404,7 +404,7 @@
 				{
 					"ControlName"	"CExLabel"
 					"fieldName"		"GiftableTextLabel"
-					"font"			"FontStoreOriginalPrice"
+					"font"			"HudFontSmallest"
 					"labelText"		"%giftable%"
 					"textAlignment"	"north-west"
 					"wide"			"205"
@@ -420,7 +420,7 @@
 				{
 					"ControlName"	"CExLabel"
 					"fieldName"		"NameableLabel"
-					"font"			"FontStoreOriginalPrice"
+					"font"			"HudFontSmallest"
 					"labelText"		"#Store_ItemDesc_Nameable"
 					"textAlignment"	"north-west"
 					"wide"			"205"
@@ -437,7 +437,7 @@
 				{
 					"ControlName"	"CExLabel"
 					"fieldName"		"NameableTextLabel"
-					"font"			"FontStoreOriginalPrice"
+					"font"			"HudFontSmallest"
 					"labelText"		"%nameable%"
 					"textAlignment"	"north-west"
 					"wide"			"205"
@@ -453,7 +453,7 @@
 				{
 					"ControlName"	"CExLabel"
 					"fieldName"		"CraftableLabel"
-					"font"			"FontStoreOriginalPrice"
+					"font"			"HudFontSmallest"
 					"labelText"		"#Store_ItemDesc_Craftable"
 					"textAlignment"	"north-west"
 					"wide"			"205"
@@ -470,7 +470,7 @@
 				{
 					"ControlName"	"CExLabel"
 					"fieldName"		"CraftableTextLabel"
-					"font"			"FontStoreOriginalPrice"
+					"font"			"Cerbetica12"
 					"labelText"		"%craftable%"
 					"textAlignment"	"north-west"
 					"wide"			"205"
@@ -1058,7 +1058,7 @@
 		"enabled"		"1"
 		"tabPosition"	"0"
 		"labelText"		"#Store_NextWeapon"
-		"font"			"CerbeticaBold12"
+		"font"			"HudFontSmallest"
 		"textAlignment"	"center"
 		"textinsetx"	"50"
 		"dulltext"		"0"
@@ -1198,7 +1198,7 @@
 
 			"paintbackground"	"0"
 			"paintbackgroundtype"	"0"
-			"defaultBgColor_Override"	"ColorBlack"
+			"defaultBgColor_Override"	"0 0 0 255"
 
 			"paintborder"		"0"
 
@@ -1419,7 +1419,7 @@
 		"enabled"		"1"
 		"tabPosition"	"0"
 		"labelText"		"#TF_BackCarat"
-		"font"			"CerbeticaBold14"
+		"font"			"HudFontSmall"
 		"textAlignment"	"center"
 		"dulltext"		"0"
 		"brighttext"	"0"
@@ -1443,7 +1443,7 @@
 		"enabled"		"1"
 		"tabPosition"	"0"
 		"labelText"		"#Store_TryItOut"
-		"font"			"CerbeticaBold14"
+		"font"			"HudFontSmall"
 		"textAlignment"	"center"
 		"dulltext"		"0"
 		"brighttext"	"0"
@@ -1460,14 +1460,14 @@
 		"xpos"			"c0"
 		"ypos"			"c105"
 		"zpos"			"2"
-		"wide"			"160"
+		"wide"			"150"
 		"tall"			"20"
 		"autoResize"	"0"
 		"visible"		"1"
 		"enabled"		"1"
 		"tabPosition"	"0"
 		"labelText"		"%storeaddtocart%"
-		"font"			"CerbeticaBold14"
+		"font"			"HudFontSmall"
 		"textAlignment"	"center"
 		"dulltext"		"0"
 		"brighttext"	"0"
diff --git a/resource/ui/econ/store/v2/storepreviewitempanel_maps.res b/resource/ui/econ/store/v2/storepreviewitempanel_maps.res
index fc95819..18c7440 100644
--- a/resource/ui/econ/store/v2/storepreviewitempanel_maps.res
+++ b/resource/ui/econ/store/v2/storepreviewitempanel_maps.res
@@ -138,11 +138,11 @@
 	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"ItemNameLabel"
-		"font"			"CerbeticaBold18"
+		"font"			"HudFontMediumSmall"
 		"labelText"		"%selectiontitle%"
 		"textAlignment"	"center"
 		"xpos"			"c-130"
-		"ypos"			"c-130"
+		"ypos"			"c-129"
 		"wide"			"260"
 		"tall"			"33"
 		"autoResize"	"1"
@@ -384,7 +384,7 @@
 		"enabled"		"1"
 		"tabPosition"	"0"
 		"labelText"		"#Store_NextWeapon"
-		"font"			"CerbeticaBold12"
+		"font"			"HudFontSmall"
 		"textAlignment"	"center"
 		"textinsetx"	"50"
 		"dulltext"		"0"
@@ -541,7 +541,7 @@
 		"enabled"		"1"
 		"tabPosition"	"0"
 		"labelText"		"#TF_BackCarat"
-		"font"			"CerbeticaBold14"
+		"font"			"HudFontSmall"
 		"textAlignment"	"center"
 		"dulltext"		"0"
 		"brighttext"	"0"
@@ -565,7 +565,7 @@
 		"enabled"		"1"
 		"tabPosition"	"0"
 		"labelText"		"#Store_AddToCart"
-		"font"			"CerbeticaBold14"
+		"font"			"HudFontSmall"
 		"textAlignment"	"center"
 		"dulltext"		"0"
 		"brighttext"	"0"
diff --git a/resource/ui/econ/store/v2/storeviewcartpanel.res b/resource/ui/econ/store/v2/storeviewcartpanel.res
index d579550..5d3177c 100644
--- a/resource/ui/econ/store/v2/storeviewcartpanel.res
+++ b/resource/ui/econ/store/v2/storeviewcartpanel.res
@@ -76,7 +76,7 @@
 			{
 				"ControlName"	"Label"
 				"fieldname"		"quantitylabel"
-				"font"			"HudFontSmallestBold"
+				"font"			"Cerbetica12"
 				"textAlignment"	"north-east"
 				"xpos"			"70"
 				"ypos"			"45"
@@ -113,14 +113,14 @@
 				"ypos"			"17"
 				"zpos"			"5"
 				"wide"			"100"
-				"tall"			"25"
+				"tall"			"20"
 				"autoResize"	"0"
 				"pinCorner"		"0"
 				"visible"		"1"
 				"enabled"		"1"
 				"tabPosition"	"0"
 				"labelText"		"#Store_Remove"
-				"font"			"HudFontSmallBold"
+				"font"			"Cerbetica14"
 				"textAlignment"	"center"
 				"dulltext"		"0"
 				"brighttext"	"0"
@@ -146,26 +146,7 @@
 				"visible"		"1"
 				"enabled"		"1"
 				"labelText"		"%price%"
-				"fgcolor_override" "130 120 104 255"
-			}
-
-			"PreviewItemLabel"
-			{
-				"ControlName"	"Label"
-				"fieldname"		"PreviewItemLabel"
-				"font"			"HudFontSmallest"
-				"textAlignment"	"center"
-				"xpos"			"110"
-				"ypos"			"36"
-				"wide"			"250"
-				"tall"			"15"
-				"zpos"			"15"
-				"autoResize"	"1"
-				"pinCorner"		"0"
-				"visible"		"1"
-				"enabled"		"1"
-				"labelText"		"%preview_item%"
-				"fgcolor_override" "130 120 104 255"
+				"fgcolor_override" "DullWhite"
 			}
 		}
 	}
@@ -233,7 +214,7 @@
 	"FooterLine"
 	{
 		"ControlName"	"EditablePanel"
-		"fieldName"		"HeaderLine"
+		"fieldName"		"FooterLine"
 		"xpos"			"0"
 		"ypos"			"420"
 		"zpos"			"2"
@@ -261,7 +242,7 @@
 			"ControlName"	"EditablePanel"
 			"fieldName"		"HeaderLine"
 			"xpos"			"0"
-			"ypos"			"420"
+			"ypos"			"0"
 			"zpos"			"2"
 			"wide"			"f0"
 			"tall"			"2"
@@ -333,20 +314,20 @@
 			"wide"			"600"
 			"tall"			"240"
 			"PaintBackgroundType"	"2"
-			"fgcolor_override"	"118 107 94 255"	// Gets copied to the scrollbar fgcolor as part of ScrollableEditablePanel
+			"fgcolor_override"	"DullWhite"	// Gets copied to the scrollbar fgcolor as part of ScrollableEditablePanel
 			"bgcolor_override"	"DarkGrey"
 			"autohide_buttons" "1"
 
 			"Scrollbar"
 			{
 				"xpos"			"586"
-				"wide"			"11"
+				"wide"			"4"
 				"tall"			"240"
 				"zpos"			"1000"
 
 				"Slider"
 				{
-					"PaintBackgroundType"	"2"
+					"PaintBackgroundType"	"1"
 				}
 
 				"nobuttons"		"1"
@@ -438,7 +419,7 @@
 						"pinCorner"		"0"
 						"visible"		"1"
 						"enabled"		"1"
-						"fgcolor_override" "130 120 104 255"
+						"fgcolor_override" "White"
 					}
 
 					"TotalSubtextLabelB"
@@ -457,7 +438,7 @@
 						"pinCorner"		"0"
 						"visible"		"1"
 						"enabled"		"1"
-						"fgcolor_override" "130 120 104 255"
+						"fgcolor_override" "White"
 					}
 
 					"TotalPriceLabel"
@@ -476,7 +457,7 @@
 						"visible"		"1"
 						"enabled"		"1"
 						"labelText"		"%totalprice%"
-						"fgcolor_override" "130 120 104 255"
+						"fgcolor_override" "White"
 					}
 				}
 			}
@@ -498,7 +479,7 @@
 		"enabled"		"1"
 		"tabPosition"	"0"
 		"labelText"		"#Store_ContinueShopping"
-		"font"			"HudFontSmallBold"
+		"font"			"Cerbetica14"
 		"textAlignment"	"center"
 		"dulltext"		"0"
 		"brighttext"	"0"
@@ -523,7 +504,7 @@
 		"enabled"		"1"
 		"tabPosition"	"0"
 		"labelText"		"#Store_Checkout"
-		"font"			"HudFontSmallBold"
+		"font"			"Cerbetica14"
 		"textAlignment"	"center"
 		"dulltext"		"0"
 		"brighttext"	"0"
diff --git a/resource/ui/econ/tradingstartdialog.res b/resource/ui/econ/tradingstartdialog.res
index 57a0ef1..e06cd2b 100644
--- a/resource/ui/econ/tradingstartdialog.res
+++ b/resource/ui/econ/tradingstartdialog.res
@@ -9,7 +9,7 @@
 		"ypos"					"80"
 		"wide"					"400"
 		"tall"					"300"
-		"bgcolor_override"		"DarkGrey"
+		"bgcolor_override"		"DarkerGrey"
 		"paintbackgroundtype"	"2"
 		"settitlebarvisible"	""
 		"border"				"CyanBorderThick"
@@ -57,7 +57,7 @@
 				"visible"		"1"
 				"enabled"		"1"
 				"scaleImage"	"1"
-				"color_outline"	"52 48 45 255"
+				"color_outline"	"HudTimerProgressInActive"
 			}
 		}
 	}
@@ -66,14 +66,14 @@
 	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"TitleLabel"
-		"font"			"HudFontMediumBold"
+		"font"			"Cerbetica22"
 		"labelText"		"#TF_TradeStartDialog_Title"
 		"textAlignment"	"north"
 		"xpos"			"0"
 		"ypos"			"15"
 		"zpos"			"1"
 		"wide"			"400"
-		"tall"			"35"
+		"tall"			"25"
 		"autoResize"	"0"
 		"pinCorner"		"0"
 		"visible"		"1"
@@ -121,7 +121,7 @@
 		{
 			"ControlName"	"CExLabel"
 			"fieldName"		"QueryLabel"
-			"font"			"HudFontSmallBold"
+			"font"			"Cerbetica12"
 			"labelText"		"#TF_TradeStartDialog_Select"
 			"textAlignment"	"north"
 			"xpos"			"0"
@@ -144,14 +144,14 @@
 			"ypos"			"50"
 			"zpos"			"1"
 			"wide"			"200"
-			"tall"			"25"
+			"tall"			"20"
 			"autoResize"	"0"
 			"pinCorner"		"3"
 			"visible"		"1"
 			"enabled"		"1"
 			"tabPosition"	"0"
 			"labelText"		"#TF_TradeStartDialog_SelectFriends"
-			"font"			"HudFontSmallBold"
+			"font"			"Cerbetica14"
 			"textAlignment"	"center"
 			"dulltext"		"0"
 			"brighttext"	"0"
@@ -168,14 +168,14 @@
 			"ypos"			"90"
 			"zpos"			"1"
 			"wide"			"200"
-			"tall"			"25"
+			"tall"			"20"
 			"autoResize"	"0"
 			"pinCorner"		"3"
 			"visible"		"1"
 			"enabled"		"1"
 			"tabPosition"	"0"
 			"labelText"		"#TF_TradeStartDialog_SelectServer"
-			"font"			"HudFontSmallBold"
+			"font"			"Cerbetica14"
 			"textAlignment"	"center"
 			"dulltext"		"0"
 			"brighttext"	"0"
@@ -192,14 +192,14 @@
 			"ypos"			"130"
 			"zpos"			"1"
 			"wide"			"200"
-			"tall"			"25"
+			"tall"			"20"
 			"autoResize"	"0"
 			"pinCorner"		"3"
 			"visible"		"1"
 			"enabled"		"1"
 			"tabPosition"	"0"
 			"labelText"		"#TF_TradeStartDialog_SelectProfile"
-			"font"			"HudFontSmallBold"
+			"font"			"Cerbetica14"
 			"textAlignment"	"center"
 			"dulltext"		"0"
 			"brighttext"	"0"
@@ -354,10 +354,10 @@
 			"labelText"		"#TF_TradeStartDialog_ProfileHelp"
 			"textAlignment"	"center"
 			"xpos"			"0"
-			"ypos"			"35"
+			"ypos"			"40"
 			"zpos"			"-1"
 			"wide"			"400"
-			"tall"			"40"
+			"tall"			"30"
 			"autoResize"	"0"
 			"pinCorner"		"0"
 			"visible"		"1"
@@ -443,14 +443,14 @@
 			"ypos"			"150"
 			"zpos"			"1"
 			"wide"			"200"
-			"tall"			"25"
+			"tall"			"20"
 			"autoResize"	"0"
 			"pinCorner"		"3"
 			"visible"		"1"
 			"enabled"		"1"
 			"tabPosition"	"0"
 			"labelText"		"#TF_TradeStartDialog_ProfileGo"
-			"font"			"HudFontSmallBold"
+			"font"			"Cerbetica14"
 			"textAlignment"	"center"
 			"dulltext"		"0"
 			"brighttext"	"0"
@@ -469,14 +469,14 @@
 		"ypos"			"250"
 		"zpos"			"1"
 		"wide"			"100"
-		"tall"			"25"
+		"tall"			"20"
 		"autoResize"	"0"
 		"pinCorner"		"3"
 		"visible"		"1"
 		"enabled"		"1"
 		"tabPosition"	"0"
 		"labelText"		"#Cancel"
-		"font"			"HudFontSmallBold"
+		"font"			"Cerbetica14"
 		"textAlignment"	"center"
 		"dulltext"		"0"
 		"brighttext"	"0"
diff --git a/resource/ui/freezepanel_basic.res b/resource/ui/freezepanel_basic.res
index ff7cc5f..9c4a1fa 100644
--- a/resource/ui/freezepanel_basic.res
+++ b/resource/ui/freezepanel_basic.res
@@ -177,8 +177,8 @@
 			"ControlName"	"CExLabel"
 			"fieldName"		"FreezeLabelKiller"
 			"font"			"Cerbetica12"
-			"xpos"			"42"
-			"ypos"			"28"
+			"xpos"			"25"
+			"ypos"			"30"
 			"zpos"			"1"
 			"wide"			"196"
 			"tall"			"15"
diff --git a/resource/ui/hud_obj_sentrygun.res b/resource/ui/hud_obj_sentrygun.res
index 65cc65a..2da4f01 100644
--- a/resource/ui/hud_obj_sentrygun.res
+++ b/resource/ui/hud_obj_sentrygun.res
@@ -89,6 +89,8 @@
 			"ypos"			"0"
 			"wide"			"200"
 			"tall"			"60"
+			"autoResize"	"0"
+			"pinCorner"		"0"
 			"visible"		"1"
 			"enabled"		"1"
 			"labelText"		"#Building_hud_sentry_not_built"
diff --git a/resource/ui/hudaccountpanel.res b/resource/ui/hudaccountpanel.res
index 90a831b..631a86d 100644
--- a/resource/ui/hudaccountpanel.res
+++ b/resource/ui/hudaccountpanel.res
@@ -86,8 +86,8 @@
 		"textAlignment"		"center"
 		"dulltext"			"0"
 		"brighttext"		"0"
-		"font"				"Cerbetica24"
-		"font_minmode"		"Cerbetica20"
+		"font"				"HudFontMedium"
+		"font_minmode"		"HudFontMediumSecondary"
 	}
 
 	"AccountValueShadow"
@@ -108,8 +108,8 @@
 		"textAlignment"		"center"
 		"dulltext"			"0"
 		"brighttext"		"0"
-		"font"				"Cerbetica24"
-		"font_minmode"		"Cerbetica20"
+		"font"				"HudFontMedium"
+		"font_minmode"		"HudFontMediumSecondary"
 		"fgcolor"			"TransparentBlack"
 
 		"pin_to_sibling"		"AccountValue"
diff --git a/resource/ui/hudachievementtrackeritem.res b/resource/ui/hudachievementtrackeritem.res
index 04e69c3..b0ef852 100644
--- a/resource/ui/hudachievementtrackeritem.res
+++ b/resource/ui/hudachievementtrackeritem.res
@@ -25,7 +25,7 @@
 		"tall"			"16"
 		"zpos"			"4"
 		"textinsetx"	"5"
-		"font"			"CerbeticaBold14"
+		"font"			"CerbeticaBold16"
 		"textAlignment"	"north-west"
 	}
 
@@ -51,7 +51,7 @@
 		"fieldName"		"AchievementDesc"
 		"labeltext"		""
 		"xpos"			"5"
-		"ypos"			"12"
+		"ypos"			"14"
 		"wide"			"190"
 		"tall"			"18"
 		"zpos"			"4"
diff --git a/resource/ui/huddamageaccount.res b/resource/ui/huddamageaccount.res
index 4200996..a999517 100644
--- a/resource/ui/huddamageaccount.res
+++ b/resource/ui/huddamageaccount.res
@@ -28,7 +28,7 @@
 		"enabled"			"1"
 		"labelText"			"%metal%"
 		"textAlignment"		"center"
-		"font"				"CerbeticaBold32"
+		"font"				"CerbeticaBold28"
 		"font_minmode"		"CerbeticaBold20"
 		"fgcolor"			"Last DamageHeal Info"
 	}
@@ -46,7 +46,7 @@
 		"enabled"			"1"
 		"labelText"			"%metal%"
 		"textAlignment"		"center"
-		"font"				"CerbeticaBold32"
+		"font"				"CerbeticaBold28"
 		"font_minmode"		"CerbeticaBold20"
 		"fgcolor"			"TransparentBlack"
 
diff --git a/resource/ui/huditemeffectmeter.res b/resource/ui/huditemeffectmeter.res
index 75c70d4..5fd6d8b 100644
--- a/resource/ui/huditemeffectmeter.res
+++ b/resource/ui/huditemeffectmeter.res
@@ -6,6 +6,7 @@
 		"visible"			"1"
 		"enabled"			"1"
 		"xpos"				"c-75"
+		"xpos_minmode"		"c-55"
 		"ypos"				"c103"
 		"ypos_minmode"		"c50"
 		"wide"				"180"
@@ -43,10 +44,10 @@
 		"fieldName"			"ItemEffectMeter"
 		"font"				"Default"
 		"xpos"				"0"
-		"xpos_minmode"		"10"
 		"ypos"				"0"
 		"zpos"				"2"
 		"wide"				"120"
+		"wide_minmode"		"110"
 		"tall"				"8"
 		"tall_minmode"		"5"
 		"autoResize"		"0"
diff --git a/resource/ui/hudkillstreaknotice.res b/resource/ui/hudkillstreaknotice.res
index f254922..cca6602 100644
--- a/resource/ui/hudkillstreaknotice.res
+++ b/resource/ui/hudkillstreaknotice.res
@@ -12,15 +12,15 @@
 		"autoResize"	"0"
 		"visible"		"1"
 		"enabled"		"1"
-		"PaintBackgroundType"	"0"
-		"bgcolor_override"		"HudBlack"
+		"PaintBackgroundType"	"2"
+		"bgcolor_override"		"TransparentBlack"
 	}
 
 	"SplashLabel"
 	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"SplashLabel"
-		"font_override"	"Cerbetica12"
+		"font"			"ScoreboardSmall"
 		"labelText"		""
 		"textAlignment" "center"
 		"xpos"			"c-250"
diff --git a/resource/ui/hudmannvsmachinestatus.res b/resource/ui/hudmannvsmachinestatus.res
index 831752d..d89c4a6 100644
--- a/resource/ui/hudmannvsmachinestatus.res
+++ b/resource/ui/hudmannvsmachinestatus.res
@@ -47,7 +47,7 @@
 	{
 		"ControlName"		"CCurrencyStatusPanel"
 		"fieldName"			"CurrencyStatusPanel"
-		"xpos"				"c-327"
+		"xpos"				"c-267"
 		"xpos_minmode"		"c-250"
 		"ypos"				"r114"
 		"ypos_minmode"		"r190"
@@ -61,7 +61,7 @@
 	{
 		"ControlName"		"CInWorldCurrencyStatus"
 		"fieldName"			"InWorldCurrencyPanel"
-		"xpos"				"c-327"
+		"xpos"				"c-267"
 		"xpos_minmode"		"c-250"
 		"ypos"				"r93"
 		"ypos_minmode"		"r168"
diff --git a/resource/ui/hudobjectiveflagpanel.res b/resource/ui/hudobjectiveflagpanel.res
index 2480861..f5961ac 100644
--- a/resource/ui/hudobjectiveflagpanel.res
+++ b/resource/ui/hudobjectiveflagpanel.res
@@ -98,7 +98,7 @@
 		"enabled"		"1"
 		"textAlignment"	"east"
 		"labelText"		"%bluescore%"
-		"font"			"Cerbetica40"
+		"font"			"CerbeticaBold40"
 		"fgcolor"		"TanLight"
 
 		"if_hybrid"
@@ -130,7 +130,7 @@
 		"enabled"		"1"
 		"textAlignment"	"east"
 		"labelText"		"%bluescore%"
-		"font"			"Cerbetica40"
+		"font"			"CerbeticaBold40"
 		"fgcolor"		"TransparentBlack"
 
 		"pin_to_sibling"		"BlueScore"
@@ -166,7 +166,7 @@
 		"enabled"		"1"
 		"textAlignment"	"west"
 		"labelText"		"%redscore%"
-		"font"			"Cerbetica40"
+		"font"			"CerbeticaBold40"
 		"fgcolor"		"TanLight"
 
 		"if_hybrid"
@@ -198,7 +198,7 @@
 		"enabled"		"1"
 		"textAlignment"	"west"
 		"labelText"		"%redscore%"
-		"font"			"Cerbetica40"
+		"font"			"CerbeticaBold40"
 		"fgcolor"		"TransparentBlack"
 
 		"pin_to_sibling"		"RedScore"
diff --git a/resource/ui/hudspellselection.res b/resource/ui/hudspellselection.res
index b7567c2..3e0693b 100644
--- a/resource/ui/hudspellselection.res
+++ b/resource/ui/hudspellselection.res
@@ -18,7 +18,7 @@
 	{
 		"ControlName"	"ImagePanel"
 		"fieldName"		"SpellIcon"
-		"xpos"			"0"
+		"xpos"			"25"
 		"ypos"			"0"
 		"zpos"			"7"
 		"wide"			"20"
@@ -69,10 +69,9 @@
 		"labelText"		"%counttext%"
 		"textAlignment" "center"
 		"xpos"			"0"
-		"ypos"			"22"
+		"ypos"			"0"
 		"zpos"			"1"
-		"xpos_minmode"	"0"
-		"ypos_minmode"	"20"
+		"xpos_minmode"	"5"
 		"wide"			"20"
 		"tall"			"20"
 		"fgcolor"		"TanLight"
diff --git a/resource/ui/itemrenameconfirmationdialog.res b/resource/ui/itemrenameconfirmationdialog.res
index ef39d95..9467969 100644
--- a/resource/ui/itemrenameconfirmationdialog.res
+++ b/resource/ui/itemrenameconfirmationdialog.res
@@ -6,10 +6,10 @@
 		"visible"				"1"
 		"enabled"				"1"
 		"xpos"					"c-200"
-		"ypos"					"105"
+		"ypos"					"c-200"
 		"wide"					"400"
 		"tall"					"240"
-		"bgcolor_override"		"DarkGrey"
+		"bgcolor_override"		"DarkerGrey"
 		"paintbackgroundtype"	"0"
 		"settitlebarvisible"	"0"
 		"border"				"CyanBorderThick"
@@ -19,7 +19,7 @@
 	{
 		"ControlName"		"CExLabel"
 		"fieldName"			"TitleLabel"
-		"font"				"HudFontSmallBold"
+		"font"				"HudFontSmall"
 		"labelText"			"dynamic"
 		"textAlignment"		"center"
 		"xpos"				"100"
@@ -60,8 +60,8 @@
 		"xpos"				"10"
 		"ypos"				"10"
 		"zpos"				"1"
-		"wide"				"200"
-		"tall"				"70"
+		"wide"				"84"
+		"tall"				"64"
 		"visible"			"1"
 		"bgcolor_override"	"Transparent"
 		"noitem_textcolor"	"TextColor"
@@ -109,8 +109,8 @@
 		"xpos"				"300"
 		"ypos"				"10"
 		"zpos"				"1"
-		"wide"				"90"
-		"tall"				"70"
+		"wide"				"84"
+		"tall"				"64"
 		"visible"			"1"
 		"bgcolor_override"	"Transparent"
 		"noitem_textcolor"	"TextColor"
@@ -203,7 +203,7 @@
 		"enabled"			"1"
 		"tabPosition"		"0"
 		"labelText"			"#Cancel"
-		"font"				"HudFontSmallBold"
+		"font"				"HudFontSmall"
 		"textAlignment"		"center"
 		"dulltext"			"0"
 		"brighttext"		"0"
@@ -228,7 +228,7 @@
 		"enabled"			"1"
 		"tabPosition"		"0"
 		"labelText"			"#CraftNameConfirm"
-		"font"				"HudFontSmallBold"
+		"font"				"HudFontSmall"
 		"textAlignment"		"center"
 		"dulltext"			"0"
 		"brighttext"		"0"
diff --git a/resource/ui/itemrenameinvaliddialog.res b/resource/ui/itemrenameinvaliddialog.res
index 9cc6cc1..3b14664 100644
--- a/resource/ui/itemrenameinvaliddialog.res
+++ b/resource/ui/itemrenameinvaliddialog.res
@@ -9,7 +9,7 @@
 		"ypos"				"105"
 		"wide"				"400"
 		"tall"				"240"
-		"bgcolor_override"	"DarkGrey"
+		"bgcolor_override"	"DarkerGrey"
 		"paintbackgroundtype"	"0"
 		"settitlebarvisible"	"0"
 		"border"				"CyanBorderThick"
@@ -19,7 +19,7 @@
 	{
 		"ControlName"		"CExLabel"
 		"fieldName"			"TitleLabel"
-		"font"				"HudFontSmallBold"
+		"font"				"HudFontSmall"
 		"labelText"			"dynamic"
 		"textAlignment"		"center"
 		"xpos"				"100"
@@ -155,7 +155,7 @@
 	{
 		"ControlName"		"CExLabel"
 		"fieldName"			"GivenName"
-		"font"				"HudFontMediumSecondary"
+		"font"				"HudFontSmall"
 		"labelText"			"%name%"
 		"textAlignment"		"center"
 		"xpos"				"20"
@@ -204,7 +204,7 @@
 		"enabled"			"1"
 		"tabPosition"		"0"
 		"labelText"			"#TF_OK"
-		"font"				"HudFontSmallBold"
+		"font"				"HudFontSmall"
 		"textAlignment"		"center"
 		"dulltext"			"0"
 		"brighttext"		"0"
diff --git a/resource/ui/itemselectionpanel.res b/resource/ui/itemselectionpanel.res
index 8a49381..32360a0 100644
--- a/resource/ui/itemselectionpanel.res
+++ b/resource/ui/itemselectionpanel.res
@@ -91,7 +91,7 @@
 	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"CaratLabel"
-		"font"			"Cerbetica16"
+		"font"			"HudFontMediumSmallSecondary"
 		"labelText"		">>"
 		"textAlignment"	"west"
 		"xpos"			"c-290"
@@ -127,7 +127,7 @@
 	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"NameFilterLabel"
-		"font"			"HudFontSmallestBold"
+		"font"			"HudFontSmallest"
 		"labelText"		"#Store_NameFilterLabel"
 		"textAlignment"	"west"
 		"xpos"			"c+175"
@@ -161,7 +161,7 @@
 		"editable"		"1"
 		"unicode"		"1"
 		"fgcolor_override"	"TanLight"
-		"bgcolor_override"	"15 15 15 255"
+		"bgcolor_override"	"DarkerGrey"
 		"paintbackgroundtype" "2"
 	}
 
@@ -218,11 +218,11 @@
 	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"NoItemsLabel"
-		"font"			"HudFontSmallBold"
+		"font"			"HudFontSmall"
 		"labelText"		"#NoItemsToEquip"
 		"textAlignment"	"center"
 		"xpos"			"c-300"
-		"ypos"			"120"
+		"ypos"			"150"
 		"zpos"			"10"
 		"wide"			"600"
 		"tall"			"30"
@@ -241,7 +241,7 @@
 		"ypos"			"400"
 		"zpos"			"2"
 		"wide"			"200"
-		"tall"			"25"
+		"tall"			"20"
 		"autoResize"	"0"
 		"pinCorner"		"2"
 		"visible"		"1"
@@ -262,10 +262,10 @@
 		"ControlName"	"CheckButton"
 		"fieldName"		"OnlyAllowUniqueQuality"
 		"labelText"		"#OnlyAllowUniqueQuality"
-		"font"			"HudFontSmallestBold"
+		"font"			"HudFontSmallest"
 		"textAlignment"	"east"
-		"xpos"			"c-291"
-		"ypos"			"320"
+		"xpos"			"c-306"
+		"ypos"			"288"
 		"zpos"			"1"
 		"wide"			"290"
 		"tall"			"25"
@@ -281,18 +281,18 @@
 	{
 		"ControlName"	"CExButton"
 		"fieldName"		"ShowBackpack"
-		"xpos"			"c-288"
+		"xpos"			"c-20"
 		"ypos"			"290"
 		"zpos"			"20"
 		"wide"			"200"
-		"tall"			"25"
+		"tall"			"20"
 		"autoResize"	"0"
 		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
 		"tabPosition"	"0"
 		"labelText"		"#Selection_ShowBackpack"
-		"font"			"HudFontSmallBold"
+		"font"			"HudFontSmall"
 		"textAlignment"	"center"
 		"textinsetx"	"50"
 		"dulltext"		"0"
@@ -305,18 +305,18 @@
 	{
 		"ControlName"	"CExButton"
 		"fieldName"		"ShowSelection"
-		"xpos"			"c-288"
+		"xpos"			"c-20"
 		"ypos"			"290"
 		"zpos"			"20"
 		"wide"			"200"
-		"tall"			"25"
+		"tall"			"20"
 		"autoResize"	"0"
 		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
 		"tabPosition"	"0"
 		"labelText"		"#Selection_ShowSelection"
-		"font"			"HudFontSmallBold"
+		"font"			"HudFontSmall"
 		"textAlignment"	"center"
 		"textinsetx"	"50"
 		"dulltext"		"0"
@@ -330,7 +330,7 @@
 	{
 		"ControlName"	"CExButton"
 		"fieldName"		"PrevPageButton"
-		"xpos"			"c205"
+		"xpos"			"c195"
 		"ypos"			"290"
 		"zpos"			"1"
 		"wide"			"20"
@@ -354,10 +354,10 @@
 	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"CurPageLabel"
-		"font"			"HudFontSmallBold"
+		"font"			"HudFontSmall"
 		"labelText"		"%backpackpage%"
 		"textAlignment"	"center"
-		"xpos"			"c230"
+		"xpos"			"c220"
 		"ypos"			"290"
 		"zpos"			"1"
 		"wide"			"40"
@@ -373,7 +373,7 @@
 	{
 		"ControlName"	"CExButton"
 		"fieldName"		"NextPageButton"
-		"xpos"			"c275"
+		"xpos"			"c265"
 		"ypos"			"290"
 		"zpos"			"1"
 		"wide"			"20"
@@ -407,6 +407,7 @@
 		"noitem_textcolor"		"TextColor"
 		"PaintBackgroundType"	"2"
 		"paintborder"			"1"
+		"paintbackground"		"0"
 
 		"text_ypos"			"20"
 		"text_center"		"1"
diff --git a/resource/ui/matchmakingdashboardcasualcriteria.res b/resource/ui/matchmakingdashboardcasualcriteria.res
index 64ec02d..0d17296 100644
--- a/resource/ui/matchmakingdashboardcasualcriteria.res
+++ b/resource/ui/matchmakingdashboardcasualcriteria.res
@@ -26,7 +26,7 @@
 		"proportionaltoparent"	"1"
 		"labeltext"				"#TF_Matchmaking_HeaderCasual"
 		"textAlignment"			"center"
-		"font"					"CerbeticaBold24"
+		"font"					"HudFontMediumSecondary"
 		"fgcolor_override"		"White"
 		"mouseinputenabled"		"0"
 	}
diff --git a/resource/ui/matchmakingdashboardcomp.res b/resource/ui/matchmakingdashboardcomp.res
index 7f412f3..6481e27 100644
--- a/resource/ui/matchmakingdashboardcomp.res
+++ b/resource/ui/matchmakingdashboardcomp.res
@@ -26,7 +26,7 @@
 		"proportionaltoparent"	"1"
 		"labeltext"		"#TF_Matchmaking_HeaderCompetitive"
 		"textAlignment"	"center"
-		"font"			"CerbeticaBold24"
+		"font"			"HudFontMediumSecondary"
 		"fgcolor_override"	"White"
 		"bgcolor_override"	"DarkGrey"
 		"mouseinputenabled"	"0"
diff --git a/resource/ui/matchmakingdashboardplaylist.res b/resource/ui/matchmakingdashboardplaylist.res
index 30a1c2c..0ae80d6 100644
--- a/resource/ui/matchmakingdashboardplaylist.res
+++ b/resource/ui/matchmakingdashboardplaylist.res
@@ -26,7 +26,7 @@
 		"proportionaltoparent"	"1"
 		"labeltext"				"#TF_Matchmaking_HeaderModeSelect"
 		"textAlignment"			"center"
-		"font"					"CerbeticaBold24"
+		"font"					"HudFontMediumSecondary"
 		"fgcolor_override"		"White"
 		"mouseinputenabled"		"0"
 	}
diff --git a/resource/ui/matchmakingdashboardpopup_newmatch.res b/resource/ui/matchmakingdashboardpopup_newmatch.res
index 23a8c44..59b3da4 100644
--- a/resource/ui/matchmakingdashboardpopup_newmatch.res
+++ b/resource/ui/matchmakingdashboardpopup_newmatch.res
@@ -74,7 +74,7 @@
 
 				"fonts"
 				{
-					"0"		"CerbeticaBold12"
+					"0"		"HudFontSmallest"
 					"1"		"StorePromotionsTitle"
 					"2"		"FontStorePrice"
 				}
@@ -113,7 +113,7 @@
 				"visible"		"1"
 				"enabled"		"1"
 				"tabPosition"	"0"
-				"font"			"CerbeticaBold12"
+				"font"			"HudFontSmallest"
 				"textAlignment"	"center"
 				"dulltext"		"0"
 				"brighttext"	"0"
@@ -150,7 +150,7 @@
 				"visible"		"1"
 				"enabled"		"1"
 				"tabPosition"	"0"
-				"font"			"CerbeticaBold12"
+				"font"			"HudFontSmallest"
 				"textAlignment"	"center"
 				"dulltext"		"0"
 				"brighttext"	"0"
@@ -180,7 +180,7 @@
 				"visible"		"1"
 				"enabled"		"1"
 				"tabPosition"	"0"
-				"font"			"CerbeticaBold12"
+				"font"			"HudFontSmallest"
 				"textAlignment"	"center"
 				"dulltext"		"0"
 				"brighttext"	"0"
@@ -206,7 +206,7 @@
 				"tall"			"20"
 				"visible"		"1"
 				"enabled"		"1"
-				"font"			"CerbeticaBold12"
+				"font"			"HudFontSmallest"
 				"fgcolor_override"	"TanLight"
 				"textAlignment"	"east"
 				"labelText"		"#TF_Matchmaking_RollingQueue_MatchReadyJoining"
diff --git a/resource/ui/objectivestatusescort.res b/resource/ui/objectivestatusescort.res
index c88eb19..8187b87 100644
--- a/resource/ui/objectivestatusescort.res
+++ b/resource/ui/objectivestatusescort.res
@@ -430,9 +430,9 @@
 		{
 			"ControlName"	"CExLabel"
 			"fieldName"		"CapNumPlayers"
-			"font"			"Cerbetica8"
-			"xpos"			"31"
-			"ypos"			"78"
+			"font"			"CapPlayerFontSmall"
+			"xpos"			"32"
+			"ypos"			"79"
 			"zpos"			"5"
 			"wide"			"15"
 			"tall"			"8"
diff --git a/resource/ui/publishfiledialog.res b/resource/ui/publishfiledialog.res
index 8b3f8b0..20f8970 100644
--- a/resource/ui/publishfiledialog.res
+++ b/resource/ui/publishfiledialog.res
@@ -83,7 +83,7 @@
 		"dulltext"			"0"
 		"brighttext"		"0"
 		"wrap"				"0"
-		"font"				"CerbeticaBold22"
+		"font"				"Cerbetica22"
 	}
 
 	"LabelPreview"
@@ -104,7 +104,7 @@
 		"dulltext"			"0"
 		"brighttext"		"0"
 		"wrap"				"0"
-		"font"				"CerbeticaBold15"
+		"font"				"Cerbetica14"
 	}
 
 	"PreviewImageBorder"
@@ -197,7 +197,7 @@
 		"dulltext"			"0"
 		"brighttext"		"0"
 		"wrap"				"0"
-		"font"				"CerbeticaBold15"
+		"font"				"Cerbetica14"
 	}
 
 	"FileTitle"
@@ -221,7 +221,7 @@
 		"fgcolor_override"	"0 0 0 255"
 		"bgcolor_override"	"235 226 202 255"
 		"paintbackgroundtype"	"2"
-		"font"					"CerbeticaBold15"
+		"font"					"Cerbetica14"
 	}
 
 	"LabelDesc"
@@ -242,7 +242,7 @@
 		"dulltext"			"0"
 		"brighttext"		"0"
 		"wrap"				"0"
-		"font"				"CerbeticaBold15"
+		"font"				"Cerbetica14"
 	}
 	"FileDesc"
 	{
@@ -251,7 +251,7 @@
 		"xpos"				"175"
 		"ypos"				"120"
 		"wide"				"250"
-		"tall"				"125"
+		"tall"				"185"
 		"autoResize"		"0"
 		"pinCorner"			"0"
 		"visible"			"1"
@@ -265,15 +265,15 @@
 		"fgcolor_override"	"0 0 0 255"
 		"bgcolor_override"	"235 226 202 255"
 		"paintbackgroundtype"	"2"
-		"font"					"CerbeticaBold15"
+		"font"					"Cerbetica14"
 	}
 
 	"LabelSourceFile"
 	{
 		"ControlName"		"Label"
 		"fieldName"			"LabelSourceFile"
-		"xpos"				"175"
-		"ypos"				"250"
+		"xpos"				"185"
+		"ypos"				"310"
 		"wide"				"250"
 		"tall"				"25"
 		"autoResize"		"0"
@@ -286,7 +286,7 @@
 		"dulltext"			"0"
 		"brighttext"		"0"
 		"wrap"				"0"
-		"font"				"CerbeticaBold15"
+		"font"				"Cerbetica14"
 	}
 
 	"SourceFile"
@@ -308,16 +308,16 @@
 		"maxchars"			"256"
 		"NumericInputOnly"	"0"
 		"unicode"			"0"
-		"font"				"CerbeticaBold15"
+		"font"				"Cerbetica14"
 	}
 
 	"ButtonSourceCosmetics"
 	{
 		"ControlName"		"CExImageButton"
 		"fieldName"			"ButtonSourceCosmetics"
-		"xpos"				"85"
-		"ypos"				"275"
-		"wide"				"140"
+		"xpos"				"15"
+		"ypos"				"250"
+		"wide"				"150"
 		"tall"				"25"
 		"autoResize"		"0"
 		"pinCorner"			"0"
@@ -351,9 +351,9 @@
 	{
 		"ControlName"		"Button"
 		"fieldName"			"ButtonSourceOther"
-		"xpos"				"230"
-		"ypos"				"275"
-		"wide"				"140"
+		"xpos"				"15"
+		"ypos"				"280"
+		"wide"				"150"
 		"tall"				"25"
 		"autoResize"		"0"
 		"pinCorner"			"0"
@@ -374,9 +374,9 @@
 	{
 		"ControlName"		"CExImageButton"
 		"fieldName"			"ButtonSourceMaps"
-		"xpos"				"375"
-		"ypos"				"275"
-		"wide"				"140"
+		"xpos"				"15"
+		"ypos"				"310"
+		"wide"				"150"
 		"tall"				"25"
 		"autoResize"		"0"
 		"pinCorner"			"0"
@@ -410,8 +410,8 @@
 	{
 		"ControlName"		"Label"
 		"fieldName"			"BrowseDescription"
-		"xpos"				"175"
-		"ypos"				"300"
+		"xpos"				"330"
+		"ypos"				"0"
 		"wide"				"270"
 		"tall"				"55"
 		"autoResize"		"0"
@@ -420,12 +420,12 @@
 		"enabled"			"1"
 		"tabPosition"		"0"
 		"labelText"			"#TF_PublishFile_BrowseDesc"
-		"textAlignment"		"center"
+		"textAlignment"		"east"
 		"dulltext"			"0"
 		"brighttext"		"0"
 		"wrap"				"1"
 		"font"				"HudFontSmallest"
-		"fgcolor_override"	"TanDark"
+		"fgcolor_override"	"TanLight"
 	}
 
 	"TagsTitle"
diff --git a/resource/ui/pvprankpanel.res b/resource/ui/pvprankpanel.res
index 0aa807d..b76491c 100644
--- a/resource/ui/pvprankpanel.res
+++ b/resource/ui/pvprankpanel.res
@@ -87,7 +87,7 @@
 
 				if_mini
 				{
-					"origin_x"		"55"
+					"origin_x"		"70"
 				}
 
 				"animation"
diff --git a/resource/ui/replaybrowser/mainpanel.res b/resource/ui/replaybrowser/mainpanel.res
index 6219a23..a88c053 100644
--- a/resource/ui/replaybrowser/mainpanel.res
+++ b/resource/ui/replaybrowser/mainpanel.res
@@ -150,11 +150,11 @@
 	{
 		"ControlName"	"CExButton"
 		"fieldName"		"BackButton"
-		"xpos"			"c-295"
+		"xpos"			"c-288"
 		"ypos"			"437"
 		"zpos"			"2"
 		"wide"			"100"
-		"tall"			"25"
+		"tall"			"20"
 		"autoResize"	"0"
 		"pinCorner"		"3"
 		"visible"		"1"
diff --git a/resource/ui/spectatorguihealth.res b/resource/ui/spectatorguihealth.res
index 7966917..e2aabd6 100644
--- a/resource/ui/spectatorguihealth.res
+++ b/resource/ui/spectatorguihealth.res
@@ -31,11 +31,11 @@
 	{
 		"ControlName"	"ImagePanel"
 		"fieldName"		"PlayerStatusHealthBonusImage"
-		"xpos"			"11"
-		"ypos"			"13"
+		"xpos"			"13"
+		"ypos"			"15"
 		"zpos"			"3"
-		"wide"			"22"
-		"tall"			"23"
+		"wide"			"18"
+		"tall"			"19"
 		"visible"		"0"
 		"enabled"		"1"
 		"image"			"../hud/health_over_bg"
@@ -47,15 +47,15 @@
 		"ControlName"	"CExLabel"
 		"fieldName"		"GuiPlayerHealth"
 		"xpos"			"2"
-		"ypos"			"19"
+		"ypos"			"16"
 		"zpos"			"5"
 		"wide"			"40"
-		"tall"			"10"
+		"tall"			"15"
 		"visible"		"1"
 		"enabled"		"1"
 		"labelText"		"%Health%"
 		"textAlignment"	"center"
-		"font"			"CerbeticaBold16"
+		"font"			"CerbeticaBold18"
 		"fgcolor"		"Health Normal"
 	}
 
@@ -64,15 +64,15 @@
 		"ControlName"	"CExLabel"
 		"fieldName"		"GuiPlayerHealthShadow"
 		"xpos"			"-1"
-		"ypos"			"-1"
+		"ypos"			"-2"
 		"zpos"			"5"
 		"wide"			"40"
-		"tall"			"10"
+		"tall"			"15"
 		"visible"		"1"
 		"enabled"		"1"
 		"labelText"		"%Health%"
 		"textAlignment"	"center"
-		"font"			"CerbeticaBold16"
+		"font"			"CerbeticaBold18"
 		"fgcolor"		"TransparentBlack"
 
 		"pin_to_sibling"		"GuiPlayerHealth"
diff --git a/resource/ui/stampdonationadd.res b/resource/ui/stampdonationadd.res
index c2b422f..445cad8 100644
--- a/resource/ui/stampdonationadd.res
+++ b/resource/ui/stampdonationadd.res
@@ -17,7 +17,7 @@
 		"PaintBackgroundType"	"0"
 		"paintbackground"		"1"
 		"paintborder"			"1"
-		"border"				"CyanBorderThick"
+		"border"				"CyanBorder"
 		"bgcolor_override"		"DarkGrey"
 	}
 
@@ -116,7 +116,7 @@
 		"ControlName"		"CExButton"
 		"fieldName"			"Nope"
 		"xpos"				"40"
-		"ypos"				"210"
+		"ypos"				"214"
 		"zpos"				"20"
 		"wide"				"175"
 		"tall"				"25"
diff --git a/resource/ui/steamworkshopdialog.res b/resource/ui/steamworkshopdialog.res
index c17184b..09c1959 100644
--- a/resource/ui/steamworkshopdialog.res
+++ b/resource/ui/steamworkshopdialog.res
@@ -95,13 +95,13 @@
 			"tabPosition"	"0"
 			"PaintBackgroundType"	"0"
 			"paintbackground"		"1"
-			"border"				"CyanBorderThick"
+			"border"				"NoBorder"
 
 			"TitleLabel"
 			{
 				"ControlName"	"CExLabel"
 				"fieldName"		"TitleLabel"
-				"font"			"HudFontMediumBold"
+				"font"			"Cerbetica22"
 				"labelText"		"#TF_SteamWorkshop_Title"
 				"textAlignment"	"center"
 				"xpos"			"0"
@@ -151,11 +151,13 @@
 				"enabled"		"1"
 				"tabPosition"	"0"
 				"labelText"		"#TF_SteamWorkshop_LearnHow"
-				"font"			"HudFontSmallBold"
+				"font"			"Cerbetica12"
 				"textAlignment"	"center"
 				"Command"		"learn_more"
 				"sound_depressed"	"UI/buttonclick.wav"
 				"sound_released"	"UI/buttonclickrelease.wav"
+				"border_default"	"NoBorder"
+				"border_armed"		"NoBorder"
 			}
 		}
 
@@ -174,8 +176,9 @@
 			"enabled"		"1"
 			"tabPosition"	"0"
 			"PaintBackgroundType"	"0"
-			"paintbackground"		"1"
-			"border"				"MainMenuHighlightBorder"
+			"paintbackground"		"0"
+			"paintborder"			"0"
+			"border"				"NoBorder"
 
 			"TitleLabel"
 			{
@@ -193,7 +196,7 @@
 				"pinCorner"		"0"
 				"visible"		"1"
 				"enabled"		"1"
-				"fgcolor_override" "Black"
+				"fgcolor_override" "TanLight"
 			}
 
 			"SteamWorkshopItem0"
@@ -258,8 +261,8 @@
 				"visible"		"1"
 				"enabled"		"1"
 				"tabPosition"	"0"
-				"labelText"		"&A"
-				"font"			"MenuArrows"
+				"labelText"		"<"
+				"font"			"Cerbetica12"
 				"textAlignment"	"center"
 				"dulltext"		"0"
 				"brighttext"	"0"
@@ -272,7 +275,7 @@
 			{
 				"ControlName"	"CExLabel"
 				"fieldName"		"CurPageLabel"
-				"font"			"HudFontSmallBold"
+				"font"			"Cerbetica12"
 				"labelText"		"%page%"
 				"textAlignment"	"center"
 				"xpos"			"460"
@@ -284,7 +287,7 @@
 				"pinCorner"		"0"
 				"visible"		"1"
 				"enabled"		"1"
-				"fgcolor_override" "Black"
+				"fgcolor_override" "ColorCyan"
 			}
 
 			"NextPageButton"
@@ -301,8 +304,8 @@
 				"visible"		"1"
 				"enabled"		"1"
 				"tabPosition"	"0"
-				"labelText"		"&D"
-				"font"			"MenuArrows"
+				"labelText"		">"
+				"font"			"Cerbetica12"
 				"textAlignment"	"center"
 				"dulltext"		"0"
 				"brighttext"	"0"
@@ -326,7 +329,7 @@
 				"enabled"		"1"
 				"tabPosition"	"0"
 				"labelText"		"#TF_SteamWorkshop_ViewPublished"
-				"font"			"HudFontSmallBold"
+				"font"			"Cerbetica12"
 				"textAlignment"	"center"
 				"textinsetx"	"50"
 				"dulltext"		"0"
@@ -334,6 +337,7 @@
 				"Command"		"view_files"
 				"sound_depressed"	"UI/buttonclick.wav"
 				"sound_released"	"UI/buttonclickrelease.wav"
+				"border_default"	"NoBorder"
 			}
 
 			"EditButton"
@@ -351,7 +355,7 @@
 				"tabPosition"	"0"
 				"textinsetx"	"25"
 				"use_proportional_insets" "1"
-				"font"			"HudFontSmallBold"
+				"font"			"Cerbetica12"
 				"textAlignment"	"west"
 				"dulltext"		"0"
 				"brighttext"	"0"
@@ -360,6 +364,7 @@
 				"sound_released"	"UI/buttonclickrelease.wav"
 				"labelText"			"#TF_SteamWorkshop_Edit"
 				"command"			"edit"
+				"border_default"	"NoBorder"
 
 				"image_drawcolor"		"TanLight"
 				"image_disabledcolor"	"ColorBlack"
@@ -395,7 +400,7 @@
 				"tabPosition"	"0"
 				"textinsetx"	"25"
 				"use_proportional_insets" "1"
-				"font"			"HudFontSmallBold"
+				"font"			"Cerbetica12"
 				"textAlignment"	"west"
 				"dulltext"		"0"
 				"brighttext"	"0"
@@ -404,6 +409,7 @@
 				"sound_released"	"UI/buttonclickrelease.wav"
 				"labelText"			"#TF_SteamWorkshop_View"
 				"command"			"view"
+				"border_default"	"NoBorder"
 
 				"image_drawcolor"		"TanLight"
 				"image_disabledcolor" 	"ColorBlack"
@@ -439,7 +445,7 @@
 				"tabPosition"	"0"
 				"textinsetx"	"25"
 				"use_proportional_insets" "1"
-				"font"			"HudFontSmallBold"
+				"font"			"Cerbetica12"
 				"textAlignment"	"west"
 				"dulltext"		"0"
 				"brighttext"	"0"
@@ -448,6 +454,7 @@
 				"sound_released"	"UI/buttonclickrelease.wav"
 				"labelText"			"#TF_SteamWorkshop_Delete"
 				"command"			"delete_item"
+				"border_default"	"NoBorder"
 
 				"image_drawcolor"		"TanLight"
 				"image_disabledcolor"	"ColorBlack"
@@ -484,11 +491,12 @@
 			"enabled"		"1"
 			"tabPosition"	"0"
 			"labelText"		"#TF_SteamWorkshop_BrowseTheWorkshop"
-			"font"			"HudFontSmallestBold"
+			"font"			"Cerbetica12"
 			"textAlignment"	"center"
 			"Command"		"browse"
 			"sound_depressed"	"UI/buttonclick.wav"
 			"sound_released"	"UI/buttonclickrelease.wav"
+			"border_default"	"NoBorder"
 		}
 
 		"LoadTestMapButton"
@@ -506,11 +514,12 @@
 			"enabled"		"1"
 			"tabPosition"	"0"
 			"labelText"		"#TF_SteamWorkshop_Test"
-			"font"			"HudFontSmallBold"
+			"font"			"Cerbetica12"
 			"textAlignment"	"center"
 			"Command"		"itemtest"
 			"sound_depressed"	"UI/buttonclick.wav"
 			"sound_released"	"UI/buttonclickrelease.wav"
+			"border_default"	"NoBorder"
 		}
 
 		"PublishButton"
@@ -528,11 +537,12 @@
 			"enabled"		"1"
 			"tabPosition"	"0"
 			"labelText"		"#TF_SteamWorkshop_Publish"
-			"font"			"HudFontSmallBold"
+			"font"			"Cerbetica12"
 			"textAlignment"	"center"
 			"Command"		"publish"
 			"sound_depressed"	"UI/buttonclick.wav"
 			"sound_released"	"UI/buttonclickrelease.wav"
+			"border_default"	"NoBorder"
 		}
 
 		"LearnMore2Button"
@@ -550,11 +560,12 @@
 			"enabled"		"1"
 			"tabPosition"	"0"
 			"labelText"		"#TF_SteamWorkshop_Instructions"
-			"font"			"HudFontSmallBold"
+			"font"			"Cerbetica12"
 			"textAlignment"	"center"
 			"Command"		"learn_more"
 			"sound_depressed"	"UI/buttonclick.wav"
 			"sound_released"	"UI/buttonclickrelease.wav"
+			"border_default"	"NoBorder"
 		}
 
 		"ViewLegalAgreementButton"
@@ -572,7 +583,7 @@
 			"enabled"		"1"
 			"tabPosition"	"0"
 			"labelText"		"#TF_SteamWorkshop_Legal"
-			"font"			"HudFontSmallBold"
+			"font"			"Cerbetica12"
 			"textAlignment"	"center"
 			"textinsetx"	"50"
 			"dulltext"		"0"
@@ -580,6 +591,7 @@
 			"Command"		"view_legal_agreement"
 			"sound_depressed"	"UI/buttonclick.wav"
 			"sound_released"	"UI/buttonclickrelease.wav"
+			"border_default"	"NoBorder"
 		}
 
 		"CancelButton"
@@ -597,7 +609,7 @@
 			"enabled"		"1"
 			"tabPosition"	"0"
 			"labelText"		"#Store_CANCEL"
-			"font"			"HudFontSmallBold"
+			"font"			"Cerbetica12"
 			"textAlignment"	"center"
 			"textinsetx"	"50"
 			"dulltext"		"0"
@@ -605,6 +617,7 @@
 			"Command"		"cancel"
 			"sound_depressed"	"UI/buttonclick.wav"
 			"sound_released"	"UI/buttonclickrelease.wav"
+			"border_default"	"NoBorder"
 		}
 	}
 }
\ No newline at end of file
diff --git a/resource/ui/streamlistpanel.res b/resource/ui/streamlistpanel.res
index 89f978b..beddbe1 100644
--- a/resource/ui/streamlistpanel.res
+++ b/resource/ui/streamlistpanel.res
@@ -36,10 +36,10 @@
 		"ControlName"	"CExImageButton"
 		"fieldName"		"CloseButton"
 		"xpos"			"282"
-		"ypos"			"4"
+		"ypos"			"6"
 		"zpos"			"10"
-		"wide"			"14"
-		"tall"			"14"
+		"wide"			"12"
+		"tall"			"12"
 		"autoResize"	"0"
 		"pinCorner"		"0"
 		"visible"		"1"
@@ -74,8 +74,8 @@
 			"xpos"			"0"
 			"ypos"			"0"
 			"zpos"			"1"
-			"wide"			"14"
-			"tall"			"14"
+			"wide"			"12"
+			"tall"			"12"
 			"visible"		"1"
 			"enabled"		"1"
 			"image"			"replay/thumbnails/close"
diff --git a/resource/ui/streampanel.res b/resource/ui/streampanel.res
index db7ec24..71d284f 100644
--- a/resource/ui/streampanel.res
+++ b/resource/ui/streampanel.res
@@ -85,6 +85,7 @@
 		"textAlignment"	"west"
 		"xpos"			"90"
 		"ypos"			"5"
+		"zpos"			"3"
 		"wide"			"205"
 		"tall"			"12"
 		"autoResize"	"0"
@@ -103,6 +104,7 @@
 		"textAlignment"	"north-west"
 		"xpos"			"90"
 		"ypos"			"18"
+		"zpos"			"3"
 		"wide"			"205"
 		"tall"			"12"
 		"autoResize"	"0"
diff --git a/resource/ui/targetid.res b/resource/ui/targetid.res
index af5ba4b..9c79d31 100644
--- a/resource/ui/targetid.res
+++ b/resource/ui/targetid.res
@@ -8,27 +8,12 @@
 		"ypos"				"29"
 		"zpos"				"6"
 		"wide"				"600"
-		"tall"				"14"
+		"tall"				"19"
 		"visible"			"1"
 		"enabled"			"1"
 		"fillcolor"			"TransparentBlack"
 	}
 
-	"TargetBackground2"
-	{
-		"ControlName"		"ImagePanel"
-		"fieldName"			"TargetBackground2"
-		"xpos" 				"0"
-		"ypos" 				"15"
-		"zpos" 				"6"
-		"wide" 				"600"
-		"tall" 				"15"
-		"autoResize"		"0"
-		"pinCorner"			"0"
-		"visible" 			"1"
-		"enabled" 			"1"
-	}
-
 	"TargetIDBG"
 	{
 		"ControlName"		"CTFImagePanel"
@@ -55,18 +40,13 @@
 		"ControlName"		"ImagePanel"
 		"fieldName"			"TargetIDBG_Spec_Blue"
 		"xpos"				"0"
-		"ypos"				"43"
-		"zpos"				"6"
-		"wide"				"252"
-		"tall"	 			"10"
+		"ypos"				"47"
+		"zpos"				"0"
+		"wide"				"5"
+		"tall"	 			"5"
 		"visible"			"0"
 		"enabled"			"1"
-		"fillcolor"			"0 28 162 255"
-
-		"src_corner_height"		"23"
-		"src_corner_width"		"23"
-		"draw_corner_width"		"0"
-		"draw_corner_height" 	"0"
+		"fillcolor"			"72 112 125 255"
 	}
 
 	"TargetIDBG_Spec_Red"
@@ -74,30 +54,25 @@
 		"ControlName"		"ImagePanel"
 		"fieldName"			"TargetIDBG_Spec_Red"
 		"xpos"				"0"
-		"ypos"				"43"
-		"zpos"				"6"
-		"wide"				"252"
-		"tall"	 			"10"
+		"ypos"				"47"
+		"zpos"				"0"
+		"wide"				"5"
+		"tall"	 			"5"
 		"visible"			"0"
 		"enabled"			"1"
-		"fillcolor"			"192 28 0 255"
-
-		"src_corner_height"		"23"
-		"src_corner_width"		"23"
-		"draw_corner_width"		"0"
-		"draw_corner_height"	"0"
+		"fillcolor"			"158 64 61 255"
 	}
 
 	"TargetNameLabel"
 	{
 		"ControlName"		"Label"
 		"fieldName"			"TargetNameLabel"
-		"font"				"Cerbetica14"
+		"font"				"HudFontMediumSmall"
 		"xpos"				"45"
-		"ypos"				"28"
+		"ypos"				"29"
 		"zpos"				"7"
 		"wide"				"300"
-		"tall"				"15"
+		"tall"				"19"
 		"visible"			"1"
 		"enabled"			"1"
 		"labelText"			"%targetname%"
@@ -108,12 +83,12 @@
 	{
 		"ControlName"		"Label"
 		"fieldName"			"TargetNameLabelShadow"
-		"font"				"Cerbetica14"
+		"font"				"HudFontMediumSmall"
 		"xpos"				"-1"
 		"ypos"				"-1"
 		"zpos"				"1"
 		"wide"				"300"
-		"tall"				"15"
+		"tall"				"19"
 		"visible"			"1"
 		"enabled"			"1"
 		"labelText"			"%targetname%"
@@ -129,7 +104,7 @@
 	{
 		"ControlName"		"Label"
 		"fieldName"			"TargetDataLabel"
-		"font"				"Cerbetica12"
+		"font"				"HudFontSmall"
 		"xpos"				"15"
 		"ypos"				"15"
 		"zpos"				"6"
@@ -146,7 +121,7 @@
 		"ControlName"		"EditablePanel"
 		"fieldName"			"SpectatorGUIHealth"
 		"xpos"				"-2"
-		"ypos"				"12"
+		"ypos"				"14"
 		"zpos"				"10"
 		"wide"				"38"
 		"tall"				"42"
diff --git a/resource/ui/votehud.res b/resource/ui/votehud.res
index a14dad3..c59599a 100644
--- a/resource/ui/votehud.res
+++ b/resource/ui/votehud.res
@@ -10,8 +10,10 @@
 		"tall"				"67"
 		"visible"			"0"
 		"enabled"			"1"
+		"paintborder"		"1"
 		"border"			"CyanBorderThick"
 		"bgcolor_override"	"DarkGrey"
+		"PaintBackgroundType"	"2"
 
 		"PassedIcon"
 		{
@@ -77,8 +79,10 @@
 		"tall"				"144"
 		"visible"			"0"
 		"enabled"			"1"
+		"paintborder"		"1"
 		"border"			"CyanBorderThick"
 		"bgcolor_override"	"DarkGrey"
+		"PaintBackgroundType"	"2"
 
 		"Header"
 		{
@@ -105,7 +109,7 @@
 			"fieldName"			"Issue"
 			"xpos"				"10"
 			"ypos"				"22"
-			"wide"				"120"
+			"wide"				"130"
 			"tall"				"40"
 			"visible"			"1"
 			"enabled"			"1"
@@ -406,8 +410,10 @@
 		"tall"				"67"
 		"visible"			"0"
 		"enabled"			"1"
+		"paintborder"		"1"
 		"border"			"CyanBorderThick"
 		"bgcolor_override"	"DarkGrey"
+		"PaintBackgroundType"	"2"
 
 		"FailedIcon"
 		{
@@ -473,8 +479,10 @@
 		"tall"				"67"
 		"visible"			"0"
 		"enabled"			"1"
+		"paintborder"		"1"
 		"border"			"CyanBorderThick"
 		"bgcolor_override"	"DarkGrey"
+		"PaintBackgroundType"	"2"
 
 		"FailedIcon"
 		{
@@ -543,9 +551,11 @@
 		"enabled"			"1"
 		"tabPosition"		"0"
 		"settitlebarvisible"	"0"
+		"paintborder"			"1"
 		"border"				"CyanBorderThick"
 		"bgcolor_override"		"DarkGrey"
 		"PaintBackground"		"1"
+		"PaintBackgroundType"	"2"
 
 		"header_font"				"ItemFontNameLarge"
 		"header_fgcolor"			"Orange"
diff --git a/resource/ui/wavestatuspanel.res b/resource/ui/wavestatuspanel.res
index e1a1df9..f46e55f 100644
--- a/resource/ui/wavestatuspanel.res
+++ b/resource/ui/wavestatuspanel.res
@@ -25,7 +25,7 @@
 	{
 		"ControlName"		"CExLabel"
 		"fieldName"			"WaveCountLabel"
-		"font"				"CerbeticaBold16"
+		"font"				"CerbeticaBold14"
 		"fgcolor"			"TanLight"
 		"xpos"				"140"
 		"ypos"				"15"
@@ -43,7 +43,7 @@
 	{
 		"ControlName"		"CExLabel"
 		"fieldName"			"WaveCountLabelShadow"
-		"font"				"CerbeticaBold16"
+		"font"				"CerbeticaBold14"
 		"fgcolor"			"TransparentBlack"
 		"xpos"				"-1"
 		"ypos"				"-1"
diff --git a/resource/ui/winpanel.res b/resource/ui/winpanel.res
index b06b977..e9314a6 100644
--- a/resource/ui/winpanel.res
+++ b/resource/ui/winpanel.res
@@ -195,12 +195,12 @@
 	{
 		"ControlName"	"EditablePanel"
 		"fieldName"		"WinPanelBGBorder"
-		"xpos"			"9999"
-		"ypos"			"9999"
+		"xpos"			"cs-0.5"
+		"ypos"			"70"
 		"zpos"			"0"
-		"wide"			"500"
-		"tall"			"80"
-		"visible"		"1"
+		"wide"			"p0.94"
+		"tall"			"185"
+		"visible"		"0"
 		"enabled"		"1"
 		"scaleImage"	"1"
 		"border"		"TFFatLineBorderBlueBG"
@@ -218,7 +218,7 @@
 		"visible"		"1"
 		"enabled"		"1"
 		"paintborder"	"0"
-		"bgcolor_override"		"0 0 0 250"
+		"bgcolor_override"		"TransparentBlack"
 		"PaintBackgroundType"	"2"
 	}
 	"WinningTeamLabel"