From 343a144a5fe85e5f702674844085974a4b2c4734 Mon Sep 17 00:00:00 2001
From: Jessie Hildebrandt <jessieh@jessieh.net>
Date: Sun, 15 Jan 2023 02:51:59 -0500
Subject: [PATCH] Clean up various UI elements (upstream)

---
 resource/chat_english.txt         | Bin 7356 -> 7344 bytes
 resource/tools/vtf preload.res    |  39 ++-
 resource/ui/hudminigame_base.res  |  75 +++--
 resource/ui/hudspellselection.res |  18 +-
 resource/ui/mvmcriteria.res       |  75 +++--
 resource/ui/votehud_base.res      | 449 +++++++++++++++---------------
 6 files changed, 332 insertions(+), 324 deletions(-)

diff --git a/resource/chat_english.txt b/resource/chat_english.txt
index 7b88bd231d1fb0b9d752d6e3f712e0c5ee41b1f5..ffdc77a117e36b78e841240edffeb44e3b7e735e 100644
GIT binary patch
delta 12
TcmdmExxsQnp7`b}aVJ&)BXI<u

delta 24
ecmdmBxyN!to;Y^^LlHwNLopC4Y|a&TW(5FYpa#nT

diff --git a/resource/tools/vtf preload.res b/resource/tools/vtf preload.res
index a0fb9a5..d7f04b1 100644
--- a/resource/tools/vtf preload.res	
+++ b/resource/tools/vtf preload.res	
@@ -1,9 +1,18 @@
-"Resource/UI/Preload.res"
+"Resource/Tools/Preload.res"
 {
-	////////////////////////////////////////////////////////////////////////////////////////////////////
+	//===================================================================================================
 	// CONTROL POINT ICONS
-	////////////////////////////////////////////////////////////////////////////////////////////////////
+	//===================================================================================================
 
+	"CPHighlight"
+	{
+		"ControlName"		"ImagePanel"
+		"fieldName"			"CPHighlight"
+		"xpos"				"9999"
+		"visible"			"1"
+		"enabled"			"1"
+		"image"				"../sprites/obj_icons/capture_highlight"
+	}
 	"CPCapMask"
 	{
 		"ControlName"		"ImagePanel"
@@ -464,9 +473,9 @@
 		"image"				"../sprites/obj_icons/icon_obj_timer"
 	}
 
-	////////////////////////////////////////////////////////////////////////////////////////////////////
+	//===================================================================================================
 	// PAYLOAD ICONS
-	////////////////////////////////////////////////////////////////////////////////////////////////////
+	//===================================================================================================
 
 	"CartAlert"
 	{
@@ -676,9 +685,9 @@
 		"image"				"../hud/cart_red_bottom"
 	}
 
-	////////////////////////////////////////////////////////////////////////////////////////////////////
+	//===================================================================================================
 	// CAPTURE THE FLAG ICONS
-	////////////////////////////////////////////////////////////////////////////////////////////////////
+	//===================================================================================================
 
 	"CTFCompassBlue"
 	{
@@ -816,9 +825,9 @@
 		"image"				"../hud/objectives_flagpanel_ico_flag_moving_alt"
 	}
 
-	////////////////////////////////////////////////////////////////////////////////////////////////////
+	//===================================================================================================
 	// ROBOT DESTRUCTION ICONS
-	////////////////////////////////////////////////////////////////////////////////////////////////////
+	//===================================================================================================
 
 	"RDCircleBlue"
 	{
@@ -893,9 +902,9 @@
 		"image"				"../hud/obj_thief_red"
 	}
 
-	////////////////////////////////////////////////////////////////////////////////////////////////////
+	//===================================================================================================
 	// MVM ICONS
-	////////////////////////////////////////////////////////////////////////////////////////////////////
+	//===================================================================================================
 
 	"MvMBombStatusBG"
 	{
@@ -988,9 +997,9 @@
 		"image"				"../hud/hud_mvm_bomb_upgrade_boss"
 	}
 
-	////////////////////////////////////////////////////////////////////////////////////////////////////
+	//===================================================================================================
 	// TIMER CLOCK ICONS
-	////////////////////////////////////////////////////////////////////////////////////////////////////
+	//===================================================================================================
 
 	"TimerRed"
 	{
@@ -1011,9 +1020,9 @@
 		"image"				"../hud/objectives_timepanel_blue_bg"
 	}
 
-	////////////////////////////////////////////////////////////////////////////////////////////////////
+	//===================================================================================================
 	// GENERIC IMAGES
-	////////////////////////////////////////////////////////////////////////////////////////////////////
+	//===================================================================================================
 
 	"MenuThumbMissingFix"
 	{
diff --git a/resource/ui/hudminigame_base.res b/resource/ui/hudminigame_base.res
index 2403711..1c525a9 100644
--- a/resource/ui/hudminigame_base.res
+++ b/resource/ui/hudminigame_base.res
@@ -2,21 +2,19 @@
 {
 	"BlackTransparentBG"
 	{
-		"ControlName"								"CExImageButton"
+		"ControlName"								"EditablePanel"
 		"fieldName"									"BlackTransparentBG"
 		"xpos"										"cs-0.5"
-		"ypos"										"r19"
+		"ypos"										"rs1"
 		"zpos"										"1"
 		"wide"										"120"
 		"tall"										"22"
-		"autoResize"								"0"
-		"pinCorner"									"0"
 		"visible"									"1"
 		"enabled"									"1"
-		"PaintBackground"							"0"
-		"border_default"							"MaterialTransparent50"
-        "textinsety" 								"99"
 		"proportionaltoparent"						"1"
+		"PaintBackground"							"0"
+		"paintborder"								"1"
+		"border"									"MaterialTransparent50"
 	}
 	"PlayingTo"
 	{
@@ -25,44 +23,42 @@
 		"xpos"										"0"
 		"ypos"										"0"
 		"zpos"										"4"
-		"wide"										"120"
+		"wide"										"110"
 		"tall"										"16"
 		"visible"									"1"
 		"enabled"									"1"
+		"proportionaltoparent"						"1"
 		"labelText"									"#TF_PlayingTo"
 		"textAlignment"								"center"
-		"dulltext"									"0"
-		"brighttext"								"0"
 		"AllCaps"									"1"
 		"font"										"Size 8"
 		"fgcolor"									"White"
-		
+
 		"pin_to_sibling"							"BlackTransparentBG"
 		"pin_corner_to_sibling"						"PIN_CENTER_BOTTOM"
 		"pin_to_sibling_corner"						"PIN_CENTER_BOTTOM"
 	}
 
-	"BlueScoreBG"	
+	"BlueScoreBG"
 	{
-		"ControlName"								"CExImageButton"
+		"ControlName"								"EditablePanel"
 		"fieldName"									"BlueScoreBG"
 		"xpos"										"0"
 		"ypos"										"-11"
 		"zpos"										"2"
-		"wide"										"65"
+		"wide"										"63"
 		"tall"										"20"
-		"autoResize"								"0"
-		"pinCorner"									"0"
 		"visible"									"1"
 		"enabled"									"1"
+		"proportionaltoparent"						"1"
 		"PaintBackground"							"0"
-		"border_default"							"MaterialBlue"
-        "textinsety" 								"99"
+		"PaintBorder"								"1"
+		"border"									"MaterialBlue"
+
 		"pin_to_sibling"							"BlackTransparentBG"
 		"pin_corner_to_sibling"						"PIN_BOTTOMLEFT"
 		"pin_to_sibling_corner"						"PIN_TOPLEFT"
 	}
-	
 	"BlueScore"
 	{
 		"ControlName"								"CExLabel"
@@ -70,14 +66,16 @@
 		"xpos"										"-5"
 		"ypos"										"0"
 		"zpos"										"10"
-		"wide"										"59"
+		"wide"										"25"
 		"tall"										"20"
 		"visible"									"1"
 		"enabled"									"1"
-		"textAlignment"								"west"	
+		"proportionaltoparent"						"1"
+		"textAlignment"								"west"
 		"labelText"									"%bluescore%"
 		"font"										"Size 18"
 		"fgcolor"									"White"
+
 		"pin_to_sibling"							"BlueScoreBG"
 		"pin_corner_to_sibling"						"PIN_CENTER_LEFT"
 		"pin_to_sibling_corner"						"PIN_CENTER_LEFT"
@@ -89,38 +87,39 @@
 		"xpos"										"-1"
 		"ypos"										"-1"
 		"zpos"										"9"
-		"wide"										"59"
+		"wide"										"25"
 		"tall"										"20"
 		"visible"									"1"
 		"enabled"									"1"
-		"textAlignment"								"west"	
+		"proportionaltoparent"						"1"
+		"textAlignment"								"west"
 		"labelText"									"%bluescore%"
 		"font"										"Size 18 Blur"
 		"fgcolor"									"Shadow"
 		"pin_to_sibling"							"BlueScore"
 	}
-	
-	"RedScoreBG"	
+
+	"RedScoreBG"
 	{
-		"ControlName"								"CExImageButton"
+		"ControlName"								"EditablePanel"
 		"fieldName"									"RedScoreBG"
 		"xpos"										"0"
 		"ypos"										"-11"
 		"zpos"										"2"
-		"wide"										"65"
+		"wide"										"64"
 		"tall"										"20"
-		"autoResize"								"0"
-		"pinCorner"									"0"
 		"visible"									"1"
 		"enabled"									"1"
+		"proportionaltoparent"						"1"
 		"PaintBackground"							"0"
-		"border_default"							"MaterialRed"
-        "textinsety" 								"99"
+		"paintborder"								"1"
+		"border"									"MaterialRed"
+
 		"pin_to_sibling"							"BlackTransparentBG"
 		"pin_corner_to_sibling"						"PIN_BOTTOMRIGHT"
 		"pin_to_sibling_corner"						"PIN_TOPRIGHT"
 	}
-	
+
 	"RedScore"
 	{
 		"ControlName"								"CExLabel"
@@ -128,11 +127,11 @@
 		"xpos"										"-5"
 		"ypos"										"0"
 		"zpos"										"10"
-		"wide"										"59"
+		"wide"										"25"
 		"tall"										"20"
 		"visible"									"1"
 		"enabled"									"1"
-		"textAlignment"								"east"	
+		"textAlignment"								"east"
 		"labelText"									"%redscore%"
 		"font"										"Size 18"
 		"fgcolor"									"White"
@@ -147,18 +146,18 @@
 		"xpos"										"-1"
 		"ypos"										"-1"
 		"zpos"										"9"
-		"wide"										"59"
+		"wide"										"25"
 		"tall"										"20"
 		"visible"									"1"
 		"enabled"									"1"
-		"textAlignment"								"east"	
+		"textAlignment"								"east"
 		"labelText"									"%redscore%"
 		"font"										"Size 18 Blur"
 		"fgcolor"									"Shadow"
 		"pin_to_sibling"							"RedScore"
 	}
-	
-	
+
+
 	//REMOVED
 	"LeftSideBG"
 	{
diff --git a/resource/ui/hudspellselection.res b/resource/ui/hudspellselection.res
index 8d08c83..39ee4ab 100644
--- a/resource/ui/hudspellselection.res
+++ b/resource/ui/hudspellselection.res
@@ -11,11 +11,11 @@
 		"tall"										"15"
 		"visible"									"1"
 		"enabled"									"1"
-		"scaleImage"								"1"	
+		"scaleImage"								"1"
 		"image"										"../signs/death_wheel_whammy"
 		"fgcolor"									"White"
 	}
-	
+
 	"CountText"
 	{
 		"ControlName"								"CExLabel"
@@ -29,7 +29,7 @@
 		"wide"										"20"
 		"tall"										"20"
 		"fgcolor"									"White"
-		
+
 		"pin_to_sibling" 							"SpellIcon"
 		"pin_corner_to_sibling" 					"PIN_CENTER_LEFT"
 		"pin_to_sibling_corner" 					"PIN_CENTER_RIGHT"
@@ -48,12 +48,12 @@
 		"fgcolor"									"Shadow"
 		"pin_to_sibling" 							"CountText"
 	}
-	
+
 	"ActionText"
 	{
 		"ControlName"								"CExLabel"
 		"fieldName"									"ActionText"
-		"font"										"Size 9"
+		"font"										"Size 7"
 		"labelText"									"%actiontext%"
 		"textAlignment"							 	"center"
 		"xpos"										"0"
@@ -65,10 +65,10 @@
 		"visible_minmode"							"1"
 		"AllCaps"									"1"
 	}
-	
-	
-	
-	
+
+
+
+
 	//REMOVED
 	"ItemEffectMeterBG"
 	{
diff --git a/resource/ui/mvmcriteria.res b/resource/ui/mvmcriteria.res
index b017378..52c40e9 100644
--- a/resource/ui/mvmcriteria.res
+++ b/resource/ui/mvmcriteria.res
@@ -12,7 +12,7 @@
 
 		"ChallengeLabel"
 		{
-			"ControlName"							"Label"
+			"ControlName"							"CExLabel"
 			"fieldName"								"ChallengeLabel"
 			"font"									"Size 14"
 			"labelText"								"#TF_MvM_TourOfDuty"
@@ -23,12 +23,12 @@
 			"zpos"									"0"
 			"wide"									"400"
 			"tall"									"26"
-			"fgcolor_override"						"WhiteDark"
+			"fgcolor"								"WhiteDark"
 		}
 
 		"DifficultyLabel"
 		{
-			"ControlName"							"Label"
+			"ControlName"							"CExLabel"
 			"fieldName"								"DifficultyLabel"
 			"font"									"Size 11"
 			"labelText"								"#TF_MvM_Difficulty"
@@ -39,12 +39,12 @@
 			"zpos"									"0"
 			"wide"									"100"
 			"tall"									"24"
-			"fgcolor_override"						"WhiteDark"
+			"fgcolor"								"WhiteDark"
 		}
 
 		"CompleteLabel"
 		{
-			"ControlName"							"Label"
+			"ControlName"							"CExLabel"
 			"fieldName"								"CompleteLabel"
 			"font"									"Size 11"
 			"labelText"								"#TF_MvM_TourOfDutyProgress"
@@ -55,12 +55,12 @@
 			"zpos"									"0"
 			"wide"									"80"
 			"tall"									"24"
-			"fgcolor_override"						"WhiteDark"
+			"fgcolor"								"WhiteDark"
 		}
 
 		"TourLevelLabel"
 		{
-			"ControlName"							"Label"
+			"ControlName"							"CExLabel"
 			"fieldName"								"TourLevelLabel"
 			"font"									"Size 11"
 			"labelText"								"#TF_MvM_TourNumber"
@@ -71,7 +71,7 @@
 			"zpos"									"0"
 			"wide"									"80"
 			"tall"									"26"
-			"fgcolor_override"						"WhiteDark"
+			"fgcolor"								"WhiteDark"
 		}
 
 		"TourlistGroupBox"
@@ -116,7 +116,7 @@
 
 		"TourDifficultyWarning"
 		{
-			"ControlName"							"Label"
+			"ControlName"							"CExLabel"
 			"fieldName"								"TourDifficultyWarning"
 			"font"									"Size 11"
 			"labelText"								"#TF_MVM_Tour_ExpertDifficulty_Warning"
@@ -165,7 +165,7 @@
 
 		"TourLootTitle"
 		{
-			"ControlName"							"Label"
+			"ControlName"							"CExLabel"
 			"fieldName"								"TourLootTitle"
 			"font"									"Size 14"
 			"labelText"								"#TF_MvM_TourLootTitle"
@@ -176,12 +176,12 @@
 			"wide"									"200"
 			"tall"									"30"
 			"AllCaps"								"1"
-			"fgcolor_override"						"WhiteDark"
+			"fgcolor"								"WhiteDark"
 		}
 
 		"TourLootDetailLabel"
 		{
-			"ControlName"							"Label"
+			"ControlName"							"CExLabel"
 			"fieldName"								"TourLootDetailLabel"
 			"font"									"Size 11"
 			"labelText"								"%tour_loot_detail%"
@@ -193,7 +193,7 @@
 			"wide"									"280"
 			"tall"									"85"
 			"AllCaps"								"1"
-			"fgcolor_override"						"WhiteDark"
+			"fgcolor"								"WhiteDark"
 		}
 	}
 
@@ -212,7 +212,7 @@
 
 		"InventoryTitleLabel"
 		{
-			"ControlName"							"Label"
+			"ControlName"							"CExLabel"
 			"fieldName"								"InventoryTitleLabel"
 			"font"									"Size 14"
 			"labelText"								"#TF_MvM_InventoryTitle"
@@ -223,7 +223,7 @@
 			"wide"									"200"
 			"tall"									"30"
 			"AllCaps"								"1"
-			"fgcolor_override"						"WhiteDark"
+			"fgcolor"								"WhiteDark"
 		}
 
 		"MannUpTicketAd"
@@ -255,12 +255,12 @@
 
 		"MannUpTicketCountLabel"
 		{
-			"ControlName"							"Label"
+			"ControlName"							"CExLabel"
 			"fieldName"								"MannUpTicketCountLabel"
 			"font"									"Size 24"
 			"labelText"								"%ticket_count%"
 			"textAlignment"							"north-west"
-			"fgcolor_override"						"WhiteDark"
+			"fgcolor"								"WhiteDark"
 			"xpos"									"15"
 			"ypos"									"24"
 			"zpos"									"2"
@@ -298,12 +298,12 @@
 
 		"SquadSurplusCountLabel"
 		{
-			"ControlName"							"Label"
+			"ControlName"							"CExLabel"
 			"fieldName"								"SquadSurplusCountLabel"
 			"font"									"Size 24"
 			"labelText"								"%voucher_count%"
 			"textAlignment"							"north-west"
-			"fgcolor_override"						"WhiteDark"
+			"fgcolor"								"WhiteDark"
 			"xpos"									"82"
 			"ypos"									"24"
 			"zpos"									"2"
@@ -327,8 +327,8 @@
 
 		"ActivateSquadSurplusLabel"
 		{
-			"ControlName"							"Label"
-			"fieldName"								"SquadSurplusCheckLabel"
+			"ControlName"							"CExLabel"
+			"fieldName"								"ActivateSquadSurplusLabel"
 			"font"									"Size 11"
 			"labelText"								"#TF_MvM_ActivateSquadSurplus"
 			"textAlignment"							"north-west"
@@ -338,7 +338,7 @@
 			"zpos"									"0"
 			"wide"									"120"
 			"tall"									"60"
-			"fgcolor_override"						"WhiteDark"
+			"fgcolor"								"WhiteDark"
 		}
 
 		"Slot0"
@@ -439,10 +439,10 @@
 
 		"MissingTicketsLabel"
 		{
-			"ControlName"							"Label"
+			"ControlName"							"CExLabel"
 			"fieldName"								"MissingTicketsLabel"
 			"font"									"Size 9"
-			"fgcolor_override"						"WhiteDark"
+			"fgcolor"								"WhiteDark"
 			"labelText"								"#TF_Matchmaking_CantQueue_NoTicket"
 			"textAlignment"							"south-west"
 			"AllCaps"								"1"
@@ -487,7 +487,7 @@
 
 		"NoMannUpTitleLabel"
 		{
-			"ControlName"							"Label"
+			"ControlName"							"CExLabel"
 			"fieldName"								"NoMannUpTitleLabel"
 			"font"									"Size 14"
 			"labelText"								"#TF_MvM_NoMannUpTitle"
@@ -498,12 +498,12 @@
 			"wide"									"200"
 			"tall"									"30"
 			"AllCaps"								"1"
-			"fgcolor_override"						"WhiteDark"
+			"fgcolor"								"WhiteDark"
 		}
 
 		"NoMannUpDescriptionLabel"
 		{
-			"ControlName"							"Label"
+			"ControlName"							"CExLabel"
 			"fieldName"								"NoMannUpDescriptionLabel"
 			"font"									"Size 11"
 			"labelText"								"#TF_MvM_NoMannUpDescription"
@@ -515,7 +515,7 @@
 			"wide"									"280"
 			"tall"									"50"
 			"AllCaps"								"1"
-			"fgcolor_override"						"WhiteDark"
+			"fgcolor"								"WhiteDark"
 		}
 
 		"MannUpNowButton"
@@ -531,19 +531,16 @@
 			"pinCorner"								"3"
 			"visible"								"1"
 			"enabled"								"1"
-			"tabPosition"							"0"
 			"labelText"								"#TF_MvM_MannUpNow"
 			"font"									"Size 14"
 			"textAlignment"							"center"
 			"AllCaps"								"1"
-			"dulltext"								"0"
-			"brighttext"							"0"
 			"command" 								"mann_up_now"
 			"sound_depressed"						"UI/buttonclick.wav"
 			"sound_released"						"UI/buttonclickrelease.wav"
-			
+
 			"paintbackground"						"0"
-		
+
 			"border_default"						"MaterialGrayDark"
 			"border_armed"							"MaterialHypno"
 
@@ -565,7 +562,7 @@
 
 		"ChallengeLabel"
 		{
-			"ControlName"							"Label"
+			"ControlName"							"CExLabel"
 			"fieldName"								"ChallengeLabel"
 			"font"									"Size 14"
 			"labelText"								"%tour_name%"
@@ -576,12 +573,12 @@
 			"wide"									"400"
 			"tall"									"26"
 			"AllCaps"								"1"
-			"fgcolor_override"						"WhiteDark"
+			"fgcolor"								"WhiteDark"
 		}
 
 		"CompleteLabel"
 		{
-			"ControlName"							"Label"
+			"ControlName"							"CExLabel"
 			"fieldName"								"CompleteLabel"
 			"font"									"Size 14"
 			"labelText"								"%complete_heading%"
@@ -592,7 +589,7 @@
 			"wide"									"100"
 			"tall"									"24"
 			"AllCaps"								"1"
-			"fgcolor_override"						"WhiteDark"
+			"fgcolor"								"WhiteDark"
 		}
 
 		"TourLevelImage"
@@ -613,7 +610,7 @@
 
 		"TourLevelLabel"
 		{
-			"ControlName"							"Label"
+			"ControlName"							"CExLabel"
 			"fieldName"								"TourLevelLabel"
 			"font"									"Size 14"
 			"labelText"								"%tour_level%"
@@ -623,7 +620,7 @@
 			"zpos"									"0"
 			"wide"									"30"
 			"tall"									"26"
-			"fgcolor_override"						"0 0 0 255"
+			"fgcolor"								"0 0 0 255"
 		}
 
 		"ChallengeListGroupBox"
diff --git a/resource/ui/votehud_base.res b/resource/ui/votehud_base.res
index d580aa6..557cc36 100644
--- a/resource/ui/votehud_base.res
+++ b/resource/ui/votehud_base.res
@@ -1,5 +1,5 @@
 "Resource/UI/VoteHud.res"
-{	
+{
 	"VotePassed"
 	{
 		"ControlName"								"EditablePanel"
@@ -11,7 +11,7 @@
 		"visible"									"0"
 		"enabled"									"1"
 		"border"									"MaterialTransparent50"
-		
+
 		"PassedIcon"
 		{
 			"ControlName"							"ImagePanel"
@@ -25,10 +25,10 @@
 			"scaleImage"							"1"
 			"image"									"hud/vote_yes"
 		}
-		
+
 		"PassedTitle"
 		{
-			"ControlName"							"Label"
+			"ControlName"							"CExLabel"
 			"fieldName"								"PassedTitle"
 			"xpos"									"32"
 			"ypos"									"10"
@@ -38,16 +38,14 @@
 			"enabled"								"1"
 			"labelText"								"#GameUI_vote_passed"
 			"textAlignment"							"west"
-			"dulltext"								"0"
-			"brighttext"							"0"
 			"font"									"Size 10"
 			"wrap"									"1"
-			"fgcolor_override"						"White"
+			"fgcolor"								"White"
 		}
-		
+
 		"PassedResult"
 		{
-			"ControlName"							"Label"
+			"ControlName"							"CExLabel"
 			"fieldName"								"PassedResult"
 			"xpos"									"10"
 			"ypos"									"29"
@@ -57,15 +55,13 @@
 			"enabled"								"1"
 			"labelText"								"%passedresult%"
 			"textAlignment"							"north-west"
-			"dulltext"								"0"
-			"brighttext"							"0"
 			"font"									"Size 8"
 			"wrap"									"1"
-			"fgcolor_override"						"White"
+			"fgcolor"								"White"
 			"noshortcutsyntax" 						"1"
-		}		
+		}
 	}
-	
+
 	"VoteActive"
 	{
 		"ControlName"								"EditablePanel"
@@ -77,10 +73,10 @@
 		"visible"									"0"
 		"enabled"									"1"
 		"border"									"MaterialTransparent50"
-		
+
 		"Header"
 		{
-			"ControlName"							"Label"
+			"ControlName"							"CExLabel"
 			"fieldName"								"Header"
 			"xpos"									"10"
 			"ypos"									"5"
@@ -90,16 +86,14 @@
 			"enabled"								"1"
 			"labelText"								"%header%"
 			"textAlignment"							"north-west"
-			"dulltext"								"0"
-			"brighttext"							"0"
 			"font"									"Size 8"
 			"wrap"									"1"
-			"fgcolor_override"						"White"
+			"fgcolor"								"White"
 		}
-		
+
 		"Issue"
 		{
-			"ControlName"							"Label"
+			"ControlName"							"CExLabel"
 			"fieldName"								"Issue"
 			"xpos"									"10"
 			"ypos"									"22"
@@ -109,10 +103,8 @@
 			"enabled"								"1"
 			"labelText"								"%voteissue%"
 			"textAlignment"							"north-west"
-			"dulltext"								"0"
-			"brighttext"							"0"
 			"font"									"Size 10"
-			"fgcolor_override"						"White"
+			"fgcolor"								"White"
 			"wrap"									"1"
 			"noshortcutsyntax" 						"1"
 		}
@@ -128,10 +120,10 @@
 			"visible"								"0"
 			"enabled"								"1"
 			"image"									""
-			"scaleImage"							"1"	
+			"scaleImage"							"1"
 			"color_outline"							"White"
 		}
-		
+
 		// divider
 		"Divider"
 		{
@@ -144,12 +136,12 @@
 			"fillcolor"								"WhiteDark"
 			"zpos"									"0"
 		}
-		
+
 		// Temp UI
-		
+
 		"LabelOption1"
 		{
-			"ControlName"							"Label"
+			"ControlName"							"CExLabel"
 			"fieldName"								"LabelOption1"
 			"xpos"									"10"
 			"ypos"									"57"
@@ -160,12 +152,10 @@
 			"enabled"								"1"
 			"labelText"								""
 			"textAlignment"							"left"
-			"dulltext"								"0"
-			"brighttext"							"0"
 			"font"									"Size 8"
-			"fgcolor_override"						"White"
+			"fgcolor"								"White"
 		}
-		
+
 		"Option1Background_Selected"
 		{
 			"ControlName"							"ImagePanel"
@@ -178,10 +168,10 @@
 			"fillcolor"								"Main Theme"
 			"visible"								"1"
 		}
-		
+
 		"Option1CountLabel"
 		{
-			"ControlName"							"Label"
+			"ControlName"							"CExLabel"
 			"fieldName"								"Option1CountLabel"
 			"xpos"									"28"
 			"ypos"									"113"
@@ -192,15 +182,13 @@
 			"enabled"								"1"
 			"labelText"								"Yes"
 			"textAlignment"							"center"
-			"dulltext"								"0"
-			"brighttext"							"0"
 			"font"									"Size 10"
-			"fgcolor_override"						"White"
+			"fgcolor"								"White"
 		}
-		
+
 		"LabelOption2"
 		{
-			"ControlName"							"Label"
+			"ControlName"							"CExLabel"
 			"fieldName"								"LabelOption2"
 			"xpos"									"10"
 			"ypos"									"73"
@@ -211,12 +199,10 @@
 			"enabled"								"1"
 			"labelText"								""
 			"textAlignment"							"left"
-			"dulltext"								"0"
-			"brighttext"							"0"
 			"font"									"Size 8"
-			"fgcolor_override"						"White"
+			"fgcolor"								"White"
 		}
-		
+
 		"Option2Background_Selected"
 		{
 			"ControlName"							"ImagePanel"
@@ -229,10 +215,10 @@
 			"fillcolor"								"Main Theme"
 			"visible"								"1"
 		}
-		
+
 		"Option2CountLabel"
 		{
-			"ControlName"							"Label"
+			"ControlName"							"CExLabel"
 			"fieldName"								"Option2CountLabel"
 			"xpos"									"74"
 			"ypos"									"113"
@@ -243,15 +229,13 @@
 			"enabled"								"1"
 			"labelText"								"No"
 			"textAlignment"							"center"
-			"dulltext"								"0"
-			"brighttext"							"0"
 			"font"									"Size 10"
-			"fgcolor_override"						"White"
+			"fgcolor"								"White"
 		}
-		
+
 		"LabelOption3"
 		{
-			"ControlName"							"Label"
+			"ControlName"							"CExLabel"
 			"fieldName"								"LabelOption3"
 			"xpos"									"10"
 			"ypos"									"89"
@@ -262,12 +246,10 @@
 			"enabled"								"1"
 			"labelText"								""
 			"textAlignment"							"left"
-			"dulltext"								"0"
-			"brighttext"							"0"
 			"font"									"Size 8"
-			"fgcolor_override"						"White"
+			"fgcolor"								"White"
 		}
-		
+
 		"Option3Background_Selected"
 		{
 			"ControlName"							"ImagePanel"
@@ -280,10 +262,10 @@
 			"fillcolor"								"Main Theme"
 			"visible"								"0"
 		}
-		
+
 		"LabelOption4"
 		{
-			"ControlName"							"Label"
+			"ControlName"							"CExLabel"
 			"fieldName"								"LabelOption4"
 			"xpos"									"10"
 			"ypos"									"105"
@@ -294,12 +276,10 @@
 			"enabled"								"1"
 			"labelText"								""
 			"textAlignment"							"left"
-			"dulltext"								"0"
-			"brighttext"							"0"
 			"font"									"Size 8"
-			"fgcolor_override"						"White"
+			"fgcolor"								"White"
 		}
-		
+
 		"Option4Background_Selected"
 		{
 			"ControlName"							"ImagePanel"
@@ -312,10 +292,10 @@
 			"fillcolor"								"Main Theme"
 			"visible"								"0"
 		}
-		
+
 		"LabelOption5"
 		{
-			"ControlName"							"Label"
+			"ControlName"							"CExLabel"
 			"fieldName"								"LabelOption5"
 			"xpos"									"10"
 			"ypos"									"121"
@@ -326,12 +306,10 @@
 			"enabled"								"1"
 			"labelText"								""
 			"textAlignment"							"left"
-			"dulltext"								"0"
-			"brighttext"							"0"
 			"font"									"Size 8"
-			"fgcolor_override"						"White"
+			"fgcolor"								"White"
 		}
-		
+
 		"Option5Background_Selected"
 		{
 			"ControlName"							"ImagePanel"
@@ -344,7 +322,7 @@
 			"fillcolor"								"Main Theme"
 			"visible"								"0"
 		}
-		
+
 		// divider
 		"Divider2"
 		{
@@ -357,10 +335,10 @@
 			"fillcolor"								"White"
 			"zpos"									"0"
 		}
-		
+
 		"VoteCountLabel"
 		{
-			"ControlName"							"Label"
+			"ControlName"							"CExLabel"
 			"fieldName"								"VoteCountLabel"
 			"xpos"									"10"
 			"ypos"									"100"
@@ -370,12 +348,10 @@
 			"enabled"								"1"
 			"labelText"								"#GameUI_vote_current_vote_count"
 			"textAlignment"							"north-west"
-			"dulltext"								"0"
-			"brighttext"							"0"
 			"font"									"Size 8"
-			"fgcolor_override"						"White"
+			"fgcolor"								"White"
 		}
-		
+
 		// vote bar
 		"VoteBar"
 		{
@@ -387,15 +363,15 @@
 			"tall"									"18"
 			"zpos"									"2"
 			"visible"								"1"
-			"enabled"								"1"			
+			"enabled"								"1"
 			"box_size"								"16"
 			"spacer"								"6"
 			"box_inset"								"1"
 			"yes_texture"							"vgui/hud/vote_yes"
-			"no_texture"							"vgui/hud/vote_no"			
-		}			
+			"no_texture"							"vgui/hud/vote_no"
+		}
 	}
-	
+
 	// This is sent to the vote caller when they're not able to start the vote
 	"CallVoteFailed"
 	{
@@ -408,7 +384,7 @@
 		"visible"									"0"
 		"enabled"									"1"
 		"border"									"MaterialTransparent50"
-				
+
 		"FailedIcon"
 		{
 			"ControlName"							"ImagePanel"
@@ -422,10 +398,10 @@
 			"scaleImage"							"1"
 			"image"									"hud/vote_no"
 		}
-		
+
 		"FailedTitle"
 		{
-			"ControlName"							"Label"
+			"ControlName"							"CExLabel"
 			"fieldName"								"FailedTitle"
 			"xpos"									"32"
 			"ypos"									"10"
@@ -435,16 +411,14 @@
 			"enabled"								"1"
 			"labelText"								"#GameUI_vote_failed"
 			"textAlignment"							"west"
-			"dulltext"								"0"
-			"brighttext"							"0"
 			"font"									"Size 10"
 			"wrap"									"1"
-			"fgcolor_override"						"Red"
+			"fgcolor"								"Red"
 		}
-		
+
 		"FailedReason"
 		{
-			"ControlName"							"Label"
+			"ControlName"							"CExLabel"
 			"fieldName"								"FailedReason"
 			"xpos"									"10"
 			"ypos"									"29"
@@ -454,14 +428,12 @@
 			"enabled"								"1"
 			"labelText"								"%FailedReason%"
 			"textAlignment"							"north-west"
-			"dulltext"								"0"
-			"brighttext"							"0"
 			"font"									"Size 8"
 			"wrap"									"1"
-			"fgcolor_override"						"White"
-		}		
+			"fgcolor"								"White"
+		}
 	}
-	
+
 	// This is shown to everyone when a vote fails due to lack of votes
 	"VoteFailed"
 	{
@@ -474,7 +446,7 @@
 		"visible"									"0"
 		"enabled"									"1"
 		"border"									"MaterialTransparent50"
-		
+
 		"FailedIcon"
 		{
 			"ControlName"							"ImagePanel"
@@ -488,10 +460,10 @@
 			"scaleImage"							"1"
 			"image"									"hud/vote_no"
 		}
-		
+
 		"FailedTitle"
 		{
-			"ControlName"							"Label"
+			"ControlName"							"CExLabel"
 			"fieldName"								"FailedTitle"
 			"xpos"									"32"
 			"ypos"									"10"
@@ -501,16 +473,14 @@
 			"enabled"								"1"
 			"labelText"								"#GameUI_vote_failed"
 			"textAlignment"							"west"
-			"dulltext"								"0"
-			"brighttext"							"0"
 			"font"									"Size 10"
 			"wrap"									"1"
-			"fgcolor_override"						"Red"
+			"fgcolor"								"Red"
 		}
-		
+
 		"FailedReason"
 		{
-			"ControlName"							"Label"
+			"ControlName"							"CExLabel"
 			"fieldName"								"FailedReason"
 			"xpos"									"10"
 			"ypos"									"29"
@@ -520,240 +490,273 @@
 			"enabled"								"1"
 			"labelText"								""
 			"textAlignment"							"north-west"
-			"dulltext"								"0"
-			"brighttext"							"0"
 			"font"									"Size 8"
 			"wrap"									"1"
-			"fgcolor_override"						"White"
-		}		
+			"fgcolor"								"White"
+		}
 	}
-	
+
 	"VoteSetupDialog"
 	{
 		"ControlName"								"CVoteSetupDialog"
 		"fieldName"									"VoteSetupDialog"
-		"xpos"										"c-200"
-		"ypos"										"c-150"
-		"wide"										"400"
+		"xpos"										"cs-0.5"
+		"ypos"										"cs-0.5"
+		"wide"										"300"
 		"tall"										"310"
-		"autoResize"								"0"
-		"pinCorner"									"0"
 		"visible"									"1"
 		"enabled"									"1"
-		"tabPosition"								"0"
+		"proportionaltoparent"						"1"
 		"settitlebarvisible"						"0"
-		"border"									"MaterialBlackLight"
-		"bgcolor_override"							"Blank"
+		"AllCaps"									"1"
+
 		"PaintBackground"							"0"
+		"PaintBorder"								"1"
+		"border"									"MaterialBlackLight"
 
 		"header_font"								"Size 12"
 		"header_fgcolor"							"White"
 
-		"issue_width"								"180"
+		"issue_width"								"138"
 		"issue_font"								"Size 10"
 		"issue_fgcolor"								"White"
-		"issue_fgcolor_disabled"					"White"
-		
-		"parameter_width"							"200"
+		"issue_fgcolor_disabled"					"WhiteDark"
+
+		"parameter_width"							"141"
 
 		"TitleLabel"
 		{
 			"ControlName"							"CExLabel"
 			"fieldName"								"TitleLabel"
-			"font"									"Size 24"
-			"labelText"								"#TF_Vote_Title"
-			"textAlignment"							"north"
-			"xpos"									"0"
-			"ypos"									"10"
-			"wide"									"400"
-			"tall"									"20"
-			"autoResize"							"0"
-			"pinCorner"								"0"
+			"xpos"									"cs-0.5"
+			"ypos"									"3"
+			"wide"									"f6"
+			"tall"									"26"
 			"visible"								"1"
 			"enabled"								"1"
-			"wrap"									"0"
+			"proportionaltoparent"					"1"
 			"AllCaps"								"1"
+			"font"									"Size 18"
+			"labelText"								"#TF_Vote_Title"
+			"textAlignment"							"center"
+			"fgcolor"								"White"
 		}
-		
+
 		"VoteSetupList"
 		{
 			"ControlName"							"SectionedListPanel"
 			"fieldName"								"VoteSetupList"
-			"xpos"									"10"
-			"ypos"									"38"
+			"xpos"									"5"
+			"ypos"									"35"
 			"zpos"									"2"
-			"wide"									"180"
-			"tall"									"200"
-			"pinCorner"								"0"
+			"wide"									"p0.46"
+			"tall"									"f91"
 			"visible"								"1"
 			"enabled"								"1"
-			"tabPosition"							"0"
-			"autoresize"							"0"
-			
+			"proportionaltoparent"					"1"
+			"paintbackground"						"1"
+			"bgcolor_override"						"BlackTransparent"
+
 			"linespacing"							"16"
 		}
-		
+		"VoteSetupListBG"
+		{
+			"ControlName"							"EditablePanel"
+			"fieldName"								"VoteSetupListBG"
+			"xpos"									"2"
+			"ypos"									"6"
+			"zpos"									"0"
+			"wide"									"p0.47"
+			"tall"									"f81"
+			"visible"								"1"
+			"enabled"								"1"
+			"proportionaltoparent"					"1"
+			"paintboder"							"1"
+			"border"								"MaterialGrayDarker"
+			"pin_to_sibling" 						"VoteSetupList"
+		}
+
 		"VoteParameterList"
 		{
 			"ControlName"							"SectionedListPanel"
 			"fieldName"								"VoteParameterList"
-			"xpos"									"190"
-			"ypos"									"38"
+			"xpos"									"rs1-5"
+			"ypos"									"35"
 			"zpos"									"2"
-			"wide"									"200"
-			"tall"									"200"
-			"pinCorner"								"0"
+			"wide"									"p0.5"
+			"tall"									"f68"
 			"visible"								"1"
 			"enabled"								"1"
-			"tabPosition"							"0"
-			"autoresize"							"0"
 			"linespacing"							"16"
+			"proportionaltoparent"					"1"
+		}
+		"VoteParameterListBG"
+		{
+			"ControlName"							"EditablePanel"
+			"fieldName"								"VoteParameterListBG"
+			"xpos"									"2"
+			"ypos"									"6"
+			"zpos"									"0"
+			"wide"									"p0.51"
+			"tall"									"f58"
+			"visible"								"1"
+			"enabled"								"1"
+			"proportionaltoparent"					"1"
+			"paintboder"							"1"
+			"border"								"MaterialGrayDarker"
+
+			"pin_to_sibling" 						"VoteParameterList"
+			"pin_corner_to_sibling" 				"PIN_TOPRIGHT"
+			"pin_to_sibling_corner" 				"PIN_TOPRIGHT"
 		}
 
 		"ComboLabel"
 		{
 			"ControlName"							"CExLabel"
 			"fieldName"								"ComboLabel"
-			"font"									"Size 11"
-			"labelText"								"%combo_label%"
-			"textAlignment"							"east"
-			"xpos"									"5"
-			"ypos"									"245"
-			"zpos"									"1"
-			"wide"									"75"
-			"tall"									"20"
-			"autoResize"							"1"
-			"pinCorner"								"0"
-			"visible"								"1"
-			"enabled"								"1"
+			"xpos"									"9999"
 		}
-		
 		"ComboBox"
 		{
 			"ControlName"							"ComboBox"
 			"fieldName"								"ComboBox"
-			"Font"									"Size 11"
-			"xpos"									"85"
-			"ypos"									"245"
+			"xpos"									"7"
+			"ypos"									"rs1-31"
 			"zpos"									"1"
-			"wide"									"235"
+			"wide"									"p0.45"
 			"tall"									"20"
-			"autoResize"							"0"
-			"pinCorner"								"0"
 			"visible"								"1"
 			"enabled"								"1"
-			"tabPosition"							"1"
+			"proportionaltoparent"					"1"
 			"textHidden"							"0"
 			"editable"								"0"
 			"maxchars"								"-1"
 			"NumericInputOnly"						"0"
 			"unicode"								"0"
-			
+			"Font"									"Size 12"
+			"paintborder"							"0"
+			"paintbackground"						"1"
+
 			"fgcolor_override"						"White"
-			"bgcolor_override"						"BlackDark"
-			"disabledFgColor_override" 				"White"
-			"disabledBgColor_override" 				"BlackDark"
-			"selectionColor_override" 				"BlackDark"
+			"bgcolor_override"						"Blank"
+			"disabledFgColor_override" 				"WhiteDark"
+			"disabledBgColor_override" 				"Blank"
+			"selectionColor_override" 				"Blank"
 			"selectionTextColor_override" 			"White"
-			"defaultSelectionBG2Color_override" 	"BlackDark"
+			"defaultSelectionBG2Color_override" 	"WhiteDark"
 		}
-		
+		"ComboBoxBG"
+		{
+			"ControlName"							"EditablePanel"
+			"fieldName"								"ComboBoxBG"
+			"xpos"									"4"
+			"ypos"									"0"
+			"zpos"									"0"
+			"wide"									"p0.47"
+			"tall"									"24"
+			"visible"								"1"
+			"enabled"								"1"
+			"proportionaltoparent"					"1"
+			"paintboder"							"1"
+			"border"								"MaterialGrayDarker"
+
+			"pin_to_sibling" 						"ComboBox"
+			"pin_corner_to_sibling" 				"PIN_CENTER_LEFT"
+			"pin_to_sibling_corner" 				"PIN_CENTER_LEFT"
+		}
+
 		"CallVoteButton"
 		{
 			"ControlName"							"Button"
 			"fieldName"								"CallVoteButton"
-			"xpos"									"75"
-			"ypos"									"275"
-			"zpos"									"1"
-			"wide"									"160"
+			"xpos"									"cs-0.5"
+			"ypos"									"rs1-3"
+			"zpos"									"10"
+			"wide"									"f6"
 			"tall"									"24"
-			"autoResize"							"0"
-			"pinCorner"								"3"
 			"visible"								"1"
-			"enabled"								"0"
-			"tabPosition"							"4"
+			"enabled"								"1"
+			"proportionaltoparent"					"1"
 			"labelText"								"#TF_call_vote"
 			"textAlignment"							"center"
-			"dulltext"								"0"
-			"brighttext"							"0"
 			"Command"								"CallVote"
 			"Default"								"0"
-			"font"									"Size 14"
+			"font"									"Size 15"
+
 			"AllCaps"								"1"
-			"sound_depressed"						"UI/buttonclick.wav"
-			"sound_released"						"UI/buttonclickrelease.wav"
-		
+
 			"paintbackground"						"0"
 			"paintborder"							"0"
-			
+
+			"sound_depressed"						"UI/buttonclick.wav"
+			"sound_released"						"UI/buttonclickrelease.wav"
+
 			"defaultFgColor_override"				"White"
-			"armedFgColor_override"					"White"
-			"depressedFgColor_override" 			"White"
+			"armedFgColor_override"					"WhiteSolid"
+			"depressedFgColor_override" 			"WhiteSolid"
 		}
-		
 		"CallVoteButtonBG"
 		{
 			"ControlName"							"EditablePanel"
 			"fieldName"								"CallVoteButtonBG"
-			"xpos"									"75"
-			"ypos"									"275"
+			"xpos"									"0"
+			"ypos"									"0"
 			"zpos"									"0"
-			"wide"									"160"
+			"wide"									"f6"
 			"tall"									"24"
-			"autoResize"							"0"
-			"pinCorner"								"3"
 			"visible"								"1"
-			"enabled"								"0"
-			"border"								"MaterialGrayDark"
+			"enabled"								"1"
+			"proportionaltoparent"					"1"
+			"paintboder"							"1"
+			"border"								"MaterialHypno"
+			"pin_to_sibling" 						"CallVoteButton"
 		}
-		
+
 		"Button1"
 		{
 			"ControlName"							"Button"
 			"fieldName"								"Button1"
-			"xpos"									"240"
-			"ypos"									"275"
-			"zpos"									"1"
-			"wide"									"80"
-			"tall"									"24"
-			"autoResize"							"0"
-			"pinCorner"								"3"
+			"xpos"									"rs1-5"
+			"ypos"									"5"
+			"zpos"									"10"
+			"wide"									"22"
+			"tall"									"22"
 			"visible"								"1"
 			"enabled"								"1"
-			"tabPosition"							"4"
-			"labelText"								"#GameUI_Close"
+			"proportionaltoparent"					"1"
+			"labelText"								"-"
 			"textAlignment"							"center"
-			"dulltext"								"0"
-			"brighttext"							"0"
 			"Command"								"Close"
 			"Default"								"0"
-			"font"									"Size 14"
+			"font"									"Symbols 18"
+
 			"AllCaps"								"1"
-			"sound_depressed"						"UI/buttonclick.wav"
-			"sound_released"						"UI/buttonclickrelease.wav"
-		
+
 			"paintbackground"						"0"
 			"paintborder"							"0"
-			
+
+			"sound_depressed"						"UI/buttonclick.wav"
+			"sound_released"						"UI/buttonclickrelease.wav"
+
 			"defaultFgColor_override"				"White"
-			"armedFgColor_override"					"White"
-			"depressedFgColor_override" 			"White"
+			"armedFgColor_override"					"WhiteSolid"
+			"depressedFgColor_override" 			"WhiteSolid"
 		}
-		
 		"Button1BG"
 		{
 			"ControlName"							"EditablePanel"
 			"fieldName"								"Button1BG"
-			"xpos"									"240"
-			"ypos"									"275"
+			"xpos"									"0"
+			"ypos"									"0"
 			"zpos"									"0"
-			"wide"									"80"
-			"tall"									"24"
-			"autoResize"							"0"
-			"pinCorner"								"3"
+			"wide"									"22"
+			"tall"									"22"
 			"visible"								"1"
-			"enabled"								"0"
-			"border"								"MaterialGrayDark"
+			"enabled"								"1"
+			"proportionaltoparent"					"1"
+			"paintborder"							"1"
+			"border"								"MaterialRed"
+			"pin_to_sibling" 						"Button1"
 		}
 	}
 }
\ No newline at end of file