Fixed Phlog/Jet Pack Meters in Minmode

- Removed duplicate backgrounds
- Fixed the Phlog and Thermal Thruster meters in minmode

19 files changed, 161 insertions, 297 deletions

diff --git a/customizations/Backgrounds/background_upward.vtf b/customizations/Backgrounds/background_upward.vtf
deleted file mode 100644
index 6eae25d..0000000
--- a/customizations/Backgrounds/background_upward.vtf
+++ /dev/null
diff --git a/customizations/Backgrounds/background_upward_widescreen.vtf b/customizations/Backgrounds/background_upward_widescreen.vtf
deleted file mode 100644
index 6eae25d..0000000
--- a/customizations/Backgrounds/background_upward_widescreen.vtf
+++ /dev/null
diff --git a/resource/ui/huditemeffectmeter.res b/resource/ui/huditemeffectmeter.res
index 5fd6d8b..b10aadc 100644
--- a/resource/ui/huditemeffectmeter.res
+++ b/resource/ui/huditemeffectmeter.res
@@ -8,7 +8,7 @@
 		"xpos"				"c-75"
 		"xpos_minmode"		"c-55"
 		"ypos"				"c103"
-		"ypos_minmode"		"c50"
+		"ypos_minmode"		"c48"
 		"wide"				"180"
 		"tall"				"8"
 		"MeterFG"			"White"
@@ -21,7 +21,7 @@
 		"fieldName"			"ItemEffectMeterLabel"
 		"xpos"				"125"
 		"ypos"				"0"
-		"zpos"				"3"
+		"zpos"				"2"
 		"wide"				"80"
 		"tall"				"8"
 		"autoResize"		"1"
@@ -35,7 +35,6 @@
 		"dulltext"			"0"
 		"brighttext"		"0"
 		"font"				"Cerbetica11"
-		"font_minmode"		"Cerbetica8"
 	}
 
 	"ItemEffectMeter"
diff --git a/resource/ui/huditemeffectmeter_cleaver.res b/resource/ui/huditemeffectmeter_cleaver.res
index 6276f58..e819cb4 100644
--- a/resource/ui/huditemeffectmeter_cleaver.res
+++ b/resource/ui/huditemeffectmeter_cleaver.res
@@ -5,6 +5,6 @@
 	"HudItemEffectMeter"
 	{
 		"ypos"					"c93"
-		"ypos_minmode"			"c53"
+		"ypos_minmode"			"c54"
 	}
 }
\ No newline at end of file
diff --git a/resource/ui/huditemeffectmeter_heavy.res b/resource/ui/huditemeffectmeter_heavy.res
index d47ab7d..f45179b 100644
--- a/resource/ui/huditemeffectmeter_heavy.res
+++ b/resource/ui/huditemeffectmeter_heavy.res
@@ -5,6 +5,6 @@
 	"HudItemEffectMeter"
 	{
 		"ypos"					"c93"
-		"ypos_minmode"			"c53"
+		"ypos_minmode"			"c54"
 	}
 }
\ No newline at end of file
diff --git a/resource/ui/huditemeffectmeter_kartcharge.res b/resource/ui/huditemeffectmeter_kartcharge.res
index dceb120..0efa20b 100644
--- a/resource/ui/huditemeffectmeter_kartcharge.res
+++ b/resource/ui/huditemeffectmeter_kartcharge.res
@@ -2,16 +2,16 @@
 {
 	HudItemEffectMeter
 	{
-		"fieldName"		"HudItemEffectMeter"
-		"visible"		"1"
-		"enabled"		"1"
-		"xpos"			"c-75"
-		"ypos"			"c156"
-		"ypos_minmode"	"c23"
-		"wide"			"500"
-		"tall"			"500"
-		"MeterFG"		"White"
-		"MeterBG"		"Gray"
+		"fieldName"				"HudItemEffectMeter"
+		"visible"				"1"
+		"enabled"				"1"
+		"xpos"					"c-75"
+		"ypos"					"c156"
+		"ypos_minmode"			"c23"
+		"wide"					"500"
+		"tall"					"500"
+		"MeterFG"				"White"
+		"MeterBG"				"Gray"
 	}
 
 	"ItemEffectMeterLabel"
@@ -102,7 +102,7 @@
 		"brighttext"			"0"
 		"font"					"CerbeticaBold28"
 		"font_minmode"			"CerbeticaBold20"
-		"fgcolor_override"		"TransparentBlack"
+		"fgcolor"				"TransparentBlack"
 
 		"pin_to_sibling"		"ItemEffectMeterCount"
 		"pin_corner_to_sibling" "PIN_TOPLEFT"
diff --git a/resource/ui/huditemeffectmeter_particlecannon.res b/resource/ui/huditemeffectmeter_particlecannon.res
index 0d26c56..d832ac3 100644
--- a/resource/ui/huditemeffectmeter_particlecannon.res
+++ b/resource/ui/huditemeffectmeter_particlecannon.res
@@ -5,6 +5,6 @@
 	"HudItemEffectMeter"
 	{
 		"ypos"					"c93"
-		"ypos_minmode"			"c53"
+		"ypos_minmode"			"c54"
 	}
 }
\ No newline at end of file
diff --git a/resource/ui/huditemeffectmeter_pomson.res b/resource/ui/huditemeffectmeter_pomson.res
index 0819f70..f2515e8 100644
--- a/resource/ui/huditemeffectmeter_pomson.res
+++ b/resource/ui/huditemeffectmeter_pomson.res
@@ -5,6 +5,6 @@
 	"HudItemEffectMeter"
 	{
 		"ypos"					"c93"
-		"ypos_minmode"			"c46"
+		"ypos_minmode"			"c54"
 	}
 }
\ No newline at end of file
diff --git a/resource/ui/huditemeffectmeter_powerupbottle.res b/resource/ui/huditemeffectmeter_powerupbottle.res
index caf00e8..77cfca1 100644
--- a/resource/ui/huditemeffectmeter_powerupbottle.res
+++ b/resource/ui/huditemeffectmeter_powerupbottle.res
@@ -5,7 +5,7 @@
 		"fieldName"			"HudItemEffectMeter"
 		"visible"			"1"
 		"enabled"			"1"
-		"xpos"				"c-327"
+		"xpos"				"c-267"
 		"xpos_minmode"		"c-250"
 		"ypos"				"r72"
 		"ypos_minmode"		"r146"
@@ -26,7 +26,7 @@
 		"tall"				"20"
 		"visible"			"1"
 		"enabled"			"1"
-		"bgcolor_override"	"0 0 0 200"
+		"bgcolor_override"	"TransparentBlack"
 		"PaintBackgroundType"	"2"
 	}
 
diff --git a/resource/ui/huditemeffectmeter_pyro.res b/resource/ui/huditemeffectmeter_pyro.res
index 811c3de..33d3999 100644
--- a/resource/ui/huditemeffectmeter_pyro.res
+++ b/resource/ui/huditemeffectmeter_pyro.res
@@ -5,5 +5,6 @@
 	"HudItemEffectMeter"
 	{
 		"ypos"					"c93"
+		"ypos_minmode"			"c54"
 	}
 }
\ No newline at end of file
diff --git a/resource/ui/huditemeffectmeter_sapper.res b/resource/ui/huditemeffectmeter_sapper.res
index aef6ae4..9e3aeb8 100644
--- a/resource/ui/huditemeffectmeter_sapper.res
+++ b/resource/ui/huditemeffectmeter_sapper.res
@@ -5,6 +5,6 @@
 	"HudItemEffectMeter"
 	{
 		"ypos"					"c83"
-		"ypos_minmode"			"c46"
+		"ypos_minmode"			"c60"
 	}
 }
\ No newline at end of file
diff --git a/resource/ui/huditemeffectmeter_scout.res b/resource/ui/huditemeffectmeter_scout.res
index d47ab7d..f45179b 100644
--- a/resource/ui/huditemeffectmeter_scout.res
+++ b/resource/ui/huditemeffectmeter_scout.res
@@ -5,6 +5,6 @@
 	"HudItemEffectMeter"
 	{
 		"ypos"					"c93"
-		"ypos_minmode"			"c53"
+		"ypos_minmode"			"c54"
 	}
 }
\ No newline at end of file
diff --git a/resource/ui/huditemeffectmeter_sniperfocus.res b/resource/ui/huditemeffectmeter_sniperfocus.res
index a88ce04..4ea7364 100644
--- a/resource/ui/huditemeffectmeter_sniperfocus.res
+++ b/resource/ui/huditemeffectmeter_sniperfocus.res
@@ -5,6 +5,6 @@
 	"HudItemEffectMeter"
 	{
 		"ypos"					"c93"
-		"ypos_minmode"			"c46"
+		"ypos_minmode"			"c54"
 	}
 }
\ No newline at end of file
diff --git a/resource/ui/huditemeffectmeter_sodapopper.res b/resource/ui/huditemeffectmeter_sodapopper.res
index d5b1523..ce68c9b 100644
--- a/resource/ui/huditemeffectmeter_sodapopper.res
+++ b/resource/ui/huditemeffectmeter_sodapopper.res
@@ -5,6 +5,6 @@
 	"HudItemEffectMeter"
 	{
 		"ypos"					"c83"
-		"ypos_minmode"			"c46"
+		"ypos_minmode"			"c60"
 	}
 }
\ No newline at end of file
diff --git a/resource/ui/huditemeffectmeter_spyknife.res b/resource/ui/huditemeffectmeter_spyknife.res
index 4b700c1..3ef775d 100644
--- a/resource/ui/huditemeffectmeter_spyknife.res
+++ b/resource/ui/huditemeffectmeter_spyknife.res
@@ -5,6 +5,6 @@
 	"HudItemEffectMeter"
 	{
 		"ypos"					"c93"
-		"ypos_minmode"			"c53"
+		"ypos_minmode"			"c54"
 	}
 }
\ No newline at end of file
diff --git a/resource/ui/hudmediccharge.res b/resource/ui/hudmediccharge.res
index 7b44ce4..27d0a5e 100644
--- a/resource/ui/hudmediccharge.res
+++ b/resource/ui/hudmediccharge.res
@@ -21,7 +21,7 @@
 	{
 		"ControlName"		"CExLabel"
 		"fieldName"			"ChargeLabel"
-		"xpos"				"150"
+		"xpos"				"165"
 		"ypos"				"35"
 		"xpos_minmode"		"106"
 		"ypos_minmode"		"-5"
@@ -71,27 +71,24 @@
 
 	"IndividualChargesLabel"
 	{
-		"ControlName"		"CExLabel"
+		"ControlName"		"CExImageButton"
 		"fieldName"			"IndividualChargesLabel"
-		"xpos"				"150"
-		"ypos"				"35"
-		"xpos_minmode"		"106"
-		"ypos_minmode"		"-5"
+		"xpos"				"160"
+		"ypos"				"55"
 		"zpos"				"2"
-		"wide"				"120"
-		"tall"				"0"
-		"autoResize"		"1"
-		"pinCorner"			"2"
+		"wide"				"122"
+		"tall"				"35"
+		"xpos_minmode"		"140"
+		"ypos_minmode"		"23"
+		"wide_minmode"		"102"
+		"tall_minmode"		"20"
+		"autoResize"		"0"
+		"pinCorner"			"0"
 		"visible"			"1"
 		"enabled"			"1"
-		"tabPosition"		"0"
-		"labelText"			"#TF_IndividualUberchargesMinHUD"
-		"textAlignment"		"center"
-		"dulltext"			"0"
-		"brighttext"		"0"
-		"font"				"CerbeticaBoldOutline56"
-		"font_minmode"		"CerbeticaBoldOutline32"
-		"fgcolor"			"Ammo In Clip"
+		"defaultbgcolor_override"	"25 25 25 255"
+		"PaintBackgroundType"	"0"
+        "textinsety" 			"99"
 	}
 
 	"ChargeMeterLabel"
@@ -147,14 +144,11 @@
 		"ControlName"		"ContinuousProgressBar"
 		"fieldName"			"ChargeMeter1"
 		"font"				"Default"
-		"xpos"				"150"
-		"ypos"				"50"
+		"xpos"				"-5"
+		"ypos"				"-5"
 		"zpos"				"3"
-		"xpos_minmode"		"125"
-		"ypos_minmode"		"28"
-		"zpos_minmode"		"3"
 		"wide"				"27"
-		"tall"				"40"
+		"tall"				"25"
 		"wide_minmode"		"22"
 		"tall_minmode"		"10"
 		"autoResize"		"0"
@@ -165,6 +159,10 @@
 		"dulltext"			"0"
 		"brighttext"		"0"
 		"fgcolor_override"	"Uber Bar Color"
+
+		"pin_to_sibling"		"IndividualChargesLabel"
+		"pin_corner_to_sibling"	"PIN_TOPLEFT"
+		"pin_to_sibling_corner"	"PIN_TOPLEFT"
 	}
 
 	"ChargeMeter2"
@@ -176,7 +174,7 @@
 		"ypos"				"0"
 		"zpos"				"4"
 		"wide"				"27"
-		"tall"				"40"
+		"tall"				"25"
 		"wide_minmode"		"22"
 		"tall_minmode"		"10"
 		"autoResize"		"0"
@@ -202,7 +200,7 @@
 		"ypos"				"0"
 		"zpos"				"4"
 		"wide"				"27"
-		"tall"				"40"
+		"tall"				"25"
 		"wide_minmode"		"22"
 		"tall_minmode"		"10"
 		"autoResize"		"0"
@@ -228,7 +226,7 @@
 		"ypos"				"0"
 		"zpos"				"4"
 		"wide"				"27"
-		"tall"				"40"
+		"tall"				"25"
 		"wide_minmode"		"22"
 		"tall_minmode"		"10"
 		"autoResize"		"0"
@@ -263,13 +261,13 @@
 	{
 		"ControlName"		"EditablePanel"
 		"fieldName"			"ResistIconAnchor"
-		"xpos"				"50"
-		"ypos"				"45"
-		"xpos_minmode"		"50"
-		"ypos_minmode"		"10"
+		"xpos"				"160"
+		"ypos"				"95"
+		"xpos_minmode"		"210"
+		"ypos_minmode"		"48"
 		"zpos"				"2"
-		"wide"				"55"
-		"tall"				"50"
+		"wide"				"30"
+		"tall"				"30"
 		"visible"			"1"
 		"enabled"			"1"
 	}
@@ -281,8 +279,8 @@
 		"xpos"				"0"
 		"ypos"				"0"
 		"zpos"				"3"
-		"wide"				"50"
-		"tall"				"50"
+		"wide"				"30"
+		"tall"				"30"
 		"visible"			"1"
 		"enabled"			"1"
 		"image"				"../HUD/defense_buff_bullet_blue"
@@ -292,25 +290,4 @@
 		"pin_corner_to_sibling"	"PIN_TOPLEFT"
 		"pin_to_sibling_corner"	"PIN_TOPLEFT"
 	}
-
-	"ResistIconBG"
-	{
-		"ControlName"		"EditablePanel"
-		"fieldName"			"ResistIconBG"
-		"xpos"				"5"
-		"ypos"				"5"
-		"zpos"				"2"
-		"wide"				"122"
-		"wide_minmode"		"102"
-		"tall"				"50"
-		"tall_minmode"		"20"
-		"visible"			"1"
-		"enabled"			"1"
-		"bgcolor_override"		"25 25 25 255"
-		"PaintBackgroundType"	"2"
-
-		"pin_to_sibling"		"ChargeMeter1"
-		"pin_corner_to_sibling"	"PIN_TOPLEFT"
-		"pin_to_sibling_corner"	"PIN_TOPLEFT"
-	}
 }
\ No newline at end of file
diff --git a/resource/ui/hudrocketpack.res b/resource/ui/hudrocketpack.res
index 25877e7..e67f658 100644
--- a/resource/ui/hudrocketpack.res
+++ b/resource/ui/hudrocketpack.res
@@ -4,9 +4,6 @@
 {
 	HudItemEffectMeter
 	{
-		"ypos"			"c103"
-		"ypos_minmode"	"c60"
-		"wide"			"180"
 		"tall"			"20"
 	}
 
@@ -35,20 +32,14 @@
 
 	"ItemEffectMeterLabel"
 	{
-		"xpos"			"32"
-		"ypos"			"12"
-		"wide"			"90"
-		"tall"			"15"
 		"visible"		"0"
 		"labelText"		"#TF_RocketPack_Disabled"
-		"font"			"HudFontSmallest"
 	}
 
 	"ItemEffectMeter"
 	{
-		"xpos_minmode"	"10"
 		"wide"			"60"
-		"wide_minmode"	"57"
+		"wide_minmode"	"55"
 	}
 
 	"ItemEffectMeter2"
@@ -57,12 +48,12 @@
 		"fieldName"		"ItemEffectMeter2"
 		"font"			"Default"
 		"xpos"			"60"
-		"xpos_minmode"	"67"
+		"xpos_minmode"	"55"
 		"ypos"			"0"
 		"zpos"			"2"
 		"wide"			"60"
 		"tall"			"8"
-		"wide_minmode"	"57"
+		"wide_minmode"	"55"
 		"tall_minmode"	"5"
 		"autoResize"	"0"
 		"pinCorner"		"0"
diff --git a/resource/ui/hudtournament.res b/resource/ui/hudtournament.res
index 45ef262..4b066ce 100644
--- a/resource/ui/hudtournament.res
+++ b/resource/ui/hudtournament.res
@@ -5,9 +5,10 @@
 		"ControlName"			"EditablePanel"
 		"fieldName"				"HudTournament"
 		"xpos"					"0"
-		"ypos"					"-10"
+		"ypos"					"25"
 		"wide"					"f0"
 		"tall"					"480"
+		"proportionaltoparent"	"1"
 
 		"team1_player_base_offset_x"	"-75"
 		"team1_player_base_y"			"0"
@@ -24,6 +25,43 @@
 		"name_width"					"57"
 		"horiz_inset"					"2"
 
+		if_mvm
+		{
+			"xpos"						"0"
+			"ypos"						"0"
+			"wide"						"f0"
+			"tall"						"480"
+
+			"team1_player_base_y"		"66"
+			"team2_player_base_y"		"66"
+			"team2_player_delta_x"		"52"
+		}
+
+		if_competitive
+		{
+			"xpos"						"0"
+			"ypos"						"25"
+			"wide"						"f0"
+			"tall"						"480"
+
+			"team1_player_base_y"		"66"
+			"team2_player_base_y"		"66"
+			"team2_player_base_offset_x" "5"
+		}
+
+		if_readymode
+		{
+			"xpos"						"0"
+			"ypos"						"25"
+			"wide"						"f0"
+			"tall"						"480"
+
+			"team1_player_base_y"		"66"
+			"team2_player_base_y"		"66"
+			"team2_player_delta_x"		"52"
+			"team2_player_base_offset_x" "5"
+		}
+
 		"ModeImage"
 		{
 			"ControlName"	"ImagePanel"
@@ -56,6 +94,12 @@
 			"color_ready"		"0 255 0 220"
 			"color_notready"	"0 0 0 220"
 
+			if_competitive
+			{
+				"wide"		"40"
+				"tall"		"29"
+			}
+
 			"PanelBG"
 			{
 				"ControlName"	"ImagePanel"
@@ -70,6 +114,12 @@
 				"visible"		"0"
 				"enabled"		"0"
 				"fillcolor"		"ColorBlack"
+
+				if_competitive
+				{
+					"wide"		"38"
+					"tall"		"20"
+				}
 			}
 
 			"playername"
@@ -88,31 +138,13 @@
 				"labelText"		"%playername%"
 				"textAlignment"	"north-west"
 
-				if_mvm
-				{
-					"xpos"		"1"
-					"ypos"		"26"
-					"wide"		"38"
-					"font"		"Cerbetica8"
-					"textAlignment"	"center"
-				}
-
 				if_competitive
 				{
 					"xpos"		"1"
-					"ypos"		"26"
-					"wide"		"38"
-					"font"		"Cerbetica8"
-					"textAlignment"	"center"
-				}
-
-				if_readymode
-				{
-					"xpos"		"1"
-					"ypos"		"26"
-					"wide"		"38"
-					"font"		"Cerbetica8"
-					"textAlignment"	"center"
+					"ypos"		"20"
+					"wide"		"39"
+					"tall"		"10"
+					"font"		"DefaultVerySmall"
 				}
 			}
 
@@ -132,28 +164,18 @@
 
 				if_mvm
 				{
-					"xpos"		"7"
-					"ypos"		"0"
-					"wide"		"26"
-					"tall"		"26"
 					"image"		"../vgui/hud_connecting"
 				}
 
 				if_competitive
 				{
-					"xpos"		"7"
-					"ypos"		"1"
-					"wide"		"26"
-					"tall"		"26"
+					"wide"		"20"
+					"tall"		"20"
 					"image"		"../vgui/hud_connecting"
 				}
 
 				if_readymode
 				{
-					"xpos"		"7"
-					"ypos"		"1"
-					"wide"		"26"
-					"tall"		"26"
 					"image"		"../vgui/hud_connecting"
 				}
 			}
@@ -203,6 +225,11 @@
 				"TFFont"					"HudFontSmallest"
 				"HealthDeathWarningColor"	"HUDDeathWarning"
 				"TextColor"					"HudOffWhite"
+
+				if_readymode
+				{
+					"xpos"			"9999"
+				}
 			}
 
 			"ReadyBG"
@@ -229,19 +256,16 @@
 				if_mvm
 				{
 					"visible"		"1"
-					"zpos"			"-2"
 				}
 
 				if_competitive
 				{
 					"visible"		"1"
-					"zpos"			"-2"
 				}
 
 				if_readymode
 				{
 					"visible"		"1"
-					"zpos"			"-2"
 				}
 			}
 
@@ -259,7 +283,6 @@
 				"visible"		"0"
 				"enabled"		"1"
 				"image"			"hud/checkmark"
-				"fillcolor"		"15 165 165 255"
 				"scaleImage"	"1"
 
 				if_mvm
@@ -336,61 +359,26 @@
 				"textAlignment"	"north-west"
 				//"fgcolor"		"TanLight"
 			}
-
-			if_mvm
-			{
-				"wide"		"40"
-				"tall"		"35"
-			}
-
-			if_competitive
-			{
-				"wide"		"40"
-				"tall"		"35"
-			}
-
-			if_readymode
-			{
-				"wide"		"40"
-				"tall"		"35"
-			}
 		}
+	}
 
-		if_mvm
-		{
-			"xpos"					"0"
-			"ypos"					"0"
-			"wide"					"f0"
-			"tall"					"480"
-
-			"team1_player_base_y"			"68"
-			"team2_player_delta_x"			"42"
-		}
-
-		if_competitive
-		{
-			"xpos"							"0"
-			"ypos"							"0"
-			"wide"							"f0"
-			"tall"							"480"
-
-			"team1_player_base_y"			"72"
-			"team2_player_base_y"			"72"
-			"team2_player_delta_x"			"42"
-			"team2_player_base_offset_x"	"5"
-		}
+	"MainBG"
+	{
+		"ControlName"	"ImagePanel"
+		"fieldName"		"MainBG"
+		"xpos"			"c-125"
+		"ypos"			"26"
+		"zpos"			"-1"
+		"wide"			"250"
+		"tall"			"17"
+		"pinCorner"		"0"
+		"visible"		"1"
+		"enabled"		"1"
+		"fillcolor"		"TransparentBlack"
 
-		if_readymode
+		if_mvm
 		{
-			"xpos"							"0"
-			"ypos"							"0"
-			"wide"							"f0"
-			"tall"							"480"
-
-			"team1_player_base_y"			"72"
-			"team2_player_base_y"			"72"
-			"team2_player_delta_x"			"42"
-			"team2_player_base_offset_x"	"5"
+			"visible"		"0"
 		}
 	}
 
@@ -638,44 +626,7 @@
 
 		if_competitive
 		{
-			"wide"			"f0"
-			"xpos"			"0"
-			"ypos"			"24"
-		}
-	}
-
-	"TournamentConditionLabelShadow"
-	{
-		"ControlName"	"CExLabel"
-		"fieldName"		"TournamentConditionLabelShadow"
-		"font"			"Cerbetica14"
-		"fgcolor"		"TransparentBlack"
-		"xpos"			"c-125"
-		"ypos"			"16"
-		"zpos"			"0"
-		"wide"			"250"
-		"tall"			"37"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"0"
-		"enabled"		"0"
-		"wrap"			"0"
-		"labelText"		"%winconditions%"
-		"textAlignment"	"center"
-
-		if_mvm
-		{
-			"visible"		"0"
-		}
-
-		if_competitive
-		{
-			"visible"		"0"
-		}
-
-		if_readymode
-		{
-			"visible"		"0"
+			"ypos"			"25"
 		}
 	}
 
@@ -706,58 +657,13 @@
 
 		if_mvm
 		{
-			"font"		"Cerbetica14"
-			"xpos"		"0"
-			"ypos"		"105"
-			"wide"		"f0"
-			"tall"		"16"
-			"zpos"		"3"
-		}
-
-		if_readymode
-		{
-			"xpos"		"0"
-			"wide"		"f0"
-		}
-
-		if_competitive
-		{
-			"xpos"		"0"
-			"wide"		"f0"
-			"ypos"		"118"
-			"font"		"Cerbetica14"
-			"tall"		"16"
-		}
-	}
-
-	"InstructionsBackground"
-	{
-		"ControlName"	"ImagePanel"
-		"fieldName"		"InstructionBackground"
-		"xpos"			"c-125"
-		"ypos"			"26"
-		"zpos"			"-1"
-		"wide"			"250"
-		"tall"			"30"
-		"pinCorner"		"0"
-		"visible"		"1"
-		"enabled"		"1"
-		"fillcolor"		"DarkGrey"
-
-		if_mvm {
-			"visible"	"0"
-		}
-
-		if_readymode
-		{
-			"xpos"		"c-125"
+			"ypos"			"105"
+			"visible"		"1"
 		}
 
 		if_competitive
 		{
-			"xpos"		"195"
-			"enabled"	"0"
-			"visible"	"0"
+			"ypos"			"36"
 		}
 	}
 
@@ -784,7 +690,7 @@
 		"ypos"			"r55"
 		"wide"			"40"
 		"tall"			"40"
-		"zpos"			"2"
+		"zpos"			"4"
 		"autoResize"	"0"
 		"pinCorner"		"0"
 		"visible"		"0"
@@ -792,28 +698,23 @@
 		"wrap"			"0"
 		"labelText"		"%tournamentstatelabel%"
 		"textAlignment"	"center"
+		"proportionaltoparent"	"1"
 
 		if_mvm
 		{
-			"visible"		"1"
-			"enabled"		"1"
-			"xpos"			"c-80"
-			"wide"			"140"
+			"xpos"			"c-20"
 		}
 
 		if_competitive
 		{
-			"xpos"			"c-20"
-			"ypos"			"130"
-			"tall"			"40"
-			"zpos"			"11"
+			"xpos"			"cs-0.5"
+			"ypos"			"cs-0.1"
 		}
 
 		if_readymode
 		{
 			"xpos"			"c-20"
 			"ypos"			"130"
-			"tall"			"20"
 		}
 	}
 
@@ -826,7 +727,7 @@
 		"ypos"			"r53"
 		"wide"			"40"
 		"tall"			"40"
-		"zpos"			"1"
+		"zpos"			"3"
 		"autoResize"	"0"
 		"pinCorner"		"0"
 		"visible"		"0"
@@ -834,29 +735,24 @@
 		"wrap"			"0"
 		"labelText"		"%tournamentstatelabel%"
 		"textAlignment"	"center"
-		"fgcolor"		"Black"
+		"fgcolor"		"TransparentBlack"
+		"proportionaltoparent"	"1"
 
 		if_mvm
 		{
-			"visible"		"1"
-			"enabled"		"1"
-			"xpos"			"c-78"
-			"wide"			"140"
+			"xpos"			"c-19"
 		}
 
 		if_competitive
 		{
-			"xpos"			"c-19"
-			"ypos"			"130"
-			"tall"			"41"
-			"zpos"			"10"
+			"xpos"			"cs-0.49"
+			"ypos"			"cs-0.09"
 		}
 
 		if_readymode
 		{
-			"xpos"			"c-18"
-			"ypos"			"130"
-			"tall"			"22"
+			"xpos"			"c-19"
+			"ypos"			"129"
 		}
 	}
 }
\ No newline at end of file
diff --git a/scripts/hudlayout.res b/scripts/hudlayout.res
index a48f728..38d6a73 100644
--- a/scripts/hudlayout.res
+++ b/scripts/hudlayout.res
@@ -60,9 +60,9 @@
 		"fieldName"			"HudWeaponAmmo"
 		"visible"			"1"
 		"enabled"			"1"
-		"xpos"				"c80"
+		"xpos"				"c70"
 		"ypos"				"c70"
-		"xpos_minmode"		"c40"
+		"xpos_minmode"		"c25"
 		"ypos_minmode"		"c30"
 		"wide"				"110"
 		"tall"				"50"
@@ -579,11 +579,11 @@
 		"fieldName" 		"HudCloseCaption"
 		"visible"			"1"
 		"enabled"			"1"
-		"xpos"				"c188"
+		"xpos"				"c205"
 		"ypos"				"302"
 		"wide"				"150"
 		"tall"				"60"
-		"xpos_minmode"		"c142"
+		"xpos_minmode"		"c170"
 		"ypos_minmode"		"273"
 		"wide_minmode"		"120"
 		"tall_minmode"		"40"
@@ -1072,7 +1072,7 @@
 		"visible"			"0"
 		"enabled"			"1"
 		"xpos"				"c-125"
-		"ypos"				"5"
+		"ypos"				"0"
 		"xpos_minmode"		"0"
 		"ypos_minmode"		"0"
 		"zpos"				"12"