Updated Mann Co. Store

1 files changed, 597 insertions, 588 deletions

diff --git a/resource/ui/econ/store/v2/storepreviewitempanel.res b/resource/ui/econ/store/v2/storepreviewitempanel.res
index 282bc50..2f8d748 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"			"HudFontMediumSmall"
-					"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"
@@ -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"					"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"		"TanDark"
+		"image_armedcolor"		"TanLight"
+		
+		"defaultFgColor_override" 	"TanDark"
+		"armedFgColor_override" 	"TanLight"
+		"depressedFgColor_override" "TanDark"
 
 		"SubImage"
 		{
@@ -1391,7 +1400,7 @@
 		"sound_released"	"UI/buttonclickrelease.wav"
 
 		"defaultFgColor_override" 	"TanLight"
-		"armedFgColor_override" 	"255 0 0 255"
+		"armedFgColor_override" 	"LightRed"
 		"depressedFgColor_override" "TanLight"
 	}