diff --git a/#customization/alt uber/resource/ui/hudmediccharge.res b/#customization/alt uber/resource/ui/hudmediccharge.res
new file mode 100644
index 0000000..369473a
--- /dev/null
+++ b/#customization/alt uber/resource/ui/hudmediccharge.res	
@@ -0,0 +1,287 @@
+"Resource/UI/HudMedicCharge.res"
+{	
+	"Background"
+	{
+		"ControlName"	"CTFImagePanel"
+		"fieldName"		"Background"
+		"xpos"			"99999"
+		"ypos"			"0"
+		"zpos"			"0"
+		"wide"			"130"
+		"tall"			"65"
+		"visible"		"1"
+		"enabled"		"1"
+		"image"			"../hud/medic_charge_blue_bg"
+		"scaleImage"	"1"	
+		"teambg_2"		"../hud/medic_charge_red_bg"
+		"teambg_3"		"../hud/medic_charge_blue_bg"				
+	}
+	
+	"ChargeLabel"
+	{
+		"ControlName"	"CExLabel"
+		"fieldName"		"ChargeLabel"
+		"xpos"			"120"
+		"ypos"			"-12"
+		"zpos"			"6"
+		"wide"			"120"
+		"tall"			"100"
+		"autoResize"	"1"
+		"pinCorner"		"2"
+		"visible"		"1"
+		"enabled"		"1"
+		"tabPosition"	"0"
+		"labelText"		"#TF_UberchargeMinHUD"
+		"textAlignment"	"west"
+		"dulltext"		"0"
+		"brighttext"	"0"
+		"font"			"hudfont48"
+	}
+	
+	"ChargeLabelShadow"
+	{
+		"ControlName"	"CExLabel"
+		"fieldName"		"ChargeLabelShadow"
+		"xpos"			"-2"
+		"ypos"			"-2"
+		"zpos"			"4"
+		"wide"			"120"
+		"tall"			"100"
+		"autoResize"	"1"
+		"pinCorner"		"2"
+		"visible"		"1"
+		"enabled"		"1"
+		"tabPosition"	"0"
+		"labelText"		"#TF_UberchargeMinHUD"
+		"textAlignment"	"west"
+		"dulltext"		"0"
+		"brighttext"	"0"
+		"font"			"hudfont48"
+		"pin_to_sibling" "ChargeLabel"
+		"fgcolor" "colorblack"
+		
+	}
+	"IndividualChargesLabel"
+	{
+		"ControlName"	"CExLabel"
+		"fieldName"		"IndividualChargesLabel"
+		"xpos"			"30"
+		"ypos"			"24"
+		"zpos"			"2"
+		"wide"			"90"
+		"tall"			"15"
+		"autoResize"	"1"
+		"pinCorner"		"2"
+		"visible"		"1"
+		"enabled"		"1"
+		"tabPosition"	"0"
+		"labelText"		"#TF_IndividualUberchargesMinHUD"
+		"textAlignment"	"west"
+		"dulltext"		"0"
+		"brighttext"	"0"
+		"font"			"HudFontSmallest"
+	}
+	
+	"ChargeMeter"
+	{	
+		"ControlName"	"ContinuousProgressBar"
+		"fieldName"		"ChargeMeter"
+		"font"			"Default"
+		"xpos"			"115"
+		"ypos"			"20"
+		"zpos"			"3"
+		"wide"			"110"
+		"tall"			"40"				
+		"autoResize"	"0"
+		"pinCorner"		"0"
+		"visible"		"1"
+		"enabled"		"1"
+		"textAlignment"	"Left"
+		"dulltext"		"0"
+		"brighttext"	"0"
+		"bgcolor_override" "colortransparentgray"
+		"fgcolor" "colordullwhite"
+	}		
+
+	"ChargeMeter1"
+	{	
+		"ControlName"	"ContinuousProgressBar"
+		"fieldName"		"ChargeMeter1"
+		"font"			"Default"
+		"xpos"			"115"
+		"ypos"			"20"
+		"zpos"			"5"
+		"wide"			"28"
+		"tall"			"40"				
+		"autoResize"	"0"
+		"pinCorner"		"0"
+		"visible"		"1"
+		"enabled"		"1"
+		"textAlignment"	"Left"
+		"dulltext"		"0"
+		"brighttext"	"0"
+		"bgcolor_override" "colorblack"
+		"fgcolor_override" "colordullwhite"
+	}
+	"mark_25"
+	{	
+		"ControlName"	"EditablePanel"
+		"fieldName"		"mark_25"
+		"font"			"Default"
+		"xpos"			"142"
+		"ypos"			"20"
+		"zpos"			"6"
+		"wide"			"2"
+		"tall"			"40"				
+		"autoResize"	"0"
+		"pinCorner"		"0"
+		"visible"		"1"
+		"enabled"		"1"
+		"textAlignment"	"Left"
+		"dulltext"		"0"
+		"brighttext"	"0"
+		"bgcolor_override" "transparentblack"
+	}
+	"ChargeMeter2"
+	{	
+		"ControlName"	"ContinuousProgressBar"
+		"fieldName"		"ChargeMeter2"
+		"font"			"Default"
+		"xpos"			"-28"
+		"ypos"			"0"
+		"zpos"			"5"
+		"wide"			"28"
+		"tall"			"40"				
+		"autoResize"	"0"
+		"pinCorner"		"0"
+		"visible"		"1"
+		"enabled"		"1"
+		"textAlignment"	"Left"
+		"dulltext"		"0"
+		"brighttext"	"0"
+		"pin_to_sibling" "ChargeMeter1"
+		"bgcolor_override" "colorblack"
+		"fgcolor_override" "colordullwhite"
+	}
+	"mark_50"
+	{	
+		"ControlName"	"EditablePanel"
+		"fieldName"		"mark_50"
+		"font"			"Default"
+		"xpos"			"169"
+		"ypos"			"20"
+		"zpos"			"6"
+		"wide"			"2"
+		"tall"			"40"				
+		"autoResize"	"0"
+		"pinCorner"		"0"
+		"visible"		"1"
+		"enabled"		"1"
+		"textAlignment"	"Left"
+		"dulltext"		"0"
+		"brighttext"	"0"
+		"bgcolor_override" "transparentblack"
+	}
+	"ChargeMeter3"
+	{	
+		"ControlName"	"ContinuousProgressBar"
+		"fieldName"		"ChargeMeter3"
+		"font"			"Default"
+		"xpos"			"-28"
+		"ypos"			"0"
+		"zpos"			"5"
+		"wide"			"28"
+		"tall"			"40"				
+		"autoResize"	"0"
+		"pinCorner"		"0"
+		"visible"		"1"
+		"enabled"		"1"
+		"textAlignment"	"Left"
+		"dulltext"		"0"
+		"brighttext"	"0"
+		"pin_to_sibling" "ChargeMeter2"
+		"bgcolor_override" "colorblack"
+		"fgcolor_override" "colordullwhite"
+	}
+	"mark_75"
+	{	
+		"ControlName"	"EditablePanel"
+		"fieldName"		"mark_75"
+		"font"			"Default"
+		"xpos"			"197"
+		"ypos"			"20"
+		"zpos"			"6"
+		"wide"			"2"
+		"tall"			"40"				
+		"autoResize"	"0"
+		"pinCorner"		"0"
+		"visible"		"1"
+		"enabled"		"1"
+		"textAlignment"	"Left"
+		"dulltext"		"0"
+		"brighttext"	"0"
+		"bgcolor_override" "transparentblack"
+	}
+	"ChargeMeter4"
+	{	
+		"ControlName"	"ContinuousProgressBar"
+		"fieldName"		"ChargeMeter4"
+		"xpos"			"-28"
+		"ypos"			"0"
+		"zpos"			"5"
+		"wide"			"28"
+		"tall"			"40"				
+		"autoResize"	"0"
+		"pinCorner"		"0"
+		"visible"		"1"
+		"enabled"		"1"
+		"textAlignment"	"Left"
+		"dulltext"		"0"
+		"brighttext"	"0"
+		"pin_to_sibling" "ChargeMeter3"
+		"bgcolor_override" "colorblack"
+		"fgcolor_override" "colordullwhite"
+	}
+	
+	"HealthClusterIcon"
+	{
+		"ControlName"	"ImagePanel"
+		"fieldName"		"HealthClusterIcon"
+		"xpos"			"99999"
+		"ypos"			"17"
+		"wide"			"36"
+		"tall"			"36"
+		"visible"		"1"
+		"enabled"		"1"
+		"image"			"../hud/ico_health_cluster"
+		"scaleImage"	"1"	
+	}	
+	
+"ResistIconAnchor"
+	{
+		"ControlName" 	"EditablePanel"
+		"fieldName" 	"ResistIconAnchor"
+		"xpos" 			"49"
+		"ypos" 			"40"
+		"wide" 			"20"
+		"tall" 			"30"
+		"visible" 		"1"
+		"enabled" 		"1"
+	}
+	"ResistIcon"
+	{
+		"ControlName" 	"ImagePanel"
+		"fieldName" 	"ResistIcon"
+		"xpos" 			"0"
+		"ypos" 			"0"
+		"wide" 			"20"
+		"tall" 			"20"
+		"visible" 		"1"
+		"enabled" 		"1"
+		"image" 		"../HUD/defense_buff_bullet_blue"
+		"scaleImage" 	"1"
+		"pin_to_sibling" "ResistIconAnchor"
+		"pin_corner_to_sibling" "1"
+		"pin_to_sibling_corner" "1"
+	}
+}
diff --git a/#customization/alt uber/scripts/hudanimations_mediccharge.txt b/#customization/alt uber/scripts/hudanimations_mediccharge.txt
new file mode 100644
index 0000000..2a80cc9
--- /dev/null
+++ b/#customization/alt uber/scripts/hudanimations_mediccharge.txt	
@@ -0,0 +1,25 @@
+event HudMedicCharged
+{
+	Animate	ChargeLabel 	FgColor		"colordullwhite"		spline 0.0 0.3
+	Animate	ChargeLabel 	FgColor		"colorwhite"			spline 0.3 0.3
+	
+	Animate	ChargeMeter 	FgColor		"ubercharge1"			spline 0.0 0.3
+	Animate	ChargeMeter 	FgColor		"ubercharge2"			spline 0.3 0.3
+
+	RunEvent HudMedicChargedLoop	0.6
+}
+
+// call to loop HudHealthBonusPulse
+event HudMedicChargedLoop
+{
+	RunEvent HudMedicCharged 0.0
+}
+
+event HudMedicChargedStop
+{
+	StopEvent HudMedicCharged 0.0
+	StopEvent HudMedicChargedLoop 0.0
+	
+	Animate	ChargeLabel 	FgColor		"colorwhite"			Linear 0 0
+	Animate	ChargeMeter 	FgColor		"colordullwhite"		Linear 0 0
+}
\ No newline at end of file
diff --git a/materials/vgui/replay/thumbnails/amogus.vtf b/materials/vgui/replay/thumbnails/amogus.vtf
new file mode 100644
index 0000000..2b363a1
Binary files /dev/null and b/materials/vgui/replay/thumbnails/amogus.vtf differ
diff --git a/resource/scheme/clientscheme_fonts.res b/resource/scheme/clientscheme_fonts.res
index 330df1a..4a2b229 100644
--- a/resource/scheme/clientscheme_fonts.res
+++ b/resource/scheme/clientscheme_fonts.res
@@ -297,6 +297,16 @@ Scheme
 				"outline"	"1"
 			}
 		}
+		"vaccinatoruber"
+		{
+			"1"
+			{
+				"name" "TF2 Build"
+				"tall" "48"
+				"antialias" "1"
+				"outline"	"1"
+			}
+		}
 // 		===========================================
 // 		caption
 
diff --git a/resource/ui/freezepanel_basic.res b/resource/ui/freezepanel_basic.res
new file mode 100644
index 0000000..87693e6
--- /dev/null
+++ b/resource/ui/freezepanel_basic.res
@@ -0,0 +1,311 @@
+"Resource/UI/FreezePanel_Basic.res"
+{
+	"FreezePanel"
+	{
+		"ControlName"	"CTFFreezePanel"
+		"fieldName"		"FreezePanel"
+
+		"screenshot_move_panel_to_corner"	"1"
+	}
+
+	"itempanel"
+	{
+		"ControlName"	"CItemModelPanel"
+		"fieldName"		"itempanel"
+		"xpos"			"r200"
+		"ypos"			"0"
+		"zpos"			"10"
+		"wide"			"190"
+		"tall"			"100"
+		"visible"		"0"
+		"bgcolor_override"		"255 255 255 0"
+		"PaintBackgroundType"	"0"
+		
+		"model_ypos"		"10"
+		"model_center_x"	"1"
+		"model_wide"		"90"
+		"model_tall"		"60"
+		
+		"text_xpos"		"10"
+		"text_ypos"		"10"
+		"text_wide"		"170"
+		"text_center"	"1"
+		
+		"max_text_height"	"100"
+		"padding_height"	"10"
+		"resize_to_text"	"1"
+		"text_forcesize"	"2"
+		
+		"itemmodelpanel"
+		{
+			"fieldName"		"itemmodelpanel"
+			"use_item_rendertarget" "0"
+			"useparentbg"		"1"
+		}
+		
+		"ItemLabel"
+		{	
+			"ControlName"	"Label"
+			"fieldName"		"ItemLabel"
+			"font"			"DefaultSmall"
+			"xpos"			"10"
+			"ypos"			"3"
+			"zpos"			"1"
+			"wide"			"270"
+			"tall"			"9"
+			"autoResize"	"0"
+			"pinCorner"		"0"
+			"visible"		"1"
+			"enabled"		"1"
+			"labelText"		"#FreezePanel_Item"
+			"textAlignment"	"Left"
+			"dulltext"		"0"
+			"brighttext"	"0"
+		}
+	}		
+	
+	"FreezePanelBase"	[$WIN32]
+	{
+		"ControlName"	"EditablePanel"
+		"fieldName"		"FreezePanelBase"
+		"xpos"			"r270"
+		"ypos"			"93"		
+		"wide"			"267"		
+		"tall"			"200"		
+		"visible"		"1"
+
+		"FreezePanelBG"
+		{
+			"ControlName"		"CTFImagePanel"
+			"fieldName"		"FreezePanelBG"
+			"xpos"			"8"
+			"ypos"			"160"
+			"zpos"			"0"
+			"wide"			"256"
+			"tall"			"33"
+			"visible"		"1"
+			"enabled"		"1"
+			"image"			"../hud/color_panel_blu"
+			"scaleImage"		"1"	
+			
+			"src_corner_height"		"25"				// pixels inside the image
+			"src_corner_width"		"25"
+				
+			"draw_corner_width"		"0"				// screen size of the corners ( and sides ), proportional
+			"draw_corner_height" 	"0"	
+		}
+		
+		"FreezeLabel"
+		{	
+			"ControlName"		"Label"
+			"fieldName"		"FreezeLabel"
+			"font"			"HudFont14"
+			"xpos"			"9999"
+			"ypos"			"162"
+			"zpos"			"1"
+			"wide"			"252"
+			"tall"			"12"
+			"autoResize"		"0"
+			"pinCorner"		"0"
+			"visible"		"1"
+			"enabled"		"1"
+			"labelText"		"#FreezePanel_Killer"
+			"textAlignment"		"North-West"
+			"dulltext"		"0"
+			"brighttext"		"0"
+		}
+		
+		"FreezePanelHealth"		[$WIN32]
+		{
+			"ControlName"	"CTFFreezePanelHealth"
+			"fieldName"		"FreezePanelHealth"
+			"xpos"			"8"
+			"ypos"			"160"
+			"zpos"			"1"
+			"wide"			"31"
+			"tall"			"31"
+			"visible"		"1"
+			"enabled"		"1"	
+			"HealthBonusPosAdj"	"9"
+			"HealthDeathWarning"	"0.49"
+			"TFFont"		"HudFontSmall"
+			"HealthDeathWarningColor"	"HUDDeathWarning"
+			"TextColor"		"HudOffWhite"
+		}	
+
+		"FreezeLabelKiller"
+		{	
+			"ControlName"	"Label"
+			"fieldName"		"FreezeLabelKiller"
+			"font"			"HudFont14"
+			"xpos"			"66"
+			"ypos"			"173"
+			"zpos"			"5"
+			"wide"			"252"
+			"tall"			"18"
+			"autoResize"	"0"
+			"pinCorner"		"0"
+			"visible"		"1"
+			"enabled"		"1"
+			"labelText"		"%killername%"
+			"textAlignment"		"Left"
+		}
+
+		"AvatarImage"
+		{
+			"ControlName"		"CAvatarImagePanel"
+			"fieldName"		"AvatarImage"
+			"xpos"			"55"
+			"ypos"			"174"
+			"zpos"			"0"
+			"wide"			"14"
+			"tall"			"14"
+			"visible"		"1"
+			"enabled"		"1"
+			"image"			""
+			"scaleImage"		"1"	
+			"color_outline"		"52 48 45 255"
+		}	
+		
+		"NemesisSubPanel"
+		{
+			"ControlName"		"EditablePanel"
+			"fieldName"		"NemesisSubPanel"
+			"xpos"			"9999"		// FIXME
+			"ypos"			"130"
+			"zpos"			"4"
+			"wide"			"306"
+			"tall"			"38"
+			"visible"		"1"
+
+			"NemesisPanelBG"
+			{
+				"ControlName"		"ScalableImagePanel"
+				"fieldName"		"NemesisPanelBG"
+				"xpos"			"95"
+				"ypos"			"4"
+				"zpos"			"5"
+				"wide"			"161"
+				"tall"			"30"
+				"visible"		"1"
+				"enabled"		"1"
+				"image"			"../hud/color_panel_brown"
+				"scaleImage"		"1"	
+				
+				"src_corner_height"		"23"				// pixels inside the image
+				"src_corner_width"		"23"
+					
+				"draw_corner_width"		"6"				// screen size of the corners ( and sides ), proportional
+				"draw_corner_height" 	"6"	
+			}
+			"NemesisIcon"
+			{
+				"ControlName"	"ImagePanel"
+				"fieldName"		"NemesisIcon"
+				"xpos"			"95"
+				"ypos"			"-1"
+				"zpos"			"6"
+				"wide"			"36"
+				"tall"			"36"
+				"visible"		"1"
+				"enabled"		"1"
+				"image"			"../hud/leaderboard_nemesis_freezecam"
+				"scaleImage"	"1"	
+			}		
+			"NemesisLabel"
+			{	
+				"ControlName"		"Label"
+				"fieldName"		"NemesisLabel"
+				"font"			"HudFontMediumSmall"
+				"xpos"			"134"
+				"ypos"			"10"
+				"zpos"			"6"
+				"wide"			"112"
+				"tall"			"18"
+				"autoResize"		"0"
+				"pinCorner"		"0"
+				"visible"		"1"
+				"enabled"		"1"
+				"labelText"		"%nemesisname%"
+				"textAlignment"		"west"
+			}
+			"NemesisLabel2"
+			{	
+				"ControlName"		"Label"
+				"fieldName"		"NemesisLabel2"
+				"font"			"DefaultSmall"
+				"xpos"			"134"
+				"ypos"			"10"
+				"zpos"			"6"
+				"wide"			"112"
+				"tall"			"18"
+				"autoResize"		"0"
+				"pinCorner"		"0"
+				"visible"		"0"
+				"enabled"		"1"
+				"labelText"		"%nemesisadvice%"
+				"textAlignment"		"west"
+			}
+		}
+	}
+		
+	"ScreenshotPanel"
+	{
+		"ControlName"	"EditablePanel"
+		"fieldName"		"ScreenshotPanel"
+		"xpos"			"c-83"
+		"ypos"			"50"
+		"zpos"			"2"
+		"wide"			"166"
+		"tall"			"40"
+		"visible"		"0"
+			
+		"ScreenshotPanelBG"
+		{
+			"ControlName"		"ImagePanel"
+			"fieldName"		"ScreenshotPanelBG"
+			"xpos"			"0"
+			"ypos"			"8"
+			"zpos"			"0"
+			"wide"			"166"
+			"tall"			"38"
+			"visible"		"1"
+			"enabled"		"1"
+			"image"			"../hud/freezecam_black_bg"
+			"scaleImage"		"1"
+		}
+		"ScreenshotIcon"
+		{
+			"ControlName"		"ImagePanel"
+			"fieldName"		"ScreenshotIcon"
+			"xpos"			"3"
+			"ypos"			"0"
+			"zpos"			"1"
+			"wide"			"36"
+			"tall"			"36"
+			"visible"		"1"
+			"enabled"		"1"
+			"image"			"../hud/ico_camera"
+			"scaleImage"	"1"	
+		}		
+		"ScreenshotLabel"
+		{	
+			"ControlName"		"Label"
+			"fieldName"		"ScreenshotLabel"
+			"font"			"SpectatorKeyHints"
+			"xpos"			"40"
+			"ypos"			"25"
+			"zpos"			"2"
+			"wide"			"133"
+			"tall"			"12"
+			"autoResize"		"0"
+			"pinCorner"		"0"
+			"visible"		"1"
+			"enabled"		"1"
+			"labelText"		"%text%"
+			"textAlignment"		"west"
+			"dulltext"		"0"
+			"brighttext"		"0"
+		}
+	}	
+}
diff --git a/resource/ui/freezepanelcallout.res b/resource/ui/freezepanelcallout.res
new file mode 100644
index 0000000..d89ebdd
--- /dev/null
+++ b/resource/ui/freezepanelcallout.res
@@ -0,0 +1,58 @@
+"Resource/UI/FreezePanelCallout.res"
+{
+	"CalloutBG"
+	{
+		"ControlName"		"CTFImagePanel"
+		"fieldName"		"CalloutBG"
+		"xpos"			"9999"
+		"ypos"			"13"
+		"zpos"			"0"
+		"wide"			"76"
+		"tall"			"24"
+		"visible"		"1"
+		"enabled"		"1"
+		"image"			"../hud/color_panel_brown"
+		"scaleImage"		"1"	
+		"teambg_2"		"../hud/color_panel_blu"	// Reversed, due to showing killer's name
+		"teambg_3"		"../hud/color_panel_red"	// Reversed, due to showing killer's name
+		
+		"src_corner_height"		"23"				// pixels inside the image
+		"src_corner_width"		"23"
+			
+		"draw_corner_width"		"5"				// screen size of the corners ( and sides ), proportional
+		"draw_corner_height" 	"5"		
+	}
+	"ArrowIcon"
+	{
+		"ControlName"		"ImagePanel"
+		"fieldName"		"ArrowIcon"
+		"xpos"			"9999"
+		"ypos"			"35"
+		"zpos"			"3"
+		"wide"			"20"
+		"tall"			"10"
+		"visible"		"1"
+		"enabled"		"1"
+		"image"			"../hud/freezecam_callout_arrow"
+		"scaleImage"	"1"	
+	}		
+	"CalloutLabel"
+	{	
+		"ControlName"		"CExLabel"
+		"fieldName"		"CalloutLabel"
+		"font"			"HudFontSmall"
+		"xpos"			"9999"
+		"ypos"			"15"
+		"zpos"			"2"
+		"wide"			"70"
+		"tall"			"20"
+		"autoResize"		"0"
+		"pinCorner"		"0"
+		"visible"		"1"
+		"enabled"		"1"
+		"labelText"		"#FreezePanel_Callout"
+		"textAlignment"		"center"
+		"dulltext"		"0"
+		"brighttext"		"0"
+	}
+}
diff --git a/resource/ui/freezepanelkillerhealth.res b/resource/ui/freezepanelkillerhealth.res
new file mode 100644
index 0000000..53f30be
--- /dev/null
+++ b/resource/ui/freezepanelkillerhealth.res
@@ -0,0 +1,140 @@
+"Resource/UI/FreezePanelKillerHealth.res"
+{
+	"PlayerStatusHealthImage"
+	{
+		"ControlName"	"ImagePanel"
+		"fieldName"		"PlayerStatusHealthImage"
+		"xpos"			"9999"
+		"ypos"			"6"
+		"zpos"			"4"
+		"wide"			"f0"
+		"tall"			"f0"
+		"visible"		"1"
+		"enabled"		"1"
+		"scaleImage"	"1"	
+	}		
+	"PlayerStatusHealthImageBG"
+	{
+		"ControlName"	"ImagePanel"
+		"fieldName"		"PlayerStatusHealthImageBG"
+		"xpos"			"9999"
+		"ypos"			"4"
+		"zpos"			"3"
+		"wide"			"f0"
+		"tall"			"f0"
+		"visible"		"1"
+		"enabled"		"1"
+		"image"			"../hud/health_bg"
+		"scaleImage"	"1"	
+	}	
+	"BuildingStatusHealthImageBG"
+	{
+		"ControlName"	"ImagePanel"
+		"fieldName"		"BuildingStatusHealthImageBG"
+		"xpos"			"9999"
+		"ypos"			"2"
+		"zpos"			"2"
+		"wide"			"f0"
+		"tall"			"f0"
+		"visible"		"0"
+		"enabled"		"1"
+		"image"			"../hud/health_equip_bg"
+		"scaleImage"	"1"	
+	}
+	"TargetHealthBG"	
+	{
+		"ControlName"	"CExImageButton"
+		"fieldName"		"TargetHealthBG"
+		"xpos"			"-5"
+		"ypos"			"9"
+		"zpos"			"1"
+		"wide"			"70"
+		"tall"			"15"
+		"autoResize"	"0"
+		"pinCorner"		"0"
+		"visible"		"1"
+		"enabled"		"1"
+		"defaultbgcolor_override"	"colortransparentgray"
+		"PaintBackgroundType"	"0"
+        "textinsety" 	"99"
+		"border" "noborder"
+	}	
+	"PlayerStatusHealthBonusImage"
+	{
+		"ControlName"	"ImagePanel"
+		"fieldName"		"PlayerStatusHealthBonusImage"
+		"xpos"			"99999"
+		"ypos"			"4"
+		"zpos"			"3"
+		"wide"			"24"
+		"tall"			"24"
+		"visible"		"0"
+		"enabled"		"1"
+		"image"			"../hud/health_over_bg"
+		"scaleImage"	"1"	
+	}
+	"PlayerStatusHealthValue"
+	{
+		"ControlName"	"CExLabel"
+		"fieldName"		"PlayerStatusHealthValue"
+		"xpos"			"-29"
+		"ypos"			"-9"
+		"zpos"			"5"
+		"wide"			"89"
+		"tall"			"50"
+		"visible"		"0"
+		"enabled"		"0"
+		"labelText"		"%Health%"
+		"textAlignment"	"center"	
+		"font"			"hudfont18"
+		"fgcolor"		"colorwhite"
+	}
+	"SpecGuiHP"
+	{
+		"ControlName"	"CExLabel"
+		"fieldName"		"SpecGuiHP"
+		"xpos"			"-29"
+		"ypos"			"-9"
+		"zpos"			"5"
+		"wide"			"89"
+		"tall"			"50"
+		"visible"		"1"
+		"enabled"		"1"
+		"labelText"		"%Health%"
+		"textAlignment"	"center"	
+		"font"			"hudfont18"
+		"fgcolor"		"colorwhite"
+	}
+	"SpecGuiHPShadow"
+	{
+		"ControlName"	"CExLabel"
+		"fieldName"		"SpecGuiHPShadow"
+		"xpos"			"-1"
+		"ypos"			"-1"
+		"zpos"			"5"
+		"wide"			"89"
+		"tall"			"50"
+		"visible"		"1"
+		"enabled"		"1"
+		"labelText"		"%Health%"
+		"textAlignment"	"center"	
+		"font"			"hudfont18"
+		"fgcolor"		"colorblack"
+		"pin_to_sibling" "SpecGuiHP"
+	}
+	"PlayerStatusPlayerLevel"
+	{
+		"ControlName"	"CExLabel"
+		"fieldName"		"PlayerStatusPlayerLevel"
+		"xpos"			"8"
+		"ypos"			"9"
+		"zpos"			"5"
+		"wide"			"16"
+		"tall"			"12"
+		"visible"		"0"
+		"enabled"		"1"
+		"textAlignment"	"center"	
+		"font"			"ScoreboardVerySmall"
+		"fgcolor"		"TFOrange"
+	}							
+}
diff --git a/resource/ui/hudaccountpanel.res b/resource/ui/hudaccountpanel.res
index cd18b99..0e9dd87 100644
--- a/resource/ui/hudaccountpanel.res
+++ b/resource/ui/hudaccountpanel.res
@@ -64,7 +64,7 @@
 		"textAlignment"	"center"
 		"dulltext"		"0"
 		"brighttext"	"0"
-		"font"			"hudfont14"
+		"font"			"hudfont20"
 		"fgcolor_override" "colorwhite"
 	}
 	"AccountValueShadow"
@@ -74,8 +74,8 @@
 		"xpos"			"-1"
 		"ypos"			"-1"
 		"zpos"			"2"
-		"wide"			"55"
-		"tall"			"26"
+		"wide"			"56"
+		"tall"			"27"
 		"autoResize"	"1"
 		"pinCorner"		"2"
 		"visible"		"1"
@@ -85,7 +85,7 @@
 		"textAlignment"	"center"
 		"dulltext"		"0"
 		"brighttext"	"0"
-		"font"			"hudfont14"
+		"font"			"hudfont20"
 		"fgcolor_override" "colorblack"
 		"pin_to_sibling" "AccountValue"
 	}
diff --git a/resource/ui/hudammoweapons.res b/resource/ui/hudammoweapons.res
index 7176b43..62b3698 100644
--- a/resource/ui/hudammoweapons.res
+++ b/resource/ui/hudammoweapons.res
@@ -93,11 +93,11 @@
 		"fieldName"		"AmmoInReserveShadow"
 		"font"			"hudfont24"
 		"fgcolor"		"colorblack"
-		"xpos"			"-1"
-		"ypos"			"0"
+		"xpos"			"-2"
+		"ypos"			"-2"
 		"zpos"			"7"
 		"wide"			"f0"
-		"tall"			"28"
+		"tall"			"27"
 		"visible"		"0"
 		"enabled"		"1"
 		"textAlignment"	"south-west"		
diff --git a/resource/ui/huditemeffectmeter_killstreak.res b/resource/ui/huditemeffectmeter_killstreak.res
new file mode 100644
index 0000000..553a7d7
--- /dev/null
+++ b/resource/ui/huditemeffectmeter_killstreak.res
@@ -0,0 +1,86 @@
+"Resource/UI/HudItemEffectMeter_Demoman.res"
+{
+	HudItemEffectMeter
+	{
+		"fieldName"		"HudItemEffectMeter"
+		"visible"		"1"
+		"enabled"		"1"
+		"xpos"			"c-150"	[$WIN32]
+		"ypos"			"c55"	[$WIN32]
+		"wide"			"100"
+		"tall"			"50"
+	}
+	
+	"ItemEffectMeterBG"
+	{
+		"ControlName"	"CTFImagePanel"
+		"fieldName"		"ItemEffectMeterBG"
+		"xpos"			"99999"
+		"ypos"			"0"
+		"zpos"			"0"
+		"wide"			"76"
+		"tall"			"44"
+		"visible"		"1"
+		"enabled"		"1"
+		"scaleImage"	"1"			
+	}
+	
+	"ItemEffectMeterLabel"
+	{
+		"ControlName"			"CExLabel"
+		"fieldName"				"ItemEffectMeterLabel"
+		"xpos"					"25"
+		"ypos"					"27"
+		"zpos"					"2"
+		"wide"					"100"
+		"tall"					"15"
+		"autoResize"			"1"
+		"pinCorner"				"2"
+		"visible"				"1"
+		"enabled"				"1"
+		"tabPosition"			"0"
+		"labelText"				"#TF_KillStreak"
+		"textAlignment"			"west"
+		"dulltext"				"0"
+		"brighttext"			"0"
+		"font"					"hudfont10shadow"
+	}
+	
+	"ItemEffectMeter"
+	{	
+		"ControlName"			"ContinuousProgressBar"
+		"fieldName"				"ItemEffectMeter"
+		"font"					"Default"
+		"xpos"					"999999"
+		"ypos"					"23"
+		"zpos"					"2"
+		"wide"					"40"
+		"tall"					"6"				
+		"autoResize"			"0"
+		"pinCorner"				"0"
+		"visible"				"0"
+		"enabled"				"0"
+		"textAlignment"			"Left"
+		"dulltext"				"0"
+		"brighttext"			"0"
+	}					
+	
+	"ItemEffectMeterCount"
+	{
+		"ControlName"			"CExLabel"
+		"fieldName"				"ItemEffectMeterCount"
+		"xpos"					"43"
+		"ypos"					"3"
+		"zpos"					"2"
+		"wide"					"40"
+		"tall"					"20"	
+		"visible"				"1"
+		"enabled"				"1"
+		"labelText"				"%progresscount%"
+		"textAlignment"			"east"
+		"font"					"hudfont14shadow"
+		"pin_to_sibling"		"ItemEffectMeterLabel"
+		"fgcolor_override"		"colorwhite"
+	}
+}
+
diff --git a/resource/ui/hudmatchstatus.res b/resource/ui/hudmatchstatus.res
index 2b04908..b396382 100644
--- a/resource/ui/hudmatchstatus.res
+++ b/resource/ui/hudmatchstatus.res
@@ -297,7 +297,7 @@
 		"PositiveColor"			"0 255 0 255"
 		"NegativeColor"			"255 0 0 255"
 		"delta_lifetime"		"1.5"
-		"delta_item_font"		"Tommy14"
+		"delta_item_font"		"hudfont14"
 
 		if_match
 		{
@@ -309,7 +309,7 @@
 			"PositiveColor"			"0 255 0 255"
 			"NegativeColor"			"255 0 0 255"
 			"delta_lifetime"		"1.5"
-			"delta_item_font"		"Tommy14"
+			"delta_item_font"		"hudfont14"
 		}
 		
 		"TimePanelValue"
@@ -335,7 +335,7 @@
 				"xpos"			"cs-0.5"
 				"ypos"			"10"
 				"tall"			"11"
-				"font"			"Tommy14"
+				"font"			"hudfont14"
 			}
 		}	
 	}
@@ -524,7 +524,7 @@
 			{
 				"ControlName"	"CExLabel"
 				"fieldName"		"respawntime"
-				"font"			"Tommy10"
+				"font"			"hudfont14"
 				"xpos"			"cs-0.5"
 				"ypos"			"0"
 				"zpos"			"5"
@@ -541,7 +541,7 @@
 			{
 				"ControlName"	"CExLabel"
 				"fieldName"		"chargeamount"
-				"font"			"Tommy10"
+				"font"			"hudfont14"
 				"xpos"			"25"
 				"ypos"			"17"
 				"zpos"			"6"
diff --git a/resource/ui/hudobjectivetimepanel.res b/resource/ui/hudobjectivetimepanel.res
new file mode 100644
index 0000000..efe6420
--- /dev/null
+++ b/resource/ui/hudobjectivetimepanel.res
@@ -0,0 +1,360 @@
+"Resource/UI/HudObjectiveTimePanel.res"
+{	
+	"TimePanelBG"
+	{
+		"ControlName"		"ScalableImagePanel"
+		"fieldName"		"TimePanelBG"
+		"xpos"			"16"
+		"xpos_hidef"	"108"
+		"xpos_lodef"	"108"
+		"ypos"			"9"
+		"zpos"			"2"
+		"wide"			"78"
+		"wide_lodef"	"90"
+		"tall"			"33"
+		"tall_lodef"	"38"
+		"visible"		"1"
+		"enabled"		"1"
+		"image"			"../hud/objectives_timepanel_blue_bg"	
+		"scaleImage"		"1"	
+
+		if_match
+		{
+			"visible"	"0"
+		}
+	}
+	"TimePanelProgressBar"
+	{
+		"ControlName"			"CTFProgressBar"
+		"fieldName"			"TimePanelProgressBar"
+		"xpos"				"67"
+		"xpos_hidef"		"159"
+		"xpos_lodef"		"165"
+		"ypos"				"16"
+		"ypos_hidef"		"15"
+		"ypos_lodef"		"16"
+		"zpos"				"4"	
+		"wide"				"20"
+		"wide_lodef"		"25"
+		"tall"				"20"
+		"tall_lodef"		"25"	
+		"visible"			"1"
+		"enabled"			"1"
+		"scaleImage"			"1"
+		"image"				"../hud/objectives_timepanel_progressbar"
+		"color_active"			"TimerProgress.Active"
+		"color_inactive"		"TimerProgress.InActive"
+		"color_warning"			"TimerProgress.Warning"
+		"percent_warning"		"0.75"
+
+		if_match
+		{
+			"visible"	"0"
+		}
+	}
+	"WaitingForPlayersLabel"
+	{
+		"ControlName"		"CExLabel"
+		"fieldName"		"WaitingForPlayersLabel"
+		"xpos"			"16"
+		"xpos_hidef"	"0"
+		"xpos_lodef"	"0"
+		"ypos"			"34"
+		"ypos_hidef"	"41"
+		"ypos_lodef"	"41"
+		"zpos"			"5"
+		"wide"			"78"
+		"wide_hidef"	"300"
+		"wide_lodef"	"300"
+		"tall"			"19"
+		"tall_hidef"	"19"
+		"tall_lodef"	"22"
+		"visible"		"0"
+		"enabled"		"1"
+		"labelText"		"#game_WaitingForPlayers"
+		"textAlignment"		"center"
+		"dulltext"		"0"
+		"brighttext"		"0"
+		"wrap"			"0"
+		"font"			"hudfont12"
+		"font_hidef"	"HudFontSmall"
+		"font_lodef"	"HudFontSmall"
+
+		if_match
+		{
+			"proportionaltoparent"	"1"
+			"xpos"					"0"
+			"ypos"					"21"
+			"wide"					"p1"
+			"font"					"hudfont12"
+			"font_hidef"			"HudFontSmallestBold"
+			"font_lodef"			"HudFontSmallestBold"
+		}
+	}			
+	"WaitingForPlayersBG"
+	{
+		"ControlName"		"CTFImagePanel"
+		"fieldName"		"WaitingForPlayersBG"
+		"xpos"			"16"	[$WIN32]
+		"xpos"			"11"	[$X360]
+		"ypos"			"31"
+		"ypos_hidef"	"-100"	//off-screen
+		"ypos_lodef"	"-100"	//off-screen
+		"zpos"			"1"
+		"wide"			"78"
+		"tall"			"20"
+		"visible"		"0"
+		"enabled"		"1"
+		"image"			"../hud/objectives_timepanel_suddendeath"	
+		"scaleImage"		"1"	
+
+		if_match
+		{
+			"wide"	"0"
+		}
+	}
+	"OvertimeLabel"
+	{
+		"ControlName"		"CExLabel"
+		"fieldName"		"OvertimeLabel"
+		"xpos"			"16"
+		"xpos_hidef"	"0"
+		"xpos_lodef"	"0"
+		"ypos"			"33"
+		"ypos_hidef"	"41"
+		"ypos_lodef"	"41"
+		"zpos"			"5"
+		"wide"			"78"
+		"wide_hidef"	"300"
+		"wide_lodef"	"300"
+		"tall"			"19"
+		"tall_hidef"	"19"
+		"tall_lodef"	"22"
+		"visible"		"0"
+		"enabled"		"1"
+		"labelText"		"#game_Overtime"
+		"textAlignment"		"center"
+		"dulltext"		"0"
+		"brighttext"		"0"
+		"wrap"			"0"
+		"font"			"hudfont12"
+		"font_hidef"	"HudFontSmall"
+		"font_lodef"	"HudFontSmall"
+
+		if_match
+		{
+			"proportionaltoparent"	"1"
+			"xpos"					"0"
+			"ypos"					"21"
+			"wide"					"p1"
+			"font"					"hudfont12"
+			"font_hidef"			"HudFontSmallestBold"
+			"font_lodef"			"HudFontSmallestBold"
+		}
+	}			
+	"OvertimeBG"
+	{
+		"ControlName"		"CTFImagePanel"
+		"fieldName"		"OvertimeBG"
+		"xpos"			"16"	[$WIN32]
+		"xpos"			"11"	[$X360]
+		"ypos"			"31"
+		"ypos_hidef"	"-100"	//off-screen
+		"ypos_lodef"	"-100"	//off-screen
+		"zpos"			"1"
+		"wide"			"78"
+		"tall"			"20"
+		"visible"		"0"
+		"enabled"		"1"
+		"image"			"../hud/objectives_timepanel_suddendeath"	
+		"scaleImage"		"1"	
+
+		if_match
+		{
+			"wide"	"0"
+		}
+	}
+	"SuddenDeathLabel"
+	{
+		"ControlName"		"CExLabel"
+		"fieldName"		"SuddenDeathLabel"
+		"xpos"			"16"
+		"xpos_hidef"	"0"
+		"xpos_lodef"	"0"
+		"ypos"			"33"
+		"ypos_hidef"	"41"
+		"ypos_lodef"	"41"
+		"zpos"			"5"
+		"wide"			"78"
+		"wide_hidef"	"300"
+		"wide_lodef"	"300"
+		"tall"			"19"
+		"tall_hidef"	"19"
+		"tall_lodef"	"22"
+		"visible"		"0"
+		"enabled"		"1"
+		"labelText"		"#game_SuddenDeath"
+		"textAlignment"		"center"
+		"dulltext"		"0"
+		"brighttext"		"0"
+		"wrap"			"0"
+		"font"			"hudfont12"
+		"font_hidef"	"HudFontSmall"
+		"font_lodef"	"HudFontSmall"
+
+		if_match
+		{
+			"proportionaltoparent"	"1"
+			"xpos"					"0"
+			"ypos"					"21"
+			"wide"					"p1"
+			"font"					"hudfont12"
+			"font_hidef"			"HudFontSmallestBold"
+			"font_lodef"			"HudFontSmallestBold"
+		}
+	}			
+	"SuddenDeathBG"
+	{
+		"ControlName"		"CTFImagePanel"
+		"fieldName"		"SuddenDeathBG"
+		"xpos"			"16"	[$WIN32]
+		"xpos"			"11"	[$X360]
+		"ypos"			"31"
+		"ypos_hidef"	"-100"	//off-screen
+		"ypos_lodef"	"-100"	//off-screen
+		"zpos"			"1"
+		"wide"			"78"
+		"tall"			"20"
+		"visible"		"0"
+		"enabled"		"1"
+		"image"			"../hud/objectives_timepanel_suddendeath"	
+		"scaleImage"		"1"	
+
+		if_match
+		{
+			"wide"	"0"
+		}
+	}	
+	"SetupLabel"
+	{
+		"ControlName"	"CExLabel"
+		"fieldName"		"SetupLabel"
+		"xpos"			"16"
+		"xpos_hidef"	"0"
+		"xpos_lodef"	"0"
+		"ypos"			"33"
+		"ypos_hidef"	"41"
+		"ypos_lodef"	"41"
+		"zpos"			"5"
+		"wide"			"78"
+		"wide_hidef"	"300"
+		"wide_lodef"	"300"
+		"tall"			"19"
+		"tall_hidef"	"19"
+		"tall_lodef"	"22"
+		"visible"		"0"
+		"enabled"		"1"
+		"labelText"		"#game_Setup"
+		"textAlignment"		"center"
+		"dulltext"		"0"
+		"brighttext"		"0"
+		"wrap"			"0"
+		"font"			"hudfont12"
+		"font_hidef"	"HudFontSmall"
+		"font_lodef"	"HudFontSmall"
+
+		if_match
+		{
+			"proportionaltoparent"	"1"
+			"xpos"					"0"
+			"ypos"					"21"
+			"wide"					"p1"
+			"font"					"hudfont12"
+			"font_hidef"			"HudFontSmallestBold"
+			"font_lodef"			"HudFontSmallestBold"
+		}
+	}	
+	"SetupBG"
+	{
+		"ControlName"		"CTFImagePanel"
+		"fieldName"		"SetupBG"
+		"xpos"			"16"	[$WIN32]
+		"xpos"			"11"	[$X360]
+		"ypos"			"31"
+		"ypos_hidef"	"-100"	//off-screen
+		"ypos_lodef"	"-100"	//off-screen
+		"zpos"			"1"
+		"wide"			"78"
+		"tall"			"20"
+		"visible"		"0"
+		"enabled"		"1"
+		"image"			"../hud/objectives_timepanel_suddendeath"	
+		"scaleImage"		"1"	
+
+		if_match
+		{
+			"wide"	"0"
+		}
+	}
+	"ServerTimeLimitLabel"
+	{
+		"ControlName"	"CExLabel"
+		"fieldName"		"ServerTimeLimitLabel"
+		"xpos"			"16"
+		"xpos_hidef"	"0"
+		"xpos_lodef"	"0"
+		"ypos"			"33"
+		"ypos_hidef"	"41"
+		"ypos_lodef"	"41"
+		"zpos"			"5"
+		"wide"			"78"
+		"wide_hidef"	"300"
+		"wide_lodef"	"300"
+		"tall"			"19"
+		"tall_hidef"	"19"
+		"tall_lodef"	"22"
+		"visible"		"0"
+		"enabled"		"1"
+		"labelText"		"%servertimeleft%"
+		"textAlignment"		"center"
+		"dulltext"		"0"
+		"brighttext"		"0"
+		"wrap"			"0"
+		"font"			"hudfont12"
+		"font_hidef"	"HudFontSmall"
+		"font_lodef"	"HudFontSmall"
+
+		if_match
+		{
+			"proportionaltoparent"	"1"
+			"xpos"					"0"
+			"ypos"					"21"
+			"wide"					"p1"
+			"font"					"hudfont12"
+			"font_hidef"			"HudFontSmallestBold"
+			"font_lodef"			"HudFontSmallestBold"
+		}
+	}	
+	"ServerTimeLimitLabelBG"
+	{
+		"ControlName"		"CTFImagePanel"
+		"fieldName"		"ServerTimeLimitLabelBG"
+		"xpos"			"16"	[$WIN32]
+		"xpos"			"11"	[$X360]
+		"ypos"			"31"
+		"ypos_hidef"	"-100"	//off-screen
+		"ypos_lodef"	"-100"	//off-screen
+		"zpos"			"1"
+		"wide"			"78"
+		"tall"			"20"
+		"visible"		"0"
+		"enabled"		"1"
+		"image"			"../hud/objectives_timepanel_suddendeath"	
+		"scaleImage"		"1"
+		
+		if_match
+		{
+			"wide"	"0"
+		}	
+	}
+}
diff --git a/resource/ui/mainmenuoverride.res b/resource/ui/mainmenuoverride.res
index c470086..8ba743b 100644
--- a/resource/ui/mainmenuoverride.res
+++ b/resource/ui/mainmenuoverride.res
@@ -2197,13 +2197,28 @@
 		"scaleImage"	"1"
 	}	
 
+	"2ndBorder"
+	{
+		"ControlName"	"EditablePanel"
+		"fieldName"		"2ndBorder"
+		"xpos"			"c-310"
+		"ypos"			"170"
+		"zpos"			"-100"
+		"wide"			"200"
+		"tall"			"90"
+		"visible"		"1"
+		"PaintBackgroundType"	"2"
+		"border"		"MainMenuBGBorder"
+		"proportionaltoparent"	"1"
+	}
+	
 	"CharacterSetupButton"
 	{
 		"ControlName"	"CExImageButton"
 		"fieldName"		"CharacterSetupButton"
-		"xpos"			"c-288"
-		"ypos"			"rs1-18"
-		"wide"			"100"
+		"xpos"			"c-302"
+		"ypos"			"c-62"
+		"wide"			"185"
 		"tall"			"26"
 		"autoResize"	"0"
 		"pinCorner"		"3"
@@ -2245,11 +2260,10 @@
 	"StoreHasNewItemsImage"
 	{
 		"ControlName"	"ImagePanel"
-		"fieldName"		"StoreHasNewItemsImage"
-		"xpos"			"c-85"
-		"ypos"			"r50"
-		"zpos"			"13"
-		"wide"			"32"
+		"xpos"			"9999"
+		"ypos"			"c-57"
+		"wide"			"185"
+		"tall"			"26"
 		"tall"			"32"
 		"visible"		"0"
 		"enabled"		"1"
@@ -2262,9 +2276,9 @@
 	{
 		"ControlName"	"CExImageButton"
 		"fieldName"		"GeneralStoreButton"
-		"xpos"			"c-165"
-		"ypos"			"rs1-18"
-		"wide"			"100"
+		"xpos"			"c-302"
+		"ypos"			"c-32"
+		"wide"			"185"
 		"tall"			"26"
 		"autoResize"	"0"
 		"pinCorner"		"3"
diff --git a/resource/ui/spectator.res b/resource/ui/spectator.res
index 8ff075c..52c63bd 100644
--- a/resource/ui/spectator.res
+++ b/resource/ui/spectator.res
@@ -69,7 +69,7 @@
 		"enabled"		"1"
 		"labelText"		"#game_respawntime_in_secs"
 		"textAlignment"		"center"
-		"font"			"Tommy21Shadow"
+		"font"			"hudfont18Shadow"
 		"fgcolor_override" "colorwhite"
 	}
 	"BuyBackLabel"
diff --git a/resource/ui/winpanel.res b/resource/ui/winpanel.res
index 6decaa5..fe9eb77 100644
--- a/resource/ui/winpanel.res
+++ b/resource/ui/winpanel.res
@@ -321,7 +321,7 @@
 		"fieldName"		"AdvancingTeamLabel"
 		"font"			"hudfont14"
 		"xpos"			"15"
-		"ypos"			"72"
+		"ypos"			"97"
 		"zpos"			"1"
 		"wide"			"268"
 		"tall"			"24"
@@ -340,8 +340,8 @@
 		"fieldName"		"AdvancingTeamLabelDropshadow"
 		"font"			"hudfont14"
 		"fgcolor"		"black"
-		"xpos"			"16"
-		"ypos"			"73"
+		"xpos"			"-1"
+		"ypos"			"-1"
 		"zpos"			"1"
 		"wide"			"268"
 		"tall"			"24"
@@ -353,6 +353,7 @@
 		"textAlignment"		"Center"
 		"dulltext"		"0"
 		"brighttext"		"0"
+		"pin_to_sibling" "AdvancingTeamLabel"
 	}
 	"WinReasonLabel"
 	{	
@@ -413,7 +414,7 @@
 	{	
 		"ControlName"		"CExLabel"
 		"fieldName"		"TopPlayerLabel"
-		"font"			"hudfont14"
+		"font"			"hudfont14shadow"
 		"xpos"			"18"
 		"ypos"			"114"
 		"zpos"			"3"
@@ -428,32 +429,11 @@
 		"dulltext"		"0"
 		"brighttext"		"0"
 	}
-	"TopPlayersLabelShadow"
-	{	
-		"ControlName"		"CExLabel"
-		"fieldName"		"TopPlayersLabelShadow"
-		"font"			"hudfont14"
-		"xpos"			"19"
-		"ypos"			"115"
-		"zpos"			"3"
-		"wide"			"200"
-		"tall"			"20"
-		"autoResize"		"0"
-		"pinCorner"		"0"
-		"visible"		"1"
-		"enabled"		"1"
-		"labelText"		"%TopPlayersLabel%"
-		"textAlignment"		"west"
-		"dulltext"		"0"
-		"brighttext"		"0"
-//		"pin_to_sibling" "TopPlayersLabel"
-		"fgcolor_override" "colorblack"
-	}
 	"PointsThisRoundLabel"
 	{	
 		"ControlName"		"CExLabel"
 		"fieldName"		"PointsThisRoundLabel"
-		"font"			"hudfont14"
+		"font"			"hudfont14shadow"
 		"xpos"			"139"
 		"ypos"			"114"
 		"zpos"			"3"
@@ -468,27 +448,6 @@
 		"dulltext"		"0"
 		"brighttext"		"0"
 	}
-	"PointsThisRoundLabelShadow"
-	{	
-		"ControlName"		"CExLabel"
-		"fieldName"		"PointsThisRoundLabelShadow"
-		"font"			"hudfont14"
-		"xpos"			"-1"
-		"ypos"			"-1"
-		"zpos"			"3"
-		"wide"			"140"
-		"tall"			"20"
-		"autoResize"		"0"
-		"pinCorner"		"0"
-		"visible"		"1"
-		"enabled"		"1"
-		"labelText"		"#Winpanel_PointsThisRound"
-		"textAlignment"		"east"
-		"dulltext"		"0"
-		"brighttext"		"0"
-		"pin_to_sibling" "PointsThisRoundLabel"
-		"fgcolor_override" "colorblack"
-	}
 	"HorizontalLine"
 	{
 		"ControlName"		"ImagePanel"
diff --git a/scripts/hudanimations_custom.txt b/scripts/hudanimations_custom.txt
index 68bffd0..a7f8e4c 100644
--- a/scripts/hudanimations_custom.txt
+++ b/scripts/hudanimations_custom.txt
@@ -7,53 +7,6 @@ event DamagedPlayer
 	Animate	Hitmarker fgcolor	"255 0 0 0"		spline 0.1 0.2 // fade out
 }
 
-//====================================
-// ubercharge
-// might lag the game a little? not sure
-
-event HudMedicCharged
-{
-	Animate	ChargeLabel 	FgColor		"colordullwhite"		spline 0.0 0.3
-	Animate	ChargeLabel 	FgColor		"colorwhite"			spline 0.3 0.3
-	
-	Animate	ChargeMeter 	FgColor		"ubercharge1"			spline 0.0 0.3
-	Animate	ChargeMeter 	FgColor		"ubercharge2"			spline 0.3 0.3
-
-	Animate	ChargeColor_25 	BgColor		"ubercharge2"			spline 0.0 0.3
-	Animate	ChargeColor_25 	BgColor		"ubercharge1"			spline 0.3 0.3
-	
-	Animate	ChargeColor_50 	BgColor		"ubercharge2"			spline 0.0 0.3
-	Animate	ChargeColor_50 	BgColor		"ubercharge1"			spline 0.3 0.3
-
-	Animate	ChargeColor_75 	BgColor		"ubercharge2"			spline 0.0 0.3
-	Animate	ChargeColor_75 	BgColor		"ubercharge1"			spline 0.3 0.3
-	
-	Animate	ChargeColor_100 BgColor		"ubercharge2"			spline 0.0 0.3
-	Animate	ChargeColor_100 BgColor		"ubercharge1"			spline 0.3 0.3
-	
-	RunEvent HudMedicChargedLoop	0.6
-}
-
-// call to loop HudHealthBonusPulse
-event HudMedicChargedLoop
-{
-	RunEvent HudMedicCharged 0.0
-}
-
-event HudMedicChargedStop
-{
-	StopEvent HudMedicCharged 0.0
-	StopEvent HudMedicChargedLoop 0.0
-	
-	Animate	ChargeLabel 	FgColor		"colorwhite"			Linear 0 0
-	Animate	ChargeMeter 	FgColor		"colorwhite"			Linear 0 0
-
-	Animate	ChargeColor_25 	BgColor		"meter1alt"			spline 0 0
-	Animate	ChargeColor_50 	BgColor		"meter2alt"			spline 0 0
-	Animate	ChargeColor_75 	BgColor		"meter3alt"			spline 0 0
-	Animate	ChargeColor_100 BgColor		"meter4alt"			spline 0 0
-}
-
 // ===========================================
 // overheal
 
diff --git a/scripts/hudanimations_manifest.txt b/scripts/hudanimations_manifest.txt
index ba4291c..a0db9d0 100644
--- a/scripts/hudanimations_manifest.txt
+++ b/scripts/hudanimations_manifest.txt
@@ -1,7 +1,9 @@
 hudanimations_manifest
 {
 
-"file" "scripts/hudanimations.txt"
-"file" "scripts/hudanimations_custom.txt"
-"file" "scripts/hudanimations_tf.txt"
+	"file" 		"scripts/hudanimations.txt"
+	"file" 		"scripts/hudanimations_custom.txt"
+	"file"		"scripts/hudanimations_mediccharge.txt"
+	"file"		"scripts/hudanimations_tf.txt"
+	
 }
\ No newline at end of file
diff --git a/scripts/hudanimations_mediccharge.txt b/scripts/hudanimations_mediccharge.txt
new file mode 100644
index 0000000..5f1b9ba
--- /dev/null
+++ b/scripts/hudanimations_mediccharge.txt
@@ -0,0 +1,42 @@
+event HudMedicCharged
+{
+	Animate	ChargeLabel 	FgColor		"colordullwhite"		spline 0.0 0.3
+	Animate	ChargeLabel 	FgColor		"colorwhite"			spline 0.3 0.3
+	
+	Animate	ChargeMeter 	FgColor		"ubercharge1"			spline 0.0 0.3
+	Animate	ChargeMeter 	FgColor		"ubercharge2"			spline 0.3 0.3
+
+	Animate	ChargeColor_25 	BgColor		"ubercharge2"			spline 0.0 0.3
+	Animate	ChargeColor_25 	BgColor		"ubercharge1"			spline 0.3 0.3
+	
+	Animate	ChargeColor_50 	BgColor		"ubercharge2"			spline 0.0 0.3
+	Animate	ChargeColor_50 	BgColor		"ubercharge1"			spline 0.3 0.3
+
+	Animate	ChargeColor_75 	BgColor		"ubercharge2"			spline 0.0 0.3
+	Animate	ChargeColor_75 	BgColor		"ubercharge1"			spline 0.3 0.3
+	
+	Animate	ChargeColor_100 BgColor		"ubercharge2"			spline 0.0 0.3
+	Animate	ChargeColor_100 BgColor		"ubercharge1"			spline 0.3 0.3
+	
+	RunEvent HudMedicChargedLoop	0.6
+}
+
+// call to loop HudHealthBonusPulse
+event HudMedicChargedLoop
+{
+	RunEvent HudMedicCharged 0.0
+}
+
+event HudMedicChargedStop
+{
+	StopEvent HudMedicCharged 0.0
+	StopEvent HudMedicChargedLoop 0.0
+	
+	Animate	ChargeLabel 	FgColor		"colorwhite"			Linear 0 0
+	Animate	ChargeMeter 	FgColor		"colorwhite"			Linear 0 0
+
+	Animate	ChargeColor_25 	BgColor		"meter1alt"			spline 0 0
+	Animate	ChargeColor_50 	BgColor		"meter2alt"			spline 0 0
+	Animate	ChargeColor_75 	BgColor		"meter3alt"			spline 0 0
+	Animate	ChargeColor_100 BgColor		"meter4alt"			spline 0 0
+}
\ No newline at end of file
diff --git a/sound/sound.cache b/sound/sound.cache
deleted file mode 100644
index 4f74689..0000000
Binary files a/sound/sound.cache and /dev/null differ