20171022 - Jungle Inferno Hot-Fixes

- Fixed the max player health number not displaying properly
- Fixed the top overlay covering the tabs in Inventory and Store pages
- Fixed the War Paint system not displaying
- Fixed the Phlogistinator item effect meter overlapping other meters
- Fixed the badge on the main menu not being clickable (might be buggy
in non 16:9 resolutions)
- Fixed the map name being covered in the loading screen

10 files changed, 1030 insertions, 153 deletions

diff --git a/resource/ui/CharInfoLoadoutSubPanel.res b/resource/ui/CharInfoLoadoutSubPanel.res
index 51bd4fe..defba37 100644
--- a/resource/ui/CharInfoLoadoutSubPanel.res
+++ b/resource/ui/CharInfoLoadoutSubPanel.res
@@ -267,7 +267,7 @@
 	{

 		"ControlName"		"ImageButton"

 		"fieldName"			"ShowBackpackButton"

-		"xpos"				"c-230"

+		"xpos"				"c-290"

 		"ypos"				"235"

 		"zpos"				"6"

 		"wide"				"60"

@@ -293,10 +293,10 @@
 		"ControlName"	"CExLabel"

 		"fieldName"		"ShowBackpackLabel"

 		"font"			"CerbeticaBold16"

-		"labelText"		"Backpack"

+		"labelText"		"#BackpackTitle"

 		"textAlignment"	"north"

-		"xpos"			"c-260"

-		"ypos"			"300"

+		"xpos"			"0"

+		"ypos"			"5"

 		"zpos"			"7"

 		"wide"			"120"

 		"tall"			"20"

@@ -304,12 +304,16 @@
 		"pinCorner"		"0"

 		"visible"		"1"

 		"enabled"		"1"

+

+		"pin_to_sibling"               "ShowBackpackButton"

+		"pin_corner_to_sibling"        "4"          

+		"pin_to_sibling_corner"        "6"  

 	}

 	"ShowCraftingButton"

 	{

 		"ControlName"		"ImageButton"

 		"fieldName"			"ShowCraftingButton"

-		"xpos"				"c-95"

+		"xpos"				"c-160"

 		"ypos"				"235"

 		"zpos"				"6"

 		"wide"				"60"

@@ -335,10 +339,10 @@
 		"ControlName"	"CExLabel"

 		"fieldName"		"ShowCraftingLabel"

 		"font"			"CerbeticaBold16"

-		"labelText"		"Crafting"

+		"labelText"		"#CraftingExplanation_Title"

 		"textAlignment"	"north"

-		"xpos"			"c-125"

-		"ypos"			"300"

+		"xpos"			"0"

+		"ypos"			"5"

 		"zpos"			"7"

 		"wide"			"120"

 		"tall"			"20"

@@ -346,12 +350,16 @@
 		"pinCorner"		"0"

 		"visible"		"1"

 		"enabled"		"1"

+

+		"pin_to_sibling"               "ShowCraftingButton"

+		"pin_corner_to_sibling"        "4"          

+		"pin_to_sibling_corner"        "6"  

 	}	

 	"ShowArmoryButton"

 	{

 		"ControlName"		"ImageButton"

 		"fieldName"			"ShowArmoryButton"

-		"xpos"				"c35"

+		"xpos"				"c-30"

 		"ypos"				"235"

 		"zpos"				"6"

 		"wide"				"60"

@@ -377,10 +385,10 @@
 		"ControlName"	"CExLabel"

 		"fieldName"		"ShowArmoryLabel"

 		"font"			"CerbeticaBold16"

-		"labelText"		"Catalog"

+		"labelText"		"#Armory"

 		"textAlignment"	"north"

-		"xpos"			"c5"

-		"ypos"			"300"

+		"xpos"			"0"

+		"ypos"			"5"

 		"zpos"			"7"

 		"wide"			"120"

 		"tall"			"20"

@@ -388,12 +396,16 @@
 		"pinCorner"		"0"

 		"visible"		"1"

 		"enabled"		"1"

+

+		"pin_to_sibling"               "ShowArmoryButton"

+		"pin_corner_to_sibling"        "4"          

+		"pin_to_sibling_corner"        "6" 

 	}

 	"ShowTradeButton"

 	{

 		"ControlName"		"ImageButton"

 		"fieldName"			"ShowTradeButton"

-		"xpos"				"c160"

+		"xpos"				"c100"

 		"ypos"				"235"

 		"zpos"				"6"

 		"wide"				"60"

@@ -419,10 +431,58 @@
 		"ControlName"	"CExLabel"

 		"fieldName"		"ShowTradeLabel"

 		"font"			"CerbeticaBold16"

-		"labelText"		"Trading"

+		"labelText"		"#TradingExplanation_Title"

 		"textAlignment"	"north"

-		"xpos"			"c130"

-		"ypos"			"300"

+		"xpos"			"0"

+		"ypos"			"5"

+		"zpos"			"7"

+		"wide"			"120"

+		"tall"			"20"

+		"autoResize"	"0"

+		"pinCorner"		"0"

+		"visible"		"1"

+		"enabled"		"1"

+		"wrap"			"0"

+

+		"pin_to_sibling"               "ShowTradeButton"

+		"pin_corner_to_sibling"        "4"          

+		"pin_to_sibling_corner"        "6" 

+	}

+

+	"ShowPaintkitsButton"

+	{

+		"ControlName"		"ImageButton"

+		"fieldName"			"ShowPaintkitsButton"

+		"xpos"				"c230"

+		"ypos"				"235"

+		"zpos"				"6"

+		"wide"				"60"

+		"tall"				"60"

+		"autoResize"		"0"

+		"pinCorner"			"0"

+		"visible"			"1"

+		"enabled"			"1"

+		"tabPosition"		"0"

+		"labelText"			""

+		"textAlignment"		"south-west"

+		"Command"			"paintkit_preview"

+		"Default"			"0"

+		"font"				"MenuKeys"

+		"scaleImage"		"1"

+		"activeimage"		"paintkit_tool"

+		"inactiveimage"		"paintkit_tool_bw"

+		"sound_depressed"	"UI/buttonclick.wav"

+		"sound_released"	"UI/buttonclickrelease.wav"

+	}	

+	"ShowPaintkitsLabel"

+	{

+		"ControlName"	"CExLabel"

+		"fieldName"		"ShowPaintkitsLabel"

+		"font"			"HudFontSmallestBold"

+		"labelText"		"#PaintkitTitle"

+		"textAlignment"	"north"

+		"xpos"			"0"

+		"ypos"			"5"

 		"zpos"			"7"

 		"wide"			"120"

 		"tall"			"20"

@@ -431,6 +491,10 @@
 		"visible"		"1"

 		"enabled"		"1"

 		"wrap"			"0"

+

+		"pin_to_sibling"               "ShowPaintkitsButton"

+		"pin_corner_to_sibling"        "4"          

+		"pin_to_sibling_corner"        "6" 

 	}

 	

 	"ClassLabel"

@@ -585,7 +649,7 @@
 		"textAlignment"	"center"

 		"dulltext"		"0"

 		"brighttext"	"0"

-		"default"		"1"

+		"default"		"0"

 		"Command"		"show_explanations"

 		"sound_depressed"	"UI/buttonclick.wav"

 		"sound_released"	"UI/buttonclickrelease.wav"

@@ -736,7 +800,7 @@
 			"textAlignment"	"center"

 			"dulltext"		"0"

 			"brighttext"	"0"

-			"default"		"1"

+			"default"		"0"

 			"sound_depressed"	"UI/buttonclick.wav"

 			"sound_released"	"UI/buttonclickrelease.wav"

 			"Command"		"nextexplanation"

@@ -785,7 +849,7 @@
 		"end_y"			"60"

 		"end_wide"		"250"

 		"end_tall"		"130"

-		"callout_inparents_x"	"c-195"

+		"callout_inparents_x"	"c-255"

 		"callout_inparents_y"	"240"

 		"next_explanation"		"CraftingExplanation"

 		

@@ -958,7 +1022,7 @@
 			"textAlignment"	"center"

 			"dulltext"		"0"

 			"brighttext"	"0"

-			"default"		"1"

+			"default"		"0"

 			"sound_depressed"	"UI/buttonclick.wav"

 			"sound_released"	"UI/buttonclickrelease.wav"

 			"Command"		"nextexplanation"

@@ -1007,7 +1071,7 @@
 		"end_y"			"60"

 		"end_wide"		"250"

 		"end_tall"		"140"

-		"callout_inparents_x"	"c-65"

+		"callout_inparents_x"	"c-130"

 		"callout_inparents_y"	"240"

 		"next_explanation"		"ArmoryExplanation"

 		

@@ -1180,7 +1244,7 @@
 			"textAlignment"	"center"

 			"dulltext"		"0"

 			"brighttext"	"0"

-			"default"		"1"

+			"default"		"0"

 			"sound_depressed"	"UI/buttonclick.wav"

 			"sound_released"	"UI/buttonclickrelease.wav"

 			"Command"		"nextexplanation"

@@ -1229,7 +1293,7 @@
 		"end_y"			"60"

 		"end_wide"		"250"

 		"end_tall"		"140"

-		"callout_inparents_x"	"c60"

+		"callout_inparents_x"	"c0"

 		"callout_inparents_y"	"240"

 		"next_explanation"		"TradingExplanation"

 		

@@ -1402,7 +1466,7 @@
 			"textAlignment"	"center"

 			"dulltext"		"0"

 			"brighttext"	"0"

-			"default"		"1"

+			"default"		"0"

 			"sound_depressed"	"UI/buttonclick.wav"

 			"sound_released"	"UI/buttonclickrelease.wav"

 			"Command"		"nextexplanation"

@@ -1451,9 +1515,9 @@
 		"end_y"			"60"

 		"end_wide"		"250"

 		"end_tall"		"140"

-		"callout_inparents_x"	"c180"

+		"callout_inparents_x"	"c130"

 		"callout_inparents_y"	"240"

-		"next_explanation"		"ExplanationExplanation"

+		"next_explanation"		"PatternsExplanation"

 		

 		"TitleLabel"

 		{

@@ -1539,7 +1603,229 @@
 				"image"			"close_button"

 				"scaleImage"	"1"

 			}				

+		}

+		"PrevButton"

+		{

+			"ControlName"	"CExImageButton"

+			"fieldName"		"PrevButton"

+			"xpos"			"10"

+			"ypos"			"110"

+			"zpos"			"10"

+			"wide"			"30"

+			"tall"			"30"

+			"autoResize"	"0"

+			"pinCorner"		"0"

+			"visible"		"1"

+			"enabled"		"1"

+			"tabPosition"	"0"

+			"labeltext"		""

+			"font"			"HudFontSmallBold"

+			"textAlignment"	"center"

+			"dulltext"		"0"

+			"brighttext"	"0"

+			"default"		"0"

+			"sound_depressed"	"UI/buttonclick.wav"

+			"sound_released"	"UI/buttonclickrelease.wav"

+			"Command"		"prevexplanation"

+			

+			"paintbackground"	"0"

+			

+			"defaultFgColor_override" "46 43 42 255"

+			"armedFgColor_override" "200 80 60 255"

+			"depressedFgColor_override" "46 43 42 255"

+			

+			"image_drawcolor"	"235 226 202 255"

+			"image_armedcolor"	"255 255 255 255"

+			"SubImage"

+			{

+				"ControlName"	"ImagePanel"

+				"fieldName"		"SubImage"

+				"xpos"			"0"

+				"ypos"			"0"

+				"zpos"			"1"

+				"wide"			"30"

+				"tall"			"30"

+				"visible"		"1"

+				"enabled"		"1"

+				"image"			"blog_back"

+				"scaleImage"	"1"

+			}				

 		}		

+		"PositionLabel"

+		{

+			"ControlName"	"CExLabel"

+			"fieldName"		"PositionLabel"

+			"font"			"HudFontSmallBold"

+			"labelText"		"%explanationnumber%"

+			"textAlignment"	"center"

+			"xpos"			"0"

+			"ypos"			"110"

+			"zpos"			"-1"

+			"wide"			"250"

+			"tall"			"30"

+			"autoResize"	"0"

+			"pinCorner"		"0"

+			"visible"		"1"

+			"enabled"		"1"

+			"fgcolor_override" "200 80 60 255"

+		}

+		"NextButton"

+		{

+			"ControlName"	"CExImageButton"

+			"fieldName"		"NextButton"

+			"xpos"			"210"

+			"ypos"			"110"

+			"zpos"			"10"

+			"wide"			"30"

+			"tall"			"30"

+			"autoResize"	"0"

+			"pinCorner"		"0"

+			"visible"		"1"

+			"enabled"		"1"

+			"tabPosition"	"0"

+			"labeltext"		""

+			"font"			"HudFontSmallBold"

+			"textAlignment"	"center"

+			"dulltext"		"0"

+			"brighttext"	"0"

+			"default"		"0"

+			"sound_depressed"	"UI/buttonclick.wav"

+			"sound_released"	"UI/buttonclickrelease.wav"

+			"Command"		"nextexplanation"

+			

+			"paintbackground"	"0"

+			

+			"defaultFgColor_override" "46 43 42 255"

+			"armedFgColor_override" "200 80 60 255"

+			"depressedFgColor_override" "46 43 42 255"

+			

+			"image_drawcolor"	"235 226 202 255"

+			"image_armedcolor"	"255 255 255 255"

+			"SubImage"

+			{

+				"ControlName"	"ImagePanel"

+				"fieldName"		"SubImage"

+				"xpos"			"0"

+				"ypos"			"0"

+				"zpos"			"1"

+				"wide"			"30"

+				"tall"			"30"

+				"visible"		"1"

+				"enabled"		"1"

+				"image"			"blog_forward"

+				"scaleImage"	"1"

+			}				

+		}	

+	}

+

+	"PatternsExplanation"

+	{

+		"ControlName"	"CExplanationPopup"

+		"fieldName"		"PatternsExplanation"

+		"xpos"			"0"

+		"ypos"			"0"

+		"zpos"			"10000"

+		"wide"			"250"

+		"tall"			"120"

+		"visible"		"0"

+		"PaintBackgroundType"	"2"

+		"paintbackground" "0"

+		"border"		"MainMenuHighlightBorder"

+		

+		"force_close"	"1"

+		"end_x"			"c130"

+		"end_y"			"60"

+		"end_wide"		"250"

+		"end_tall"		"140"

+		"callout_inparents_x"	"c255"

+		"callout_inparents_y"	"240"

+		"next_explanation"		"ExplanationExplanation"

+		

+		"TitleLabel"

+		{

+			"ControlName"	"CExLabel"

+			"fieldName"		"TitleLabel"

+			"font"			"HudFontSmallBold"

+			"labelText"		"#WeaponPatternsExplanation_Title"

+			"textAlignment"	"north"

+			"xpos"			"20"

+			"ypos"			"10"

+			"wide"			"210"

+			"tall"			"30"

+			"autoResize"	"0"

+			"pinCorner"		"0"

+			"visible"		"1"

+			"enabled"		"1"

+			"wrap"			"1"

+			"fgcolor_override" "46 43 42 255"

+		}

+		

+		"TextLabel"

+		{

+			"ControlName"	"CExLabel"

+			"fieldName"		"TextLabel"

+			"font"			"HudFontSmall"

+			"labelText"		"#WeaponPatternsExplanation_Text"

+			"textAlignment"	"north-west"

+			"xpos"			"20"

+			"ypos"			"35"

+			"wide"			"210"

+			"tall"			"75"

+			"autoResize"	"0"

+			"pinCorner"		"0"

+			"visible"		"1"

+			"enabled"		"1"

+			"wrap"			"1"

+			"fgcolor_override" "46 43 42 255"

+		}

+		

+		"CloseButton"

+		{

+			"ControlName"	"CExImageButton"

+			"fieldName"		"CloseButton"

+			"xpos"			"230"

+			"ypos"			"5"

+			"zpos"			"10"

+			"wide"			"14"

+			"tall"			"14"

+			"autoResize"	"0"

+			"pinCorner"		"0"

+			"visible"		"1"

+			"enabled"		"1"

+			"tabPosition"	"0"

+			"labeltext"		""

+			"font"			"HudFontSmallBold"

+			"textAlignment"	"center"

+			"dulltext"		"0"

+			"brighttext"	"0"

+			"default"		"0"

+			"sound_depressed"	"UI/buttonclick.wav"

+			"sound_released"	"UI/buttonclickrelease.wav"

+			"Command"		"close"

+			

+			"paintbackground"	"0"

+			

+			"defaultFgColor_override" "46 43 42 255"

+			"armedFgColor_override" "235 226 202 255"

+			"depressedFgColor_override" "46 43 42 255"

+			

+			"image_drawcolor"	"117 107 94 255"

+			"image_armedcolor"	"200 80 60 255"

+			"SubImage"

+			{

+				"ControlName"	"ImagePanel"

+				"fieldName"		"SubImage"

+				"xpos"			"0"

+				"ypos"			"0"

+				"zpos"			"1"

+				"wide"			"14"

+				"tall"			"14"

+				"visible"		"1"

+				"enabled"		"1"

+				"image"			"close_button"

+				"scaleImage"	"1"

+			}				

+		}	

 		"PrevButton"

 		{

 			"ControlName"	"CExImageButton"

@@ -1624,7 +1910,7 @@
 			"textAlignment"	"center"

 			"dulltext"		"0"

 			"brighttext"	"0"

-			"default"		"1"

+			"default"		"0"

 			"sound_depressed"	"UI/buttonclick.wav"

 			"sound_released"	"UI/buttonclickrelease.wav"

 			"Command"		"nextexplanation"

@@ -1733,7 +2019,7 @@
 			"textAlignment"	"center"

 			"dulltext"		"0"

 			"brighttext"	"0"

-			"default"		"1"

+			"default"		"0"

 			"sound_depressed"	"UI/buttonclick.wav"

 			"sound_released"	"UI/buttonclickrelease.wav"

 			"Command"		"close"

@@ -1839,4 +2125,17 @@
 		"zpos"				"500"

 		"visible"			"1"

 	}

+

+	"InspectionPanel"

+	{

+		"fieldName"		"InspectionPanel"

+		"xpos"			"cs-0.5"

+		"ypos"			"0"

+		"zpos"			"2000"

+		"wide"			"f0"

+		"tall"			"f100"

+		"visible"		"0"

+		"proportionaltoparent"	"1"

+		"bgcolor_override"	"30 25 25 245"

+	}

 }

diff --git a/resource/ui/HudItemEffectMeter.res b/resource/ui/HudItemEffectMeter.res
index aed0c2c..4939735 100644
--- a/resource/ui/HudItemEffectMeter.res
+++ b/resource/ui/HudItemEffectMeter.res
@@ -6,7 +6,7 @@
 		"visible"		"1"

 		"enabled"		"1"

 		"xpos"			"c-75"

-		"ypos"			"c137"	

+		"ypos"			"c127"	

 		"ypos_minmode"	"c60"

 		"wide"			"500"

 		"tall"			"500"

diff --git a/resource/ui/MainMenuOverride.res b/resource/ui/MainMenuOverride.res
index 27b2b68..18146f8 100644
--- a/resource/ui/MainMenuOverride.res
+++ b/resource/ui/MainMenuOverride.res
@@ -253,7 +253,7 @@
 		"ControlName"	"ImagePanel"
 		"fieldName"		"HudNameBG"
 		"xpos"			"5"
-		"ypos"			"60"
+		"ypos"			"57"
 		"zpos"			"0"
 		"wide"			"220"
 		"tall"			"25"
@@ -269,7 +269,7 @@
 		"ControlName"	"CExImageButton"
 		"fieldName"		"HudName"
 		"xpos"			"10"
-		"ypos"			"61"
+		"ypos"			"58"
 		"zpos"			"1"
 		"wide"			"56"
 		"tall"			"25"
@@ -456,8 +456,8 @@
 	{
 		"ControlName"	"CPvPRankPanel"
 		"fieldName"		"RankModelPanel"
-		"xpos"			"cs-0.5-396"
-		"ypos"			"cs-0.5+40"
+		"xpos"			"cs-0.5-370"
+		"ypos"			"cs-0.5+50"
 
 		"zpos"			"-51"
 		"wide"			"1000"
@@ -476,7 +476,7 @@
 		"ControlName"	"CPvPRankPanel"
 		"fieldName"		"RankPanel"
 		"xpos"			"c-460"
-		"ypos"			"230"
+		"ypos"			"240"
 		"zpos"			"-52"
 		"wide"			"320"
 		"tall"			"100"
@@ -548,7 +548,7 @@
 		"ControlName"	"EditablePanel"
 		"fieldname"		"CreateServerButton"
 		"xpos"			"145"
-		"ypos"			"61"
+		"ypos"			"58"
 		"zpos"			"12"
 		"wide"			"20"
 		"tall"			"25"
@@ -610,7 +610,7 @@
 		"ControlName"	"EditablePanel"
 		"fieldName"		"WatchStreamButton"
 		"xpos"			"205"
-		"ypos"			"61"
+		"ypos"			"58"
 		"zpos"			"1"
 		"wide"			"32"
 		"tall"			"32"
@@ -707,7 +707,7 @@
 		"ControlName"	"EditablePanel"
 		"fieldName"		"MOTD_ShowButtonPanel"
 		"xpos"			"125"
-		"ypos"			"61"
+		"ypos"			"58"
 		"zpos"			"1"
 		"wide"			"20"
 		"tall"			"25"
@@ -1114,7 +1114,7 @@
 		"ControlName"	"EditablePanel"
 		"fieldName"		"QuestLogButton"
 		"xpos"			"85"
-		"ypos"			"61"
+		"ypos"			"58"
 		"zpos"			"10"
 		"wide"			"20"
 		"tall"			"25"
@@ -1188,7 +1188,7 @@
 			"ControlName"	"EditablePanel"
 			"fieldName"		"NotificationsContainer"
 			"xpos"			"225"
-			"ypos"			"61"
+			"ypos"			"58"
 			"zpos"			"10"
 			"wide"			"16"
 			"tall"			"16"
@@ -1260,7 +1260,7 @@
 		"ControlName"	"EditablePanel"
 		"fieldName"		"Notifications_ShowButtonPanel"
 		"xpos"			"105"
-		"ypos"			"61"
+		"ypos"			"58"
 		"zpos"			"10"
 		"wide"			"20"
 		"tall"			"25"
@@ -1502,7 +1502,7 @@
 	{
 		"ControlName"	"EditablePanel"
 		"fieldname"		"FriendsContainer"
-		"xpos"			"25"
+		"xpos"			"27"
 		"ypos"			"320"
 		"zpos"			"5"
 		"wide"			"260"
@@ -1932,7 +1932,7 @@
 		"fieldname"		"CharacterSetupButton"
 		"xpos"			"5"
 		"ypos"			"122"
-		"zpos"			"11"
+		"zpos"			"12"
 		"wide"			"220"
 		"tall"			"18"
 		"visible"		"1"
@@ -2674,7 +2674,7 @@
 		"ControlName"	"EditablePanel"
 		"fieldname"		"ChangeServerButton"
 		"xpos"			"5"
-		"ypos"			"62"
+		"ypos"			"102"
 		"zpos"			"11"
 		"wide"			"220"
 		"tall"			"18"
@@ -2805,12 +2805,12 @@
 	{
 		"ControlName"	"EditablePanel"
 		"fieldname"		"ResumeGameButton"
-		"xpos"			"75"
-		"ypos"			"176"
+		"xpos"			"5"
+		"ypos"			"102"
 		"zpos"			"11"
 		"wide"			"220"
 		"tall"			"18"
-		"visible"		"1"
+		"visible"		"0"
 		"PaintBackgroundType"	"0"
 		"SubButton"
 		{
@@ -2869,7 +2869,7 @@
 		"ControlName"	"EditablePanel"
 		"fieldname"		"CallVoteButton"
 		"xpos"			"245"
-		"ypos"			"61"
+		"ypos"			"58"
 		"zpos"			"12"
 		"wide"			"20"
 		"tall"			"25"
@@ -2930,7 +2930,7 @@
 		"ControlName"	"EditablePanel"
 		"fieldname"		"MutePlayersButton"
 		"xpos"			"265"
-		"ypos"			"61"
+		"ypos"			"58"
 		"zpos"			"12"
 		"wide"			"20"
 		"tall"			"25"
@@ -2991,7 +2991,7 @@
 		"ControlName"	"EditablePanel"
 		"fieldname"		"RequestCoachButton"
 		"xpos"			"225"
-		"ypos"			"61"
+		"ypos"			"58"
 		"zpos"			"12"
 		"wide"			"20"
 		"tall"			"25"
@@ -3126,7 +3126,7 @@
 		"ControlName"	"CExImageButton"
 		"fieldName"		"AchievementsButton"
 		"xpos"			"185"
-		"ypos"			"61"
+		"ypos"			"58"
 		"zpos"			"3"
 		"wide"			"20"
 		"tall"			"25"
@@ -3217,7 +3217,7 @@
 		"ControlName"	"CExImageButton"
 		"fieldName"		"CoachPlayersButton"
 		"xpos"			"165"
-		"ypos"			"61"
+		"ypos"			"58"
 		"zpos"			"12"
 		"wide"			"20"
 		"tall"			"25"
diff --git a/resource/ui/charinfopanel.res b/resource/ui/charinfopanel.res
index 6462105..388d24e 100644
--- a/resource/ui/charinfopanel.res
+++ b/resource/ui/charinfopanel.res
@@ -112,8 +112,9 @@
 		"tabxindent"	"80"
 		"tabxdelta"		"10"
 		"tabwidth"		"240"
-		"tabheight"		"34"
+		"tabheight"		"20"
 		"transition_time" "0"
+		"yoffset"		"14"
 		
 		"HeaderLine"
 		{
@@ -136,7 +137,7 @@
 		{
 			"textinsetx"		"25"
 			"textAlignment"		"center"
-			"font"				"Cerbetica32"
+			"font"				"Cerbetica20"
 			"ypos"				"50"
 			"selectedcolor"		"TanLight"
 			"unselectedcolor"	"TanDark"	
diff --git a/resource/ui/econ/inspectionpanel.res b/resource/ui/econ/inspectionpanel.res
index 8a9a7fc..a50e4e4 100644
--- a/resource/ui/econ/inspectionpanel.res
+++ b/resource/ui/econ/inspectionpanel.res
@@ -1,24 +1,11 @@
 "Resource/UI/econ/QuestEditorPanel.res"
 {
-	"InspectionPanel"
-	{
-		"fieldName"		"InspectionPanel"
-		"xpos"			"cs-0.5"
-		"ypos"			"cs-0.5"
-		"zpos"			"200"
-		"wide"			"f0"
-		"tall"			"f0"
-		"visible"		"0"
-		"proportionaltoparent"	"1"
-		"bgcolor_override"	"30 25 25 245"
-	}
-
 	"BGImage"
 	{
 		"ControlName"	"ImagePanel"
 		"fieldName"		"BGImage"
 		"xpos"			"cs-0.5"
-		"ypos"			"cs-0.5"
+		"ypos"			"0"
 		"zpos"			"1"
 		"wide"			"o1"
 		"tall"			"p0.75"
@@ -29,14 +16,47 @@
 		"proportionaltoparent" "1"
 	}	
 
+	"ItemName"
+	{		
+		"ControlName"	"CItemModelPanel"
+		"fieldName"		"ItemName"
+		"xpos"			"cs-0.5"
+		"ypos"			"0"
+		"zpos"			"5"
+		"wide"			"f0"
+		"tall"			"200"
+		"visible"		"1"
+		"bgcolor_override"		"0 0 0 0"
+		"noitem_textcolor"		"117 107 94 255"
+		"PaintBackgroundType"	"2"
+		"paintborder"	"0"
+		"mouseinputenabled"	"0"
+		"proportionaltoparent"	"1"
+
+		"text_ypos"		"15"
+		"text_center"	"0"
+		"paint_icon_hide" "1"
+		"model_hide"	"1"
+		"text_forcesize"	"4"
+		"name_only"	"1"
+
+		"itemmodelpanel"
+		{
+			"use_item_rendertarget" "0"
+			"allow_rot"				"0"
+			"inventory_image_type"	"1"
+			"continued_velocity"	"1"
+		}
+	}
+
 	"ModelInspectionPanel"
 	{
 		"fieldName"		"ModelInspectionPanel"
 		"xpos"			"cs-0.5"
-		"ypos"			"cs-0.5"
+		"ypos"			"0"
 		"zpos"			"5"
 		"wide"			"o1.5"
-		"tall"			"f0"
+		"tall"			"p0.8"
 		"visible"		"1"
 		"proportionaltoparent"	"1"
 
@@ -98,67 +118,12 @@
 		}
 	}
 
-	"CloseButton"
-	{
-		"ControlName"	"CExImageButton"
-		"fieldName"		"CloseButton"
-		"xpos"			"c92"
-		"ypos"			"c-98"
-		"zpos"			"100"
-		"wide"			"20"
-		"tall"			"20"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"1"
-		"enabled"		"1"
-		"tabPosition"	"0"
-		"labeltext"		""
-		"font"			"HudFontSmallBold"
-		"textAlignment"	"center"
-		"dulltext"		"0"
-		"brighttext"	"0"
-		"default"		"0"
-		"sound_depressed"	"UI/buttonclick.wav"
-		"sound_released"	"UI/buttonclickrelease.wav"
-		"Command"		"close"
-		"proportionaltoparent" "1"
-		"actionsignallevel" "2"
-			
-		"paintbackground"	"0"
-
-		"pin_to_sibling"		"MainContainer"
-		"pin_corner_to_sibling"	"PIN_BOTTOMLEFT"
-		"pin_to_sibling_corner"	"PIN_TOPRIGHT"
-			
-		"defaultFgColor_override" "46 43 42 255"
-		"armedFgColor_override" "200 80 60 255"
-		"depressedFgColor_override" "46 43 42 255"
-			
-		"image_drawcolor"	"150 60 45 255"
-		"image_armedcolor"	"200 80 60 255"
-		"SubImage"
-		{
-			"ControlName"	"ImagePanel"
-			"fieldName"		"SubImage"
-			"xpos"			"0"
-			"ypos"			"0"
-			"zpos"			"1"
-			"wide"			"f0"
-			"tall"			"f0"
-			"visible"		"1"
-			"enabled"		"1"
-			"image"			"close_button"
-			"scaleImage"	"1"
-			"proportionaltoparent" "1"
-		}				
-	}	
-
 	"TeamNavPanel"
 	{
 		"ControlName"		"CNavigationPanel"
 		"fieldName"			"TeamNavPanel"
 		"xpos"				"cs-0.5"
-		"ypos"				"c90"
+		"ypos"				"p.7-16"
 		"zpos"				"100"
 		"wide"				"60"
 		"tall"				"25"
@@ -253,4 +218,400 @@
 			}
 		}
 	}
+
+	"PaintkitPreviewContainer"
+	{
+		"ControlName"	"EditablePanel"
+		"fieldName"		"PaintkitPreviewContainer"
+		"xpos"			"cs-0.5"
+		"ypos"			"p.7"
+		"wide"			"300"
+		"tall"			"100"
+		"zpos"			"100"
+		"border"		"MainMenuBGBorder"
+		"mouseinputenabled"	"1"
+		"proportionaltoparent"	"1"
+
+		"visible"		"0"
+
+		"fixed_item"
+		{
+			"tall"		"80"
+			"visible"	"1"
+		}
+		"fixed_paintkit"
+		{
+			"tall"		"60"
+			"visible"	"1"
+		}
+		"consume_mode"
+		{
+			"border"		"ReplayHighlightBorder"
+		}
+
+		"DebugButton"
+		{
+			"ControlName"	"CExImageButton"
+			"fieldName"		"DebugButton"
+			"xpos"			"5"
+			"ypos"			"0"
+			"zpos"			"1005"
+			"wide"			"8"
+			"tall"			"8"
+			"autoResize"	"0"
+			"pinCorner"		"0"
+			"visible"		"0"
+			"enabled"		"1"
+			"tabPosition"	"0"
+			"labeltext"		""
+			"font"			"HudFontSmallBold"
+			"textAlignment"	"center"
+			"dulltext"		"0"
+			"brighttext"	"0"
+			"default"		"0"
+			"sound_depressed"	"UI/buttonclick.wav"
+			"sound_released"	"UI/buttonclickrelease.wav"
+			"Command"		"debug_menu"
+			"proportionaltoparent" "1"
+			"actionsignallevel"	"2"
+			
+			"paintbackground"	"0"
+			
+			"defaultFgColor_override" "0 0 0 0"
+			"armedFgColor_override" "200 80 60 255"
+			"depressedFgColor_override" "46 43 42 255"
+			
+			"image_drawcolor"	"TanDark"
+			"image_armedcolor"	"200 80 60 255"
+			"SubImage"
+			{
+				"ControlName"	"ImagePanel"
+				"fieldName"		"SubImage"
+				"xpos"			"0"
+				"ypos"			"0"
+				"zpos"			"1"
+				"wide"			"8"
+				"tall"			"8"
+				"visible"		"1"
+				"enabled"		"1"
+				"image"			"glyph_workshop_edit"
+				"scaleImage"	"1"
+			}				
+		} // Debug button
+
+
+		"ComboBoxValidPaintkits"
+		{
+			"ControlName"		"ComboBox"
+			"fieldName"			"ComboBoxValidPaintkits"
+			"Font"				"HudFontSmallest"
+			"wrap"				"0"
+			"xpos"				"rs1-10"
+			"ypos"				"10"
+			"zpos"				"100"
+			"wide"				"200"
+			"tall"				"15"
+			"autoResize"		"0"
+			"pinCorner"			"0"
+			"visible"			"1"
+			"enabled"			"1"
+			"textHidden"		"0"
+			"editable"			"0"
+			"maxchars"			"-1"
+			"NumericInputOnly"	"0"
+			"unicode"			"0"
+			"default"			"0"
+			"actionsignallevel"	"2"
+			"proportionaltoparent"	"1"
+
+			"fixed_paintkit"
+			{
+				"visible"	"0"
+			}
+		
+			"fgcolor_override"	"235 226 202 255"
+			"bgcolor_override"	"0 0 0 0"
+			"disabledFgColor_override" "235 226 202 255"
+			"disabledBgColor_override" "0 0 0 0"
+			"selectionColor_override" "0 0 0 0"
+			"selectionTextColor_override" "235 226 202 255"
+			"defaultSelectionBG2Color_override" "0 0 0 0"
+		}
+
+		"PaintkitLabel"
+		{
+			"ControlName"	"CExLabel"
+			"fieldName"		"PaintkitLabel"
+			"font"			"HudFontSmallest"
+			"labelText"		"Preview Paint Kit"
+			"textAlignment"	"west"
+			"xpos"			"8"
+			"ypos"			"10"
+			"wide"			"80"
+			"tall"			"15"
+			"autoResize"	"0"
+			"pinCorner"		"0"
+			"visible"		"1"
+			"enabled"		"1"
+			"fgcolor_override"	"235 227 203 255"
+
+			"fixed_paintkit"
+			{
+				"visible"	"0"
+			}
+		}
+
+		"ComboBoxValidItems"
+		{
+			"ControlName"		"ComboBox"
+			"fieldName"			"ComboBoxValidItems"
+			"Font"				"HudFontSmallest"
+			"wrap"				"0"
+			"xpos"				"rs1-10"
+			"ypos"				"30"
+			"fixed_paintkit"
+			{
+				"ypos"		"10"
+			}
+			"zpos"				"100"
+			"wide"				"200"
+			"tall"				"15"
+			"autoResize"		"0"
+			"pinCorner"			"0"
+			"visible"			"1"
+			"enabled"			"1"
+			"textHidden"		"0"
+			"editable"			"0"
+			"maxchars"			"-1"
+			"NumericInputOnly"	"0"
+			"unicode"			"0"
+			"default"			"0"
+			"actionsignallevel"	"2"
+
+			"fixed_item"
+			{
+				"visible"	"0"
+			}
+
+			"proportionaltoparent"	"1"
+		
+			"fgcolor_override"	"235 226 202 255"
+			"bgcolor_override"	"0 0 0 0"
+			"disabledFgColor_override" "TanDark"
+			"disabledBgColor_override" "0 0 0 0"
+			"selectionColor_override" "0 0 0 0"
+			"selectionTextColor_override" "235 226 202 255"
+			"defaultSelectionBG2Color_override" "0 0 0 0"
+		}
+
+		"ItemLabel"
+		{
+			"ControlName"	"CExLabel"
+			"fieldName"		"ItemLabel"
+			"font"			"HudFontSmallest"
+			"labelText"		"#TF_ItemPreview_ItemPreview"
+			"textAlignment"	"west"
+			"xpos"			"8"
+			"ypos"			"30"
+			"fixed_paintkit"
+			{
+				"ypos"		"10"
+			}
+			"wide"			"80"
+			"tall"			"15"
+			"autoResize"	"0"
+			"pinCorner"		"0"
+			"visible"		"1"
+			"enabled"		"1"
+			"fgcolor_override"	"235 227 203 255"
+
+			"fixed_item"
+			{
+				"visible"	"0"
+			}
+
+			"consume_mode"
+			{
+				"labelText"		"#TF_ItemPreview_RedeemItem"
+			}
+		}
+
+		"WearSlider"
+		{
+			"ControlName"	"Slider"
+			"fieldName"		"WearSlider"
+			"xpos"			"90"
+			"ypos"			"50"
+			"fixed_item"
+			{
+				"ypos"		"30"
+			}
+			"zpos"			"1"
+			"wide"			"204"
+			"tall"			"30"
+			"numticks"		"4"
+			"rangemin"		"1"
+			"rangemax"		"5"
+			"lefttext"		"#TFUI_InvTooltip_BattleScared"
+			"righttext"		"#TFUI_InvTooltip_FactoryNew"
+			"proportionaltoparent"	"1"
+			"actionsignallevel"	"2"
+
+			"fixed_paintkit"
+			{
+				"visible"	"0"
+			}
+
+			"consume_mode"
+			{
+				"visible"	"0"
+			}
+		}
+
+		"WearLabel"
+		{
+			"ControlName"	"CExLabel"
+			"fieldName"		"WearLabel"
+			"font"			"HudFontSmallest"
+			"labelText"		"#TF_ItemPreview_ItemWear"
+			"textAlignment"	"west"
+			"xpos"			"8"
+			"ypos"			"50"
+			"fixed_item"
+			{
+				"ypos"		"30"
+			}
+			"wide"			"80"
+			"tall"			"15"
+			"autoResize"	"0"
+			"pinCorner"		"0"
+			"visible"		"1"
+			"enabled"		"1"
+			"fgcolor_override"	"235 227 203 255"
+
+			"fixed_paintkit"
+			{
+				"visible"	"0"
+			}
+
+			"consume_mode"
+			{
+				"visible"	"0"
+			}
+		}
+
+		"NewSeedButton"
+		{
+			"ControlName"	"Button"
+			"fieldName"		"NewSeedButton"
+			"xpos"			"8"
+			"ypos"			"75"
+			"fixed_item"
+			{
+				"ypos"		"50"
+			}
+			"fixed_paintkit"
+			{
+				"ypos"		"30"
+			}
+			"zpos"			"10"
+			"wide"			"70"
+			"tall"			"20"
+			"autoResize"	"0"
+			"visible"		"1"
+			"enabled"		"1"
+			"tabPosition"	"0"
+			"labelText"		"#TF_ItemPreview_PaintkitSeed"
+			"actionsignallevel" "2"
+			"use_proportional_insets" "1"
+			"textAlignment"	"center"
+			"dulltext"		"0"
+			"brighttext"	"0"
+			"keyboardinputenabled"	"0"
+
+			"sound_depressed"	"UI/buttonclick.wav"
+			"sound_released"	"UI/buttonclickrelease.wav"
+
+			"command"	"random_seed"
+
+			"consume_mode"
+			{
+				"visible"	"0"
+			}
+		}
+
+		"SeedTextEntry"
+		{
+			"ControlName"	"TextEntry"
+			"fieldName"		"SeedTextEntry"
+			"xpos"			"90"
+			"ypos"			"75"
+			"fixed_item"
+			{
+				"ypos"		"50"
+			}
+			"fixed_paintkit"
+			{
+				"ypos"		"30"
+			}
+			"zpos"			"10"
+			"wide"			"115"
+			"tall"			"20"
+			"autoResize"	"0"
+			"visible"		"1"
+			"enabled"		"1"
+			"tabPosition"	"0"
+			"actionsignallevel" "2"
+			"default"		"1"
+			"NumericInputOnly"	"1"
+			"bgcolor_override"	"0 0 0 200"
+			"maxchars"		"18"
+
+			"consume_mode"
+			{
+				"visible"	"0"
+			}
+		}
+
+		"MarketButton"
+		{
+			"ControlName"	"CExButton"
+			"fieldName"		"MarketButton"
+			"xpos"		"rs1-10"
+			"ypos"			"75"
+			"fixed_item"
+			{
+				"ypos"		"50"
+			}
+			"fixed_paintkit"
+			{
+				"ypos"		"30"
+			}
+			"zpos"		"100"
+			"wide"		"75"
+			"tall"		"20"
+			"labelText"			"#TF_ItemAd_ViewOnMarket"
+			"font"			"AdFont_PurchaseButton"
+			"textinsetx"		"0"
+			"textAlignment"	"center"
+		
+			"proportionaltoparent"	"1"
+			"paintbackground"	"1"
+			"command"	"market"
+			"actionsignallevel" "2"
+			"RoundedCorners"	"0"
+
+			"defaultFgColor_override"	"White"
+			"armedFgColor_override"		"White"
+
+			"border_default"	"NoBorder"
+
+			"defaultBgColor_override"	"72 103 32 255"
+			"armedBgColor_override"		"72 133 32 255"
+
+			"sound_armed"		"ui/item_info_mouseover.wav"
+			"sound_depressed"	"UI/buttonclick.wav"
+			"sound_released"	"UI/buttonclickrelease.wav"
+		}
+	}
 }
\ No newline at end of file
diff --git a/resource/ui/econ/itempickuppanel.res b/resource/ui/econ/itempickuppanel.res
index 83efc9b..a41b62a 100644
--- a/resource/ui/econ/itempickuppanel.res
+++ b/resource/ui/econ/itempickuppanel.res
@@ -6,7 +6,7 @@
 		"fieldName"		"item_pickup"
 		"xpos"			"0"
 		"ypos"			"0"
-		"zpos"			"100000"
+		"zpos"			"200000"
 		"wide"			"f0"
 		"tall"			"480"
 		"autoResize"		"0"
@@ -28,43 +28,26 @@
 		"modelpanelskv"	
 		{
 			"PaintBackgroundType"	"0"
-			"paintborder"			"0"
-			"bgcolor_override"		"0 0 0 0"
+			"paintborder"			"1"
+			"bgcolor_override"		"Grey"
 			
-			"model_xpos"	"-125"
+			"model_xpos"	"0"
 			"model_center_y"	"1"
 			"model_tall"	"160"
+			"model_wide"	"240"
 			
 			"text_forcesize"	"1"
 			"text_xpos"		"250"
 			"text_wide"		"225"
 			"text_center"	"1"
-			"BackColor"
-			{
-    		"ControlName"		"EditablePanel"
-    		"fieldName"			"BackColor"
-    		"xpos"				"0"
-    		"ypos"				"0"
-    		"zpos"				"-1"
-    		"wide"				"f0"
-    		"tall"	 			"f0"
-    		"visible"			"1"
-    		"enabled"			"1"
-			"pinCorner"			"0"
-			"autoResize"		"0"
-			"PaintBackgroundType""1"
-			"border"			"NoBorder"
-			"bgcolor_override"	"35 35 35 255"
-			
-			}
+			"is_mouseover"	"1"
+			"hide_collection_panel"	"1"
 			
 			"itemmodelpanel"
 			{
 				"use_item_rendertarget" "0"
 				"inventory_image_type" "1"
 			}
-		
-
 		}
 	}
 	
diff --git a/resource/ui/econ/store/v2/storepanel.res b/resource/ui/econ/store/v2/storepanel.res
index fb166e2..3c144d9 100644
--- a/resource/ui/econ/store/v2/storepanel.res
+++ b/resource/ui/econ/store/v2/storepanel.res
@@ -111,7 +111,8 @@
 		"tabxindent"	"80"
 		"tabxdelta"		"10"
 		"tabwidth"		"240"
-		"tabheight"		"34"
+		"tabheight"		"20"
+		"yoffset"		"14"
 		"transition_time" "0"
 		
 		"HeaderLine"
@@ -135,7 +136,7 @@
 		{
 			"textinsetx"		"25"
 			"textAlignment"		"center"
-			"font"				"Cerbetica32"
+			"font"				"Cerbetica20"
 			"ypos"				"50"
 			"selectedcolor"		"TanLight"
 			"unselectedcolor"	"TanDark"	
diff --git a/resource/ui/huditemeffectmeter_organs.res b/resource/ui/huditemeffectmeter_organs.res
new file mode 100644
index 0000000..0e72079
--- /dev/null
+++ b/resource/ui/huditemeffectmeter_organs.res
@@ -0,0 +1,108 @@
+"Resource/UI/HudItemEffectMeter_Scout.res"
+{
+	HudItemEffectMeter
+	{
+		"fieldName"		"HudItemEffectMeter"
+		"visible"		"1"
+		"enabled"		"1"
+		"x_offset"		"40"
+		"xpos"			"r174"	[$WIN32]
+		"ypos"			"r57"	[$WIN32]
+		"xpos_minmode"	"r52"	[$WIN32]
+		"ypos_minmode"	"r68"	[$WIN32]
+		"x_offset_minmode"		"0"	[$WIN32]
+		"xpos"			"r194"	[$X360]
+		"ypos"			"r124"	[$X360]
+		"wide"			"100"
+		"tall"			"50"
+		"MeterFG"		"White"
+		"MeterBG"		"Gray"
+	}
+	
+	"ItemEffectMeterBG"
+	{
+		"ControlName"	"CTFImagePanel"
+		"fieldName"		"ItemEffectMeterBG"
+		"xpos"			"12"
+		"ypos"			"0"
+		"zpos"			"0"
+		"wide"			"100"
+		"tall"			"50"
+		"visible"		"1"
+		"visible_minmode"	"0"
+		"enabled"		"1"
+		"image"			"../hud/misc_ammo_area_horiz2_blue"
+		"scaleImage"	"1"	
+		"teambg_2"		"../hud/misc_ammo_area_horiz2_red"
+		"teambg_2_lodef"	"../hud/misc_ammo_area_red_lodef"
+		"teambg_3"		"../hud/misc_ammo_area_horiz2_blue"
+		"teambg_3_lodef"	"../hud/misc_ammo_area_blue_lodef"				
+	}
+	
+	"ItemEffectMeterLabel"
+	{
+		"ControlName"			"CExLabel"
+		"fieldName"				"ItemEffectMeterLabel"
+		"xpos"					"40"
+		"xpos_minmode"			"15"
+		"ypos"					"27"
+		"ypos_minmode"			"0"
+		"zpos"					"2"
+		"wide"					"41"
+		"tall"					"15"
+		"autoResize"			"1"
+		"pinCorner"				"2"
+		"visible"				"1"
+		"visible_minmode"		"1"
+		"textAlignment_minmode"			"west"
+		"enabled"				"1"
+		"tabPosition"			"0"
+		"textAlignment"			"center"
+		"dulltext"				"0"
+		"brighttext"			"0"
+		"font"					"TFFontSmall"
+	}
+
+	"ItemEffectMeter"
+	{	
+		"ControlName"			"ContinuousProgressBar"
+		"fieldName"				"ItemEffectMeter"
+		"font"					"Default"
+		"xpos"					"45"
+		"ypos"					"23"
+		"ypos_minmode"			"0"
+		"xpos_minmode"			"0"
+		"zpos"					"2"
+		"wide"					"30"
+		"wide_minmode"			"50"
+		"tall"					"5"				
+		"autoResize"			"0"
+		"pinCorner"				"0"
+		"visible"				"0"
+		"enabled"				"1"
+		"textAlignment"			"Left"
+		"dulltext"				"0"
+		"brighttext"			"0"
+	}
+
+	"ItemEffectMeterCount"
+	{
+		"ControlName"			"CExLabel"
+		"fieldName"				"ItemEffectMeterCount"
+		"xpos"					"40"
+		"xpos_minmode"			"12"
+		"ypos"					"10"
+		"zpos"					"2"
+		"wide"					"40"
+		"tall"					"20"	
+		"pinCorner"				"2"
+		"visible"				"1"
+		"enabled"				"1"
+		"tabPosition"			"0"
+		"labelText"				"%progresscount%"
+		"textAlignment"			"north"
+		"dulltext"				"0"
+		"brighttext"			"0"
+		"font"					"HudFontMedium"
+	}	
+}
\ No newline at end of file
diff --git a/resource/ui/hudrocketpack.res b/resource/ui/hudrocketpack.res
new file mode 100644
index 0000000..59f5746
--- /dev/null
+++ b/resource/ui/hudrocketpack.res
@@ -0,0 +1,124 @@
+#base "HudItemEffectMeter.res"
+"Resource/UI/HudRocketPack.res"
+{
+	HudItemEffectMeter
+	{
+		"fieldName"		"HudItemEffectMeter"
+		"visible"		"1"
+		"enabled"		"1"
+		"xpos"			"r95"	[$WIN32]
+		"xpos_minmode"	"r85"	[$WIN32]
+		"ypos"			"r105"	[$WIN32]
+		"ypos_minmode"	"r105"	[$WIN32]
+		"wide"			"94"
+		"tall"			"45"
+	}
+
+	"ItemEffectMeterBG"
+	{
+		"ControlName"	"CTFImagePanel"
+		"fieldName"		"ItemEffectMeterBG"
+		"xpos"			"4"
+		"xpos_minmode"	"28"
+		"ypos"			"0"
+		"ypos_minmode"	"28"
+		"zpos"			"1"
+		"wide"			"90"
+		"tall"			"45"
+		"visible"		"1"
+		"visible_minmode""0"
+		"enabled"		"1"
+		"scaleImage"	"1"	
+		"image"				"../hud/ammo_blue_bg"
+		"teambg_2"			"../hud/ammo_red_bg"
+		"teambg_2_lodef"	"../hud/ammo_red_bg_lodef"
+		"teambg_3"			"../hud/ammo_blue_bg"
+		"teambg_3_lodef"	"../hud/ammo_blue_bg_lodef"					
+	}
+
+	"ItemEffectIcon"
+	{
+		"ControlName"	"CTFImagePanel"
+		"fieldName"		"ItemEffectIcon"
+		"xpos"			"0"
+		"ypos"			"0"
+		"ypos_minmode"	"15"
+		"zpos"			"2"
+		"wide"			"32"
+		"tall"			"32"
+		"visible"		"1"
+		"visible_minmode""1"
+		"enabled"		"1"
+		"image"			"../hud/pyro_jetpack_off2"
+		"scaleImage"	"1"	
+	}
+
+	"ItemEffectMeterLabel"
+	{
+		"ControlName"	"CExLabel"
+		"fieldName"		"ItemEffectMeterLabel"
+		"xpos"			"32"
+		"xpos_minmode"	"32"
+		"ypos"			"12"
+		"ypos_minmode"	"27"
+		"zpos"			"2"
+		"wide"			"90"
+		"tall"			"15"
+		"autoResize"	"1"
+		"pinCorner"		"2"
+		"visible"		"1"
+		"enabled"		"1"
+		"tabPosition"	"0"
+		"labelText"		"#TF_RocketPack_Disabled"
+		"textAlignment"	"west"
+		"dulltext"		"0"
+		"brighttext"	"0"
+		"font"			"HudFontSmallest"
+		"fgcolor"		"178 0 0 255"
+	}
+
+	"ItemEffectMeter"
+	{	
+		"ControlName"	"ContinuousProgressBar"
+		"fieldName"		"ItemEffectMeter"
+		"font"			"Default"
+		"xpos"			"26"
+		"xpos_minmode"	"26"
+		"ypos"			"28"
+		"ypos_minmode"	"40"
+		"zpos"			"2"
+		"wide"			"22"
+		"wide_minmode"	"22"
+		"tall"			"8"				
+		"autoResize"	"0"
+		"pinCorner"		"0"
+		"visible"		"1"
+		"enabled"		"1"
+		"textAlignment"	"Left"
+		"dulltext"		"0"
+		"brighttext"	"0"
+		"fgcolor"		"White"
+	}
+
+	"ItemEffectMeter2"
+	{	
+		"ControlName"	"ContinuousProgressBar"
+		"fieldName"		"ItemEffectMeter2"
+		"font"			"Default"
+		"xpos"			"52"
+		"xpos_minmode"	"52"
+		"ypos"			"28"
+		"ypos_minmode"	"40"
+		"zpos"			"2"
+		"wide"			"22"
+		"tall"			"8"				
+		"autoResize"	"0"
+		"pinCorner"		"0"
+		"visible"		"1"
+		"enabled"		"1"
+		"textAlignment"	"Left"
+		"dulltext"		"0"
+		"brighttext"	"0"
+		"fgcolor"		"White"
+	}
+}
diff --git a/resource/ui/statsummary.res b/resource/ui/statsummary.res
index c9085ec..5d4438f 100644
--- a/resource/ui/statsummary.res
+++ b/resource/ui/statsummary.res
@@ -249,7 +249,7 @@
 		"labelText"		"%maplabel%"
 		"textAlignment"	"west"
 		"xpos"			"5"
-		"ypos"			"0"
+		"ypos"			"20"
 		"zpos"			"50"
 		"wide"			"f0"
 		"tall"			"56"
@@ -267,7 +267,7 @@
 		"labelText"		"%maptype%"
 		"textAlignment"	"west"
 		"xpos"			"6"
-		"ypos"			"44"
+		"ypos"			"64"
 		"zpos"			"50"
 		"wide"			"f0"
 		"tall"			"24"