Bumped version number. New Control Point Icons.

- Added custom control point icons.
- Bumped version number.
- Removed the Symbols font file and files for teambar, intromenu and inspectpanel.
- Updated the payload tracker and control point icons.
- Updated the hud animations and layout files.
- Updated the included config to improve hud experience (Credit to Wiethoofd)

8 files changed, 433 insertions, 496 deletions

diff --git a/resource/fonts/Symbol.ttf b/resource/fonts/Symbol.ttf
deleted file mode 100644
index fd1c033..0000000
--- a/resource/fonts/Symbol.ttf
+++ /dev/null
diff --git a/resource/preload.res b/resource/preload.res
new file mode 100644
index 0000000..2e0e3a9
--- /dev/null
+++ b/resource/preload.res
@@ -0,0 +1,142 @@
+"Resource/UI/MainMenuOverride.res"
+{
+	"cpiconbluunlock"
+	{
+		"ControlName"	"ImagePanel"
+		"fieldName"		"cpiconbluunlock"
+		"xpos"			"9999"
+		"visible"		"1"
+		"enabled"		"1"
+		"image"			"../sprites/obj_icons/icon_obj_blu"
+	}
+	
+	"cpiconblulock"
+	{
+		"ControlName"	"ImagePanel"
+		"fieldName"		"cpiconblulock"
+		"xpos"			"9999"
+		"visible"		"1"
+		"enabled"		"1"
+		"image"			"../sprites/obj_icons/icon_obj_blu_locked"
+	}	
+	
+	"cpiconredunlock"
+	{
+		"ControlName"	"ImagePanel"
+		"fieldName"		"cpiconredunlock"
+		"xpos"			"9999"
+		"visible"		"1"
+		"enabled"		"1"
+		"image"			"../sprites/obj_icons/icon_obj_red"
+	}
+	
+	"cpiconredlock"
+	{
+		"ControlName"	"ImagePanel"
+		"fieldName"		"cpiconredlock"
+		"xpos"			"9999"
+		"visible"		"1"
+		"enabled"		"1"
+		"image"			"../sprites/obj_icons/icon_obj_red_locked"
+	}	
+	
+	"cpiconneutralunlock"
+	{
+		"ControlName"	"ImagePanel"
+		"fieldName"		"cpiconneutralunlock"
+		"xpos"			"9999"
+		"visible"		"1"
+		"enabled"		"1"
+		"image"			"../sprites/obj_icons/icon_obj_neutral"
+	}	
+	
+	"cpiconneutrallock"
+	{
+		"ControlName"	"ImagePanel"
+		"fieldName"		"cpiconneutrallock"
+		"xpos"			"9999"
+		"visible"		"1"
+		"enabled"		"1"
+		"image"			"../sprites/obj_icons/icon_obj_neutral_locked"
+	}
+	
+	"cpicona"
+	{
+		"ControlName"	"ImagePanel"
+		"fieldName"		"cpicona"
+		"xpos"			"9999"
+		"visible"		"1"
+		"enabled"		"1"
+		"image"			"../sprites/obj_icons/icon_obj_a"
+	}
+	
+	"cpiconb"
+	{
+		"ControlName"	"ImagePanel"
+		"fieldName"		"cpiconb"
+		"xpos"			"9999"
+		"visible"		"1"
+		"enabled"		"1"
+		"image"			"../sprites/obj_icons/icon_obj_b"
+	}
+	
+	"cpiconc"
+	{
+		"ControlName"	"ImagePanel"
+		"fieldName"		"cpiconc"
+		"xpos"			"9999"
+		"visible"		"1"
+		"enabled"		"1"
+		"image"			"../sprites/obj_icons/icon_obj_c"
+	}
+	
+	"cpicond"
+	{
+		"ControlName"	"ImagePanel"
+		"fieldName"		"cpicond"
+		"xpos"			"9999"
+		"visible"		"1"
+		"enabled"		"1"
+		"image"			"../sprites/obj_icons/icon_obj_d"
+	}
+	
+	"cpicone"
+	{
+		"ControlName"	"ImagePanel"
+		"fieldName"		"cpicone"
+		"xpos"			"9999"
+		"visible"		"1"
+		"enabled"		"1"
+		"image"			"../sprites/obj_icons/icon_obj_e"
+	}
+	
+	"cpiconcapblu"
+	{
+		"ControlName"	"ImagePanel"
+		"fieldName"		"cpiconcapblu"
+		"xpos"			"9999"
+		"visible"		"1"
+		"enabled"		"1"
+		"image"			"../sprites/obj_icons/icon_obj_cap_blu"
+	}
+	
+	"cpiconcapred"
+	{
+		"ControlName"	"ImagePanel"
+		"fieldName"		"cpiconcapred"
+		"xpos"			"9999"
+		"visible"		"1"
+		"enabled"		"1"
+		"image"			"../sprites/obj_icons/icon_obj_cap_red"
+	}
+	
+	"cpiconcapmask"
+	{
+		"ControlName"	"ImagePanel"
+		"fieldName"		"cpiconcapmask"
+		"xpos"			"9999"
+		"visible"		"1"
+		"enabled"		"1"
+		"image"			"../sprites/obj_icons/icon_obj_cap_mask"
+	}
+}
\ No newline at end of file
diff --git a/resource/ui/controlpointicon.res b/resource/ui/controlpointicon.res
index f42957d..15c7d66 100644
--- a/resource/ui/controlpointicon.res
+++ b/resource/ui/controlpointicon.res
@@ -7,8 +7,8 @@
 		"xpos"			"0"
 		"ypos"			"0"
 		"zpos"			"2"
-		"wide"			"28"
-		"tall"			"28"
+		"wide"			"26"
+		"tall"			"26"
 		"visible"		"1"
 		"enabled"		"1"
 	}
@@ -20,8 +20,8 @@
 		"xpos"			"0"
 		"ypos"			"0"
 		"zpos"			"4"
-		"wide"			"28"
-		"tall"			"28"
+		"wide"			"26"
+		"tall"			"26"
 		"visible"		"1"
 		"enabled"		"1"
 	}
@@ -50,7 +50,7 @@
 		"ypos"			"0"
 		"zpos"			"4"
 		"wide"			"16"
-		"tall"			"33"
+		"tall"			"26"
 		"autoResize"	"0"
 		"pinCorner"		"0"
 		"visible"		"1"
diff --git a/resource/ui/hudinspectpanel.res b/resource/ui/hudinspectpanel.res
deleted file mode 100644
index 04097ba..0000000
--- a/resource/ui/hudinspectpanel.res
+++ /dev/null
@@ -1,75 +0,0 @@
-"Resource/UI/HudInspectPanel.res"
-{	
-	"itempanel"
-	{
-		"ControlName"			"CItemModelPanel"
-		"fieldName"				"itempanel"
-		"xpos"					"0"
-		"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"
-		
-		"ItemBackground"
-		{
-			"ControlName"		"ImagePanel"
-			"fieldName"			"ItemBackground"
-			"xpos"				"0"
-			"ypos"				"0"
-			"zpos"				"-1"
-			"wide"				"240"
-			"tall"				"900"
-			"autoResize"		"0"
-			"pinCorner"			"0"
-			"visible"			"1"
-			"enabled"			"1"
-			"fillcolor"			"0 0 0 100"
-		}
-		
-		"itemmodelpanel"
-		{
-			"fieldName"				"itemmodelpanel"
-			"use_item_rendertarget" "0"
-			"useparentbg"			"1"
-			"inventory_image_type"	"1"
-		}
-		
-		"ItemLabel"
-		{	
-			"ControlName"	"Label"
-			"fieldName"		"ItemLabel"
-			"font"			"Cerbetica12"
-			"xpos"			"10"
-			"ypos"			"3"
-			"zpos"			"1"
-			"wide"			"270"
-			"tall"			"16"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"labelText"		"#FreezePanel_Item"
-			"textAlignment"	"Left"
-			"dulltext"		"0"
-			"brighttext"	"0"
-		}
-	}
-}
\ No newline at end of file
diff --git a/resource/ui/huditemattributetracker.res b/resource/ui/huditemattributetracker.res
new file mode 100644
index 0000000..e19e852
--- /dev/null
+++ b/resource/ui/huditemattributetracker.res
@@ -0,0 +1,82 @@
+"Resource/UI/HudAchievementTrackerItem.res"
+{	
+	"ItemAttributeTracker"
+	{
+		"fieldName" 	"ItemAttributeTracker"
+		"visible" 		"1"
+		"enabled" 		"1"
+		"xpos"			"0"
+		"ypos"			"0"
+		"wide"			"f0"
+		"tall"			"f0"
+		"PaintBackgroundType"	"0"
+
+		"stats_buffer_width"	"30"
+	}
+
+	"QuestsStatusContainer"
+	{
+		"ControlName"	"EditablePanel"
+		"fieldName"		"QuestsStatusContainer"
+		"xpos"			"rs1-10"
+		"ypos"			"120"
+		"wide"			"110"
+		"tall"			"20"
+		"proportionaltoparent"	"1"
+
+		"border"	"NoBorder"	//QuestStatusBorder
+		"paintborder"	"2"
+		
+		"Header"
+		{
+			"ControlName"	"Label"
+			"fieldName"		"Header"
+			"labeltext"		"%header%"
+			"xpos"			"rs1"
+			"ypos"			"2"
+			"wide"			"500"
+			"tall"			"18"
+			"zpos"			"4"
+			"textinsetx"	"5"
+			"fgcolor_override"		"255 255 255 255"	//235 226 202 255
+			"font"			"AchievementTracker_Name"
+			//"wrap"			"1"
+			"TextAlignment"		"north-east"
+			"proportionaltoparent" "1"
+		}
+
+		"CallToAction"
+		{
+			"ControlName"	"CExLabel"
+			"fieldName"		"CallToAction"
+			"labeltext"		"%call_to_action%"
+			"xpos"			"rs1"
+			"ypos"			"11"
+			"wide"			"190"
+			"tall"			"f0"
+			"zpos"			"4"
+			"textinsetx"	"5"
+			"fgcolor_override"		"255 255 255 255"	//235 226 202 255
+			"font"			"QuestObjectiveTracker_Desc"
+			//"wrap"			"1"
+			"TextAlignment"		"north-east"
+			"proportionaltoparent" "1"
+		}
+
+		"Image"
+		{
+			"ControlName"	"CTFImagePanel"
+			"fieldName"		"Image"
+			"xpos"			"4"
+			"ypos"			"cs-0.5"
+			"zpos"			"0"
+			"wide"			"o1"
+			"tall"			"p0.8"
+			"visible"		"0"	//1
+			"enabled"		"0"	//1
+			"image"			"tf2_folder_icon"
+			"scaleImage"	"1"	
+			"proportionaltoparent"	"1"	
+		}
+	}
+}
diff --git a/resource/ui/intromenu.res b/resource/ui/intromenu.res
deleted file mode 100644
index 5af2792..0000000
--- a/resource/ui/intromenu.res
+++ /dev/null
@@ -1,293 +0,0 @@
-"Resource/UI/IntroMenu.res"
-{
-	"intro"
-	{
-		"ControlName"	"CTFIntroMenu"
-		"fieldName"		"intro"
-		"xpos"			"0"
-		"ypos"			"0"
-		"wide"			"f0"
-		"tall"			"480"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"1"
-		"enabled"		"1"
-		"tabPosition"	"0"
-		"paintbackground"	"0"
-	}
-	
-	"MainBG"
-	{
-		"ControlName"	"ImagePanel"
-		"fieldName"		"MainBG"
-		"xpos"			"c-180"
-		"ypos"			"c-120"
-		"zpos"			"-1"
-		"wide"			"360"
-		"tall"			"250"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"1"
-		"enabled"		"1"
-		"fillcolor"		"0 0 0 100"
-	}
-	
-	"titlelabel"
-	{
-		"ControlName"	"CExLabel"
-		"fieldName"		"titlelabel"
-		"xpos"			"0"
-		"ypos"			"0"
-		"wide"			"f0"
-		"tall"			"70"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"0"
-		"enabled"		"0"
-		"tabPosition"	"0"
-	}
-
-	"Skip" [$WIN32] 
-	{
-		"ControlName"	"CExButton"
-		"fieldName"		"Skip"
-		"xpos"			"c60"
-		"ypos"			"c96"
-		"zpos"			"6"
-		"wide"			"120"
-		"tall"			"30"
-		"autoResize"	"0"
-		"pinCorner"		"2"
-		"visible"		"1"
-		"enabled"		"1"
-		"tabPosition"	"0"
-		"labelText"		"SKIP"
-		"textAlignment"	"center"
-		"dulltext"		"0"
-		"brighttext"	"0"
-		"wrap"			"0"
-		"command"		"skip"
-		"font"			"Cerbetica20"
-		"paintbackground"	"0"
-
-		"fgcolor"					"TanLight"
-		"defaultFgColor_override" 	"TanLight"
-		"armedFgColor_override"		"TanDark"
-		"depressedFgColor_override" "TanDark"
-		"selectedFgColor_override" 	"TanDark"
-	}
-
-	"Continue"
-	{
-		"ControlName"	"CExButton"
-		"fieldName"		"Continue"
-		"xpos"			"99999"
-		"ypos"			"r40"
-		"zpos"			"6"
-		"wide"			"150"
-		"tall"			"30"
-		"autoResize"	"0"
-		"pinCorner"		"2"
-		"visible"		"0"
-		"enabled"		"0"
-		"tabPosition"	"0"
-		"labelText"		"CONTINUE (&E)"
-		"textAlignment"	"center"
-		"dulltext"		"0"
-		"brighttext"	"0"
-		"wrap"			"0"
-		"command"		"skip"
-		"font"			"MenuSmallFont"
-	}
-	
-	"Back" [$WIN32] 
-	{
-		"ControlName"	"CExButton"
-		"fieldName"		"Back"
-		"xpos"			"c-180"
-		"ypos"			"c96"
-		"zpos"			"6"
-		"wide"			"120"
-		"tall"			"30"
-		"autoResize"	"0"
-		"pinCorner"		"2"
-		"visible"		"1"
-		"enabled"		"1"
-		"labelText"		"BACK"
-		"textAlignment"	"center"
-		"dulltext"		"0"
-		"brighttext"	"0"
-		"command"		"back"
-		"font"			"Cerbetica20"
-		"paintbackground"	"0"
-		
-		"fgcolor"					"TanLight"
-		"defaultFgColor_override" 	"TanLight"
-		"armedFgColor_override"		"TanDark"
-		"depressedFgColor_override" "TanDark"
-		"selectedFgColor_override" 	"TanDark"
-	}
-
-	"ReplayVideo" [$WIN32] 
-	{
-		"ControlName"	"CExButton"
-		"fieldName"		"ReplayVideo"
-		"xpos"			"9999"
-		"xpos_hidef"	"50"
-		"ypos"			"9999"
-		"ypos_lodef"	"r64"
-		"ypos_hidef"	"r54"
-		"zpos"			"6"
-		"wide"			"150"
-		"tall"			"30"
-		"autoResize"	"0"
-		"pinCorner"		"2"
-		"visible"		"0"
-		"enabled"		"1"
-		"labelText"		"#TF_ReplayIntro"
-		"textAlignment"	"center"
-		"dulltext"		"0"
-		"brighttext"	"0"
-		"command"		"replayVideo"
-		"font"			"MenuSmallFont"
-		"fgcolor"		"Black"
-	}
-	
-	"ShadedBar"
-	{
-		"ControlName"	"ImagePanel"
-		"fieldName"		"ShadedBar"
-		"xpos"			"9999"
-		"ypos"			"9999"
-		"zpos"			"5"
-		"wide"			"f0"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"1"
-		"enabled"		"1"
-		"tabPosition"	"0"	
-		"image"			"loadout_bottom_gradient"
-		"tileImage"		"1"
-		"PaintBackgroundType"	"0"
-	}		
-	
-	"VideoPanel"
-	{
-		"ControlName"	"CTFVideoPanel"
-		"fieldName"		"VideoPanel"
-		"xpos"			"c-140"
-		"ypos"			"c-110"
-		"zpos"			"1"
-		"wide"			"340"
-		"tall"			"205"
-		"autoResize"	"1"
-		"pinCorner"		"0"
-		"visible"		"1"
-		"enabled"		"1"
-		"start_delay"	"2.0"
-		"end_delay"		"2.0"
-	}
-	
-	"MenuBG"
-	{
-		"ControlName"	"CModelPanel"
-		"fieldName"		"MenuBG"
-		"xpos"			"0"
-		"ypos"			"0"
-		"zpos"			"0"		
-		"wide"			"f0"
-		"tall"			"480"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"0"
-		"enabled"		"0"
-		"fov"			"20"
-		
-		"model"
-		{
-			"modelname"	"models/vgui/UI_welcome01_screen.mdl"
-			"skin"		"0"
-			"angles_x" "0"
-			"angles_y" "180"
-			"angles_z" "0"
-			"origin_x" "290"
-			"origin_x_lodef" "320"
-			"origin_x_hidef" "310"
-			"origin_y" "0"
-			"origin_z" "-39"
-			
-			"animation"
-			{
-				"name"			"Up"
-				"sequence"		"screenup"
-			}
-			
-			"animation"
-			{
-				"name"			"UpSlow"
-				"sequence"		"screenup_slow"
-			}
-			
-			"animation"
-			{
-				"name"			"Down"
-				"sequence"		"screendown"
-				"default"		"1"
-			}
-		}
-	}
-	
-	"VideoCaption"
-	{
-		"ControlName"	"CExLabel"
-		"fieldName"		"VideoCaption"
-		"xpos"			"c-145"
-		"ypos"			"c40"
-		"zpos"			"6"
-		"wide"			"295"
-		"tall"			"70"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"0"
-		"enabled"		"1"
-		"labelText"		" "
-		"textAlignment"	"center"
-		"dulltext"		"0"
-		"brighttext"	"0"
-		"font"			"IntroMenuCaption"
-		"fgcolor"		"White"
-		"wrap"			"1"
-	}
-	
-	"Footer" [$X360]
-	{
-		"ControlName"		"CTFFooter"
-		"fieldName"			"Footer"
-		"zpos"				"6"
-		"tall"				"80"
-		"button_separator"	"10"
-		"button_separator_lodef" "5"
-		"buttongap"			"50"
-		"textadjust"		"3"
-		"buttonoffsety"		"20"
-		"buttonoffsety_hidef"	"0"
-		"buttonoffsety_lodef"	"18"
-		"fonttext"			"MatchmakingDialogMenuLarge"
-		"fonttext_lodef"	"MatchmakingDialogMenuSmall"
-		"fgcolor"			"HudOffWhite" 	
-		
-		"button"
-		{
-			"name"		"intro"
-			"text"		"#GameUI_Back"
-			"icon"		"#GameUI_Icons_B_BUTTON"	
-		}
-		
-		"button"
-		{
-			"name"		"continue"
-			"text"		"#Button_SkipIntro_360"
-			"icon"		"#GameUI_Icons_A_BUTTON"	
-		}
-	}	
-}
\ No newline at end of file
diff --git a/resource/ui/objectivestatusescort.res b/resource/ui/objectivestatusescort.res
index 4061031..13a73f8 100644
--- a/resource/ui/objectivestatusescort.res
+++ b/resource/ui/objectivestatusescort.res
@@ -4,10 +4,10 @@
 	{
 		"ControlName"		"EditablePanel"
 		"fieldName"			"ObjectiveStatusEscort"
-		"xpos"				"c-200"
-		"ypos"				"330"
+		"xpos"				"0"
+		"ypos"				"r145"
 		"zpos"				"1"
-		"wide"				"400"
+		"wide"				"f0"
 		"tall"				"150"
 		"visible"			"1"
 		"enabled"			"1"
@@ -16,7 +16,7 @@
 		
 		"if_multiple_trains"
 		{
-			"ypos"			"330"
+			"ypos"			"r200"
 			"tall"			"200"
 		}
 	}
@@ -25,51 +25,91 @@
 	{
 		"ControlName"		"ImagePanel"
 		"fieldName"			"LevelBar"
-		"xpos"				"73"
-		"ypos"				"123"
+		"xpos"				"c-60"
+		"ypos"				"130"
 		"zpos"				"0"
-		"wide"				"254"
-		"tall"				"4"
-		"visible"			"1"
+		"wide"				"120"
+		"tall"				"10"
+		"visible"			"0"
 		"enabled"			"1"
 		"labelText"			""
-		"image"				"../hud/cart_track"
+		"image"				"../hud/cart_track_neutral_opaque"
 		"scaleImage"		"1"
 		
 		"if_multiple_trains"
 		{
 			"ypos"			"114"
 			"zpos"			"3"
-			"tall"			"12"
+			"tall"			"10"
 			"image"			"../hud/cart_track_neutral_opaque"
 		}
 		
 		"if_single_with_hills"
 		{
-			"ypos"			"120"
-			"tall"			"12"
+			"ypos"			"131"
+			"tall"			"8"
 			"image"			"../hud/cart_track_neutral_opaque"
 		}
 	}
 	
-	"ProgressBar"
+	"BarBg"
 	{
-		"ControlName"	"CTFHudEscortProgressBar"
-		"fieldName"		"ProgressBar"
-		"xpos"			"73"
-		"ypos"			"123"
-		"zpos"			"4"
-		"wide"			"254"
-		"tall"			"4"
-		"visible"		"0"
+		"ControlName"	"EditablePanel"
+		"fieldName"		"BarBg"
+		"xpos"			"c-60"
+		"ypos"			"131"
+		"zpos"			"0"
+		"wide"			"120"
+		"tall"			"8"
+		"visible"		"1"
 		"enabled"		"1"
-		"scaleImage"	"1"
+		"paintbackground"	"1"
+		"bgcolor_override"	"0 0 0 100"
 		
 		"if_multiple_trains"
 		{
-			"ypos"			"114"
+			"ypos"		"115"
+		}
+	}
+	
+	"BarStripe"
+	{
+		"ControlName"	"EditablePanel"
+		"fieldName"		"BarStripe"
+		"xpos"			"c-60"
+		"ypos"			"134"
+		"zpos"			"0"
+		"wide"			"120"
+		"tall"			"2"
+		"visible"		"1"
+		"enabled"		"1"
+		"paintbackground"	"1"
+		"bgcolor_override"	"255 255 255 10"
+		
+		"if_multiple_trains"
+		{
+			"ypos"		"118"
+		}
+	}
+	
+	"ProgressBar"
+	{
+		"ControlName"		"CTFHudEscortProgressBar"
+		"fieldName"			"ProgressBar"
+		"xpos"				"c-60"
+		"ypos"				"131"
+		"zpos"				"10"
+		"wide"				"120"
+		"tall"				"10"
+		"visible"			"0"
+		"enabled"			"1"
+		"scaleImage"		"1"
+		
+		"if_multiple_trains"
+		{
+			"ypos"			"115"
 			"zpos"			"6"
-			"tall"			"12"
+			"tall"			"8"
 			"visible"		"1"
 		}
 	}
@@ -78,28 +118,28 @@
 	{
 		"ControlName"		"ImagePanel"
 		"fieldName"			"HomeCPIcon"
-		"xpos"				"64"
-		"ypos"				"116"
-		"zpos"				"1"
-		"wide"				"18"
-		"tall"				"18"
+		"xpos"				"c-66"
+		"ypos"				"130"
+		"zpos"				"10"
+		"wide"				"10"
+		"tall"				"10"
 		"autoResize"		"0"
 		"pinCorner"			"0"
 		"visible"			"1"
 		"enabled"			"1"
 		"tabPosition"		"0"
 		"labelText"			""
-		"image"				"../hud/cart_home_blue"
+		"image"				"../hud/cart_point_blue_opaque"
 		"scaleImage"		"1"	
 		
 		"if_team_red"
 		{
-			"image"			"../hud/cart_home_red"
+			"image"			"../hud/cart_point_red"
 		}
 		
 		"if_single_with_hills_blue"
 		{
-			"image"			"../hud/cart_home_blue_opaque"
+			"image"			"../hud/cart_point_blue_opaque"
 		}		
 		
 		"if_single_with_hills_red"
@@ -109,10 +149,10 @@
 		
 		"if_multiple_trains"
 		{
-			"xpos"			"61"
-			"zpos"			"5"
-			"wide"			"12"
-			"tall"			"12"
+			"xpos"			"c-66"
+			"zpos"			"10"
+			"wide"			"10"
+			"tall"			"10"
 			"image"			"../hud/cart_track_neutral_opaque"
 		}
 		
@@ -128,12 +168,12 @@
 		
 		"if_multiple_trains_red"
 		{
-			"image"			"../hud/cart_home_red_square"
+			"image"			"../hud/cart_point_red_opaque"
 		}
 		
 		"if_multiple_trains_blue"
 		{
-			"image"			"../hud/cart_home_blue_square"
+			"image"			"../hud/cart_point_blue_opaque"
 		}
 	}
 	
@@ -141,11 +181,11 @@
 	{
 		"ControlName"		"ImagePanel"
 		"fieldName"			"SimpleControlPointTemplate"
-		"xpos"				"65"
-		"ypos"				"116"
-		"zpos"				"1"
-		"wide"				"18"
-		"tall"				"18"
+		"xpos"				"40"
+		"ypos"				"130"
+		"zpos"				"10"
+		"wide"				"10"
+		"tall"				"10"
 		"autoResize"		"0"
 		"pinCorner"			"0"
 		"visible"			"0"
@@ -160,8 +200,8 @@
 			"xpos"			"61"
 			"ypos"			"114"
 			"zpos"			"5"	
-			"wide"			"12"
-			"tall"			"12"
+			"wide"			"10"
+			"tall"			"10"
 		}
 	}
 
@@ -170,10 +210,10 @@
 		"ControlName"		"EditablePanel"
 		"fieldName"			"EscortItemPanel"
 		"xpos"				"0"
-		"ypos"				"48"
+		"ypos"				"30"
 		"zpos"				"2"
-		"wide"				"52"
-		"tall"				"75"
+		"wide"				"80"
+		"tall"				"115"
 		"visible"			"1"
 		"enabled"			"1"
 		
@@ -189,12 +229,12 @@
 		{	
 			"ControlName"	"CExLabel"
 			"fieldName"		"RecedeTime"
-			"font"			"Cerbetica8"
-			"xpos"			"18"
-			"ypos"			"53"
+			"font"			"Cerbetica10"
+			"xpos"			"27"
+			"ypos"			"78"
 			"zpos"			"2"
-			"wide"			"17"
-			"tall"			"7"
+			"wide"			"25"
+			"tall"			"10"
 			"autoResize"	"0"
 			"pinCorner"		"0"
 			"visible"		"1"
@@ -206,9 +246,9 @@
 			
 			"if_multiple_trains"
 			{
-				"font"		"ItemFontAttribSmall"
-				"xpos"		"21"
-				"wide"		"11"
+				"font"		"HudFontSmallest"
+				"xpos"		"17"
+				"wide"		"18"
 				"tall"		"10"
 			}
 			
@@ -227,11 +267,11 @@
 		{
 			"ControlName"	"ImagePanel"
 			"fieldName"		"EscortItemImage"
-			"xpos"			"13"
-			"ypos"			"50"
+			"xpos"			"27"
+			"ypos"			"77"
 			"zpos"			"1"
-			"wide"			"26"
-			"tall"			"26"
+			"wide"			"25"
+			"tall"			"25"
 			"autoResize"	"0"
 			"pinCorner"		"0"
 			"visible"		"1"
@@ -326,11 +366,11 @@
 		{
 			"ControlName"	"ImagePanel"
 			"fieldName"		"Speed_Backwards"
-			"xpos"			"23"
-			"ypos"			"53"
+			"xpos"			"36"
+			"ypos"			"80"
 			"zpos"			"2"
-			"wide"			"7"
-			"tall"			"7"
+			"wide"			"6"
+			"tall"			"6"
 			"autoResize"	"0"
 			"pinCorner"		"0"
 			"visible"		"0"
@@ -362,19 +402,19 @@
 		{
 			"ControlName"	"ImagePanel"
 			"fieldName"		"CapPlayerImage"
-			"xpos"			"20"
-			"ypos"			"52"
+			"xpos"			"9999"
+			"ypos"			"9999"
 			"zpos"			"3"
-			"wide"			"3"
-			"tall"			"7"
+			"wide"			"6"
+			"tall"			"12"
 			"visible"		"0"
-			"enabled"		"1"
+			"enabled"		"0"
 			"image"			"capture_icon_white"
 			"scaleImage"	"1"
 			
 			"if_multiple_trains"
 			{
-				"xpos"		"19"
+				"xpos"		"9999"
 				"wide"		"5"
 				"tall"		"10"
 			}
@@ -394,27 +434,27 @@
 		{	
 			"ControlName"	"CExLabel"
 			"fieldName"		"CapNumPlayers"
-			"font"			"Cerbetica8"
-			"xpos"			"25"
-			"ypos"			"53"
-			"zpos"			"4"
-			"wide"			"20"
-			"tall"			"7"
+			"font"			"Cerbetica10"
+			"xpos"			"32"
+			"ypos"			"79"
+			"zpos"			"5"
+			"wide"			"15"
+			"tall"			"8"
 			"autoResize"	"0"
 			"pinCorner"		"0"
 			"visible"		"0"
 			"enabled"		"1"
 			"labelText"		"#ControlPointIconCappers"
-			"textAlignment"	"west"
+			"textAlignment"	"center"
 			"dulltext"		"0"
 			"brighttext"	"0"
 			
 			"if_multiple_trains"
 			{
-				"font"		"ItemFontAttribSmall"
-				"xpos"		"24"
-				"wide"		"30"
+				"xpos"		"16"
+				"wide"		"18"
 				"tall"		"10"
+				"textinsetx"	"-10"
 			}			
 			
 			"if_multiple_trains_top"
@@ -424,7 +464,7 @@
 			
 			"if_multiple_trains_bottom"
 			{
-				"ypos"		"81"
+				"ypos"		"82"
 			}	
 		}
 		
@@ -432,11 +472,11 @@
 		{
 			"ControlName"	"ImagePanel"
 			"fieldName"		"Blocked"	
-			"xpos"			"23"
-			"ypos"			"53"
+			"xpos"			"35"
+			"ypos"			"79"
 			"zpos"			"2"
-			"wide"			"7"
-			"tall"			"7"
+			"wide"			"8"
+			"tall"			"8"
 			"autoResize"	"0"
 			"pinCorner"		"0"
 			"visible"		"0"
@@ -470,16 +510,16 @@
 			"fieldName"			"EscortTeardrop"
 			"xpos"				"9999"
 			"ypos"				"9999"
-			"zpos"				"20"
-			"wide"				"100"
-			"tall"				"65"
+			"zpos"				"10"
+			"wide"				"50"
+			"tall"				"42"
 			"visible"			"0"
-			"enabled"			"1"
+			"enabled"			"0"
 			
 			"if_multiple_trains"
 			{
-				"xpos"			"9"
-				"ypos"			"2"
+				"xpos"			"9999"
+				"ypos"			"9999"
 				"wide"			"65"
 				"tall"			"42"
 			}
@@ -491,10 +531,8 @@
 				"xpos"			"0"
 				"ypos"			"0"
 				"zpos"			"0"
-				"wide"			"54"
-				"tall"			"65"
-				"wide_minmode"	"35"
-				"tall_minmode"	"42"
+				"wide"			"34"
+				"tall"			"41"
 				"visible"		"1"
 				"enabled"		"1"
 				"scaleImage"	"1"
@@ -503,10 +541,6 @@
 				
 				"if_multiple_trains"
 				{
-					"xpos"		"0"
-					"ypos"		"0"
-					"wide"		"35"
-					"tall"		"42"
 				}
 			}
 
@@ -515,30 +549,27 @@
 				"ControlName"	"Label"
 				"fieldName"		"ProgressText"
 				"font"			"DefaultSmall"
-				"font_minmode"	"DefaultVerySmall"
-				"xpos"			"9999"
-				"ypos"			"9999"
+				"xpos"			"0"
+				"ypos"			"8"
 				"zpos"			"23"
-				"wide"			"54"
-				"tall"			"40"
-				"wide_minmode"	"35"
-				"tall_minmode"	"28"
+				"wide"			"0"
+				"tall"			"0"
 				"autoResize"	"0"
 				"pinCorner"		"0"
 				"visible"		"0"
-				"enabled"		"1"
-				"labelText"		"progress"
+				"enabled"		"0"
+				"labelText"		"#Questlog_Progress"
 				"dulltext"		"0"
 				"brighttext"	"0"
 				"centerwrap"	"1"
 				
 				"if_multiple_trains"
 				{
-					"font"		"Cerbetica8"
+					"font"		"DefaultVerySmall"
 					"xpos"		"0"
 					"ypos"		"3"
-					"wide"		"35"
-					"tall"		"28"
+					"wide"		"0"
+					"tall"		"0"
 				}
 			}
 
@@ -547,12 +578,10 @@
 				"ControlName"	"CIconPanel"
 				"fieldName"		"Blocked"
 				"xpos"			"2"
-				"ypos"			"2"
+				"ypos"			"3"
 				"zpos"			"1"
-				"wide"			"50"
-				"tall"			"50"
-				"wide_minmode"	"31"
-				"tall_minmode"	"31"
+				"wide"			"30"
+				"tall"			"30"
 				"visible"		"1"
 				"enabled"		"1"
 				"scaleImage"	"1"
@@ -572,13 +601,11 @@
 			{
 				"ControlName"	"ImagePanel"
 				"fieldName"		"Capping"	
-				"xpos"			"8"
-				"ypos"			"8"
+				"xpos"			"6"
+				"ypos"			"6"
 				"zpos"			"1"
-				"wide"			"30"
-				"tall"			"30"
-				"wide_minmode"	"20"
-				"tall_minmode"	"20"
+				"wide"			"24"
+				"tall"			"24"
 				"autoResize"	"0"
 				"pinCorner"		"0"
 				"visible"		"0"
diff --git a/resource/ui/objectivestatusmultipleescort.res b/resource/ui/objectivestatusmultipleescort.res
new file mode 100644
index 0000000..1656e5c
--- /dev/null
+++ b/resource/ui/objectivestatusmultipleescort.res
@@ -0,0 +1,54 @@
+"Resource/UI/ObjectiveStatusMultipleEscort.res"
+{	
+	"ObjectiveStatusMultipleEscort"
+	{
+		"ControlName"		"EditablePanel"
+		"fieldName"			"ObjectiveStatusMultipleEscort"
+		"xpos"				"0"
+		"ypos"				"0"
+		"wide"				"f0"
+		"tall"				"480"
+		"visible"			"1"
+		"enabled"			"1"
+	}
+	
+	"BlueEscortPanel"
+	{
+		"ControlName"		"CTFHudEscort"
+		"fieldName"			"BlueEscortPanel"
+		"xpos"				"0"
+		"ypos"				"r150"
+		"zpos"				"220"
+		"wide"				"f0"
+		"tall"				"200"
+		"visible"			"1"
+		"enabled"			"1"
+		"progress_xpos"		"79"
+		"progress_wide"		"270"
+		
+		"if_blue_is_top"
+		{
+			"ypos"			"r162"
+		}
+	}
+
+	"RedEscortPanel"
+	{
+		"ControlName"		"CTFHudEscort"
+		"fieldName"			"RedEscortPanel"
+		"xpos"				"0"
+		"ypos"				"r150"
+		"zpos"				"220"
+		"wide"				"f0"
+		"tall"				"200"
+		"visible"			"1"
+		"enabled"			"1"
+		"progress_xpos"		"79"
+		"progress_wide"		"270"
+		
+		"if_red_is_top"
+		{
+			"ypos"			"r162"
+		}
+	}
+}
\ No newline at end of file