Merge pull request #173 from raysfire/dev

v2021.0705

6 files changed, 687 insertions, 727 deletions

diff --git a/resource/ui/econ/store/v2/storehome_base.res b/resource/ui/econ/store/v2/storehome_base.res
index 4830e2f..87cf077 100644
--- a/resource/ui/econ/store/v2/storehome_base.res
+++ b/resource/ui/econ/store/v2/storehome_base.res
@@ -18,18 +18,15 @@
 		"bgcolor_override"				"DarkGrey"
 		"infocus_bgcolor_override"		"DarkGrey"
 		"outoffocus_bgcolor_override"	"DarkGrey"
-
-		"item_controls_xoffset"	"2"
-		"item_controls_yoffset"	"2"
-		"max_cart_model_panels"	"8"
+		"max_cart_model_panels"	"10"
 		"item_ypos"				"70"
-		"item_mod_wide"			"40"
-		"item_panels"			"12"
-		"item_columns"			"4"
-		"item_offcenter_x"		"-230"
+		"item_panels"			"15"
+		"item_columns"			"5"
+		"item_offcenter_x"		"-292"
 		"item_xdelta"			"8"
 		"item_ydelta"			"8"
-		"item_backdrop_zpos"	"1"
+		"item_controls_xoffset"	"2"
+		"item_controls_yoffset"	"2"
 		"show_item_backdrop"	"1"
 		"item_backdrop_color"	"DarkGrey"
 		"item_backdrop_left_margin"			"11"
@@ -37,7 +34,6 @@
 		"item_backdrop_top_margin"			"9"
 		"item_backdrop_bottom_margin"		"42"
 		"item_backdrop_paintbackgroundtype"	"0"
-		"item_backdrop_zpos"				"1"
 		"item_panel_bgcolor"			"Grey"
 		"item_panel_bgcolor_mouseover"	"156 146 128 255"
 		"item_panel_bgcolor_selected"	"176 166 148 255"
@@ -52,9 +48,9 @@
 			"wide"			"111"
 			"tall"			"62"
 			"visible"		"0"
-			"bgcolor_override"		"0 0 0 255"
+			"bgcolor_override"		"ColorBlack"
 			"noitem_textcolor"		"TextColor"
-			"PaintBackgroundType"	"0"
+			"PaintBackgroundType"	"2"
 			"paintborder"	"0"
 			"model_xpos"	"24"
 			"model_ypos"	"6"
@@ -67,7 +63,6 @@
 			"name_only"		"1"
 			"resize_to_text" "0"
 			"name_label_alignment" "3"
-
 			"inset_eq_x"	"2"
 			"inset_eq_y"	"2"
 
@@ -82,7 +77,7 @@
 
 		"modelpanel_labels_kv"
 		{
-			"font"			"HudFontSmallestBold"
+			"font"			"HudFontSmallest"
 			"textAlignment"	"north-east"
 			"xpos"			"c-61"
 			"ypos"			"32"
@@ -93,7 +88,6 @@
 			"pinCorner"		"0"
 			"visible"		"0"
 			"enabled"		"1"
-
 			"use_item_sounds" "1"
 		}
 
@@ -106,11 +100,10 @@
 			"wide"			"32"
 			"tall"			"25"
 			"visible"		"0"
-			"bgcolor_override"		"0 0 0 255"
+			"bgcolor_override"		"ColorBlack"
 			"noitem_textcolor"		"TextColor"
-			"PaintBackgroundType"	"0"
+			"PaintBackgroundType"	"2"
 			"paintborder"	"0"
-
 			"model_xpos"	"2"
 			"model_ypos"	"2"
 			"model_wide"	"28"
@@ -118,7 +111,6 @@
 			"text_ypos"		"60"
 			"text_center"	"1"
 			"name_only"		"1"
-
 			"inset_eq_x"	"2"
 			"inset_eq_y"	"2"
 
@@ -134,7 +126,7 @@
 
 		"cart_labels_kv"
 		{
-			"font"			"HudFontSmallestBold"
+			"font"			"HudFontSmallest"
 			"textAlignment"	"north-east"
 			"xpos"			"c-61"
 			"ypos"			"32"
@@ -185,7 +177,7 @@
 			"autoResize"		"0"
 			"PaintBackgroundType" "2"
 			"border"			"NoBorder"
-			"bgcolor_override"	"DarkGrey"
+			"bgcolor_override"	"35 35 35 255"
 		}
 
 		"attriblabel"
@@ -236,7 +228,7 @@
 		"enabled"		"1"
 		"tabPosition"	"0"
 		"labelText"		"RELOADSCHEME"
-		"font"			"HudFontSmallestBold"
+		"font"			"HudFontSmallest"
 		"textAlignment"	"center"
 		"textinsetx"	"50"
 		"dulltext"		"0"
@@ -250,7 +242,7 @@
 	{
 		"ControlName"		"CNavigationPanel"
 		"fieldName"			"ItemCategoryTabs"
-		"xpos"				"c-230"
+		"xpos"				"c-290"
 		"ypos"				"31"
 		"zpos"				"0"
 		"wide"				"430"
@@ -278,22 +270,22 @@
 			"textAlignment"		"center"
 			"scaleImage"		"1"
 			"font"				"HudFontSmallest"
-			"fgcolor"			"TanDark"
+			"fgcolor"			"TanLight"
+			"allcaps"			"1"
 
-			"defaultBgColor_override"	"25 25 25 255"
-			"defaultFgColor_override"	"124 114 99 255"
-			"armedBgColor_override"		"0 0 0 100"
-			"armedFgColor_override"		"235 227 203 255"
-			"selectedBgColor_override"	"0 0 0 100"
-			"selectedFgColor_override"	"235 227 203 255"
+			"defaultBgColor_override"	"TanDarker"
+			"defaultFgColor_override"	"TanLight"
+			"armedBgColor_override"		"TanDark"
+			"armedFgColor_override"		"TanLight"
+			"selectedBgColor_override"	"TanDark"
+			"selectedFgColor_override"	"TanLight"
 
 			"sound_depressed"	"UI/buttonclick.wav"
 			"sound_released"	"UI/buttonclickrelease.wav"
 			"sound_armed"		"UI/buttonrollover.wav"
 
 			"paintbackground"	"1"
-			"paintborder"		"1"
-			"border"			"ButtonBorder"
+			"paintborder"		"0"
 
 			"stayselectedonclick"	"1"
 			"keyboardinputenabled"	"0"
@@ -304,8 +296,8 @@
 	{
 		"ControlName"	"CExButton"
 		"fieldName"		"PrevPageButton"
-		"xpos"			"c130"
-		"ypos"			"283"
+		"xpos"			"c190"
+		"ypos"			"280"
 		"zpos"			"5"
 		"wide"			"20"
 		"tall"			"20"
@@ -322,18 +314,17 @@
 		"Command"		"prevpage"
 		"sound_depressed"	"UI/buttonclick.wav"
 		"sound_released"	"UI/buttonclickrelease.wav"
-		"defaultBgColor_override" "TanDarker"
 	}
 
 	"CurPageLabel"
 	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"CurPageLabel"
-		"font"			"HudFontSmallBold"
+		"font"			"HudFontSmall"
 		"labelText"		"%backpackpage%"
 		"textAlignment"	"center"
-		"xpos"			"c160"
-		"ypos"			"283"
+		"xpos"			"c220"
+		"ypos"			"280"
 		"zpos"			"5"
 		"wide"			"40"
 		"tall"			"20"
@@ -348,8 +339,8 @@
 	{
 		"ControlName"	"CExButton"
 		"fieldName"		"NextPageButton"
-		"xpos"			"c210"
-		"ypos"			"283"
+		"xpos"			"c270"
+		"ypos"			"280"
 		"zpos"			"5"
 		"wide"			"20"
 		"tall"			"20"
@@ -366,7 +357,6 @@
 		"Command"		"nextpage"
 		"sound_depressed"	"UI/buttonclick.wav"
 		"sound_released"	"UI/buttonclickrelease.wav"
-		"defaultBgColor_override" "TanDarker"
 	}
 
 	"BackpackSpaceLabel"
@@ -376,10 +366,10 @@
 		"font"			"HudFontSmallest"
 		"labelText"		"%freebackpackspace%"
 		"textAlignment"	"west"
-		"xpos"			"c-237"
+		"xpos"			"c-300"
 		"ypos"			"315"
 		"zpos"			"10"
-		"wide"			"160"
+		"wide"			"200"
 		"tall"			"20"
 		"autoResize"	"1"
 		"pinCorner"		"0"
@@ -394,7 +384,7 @@
 		"font"			"HudFontSmall"
 		"labelText"		"%storecart%"
 		"textAlignment"	"east"
-		"xpos"			"c-238"
+		"xpos"			"c-300"
 		"ypos"			"334"
 		"zpos"			"12"
 		"wide"			"56"
@@ -413,7 +403,7 @@
 	{
 		"ControlName"	"ImagePanel"
 		"fieldName"		"CartImage"
-		"xpos"			"c-233"
+		"xpos"			"c-295"
 		"ypos"			"336"
 		"zpos"			"13"
 		"wide"			"24"
@@ -428,8 +418,8 @@
 	{
 		"ControlName"	"CExButton"
 		"fieldName"		"BrowseTheStoreButton"
-		"xpos"			"c-365"
-		"ypos"			"c-80"
+		"xpos"			"c-64"
+		"ypos"			"334"
 		"zpos"			"2"
 		"wide"			"160"
 		"tall"			"23"
@@ -453,8 +443,8 @@
 	{
 		"ControlName"	"CExButton"
 		"fieldName"		"MarketPlaceButton"
-		"xpos"			"c-230"
-		"ypos"			"c40"
+		"xpos"			"c-20"
+		"ypos"			"31"
 		"zpos"			"2"
 		"wide"			"170"
 		"tall"			"23"
@@ -464,7 +454,7 @@
 		"enabled"		"1"
 		"tabPosition"	"0"
 		"labelText"		"#Store_MarketPlace"
-		"font"			"HudFontSmall"
+		"font"			"HudFontSmallest"
 		"textAlignment"	"center"
 		"dulltext"		"0"
 		"brighttext"	"0"
@@ -510,7 +500,7 @@
 		{
 			"ControlName"	"CExLabel"
 			"fieldName"		"CaseLabel"
-			"font"			"HudFontMediumBold"
+			"font"			"HudFontMedium"
 			"labelText"		"#Store_Case_Label"
 			"textAlignment"	"west"
 			"xpos"			"0"
@@ -528,7 +518,7 @@
 		{
 			"ControlName"	"CExLabel"
 			"fieldName"		"KeyLabel"
-			"font"			"HudFontMediumBold"
+			"font"			"HudFontMedium"
 			"labelText"		"#Store_Key_Label"
 			"textAlignment"	"west"
 			"xpos"			"0"
@@ -546,7 +536,7 @@
 		{
 			"ControlName"	"CExLabel"
 			"fieldName"		"CaseLabel"
-			"font"			"HudFontMediumBold"
+			"font"			"HudFontMedium"
 			"labelText"		"#Store_Taunt_Label"
 			"textAlignment"	"west"
 			"xpos"			"0"
@@ -560,22 +550,4 @@
 			"enabled"		"1"
 		}
 	}
-
-	"Wall"
-	{
-		"ControlName"	"EditablePanel"
-		"fieldName"		"Wall"
-		"xpos"			"c-250"
-		"ypos"			"55"
-		"zpos"			"-5"
-		"wide"			"505"
-		"tall"			"260"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"1"
-		"enabled"		"1"
-		"paintbackground"	"1"
-		"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 0ab0419..bdd2a91 100644
--- a/resource/ui/econ/store/v2/storepage.res
+++ b/resource/ui/econ/store/v2/storepage.res
@@ -79,7 +79,7 @@
 
 		"modelpanel_labels_kv"
 		{
-			"font"			"HudFontSmallestBold"
+			"font"			"HudFontSmallest"
 			"textAlignment"	"north-east"
 			"xpos"			"c-61"
 			"ypos"			"32"
@@ -119,6 +119,7 @@
 			"itemmodelpanel"
 			{
 				"use_item_rendertarget" "0"
+				"inventory_image_type" 	"1"
 				"allow_rot"				"0"
 			}
 
@@ -127,7 +128,7 @@
 
 		"cart_labels_kv"
 		{
-			"font"			"HudFontSmallestBold"
+			"font"			"HudFontSmallest"
 			"textAlignment"	"north-east"
 			"xpos"			"c-61"
 			"ypos"			"32"
@@ -158,8 +159,8 @@
 		"textHidden"	"0"
 		"editable"		"1"
 		"unicode"		"1"
-		"fgcolor_override"	"TanLight"
-		"bgcolor_override"	"15 15 15 255"
+		"fgcolor_override"	"DarkerGrey"
+		"bgcolor_override"	"TanLight"
 		"paintbackgroundtype" "2"
 		"font"		"HudFontSmall"
 	}
@@ -168,7 +169,7 @@
 	{
 		"ControlName"		"ComboBox"
 		"fieldName"			"SubcategoryFilterComboBox"
-		"Font"				"HudFontSmallestBold"
+		"Font"				"HudFontSmallest"
 		"xpos"				"c30"
 		"ypos"				"30"
 		"zpos"				"1"
@@ -178,38 +179,26 @@
 		"pinCorner"			"0"
 		"visible"			"1"
 		"enabled"			"1"
-		"tabPosition"		"1"
 		"textHidden"		"0"
 		"editable"			"0"
 		"maxchars"			"-1"
 		"NumericInputOnly"	"0"
 		"unicode"			"0"
-		"border_override"	"ButtonBorder"
-		"paintborder"		"1"
 
 		"fgcolor_override"					"TanLight"
-		"bgcolor_override"					"Black"
+		"bgcolor_override"					"Transparent"
 		"disabledFgColor_override"			"TanLight"
-		"disabledBgColor_override"			"Black"
-		"selectionColor_override"			"Black"
+		"disabledBgColor_override"			"Transparent"
+		"selectionColor_override"			"Transparent"
 		"selectionTextColor_override"		"TanLight"
-		"defaultSelectionBG2Color_override"	"Black"
-
-		"Button"
-		{
-			"defaultFgColor_override"	"TanLight"
-			"defaultBgColor_override"	"Black"
-			"armedFgColor_override"		"15 255 255 255"
-			"armedBgColor_override"		"Black"
-			"paintbackgroundtype"		"2"
-		}
+		"defaultSelectionBG2Color_override"	"Transparent"
 	}
 
 	"SortFilterComboBox"
 	{
 		"ControlName"		"ComboBox"
 		"fieldName"			"SortFilterComboBox"
-		"Font"				"HudFontSmallestBold"
+		"Font"				"HudFontSmallest"
 		"xpos"				"c152"
 		"ypos"				"30"
 		"zpos"				"1"
@@ -219,31 +208,19 @@
 		"pinCorner"			"0"
 		"visible"			"1"
 		"enabled"			"1"
-		"tabPosition"		"1"
 		"textHidden"		"0"
 		"editable"			"0"
 		"maxchars"			"-1"
 		"NumericInputOnly"	"0"
 		"unicode"			"0"
-		"border_override"	"ButtonBorder"
-		"paintborder"		"1"
 
 		"fgcolor_override"					"TanLight"
-		"bgcolor_override"					"Black"
+		"bgcolor_override"					"Transparent"
 		"disabledFgColor_override"			"TanLight"
-		"disabledBgColor_override"			"Black"
-		"selectionColor_override"			"Black"
+		"disabledBgColor_override"			"Transparent"
+		"selectionColor_override"			"Transparent"
 		"selectionTextColor_override"		"TanLight"
-		"defaultSelectionBG2Color_override"	"Black"
-
-		"Button"
-		{
-			"defaultFgColor_override"	"TanLight"
-			"defaultBgColor_override"	"Black"
-			"armedFgColor_override"		"15 255 255 255"
-			"armedBgColor_override"		"Black"
-			"paintbackgroundtype"		"2"
-		}
+		"defaultSelectionBG2Color_override"	"Transparent"
 	}
 
 	"mouseoveritempanel"
@@ -308,7 +285,7 @@
 	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"ClassFilterTooltipLabel"
-		"font"			"HudFontSmallBold"
+		"font"			"HudFontSmall"
 		"textAlignment"	"center"
 		"xpos"			"36"
 		"ypos"			"170"
@@ -399,7 +376,7 @@
 	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"PriceLabel"
-		"font"			"HudFontSmallBold"
+		"font"			"HudFontSmall"
 		"labelText"		"%selectionprice%"
 		"textAlignment"	"east"
 		"xpos"			"c20"
@@ -419,7 +396,7 @@
 	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"NameFilterLabel"
-		"font"			"HudFontSmallestBold"
+		"font"			"HudFontSmallest"
 		"labelText"		"#Store_NameFilterLabel"
 		"textAlignment"	"west"
 		"xpos"			"c-70"
@@ -438,7 +415,7 @@
 	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"SubcategoryFiltersLabel"
-		"font"			"HudFontSmallestBold"
+		"font"			"HudFontSmallest"
 		"labelText"		"#Store_ItemTypeFilterLabel"
 		"textAlignment"	"west"
 		"xpos"			"c30"
@@ -457,7 +434,7 @@
 	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"SortFilterLabel"
-		"font"			"HudFontSmallestBold"
+		"font"			"HudFontSmallest"
 		"labelText"		"#Store_SortByLabel"
 		"textAlignment"	"west"
 		"xpos"			"c152"
@@ -476,7 +453,7 @@
 	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"ClassFilterLabel"
-		"font"			"HudFontSmallestBold"
+		"font"			"HudFontSmallest"
 		"labelText"		"#Store_ClassFilterLabel"
 		"textAlignment"	"west"
 		"xpos"			"c-300"
@@ -778,7 +755,7 @@
 		"enabled"		"0"
 		"tabPosition"	"0"
 		"labelText"		"RELOADSCHEME"
-		"font"			"HudFontSmallestBold"
+		"font"			"HudFontSmallest"
 		"textAlignment"	"center"
 		"textinsetx"	"50"
 		"dulltext"		"0"
diff --git a/resource/ui/econ/store/v2/storepanel.res b/resource/ui/econ/store/v2/storepanel.res
index 0db5a9f..20896d6 100644
--- a/resource/ui/econ/store/v2/storepanel.res
+++ b/resource/ui/econ/store/v2/storepanel.res
@@ -19,7 +19,7 @@
 		"infocus_bgcolor_override"		"46 43 42 0"
 		"outoffocus_bgcolor_override"	"46 43 42 0"
 		"title"				"#StoreTitle"
-		"title_font"		"HudFontMediumBold"
+		"title_font"		"HudFontMedium"
 		"titletextinsetX"	"40"
 		"titletextinsetY"	"0"
 		"titlebarfgcolor_override"			"HudOffWhite"
@@ -162,7 +162,7 @@
 		"enabled"			"1"
 		"tabPosition"		"0"
 		"labelText"			"Exit Store (&Q)"
-		"font"				"HudFontSmall"
+		"font"				"HudFontMediumSmall"
 		"textAlignment"		"center"
 		"dulltext"			"0"
 		"brighttext"		"0"
@@ -219,9 +219,9 @@
 		"xpos"				"c304"
 		"ypos"				"440"
 		"zpos"				"5"
-		"wide"				"70"
+		"wide"				"100"
 		"tall"				"100"
-		"font"				"Cerbetica10"
+		"font"				"HudFontSmallest"
 		"wrap"				"1"
 		"labelText"			"#Store_ConfirmStampDonationAddTitle"
 		"visible"			"0"
@@ -242,7 +242,7 @@
 		"enabled"			"1"
 		"tabPosition"		"0"
 		"labelText"			"#Store_Checkout"
-		"font"				"HudFontSmall"
+		"font"				"HudFontMediumSmall"
 		"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 1ca502b..0c5b727 100644
--- a/resource/ui/econ/store/v2/storepreviewitempanel.res
+++ b/resource/ui/econ/store/v2/storepreviewitempanel.res
@@ -2,19 +2,19 @@
 {
 	"storepreviewitem"
 	{
-		"ControlName"	"CStorePreviewItemPanel"
-		"fieldName"		"storepreviewitem"
-		"xpos"			"0"
-		"ypos"			"0"
-		"zpos"			"1000"
-		"wide"			"f0"
-		"tall"			"f0"
-		"autoResize"	"0"
-		"skip_autoresize"	"1"
-		"pinCorner"		"0"
-		"visible"		"0"
-		"enabled"		"1"
-		"tabPosition"	"0"
+		"ControlName"			"CStorePreviewItemPanel"
+		"fieldName"				"storepreviewitem"
+		"xpos"					"0"
+		"ypos"					"0"
+		"zpos"					"1000"
+		"wide"					"f0"
+		"tall"					"f0"
+		"autoResize"			"0"
+		"skip_autoresize"		"1"
+		"pinCorner"				"0"
+		"visible"				"0"
+		"enabled"				"1"
+		"tabPosition"			"0"
 
 		"small_vertical_break_size"		"0"
 		"medium_vertical_break_size"	"6"
@@ -29,15 +29,15 @@
 
 	"ScrollBar"
 	{
-		"ControlName"	"ScrollBar"
-		"FieldName"		"ScrollBar"
-		"xpos"			"c226"
-		"ypos"			"c-120"
-		"wide"			"4"
-		"tall"			"200"
-		"zpos"			"1000"
-		"visible"		"1"
-		"nobuttons"		"1"
+		"ControlName"			"ScrollBar"
+		"FieldName"				"ScrollBar"
+		"xpos"					"c226"
+		"ypos"					"c-120"
+		"wide"					"4"
+		"tall"					"200"
+		"zpos"					"1000"
+		"visible"				"1"
+		"nobuttons"				"1"
 
 		"Slider"
 		{
@@ -47,439 +47,441 @@
 
 		"UpButton"
 		{
-			"ControlName"	"Button"
-			"FieldName"		"UpButton"
-			"visible"		"0"
-			"tall"			"0"
-			"wide"			"0"
+			"ControlName"			"Button"
+			"FieldName"				"UpButton"
+			"visible"				"0"
+			"tall"					"0"
+			"wide"					"0"
 		}
 
 		"DownButton"
 		{
-			"ControlName"	"Button"
-			"FieldName"		"DownButton"
-			"visible"		"0"
-			"tall"			"0"
-			"wide"			"0"
+			"ControlName"			"Button"
+			"FieldName"				"DownButton"
+			"visible"				"0"
+			"tall"					"0"
+			"wide"					"0"
 		}
 	}
 
 	// Fullscreen background panel
 	"BgPanel"
 	{
-		"ControlName"	"EditablePanel"
-		"fieldName"		"BgPanel"
-		"xpos"			"0"
-		"ypos"			"0"
-		"zpos"			"0"
-		"wide"			"f0"
-		"tall"			"f0"
-		"visible"		"1"
-		"enabled"		"1"
+		"ControlName"			"EditablePanel"
+		"fieldName"				"BgPanel"
+		"xpos"					"0"
+		"ypos"					"0"
+		"zpos"					"0"
+		"wide"					"f0"
+		"tall"					"f0"
+		"visible"				"1"
+		"enabled"				"1"
 		"PaintBackgroundType"	"0"
-		"bgcolor_override" "0 0 0 128"
+		"bgcolor_override"		"0 0 0 128"
 	}
 
 	// Rounded dialog border
 	"DialogFrame"
 	{
-		"ControlName"	"EditablePanel"
-		"fieldName"		"DialogFrame"
-		"xpos"			"c-240"
-		"ypos"			"c-150"
-		"zpos"			"0"
-		"wide"			"480"
-		"tall"			"300"
-		"visible"		"1"
-		"enabled"		"1"
-		"paintbackground"	"1"
-		"border"			"CyanBorderThick"
-		"bgcolor_override"	"DarkGrey"
-		"PaintBorder"		"1"
+		"ControlName"			"EditablePanel"
+		"fieldName"				"DialogFrame"
+		"xpos"					"c-240"
+		"ypos"					"c-150"
+		"zpos"					"0"
+		"wide"					"480"
+		"tall"					"300"
+		"visible"				"1"
+		"enabled"				"1"
+		"paintbackground"		"1"
+		"border"				"CyanBorderThick"
+		"bgcolor_override"		"DarkGrey"
+		"PaintBorder"			"1"
 
 		// Background for the player model & item preview panels
 		"PreviewViewportBg"
 		{
-			"ControlName"	"EditablePanel"
-			"fieldName"		"PreviewViewportBg"
-			"xpos"			"10"
-			"ypos"			"18"
-			"zpos"			"1"
-			"wide"			"220"
-			"tall"			"213"
-			"visible"		"1"
-			"enabled"		"1"
-			"paintborder"	"1"
-			"border"		"NoBorder"
-			"bgcolor_override"	"Grey"
+			"ControlName"			"EditablePanel"
+			"fieldName"				"PreviewViewportBg"
+			"xpos"					"10"
+			"ypos"					"18"
+			"zpos"					"1"
+			"wide"					"220"
+			"tall"					"213"
+			"visible"				"1"
+			"enabled"				"1"
+			"paintborder"			"1"
+			"border"				"NoBorder"
+			"bgcolor_override"		"Grey"
 		}
 
 		"ItemNameLabel"
 		{
-			"ControlName"	"CExLabel"
-			"fieldName"		"ItemNameLabel"
-			"font"			"Cerbetica20"
-			"labelText"		"%itemname%"
-			"textAlignment"	"west"
-			"xpos"			"240"
-			"ypos"			"17"
-			"wide"			"230"
-			"tall"			"15"
-			"autoResize"	"0"
-			"skip_autoresize"	"1"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"wrap"			"1"
+			"ControlName"			"CExLabel"
+			"fieldName"				"ItemNameLabel"
+			"font"					"HudFontMediumSmall"
+			"labelText"				"%itemname%"
+			"textAlignment"			"west"
+			"xpos"					"240"
+			"ypos"					"17"
+			"wide"					"230"
+			"tall"					"15"
+			"autoResize"			"0"
+			"skip_autoresize"		"1"
+			"pinCorner"				"0"
+			"visible"				"1"
+			"enabled"				"1"
+			"wrap"					"1"
+			"fgcolor"				"TanLight"
 		}
 
 		// Scrollable editable panel for right-hand side of preview, for all text details
 		"DetailsView"
 		{
-			"ControlName"	"EditablePanel"
-			"fieldName"		"DetailsView"
-			"xpos"			"240"
-			"ypos"			"30"
-			"zpos"			"100"
-			"wide"			"230"
-			"tall"			"201"
-			"visible"		"1"
+			"ControlName"			"EditablePanel"
+			"fieldName"				"DetailsView"
+			"xpos"					"240"
+			"ypos"					"30"
+			"zpos"					"100"
+			"wide"					"230"
+			"tall"					"201"
+			"visible"				"1"
 			"PaintBackgroundType"	"0"
-			"bgcolor_override"	"Transparent"
-			"skip_autoresize"	"1"
-			"autoresize"		"0"
+			"bgcolor_override"		"Transparent"
+			"skip_autoresize"		"1"
+			"autoresize"			"0"
 
 			"ScrollableChild"
 			{
-				"ControlName"	"EditablePanel"
-				"fieldName"		"ScrollableChild"
-				"xpos"			"240"
-				"ypos"			"0"
-				"zpos"			"100"
-				"wide"			"230"
-				"tall"			"222"
-				"visible"		"1"
+				"ControlName"			"EditablePanel"
+				"fieldName"				"ScrollableChild"
+				"xpos"					"240"
+				"ypos"					"0"
+				"zpos"					"100"
+				"wide"					"230"
+				"tall"					"222"
+				"visible"				"1"
 				"PaintBackgroundType"	"0"
-				"bgcolor_override"	"Transparent"
-				"skip_autoresize"	"1"
-				"autoresize"		"0"
+				"bgcolor_override"		"Transparent"
+				"skip_autoresize"		"1"
+				"autoresize"			"0"
 
 				"ItemLevelInfoLabel"
 				{
-					"ControlName"	"CExLabel"
-					"fieldName"		"ItemLevelInfoLabel"
-					"font"			"HudFontSmallest"
-					"labelText"		"%item_level_info%"
-					"textAlignment"	"north-west"
-					"wide"			"228"
-					"tall"			"15"
-					"autoResize"	"0"
-					"pinCorner"		"0"
-					"visible"		"1"
-					"enabled"		"1"
-					"wrap"			"1"
-					"fgcolor"		"DullWhite"
+					"ControlName"		"CExLabel"
+					"fieldName"			"ItemLevelInfoLabel"
+					"font"				"HudFontSmallest"
+					"labelText"			"%item_level_info%"
+					"textAlignment"		"north-west"
+					"wide"				"228"
+					"tall"				"12"
+					"autoResize"		"0"
+					"pinCorner"			"0"
+					"visible"			"1"
+					"enabled"			"1"
+					"wrap"				"1"
+					"fgcolor"			"DullWhite"
 				}
 
 				"RestrictionsLabel"
 				{
-					"ControlName"	"CExLabel"
-					"fieldName"		"RestrictionsLabel"
-					"font"			"HudFontSmallest"
-					"labelText"		"#Store_ItemDesc_Restrictions"
-					"textAlignment"	"north-west"
-					"wide"			"228"
-					"tall"			"10"
-					"autoResize"	"0"
-					"pinCorner"		"0"
-					"visible"		"0"
-					"enabled"		"1"
-					"wrap"			"1"
-					"fgcolor"		"LightRed"
+					"ControlName"		"CExLabel"
+					"fieldName"			"RestrictionsLabel"
+					"font"				"HudFontSmallest"
+					"labelText"			"#Store_ItemDesc_Restrictions"
+					"textAlignment"		"north-west"
+					"wide"				"228"
+					"tall"				"12"
+					"autoResize"		"0"
+					"pinCorner"			"0"
+					"visible"			"0"
+					"enabled"			"1"
+					"wrap"				"1"
+					"fgcolor"			"LightRed"
 				}
 
 				"RestrictionsTextLabel"
 				{
-					"ControlName"	"CExLabel"
-					"fieldName"		"RestrictionsTextLabel"
-					"font"			"HudFontSmallest"
-					"labelText"		"#Store_HolidayRestrictionText"
-					"textAlignment"	"north-west"
-					"wide"			"228"
-					"tall"			"10"
-					"autoResize"	"0"
-					"pinCorner"		"0"
-					"visible"		"0"
-					"enabled"		"1"
-					"wrap"			"1"
-					"fgcolor"		"LightRed"
+					"ControlName"		"CExLabel"
+					"fieldName"			"RestrictionsTextLabel"
+					"font"				"HudFontSmallest"
+					"labelText"			"#Store_HolidayRestrictionText"
+					"textAlignment"		"north-west"
+					"wide"				"228"
+					"tall"				"12"
+					"autoResize"		"0"
+					"pinCorner"			"0"
+					"visible"			"0"
+					"enabled"			"1"
+					"wrap"				"1"
+					"fgcolor"			"LightRed"
 				}
 
 				"UsedByLabel"
 				{
-					"ControlName"	"CExLabel"
-					"fieldName"		"UsedByLabel"
-					"font"			"HudFontSmallest"
-					"labelText"		"#Store_ItemDesc_UsedBy"
-					"textAlignment"	"north-west"
-					"wide"			"228"
-					"tall"			"10"
-					"autoResize"	"0"
-					"pinCorner"		"0"
-					"visible"		"1"
-					"enabled"		"1"
-					"wrap"			"1"
-					"fgcolor"		"DullWhite"
+					"ControlName"		"CExLabel"
+					"fieldName"			"UsedByLabel"
+					"font"				"HudFontSmallest"
+					"labelText"			"#Store_ItemDesc_UsedBy"
+					"textAlignment"		"north-west"
+					"wide"				"228"
+					"tall"				"12"
+					"autoResize"		"0"
+					"pinCorner"			"0"
+					"visible"			"1"
+					"enabled"			"1"
+					"wrap"				"1"
+					"fgcolor"			"DullWhite"
 				}
 
 				"UsedByTextLabel"
 				{
-					"ControlName"	"CExLabel"
-					"fieldName"		"UsedByTextLabel"
-					"font"			"HudFontSmallest"
-					"labelText"		"%used_by_classes%"
-					"textAlignment"	"north-west"
-					"wide"			"228"
-					"tall"			"10"
-					"autoResize"	"0"
-					"pinCorner"		"0"
-					"visible"		"1"
-					"enabled"		"1"
-					"wrap"			"1"
+					"ControlName"		"CExLabel"
+					"fieldName"			"UsedByTextLabel"
+					"font"				"HudFontSmallest"
+					"labelText"			"%used_by_classes%"
+					"textAlignment"		"north-west"
+					"wide"				"228"
+					"tall"				"12"
+					"autoResize"		"0"
+					"pinCorner"			"0"
+					"visible"			"1"
+					"enabled"			"1"
+					"wrap"				"1"
 				}
 
 				"SlotLabel"
 				{
-					"ControlName"	"CExLabel"
-					"fieldName"		"SlotLabel"
-					"font"			"HudFontSmallest"
-					"labelText"		"#Store_ItemDesc_Slot"
-					"textAlignment"	"north-west"
-					"wide"			"228"
-					"tall"			"10"
-					"autoResize"	"0"
-					"pinCorner"		"0"
-					"visible"		"1"
-					"enabled"		"1"
-					"wrap"			"1"
-					"fgcolor"		"DullWhite"
+					"ControlName"		"CExLabel"
+					"fieldName"			"SlotLabel"
+					"font"				"HudFontSmallest"
+					"labelText"			"#Store_ItemDesc_Slot"
+					"textAlignment"		"north-west"
+					"wide"				"228"
+					"tall"				"12"
+					"autoResize"		"0"
+					"pinCorner"			"0"
+					"visible"			"1"
+					"enabled"			"1"
+					"wrap"				"1"
+					"fgcolor"			"DullWhite"
 				}
 
 				"SlotTextLabel"
 				{
-					"ControlName"	"CExLabel"
-					"fieldName"		"SlotTextLabel"
-					"font"			"HudFontSmallest"
-					"labelText"		"%slot%"
-					"textAlignment"	"north-west"
-					"wide"			"228"
-					"tall"			"10"
-					"autoResize"	"0"
-					"pinCorner"		"0"
-					"visible"		"1"
-					"enabled"		"1"
-					"wrap"			"1"
+					"ControlName"		"CExLabel"
+					"fieldName"			"SlotTextLabel"
+					"font"				"HudFontSmallest"
+					"labelText"			"%slot%"
+					"textAlignment"		"north-west"
+					"wide"				"228"
+					"tall"				"12"
+					"autoResize"		"0"
+					"pinCorner"			"0"
+					"visible"			"1"
+					"enabled"			"1"
+					"wrap"				"1"
 				}
 
 				"PriceLabel"
 				{
-					"ControlName"	"CExLabel"
-					"fieldName"		"PriceLabel"
-					"font"			"HudFontSmall"
-					"textAlignment"	"north-west"
-					"wide"			"228"
-					"tall"			"25"
-					"autoResize"	"0"
-					"pinCorner"		"0"
-					"visible"		"1"
-					"enabled"		"1"
-					"wrap"			"1"
-					"labeltext"		"%price%"
+					"ControlName"		"CExLabel"
+					"fieldName"			"PriceLabel"
+					"font"				"HudFontMediumSmall"
+					"textAlignment"		"north-west"
+					"wide"				"228"
+					"tall"				"25"
+					"autoResize"		"0"
+					"pinCorner"			"0"
+					"visible"			"1"
+					"enabled"			"1"
+					"wrap"				"1"
+					"labeltext"			"%price%"
 				}
 
 				"ArmoryTextLabel"
 				{
-					"ControlName"	"CExLabel"
-					"fieldName"		"ArmoryTextLabel"
-					"font"			"HudFontSmallest"
-					"textAlignment"	"north-west"
-					"wide"			"228"
-					"tall"			"10"
-					"autoResize"	"0"
-					"pinCorner"		"0"
-					"visible"		"1"
-					"enabled"		"1"
-					"wrap"			"1"
-					"labeltext"		"%armory_text%"
+					"ControlName"		"CExLabel"
+					"fieldName"			"ArmoryTextLabel"
+					"font"				"HudFontSmallest"
+					"textAlignment"		"north-west"
+					"wide"				"228"
+					"tall"				"12"
+					"autoResize"		"0"
+					"pinCorner"			"0"
+					"visible"			"1"
+					"enabled"			"1"
+					"wrap"				"1"
+					"labeltext"			"%armory_text%"
 				}
 
 				"AttributesLabel"
 				{
-					"ControlName"	"CExLabel"
-					"fieldName"		"AttributesLabel"
-					"font"			"HudFontSmallest"
-					"textAlignment"	"north-west"
-					"wide"			"228"
-					"tall"			"10"
-					"autoResize"	"0"
-					"pinCorner"		"0"
-					"visible"		"1"
-					"enabled"		"1"
-					"wrap"			"1"
+					"ControlName"		"CExLabel"
+					"fieldName"			"AttributesLabel"
+					"font"				"HudFontSmallest"
+					"textAlignment"		"north-west"
+					"zpos"				"2"
+					"wide"				"228"
+					"tall"				"12"
+					"autoResize"		"0"
+					"pinCorner"			"0"
+					"visible"			"1"
+					"enabled"			"1"
+					"wrap"				"1"
 				}
 
 				"ItemWikiPageButton"
 				{
-					"ControlName"	"CExButton"
-					"fieldName"		"ItemWikiPageButton"
-					"zpos"			"20"
-					"wide"			"150"
-					"tall"			"20"
-					"autoResize"	"0"
-					"pinCorner"		"0"
-					"visible"		"1"
-					"enabled"		"1"
-					"tabPosition"	"0"
-					"labelText"		"#Store_ItemDesc_ItemWikiPage"
-					"font"			"HudFontSmall"
-					"textAlignment"	"center"
-					"dulltext"		"0"
-					"brighttext"	"0"
-					"command"		"viewwikipage"
+					"ControlName"		"CExButton"
+					"fieldName"			"ItemWikiPageButton"
+					"zpos"				"20"
+					"wide"				"150"
+					"tall"				"20"
+					"autoResize"		"0"
+					"pinCorner"			"0"
+					"visible"			"1"
+					"enabled"			"1"
+					"tabPosition"		"0"
+					"labelText"			"#Store_ItemDesc_ItemWikiPage"
+					"font"				"HudFontMediumSmall"
+					"textAlignment"		"center"
+					"dulltext"			"0"
+					"brighttext"		"0"
+					"command"			"viewwikipage"
 					"sound_depressed"	"UI/buttonclick.wav"
 					"sound_released"	"UI/buttonclickrelease.wav"
 				}
 
 				"TradableLabel"
 				{
-					"ControlName"	"CExLabel"
-					"fieldName"		"TradableLabel"
-					"font"			"HudFontSmallest"
-					"labelText"		"#Store_ItemDesc_Tradable"
-					"textAlignment"	"north-west"
-					"wide"			"205"
-					"tall"			"10"
-					"autoResize"	"0"
-					"pinCorner"		"0"
-					"visible"		"1"
-					"enabled"		"1"
-					"wrap"			"1"
-					"fgcolor"		"DullWhite"
+					"ControlName"		"CExLabel"
+					"fieldName"			"TradableLabel"
+					"font"				"HudFontSmallest"
+					"labelText"			"#Store_ItemDesc_Tradable"
+					"textAlignment"		"north-west"
+					"wide"				"205"
+					"tall"				"12"
+					"autoResize"		"0"
+					"pinCorner"			"0"
+					"visible"			"1"
+					"enabled"			"1"
+					"wrap"				"1"
+					"fgcolor"			"DullWhite"
 				}
 
 				"TradableTextLabel"
 				{
-					"ControlName"	"CExLabel"
-					"fieldName"		"TradableTextLabel"
-					"font"			"HudFontSmallest"
-					"labelText"		"%tradable%"
-					"textAlignment"	"north-west"
-					"wide"			"205"
-					"tall"			"10"
-					"autoResize"	"0"
-					"pinCorner"		"0"
-					"visible"		"1"
-					"enabled"		"1"
-					"wrap"			"1"
+					"ControlName"		"CExLabel"
+					"fieldName"			"TradableTextLabel"
+					"font"				"HudFontSmallest"
+					"labelText"			"%tradable%"
+					"textAlignment"		"north-west"
+					"wide"				"205"
+					"tall"				"12"
+					"autoResize"		"0"
+					"pinCorner"			"0"
+					"visible"			"1"
+					"enabled"			"1"
+					"wrap"				"1"
 				}
 
 				"GiftableLabel"
 				{
-					"ControlName"	"CExLabel"
-					"fieldName"		"GiftableLabel"
-					"font"			"HudFontSmallest"
-					"labelText"		"#Store_ItemDesc_Giftable"
-					"textAlignment"	"north-west"
-					"wide"			"205"
-					"tall"			"10"
-					"autoResize"	"0"
-					"pinCorner"		"0"
-					"visible"		"1"
-					"enabled"		"1"
-					"wrap"			"1"
-					"fgcolor"		"DullWhite"
+					"ControlName"		"CExLabel"
+					"fieldName"			"GiftableLabel"
+					"font"				"HudFontSmallest"
+					"labelText"			"#Store_ItemDesc_Giftable"
+					"textAlignment"		"north-west"
+					"wide"				"205"
+					"tall"				"12"
+					"autoResize"		"0"
+					"pinCorner"			"0"
+					"visible"			"1"
+					"enabled"			"1"
+					"wrap"				"1"
+					"fgcolor"			"DullWhite"
 				}
 
 				"GiftableTextLabel"
 				{
-					"ControlName"	"CExLabel"
-					"fieldName"		"GiftableTextLabel"
-					"font"			"HudFontSmallest"
-					"labelText"		"%giftable%"
-					"textAlignment"	"north-west"
-					"wide"			"205"
-					"tall"			"10"
-					"autoResize"	"0"
-					"pinCorner"		"0"
-					"visible"		"1"
-					"enabled"		"1"
-					"wrap"			"1"
+					"ControlName"		"CExLabel"
+					"fieldName"			"GiftableTextLabel"
+					"font"				"HudFontSmallest"
+					"labelText"			"%giftable%"
+					"textAlignment"		"north-west"
+					"wide"				"205"
+					"tall"				"12"
+					"autoResize"		"0"
+					"pinCorner"			"0"
+					"visible"			"1"
+					"enabled"			"1"
+					"wrap"				"1"
 				}
 
 				"NameableLabel"
 				{
-					"ControlName"	"CExLabel"
-					"fieldName"		"NameableLabel"
-					"font"			"HudFontSmallest"
-					"labelText"		"#Store_ItemDesc_Nameable"
-					"textAlignment"	"north-west"
-					"wide"			"205"
-					"tall"			"10"
-					"autoResize"	"0"
-					"pinCorner"		"0"
-					"visible"		"1"
-					"enabled"		"1"
-					"wrap"			"1"
-					"fgcolor"		"DullWhite"
+					"ControlName"		"CExLabel"
+					"fieldName"			"NameableLabel"
+					"font"				"HudFontSmallest"
+					"labelText"			"#Store_ItemDesc_Nameable"
+					"textAlignment"		"north-west"
+					"wide"				"205"
+					"tall"				"12"
+					"autoResize"		"0"
+					"pinCorner"			"0"
+					"visible"			"1"
+					"enabled"			"1"
+					"wrap"				"1"
+					"fgcolor"			"DullWhite"
 				}
 
 				"NameableTextLabel"
 				{
-					"ControlName"	"CExLabel"
-					"fieldName"		"NameableTextLabel"
-					"font"			"HudFontSmallest"
-					"labelText"		"%nameable%"
-					"textAlignment"	"north-west"
-					"wide"			"205"
-					"tall"			"10"
-					"autoResize"	"0"
-					"pinCorner"		"0"
-					"visible"		"1"
-					"enabled"		"1"
-					"wrap"			"1"
+					"ControlName"		"CExLabel"
+					"fieldName"			"NameableTextLabel"
+					"font"				"HudFontSmallest"
+					"labelText"			"%nameable%"
+					"textAlignment"		"north-west"
+					"wide"				"205"
+					"tall"				"12"
+					"autoResize"		"0"
+					"pinCorner"			"0"
+					"visible"			"1"
+					"enabled"			"1"
+					"wrap"				"1"
 				}
 
 				"CraftableLabel"
 				{
-					"ControlName"	"CExLabel"
-					"fieldName"		"CraftableLabel"
-					"font"			"HudFontSmallest"
-					"labelText"		"#Store_ItemDesc_Craftable"
-					"textAlignment"	"north-west"
-					"wide"			"205"
-					"tall"			"10"
-					"autoResize"	"0"
-					"pinCorner"		"0"
-					"visible"		"1"
-					"enabled"		"1"
-					"wrap"			"1"
-					"fgcolor"		"DullWhite"
+					"ControlName"		"CExLabel"
+					"fieldName"			"CraftableLabel"
+					"font"				"HudFontSmallest"
+					"labelText"			"#Store_ItemDesc_Craftable"
+					"textAlignment"		"north-west"
+					"wide"				"205"
+					"tall"				"12"
+					"autoResize"		"0"
+					"pinCorner"			"0"
+					"visible"			"1"
+					"enabled"			"1"
+					"wrap"				"1"
+					"fgcolor"			"DullWhite"
 				}
 
 				"CraftableTextLabel"
 				{
-					"ControlName"	"CExLabel"
-					"fieldName"		"CraftableTextLabel"
-					"font"			"HudFontSmallest"
-					"labelText"		"%craftable%"
-					"textAlignment"	"north-west"
-					"wide"			"205"
-					"tall"			"10"
-					"autoResize"	"0"
-					"pinCorner"		"0"
-					"visible"		"1"
-					"enabled"		"1"
-					"wrap"			"1"
+					"ControlName"		"CExLabel"
+					"fieldName"			"CraftableTextLabel"
+					"font"				"HudFontSmallest"
+					"labelText"			"%craftable%"
+					"textAlignment"		"north-west"
+					"wide"				"205"
+					"tall"				"12"
+					"autoResize"		"0"
+					"pinCorner"			"0"
+					"visible"			"1"
+					"enabled"			"1"
+					"wrap"				"1"
 				}
 			}
 		}
@@ -487,62 +489,62 @@
 
 	"classmodelpanel"
 	{
-		"ControlName"	"CTFPlayerModelPanel"
-		"fieldName"		"classmodelpanel"
-		"xpos"			"c-230"
-		"ypos"			"c-132"
-		"zpos"			"1"
-		"wide"			"220"
-		"tall"			"213"
-		"autoResize"	"1"
-		"pinCorner"		"0"
-		"visible"		"1"
-		"enabled"		"1"
-		"render_texture"	"0"
-		"fov"			"40"
-		"allow_rot"		"1"
-		"paintbackground" "1"
-		"paintbackgroundenabled" "1"
-		"bgcolor_override" "255 255 255 0"
+		"ControlName"			"CTFPlayerModelPanel"
+		"fieldName"				"classmodelpanel"
+		"xpos"					"c-230"
+		"ypos"					"c-132"
+		"zpos"					"1"
+		"wide"					"220"
+		"tall"					"213"
+		"autoResize"			"1"
+		"pinCorner"				"0"
+		"visible"				"1"
+		"enabled"				"1"
+		"render_texture"		"0"
+		"fov"					"40"
+		"allow_rot"				"1"
+		"paintbackground"		"1"
+		"bgcolor_override"		"255 255 255 0"
+		"paintbackgroundenabled"	"1"
 
 		"model"
 		{
-			"force_pos"	"1"
-			"angles_x" "0"
-			"angles_y" "170"
-			"angles_z" "0"
-			"origin_x" "190"
-			"origin_y" "0"
-			"origin_z" "-36"
-			"frame_origin_x"	"0"
-			"frame_origin_y"	"0"
-			"frame_origin_z"	"0"
-			"spotlight" "1"
-			"modelname"		""
+			"force_pos"				"1"
+			"angles_x" 				"0"
+			"angles_y" 				"170"
+			"angles_z" 				"0"
+			"origin_x"				"190"
+			"origin_y" 				"0"
+			"origin_z"				"-36"
+			"frame_origin_x"		"0"
+			"frame_origin_y"		"0"
+			"frame_origin_z"		"0"
+			"spotlight" 			"1"
+			"modelname"				""
 		}
 	}
 
 	"PreviewItemModelPanel"
 	{
-		"ControlName"	"CItemModelPanel"
-		"fieldName"		"PreviewItemModelPanel"
-		"xpos"			"c-230"
-		"ypos"			"c-140"
-		"zpos"			"1"
-		"wide"			"220"
-		"tall"			"220"
-		"visible"		"1"
-		"paintbackground"	"0"
-		"paintborder"	"0"
-		"model_xpos"	"10"
-		"model_ypos"	"10"
-		"model_wide"	"200"
-		"model_tall"	"200"
-		"name_only"		"0"
-		"attrib_only"	"0"
-		"model_only"	"1"
-		"paint_icon_hide"	"0"
-		"text_ypos"		"10"
+		"ControlName"			"CItemModelPanel"
+		"fieldName"				"PreviewItemModelPanel"
+		"xpos"					"c-230"
+		"ypos"					"c-140"
+		"zpos"					"1"
+		"wide"					"220"
+		"tall"					"220"
+		"visible"				"1"
+		"paintbackground"		"0"
+		"paintborder"			"0"
+		"model_xpos"			"10"
+		"model_ypos"			"10"
+		"model_wide"			"200"
+		"model_tall"			"200"
+		"name_only"				"0"
+		"attrib_only"			"0"
+		"model_only"			"1"
+		"paint_icon_hide"		"0"
+		"text_ypos"				"10"
 
 		"itemmodelpanel"
 		{
@@ -554,47 +556,47 @@
 
 	"ItemIcon1"
 	{
-		"ControlName"	"CStorePreviewItemIcon"
-		"fieldName"		"ItemIcon1"
-		"xpos"			"c-215"
-		"ypos"			"c56"
-		"zpos"			"13"
-		"wide"			"30"
-		"tall"			"20"
-		"visible"		"1"
-		"panel_bgcolor" "TextColor"
-		"panel_bgcolor_mouseover" "White"
-		"image_indent"	"0"
+		"ControlName"			"CStorePreviewItemIcon"
+		"fieldName"				"ItemIcon1"
+		"xpos"					"c-215"
+		"ypos"					"c56"
+		"zpos"					"13"
+		"wide"					"30"
+		"tall"					"20"
+		"visible"				"1"
+		"panel_bgcolor"			"TextColor"
+		"image_indent"			"0"
 		"PaintBackgroundType"	"2"
+		"panel_bgcolor_mouseover" "White"
 
 		"bgblockout"
 		{
-			"ControlName"	"EditablePanel"
-			"fieldName"		"bgblockout"
-			"xpos"			"2"
-			"ypos"			"2"
-			"zpos"			"-10"
-			"wide"			"26"
-			"tall"			"16"
-			"visible"		"1"
-			"enabled"		"0"
+			"ControlName"			"EditablePanel"
+			"fieldName"				"bgblockout"
+			"xpos"					"2"
+			"ypos"					"2"
+			"zpos"					"-10"
+			"wide"					"26"
+			"tall"					"16"
+			"visible"				"1"
+			"enabled"				"0"
 			"PaintBackgroundType"	"2"
-			"bgcolor_override" "Grey"
+			"bgcolor_override"		"Grey"
 		}
 
 		"itempanel"
 		{
-			"fieldName"		"itempanel"
+			"fieldName"				"itempanel"
+			"paintborder"			"0"
+			"model_xpos"			"1"
+			"model_ypos"			"2"
+			"model_wide"			"28"
+			"model_tall"			"16"
+			"name_only"				"0"
+			"attrib_only"			"0"
+			"model_only"			"1"
+			"paint_icon_hide"		"0"
 			"PaintBackgroundType"	"2"
-			"paintborder"	"0"
-			"model_xpos"	"1"
-			"model_ypos"	"2"
-			"model_wide"	"28"
-			"model_tall"	"16"
-			"name_only"		"0"
-			"attrib_only"	"0"
-			"model_only"	"1"
-			"paint_icon_hide"	"0"
 
 			"itemmodelpanel"
 			{
@@ -815,179 +817,182 @@
 
 	"ClassUsageImage1"
 	{
-		"ControlName"	"CStorePreviewClassIcon"
-		"fieldName"		"ClassUsageImage1"
-		"xpos"			"65"
-		"ypos"			"225"
-		"zpos"			"5"
-		"wide"			"20"
-		"tall"			"20"
-		"visible"		"1"
-		"enabled"		"1"
-		"panel_bgcolor" "TextColor"
-		"panel_bgcolor_mouseover" "White"
-		"image_indent"	"2"
+		"ControlName"			"CStorePreviewClassIcon"
+		"fieldName"				"ClassUsageImage1"
+		"xpos"					"65"
+		"ypos"					"225"
+		"zpos"					"5"
+		"wide"					"20"
+		"tall"					"20"
+		"visible"				"1"
+		"enabled"				"1"
+		"panel_bgcolor"			"TextColor"
+		"image_indent"			"2"
 		"PaintBackgroundType"	"2"
+		"panel_bgcolor_mouseover" "White"
 	}
 	"ClassUsageImage2"
 	{
-		"ControlName"	"CStorePreviewClassIcon"
-		"fieldName"		"ClassUsageImage2"
-		"xpos"			"85"
-		"ypos"			"225"
-		"zpos"			"5"
-		"wide"			"20"
-		"tall"			"20"
-		"visible"		"1"
-		"enabled"		"1"
-		"panel_bgcolor" "TextColor"
-		"panel_bgcolor_mouseover" "White"
-		"image_indent"	"2"
+		"ControlName"			"CStorePreviewClassIcon"
+		"fieldName"				"ClassUsageImage2"
+		"xpos"					"85"
+		"ypos"					"225"
+		"zpos"					"5"
+		"wide"					"20"
+		"tall"					"20"
+		"visible"				"1"
+		"enabled"				"1"
+		"panel_bgcolor" 		"TextColor"
+		"image_indent"			"2"
 		"PaintBackgroundType"	"2"
+		"panel_bgcolor_mouseover" "White"
 	}
 	"ClassUsageImage3"
 	{
-		"ControlName"	"CStorePreviewClassIcon"
-		"fieldName"		"ClassUsageImage3"
-		"xpos"			"105"
-		"ypos"			"225"
-		"zpos"			"5"
-		"wide"			"20"
-		"tall"			"20"
-		"visible"		"1"
-		"enabled"		"1"
-		"panel_bgcolor" "TextColor"
-		"panel_bgcolor_mouseover" "White"
-		"image_indent"	"2"
+		"ControlName"			"CStorePreviewClassIcon"
+		"fieldName"				"ClassUsageImage3"
+		"xpos"					"105"
+		"ypos"					"225"
+		"zpos"					"5"
+		"wide"					"20"
+		"tall"					"20"
+		"visible"				"1"
+		"enabled"				"1"
+		"panel_bgcolor"			"TextColor"
+		"image_indent"			"2"
 		"PaintBackgroundType"	"2"
+		"panel_bgcolor_mouseover" "White"
 	}
 	"ClassUsageImage4"
 	{
-		"ControlName"	"CStorePreviewClassIcon"
-		"fieldName"		"ClassUsageImage4"
-		"xpos"			"125"
-		"ypos"			"225"
-		"zpos"			"5"
-		"wide"			"20"
-		"tall"			"20"
-		"visible"		"1"
-		"enabled"		"1"
-		"panel_bgcolor" "TextColor"
-		"panel_bgcolor_mouseover" "White"
-		"image_indent"	"2"
+		"ControlName"			"CStorePreviewClassIcon"
+		"fieldName"				"ClassUsageImage4"
+		"xpos"					"125"
+		"ypos"					"225"
+		"zpos"					"5"
+		"wide"					"20"
+		"tall"					"20"
+		"visible"				"1"
+		"enabled"				"1"
+		"panel_bgcolor" 		"TextColor"
+		"image_indent"			"2"
 		"PaintBackgroundType"	"2"
+		"panel_bgcolor_mouseover" "White"
 	}
 	"ClassUsageImage5"
 	{
-		"ControlName"	"CStorePreviewClassIcon"
-		"fieldName"		"ClassUsageImage5"
-		"xpos"			"145"
-		"ypos"			"225"
-		"zpos"			"5"
-		"wide"			"20"
-		"tall"			"20"
-		"visible"		"1"
-		"enabled"		"1"
-		"panel_bgcolor" "TextColor"
-		"panel_bgcolor_mouseover" "White"
-		"image_indent"	"2"
+		"ControlName"			"CStorePreviewClassIcon"
+		"fieldName"				"ClassUsageImage5"
+		"xpos"					"145"
+		"ypos"					"225"
+		"zpos"					"5"
+		"wide"					"20"
+		"tall"					"20"
+		"visible"				"1"
+		"enabled"				"1"
+		"panel_bgcolor" 		"TextColor"
+		"image_indent"			"2"
 		"PaintBackgroundType"	"2"
+		"panel_bgcolor_mouseover" "White"
 	}
 	"ClassUsageImage6"
 	{
-		"ControlName"	"CStorePreviewClassIcon"
-		"fieldName"		"ClassUsageImage6"
-		"xpos"			"165"
-		"ypos"			"225"
-		"zpos"			"5"
-		"wide"			"20"
-		"tall"			"20"
-		"visible"		"1"
-		"enabled"		"1"
-		"panel_bgcolor" "TextColor"
-		"panel_bgcolor_mouseover" "White"
-		"image_indent"	"2"
+		"ControlName"			"CStorePreviewClassIcon"
+		"fieldName"				"ClassUsageImage6"
+		"xpos"					"165"
+		"ypos"					"225"
+		"zpos"					"5"
+		"wide"					"20"
+		"tall"					"20"
+		"visible"				"1"
+		"enabled"				"1"
+		"panel_bgcolor" 		"TextColor"
+		"image_indent"			"2"
 		"PaintBackgroundType"	"2"
+		"panel_bgcolor_mouseover" "White"
 	}
 
 	"IconsMoveLeftButton"
 	{
-		"ControlName"	"CExButton"
-		"fieldName"		"IconsMoveLeftButton"
-		"xpos"			"c-210"
-		"ypos"			"c58"
-		"zpos"			"20"
-		"wide"			"15"
-		"tall"			"15"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"1"
-		"enabled"		"1"
-		"tabPosition"	"0"
-		"labelText"		"&A"
-		"font"			"MenuArrows"
-		"textAlignment"	"center"
-		"dulltext"		"0"
-		"brighttext"	"0"
-		"command"		"icons_left"
-		"sound_depressed"	"UI/buttonclick.wav"
-		"sound_released"	"UI/buttonclickrelease.wav"
-		"paintbackground"	"0"
-		"defaultFgColor_override"	"118 107 94 255"
-		"armedFgColor_override"		"128 117 104 255"
-		"depressedFgColor_override"	"236 227 203 255"
+		"ControlName"			"CExButton"
+		"fieldName"				"IconsMoveLeftButton"
+		"xpos"					"c-210"
+		"ypos"					"c58"
+		"zpos"					"20"
+		"wide"					"15"
+		"tall"					"15"
+		"autoResize"			"0"
+		"pinCorner"				"0"
+		"visible"				"1"
+		"enabled"				"1"
+		"tabPosition"			"0"
+		"labelText"				"&A"
+		"font"					"MenuArrows"
+		"textAlignment"			"center"
+		"dulltext"				"0"
+		"brighttext"			"0"
+		"command"				"icons_left"
+		"paintbackground"		"0"
+		
+		"sound_depressed"		"UI/buttonclick.wav"
+		"sound_released"		"UI/buttonclickrelease.wav"
+		
+		"defaultFgColor_override"	"TanDark"
+		"armedFgColor_override"		"TanLight"
+		"depressedFgColor_override"	"TanDark"
 	}
 
 	"IconsMoveRightButton"
 	{
-		"ControlName"	"CExButton"
-		"fieldName"		"IconsMoveRightButton"
-		"xpos"			"c-45"
-		"ypos"			"c58"
-		"zpos"			"20"
-		"wide"			"15"
-		"tall"			"15"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"1"
-		"enabled"		"1"
-		"tabPosition"	"0"
-		"labelText"		"&D"
-		"font"			"MenuArrows"
-		"textAlignment"	"center"
-		"dulltext"		"0"
-		"brighttext"	"0"
-		"command"		"icons_right"
-		"paintbackground"	"0"
-		"sound_depressed"	"UI/buttonclick.wav"
-		"sound_released"	"UI/buttonclickrelease.wav"
-
-		"defaultFgColor_override"	"118 107 94 255"
-		"armedFgColor_override"		"128 117 104 255"
-		"depressedFgColor_override"	"236 227 203 255"
+		"ControlName"			"CExButton"
+		"fieldName"				"IconsMoveRightButton"
+		"xpos"					"c-45"
+		"ypos"					"c58"
+		"zpos"					"20"
+		"wide"					"15"
+		"tall"					"15"
+		"autoResize"			"0"
+		"pinCorner"				"0"
+		"visible"				"1"
+		"enabled"				"1"
+		"tabPosition"			"0"
+		"labelText"				"&D"
+		"font"					"MenuArrows"
+		"textAlignment"			"center"
+		"dulltext"				"0"
+		"brighttext"			"0"
+		"command"				"icons_right"
+		"paintbackground"		"0"
+		
+		"sound_depressed"		"UI/buttonclick.wav"
+		"sound_released"		"UI/buttonclickrelease.wav"
+		
+		"defaultFgColor_override"	"TanDark"
+		"armedFgColor_override"		"TanLight"
+		"depressedFgColor_override"	"TanDark"
 	}
 
 	"ClassUsageMouseoverLabel"
 	{
-		"ControlName"	"CExLabel"
-		"fieldName"		"ClassUsageMouseoverLabel"
-		"font"			"HudFontSmallest"
-		"textAlignment"	"center"
-		"xpos"			"c-215"
-		"ypos"			"c75"
-		"zpos"			"100"
-		"wide"			"230"
-		"tall"			"55"
-		"autoResize"	"1"
-		"pinCorner"		"0"
-		"visible"		"1"
-		"enabled"		"1"
+		"ControlName"			"CExLabel"
+		"fieldName"				"ClassUsageMouseoverLabel"
+		"font"					"HudFontSmallest"
+		"textAlignment"			"center"
+		"xpos"					"c-215"
+		"ypos"					"c75"
+		"zpos"					"100"
+		"wide"					"230"
+		"tall"					"55"
+		"autoResize"			"1"
+		"pinCorner"				"0"
+		"visible"				"1"
+		"enabled"				"1"
 		"bgcolor_override"		"Transparent"
 		"PaintBackgroundType"	"2"
-		"centerwrap"	"1"
-		"paintborder"	"1"
-		"textinsetx"	"100"
-		"border"		"LoadoutItemPopupBorder"
+		"centerwrap"			"1"
+		"paintborder"			"1"
+		"textinsetx"			"100"
+		"border"				"LoadoutItemPopupBorder"
 	}
 
 	"RotLeftButton"
@@ -1063,7 +1068,7 @@
 		"enabled"		"1"
 		"tabPosition"	"0"
 		"labelText"		"#Store_NextWeapon"
-		"font"			"HudFontSmallest"
+		"font"			"HudFontMediumSmall"
 		"textAlignment"	"center"
 		"textinsetx"	"50"
 		"dulltext"		"0"
@@ -1075,32 +1080,36 @@
 
 	"GoFullscreenButton"
 	{
-		"ControlName"	"CExImageButton"
-		"fieldName"		"GoFullscreenButton"
-		"xpos"			"c-31"
-		"ypos"			"c-123"
-		"zpos"			"20"
-		"wide"			"11"
-		"tall"			"11"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"0"
-		"enabled"		"1"
-		"tabPosition"	"0"
-		"labeltext"		""
-		"font"			"HudFontSmallBold"
-		"textAlignment"	"center"
-		"dulltext"		"0"
-		"brighttext"	"0"
-		"default"		"0"
-		"Command"		"gofullscreen"
-		"paintbackground"	"0"
-
-		"sound_depressed"	"UI/buttonclick.wav"
-		"sound_released"	"UI/buttonclickrelease.wav"
-
-		"image_drawcolor"	"118 107 94 200"
-		"image_armedcolor"	"246 247 213 255"
+		"ControlName"			"CExImageButton"
+		"fieldName"				"GoFullscreenButton"
+		"xpos"					"c-31"
+		"ypos"					"c-123"
+		"zpos"					"20"
+		"wide"					"11"
+		"tall"					"11"
+		"autoResize"			"0"
+		"pinCorner"				"0"
+		"visible"				"0"
+		"enabled"				"1"
+		"tabPosition"			"0"
+		"labeltext"				""
+		"font"					"HudFontSmall"
+		"textAlignment"			"center"
+		"dulltext"				"0"
+		"brighttext"			"0"
+		"default"				"0"
+		"Command"				"gofullscreen"
+		"paintbackground"		"0"
+		
+		"sound_depressed"		"UI/buttonclick.wav"
+		"sound_released"		"UI/buttonclickrelease.wav"
+
+		"image_drawcolor"		"TanDark"
+		"image_armedcolor"		"TanLight"
+		
+		"defaultFgColor_override" 	"TanDark"
+		"armedFgColor_override" 	"TanLight"
+		"depressedFgColor_override" "TanDark"
 
 		"SubImage"
 		{
@@ -1133,7 +1142,7 @@
 		"enabled"		"1"
 		"tabPosition"	"0"
 		"labeltext"		""
-		"font"			"HudFontSmallBold"
+		"font"			"HudFontSmall"
 		"textAlignment"	"center"
 		"dulltext"		"0"
 		"brighttext"	"0"
@@ -1178,7 +1187,7 @@
 		"enabled"		"1"
 		"tabPosition"	"0"
 		"labeltext"		""
-		"font"			"HudFontSmallBold"
+		"font"			"HudFontSmall"
 		"textAlignment"	"center"
 		"dulltext"		"0"
 		"brighttext"	"0"
@@ -1391,7 +1400,7 @@
 		"sound_released"	"UI/buttonclickrelease.wav"
 
 		"defaultFgColor_override" 	"TanLight"
-		"armedFgColor_override" 	"255 0 0 255"
+		"armedFgColor_override" 	"LightRed"
 		"depressedFgColor_override" "TanLight"
 	}
 
@@ -1409,7 +1418,7 @@
 		"enabled"		"1"
 		"tabPosition"	"0"
 		"labelText"		"#TF_BackCarat"
-		"font"			"HudFontSmall"
+		"font"			"HudFontMediumSmall"
 		"textAlignment"	"center"
 		"dulltext"		"0"
 		"brighttext"	"0"
@@ -1434,7 +1443,7 @@
 		"enabled"		"1"
 		"tabPosition"	"0"
 		"labelText"		"#Store_TryItOut"
-		"font"			"HudFontSmall"
+		"font"			"HudFontMediumSmall"
 		"textAlignment"	"center"
 		"dulltext"		"0"
 		"brighttext"	"0"
@@ -1459,7 +1468,7 @@
 		"enabled"		"1"
 		"tabPosition"	"0"
 		"labelText"		"%storeaddtocart%"
-		"font"			"HudFontSmall"
+		"font"			"HudFontMediumSmall"
 		"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 6577508..7f44bf2 100644
--- a/resource/ui/econ/store/v2/storepreviewitempanel_maps.res
+++ b/resource/ui/econ/store/v2/storepreviewitempanel_maps.res
@@ -59,8 +59,8 @@
 			"zpos"			"1"
 			"wide"			"260"
 			"tall"			"209"
-			"visible"		"1"
-			"enabled"		"1"
+			"visible"		"0"
+			"enabled"		"0"
 			"paintborder"	"1"
 			"border"		"PanelBorder"
 			"bgcolor_override"	"Grey"
@@ -142,7 +142,7 @@
 		"labelText"		"%selectiontitle%"
 		"textAlignment"	"center"
 		"xpos"			"c-130"
-		"ypos"			"c-129"
+		"ypos"			"c-140"
 		"wide"			"260"
 		"tall"			"33"
 		"autoResize"	"1"
@@ -151,6 +151,8 @@
 		"enabled"		"1"
 		"wrap"			"1"
 		"centerwrap"	"1"
+		"allcaps"		"1"
+		"fgcolor"		"TanLight"
 	}
 
 	"ClassUsageImage1"
@@ -509,7 +511,7 @@
 		"sound_released"	"UI/buttonclickrelease.wav"
 
 		"defaultFgColor_override" 	"White"
-		"armedFgColor_override" 	"255 0 0 255"
+		"armedFgColor_override" 	"LightRed"
 		"depressedFgColor_override" "White"
 	}
 
@@ -527,7 +529,7 @@
 		"enabled"		"1"
 		"tabPosition"	"0"
 		"labelText"		"#TF_BackCarat"
-		"font"			"HudFontSmall"
+		"font"			"HudFontMediumSmall"
 		"textAlignment"	"center"
 		"dulltext"		"0"
 		"brighttext"	"0"
@@ -552,7 +554,7 @@
 		"enabled"		"1"
 		"tabPosition"	"0"
 		"labelText"		"#Store_AddToCart"
-		"font"			"HudFontSmall"
+		"font"			"HudFontMediumSmall"
 		"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 6f1cc25..72043f7 100644
--- a/resource/ui/econ/store/v2/storeviewcartpanel.res
+++ b/resource/ui/econ/store/v2/storeviewcartpanel.res
@@ -20,7 +20,7 @@
 		"outoffocus_bgcolor_override"	"DarkGrey"
 
 		"title"				"#StoreTitle"
-		"title_font"		"HudFontMediumBold"
+		"title_font"		"HudFontMedium"
 		"titletextinsetX"	"40"
 		"titletextinsetY"	"0"
 		"titlebarfgcolor_override"			"HudOffWhite"
@@ -120,7 +120,7 @@
 				"enabled"		"1"
 				"tabPosition"	"0"
 				"labelText"		"#Store_Remove"
-				"font"			"HudFontSmall"
+				"font"			"HudFontMediumSmall"
 				"textAlignment"	"center"
 				"dulltext"		"0"
 				"brighttext"	"0"
@@ -257,7 +257,7 @@
 		{
 			"ControlName"	"CExLabel"
 			"fieldName"		"CartItemsLabel"
-			"font"			"HudFontMediumBold"
+			"font"			"HudFontMedium"
 			"labelText"		"%storecart%"
 			"textAlignment"	"west"
 			"xpos"			"c-300"
@@ -290,7 +290,7 @@
 		{
 			"ControlName"	"Label"
 			"fieldName"		"EmptyCartLabel"
-			"font"			"HudFontSmallBold"
+			"font"			"HudFontMediumSmall"
 			"labelText"		"#Store_CartIsEmpty"
 			"textAlignment"	"center"
 			"xpos"			"c-300"
@@ -480,7 +480,7 @@
 		"enabled"		"1"
 		"tabPosition"	"0"
 		"labelText"		"#Store_ContinueShopping"
-		"font"			"HudFontSmall"
+		"font"			"HudFontMediumSmall"
 		"textAlignment"	"center"
 		"dulltext"		"0"
 		"brighttext"	"0"
@@ -505,7 +505,7 @@
 		"enabled"		"1"
 		"tabPosition"	"0"
 		"labelText"		"#Store_Checkout"
-		"font"			"HudFontSmall"
+		"font"			"HudFontMediumSmall"
 		"textAlignment"	"center"
 		"dulltext"		"0"
 		"brighttext"	"0"