Main Menu Updates, More Bug Fixes

- Updated various main menu and store pages.
- Updated the look of the TargetID and Friends list.
- Fixed the position of the count of players on the payload
- Fixed the size of the badge seen on the post match screen.
- Fixed the item effect meter not being properly centered in minmode.
- Removed icons from the abandon panels.
- Updated font definitions throughout the hud.

6 files changed, 95 insertions, 115 deletions

diff --git a/resource/ui/econ/store/v2/storehome_base.res b/resource/ui/econ/store/v2/storehome_base.res
index f1b0d62..ff48e5f 100644
--- a/resource/ui/econ/store/v2/storehome_base.res
+++ b/resource/ui/econ/store/v2/storehome_base.res
@@ -185,7 +185,7 @@
 			"autoResize"		"0"
 			"PaintBackgroundType" "2"
 			"border"			"NoBorder"
-			"bgcolor_override"	"35 35 35 255"
+			"bgcolor_override"	"DarkGrey"
 		}
 
 		"attriblabel"
@@ -295,7 +295,7 @@
 		"ControlName"		"CNavigationPanel"
 		"fieldName"			"ItemCategoryTabs"
 		"xpos"				"c-230"
-		"ypos"				"30"
+		"ypos"				"31"
 		"zpos"				"0"
 		"wide"				"430"
 		"tall"				"25"
@@ -321,8 +321,8 @@
 			"tabPosition"		"0"
 			"textAlignment"		"center"
 			"scaleImage"		"1"
-			"font"				"Cerbetica16"
-			"fgcolor"			"124 114 99 255"
+			"font"				"Cerbetica12"
+			"fgcolor"			"TanDark"
 
 			"defaultBgColor_override"	"25 25 25 255"
 			"defaultFgColor_override"	"124 114 99 255"
@@ -417,11 +417,11 @@
 	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"BackpackSpaceLabel"
-		"font"			"Cerbetica14"
+		"font"			"Cerbetica12"
 		"labelText"		"%freebackpackspace%"
 		"textAlignment"	"west"
-		"xpos"			"c-230"
-		"ypos"			"310"
+		"xpos"			"c-237"
+		"ypos"			"315"
 		"zpos"			"10"
 		"wide"			"160"
 		"tall"			"20"
@@ -435,10 +435,10 @@
 	{
 		"ControlName"	"CExButton"
 		"fieldName"		"CartButton"
-		"font"			"HudFontSmallBold"
+		"font"			"Cerbetica14"
 		"labelText"		"%storecart%"
 		"textAlignment"	"east"
-		"xpos"			"c-230"
+		"xpos"			"c-238"
 		"ypos"			"334"
 		"zpos"			"12"
 		"wide"			"56"
@@ -448,6 +448,7 @@
 		"PaintBackgroundType"	"2"
 		"textinsetx"	"15"
 		"Command"		"viewcart"
+		"defaultBgColor_override" "TanDarker"
 		"sound_depressed"	"UI/buttonclick.wav"
 		"sound_released"	"UI/buttonclickrelease.wav"
 	}
@@ -456,7 +457,7 @@
 	{
 		"ControlName"	"ImagePanel"
 		"fieldName"		"CartImage"
-		"xpos"			"c-225"
+		"xpos"			"c-233"
 		"ypos"			"336"
 		"zpos"			"13"
 		"wide"			"24"
@@ -482,7 +483,7 @@
 		"enabled"		"1"
 		"tabPosition"	"0"
 		"labelText"		"#Store_BrowseTheStore"
-		"font"			"HudFontSmallBold"
+		"font"			"Cerbetica14"
 		"textAlignment"	"center"
 		"dulltext"		"0"
 		"brighttext"	"0"
@@ -507,7 +508,7 @@
 		"enabled"		"1"
 		"tabPosition"	"0"
 		"labelText"		"#Store_MarketPlace"
-		"font"			"HudFontSmallBold"
+		"font"			"Cerbetica14"
 		"textAlignment"	"center"
 		"dulltext"		"0"
 		"brighttext"	"0"
@@ -608,16 +609,17 @@
 	{
 		"ControlName"	"EditablePanel"
 		"fieldName"		"Wall"
-		"xpos"			"0"
+		"xpos"			"c-250"
 		"ypos"			"55"
 		"zpos"			"-5"
-		"wide"			"f0"
-		"tall"			"f0"
+		"wide"			"505"
+		"tall"			"260"
 		"autoResize"	"0"
 		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
 		"paintbackground"	"1"
-		"bgcolor_override"	"0 0 0 100"
+		"bgcolor_override"	"DarkerGrey"
+		"PaintBackgroundType"	"2"
 	}
 }
\ No newline at end of file
diff --git a/resource/ui/econ/store/v2/storepage.res b/resource/ui/econ/store/v2/storepage.res
index 6f894cf..af24210 100644
--- a/resource/ui/econ/store/v2/storepage.res
+++ b/resource/ui/econ/store/v2/storepage.res
@@ -33,7 +33,7 @@
 		"item_backdrop_right_margin"		"11"
 		"item_backdrop_top_margin"			"9"
 		"item_backdrop_bottom_margin"		"42"
-		"item_backdrop_paintbackgroundtype"	"2"
+		"item_backdrop_paintbackgroundtype"	"0"
 		"item_panel_bgcolor"			"Grey"
 		"item_panel_bgcolor_mouseover"	"156 146 128 255"
 		"item_panel_bgcolor_selected"	"176 166 148 255"
@@ -199,7 +199,7 @@
 		{
 			"defaultFgColor_override"	"TanLight"
 			"defaultBgColor_override"	"15 15 15 255"
-			"armedFgColor_override"		"15 255 255 255 255"
+			"armedFgColor_override"		"15 255 255 255"
 			"armedBgColor_override"		"15 15 15 255"
 			"paintbackgroundtype"		"2"
 		}
@@ -240,7 +240,7 @@
 		{
 			"defaultFgColor_override"	"TanLight"
 			"defaultBgColor_override"	"15 15 15 255"
-			"armedFgColor_override"		"15 255 255 255 255"
+			"armedFgColor_override"		"15 255 255 255"
 			"armedBgColor_override"		"15 15 15 255"
 			"paintbackgroundtype"		"2"
 		}
@@ -314,7 +314,7 @@
 		"ypos"			"170"
 		"zpos"			"100"
 		"wide"			"200"
-		"tall"			"40"
+		"tall"			"20"
 		"autoResize"	"1"
 		"pinCorner"		"0"
 		"visible"		"0"
@@ -325,13 +325,14 @@
 		"paintborder"	"1"
 		"textinsetx"	"100"
 		"border"		"LoadoutItemPopupBorder"
+		"fgcolor"		"White"
 	}
 
 	"PrevPageButton"
 	{
 		"ControlName"	"CExButton"
 		"fieldName"		"PrevPageButton"
-		"xpos"			"c210"
+		"xpos"			"c190"
 		"ypos"			"280"
 		"zpos"			"5"
 		"wide"			"20"
@@ -349,17 +350,16 @@
 		"Command"		"prevpage"
 		"sound_depressed"	"UI/buttonclick.wav"
 		"sound_released"	"UI/buttonclickrelease.wav"
-		"defaultBgColor_override" "DarkerGrey"
 	}
 
 	"CurPageLabel"
 	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"CurPageLabel"
-		"font"			"HudFontSmallBold"
+		"font"			"Cerbetica14"
 		"labelText"		"%backpackpage%"
 		"textAlignment"	"center"
-		"xpos"			"c230"
+		"xpos"			"c220"
 		"ypos"			"280"
 		"zpos"			"5"
 		"wide"			"40"
@@ -393,7 +393,6 @@
 		"Command"		"nextpage"
 		"sound_depressed"	"UI/buttonclick.wav"
 		"sound_released"	"UI/buttonclickrelease.wav"
-		"defaultBgColor_override" "DarkerGrey"
 	}
 
 	"PriceLabel"
@@ -432,7 +431,7 @@
 		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
-		"fgcolor"		"StoreDarkTan"
+		"fgcolor"		"White"
 	}
 
 	"SubcategoryFiltersLabel"
@@ -451,7 +450,7 @@
 		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
-		"fgcolor"		"StoreDarkTan"
+		"fgcolor"		"White"
 	}
 
 	"SortFilterLabel"
@@ -470,7 +469,7 @@
 		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
-		"fgcolor"		"StoreDarkTan"
+		"fgcolor"		"White"
 	}
 
 	"ClassFilterLabel"
@@ -489,7 +488,7 @@
 		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
-		"fgcolor"		"StoreDarkTan"
+		"fgcolor"		"White"
 	}
 
 	"ClassFilterNavPanel"
@@ -698,11 +697,11 @@
 	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"BackpackSpaceLabel"
-		"font"			"Cerbetica14"
+		"font"			"Cerbetica12"
 		"labelText"		"%freebackpackspace%"
 		"textAlignment"	"west"
-		"xpos"			"c-292"
-		"ypos"			"277"
+		"xpos"			"c-300"
+		"ypos"			"315"
 		"zpos"			"0"
 		"wide"			"200"
 		"tall"			"20"
@@ -716,11 +715,11 @@
 	{
 		"ControlName"	"CExButton"
 		"fieldName"		"CartButton"
-		"font"			"HudFontSmallBold"
+		"font"			"Cerbetica14"
 		"labelText"		"%storecart%"
 		"textAlignment"	"east"
-		"xpos"			"c-292"
-		"ypos"			"299"
+		"xpos"			"c-300"
+		"ypos"			"334"
 		"zpos"			"12"
 		"wide"			"56"
 		"tall"			"24"
@@ -728,9 +727,8 @@
 		"enabled"		"1"
 		"PaintBackgroundType"	"2"
 		"textinsetx"	"15"
-
 		"Command"		"viewcart"
-		"font"			"HudFontSmallBold"
+		"defaultBgColor_override" "TanDarker"
 		"sound_depressed"	"UI/buttonclick.wav"
 		"sound_released"	"UI/buttonclickrelease.wav"
 	}
@@ -739,8 +737,8 @@
 	{
 		"ControlName"	"ImagePanel"
 		"fieldName"		"CartImage"
-		"xpos"			"c-289"
-		"ypos"			"302"
+		"xpos"			"c-295"
+		"ypos"			"336"
 		"zpos"			"13"
 		"wide"			"24"
 		"tall"			"20"
diff --git a/resource/ui/econ/store/v2/storepanel.res b/resource/ui/econ/store/v2/storepanel.res
index c2373bd..eb0545a 100644
--- a/resource/ui/econ/store/v2/storepanel.res
+++ b/resource/ui/econ/store/v2/storepanel.res
@@ -91,7 +91,7 @@
 	"FooterLine"
 	{
 		"ControlName"	"EditablePanel"
-		"fieldName"		"HeaderLine"
+		"fieldName"		"FooterLine"
 		"xpos"			"0"
 		"ypos"			"420"
 		"zpos"			"2"
@@ -109,7 +109,7 @@
 		"fieldName"		"Sheet"
 		"tabxindent"	"80"
 		"tabxdelta"		"10"
-		"tabwidth"		"240"
+		"tabxfittotext"	"1"
 		"tabheight"		"20"
 		"yoffset"		"14"
 		"transition_time" "0"
@@ -135,16 +135,15 @@
 		{
 			"textinsetx"		"25"
 			"textAlignment"		"center"
-			"font"				"Cerbetica20"
-			"ypos"				"50"
+			"font"				"Cerbetica14"
 			"selectedcolor"		"TanLight"
 			"unselectedcolor"	"TanDark"
-			"paintbackground"	"1"
-			"defaultBgColor_override"		"25 25 25 255"
+			"defaultBgColor_override"	"25 25 25 255"
+			"paintbackground"		"1"
+			"activeborder_override"	"CyanBorderTabs"
+			"normalborder_override" "CyanBorderTabsInactive"
 			"unselectedBgColor_override"	"10 10 10 255"
-			"activeborder_override"			"CyanBorderTabs"
 			"depressedBgColor_override"		"10 10 10 255"
-			"normalborder_override" 		"CyanBorderTabsInactive"
 		}
 	}
 
@@ -155,15 +154,15 @@
 		"xpos"				"c-300"
 		"ypos"				"437"
 		"zpos"				"2"
-		"wide"				"100"
+		"wide"				"130"
 		"tall"				"25"
 		"autoResize"		"0"
 		"pinCorner"			"3"
 		"visible"			"1"
 		"enabled"			"1"
 		"tabPosition"		"0"
-		"labelText"			"<< Back (&Q)"
-		"font"				"HudFontSmallBold"
+		"labelText"			"Exit Store (&Q)"
+		"font"				"Cerbetica14"
 		"textAlignment"		"center"
 		"dulltext"			"0"
 		"brighttext"		"0"
@@ -222,7 +221,7 @@
 		"zpos"				"5"
 		"wide"				"70"
 		"tall"				"100"
-		"font"				"Cerbetica10"
+		"font"				"Cerbetica8"
 		"wrap"				"1"
 		"labelText"			"#Store_ConfirmStampDonationAddTitle"
 		"visible"			"0"
@@ -243,7 +242,7 @@
 		"enabled"			"1"
 		"tabPosition"		"0"
 		"labelText"			"#Store_Checkout"
-		"font"				"HudFontSmallBold"
+		"font"				"Cerbetica14"
 		"textAlignment"		"center"
 		"dulltext"			"0"
 		"brighttext"		"0"
diff --git a/resource/ui/econ/store/v2/storepreviewitempanel.res b/resource/ui/econ/store/v2/storepreviewitempanel.res
index 8beec68..432d3d5 100644
--- a/resource/ui/econ/store/v2/storepreviewitempanel.res
+++ b/resource/ui/econ/store/v2/storepreviewitempanel.res
@@ -168,7 +168,7 @@
 				{
 					"ControlName"	"CExLabel"
 					"fieldName"		"ItemLevelInfoLabel"
-					"font"			"FontStoreOriginalPrice"
+					"font"			"HudFontSmallest"
 					"labelText"		"%item_level_info%"
 					"textAlignment"	"north-west"
 					"wide"			"228"
@@ -185,7 +185,7 @@
 				{
 					"ControlName"	"CExLabel"
 					"fieldName"		"RestrictionsLabel"
-					"font"			"FontStoreOriginalPrice"
+					"font"			"HudFontSmallest"
 					"labelText"		"#Store_ItemDesc_Restrictions"
 					"textAlignment"	"north-west"
 					"wide"			"228"
@@ -202,7 +202,7 @@
 				{
 					"ControlName"	"CExLabel"
 					"fieldName"		"RestrictionsTextLabel"
-					"font"			"FontStoreOriginalPrice"
+					"font"			"HudFontSmallest"
 					"labelText"		"#Store_HolidayRestrictionText"
 					"textAlignment"	"north-west"
 					"wide"			"228"
@@ -219,7 +219,7 @@
 				{
 					"ControlName"	"CExLabel"
 					"fieldName"		"UsedByLabel"
-					"font"			"FontStoreOriginalPrice"
+					"font"			"HudFontSmallest"
 					"labelText"		"#Store_ItemDesc_UsedBy"
 					"textAlignment"	"north-west"
 					"wide"			"228"
@@ -236,7 +236,7 @@
 				{
 					"ControlName"	"CExLabel"
 					"fieldName"		"UsedByTextLabel"
-					"font"			"FontStoreOriginalPrice"
+					"font"			"HudFontSmallest"
 					"labelText"		"%used_by_classes%"
 					"textAlignment"	"north-west"
 					"wide"			"228"
@@ -252,7 +252,7 @@
 				{
 					"ControlName"	"CExLabel"
 					"fieldName"		"SlotLabel"
-					"font"			"FontStoreOriginalPrice"
+					"font"			"HudFontSmallest"
 					"labelText"		"#Store_ItemDesc_Slot"
 					"textAlignment"	"north-west"
 					"wide"			"228"
@@ -269,7 +269,7 @@
 				{
 					"ControlName"	"CExLabel"
 					"fieldName"		"SlotTextLabel"
-					"font"			"FontStoreOriginalPrice"
+					"font"			"HudFontSmallest"
 					"labelText"		"%slot%"
 					"textAlignment"	"north-west"
 					"wide"			"228"
@@ -285,7 +285,7 @@
 				{
 					"ControlName"	"CExLabel"
 					"fieldName"		"PriceLabel"
-					"font"			"CerbeticaBold14"
+					"font"			"HudFontSmall"
 					"textAlignment"	"north-west"
 					"wide"			"228"
 					"tall"			"25"
@@ -301,7 +301,7 @@
 				{
 					"ControlName"	"CExLabel"
 					"fieldName"		"ArmoryTextLabel"
-					"font"			"FontStoreOriginalPrice"
+					"font"			"HudFontSmallest"
 					"textAlignment"	"north-west"
 					"wide"			"228"
 					"tall"			"10"
@@ -317,7 +317,7 @@
 				{
 					"ControlName"	"CExLabel"
 					"fieldName"		"AttributesLabel"
-					"font"			"FontStoreOriginalPrice"
+					"font"			"HudFontSmallest"
 					"textAlignment"	"north-west"
 					"wide"			"228"
 					"tall"			"10"
@@ -341,7 +341,7 @@
 					"enabled"		"1"
 					"tabPosition"	"0"
 					"labelText"		"#Store_ItemDesc_ItemWikiPage"
-					"font"			"CerbeticaBold12"
+					"font"			"HudFontSmall"
 					"textAlignment"	"center"
 					"dulltext"		"0"
 					"brighttext"	"0"
@@ -354,7 +354,7 @@
 				{
 					"ControlName"	"CExLabel"
 					"fieldName"		"TradableLabel"
-					"font"			"FontStoreOriginalPrice"
+					"font"			"HudFontSmallest"
 					"labelText"		"#Store_ItemDesc_Tradable"
 					"textAlignment"	"north-west"
 					"wide"			"205"
@@ -371,7 +371,7 @@
 				{
 					"ControlName"	"CExLabel"
 					"fieldName"		"TradableTextLabel"
-					"font"			"FontStoreOriginalPrice"
+					"font"			"HudFontSmallest"
 					"labelText"		"%tradable%"
 					"textAlignment"	"north-west"
 					"wide"			"205"
@@ -387,7 +387,7 @@
 				{
 					"ControlName"	"CExLabel"
 					"fieldName"		"GiftableLabel"
-					"font"			"FontStoreOriginalPrice"
+					"font"			"HudFontSmallest"
 					"labelText"		"#Store_ItemDesc_Giftable"
 					"textAlignment"	"north-west"
 					"wide"			"205"
@@ -404,7 +404,7 @@
 				{
 					"ControlName"	"CExLabel"
 					"fieldName"		"GiftableTextLabel"
-					"font"			"FontStoreOriginalPrice"
+					"font"			"HudFontSmallest"
 					"labelText"		"%giftable%"
 					"textAlignment"	"north-west"
 					"wide"			"205"
@@ -420,7 +420,7 @@
 				{
 					"ControlName"	"CExLabel"
 					"fieldName"		"NameableLabel"
-					"font"			"FontStoreOriginalPrice"
+					"font"			"HudFontSmallest"
 					"labelText"		"#Store_ItemDesc_Nameable"
 					"textAlignment"	"north-west"
 					"wide"			"205"
@@ -437,7 +437,7 @@
 				{
 					"ControlName"	"CExLabel"
 					"fieldName"		"NameableTextLabel"
-					"font"			"FontStoreOriginalPrice"
+					"font"			"HudFontSmallest"
 					"labelText"		"%nameable%"
 					"textAlignment"	"north-west"
 					"wide"			"205"
@@ -453,7 +453,7 @@
 				{
 					"ControlName"	"CExLabel"
 					"fieldName"		"CraftableLabel"
-					"font"			"FontStoreOriginalPrice"
+					"font"			"HudFontSmallest"
 					"labelText"		"#Store_ItemDesc_Craftable"
 					"textAlignment"	"north-west"
 					"wide"			"205"
@@ -470,7 +470,7 @@
 				{
 					"ControlName"	"CExLabel"
 					"fieldName"		"CraftableTextLabel"
-					"font"			"FontStoreOriginalPrice"
+					"font"			"Cerbetica12"
 					"labelText"		"%craftable%"
 					"textAlignment"	"north-west"
 					"wide"			"205"
@@ -1058,7 +1058,7 @@
 		"enabled"		"1"
 		"tabPosition"	"0"
 		"labelText"		"#Store_NextWeapon"
-		"font"			"CerbeticaBold12"
+		"font"			"HudFontSmallest"
 		"textAlignment"	"center"
 		"textinsetx"	"50"
 		"dulltext"		"0"
@@ -1198,7 +1198,7 @@
 
 			"paintbackground"	"0"
 			"paintbackgroundtype"	"0"
-			"defaultBgColor_Override"	"ColorBlack"
+			"defaultBgColor_Override"	"0 0 0 255"
 
 			"paintborder"		"0"
 
@@ -1419,7 +1419,7 @@
 		"enabled"		"1"
 		"tabPosition"	"0"
 		"labelText"		"#TF_BackCarat"
-		"font"			"CerbeticaBold14"
+		"font"			"HudFontSmall"
 		"textAlignment"	"center"
 		"dulltext"		"0"
 		"brighttext"	"0"
@@ -1443,7 +1443,7 @@
 		"enabled"		"1"
 		"tabPosition"	"0"
 		"labelText"		"#Store_TryItOut"
-		"font"			"CerbeticaBold14"
+		"font"			"HudFontSmall"
 		"textAlignment"	"center"
 		"dulltext"		"0"
 		"brighttext"	"0"
@@ -1460,14 +1460,14 @@
 		"xpos"			"c0"
 		"ypos"			"c105"
 		"zpos"			"2"
-		"wide"			"160"
+		"wide"			"150"
 		"tall"			"20"
 		"autoResize"	"0"
 		"visible"		"1"
 		"enabled"		"1"
 		"tabPosition"	"0"
 		"labelText"		"%storeaddtocart%"
-		"font"			"CerbeticaBold14"
+		"font"			"HudFontSmall"
 		"textAlignment"	"center"
 		"dulltext"		"0"
 		"brighttext"	"0"
diff --git a/resource/ui/econ/store/v2/storepreviewitempanel_maps.res b/resource/ui/econ/store/v2/storepreviewitempanel_maps.res
index fc95819..18c7440 100644
--- a/resource/ui/econ/store/v2/storepreviewitempanel_maps.res
+++ b/resource/ui/econ/store/v2/storepreviewitempanel_maps.res
@@ -138,11 +138,11 @@
 	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"ItemNameLabel"
-		"font"			"CerbeticaBold18"
+		"font"			"HudFontMediumSmall"
 		"labelText"		"%selectiontitle%"
 		"textAlignment"	"center"
 		"xpos"			"c-130"
-		"ypos"			"c-130"
+		"ypos"			"c-129"
 		"wide"			"260"
 		"tall"			"33"
 		"autoResize"	"1"
@@ -384,7 +384,7 @@
 		"enabled"		"1"
 		"tabPosition"	"0"
 		"labelText"		"#Store_NextWeapon"
-		"font"			"CerbeticaBold12"
+		"font"			"HudFontSmall"
 		"textAlignment"	"center"
 		"textinsetx"	"50"
 		"dulltext"		"0"
@@ -541,7 +541,7 @@
 		"enabled"		"1"
 		"tabPosition"	"0"
 		"labelText"		"#TF_BackCarat"
-		"font"			"CerbeticaBold14"
+		"font"			"HudFontSmall"
 		"textAlignment"	"center"
 		"dulltext"		"0"
 		"brighttext"	"0"
@@ -565,7 +565,7 @@
 		"enabled"		"1"
 		"tabPosition"	"0"
 		"labelText"		"#Store_AddToCart"
-		"font"			"CerbeticaBold14"
+		"font"			"HudFontSmall"
 		"textAlignment"	"center"
 		"dulltext"		"0"
 		"brighttext"	"0"
diff --git a/resource/ui/econ/store/v2/storeviewcartpanel.res b/resource/ui/econ/store/v2/storeviewcartpanel.res
index d579550..5d3177c 100644
--- a/resource/ui/econ/store/v2/storeviewcartpanel.res
+++ b/resource/ui/econ/store/v2/storeviewcartpanel.res
@@ -76,7 +76,7 @@
 			{
 				"ControlName"	"Label"
 				"fieldname"		"quantitylabel"
-				"font"			"HudFontSmallestBold"
+				"font"			"Cerbetica12"
 				"textAlignment"	"north-east"
 				"xpos"			"70"
 				"ypos"			"45"
@@ -113,14 +113,14 @@
 				"ypos"			"17"
 				"zpos"			"5"
 				"wide"			"100"
-				"tall"			"25"
+				"tall"			"20"
 				"autoResize"	"0"
 				"pinCorner"		"0"
 				"visible"		"1"
 				"enabled"		"1"
 				"tabPosition"	"0"
 				"labelText"		"#Store_Remove"
-				"font"			"HudFontSmallBold"
+				"font"			"Cerbetica14"
 				"textAlignment"	"center"
 				"dulltext"		"0"
 				"brighttext"	"0"
@@ -146,26 +146,7 @@
 				"visible"		"1"
 				"enabled"		"1"
 				"labelText"		"%price%"
-				"fgcolor_override" "130 120 104 255"
-			}
-
-			"PreviewItemLabel"
-			{
-				"ControlName"	"Label"
-				"fieldname"		"PreviewItemLabel"
-				"font"			"HudFontSmallest"
-				"textAlignment"	"center"
-				"xpos"			"110"
-				"ypos"			"36"
-				"wide"			"250"
-				"tall"			"15"
-				"zpos"			"15"
-				"autoResize"	"1"
-				"pinCorner"		"0"
-				"visible"		"1"
-				"enabled"		"1"
-				"labelText"		"%preview_item%"
-				"fgcolor_override" "130 120 104 255"
+				"fgcolor_override" "DullWhite"
 			}
 		}
 	}
@@ -233,7 +214,7 @@
 	"FooterLine"
 	{
 		"ControlName"	"EditablePanel"
-		"fieldName"		"HeaderLine"
+		"fieldName"		"FooterLine"
 		"xpos"			"0"
 		"ypos"			"420"
 		"zpos"			"2"
@@ -261,7 +242,7 @@
 			"ControlName"	"EditablePanel"
 			"fieldName"		"HeaderLine"
 			"xpos"			"0"
-			"ypos"			"420"
+			"ypos"			"0"
 			"zpos"			"2"
 			"wide"			"f0"
 			"tall"			"2"
@@ -333,20 +314,20 @@
 			"wide"			"600"
 			"tall"			"240"
 			"PaintBackgroundType"	"2"
-			"fgcolor_override"	"118 107 94 255"	// Gets copied to the scrollbar fgcolor as part of ScrollableEditablePanel
+			"fgcolor_override"	"DullWhite"	// Gets copied to the scrollbar fgcolor as part of ScrollableEditablePanel
 			"bgcolor_override"	"DarkGrey"
 			"autohide_buttons" "1"
 
 			"Scrollbar"
 			{
 				"xpos"			"586"
-				"wide"			"11"
+				"wide"			"4"
 				"tall"			"240"
 				"zpos"			"1000"
 
 				"Slider"
 				{
-					"PaintBackgroundType"	"2"
+					"PaintBackgroundType"	"1"
 				}
 
 				"nobuttons"		"1"
@@ -438,7 +419,7 @@
 						"pinCorner"		"0"
 						"visible"		"1"
 						"enabled"		"1"
-						"fgcolor_override" "130 120 104 255"
+						"fgcolor_override" "White"
 					}
 
 					"TotalSubtextLabelB"
@@ -457,7 +438,7 @@
 						"pinCorner"		"0"
 						"visible"		"1"
 						"enabled"		"1"
-						"fgcolor_override" "130 120 104 255"
+						"fgcolor_override" "White"
 					}
 
 					"TotalPriceLabel"
@@ -476,7 +457,7 @@
 						"visible"		"1"
 						"enabled"		"1"
 						"labelText"		"%totalprice%"
-						"fgcolor_override" "130 120 104 255"
+						"fgcolor_override" "White"
 					}
 				}
 			}
@@ -498,7 +479,7 @@
 		"enabled"		"1"
 		"tabPosition"	"0"
 		"labelText"		"#Store_ContinueShopping"
-		"font"			"HudFontSmallBold"
+		"font"			"Cerbetica14"
 		"textAlignment"	"center"
 		"dulltext"		"0"
 		"brighttext"	"0"
@@ -523,7 +504,7 @@
 		"enabled"		"1"
 		"tabPosition"	"0"
 		"labelText"		"#Store_Checkout"
-		"font"			"HudFontSmallBold"
+		"font"			"Cerbetica14"
 		"textAlignment"	"center"
 		"dulltext"		"0"
 		"brighttext"	"0"