Backend Changes

- Fixed certain colors not being enforced from the customizable files
- Backend cleanup. Colors are assigned to their schema name.
- Updated the PDA and killstreak count's use of #base.
- Removed the Smissmas promo from the Mann Co. Store

20 files changed, 134 insertions, 548 deletions

diff --git a/resource/ui/econ/backpackpanel.res b/resource/ui/econ/backpackpanel.res
index 2fb6603..f5ff0a0 100644
--- a/resource/ui/econ/backpackpanel.res
+++ b/resource/ui/econ/backpackpanel.res
@@ -15,7 +15,7 @@
 		"settitlebarvisible"	"0"
 		"PaintBackgroundType"	"0"
 		"bgcolor_override"				"DarkGrey"
-		"infocus_bgcolor_override" 		"DarkGrey"
+		"infocus_bgcolor_override"		"DarkGrey"
 		"outoffocus_bgcolor_override" 	"DarkGrey"
 		
 		"item_xpos_offcenter_a"	"-310"
@@ -236,7 +236,7 @@
 		"disabledBgColor_override"			"Transparent"
 		"selectionColor_override"			"Transparent"
 		"selectionTextColor_override"		"TanLight"
-		"defaultSelectionBG2Color_override" "Transparent"
+		"defaultSelectionBG2Color_override"	"Transparent"
 	}	
 	
 	"ShowBaseItemsCheckbox"
@@ -329,8 +329,8 @@
 		"bgcolor_override"				"Transparent"
 		"disabledFgColor_override"		"TanLight"
 		"disabledBgColor_override"		"Transparent"
-		"selectionColor_override" 		"Transparent"
-		"selectionTextColor_override" 	"TanLight"
+		"selectionColor_override"		"Transparent"
+		"selectionTextColor_override"	"TanLight"
 		"defaultSelectionBG2Color_override" "Transparent"
 	}
 	
@@ -1085,450 +1085,6 @@
 			"ControlName"	"CExImageButton"
 			"fieldName"		"PrevButton"
 			"xpos"			"10"
-			"ypos"			"165"
-			"zpos"			"10"
-			"wide"			"30"
-			"tall"			"30"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"tabPosition"	"0"
-			"labeltext"		""
-			"font"			"HudFontSmallBold"
-			"textAlignment"	"center"
-			"dulltext"		"0"
-			"brighttext"	"0"
-			"default"		"0"
-			"sound_depressed"	"UI/buttonclick.wav"
-			"sound_released"	"UI/buttonclickrelease.wav"
-			"Command"			"prevexplanation"
-			"paintbackground"	"0"
-			
-			"defaultFgColor_override"	"TanDarker"
-			"armedFgColor_override"		"LightRed"
-			"depressedFgColor_override"	"TanDarker"
-			"image_drawcolor"			"TanLight"
-			"image_armedcolor"			"White"
-			
-			"SubImage"
-			{
-				"ControlName"	"ImagePanel"
-				"fieldName"		"SubImage"
-				"xpos"			"0"
-				"ypos"			"0"
-				"zpos"			"1"
-				"wide"			"30"
-				"tall"			"30"
-				"visible"		"1"
-				"enabled"		"1"
-				"image"			"blog_back"
-				"scaleImage"	"1"
-			}
-		}
-		
-		"NextButton"
-		{
-			"ControlName"	"CExImageButton"
-			"fieldName"		"NextButton"
-			"xpos"			"260"
-			"ypos"			"165"
-			"zpos"			"10"
-			"wide"			"30"
-			"tall"			"30"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"tabPosition"	"0"
-			"labeltext"		""
-			"font"			"HudFontSmallBold"
-			"textAlignment"	"center"
-			"dulltext"		"0"
-			"brighttext"	"0"
-			"default"		"0"
-			"sound_depressed"	"UI/buttonclick.wav"
-			"sound_released"	"UI/buttonclickrelease.wav"
-			"Command"			"nextexplanation"
-			"paintbackground"	"0"
-			
-			"defaultFgColor_override"	"TanDarker"
-			"armedFgColor_override"		"LightRed"
-			"depressedFgColor_override"	"TanDarker"
-			"image_drawcolor"			"TanLight"
-			"image_armedcolor"			"White"
-			
-			"SubImage"
-			{
-				"ControlName"	"ImagePanel"
-				"fieldName"		"SubImage"
-				"xpos"			"0"
-				"ypos"			"0"
-				"zpos"			"1"
-				"wide"			"30"
-				"tall"			"30"
-				"visible"		"1"
-				"enabled"		"1"
-				"image"			"blog_forward"
-				"scaleImage"	"1"
-			}
-		}
-		
-		"PositionLabel"
-		{
-			"ControlName"	"CExLabel"
-			"fieldName"		"PositionLabel"
-			"font"			"HudFontSmallBold"
-			"labelText"		"%explanationnumber%"
-			"textAlignment"	"center"
-			"xpos"			"0"
-			"ypos"			"165"
-			"zpos"			"-1"
-			"wide"			"300"
-			"tall"			"30"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"fgcolor_override" "LightRed"
-		}
-	}
-	
-	"ArmoryExplanation"
-	{
-		"ControlName"	"CExplanationPopup"
-		"fieldName"		"ArmoryExplanation"
-		"xpos"			"0"
-		"ypos"			"0"
-		"zpos"			"10000"
-		"wide"			"250"
-		"tall"			"140"
-		"visible"		"0"
-		"PaintBackgroundType"	"2"
-		"paintbackground" "0"
-		"border"		"MainMenuHighlightBorder"
-		
-		"force_close"	"1"
-		"end_x"			"c-150"
-		"end_y"			"80"
-		"end_wide"		"300"
-		"end_tall"		"155"
-		"callout_inparents_x"	"c225"
-		"callout_inparents_y"	"323"
-		"next_explanation"		"ToolsExplanation"
-		
-		"TitleLabel"
-		{
-			"ControlName"	"CExLabel"
-			"fieldName"		"TitleLabel"
-			"font"			"HudFontSmallBold"
-			"labelText"		"#BackpackArmoryExplanation_Title"
-			"textAlignment"	"north"
-			"xpos"			"20"
-			"ypos"			"10"
-			"wide"			"260"
-			"tall"			"30"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"wrap"			"1"
-			"fgcolor_override" "TanDarker"
-		}
-		
-		"TextLabel"
-		{
-			"ControlName"	"CExLabel"
-			"fieldName"		"TextLabel"
-			"font"			"HudFontSmall"
-			"labelText"		"#BackpackArmoryExplanation_Text"
-			"textAlignment"	"north-west"
-			"xpos"			"20"
-			"ypos"			"45"
-			"wide"			"260"
-			"tall"			"135"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"wrap"			"1"
-			"fgcolor_override" "TanDarker"
-		}
-		
-		"CloseButton"
-		{
-			"ControlName"	"CExImageButton"
-			"fieldName"		"CloseButton"
-			"xpos"			"280"
-			"ypos"			"5"
-			"zpos"			"10"
-			"wide"			"14"
-			"tall"			"14"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"tabPosition"	"0"
-			"labeltext"		""
-			"font"			"HudFontSmallBold"
-			"textAlignment"	"center"
-			"dulltext"		"0"
-			"brighttext"	"0"
-			"default"		"0"
-			"sound_depressed"	"UI/buttonclick.wav"
-			"sound_released"	"UI/buttonclickrelease.wav"
-			"Command"			"close"
-			"paintbackground"	"0"
-			
-			"defaultFgColor_override"	"TanDarker"
-			"armedFgColor_override"		"LightRed"
-			"depressedFgColor_override"	"TanDarker"
-			"image_drawcolor"			"TextColor"
-			"image_armedcolor"			"LightRed"
-			
-			"SubImage"
-			{
-				"ControlName"	"ImagePanel"
-				"fieldName"		"SubImage"
-				"xpos"			"0"
-				"ypos"			"0"
-				"zpos"			"1"
-				"wide"			"14"
-				"tall"			"14"
-				"visible"		"1"
-				"enabled"		"1"
-				"image"			"replay/thumbnails/close"
-				"scaleImage"	"1"
-			}
-		}
-		
-		"PrevButton"
-		{
-			"ControlName"	"CExImageButton"
-			"fieldName"		"PrevButton"
-			"xpos"			"10"
-			"ypos"			"120"
-			"zpos"			"10"
-			"wide"			"30"
-			"tall"			"30"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"tabPosition"	"0"
-			"labeltext"		""
-			"font"			"HudFontSmallBold"
-			"textAlignment"	"center"
-			"dulltext"		"0"
-			"brighttext"	"0"
-			"default"		"0"
-			"sound_depressed"	"UI/buttonclick.wav"
-			"sound_released"	"UI/buttonclickrelease.wav"
-			"Command"			"prevexplanation"
-			"paintbackground"	"0"
-			
-			"defaultFgColor_override"	"TanDarker"
-			"armedFgColor_override"		"LightRed"
-			"depressedFgColor_override"	"TanDarker"
-			"image_drawcolor"			"TanLight"
-			"image_armedcolor"			"White"
-			
-			"SubImage"
-			{
-				"ControlName"	"ImagePanel"
-				"fieldName"		"SubImage"
-				"xpos"			"0"
-				"ypos"			"0"
-				"zpos"			"1"
-				"wide"			"30"
-				"tall"			"30"
-				"visible"		"1"
-				"enabled"		"1"
-				"image"			"blog_back"
-				"scaleImage"	"1"
-			}
-		}
-		
-		"NextButton"
-		{
-			"ControlName"	"CExImageButton"
-			"fieldName"		"NextButton"
-			"xpos"			"260"
-			"ypos"			"120"
-			"zpos"			"10"
-			"wide"			"30"
-			"tall"			"30"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"tabPosition"	"0"
-			"labeltext"		""
-			"font"			"HudFontSmallBold"
-			"textAlignment"	"center"
-			"dulltext"		"0"
-			"brighttext"	"0"
-			"default"		"0"
-			"sound_depressed"	"UI/buttonclick.wav"
-			"sound_released"	"UI/buttonclickrelease.wav"
-			"Command"			"nextexplanation"
-			"paintbackground"	"0"
-			
-			"defaultFgColor_override"	"TanDarker"
-			"armedFgColor_override"		"LightRed"
-			"depressedFgColor_override"	"TanDarker"
-			"image_drawcolor"			"TanLight"
-			"image_armedcolor"			"White"
-			
-			"SubImage"
-			{
-				"ControlName"	"ImagePanel"
-				"fieldName"		"SubImage"
-				"xpos"			"0"
-				"ypos"			"0"
-				"zpos"			"1"
-				"wide"			"30"
-				"tall"			"30"
-				"visible"		"1"
-				"enabled"		"1"
-				"image"			"blog_forward"
-				"scaleImage"	"1"
-			}
-		}
-		
-		"PositionLabel"
-		{
-			"ControlName"	"CExLabel"
-			"fieldName"		"PositionLabel"
-			"font"			"HudFontSmallBold"
-			"labelText"		"%explanationnumber%"
-			"textAlignment"	"center"
-			"xpos"			"0"
-			"ypos"			"120"
-			"zpos"			"-1"
-			"wide"			"300"
-			"tall"			"30"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"fgcolor_override" "LightRed"
-		}
-	}
-	
-	"ToolsExplanation"
-	{
-		"ControlName"	"CExplanationPopup"
-		"fieldName"		"ToolsExplanation"
-		"xpos"			"0"
-		"ypos"			"0"
-		"zpos"			"10000"
-		"wide"			"250"
-		"tall"			"160"
-		"visible"		"0"
-		"PaintBackgroundType"	"2"
-		"paintbackground" "0"
-		"border"		"MainMenuHighlightBorder"
-		
-		"force_close"	"1"
-		"end_x"			"c-150"
-		"end_y"			"80"
-		"end_wide"		"300"
-		"end_tall"		"165"
-		"callout_inparents_x"	"c105"
-		"callout_inparents_y"	"323"
-		"next_explanation"		"StockExplanation"
-		
-		"TitleLabel"
-		{
-			"ControlName"	"CExLabel"
-			"fieldName"		"TitleLabel"
-			"font"			"HudFontSmallBold"
-			"labelText"		"#BackpackToolsExplanation_Title"
-			"textAlignment"	"north"
-			"xpos"			"20"
-			"ypos"			"10"
-			"wide"			"260"
-			"tall"			"30"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"wrap"			"1"
-			"fgcolor_override" "TanDarker"
-		}
-		
-		"TextLabel"
-		{
-			"ControlName"	"CExLabel"
-			"fieldName"		"TextLabel"
-			"font"			"HudFontSmall"
-			"labelText"		"#BackpackToolsExplanation_Text"
-			"textAlignment"	"north-west"
-			"xpos"			"20"
-			"ypos"			"45"
-			"wide"			"260"
-			"tall"			"135"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"wrap"			"1"
-			"fgcolor_override" "TanDarker"
-		}
-		
-		"CloseButton"
-		{
-			"ControlName"	"CExImageButton"
-			"fieldName"		"CloseButton"
-			"xpos"			"280"
-			"ypos"			"5"
-			"zpos"			"10"
-			"wide"			"14"
-			"tall"			"14"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"tabPosition"	"0"
-			"labeltext"		""
-			"font"			"HudFontSmallBold"
-			"textAlignment"	"center"
-			"dulltext"		"0"
-			"brighttext"	"0"
-			"default"		"0"
-			"sound_depressed"	"UI/buttonclick.wav"
-			"sound_released"	"UI/buttonclickrelease.wav"
-			"Command"			"close"
-			"paintbackground"	"0"
-			
-			"defaultFgColor_override" "TanDarker"
-			"armedFgColor_override" "LightRed"
-			"depressedFgColor_override" "TanDarker"
-			"image_drawcolor"	"TextColor"
-			"image_armedcolor"	"LightRed"
-			
-			"SubImage"
-			{
-				"ControlName"	"ImagePanel"
-				"fieldName"		"SubImage"
-				"xpos"			"0"
-				"ypos"			"0"
-				"zpos"			"1"
-				"wide"			"14"
-				"tall"			"14"
-				"visible"		"1"
-				"enabled"		"1"
-				"image"			"replay/thumbnails/close"
-				"scaleImage"	"1"
-			}
-		}
-		
-		"PrevButton"
-		{
-			"ControlName"	"CExImageButton"
-			"fieldName"		"PrevButton"
-			"xpos"			"10"
 			"ypos"			"135"
 			"zpos"			"10"
 			"wide"			"30"
@@ -1992,9 +1548,9 @@
 			"Command"			"prevexplanation"
 			"paintbackground"	"0"
 			
-			"defaultFgColor_override" 	"TanDarker"
-			"armedFgColor_override" 	"LightRed"
-			"depressedFgColor_override" "TanDarker"
+			"defaultFgColor_override"	"TanDarker"
+			"armedFgColor_override"		"LightRed"
+			"depressedFgColor_override"	"TanDarker"
 			"image_drawcolor"			"TanLight"
 			"image_armedcolor"			"White"
 			
diff --git a/resource/ui/econ/comboboxbackpackoverlaydialog.res b/resource/ui/econ/comboboxbackpackoverlaydialog.res
index 888578a..a51c1c3 100644
--- a/resource/ui/econ/comboboxbackpackoverlaydialog.res
+++ b/resource/ui/econ/comboboxbackpackoverlaydialog.res
@@ -2,14 +2,14 @@
 {
 	"ComboBoxBackpackOverlayDialogBase"
 	{
-		"fieldName"			"ComboBoxBackpackOverlayDialogBase"
-		"visible"			"1"
-		"enabled"			"1"
-		"xpos"				"c-140"
-		"ypos"				"105"
-		"wide"				"280"
-		"tall"				"240"
-		"bgcolor_override"	"DarkGrey"
+		"fieldName"				"ComboBoxBackpackOverlayDialogBase"
+		"visible"				"1"
+		"enabled"				"1"
+		"xpos"					"c-140"
+		"ypos"					"105"
+		"wide"					"280"
+		"tall"					"240"
+		"bgcolor_override"		"DarkGrey"
 		"paintbackgroundtype"	"0"
 		"settitlebarvisible"	"1"
 		"border"				"CyanBorderThick"
diff --git a/resource/ui/econ/confirmapplydecodedialog.res b/resource/ui/econ/confirmapplydecodedialog.res
index 3ed963e..34ae644 100644
--- a/resource/ui/econ/confirmapplydecodedialog.res
+++ b/resource/ui/econ/confirmapplydecodedialog.res
@@ -2,14 +2,14 @@
 {
 	"ConfirmApplyDecodeDialog"
 	{
-		"fieldName"			"ConfirmApplyDecodeDialog"
-		"visible"			"1"
-		"enabled"			"1"
-		"xpos"				"c-200"
-		"ypos"				"c-200"
-		"wide"				"400"
-		"tall"				"240"
-		"bgcolor_override"	"DarkGrey"
+		"fieldName"				"ConfirmApplyDecodeDialog"
+		"visible"				"1"
+		"enabled"				"1"
+		"xpos"					"c-200"
+		"ypos"					"c-200"
+		"wide"					"400"
+		"tall"					"240"
+		"bgcolor_override"		"DarkGrey"
 		"paintbackgroundtype"	"0"
 		"settitlebarvisible"	"0"
 		"border"				"CyanBorderThick"
diff --git a/resource/ui/econ/confirmapplygiftwrapdialog.res b/resource/ui/econ/confirmapplygiftwrapdialog.res
index 10195b6..b242f44 100644
--- a/resource/ui/econ/confirmapplygiftwrapdialog.res
+++ b/resource/ui/econ/confirmapplygiftwrapdialog.res
@@ -2,17 +2,17 @@
 {
 	"ConfirmApplyGiftWrapDialog"
 	{
-		"fieldName"			"ConfirmApplyGiftWrapDialog"
-		"visible"			"1"
-		"enabled"			"1"
-		"xpos"				"c-200"
-		"ypos"				"c-200"
-		"wide"				"400"
-		"tall"				"240"
-		"bgcolor_override"	"DarkGrey"
-		"paintbackgroundtype" "0"
-		"settitlebarvisible" "0"
-		"border"			"CyanBorderThick"
+		"fieldName"				"ConfirmApplyGiftWrapDialog"
+		"visible"				"1"
+		"enabled"				"1"
+		"xpos"					"c-200"
+		"ypos"					"c-200"
+		"wide"					"400"
+		"tall"					"240"
+		"bgcolor_override"		"DarkGrey"
+		"paintbackgroundtype"	"0"
+		"settitlebarvisible"	"0"
+		"border"				"CyanBorderThick"
 	}
 	
 	"mouseoveritempanel"
diff --git a/resource/ui/econ/confirmapplystrangifierdialog.res b/resource/ui/econ/confirmapplystrangifierdialog.res
index 117fe1a..bc2f37f 100644
--- a/resource/ui/econ/confirmapplystrangifierdialog.res
+++ b/resource/ui/econ/confirmapplystrangifierdialog.res
@@ -186,8 +186,8 @@
 		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
-		"centerwrap"	"1"
 		"fgcolor_override" "Yellow"
+		"centerwrap"	"1"
 	}
 
 	"CancelButton"
diff --git a/resource/ui/econ/confirmapplyteamcolorpaintcandialog.res b/resource/ui/econ/confirmapplyteamcolorpaintcandialog.res
index 392cc81..5b7f1b5 100644
--- a/resource/ui/econ/confirmapplyteamcolorpaintcandialog.res
+++ b/resource/ui/econ/confirmapplyteamcolorpaintcandialog.res
@@ -130,7 +130,7 @@
 		"text_center"	"1"
 		"name_only"		"1"
 		"paint_icon_hide" "1"
-
+		
 		"itemmodelpanel"
 		{
 			"use_item_rendertarget" "0"
diff --git a/resource/ui/econ/confirmcustomizetexturedialog.res b/resource/ui/econ/confirmcustomizetexturedialog.res
index 5d238ce..9de47b1 100644
--- a/resource/ui/econ/confirmcustomizetexturedialog.res
+++ b/resource/ui/econ/confirmcustomizetexturedialog.res
@@ -370,10 +370,10 @@
 				"tall"			"15"
 				"editable"		"0"
 				"font"			"HudFontSmall"
-				"bgcolor_override"					"0 0 0 255"
-				"disabledBgColor_override" 			"0 0 0 255"
-				"selectionColor_override" 			"0 0 0 255"
-				"selectionTextColor_override" 		"235 226 202 255"
+				"bgcolor_override"					"ColorBlack"
+				"disabledBgColor_override" 			"ColorBlack"
+				"selectionColor_override" 			"ColorBlack"
+				"selectionTextColor_override" 		"TanLight"
 				"defaultSelectionBG2Color_override" "Transparent"
 			}
 		}
@@ -490,10 +490,10 @@
 				"editable"		"0"
 				"font"			"HudFontSmall"
 				"visible"		"0"
-				"bgcolor_override"					"0 0 0 255"
-				"disabledBgColor_override"			"0 0 0 255"
-				"selectionColor_override"			"0 0 0 255"
-				"selectionTextColor_override"		"235 226 202 255"
+				"bgcolor_override"					"ColorBlack"
+				"disabledBgColor_override"			"ColorBlack"
+				"selectionColor_override"			"ColorBlack"
+				"selectionTextColor_override"		"TanLight"
 				"defaultSelectionBG2Color_override"	"Transparent"
 			}
 			"PainterlyOptions"
@@ -627,10 +627,10 @@
 					"tall"			"15"
 					"editable"		"0"
 					"font"			"HudFontSmall"
-					"bgcolor_override"					"0 0 0 255"
-					"disabledBgColor_override" 			"0 0 0 255"
-					"selectionColor_override" 			"0 0 0 255"
-					"selectionTextColor_override"		"235 226 202 255"
+					"bgcolor_override"					"ColorBlack"
+					"disabledBgColor_override" 			"ColorBlack"
+					"selectionColor_override" 			"ColorBlack"
+					"selectionTextColor_override"		"TanLight"
 					"defaultSelectionBG2Color_override" "Transparent"
 				}
 			}
diff --git a/resource/ui/econ/confirmdialogabandonpenalty.res b/resource/ui/econ/confirmdialogabandonpenalty.res
index 3199cf7..1e1f987 100644
--- a/resource/ui/econ/confirmdialogabandonpenalty.res
+++ b/resource/ui/econ/confirmdialogabandonpenalty.res
@@ -72,6 +72,7 @@
 		"wrap"					"1"
 		"fgcolor_override"		"ColorCyan"
 	}
+	
 	"CancelButton"
 	{
 		"ControlName"			"CExButton"
diff --git a/resource/ui/econ/confirmdialogoptout.res b/resource/ui/econ/confirmdialogoptout.res
index 2272def..e13adf3 100644
--- a/resource/ui/econ/confirmdialogoptout.res
+++ b/resource/ui/econ/confirmdialogoptout.res
@@ -140,6 +140,6 @@
 		"brighttext"		"0"
 		"wrap"				"0"
 		"font"				"HudFontSmallest"
-		"selected_fgcolor_override" "255 0 0 255"
+		"selected_fgcolor_override" "ColorRed"
 	}
 }
\ No newline at end of file
diff --git a/resource/ui/econ/inspectionpanel.res b/resource/ui/econ/inspectionpanel.res
index d7fa6f7..18cd85a 100644
--- a/resource/ui/econ/inspectionpanel.res
+++ b/resource/ui/econ/inspectionpanel.res
@@ -157,7 +157,7 @@
 			"sound_armed"			"UI/buttonrollover.wav"
 			"paintbackground"		"0"
 			"paintbackgroundtype"	"0"
-			"defaultBgColor_Override"	"0 0 0 255"
+			"defaultBgColor_Override"	"ColorBlack"
 			"paintborder"			"0"
 			"image_drawcolor"		"255 255 255 77"
 			"image_armedcolor"		"255 255 255 128"
@@ -221,7 +221,7 @@
 		"border"		"CyanBorder"
 		"mouseinputenabled"	"1"
 		"proportionaltoparent"	"1"
-		"visible"			"0"
+		"visible"		"0"
 		"bgcolor_override"	"DarkerGrey"
 		
 		"fixed_item"
@@ -377,13 +377,13 @@
 			"unicode"			"0"
 			"default"			"0"
 			"actionsignallevel"	"2"
+			"proportionaltoparent"	"1"
 			
 			"fixed_item"
 			{
 				"visible"	"0"
 			}
 			
-			"proportionaltoparent"	"1"
 			"fgcolor_override"	"White"
 			"bgcolor_override"	"Transparent"
 			"disabledFgColor_override" "TanDark"
diff --git a/resource/ui/econ/inspectionpanel_cosmetic.res b/resource/ui/econ/inspectionpanel_cosmetic.res
index 1c56f05..ae227d7 100644
--- a/resource/ui/econ/inspectionpanel_cosmetic.res
+++ b/resource/ui/econ/inspectionpanel_cosmetic.res
@@ -39,7 +39,7 @@
 			"enabled"		"1"
 			"paintbackground"		"1"
 			"PaintBackgroundType"	"0"
-			"bgcolor_override" 		"0 0 0 255"
+			"bgcolor_override" 		"ColorBlack"
 			"proportionaltoparent"	"1"
 			
 			"fullscreen_fade_to_black_duration"	"0.32"
@@ -298,7 +298,7 @@
 					"visible"		"1"
 					"enabled"		"1"
 					"wrap"			"1"
-					"fgcolor"		"132 132 132 255"
+					"fgcolor"		"DullWhite"
 				}
 				
 				"RestrictionsLabel"
@@ -349,7 +349,7 @@
 					"visible"		"1"
 					"enabled"		"1"
 					"wrap"			"1"
-					"fgcolor"		"132 132 132 255"
+					"fgcolor"		"DullWhite"
 				}
 				
 				"UsedByTextLabel"
@@ -382,7 +382,7 @@
 					"visible"		"1"
 					"enabled"		"1"
 					"wrap"			"1"
-					"fgcolor"		"132 132 132 255"
+					"fgcolor"		"DullWhite"
 				}
 				
 				"SlotTextLabel"
@@ -490,9 +490,9 @@
 		"render_texture" "0"
 		"fov"			"40"
 		"allow_rot"		"1"
-		"paintbackground" 		"1"		
+		"paintbackground"		"1"
 		"paintbackgroundenabled" "1"
-		"bgcolor_override" 		"255 255 255 0"
+		"bgcolor_override"		"255 255 255 0"
 		
 		"model"
 		{
@@ -552,7 +552,7 @@
 		"tall"			"20"
 		"visible"		"1"
 		"panel_bgcolor" "TextColor"
-		"panel_bgcolor_mouseover" "255 255 255 255"
+		"panel_bgcolor_mouseover" "ColorWhite"
 		"image_indent"			"0"
 		"PaintBackgroundType"	"2"
 		
@@ -568,14 +568,14 @@
 			"visible"		"1"
 			"enabled"		"0"
 			"PaintBackgroundType"	"2"
-			"bgcolor_override" "51 47 46 255"
+			"bgcolor_override" "Grey"
 		}
 		
 		"itempanel"
 		{
-			"fieldName"		"itempanel"		
+			"fieldName"		"itempanel"
 			"PaintBackgroundType"	"2"
-			"paintborder"	"0"	
+			"paintborder"	"0"
 			"model_xpos"	"1"
 			"model_ypos"	"2"
 			"model_wide"	"28"
@@ -836,7 +836,7 @@
 		"sound_depressed"	"UI/buttonclick.wav"
 		"sound_released"	"UI/buttonclickrelease.wav"
 		"Command"			"options"
-		"paintbackground"	"0"	
+		"paintbackground"	"0"
 		"image_drawcolor"	"118 107 94 200"
 		"image_armedcolor"	"246 247 213 255"
 		
@@ -871,8 +871,8 @@
 		"enabled"			"1"
 		"auto_scale"		"1"
 		"auto_layout"		"1"
-		"selected_button_default"	  "0"
-		"auto_layout_vertical_buffer" "-4"
+		"selected_button_default"		"0"
+		"auto_layout_vertical_buffer"	"-4"
 		"display_vertically"	"1"
 		"align"					"west"
 		
@@ -899,13 +899,13 @@
 			
 			"paintbackground"			"0"
 			"paintbackgroundtype"		"0"
-			"defaultBgColor_Override"	"0 0 0 255"
+			"defaultBgColor_Override"	"ColorBlack"
 			
 			"paintborder"				"0"
 			
 			"image_drawcolor"		"255 255 255 77"
 			"image_armedcolor"		"255 255 255 128"
-			"image_selectedcolor"	"255 255 255 255"
+			"image_selectedcolor"	"ColorWhite"
 			
 			"stayselectedonclick"	"1"
 			"keyboardinputenabled"	"0"
diff --git a/resource/ui/econ/itemmodelpanel.res b/resource/ui/econ/itemmodelpanel.res
index 862fc7e..dd9fd49 100644
--- a/resource/ui/econ/itemmodelpanel.res
+++ b/resource/ui/econ/itemmodelpanel.res
@@ -90,7 +90,7 @@
 			"enabled"		"1"
 			"labelText"		"%itemname%"
 			"textAlignment"	"south"
-			"fgcolor"		"235 226 202 255"
+			"fgcolor"		"TanLight"
 			"centerwrap"	"1"
 		}
 		
@@ -131,7 +131,7 @@
 			"labelText"		"#ItemPanelEquipped"
 			"textAlignment"	"center"
 			"fgcolor"		"LightRed"
-			"bgcolor_override"		"0 0 0 255"
+			"bgcolor_override"		"ColorBlack"
 			"PaintBackgroundType"	"2"
 		}
 		
@@ -165,7 +165,7 @@
 			"labelText"		""
 			"textAlignment"	"center"
 			"fgcolor"		"LightRed"
-			"bgcolor_override"		"0 0 0 255"
+			"bgcolor_override"		"ColorBlack"
 			"PaintBackgroundType"	"2"
 		}
 		
@@ -304,8 +304,8 @@
 			{
 				"use_item_rendertarget" "0"
 				"allow_rot"				"0"
+				"inventory_image_type"	"1"
 			}
-			
 			"use_item_sounds"	"1"
 		}
 	}
diff --git a/resource/ui/econ/itempickuppanel.res b/resource/ui/econ/itempickuppanel.res
index 26c3f10..f27d504 100644
--- a/resource/ui/econ/itempickuppanel.res
+++ b/resource/ui/econ/itempickuppanel.res
@@ -61,7 +61,7 @@
 		"wide"			"36"
 		"tall"			"36"
 		"visible"		"1"
-		"bgcolor_override" "0 0 0 255"
+		"bgcolor_override" "ColorBlack"
 	}
 	
 	"classimage"
@@ -312,8 +312,8 @@
 		"defaultBgColor_override" "TextColor"
 		"armedBgColor_override" "145 73 59 255"
 		"depressedBgColor_override" "TextColor"
-		"image_drawcolor"	"235 226 202 255"
-		"image_armedcolor"	"235 226 202 255"		
+		"image_drawcolor"	"TanLight"
+		"image_armedcolor"	"TanLight"		
 		
 		"SubImage"
 		{
@@ -361,7 +361,7 @@
 			"pinCorner"		"0"
 			"visible"		"1"
 			"enabled"		"1"
-			"fgcolor_override"	"235 226 202 255"
+			"fgcolor_override"	"TanLight"
 			"wrap"			"1"
 			"centerwrap"	"1"
 		}
@@ -406,8 +406,8 @@
 		"NumericInputOnly"	"0"
 		"unicode"			"0"
 		"wrap"				"0"
-		"fgcolor_override"	"235 226 202 255"
-		"bgcolor_override"	"0 0 0 255"
+		"fgcolor_override"	"TanLight"
+		"bgcolor_override"	"ColorBlack"
 		"labelText"			"Enter Score Here"
 		"textAlignment"		"center"
 	}
diff --git a/resource/ui/econ/store/v2/storehome_base.res b/resource/ui/econ/store/v2/storehome_base.res
index 925f857..05e3a28 100644
--- a/resource/ui/econ/store/v2/storehome_base.res
+++ b/resource/ui/econ/store/v2/storehome_base.res
@@ -18,6 +18,7 @@
 		"bgcolor_override"				"DarkGrey"
 		"infocus_bgcolor_override"		"DarkGrey"
 		"outoffocus_bgcolor_override"	"DarkGrey"
+		
 		"item_controls_xoffset"	"2"
 		"item_controls_yoffset"	"2"
 		"max_cart_model_panels"	"8"
@@ -54,7 +55,7 @@
 			"bgcolor_override"		"25 25 25 255"
 			"noitem_textcolor"		"TextColor"
 			"PaintBackgroundType"	"0"
-			"paintborder"			"0"
+			"paintborder"	"0"
 			"model_xpos"	"24"
 			"model_ypos"	"6"
 			"model_wide"	"71"
@@ -76,7 +77,6 @@
 				"allow_rot"				"0"
 				"inventory_image_type"	"1"
 			}
-			
 			"use_item_sounds" "1"		
 		}
 		
@@ -106,10 +106,10 @@
 			"wide"			"32"
 			"tall"			"25"
 			"visible"		"0"
-			"bgcolor_override"		"0 0 0 255"
+			"bgcolor_override"		"ColorBlack"
 			"noitem_textcolor"		"TextColor"
 			"PaintBackgroundType"	"0"
-			"paintborder"			"0"
+			"paintborder"	"0"
 			
 			"model_xpos"	"2"
 			"model_ypos"	"2"
diff --git a/resource/ui/econ/store/v2/storehome_premium.res b/resource/ui/econ/store/v2/storehome_premium.res
new file mode 100644
index 0000000..2989ef1
--- /dev/null
+++ b/resource/ui/econ/store/v2/storehome_premium.res
@@ -0,0 +1,31 @@
+#base "StoreHome_Base.res"
+
+"Resource/UI/StoreHome_Premium.res"
+{
+	"PremiumCallout"
+	{
+		"ControlName"	"EditablePanel"
+		"fieldName"		"PremiumCallout"
+		"xpos"			"c-323"
+		"ypos"			"c-45"
+		"zpos"			"-1"
+		"wide"			"300"
+		"tall"			"300"
+		"visible"		"1"
+		"enabled"		"1"
+	
+		"MannCoImage"
+		{
+			"ControlName"	"ImagePanel"
+			"fieldName"		"MannCoImage"
+			"wide"			"420"
+			"tall"			"220"
+			"visible"		"0"
+			"enabled"		"1"
+			"scaleImage"	"1"
+			"xpos"			"15"
+			"ypos"			"0"
+			"zpos"			"0"
+		}
+	}
+}
\ 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 da0542d..dae9486 100644
--- a/resource/ui/econ/store/v2/storepage.res
+++ b/resource/ui/econ/store/v2/storepage.res
@@ -48,7 +48,7 @@
 			"wide"			"111"
 			"tall"			"62"
 			"visible"		"0"
-			"bgcolor_override"		"0 0 0 255"
+			"bgcolor_override"		"ColorBlack"
 			"noitem_textcolor"		"TextColor"
 			"PaintBackgroundType"	"2"
 			"paintborder"	"0"
@@ -74,7 +74,6 @@
 				"allow_rot"				"0"
 				"inventory_image_type" "1"
 			}
-			
 			"use_item_sounds" "1"
 		}
 		
@@ -103,7 +102,7 @@
 			"wide"			"32"
 			"tall"			"25"
 			"visible"		"0"
-			"bgcolor_override"		"0 0 0 255"
+			"bgcolor_override"		"ColorBlack"
 			"noitem_textcolor"		"TextColor"
 			"PaintBackgroundType"	"2"
 			"paintborder"	"0"
diff --git a/resource/ui/econ/store/v2/storepanel.res b/resource/ui/econ/store/v2/storepanel.res
index 994e991..d0aa382 100644
--- a/resource/ui/econ/store/v2/storepanel.res
+++ b/resource/ui/econ/store/v2/storepanel.res
@@ -138,7 +138,7 @@
 			"font"				"Cerbetica20"
 			"ypos"				"50"
 			"selectedcolor"		"TanLight"
-			"unselectedcolor"	"TanDark"	
+			"unselectedcolor"	"TanDark"
 			"paintbackground"	"1"
 			"defaultBgColor_override"		"25 25 25 255"
 			"unselectedBgColor_override"	"10 10 10 255"
diff --git a/resource/ui/econ/store/v2/storepreviewitempanel.res b/resource/ui/econ/store/v2/storepreviewitempanel.res
index e7f6bd1..fed93d6 100644
--- a/resource/ui/econ/store/v2/storepreviewitempanel.res
+++ b/resource/ui/econ/store/v2/storepreviewitempanel.res
@@ -42,7 +42,7 @@
 		"Slider"
 		{
 			"PaintBackgroundType"	"0"
-			"fgcolor_override"		"132 132 132 255"
+			"fgcolor_override"		"DullWhite"
 		}
 		
 		"UpButton"
@@ -126,7 +126,7 @@
 			"wide"			"230"
 			"tall"			"15"
 			"autoResize"	"0"
-			"skip_autoresize" "1"
+			"skip_autoresize"	"1"
 			"pinCorner"		"0"
 			"visible"		"1"
 			"enabled"		"1"
@@ -229,7 +229,7 @@
 					"visible"		"1"
 					"enabled"		"1"
 					"wrap"			"1"
-					"fgcolor"		"132 132 132 255"
+					"fgcolor"		"DullWhite"
 				}
 				
 				"UsedByTextLabel"
@@ -262,7 +262,7 @@
 					"visible"		"1"
 					"enabled"		"1"
 					"wrap"			"1"
-					"fgcolor"		"132 132 132 255"
+					"fgcolor"		"DullWhite"
 				}
 				
 				"SlotTextLabel"
@@ -366,7 +366,7 @@
 					"visible"		"1"
 					"enabled"		"1"
 					"wrap"			"1"
-					"fgcolor"		"132 132 132 255"
+					"fgcolor"		"DullWhite"
 				}
 				
 				"TradableTextLabel"
@@ -399,7 +399,7 @@
 					"visible"		"1"
 					"enabled"		"1"
 					"wrap"			"1"
-					"fgcolor"		"132 132 132 255"
+					"fgcolor"		"DullWhite"
 				}
 				
 				"GiftableTextLabel"
@@ -432,7 +432,7 @@
 					"visible"		"1"
 					"enabled"		"1"
 					"wrap"			"1"
-					"fgcolor"		"132 132 132 255"
+					"fgcolor"		"DullWhite"
 				}
 				
 				"NameableTextLabel"
@@ -465,7 +465,7 @@
 					"visible"		"1"
 					"enabled"		"1"
 					"wrap"			"1"
-					"fgcolor"		"132 132 132 255"
+					"fgcolor"		"DullWhite"
 				}
 				
 				"CraftableTextLabel"
@@ -557,7 +557,7 @@
 	"ItemIcon1"
 	{
 		"ControlName"	"CStorePreviewItemIcon"
-		"fieldName"		"ItemIcon1"	
+		"fieldName"		"ItemIcon1"
 		"xpos"			"c-215"
 		"ypos"			"c56"
 		"zpos"			"13"
@@ -588,7 +588,7 @@
 		{
 			"fieldName"		"itempanel"
 			"PaintBackgroundType"	"2"
-			"paintborder"	"0"	
+			"paintborder"	"0"
 			"model_xpos"	"1"
 			"model_ypos"	"2"
 			"model_wide"	"28"
@@ -638,7 +638,7 @@
 		
 		"itempanel"
 		{
-			"fieldName"		"itempanel"	
+			"fieldName"		"itempanel"
 			"PaintBackgroundType"	"2"
 			"paintborder"	"0"
 			"model_xpos"	"1"
@@ -1135,8 +1135,8 @@
 		"default"		"0"
 		"sound_depressed"	"UI/buttonclick.wav"
 		"sound_released"	"UI/buttonclickrelease.wav"
-		"Command"		"zoom_toggle"
-		"paintbackground"	"0"	
+		"Command"			"zoom_toggle"
+		"paintbackground"	"0"
 		"image_drawcolor"		"118 107 94 200"
 		"image_armedcolor"		"128 117 104 255"
 		
@@ -1169,13 +1169,12 @@
 		"pinCorner"			"0"
 		"visible"			"1"
 		"enabled"			"1"
-		
 		"auto_scale"		"1"
 		"auto_layout"		"1"
 		"selected_button_default"	"0"
 		"auto_layout_vertical_buffer"	"-4"
 		"display_vertically"	"1"
-		"align"				"west"
+		"align"					"west"
 		
 		"ButtonSettings"
 		{
@@ -1201,7 +1200,7 @@
 			
 			"paintbackground"	"0"
 			"paintbackgroundtype"	"0"
-			"defaultBgColor_Override"	"0 0 0 255"
+			"defaultBgColor_Override"	"ColorBlack"
 			
 			"paintborder"		"0"
 			
@@ -1389,7 +1388,7 @@
 		"armedFgColor_override" "Blank"
 		"depressedFgColor_override" "Blank"
 		"image_drawcolor"	"White"
-		"image_armedcolor"	"255 0 0 255"
+		"image_armedcolor"	"ColorRed"
 		
 		"SubImage"
 		{
diff --git a/resource/ui/econ/store/v2/storepreviewitempanel_maps.res b/resource/ui/econ/store/v2/storepreviewitempanel_maps.res
index 2b3750c..31add8b 100644
--- a/resource/ui/econ/store/v2/storepreviewitempanel_maps.res
+++ b/resource/ui/econ/store/v2/storepreviewitempanel_maps.res
@@ -508,7 +508,7 @@
 		"paintbackground"	"0"
 		
 		"image_drawcolor"	"White"
-		"image_armedcolor"	"255 0 0 255"
+		"image_armedcolor"	"ColorRed"
 		
 		"SubImage"
 		{
diff --git a/resource/ui/econ/store/v2/storeviewcartpanel.res b/resource/ui/econ/store/v2/storeviewcartpanel.res
index 9a73766..b71b307 100644
--- a/resource/ui/econ/store/v2/storeviewcartpanel.res
+++ b/resource/ui/econ/store/v2/storeviewcartpanel.res
@@ -46,7 +46,7 @@
 				"wide"			"400"
 				"tall"			"58"
 				"visible"		"1"
-				"bgcolor_override"		"0 0 0 255"
+				"bgcolor_override"		"ColorBlack"
 				"noitem_textcolor"		"TextColor"
 				"PaintBackgroundType"	"2"
 				"paintborder"	"0"