Changed main menu background, see notes.

- Changed the background to classic rayshud.
- Updated the killer panel, class select, achievement tracker and more?
- Visual tweaks and inconsistency fixes.
- Expanded the size allocated to the player list in the match hud.

29 files changed, 308 insertions, 376 deletions

diff --git a/resource/chatscheme.res b/resource/chatscheme.res
index 1173f43..b8bb736 100644
--- a/resource/chatscheme.res
+++ b/resource/chatscheme.res
@@ -5,32 +5,23 @@ Scheme
 	// this is a list of all the colors used by the scheme
 	Colors
 	{
-		"TFDarkBrown"               		"60 56 53 255"
-		"TFDarkBrownTransparent"    		"60 56 53 190"
-		"TFTanBright"               		"236 227 203 150"
-		"TFTanLight"                		"201 188 162 150"
-		"TFTanMedium"               		"131 121 104 150"
-		"TFTanLightBright"          		"229 223 211 90"
-		"TFTanLightDark"            		"96 90 78 90"
-		"TFOrangeBright"            		"156 82 33 255"
-		"TFTextBright"             			"251 236 203 150"
-		"TFTextLight"						"201 188 162 255"
-		"TFTextMedium"						"131 121 104 255"
-		"TFTextMediumDark"					"104 96 83 255"
-		"TFTextBlack"						"42 39 37 255"
-		"TFTextDull"						"131 121 104 255"
-		"TFMediumBrown"						"69 64 58 255"
-		"QuickListBGDeselected"				"69 64 58 255"
-		"QuickListBGSelected"				"131 121 104 150"
-		"Blank"								"0 0 0 0"
-		"White"								"255 255 255 255"
-		"ControlBG"							"76 88 68 255"
-		"ControlDarkBG"						"90 106 80 255"
-		"WindowBG"							"62 70 55 255"
-		"SelectionBG"						"90 84 75 255"
-		"SelectionBG2"						"69 64 57 255"
-		"ListBG"							"39 36 34 0"
-		"Green"								"63 185 73 255"
+		// base colors
+		"White"				"255 255 255 255"
+		"OffWhite"			"216 216 216 255"
+		"DullWhite"			"142 142 142 255"
+		"Orange"			"156 82 33 255"
+		"TransparentBlack"	"0 0 0 128"
+		"Black"				"0 0 0 255"
+		"Green"				"63 185 73 255"
+		"Blank"				"0 0 0 0"
+		
+		"DarkBrown"			"60 56 53 255"
+		"TanBright"			"236 227 203 150"
+		"TanLight"			"201 188 162 150"
+		"TanDark"			"96 90 78 90"
+		"TextBright"		"251 236 203 150"
+		"TextBlack"			"42 39 37 255"
+		"TextDull"			"131 121 104 255"
 	}
 
 	///////////////////// BASE SETTINGS ////////////////////////
@@ -40,35 +31,35 @@ Scheme
 	BaseSettings
 	{
 		// vgui_controls color specifications
-		Border.Bright						"TFTanLightDark"
-		Border.Dark							"TFTanLightDark"
+		Border.Bright						"TanDark"
+		Border.Dark							"TanDark"
 		Border.Selection					"BorderSelection"
 
-		Button.TextColor					"TFDarkBrown"
-		Button.BgColor						"TFTanLight"
-		Button.ArmedTextColor				"TFDarkBrown"
-		Button.ArmedBgColor					"TFTanBright"
-		Button.DepressedTextColor			"TFDarkBrown"
-		Button.DepressedBgColor				"TFTanLight"
+		Button.TextColor					"DarkBrown"
+		Button.BgColor						"TanLight"
+		Button.ArmedTextColor				"DarkBrown"
+		Button.ArmedBgColor					"TanBright"
+		Button.DepressedTextColor			"DarkBrown"
+		Button.DepressedBgColor				"TanLight"
 		Button.FocusBorderColor				"TransparentBlack"
 
-		CheckButton.TextColor				"TFTextBright"
-		CheckButton.SelectedTextColor		"TFTextBright"
-		CheckButton.BgColor					"ListBG"
-		CheckButton.HighlightFgColor		"TFTextMedium"
+		CheckButton.TextColor				"TextBright"
+		CheckButton.SelectedTextColor		"TextBright"
+		CheckButton.BgColor					"TransparentBlack"
+		CheckButton.HighlightFgColor		"TextDull"
 		CheckButton.ArmedBgColor			"Blank"
 		CheckButton.DepressedBgColor		"Blank"
 		CheckButton.Border1  				"Border.Dark"
 		CheckButton.Border2  				"Border.Bright"
-		CheckButton.Check					"TFTanBright"
-		CheckButton.DisabledBgColor	   	 	"ListBG"
+		CheckButton.Check					"TanBright"
+		CheckButton.DisabledBgColor	   	 	"TransparentBlack"
 
-		ComboBoxButton.ArrowColor			"TFTanLight"
-		ComboBoxButton.ArmedArrowColor		"TFTanBright"
+		ComboBoxButton.ArrowColor			"TanLight"
+		ComboBoxButton.ArmedArrowColor		"TanBright"
 		ComboBoxButton.BgColor				"Blank"
 		ComboBoxButton.DisabledBgColor		"Blank"
 
-		"Chat.TypingText"					"TFTextBright"
+		"Chat.TypingText"					"TextBright"
 
 		Frame.BgColor						"TransparentBlack"
 		Frame.OutOfFocusBgColor				"TransparentBlack"
@@ -93,27 +84,27 @@ Scheme
 		GraphPanel.FgColor					"White"
 		GraphPanel.BgColor					"TransparentBlack"
 
-		Label.TextDullColor					"TFTextDull"
-		Label.TextColor						"TFTextBright"
-		Label.TextBrightColor				"TFTextBright"
-		Label.SelectedTextColor				"TFTextBright"
+		Label.TextDullColor					"TextDull"
+		Label.TextColor						"TextBright"
+		Label.TextBrightColor				"TextBright"
+		Label.SelectedTextColor				"TextBright"
 		Label.BgColor						"Blank"
-		Label.DisabledFgColor1				"TFTextDull"
+		Label.DisabledFgColor1				"TextDull"
 		Label.DisabledFgColor2				"Blank"
 
-		ListPanel.TextColor					"TFTextBright"
-		ListPanel.BgColor					"ListBG"
-		ListPanel.SelectedBgColor			"SelectionBG"
-		ListPanel.SelectedOutOfFocusBgColor	"SelectionBG2"
+		ListPanel.TextColor					"TextBright"
+		ListPanel.BgColor					"TransparentBlack"
+		ListPanel.SelectedBgColor			"90 84 75 255"
+		ListPanel.SelectedOutOfFocusBgColor	"69 64 57 255"
 
 		Menu.TextColor						"White"
-		Menu.BgColor						"ListBG"
-		Menu.ArmedTextColor					"TFTextBlack"
-		Menu.ArmedBgColor					"TFOrangeBright"
+		Menu.BgColor						"TransparentBlack"
+		Menu.ArmedTextColor					"TextBlack"
+		Menu.ArmedBgColor					"Orange"
 		Menu.TextInset						"6"
 
 		Panel.FgColor						"Blank"
-		Panel.BgColor						"TFDarkBrown"
+		Panel.BgColor						"DarkBrown"
 
 		ProgressBar.FgColor					"White"
 		ProgressBar.BgColor					"TransparentBlack"
@@ -125,9 +116,9 @@ Scheme
 		RadioButton.SelectedTextColor		"White"
 
 		RichText.TextColor					"White"
-		RichText.BgColor					"ListBG"
+		RichText.BgColor					"TransparentBlack"
 		RichText.SelectedTextColor			"White"
-		RichText.SelectedBgColor			"TFOrangeBright"
+		RichText.SelectedBgColor			"Orange"
 
 		ScrollBar.Wide						"0"
 		ScrollBarButton.FgColor				"Blank"
@@ -156,20 +147,20 @@ Scheme
 		Slider.DisabledTextColor1			"117 117 117 255"
 		Slider.DisabledTextColor2			"30 30 30 255"
 
-		TextEntry.TextColor					"TFTextBright"
-		TextEntry.BgColor					"ListBG"
+		TextEntry.TextColor					"TextBright"
+		TextEntry.BgColor					"TransparentBlack"
 		TextEntry.CursorColor				"OffWhite"
 		TextEntry.DisabledTextColor			"DullWhite"
 		TextEntry.DisabledBgColor			"Blank"
 		TextEntry.SelectedTextColor			"White"
-		TextEntry.SelectedBgColor			"TFOrangeBright"
+		TextEntry.SelectedBgColor			"Orange"
 		TextEntry.OutOfFocusSelectedBgColor	"255 155 0 128"
 		TextEntry.FocusEdgeColor			"0 0 0 196"
 
-		ToggleButton.SelectedTextColor		"TFOrangeBright"
+		ToggleButton.SelectedTextColor		"Orange"
 
 		Tooltip.TextColor					"0 0 0 196"
-		Tooltip.BgColor						"TFOrangeBright"
+		Tooltip.BgColor						"Orange"
 
 		TreeView.BgColor					"TransparentBlack"
 
diff --git a/resource/scheme/clientscheme_colors.res b/resource/scheme/clientscheme_colors.res
index 34655ff..db9b858 100644
--- a/resource/scheme/clientscheme_colors.res
+++ b/resource/scheme/clientscheme_colors.res
@@ -7,7 +7,7 @@
 		//---------------------------------------------
 		"ColorRed"					"255 0 0 255"
 		"ColorYellow"				"255 255 0 255"
-		"ColorGreen"				"76 107 34 150"
+		"ColorGreen"				"48 255 48 255"
 		"ColorCyan"					"72 255 255 255"
 		"ColorBlue"					"0 0 255 255"
 		"ColorPurple"				"128 0 255 255"
diff --git a/resource/ui/classloadoutpanel.res b/resource/ui/classloadoutpanel.res
index e2aa122..1ce6f43 100644
--- a/resource/ui/classloadoutpanel.res
+++ b/resource/ui/classloadoutpanel.res
@@ -134,6 +134,7 @@
 		"pinCorner"			"0"
 		"visible"			"1"
 		"enabled"			"1"
+		"allcaps"			"1"
 	}
 
 	"TauntCaratLabel"
diff --git a/resource/ui/classselection-base.res b/resource/ui/classselection-base.res
index 74ed9c7..0e1a58d 100644
--- a/resource/ui/classselection-base.res
+++ b/resource/ui/classselection-base.res
@@ -21,12 +21,27 @@
 		"fieldName"		"SidePanelBG"
 		"xpos"			"0"
 		"ypos"			"0"
-		"zpos"			"1"
+		"zpos"			"0"
 		"wide"			"255"
 		"tall"			"f0"
 		"visible"		"1"
 		"enabled"		"1"
 		"scaleImage"	"1"
+		"fillcolor"		"0 0 0 100"
+	}
+	
+	"Background"
+	{
+		"ControlName"	"ImagePanel"
+		"fieldName"		"Background"
+		"xpos"			"0"
+		"ypos"			"0"
+		"zpos"			"0"
+		"wide"			"f0"
+		"tall"			"f0"
+		"visible"		"1"
+		"enabled"		"1"
+		"scaleImage"	"1"
 		"fillcolor"		"0 0 0 200"
 	}
 
@@ -69,7 +84,7 @@
 		"xpos"				"32"
 		"ypos"				"275"
 		"zpos"				"6"
-		"wide"				"150"
+		"wide"				"100"
 		"tall"				"16"
 		"autoResize"		"0"
 		"pinCorner"			"2"
@@ -83,6 +98,7 @@
 		"font"				"Cerbetica16"
 		"scaleImage"		"1"
 		"paintbackground"	"0"
+		"allcaps"			"1"
 
 		"fgcolor"					"TanLight"
 		"defaultFgColor_override"	"TanLight"
@@ -106,7 +122,7 @@
 		"xpos"				"30"
 		"ypos"				"291"
 		"zpos"				"6"
-		"wide"				"150"
+		"wide"				"100"
 		"tall"				"16"
 		"autoResize"		"0"
 		"pinCorner"			"2"
@@ -120,6 +136,7 @@
 		"font"				"Cerbetica16"
 		"scaleImage"		"1"
 		"paintbackground"	"0"
+		"allcaps"			"1"
 
 		"fgcolor"					"TanLight"
 		"defaultFgColor_override"	"TanLight"
@@ -143,7 +160,7 @@
 		"xpos"				"30"
 		"ypos"				"307"
 		"zpos"				"6"
-		"wide"				"150"
+		"wide"				"100"
 		"tall"				"16"
 		"autoResize"		"0"
 		"pinCorner"			"2"
@@ -157,6 +174,7 @@
 		"font"				"Cerbetica16"
 		"scaleImage"		"1"
 		"paintbackground"	"0"
+		"allcaps"			"1"
 
 		"fgcolor"					"TanLight"
 		"defaultFgColor_override"	"TanLight"
@@ -180,7 +198,7 @@
 		"xpos"				"30"
 		"ypos"				"327"
 		"zpos"				"6"
-		"wide"				"150"
+		"wide"				"100"
 		"tall"				"16"
 		"autoResize"		"0"
 		"pinCorner"			"2"
@@ -194,6 +212,7 @@
 		"font"				"Cerbetica16"
 		"scaleImage"		"1"
 		"paintbackground"	"0"
+		"allcaps"			"1"
 
 		"fgcolor"					"TanLight"
 		"defaultFgColor_override"	"TanLight"
@@ -217,7 +236,7 @@
 		"xpos"				"30"
 		"ypos"				"343"
 		"zpos"				"6"
-		"wide"				"150"
+		"wide"				"100"
 		"tall"				"16"
 		"autoResize"		"0"
 		"pinCorner"			"2"
@@ -231,6 +250,7 @@
 		"font"				"Cerbetica16"
 		"scaleImage"		"1"
 		"paintbackground"	"0"
+		"allcaps"			"1"
 
 		"fgcolor"					"TanLight"
 		"defaultFgColor_override"	"TanLight"
@@ -254,7 +274,7 @@
 		"xpos"				"30"
 		"ypos"				"359"
 		"zpos"				"6"
-		"wide"				"150"
+		"wide"				"100"
 		"tall"				"16"
 		"autoResize"		"0"
 		"pinCorner"			"2"
@@ -268,6 +288,7 @@
 		"font"				"Cerbetica16"
 		"scaleImage"		"1"
 		"paintbackground"	"0"
+		"allcaps"			"1"
 
 		"fgcolor"					"TanLight"
 		"defaultFgColor_override"	"TanLight"
@@ -291,7 +312,7 @@
 		"xpos"				"30"
 		"ypos"				"379"
 		"zpos"				"6"
-		"wide"				"150"
+		"wide"				"100"
 		"tall"				"16"
 		"autoResize"		"0"
 		"pinCorner"			"2"
@@ -305,6 +326,7 @@
 		"font"				"Cerbetica16"
 		"scaleImage"		"1"
 		"paintbackground"	"0"
+		"allcaps"			"1"
 
 		"fgcolor"					"TanLight"
 		"defaultFgColor_override"	"TanLight"
@@ -328,7 +350,7 @@
 		"xpos"				"30"
 		"ypos"				"395"
 		"zpos"				"6"
-		"wide"				"150"
+		"wide"				"100"
 		"tall"				"16"
 		"autoResize"		"0"
 		"pinCorner"			"2"
@@ -342,6 +364,7 @@
 		"font"				"Cerbetica16"
 		"scaleImage"		"1"
 		"paintbackground"	"0"
+		"allcaps"			"1"
 
 		"fgcolor"					"TanLight"
 		"defaultFgColor_override"	"TanLight"
@@ -365,7 +388,7 @@
 		"xpos"				"30"
 		"ypos"				"411"
 		"zpos"				"6"
-		"wide"				"150"
+		"wide"				"100"
 		"tall"				"16"
 		"autoResize"		"0"
 		"pinCorner"			"2"
@@ -379,6 +402,7 @@
 		"font"				"Cerbetica16"
 		"scaleImage"		"1"
 		"paintbackground"	"0"
+		"allcaps"			"1"
 
 		"fgcolor"					"TanLight"
 		"defaultFgColor_override"	"TanLight"
@@ -409,7 +433,7 @@
 		"visible"			"1"
 		"enabled"			"1"
 		"tabPosition"		"0"
-		"labelText"			"(&R)  RANDOM"
+		"labelText"			"(&R)  Random"
 		"textAlignment"		"west"
 		"Command"			"joinclass random"
 		"font"				"Cerbetica16"
@@ -444,7 +468,7 @@
 		"visible"		"1"
 		"enabled"		"1"
 		"tabPosition"	"0"
-		"labelText"		"(&Q)  CANCEL"
+		"labelText"		"(&Q)  Cancel"
 		"textAlignment"	"west"
 		"Command"		"vguicancel"
 		"font"			"Cerbetica16"
@@ -476,7 +500,7 @@
 		"enabled"		"1"
 		"tabPosition"	"0"
 		"paintbackground" "0"
-		"labelText"		"(&E)  EDIT LOADOUT"
+		"labelText"		"(&E)  Edit Loadout"
 		"textAlignment"	"west"
 		"Command"		"openloadout"
 		"font"			"Cerbetica16"
diff --git a/resource/ui/craftingstatusdialog.res b/resource/ui/craftingstatusdialog.res
index 88b677e..97c8dd5 100644
--- a/resource/ui/craftingstatusdialog.res
+++ b/resource/ui/craftingstatusdialog.res
@@ -47,7 +47,7 @@
 	{
 		"ControlName"			"Label"
 		"fieldName"				"TitleLabel"
-		"font"					"HudFontSmall"
+		"font"					"HudFontMediumSmall"
 		"xpos"					"0"
 		"ypos"					"0"
 		"zpos"					"0"
diff --git a/resource/ui/disguise_menu/heavy_red.res b/resource/ui/disguise_menu/heavy_red.res
index 28745e8..8f164a7 100644
--- a/resource/ui/disguise_menu/heavy_red.res
+++ b/resource/ui/disguise_menu/heavy_red.res
@@ -4,7 +4,7 @@
 	{
 		"ControlName"		"CExLabel"
 		"fieldName"			"ItemName"
-		"font"				"HudFontSmallest"
+		"font"				"HudFontSmallBold"
 		"xpos"				"20"
 		"ypos"				"0"
 		"zpos"				"1"
diff --git a/resource/ui/disguise_menu/hudmenuspydisguise.res b/resource/ui/disguise_menu/hudmenuspydisguise.res
index 1481ee2..39191fc 100644
--- a/resource/ui/disguise_menu/hudmenuspydisguise.res
+++ b/resource/ui/disguise_menu/hudmenuspydisguise.res
@@ -7,7 +7,7 @@
 		"xpos"				"9999"
 		"ypos"				"9999"
 		"zpos"				"0"
-		"wide"				"470"
+		"wide"				"100"
 		"tall"				"170"
 		"visible"			"1"
 		"enabled"			"1"
@@ -21,17 +21,17 @@
 		"ControlName"		"CExLabel"
 		"fieldName"			"TitleLabel"
 		"font"				"Cerbetica28"
-		"xpos"				"10"
+		"xpos"				"0"
 		"ypos"				"0"
 		"zpos"				"3"
-		"wide"				"380"
+		"wide"				"100"
 		"tall"				"30"
 		"autoResize"		"0"
 		"pinCorner"			"0"
 		"visible"			"1"
 		"enabled"			"1"
 		"labelText"			"#Hud_Menu_Disguise_Title"
-		"textAlignment"		"west"
+		"textAlignment"		"center"
 		"dulltext"			"0"
 		"brighttext"		"0"
 	}
@@ -45,14 +45,14 @@
 		"xpos"				"-2"
 		"ypos"				"-2"
 		"zpos"				"3"
-		"wide"				"380"
+		"wide"				"100"
 		"tall"				"30"
 		"autoResize"		"0"
 		"pinCorner"			"0"
 		"visible"			"1"
 		"enabled"			"1"
 		"labelText"			"#Hud_Menu_Disguise_Title"
-		"textAlignment"		"west"
+		"textAlignment"		"center"
 		"dulltext"			"1"
 		"brighttext"		"0"
 		"pin_to_sibling"	"TitleLabel"
@@ -64,7 +64,7 @@
 		"fieldName"			"ToggleLabel"
 		"font"				"SpectatorKeyHints"
 		"xpos"				"0"
-		"ypos"				"165"
+		"ypos"				"167"
 		"zpos"				"2"
 		"wide"				"100"
 		"tall"				"15"
@@ -335,7 +335,7 @@
 		"ControlName"		"CExLabel"
 		"fieldName"			"NumberLabel"
 		"font"				"Cerbetica20"
-		"fgcolor"			"White"
+		"fgcolor"			"TanLight"
 		"xpos"				"10"
 		"ypos"				"40"
 		"zpos"				"5"
@@ -372,7 +372,7 @@
 		"ControlName"		"CExLabel"
 		"fieldName"			"NumberLabel"
 		"font"				"Cerbetica20"
-		"fgcolor"			"White"
+		"fgcolor"			"TanLight"
 		"xpos"				"10"
 		"ypos"				"85"
 		"zpos"				"5"
@@ -409,7 +409,7 @@
 		"ControlName"		"CExLabel"
 		"fieldName"			"NumberLabel"
 		"font"				"Cerbetica20"
-		"fgcolor"			"White"
+		"fgcolor"			"TanLight"
 		"xpos"				"10"
 		"ypos"				"130"
 		"zpos"				"5"
@@ -430,7 +430,7 @@
 		"ControlName"		"EditablePanel"
 		"fieldName"			"MenuBG"
 		"xpos"				"0"
-		"ypos"				"22"
+		"ypos"				"25"
 		"zpos"				"1"
 		"wide"				"100"
 		"tall"				"145"
diff --git a/resource/ui/freezepanel_basic.res b/resource/ui/freezepanel_basic.res
index 8e7220b..423e0ee 100644
--- a/resource/ui/freezepanel_basic.res
+++ b/resource/ui/freezepanel_basic.res
@@ -5,25 +5,29 @@
 	"itempanel"
 	{
 		// For some reason this doesnt obey the xpos set in HUD Layout
-		"xpos"				"r249"
+		"xpos"					"r249"
 	}
 
 	"FreezePanel"
 	{
-		"ControlName"		"CTFFreezePanel"
-		"fieldName"			"FreezePanel"
+		"ControlName"			"CTFFreezePanel"
+		"fieldName"				"FreezePanel"
 		"screenshot_move_panel_to_corner"	"0"
 	}
 
 	"FreezePanelBase"
 	{
-		"ControlName"		"EditablePanel"
-		"fieldName"			"FreezePanelBase"
-		"xpos"				"r249"
-		"ypos"				"c-20"
-		"wide"				"240"
-		"tall"				"200"
-		"visible"			"1"
+		"ControlName"			"EditablePanel"
+		"fieldName"				"FreezePanelBase"
+		"xpos"					"r200"
+		"ypos"					"c20"
+		"wide"					"200"
+		"tall"					"38"
+		"visible"				"1"
+		"proportionaltoparent"	"1"
+		"PaintBackgroundType"	"2"
+		"paintBackground"		"1"
+		"paintBorder"			"0"
 
 		"FreezePanelBGTitle"
 		{
@@ -32,20 +36,20 @@
 			"xpos" 				"0"
 			"ypos" 				"15"
 			"zpos" 				"-1"
-			"wide" 				"240"
-			"tall" 				"31"
+			"wide" 				"f0"
+			"tall" 				"20"
 			"autoResize"		"0"
 			"pinCorner"			"0"
 			"visible" 			"1"
 			"enabled" 			"1"
-			"fillcolor" 		"0 0 0 128"
+			"fillcolor" 		"TransparentBlack"
 		}
 		"FreezePanelBG"
 		{
 			"ControlName"		"CTFImagePanel"
 			"fieldName"			"FreezePanelBG"
 			"xpos"				"0"
-			"ypos"				"46"
+			"ypos"				"35"
 			"zpos"				"0"
 			"wide"				"240"
 			"tall"				"3"
@@ -65,10 +69,10 @@
 			"ControlName"		"CExLabel"
 			"fieldName"			"FreezeLabel"
 			"font"				"HudFontSmall"
-			"xpos"				"25"
-			"ypos"				"15"
+			"xpos"				"0"
+			"ypos"				"0"
 			"zpos"				"1"
-			"wide"				"198"
+			"wide"				"200"
 			"tall"				"15"
 			"autoResize"		"0"
 			"pinCorner"			"0"
@@ -85,10 +89,10 @@
 			"ControlName"		"CTFFreezePanelHealth"
 			"fieldName"			"FreezePanelHealth"
 			"xpos"				"0"
-			"ypos"				"6"
+			"ypos"				"10"
 			"zpos"				"1"
-			"wide"				"30"
-			"tall"				"30"
+			"wide"				"35"
+			"tall"				"25"
 			"visible"			"1"
 			"enabled"			"1"
 			"HealthBonusPosAdj"			"9"
@@ -102,29 +106,30 @@
 		{
 			"ControlName"		"CExLabel"
 			"fieldName"			"FreezeLabelKiller"
-			"font"				"HudFontSmall"
-			"xpos"				"25"
-			"ypos"				"30"
+			"font"				"HudFontMediumSmall"
+			"xpos"				"0"
+			"ypos"				"15"
 			"zpos"				"1"
-			"wide"				"196"
-			"tall"				"15"
+			"wide"				"200"
+			"tall"				"20"
 			"autoResize"		"0"
 			"pinCorner"			"0"
 			"visible"			"1"
 			"enabled"			"1"
 			"labelText"			"%killername%"
 			"textAlignment"		"center"
+			"fgcolor"			"TanLight"
 		}
 
 		"AvatarImage"
 		{
 			"ControlName"		"CAvatarImagePanel"
 			"fieldName"			"AvatarImage"
-			"xpos"				"7"
-			"ypos"				"30"
+			"xpos"				"0"
+			"ypos"				"15"
 			"zpos"				"0"
-			"wide"				"14"
-			"tall"				"14"
+			"wide"				"20"
+			"tall"				"20"
 			"visible"			"1"
 			"enabled"			"1"
 			"image"				""
diff --git a/resource/ui/freezepanelkillerhealth.res b/resource/ui/freezepanelkillerhealth.res
index 9f35900..978e1e3 100644
--- a/resource/ui/freezepanelkillerhealth.res
+++ b/resource/ui/freezepanelkillerhealth.res
@@ -6,8 +6,8 @@
 		"fieldName"		"PlayerStatusHealthImage"
 		"wide"			"0"
 		"tall"			"0"
-		"visible"		"0"
-		"enabled"		"0"
+		"visible"		"1"
+		"enabled"		"1"
 	}
 
 	"PlayerStatusHealthImageBG"
@@ -16,8 +16,8 @@
 		"fieldName"		"PlayerStatusHealthImageBG"
 		"wide"			"0"
 		"tall"			"0"
-		"visible"		"0"
-		"enabled"		"0"
+		"visible"		"1"
+		"enabled"		"1"
 	}
 
 	"BuildingStatusHealthImageBG"
@@ -26,8 +26,8 @@
 		"fieldName"		"BuildingStatusHealthImageBG"
 		"wide"			"0"
 		"tall"			"0"
-		"visible"		"0"
-		"enabled"		"0"
+		"visible"		"1"
+		"enabled"		"1"
 	}
 
 	"PlayerStatusHealthBonusImage"
@@ -36,14 +36,14 @@
 		"fieldName"		"PlayerStatusHealthBonusImage"
 		"wide"			"0"
 		"tall"			"0"
-		"visible"		"0"
-		"enabled"		"0"
+		"visible"		"1"
+		"enabled"		"1"
 	}
 
-	"SpecHealthValue"
+	"TargetHealthValue"
 	{
 		"ControlName"	"CExLabel"
-		"fieldName"		"SpecHealthValue"
+		"fieldName"		"TargetHealthValue"
 		"xpos"			"3"
 		"ypos"			"3"
 		"zpos"			"5"
@@ -52,14 +52,14 @@
 		"visible"		"1"
 		"enabled"		"1"
 		"textAlignment"	"center"
-		"font"			"Cerbetica16"
+		"font"			"HudFontMediumSmall"
 		"labeltext"		"%Health%"
 	}
 
-	"SpecHealthValueShadow"
+	"TargetHealthShadow"
 	{
 		"ControlName"	"CExLabel"
-		"fieldName"		"SpecHealthValueShadow"
+		"fieldName"		"TargetHealthShadow"
 		"xpos"			"4"
 		"ypos"			"4"
 		"zpos"			"5"
@@ -68,7 +68,7 @@
 		"visible"		"1"
 		"enabled"		"1"
 		"textAlignment"	"center"
-		"font"			"Cerbetica16"
+		"font"			"HudFontMediumSmall"
 		"fgcolor"		"TransparentBlack"
 		"labeltext"		"%Health%"
 	}
diff --git a/resource/ui/hudaccountpanel.res b/resource/ui/hudaccountpanel.res
index 7152576..9aa8c75 100644
--- a/resource/ui/hudaccountpanel.res
+++ b/resource/ui/hudaccountpanel.res
@@ -5,9 +5,9 @@
 		"delta_item_x"			"8"
 		"delta_item_start_y"	"10"
 		"delta_item_end_y"		"35"
-		"PositiveColor"			"ColorGreen"
-		"NegativeColor"			"ColorRed"
-		"delta_lifetime"		"2"
+		"PositiveColor"			"Heal Numbers"
+		"NegativeColor"			"Damage Numbers"
+		"delta_lifetime"		"1.5"
 		"delta_item_font"		"HudFontMedium"
 		"delta_item_x_minmode"			"18"
 		"delta_item_start_y_minmode"	"10"
@@ -20,6 +20,8 @@
 		"ControlName"			"CTFImagePanel"
 		"fieldName"				"AccountBG"
 		"xpos"					"9999"
+		"visible"				"0"
+		"enabled"				"0"
 	}
 
 	"MetalIcon"
diff --git a/resource/ui/hudachievementtrackeritem.res b/resource/ui/hudachievementtrackeritem.res
deleted file mode 100644
index c87717b..0000000
--- a/resource/ui/hudachievementtrackeritem.res
+++ /dev/null
@@ -1,92 +0,0 @@
-"Resource/UI/HudAchievementTrackerItem.res"
-{
-	"HudAchievementTrackerItem"
-	{
-		"ControlName"	"EditablePanel"
-		"fieldName"		"HudAchievementTrackerItem"
-		"xpos"			"0"
-		"ypos"			"0"
-		"zpos"			"3"
-		"wide"			"190"
-		"tall"			"29"
-		"visible"		"0"
-		"enabled"		"1"
-		"PaintBackgroundType"	"2"
-	}
-
-	"AchievementName"
-	{
-		"ControlName"	"Label"
-		"fieldName"		"AchievementName"
-		"labeltext"		""
-		"xpos"			"5"
-		"ypos"			"-2"
-		"wide"			"190"
-		"tall"			"16"
-		"zpos"			"4"
-		"textinsetx"	"5"
-		"font"			"Cerbetica16"
-		"textAlignment"	"north-west"
-	}
-
-	"AchievementNameGlow"
-	{
-		"ControlName"	"Label"
-		"fieldName"		"AchievementNameGlow"
-		"labeltext"		""
-		"xpos"			"5"
-		"ypos"			"0"
-		"wide"			"190"
-		"tall"			"10"
-		"zpos"			"4"
-		"fgcolor_override"	"TanLight"
-		"font"				"AchievementTracker_NameGlow"
-		"textinsetx"		"5"
-		"textAlignment"		"north-west"
-	}
-
-	"AchievementDesc"
-	{
-		"ControlName"	"Label"
-		"fieldName"		"AchievementDesc"
-		"labeltext"		""
-		"xpos"			"5"
-		"ypos"			"14"
-		"wide"			"190"
-		"tall"			"18"
-		"zpos"			"4"
-		"textinsetx"	"5"
-		"fgcolor_override"	"TanLight"
-		"font"				"AchievementTracker_Desc"
-		"wrap"				"1"
-		"TextAlignment"		"north-west"
-	}
-
-	"ProgressBarBG"
-	{
-		"ControlName"	"ImagePanel"
-		"fieldName"		"ProgressBarBG"
-		"xpos"			"7"
-		"ypos"			"19"
-		"wide"			"100"
-		"tall"			"6"
-		"fillcolor"	 	"250 234 201 51"
-		"zpos"			"4"
-		"visible"		"1"
-		"enabled"		"1"
-	}
-
-	"ProgressBar"
-	{
-		"ControlName"	"ImagePanel"
-		"fieldName"		"ProgressBar"
-		"xpos"			"7"
-		"ypos"			"19"
-		"wide"			"0"
-		"tall"			"6"
-		"fillcolor"		"251 235 202 255"
-		"zpos"			"5"
-		"visible"		"1"
-		"enabled"		"1"
-	}
-}
\ No newline at end of file
diff --git a/resource/ui/hudammoweapons.res b/resource/ui/hudammoweapons.res
index ef72d5e..b2e4adf 100644
--- a/resource/ui/hudammoweapons.res
+++ b/resource/ui/hudammoweapons.res
@@ -5,6 +5,8 @@
 		"ControlName"		"CTFImagePanel"
 		"fieldName"			"HudWeaponAmmoBG"
 		"xpos"				"9999"
+		"visible"			"0"
+		"enabled"			"0"
 	}
 
 	"HudWeaponLowAmmoImage"
@@ -12,6 +14,8 @@
 		"ControlName"		"ImagePanel"
 		"fieldName"			"HudWeaponLowAmmoImage"
 		"xpos"				"9999"
+		"visible"			"0"
+		"enabled"			"0"
 	}
 
 	"AmmoInClip"
diff --git a/resource/ui/huddemomancharge.res b/resource/ui/huddemomancharge.res
index 3c566b9..74cafa5 100644
--- a/resource/ui/huddemomancharge.res
+++ b/resource/ui/huddemomancharge.res
@@ -4,6 +4,7 @@
 	{
 		"ControlName"		"ContinuousProgressBar"
 		"fieldName"			"ChargeMeter"
+		"font"				"Default"
 		"xpos"				"c-75"
 		"ypos"				"c92"
 		"xpos_minmode"		"c-60"
diff --git a/resource/ui/hudhealthaccount.res b/resource/ui/hudhealthaccount.res
index c6833c3..d02c321 100644
--- a/resource/ui/hudhealthaccount.res
+++ b/resource/ui/hudhealthaccount.res
@@ -6,13 +6,13 @@
 		"delta_item_x"				"128"
 		"delta_item_start_y"		"65"
 		"delta_item_end_y"			"95"
-		"delta_item_x_minmode"		"0"
-		"delta_item_start_y_minmode" "60"
-		"delta_item_end_y_minmode"	"75"
-		"PositiveColor"				"ColorGreen"
-		"NegativeColor"				"ColorRed"
+		"PositiveColor"				"Heal Numbers"
+		"NegativeColor"				"Damage Numbers"
 		"delta_lifetime"			"1.5"
 		"delta_item_font"			"Cerbetica28"
-		"delta_item_font_minmode"	"Cerbetica20"
+		"delta_item_x_minmode"			"0"
+		"delta_item_start_y_minmode"	"60"
+		"delta_item_end_y_minmode"		"75"
+		"delta_item_font_minmode"		"Cerbetica20"
 	}
 }
\ No newline at end of file
diff --git a/resource/ui/hudinspectpanel.res b/resource/ui/hudinspectpanel.res
index 7abf448..4013be2 100644
--- a/resource/ui/hudinspectpanel.res
+++ b/resource/ui/hudinspectpanel.res
@@ -11,9 +11,11 @@
 		"tall"					"100"
 		"visible"				"0"
 		"bgcolor_override"		"TransparentBlack"
-		"PaintBackgroundType"	"0"
+		"paintBackground"    	"1"
+		"PaintBackgroundType"	"2"
+		"paintBorder"			"0"
 
-		"model_ypos"			"10"
+		"model_ypos"			"20"
 		"model_center_x"		"1"
 		"model_wide"			"90"
 		"model_tall"			"60"
@@ -45,7 +47,7 @@
 			"ypos"			"3"
 			"zpos"			"1"
 			"wide"			"270"
-			"tall"			"9"
+			"tall"			"15"
 			"autoResize"	"0"
 			"pinCorner"		"0"
 			"visible"		"1"
diff --git a/resource/ui/huditemeffectmeter.res b/resource/ui/huditemeffectmeter.res
index 499ede4..f6056a2 100644
--- a/resource/ui/huditemeffectmeter.res
+++ b/resource/ui/huditemeffectmeter.res
@@ -1,6 +1,6 @@
 "Resource/UI/HudItemEffectMeter.res"
 {
-	HudItemEffectMeter
+	"HudItemEffectMeter"
 	{
 		"fieldName"			"HudItemEffectMeter"
 		"visible"			"1"
diff --git a/resource/ui/huditemeffectmeter_demoman.res b/resource/ui/huditemeffectmeter_demoman.res
index e88ccc3..fad379a 100644
--- a/resource/ui/huditemeffectmeter_demoman.res
+++ b/resource/ui/huditemeffectmeter_demoman.res
@@ -23,7 +23,7 @@
 		"ypos"					"0"
 		"zpos"					"2"
 		"wide"					"40"
-		"tall"					"11"
+		"tall"					"10"
 		"autoResize"			"1"
 		"pinCorner"				"2"
 		"visible"				"1"
@@ -61,7 +61,7 @@
 		"ControlName"			"CExLabel"
 		"fieldName"				"ItemEffectMeterCount"
 		"xpos"					"0"
-		"ypos"					"12"
+		"ypos"					"10"
 		"ypos_minmode"			"8"
 		"zpos"					"2"
 		"wide"					"40"
diff --git a/resource/ui/huditemeffectmeter_killstreak.res b/resource/ui/huditemeffectmeter_killstreak.res
index e39e1f6..a811e01 100644
--- a/resource/ui/huditemeffectmeter_killstreak.res
+++ b/resource/ui/huditemeffectmeter_killstreak.res
@@ -2,7 +2,7 @@
 
 "Resource/UI/HudItemEffectMeter_Killstreak.res"
 {
-	HudItemEffectMeter
+	"HudItemEffectMeter"
 	{
 		"xpos"				"c115"
 		"xpos_minmode"		"c65"
diff --git a/resource/ui/hudmatchstatus.res b/resource/ui/hudmatchstatus.res
index 64c01e8..90ea1a3 100644
--- a/resource/ui/hudmatchstatus.res
+++ b/resource/ui/hudmatchstatus.res
@@ -274,11 +274,11 @@
 
 		"team1_grow_dir" 	"west"
 		"team1_base_x"		"c-30"
-		"team1_max_expand"	"200"
+		"team1_max_expand"	"250"
 
 		"team2_grow_dir"	"east"
-		"team2_base_x"		"c30"
-		"team2_max_expand"	"200"
+		"team2_base_x"		"c31"
+		"team2_max_expand"	"250"
 
 		"playerpanels_kv"
 		{
@@ -292,11 +292,11 @@
 			"color_portrait_bg_blue"			"70 130 180 150"
 			"color_portrait_bg_red_dead"		"79 54 52 255"
 			"color_portrait_bg_blue_dead"		"44 49 51 255"
-			"color_bar_health_high"				"84 191 58 255"
+			"color_bar_health_high"				"Health Buff"
 			"color_bar_health_med"				"191 183 58 255"
-			"percentage_health_med"				"0.6"
-			"color_bar_health_low"				"191 58 58 255"
-			"percentage_health_low"				"0.3"
+			"percentage_health_med"				"0.5"
+			"color_bar_health_low"				"Health Hurt"
+			"percentage_health_low"				"0.2"
 			"color_portrait_blend_dead_red"		"235 235 235 255"
 			"color_portrait_blend_dead_blue"	"235 235 235 255"
 
diff --git a/resource/ui/hudmediccharge.res b/resource/ui/hudmediccharge.res
index 869a860..75d129e 100644
--- a/resource/ui/hudmediccharge.res
+++ b/resource/ui/hudmediccharge.res
@@ -21,7 +21,7 @@
 	{
 		"ControlName"		"CExLabel"
 		"fieldName"			"ChargeLabel"
-		"xpos"				"165"
+		"xpos"				"c80"
 		"ypos"				"35"
 		"xpos_minmode"		"106"
 		"ypos_minmode"		"-5"
@@ -73,11 +73,11 @@
 	{
 		"ControlName"		"CExImageButton"
 		"fieldName"			"IndividualChargesLabel"
-		"xpos"				"160"
-		"ypos"				"55"
+		"xpos"				"c80"
+		"ypos"				"56"
 		"zpos"				"2"
 		"wide"				"122"
-		"tall"				"35"
+		"tall"				"34"
 		"xpos_minmode"		"140"
 		"ypos_minmode"		"23"
 		"wide_minmode"		"102"
@@ -86,7 +86,7 @@
 		"pinCorner"			"0"
 		"visible"			"1"
 		"enabled"			"1"
-		"defaultbgcolor_override"	"25 25 25 255"
+		"defaultbgcolor_override"	"Black"
 		"PaintBackgroundType"		"0"
         "textinsety" 				"99"
 	}
@@ -95,18 +95,19 @@
 	{
 		"ControlName"		"CExLabel"
 		"fieldName"			"ChargeMeterLabel"
-		"xpos"				"0"
-		"ypos"				"80"
+		"xpos"				"c-75"
+		"ypos"				"60"
+		"xpos_minmode"		"10"
 		"ypos_minmode"		"35"
 		"zpos"				"3"
 		"wide"				"150"
-		"tall"				"15"
+		"tall"				"20"
 		"autoResize"		"1"
 		"pinCorner"			"2"
 		"visible"			"0"
 		"enabled"			"0"
 		"tabPosition"		"0"
-		"labelText"			"#TF_Charge"
+		"labelText"			"#TF_Ubercharge"
 		"textAlignment"		"center"
 		"dulltext"			"0"
 		"brighttext"		"0"
@@ -119,8 +120,8 @@
 		"ControlName"		"ContinuousProgressBar"
 		"fieldName"			"ChargeMeter"
 		"font"				"Default"
-		"xpos"				"0"
-		"ypos"				"80"
+		"xpos"				"c-75"
+		"ypos"				"60"
 		"xpos_minmode"		"10"
 		"ypos_minmode"		"35"
 		"zpos"				"2"
@@ -144,11 +145,11 @@
 		"ControlName"		"ContinuousProgressBar"
 		"fieldName"			"ChargeMeter1"
 		"font"				"Default"
-		"xpos"				"-5"
-		"ypos"				"-5"
+		"xpos"				"-3"
+		"ypos"				"-3"
 		"zpos"				"3"
-		"wide"				"27"
-		"tall"				"25"
+		"wide"				"28"
+		"tall"				"28"
 		"wide_minmode"		"22"
 		"tall_minmode"		"10"
 		"autoResize"		"0"
@@ -170,8 +171,8 @@
 		"xpos"				"2"
 		"ypos"				"0"
 		"zpos"				"4"
-		"wide"				"27"
-		"tall"				"25"
+		"wide"				"28"
+		"tall"				"28"
 		"wide_minmode"		"22"
 		"tall_minmode"		"10"
 		"autoResize"		"0"
@@ -196,8 +197,8 @@
 		"xpos"				"2"
 		"ypos"				"0"
 		"zpos"				"4"
-		"wide"				"27"
-		"tall"				"25"
+		"wide"				"28"
+		"tall"				"28"
 		"wide_minmode"		"22"
 		"tall_minmode"		"10"
 		"autoResize"		"0"
@@ -222,8 +223,8 @@
 		"xpos"				"2"
 		"ypos"				"0"
 		"zpos"				"4"
-		"wide"				"27"
-		"tall"				"25"
+		"wide"				"28"
+		"tall"				"28"
 		"wide_minmode"		"22"
 		"tall_minmode"		"10"
 		"autoResize"		"0"
@@ -242,27 +243,26 @@
 
 	"HealthClusterIcon"
 	{
-		"ControlName"	"ImagePanel"
-		"fieldName"		"HealthClusterIcon"
-		"xpos"			"0"
-		"ypos"			"0"
-		"wide"			"25"
-		"tall"			"25"
-		"visible"		"0"
-		"enabled"		"0"
-		"image"			"../hud/ico_health_cluster"
-		"scaleImage"	"1"
+		"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"
 		"fieldName"			"ResistIconAnchor"
-		"xpos"				"160"
+		"xpos"				"c80"
 		"ypos"				"95"
 		"xpos_minmode"		"210"
 		"ypos_minmode"		"48"
-		"zpos"				"2"
 		"wide"				"30"
 		"tall"				"30"
 		"visible"			"1"
@@ -275,7 +275,6 @@
 		"fieldName"			"ResistIcon"
 		"xpos"				"0"
 		"ypos"				"0"
-		"zpos"				"3"
 		"wide"				"30"
 		"tall"				"30"
 		"visible"			"1"
diff --git a/resource/ui/hudmenutauntselection.res b/resource/ui/hudmenutauntselection.res
index f49829f..1ae34b2 100644
--- a/resource/ui/hudmenutauntselection.res
+++ b/resource/ui/hudmenutauntselection.res
@@ -45,9 +45,10 @@
 		"visible"		"1"
 		"enabled"		"1"
 		"labelText"		"#Hud_Menu_Taunt_Title"
-		"textAlignment"	"Left"
+		"textAlignment"	"west"
 		"dulltext"		"0"
 		"brighttext"	"0"
+		"allcaps"		"1"
 	}
 
 	"TitleLabelShadow"
@@ -66,9 +67,10 @@
 		"visible"		"1"
 		"enabled"		"1"
 		"labelText"		"#Hud_Menu_Taunt_Title"
-		"textAlignment"	"Left"
+		"textAlignment"	"west"
 		"dulltext"		"1"
 		"brighttext"	"0"
+		"allcaps"		"1"
 		"pin_to_sibling"	"TitleLabel"
 	}
 
@@ -901,7 +903,7 @@
 		"ControlName"	"EditablePanel"
 		"fieldName"		"MenuBG"
 		"xpos"			"0"
-		"ypos"			"20"
+		"ypos"			"22"
 		"zpos"			"1"
 		"wide"			"470"
 		"tall"			"100"
diff --git a/resource/ui/mainmenuplaylistentry.res b/resource/ui/mainmenuplaylistentry.res
index 385addf..949bb93 100644
--- a/resource/ui/mainmenuplaylistentry.res
+++ b/resource/ui/mainmenuplaylistentry.res
@@ -92,9 +92,9 @@
 		"sound_depressed"	"UI/buttonclick.wav"
 		"sound_released"	"UI/buttonclickrelease.wav"
 
-		"defaultFgColor_override"	"TanDark"
+		"defaultFgColor_override"	"TanLight"
 		"armedFgColor_override"		"TanLight"
-		"depressedFgColor_override" "TanDark"
+		"depressedFgColor_override" "TanLight"
 	}
 
 	"MatchmakingBanPanel"
diff --git a/resource/ui/mapinfomenu.res b/resource/ui/mapinfomenu.res
index c8868d7..d2b5b55 100644
--- a/resource/ui/mapinfomenu.res
+++ b/resource/ui/mapinfomenu.res
@@ -48,6 +48,7 @@
 		"textAlignment"	"center"
 		"font"			"HudFontMedium"
 		"fgcolor"		"TanLight"
+		"allcaps"		"1"
 	}
 
 	"MapInfoType"
@@ -126,11 +127,10 @@
 		"font"			"HudFontMedium"
 		"paintbackground"	"0"
 
-		"fgcolor"					"TanLight"
-		"defaultFgColor_override" 	"TanLight"
-		"armedFgColor_override"		"TanDark"
+		"defaultFgColor_override" 	"TanDark"
+		"armedFgColor_override"		"TanLight"
 		"depressedFgColor_override" "TanDark"
-		"selectedFgColor_override" 	"TanDark"
+
 	}
 
 	"MapInfoWatchIntro"
@@ -161,11 +161,10 @@
 		"font"			"HudFontMedium"
 		"paintbackground"	"0"
 
-		"fgcolor"					"TanLight"
-		"defaultFgColor_override" 	"TanLight"
-		"armedFgColor_override"		"TanDark"
+		"defaultFgColor_override" 	"TanDark"
+		"armedFgColor_override"		"TanLight"
 		"depressedFgColor_override" "TanDark"
-		"selectedFgColor_override" 	"TanDark"
+
 	}
 
 	"MenuBG"
diff --git a/resource/ui/matchmakingdashboardpopup_newmatch.res b/resource/ui/matchmakingdashboardpopup_newmatch.res
index a93a7d6..578066c 100644
--- a/resource/ui/matchmakingdashboardpopup_newmatch.res
+++ b/resource/ui/matchmakingdashboardpopup_newmatch.res
@@ -59,14 +59,14 @@
 				"ControlName"	"CAutoFittingLabel"
 				"fieldName"		"DescLabel"
 				"xpos"			"0"
-				"ypos"			"7"
+				"ypos"			"5"
 				"wide"			"f0"
 				"zpos"			"100"
 				"tall"			"20"
 				"visible"		"1"
 				"enabled"		"1"
 				"font"			"HudFontSmall"
-				"fgcolor_override"	"White"
+				"fgcolor_override"	"TanLight"
 				"textAlignment"	"center"
 				"labelText"		"%match_type%"
 				"proportionaltoparent"	"1"
@@ -85,7 +85,7 @@
 				"ControlName"	"Label"
 				"fieldName"		"AutoJoinLabel"
 				"xpos"			"0"
-				"ypos"			"rs1-17"
+				"ypos"			"rs1-15"
 				"wide"			"f0"
 				"zpos"			"100"
 				"tall"			"20"
diff --git a/resource/ui/spectatorguihealth.res b/resource/ui/spectatorguihealth.res
index bdca9a2..5ea03f0 100644
--- a/resource/ui/spectatorguihealth.res
+++ b/resource/ui/spectatorguihealth.res
@@ -42,10 +42,10 @@
 		"scaleImage"	"1"
 	}
 
-	"SpecHealthValue"
+	"TargetHealthValue"
 	{
 		"ControlName"	"CExLabel"
-		"fieldName"		"GuiPlayerHealth"
+		"fieldName"		"TargetHealthValue"
 		"xpos"			"2"
 		"ypos"			"16"
 		"zpos"			"5"
@@ -59,10 +59,10 @@
 		"fgcolor"		"Health Normal"
 	}
 
-	"SpecHealthValueShadow"
+	"TargetHealthShadow"
 	{
 		"ControlName"	"CExLabel"
-		"fieldName"		"SpecHealthValueShadow"
+		"fieldName"		"TargetHealthShadow"
 		"xpos"			"-1"
 		"ypos"			"-2"
 		"zpos"			"5"
@@ -75,7 +75,7 @@
 		"font"			"Cerbetica18"
 		"fgcolor"		"TransparentBlack"
 
-		"pin_to_sibling"		"SpecHealthValue"
+		"pin_to_sibling"		"TargetHealthValue"
 		"pin_corner_to_sibling"	"PIN_TOPLEFT"
 		"pin_to_sibling_corner"	"PIN_TOPLEFT"
 	}
diff --git a/resource/ui/statsummary.res b/resource/ui/statsummary.res
index 8cc7fc5..5a19944 100644
--- a/resource/ui/statsummary.res
+++ b/resource/ui/statsummary.res
@@ -51,36 +51,19 @@
 	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"OnYourWayLabel"
-		"font"			"Cerbetica24"
+		"font"			"HudFontBig"
 		"labelText"		"#LoadingMap"
 		"textAlignment"	"west"
 		"xpos"			"5"
-		"ypos"			"5"
+		"ypos"			"20"
 		"zpos"			"40"
 		"wide"			"0"
-		"tall"			"0"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"0"
-		"enabled"		"0"
-		"fgcolor_override" "TanLight"
-	}
-	"LoadingLabel"
-	{
-		"ControlName"	"CExLabel"
-		"fieldName"		"LoadingLabel"
-		"font"			"HudFontBig"
-		"labelText"		"#LoadingMap"
-		"textAlignment"	"west"
-		"xpos"			"5"
-		"ypos"			"414"
-		"zpos"			"201"
-		"wide"			"f0"
-		"tall"			"96"
+		"tall"			"40"
 		"autoResize"	"0"
 		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
+		"fgcolor_override" "TanLight"
 	}
 
 	"MapLabel"
@@ -90,36 +73,36 @@
 		"font"			"HudFontGiantBold"
 		"labelText"		"%maplabel%"
 		"textAlignment"	"west"
-		"xpos"			"5"
+		"xpos"			"6"
 		"ypos"			"20"
 		"zpos"			"50"
 		"wide"			"f0"
-		"tall"			"56"
+		"tall"			"50"
 		"autoResize"	"0"
 		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
-		"fgcolor_override" "TanLight"
 		"allcaps"		"1"
+		"fgcolor_override" "TanLight"
 	}
 	"MapType"
 	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"MapType"
-		"font"			"HudFontMedium"
+		"font"			"HudFontBig"
 		"labelText"		"%maptype%"
 		"textAlignment"	"west"
 		"xpos"			"6"
-		"ypos"			"69"
+		"ypos"			"60"
 		"zpos"			"50"
 		"wide"			"f0"
-		"tall"			"24"
+		"tall"			"40"
 		"autoResize"	"0"
 		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
-		"fgcolor_override" "TanLight"
 		"allcaps"		"1"
+		"fgcolor_override" "TanLight"
 	}
 
 	"StatData"
diff --git a/resource/ui/targetid.res b/resource/ui/targetid.res
index 8b2a286..d7491cc 100644
--- a/resource/ui/targetid.res
+++ b/resource/ui/targetid.res
@@ -5,10 +5,10 @@
 		"ControlName"		"ImagePanel"
 		"fieldName"			"TargetBG"
 		"xpos"				"0"
-		"ypos"				"29"
-		"zpos"				"6"
-		"wide"				"600"
-		"tall"				"19"
+		"ypos"				"30"
+		"zpos"				"0"
+		"wide"				"640"
+		"tall"				"20"
 		"visible"			"1"
 		"enabled"			"1"
 		"fillcolor"			"TransparentBlack"
@@ -42,13 +42,18 @@
 		"ControlName"		"ImagePanel"
 		"fieldName"			"TargetIDBG_Spec_Blue"
 		"xpos"				"0"
-		"ypos"				"47"
-		"zpos"				"0"
-		"wide"				"5"
-		"tall"	 			"5"
+		"ypos"				"50"
+		"zpos"				"1"
+		"wide"				"f0"
+		"tall"	 			"35"
 		"visible"			"0"
 		"enabled"			"1"
 		"fillcolor"			"72 112 125 255"
+
+		"src_corner_height"		"23"
+		"src_corner_width"		"23"
+		"draw_corner_width"		"0"
+		"draw_corner_height" 	"0"
 	}
 
 	"TargetIDBG_Spec_Red"
@@ -56,25 +61,30 @@
 		"ControlName"		"ImagePanel"
 		"fieldName"			"TargetIDBG_Spec_Red"
 		"xpos"				"0"
-		"ypos"				"47"
-		"zpos"				"0"
-		"wide"				"5"
-		"tall"	 			"5"
+		"ypos"				"50"
+		"zpos"				"1"
+		"wide"				"f0"
+		"tall"	 			"35"
 		"visible"			"0"
 		"enabled"			"1"
 		"fillcolor"			"158 64 61 255"
+
+		"src_corner_height"		"23"
+		"src_corner_width"		"23"
+		"draw_corner_width"		"0"
+		"draw_corner_height" 	"0"
 	}
 
 	"TargetNameLabel"
 	{
 		"ControlName"		"Label"
 		"fieldName"			"TargetNameLabel"
-		"font"				"HudFontMediumSmall"
+		"font"				"HudClassHealth"
 		"xpos"				"45"
-		"ypos"				"29"
-		"zpos"				"7"
-		"wide"				"300"
-		"tall"				"19"
+		"ypos"				"30"
+		"zpos"				"1"
+		"wide"				"640"
+		"tall"				"20"
 		"visible"			"1"
 		"enabled"			"1"
 		"labelText"			"%targetname%"
@@ -85,14 +95,14 @@
 	{
 		"ControlName"		"Label"
 		"fieldName"			"TargetNameLabelShadow"
-		"font"				"HudFontMediumSmall"
+		"font"				"HudClassHealth"
 		"xpos"				"-1"
 		"ypos"				"-1"
 		"zpos"				"1"
-		"wide"				"300"
-		"tall"				"19"
-		"visible"			"1"
-		"enabled"			"1"
+		"wide"				"640"
+		"tall"				"20"
+		"visible"			"0"
+		"enabled"			"0"
 		"labelText"			"%targetname%"
 		"textAlignment"		"west"
 		"fgcolor_override"	"TransparentBlack"
@@ -104,9 +114,9 @@
 		"ControlName"		"Label"
 		"fieldName"			"TargetDataLabel"
 		"font"				"HudFontSmall"
-		"xpos"				"15"
+		"xpos"				"0"
 		"ypos"				"15"
-		"zpos"				"6"
+		"zpos"				"1"
 		"wide"				"f0"
 		"tall"				"15"
 		"visible"			"1"
@@ -119,11 +129,11 @@
 	{
 		"ControlName"		"EditablePanel"
 		"fieldName"			"SpectatorGUIHealth"
-		"xpos"				"-2"
-		"ypos"				"14"
+		"xpos"				"0"
+		"ypos"				"15"
 		"zpos"				"10"
-		"wide"				"38"
-		"tall"				"42"
+		"wide"				"45"
+		"tall"				"35"
 		"visible"			"1"
 		"enabled"			"1"
 		"HealthBonusPosAdj"	"10"
@@ -185,7 +195,7 @@
 		"fieldName"			"MoveableSubPanel"
 		"xpos"				"0"
 		"ypos"				"0"
-		"zpos"				"6"
+		"zpos"				"1"
 		"wide"				"32"
 		"tall"				"36"
 		"visible"			"1"
@@ -219,7 +229,7 @@
 			"visible"		"1"
 			"enabled"		"1"
 			"icon"			"obj_status_sentrygun_1"
-			"drawcolor"		"ProgressOffWhite"
+			"drawcolor"		"TanLight"
 			"scaleImage"	"1"
 		}
 		"MoveableSymbolIcon"
@@ -234,7 +244,7 @@
 			"visible"		"1"
 			"enabled"		"1"
 			"image"			"../hud/eng_sel_item_movable"
-			"drawcolor"		"ProgressOffWhite"
+			"drawcolor"		"TanLight"
 			"scaleImage"	"1"
 		}
 
@@ -244,9 +254,9 @@
 			"fieldName"		"MoveableKeyLabel"
 			"font"			"HudFontSmallest"
 			"xpos"			"0"
-			"ypos"			"43"
-			"zpos"			"6"
-			"wide"			"12"
+			"ypos"			"45"
+			"zpos"			"1"
+			"wide"			"10"
 			"tall"			"0"
 			"autoResize"	"0"
 			"pinCorner"		"0"
diff --git a/resource/ui/teammenu-base.res b/resource/ui/teammenu-base.res
index 1957ec3..1fe00ec 100644
--- a/resource/ui/teammenu-base.res
+++ b/resource/ui/teammenu-base.res
@@ -13,8 +13,8 @@
 		"visible"		"1"
 		"enabled"		"1"
 		"tabPosition"	"0"
-		"fgcolor"		"255 0 0 255"
 	}
+	
 	"SidePanelBG"
 	{
 		"ControlName"	"ImagePanel"
@@ -366,7 +366,7 @@
 		"tall"			"0"
 		"visible"		"1"
 		"enabled"		"1"
-		"labelText"		"&3"
+		"labelText"		"&1"
 		"command"		"jointeam blue"
 		"team"			"3"
 	}
@@ -379,7 +379,7 @@
 		"tall"			"0"
 		"visible"		"1"
 		"enabled"		"1"
-		"labelText"		"&4"
+		"labelText"		"&2"
 		"command"		"jointeam red"
 		"team"			"4"
 	}
@@ -392,7 +392,7 @@
 		"tall"			"0"
 		"visible"		"1"
 		"enabled"		"1"
-		"labelText"		"&1"
+		"labelText"		"&3"
 		"command"		"jointeam auto"
 	}
 
@@ -404,7 +404,7 @@
 		"tall"			"0"
 		"visible"		"1"
 		"enabled"		"1"
-		"labelText"		"&2"
+		"labelText"		"&4"
 		"command"		"jointeam spectate"
 	}
 }
\ No newline at end of file
diff --git a/resource/ui/textwindow.res b/resource/ui/textwindow.res
index bb33c5a..c856be2 100644
--- a/resource/ui/textwindow.res
+++ b/resource/ui/textwindow.res
@@ -43,10 +43,11 @@
 		"pinCorner"			"0"
 		"visible"			"1"
 		"enabled"			"1"
-		"labelText"			"#TF_WELCOME"
+		"labelText"			"%mapname%"
 		"textAlignment"		"center"
 		"font"				"HudFontMedium"
 		"fgcolor"			"TanLight"
+		"allcaps"			"1"
 	}
 
 	"TextMessage"
@@ -96,10 +97,10 @@
 	{
 		"ControlName"		"CExButton"
 		"fieldName"			"ok"
-		"xpos"				"c-180"
+		"xpos"				"c-60"
 		"ypos"				"c96"
 		"zpos"				"6"
-		"wide"				"360"
+		"wide"				"120"
 		"tall"				"30"
 		"autoResize"		"0"
 		"pinCorner"			"2"
@@ -114,9 +115,9 @@
 		"font"				"HudFontMedium"
 		"paintbackground"	"0"
 
-		"defaultFgColor_override" 	"TanLight"
-		"armedFgColor_override"		"TanDark"
-		"depressedFgColor_override" "TanLight"
+		"defaultFgColor_override" 	"TanDark"
+		"armedFgColor_override"		"TanLight"
+		"depressedFgColor_override" "TanDark"
 	}
 
 	"MenuBG"