Updated for quickplay update

15 files changed, 590 insertions, 464 deletions

diff --git a/resource/ui/econ/BackpackPanel.res b/resource/ui/econ/BackpackPanel.res
index 5d9eb82..b009ae4 100644
--- a/resource/ui/econ/BackpackPanel.res
+++ b/resource/ui/econ/BackpackPanel.res
@@ -57,6 +57,9 @@
 			"inset_eq_x"	"2"
 			"inset_eq_y"	"2"
 			
+			"deferred_description"	"1"
+			"deffered_icon"			"1"
+			
 			"itemmodelpanel"
 			{
 				"use_item_rendertarget" "0"
@@ -254,9 +257,10 @@
 		"wide"			"300"
 		"tall"			"300"
 		"visible"		"0"
-		"paintborder"			"1"
-		"paintbackground"		"1"
-		"border"				"NoBorder"
+		"bgcolor_override"		"0 0 0 0"
+		"noitem_textcolor"		"117 107 94 255"
+		"PaintBackgroundType"	"2"
+		"paintborder"	"1"
 		
 		"text_ypos"			"20"
 		"text_center"		"1"
@@ -270,35 +274,35 @@
     		"fieldName"			"BackColor"
     		"xpos"				"0"
     		"ypos"				"0"
-    		"zpos"				"1"
+    		"zpos"				"-1"
     		"wide"				"f0"
     		"tall"	 			"f0"
     		"visible"			"1"
     		"enabled"			"1"
-			"pinCorner"		"0"
-			"autoResize"	"0"
-			"PaintBackgroundType"	"2"
+			"pinCorner"			"0"
+			"autoResize"		"0"
+			"PaintBackgroundType""1"
 			"border"			"NoBorder"
 			"bgcolor_override"	"35 35 35 255"
+			
+			"attriblabel"
+			{
+				"font"			"ItemFontAttribLarge"
+				"xpos"			"0"
+				"ypos"			"30"
+				"zpos"			"101"
+				"wide"			"140"
+				"tall"			"60"
+				"autoResize"	"0"
+				"pinCorner"		"0"
+				"visible"		"1"
+				"enabled"		"1"
+				"labelText"		"%attriblist%"
+				"textAlignment"	"center"
+				"fgcolor"		"117 107 94 255"
+				"centerwrap"	"1"
+			}
     	}
-		
-		"attriblabel"
-		{
-			"font"			"ItemFontAttribLarge"
-			"xpos"			"0"
-			"ypos"			"30"
-			"zpos"			"2"
-			"wide"			"140"
-			"tall"			"60"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"labelText"		"%attriblist%"
-			"textAlignment"	"center"
-			"fgcolor"		"117 107 94 255"
-			"centerwrap"	"1"
-		}
 	}
 	
 	"mousedragitempanel"
diff --git a/resource/ui/econ/ConfirmApplyCardUpgradeApplicationDialog.res b/resource/ui/econ/ConfirmApplyCardUpgradeApplicationDialog.res
index 11960df..4ff5097 100644
--- a/resource/ui/econ/ConfirmApplyCardUpgradeApplicationDialog.res
+++ b/resource/ui/econ/ConfirmApplyCardUpgradeApplicationDialog.res
@@ -34,23 +34,41 @@
 		"model_hide"		"1"
 		"resize_to_text"	"1"
 		"padding_height"	"15"
-		"attriblabel"
-		{
-			"font"			"ItemFontAttribLarge"
-			"xpos"			"0"
-			"ypos"			"30"
-			"zpos"			"2"
-			"wide"			"140"
-			"tall"			"60"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"labelText"		"%attriblist%"
-			"textAlignment"	"center"
-			"fgcolor"		"117 107 94 255"
-			"centerwrap"	"1"
-		}
+			"BackColor"
+    	{
+    		"ControlName"		"EditablePanel"
+    		"fieldName"			"BackColor"
+    		"xpos"				"0"
+    		"ypos"				"0"
+    		"zpos"				"-1"
+    		"wide"				"f0"
+    		"tall"	 			"f0"
+    		"visible"			"1"
+    		"enabled"			"1"
+			"pinCorner"			"0"
+			"autoResize"		"0"
+			"PaintBackgroundType""1"
+			"border"			"NoBorder"
+			"bgcolor_override"	"35 35 35 255"
+			
+			"attriblabel"
+			{
+				"font"			"ItemFontAttribLarge"
+				"xpos"			"0"
+				"ypos"			"30"
+				"zpos"			"101"
+				"wide"			"140"
+				"tall"			"60"
+				"autoResize"	"0"
+				"pinCorner"		"0"
+				"visible"		"1"
+				"enabled"		"1"
+				"labelText"		"%attriblist%"
+				"textAlignment"	"center"
+				"fgcolor"		"117 107 94 255"
+				"centerwrap"	"1"
+			}
+    	}
 	}
 	"TitleLabel"
 	{
diff --git a/resource/ui/econ/ConfirmApplyDecodeDialog.res b/resource/ui/econ/ConfirmApplyDecodeDialog.res
index 41e7744..8bf2c5b 100644
--- a/resource/ui/econ/ConfirmApplyDecodeDialog.res
+++ b/resource/ui/econ/ConfirmApplyDecodeDialog.res
@@ -34,40 +34,41 @@
 		"model_hide"		"1"
 		"resize_to_text"	"1"
 		"padding_height"	"15"
-		"BackColor"
+			"BackColor"
     	{
     		"ControlName"		"EditablePanel"
     		"fieldName"			"BackColor"
     		"xpos"				"0"
     		"ypos"				"0"
-    		"zpos"				"1"
+    		"zpos"				"-1"
     		"wide"				"f0"
     		"tall"	 			"f0"
     		"visible"			"1"
     		"enabled"			"1"
-			"pinCorner"		"0"
-			"autoResize"	"0"
-			"PaintBackgroundType"	"2"
-			"border"		"NoBorder"
+			"pinCorner"			"0"
+			"autoResize"		"0"
+			"PaintBackgroundType""1"
+			"border"			"NoBorder"
 			"bgcolor_override"	"35 35 35 255"
+			
+			"attriblabel"
+			{
+				"font"			"ItemFontAttribLarge"
+				"xpos"			"0"
+				"ypos"			"30"
+				"zpos"			"101"
+				"wide"			"140"
+				"tall"			"60"
+				"autoResize"	"0"
+				"pinCorner"		"0"
+				"visible"		"1"
+				"enabled"		"1"
+				"labelText"		"%attriblist%"
+				"textAlignment"	"center"
+				"fgcolor"		"117 107 94 255"
+				"centerwrap"	"1"
+			}
     	}
-		"attriblabel"
-		{
-			"font"			"ItemFontAttribLarge"
-			"xpos"			"0"
-			"ypos"			"30"
-			"zpos"			"2"
-			"wide"			"140"
-			"tall"			"60"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"labelText"		"%attriblist%"
-			"textAlignment"	"center"
-			"fgcolor"		"117 107 94 255"
-			"centerwrap"	"1"
-		}
 	}
 	"TitleLabel"
 	{
diff --git a/resource/ui/econ/ConfirmApplyGiftWrapDialog.res b/resource/ui/econ/ConfirmApplyGiftWrapDialog.res
index acea604..201dd4a 100644
--- a/resource/ui/econ/ConfirmApplyGiftWrapDialog.res
+++ b/resource/ui/econ/ConfirmApplyGiftWrapDialog.res
@@ -35,40 +35,41 @@
 		"model_hide"		"1"
 		"resize_to_text"	"1"
 		"padding_height"	"15"
-		"BackColor"
+			"BackColor"
     	{
     		"ControlName"		"EditablePanel"
     		"fieldName"			"BackColor"
     		"xpos"				"0"
     		"ypos"				"0"
-    		"zpos"				"1"
+    		"zpos"				"-1"
     		"wide"				"f0"
     		"tall"	 			"f0"
     		"visible"			"1"
     		"enabled"			"1"
-			"pinCorner"		"0"
-			"autoResize"	"0"
-			"PaintBackgroundType"	"2"
-			"border"		"NoBorder"
+			"pinCorner"			"0"
+			"autoResize"		"0"
+			"PaintBackgroundType""1"
+			"border"			"NoBorder"
 			"bgcolor_override"	"35 35 35 255"
+			
+			"attriblabel"
+			{
+				"font"			"ItemFontAttribLarge"
+				"xpos"			"0"
+				"ypos"			"30"
+				"zpos"			"101"
+				"wide"			"140"
+				"tall"			"60"
+				"autoResize"	"0"
+				"pinCorner"		"0"
+				"visible"		"1"
+				"enabled"		"1"
+				"labelText"		"%attriblist%"
+				"textAlignment"	"center"
+				"fgcolor"		"117 107 94 255"
+				"centerwrap"	"1"
+			}
     	}
-		"attriblabel"
-		{
-			"font"			"ItemFontAttribLarge"
-			"xpos"			"0"
-			"ypos"			"30"
-			"zpos"			"2"
-			"wide"			"140"
-			"tall"			"60"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"labelText"		"%attriblist%"
-			"textAlignment"	"center"
-			"fgcolor"		"117 107 94 255"
-			"centerwrap"	"1"
-		}
 	}
 	"TitleLabel"
 	{
diff --git a/resource/ui/econ/ConfirmApplyPaintCanDialog.res b/resource/ui/econ/ConfirmApplyPaintCanDialog.res
index 666527a..91b8cd0 100644
--- a/resource/ui/econ/ConfirmApplyPaintCanDialog.res
+++ b/resource/ui/econ/ConfirmApplyPaintCanDialog.res
@@ -34,40 +34,41 @@
 		"model_hide"		"1"
 		"resize_to_text"	"1"
 		"padding_height"	"15"
-		"BackColor"
+			"BackColor"
     	{
     		"ControlName"		"EditablePanel"
     		"fieldName"			"BackColor"
     		"xpos"				"0"
     		"ypos"				"0"
-    		"zpos"				"1"
+    		"zpos"				"-1"
     		"wide"				"f0"
     		"tall"	 			"f0"
     		"visible"			"1"
     		"enabled"			"1"
-			"pinCorner"		"0"
-			"autoResize"	"0"
-			"PaintBackgroundType"	"2"
-			"border"		"NoBorder"
+			"pinCorner"			"0"
+			"autoResize"		"0"
+			"PaintBackgroundType""1"
+			"border"			"NoBorder"
 			"bgcolor_override"	"35 35 35 255"
+			
+			"attriblabel"
+			{
+				"font"			"ItemFontAttribLarge"
+				"xpos"			"0"
+				"ypos"			"30"
+				"zpos"			"101"
+				"wide"			"140"
+				"tall"			"60"
+				"autoResize"	"0"
+				"pinCorner"		"0"
+				"visible"		"1"
+				"enabled"		"1"
+				"labelText"		"%attriblist%"
+				"textAlignment"	"center"
+				"fgcolor"		"117 107 94 255"
+				"centerwrap"	"1"
+			}
     	}
-		"attriblabel"
-		{
-			"font"			"ItemFontAttribLarge"
-			"xpos"			"0"
-			"ypos"			"30"
-			"zpos"			"2"
-			"wide"			"140"
-			"tall"			"60"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"labelText"		"%attriblist%"
-			"textAlignment"	"center"
-			"fgcolor"		"117 107 94 255"
-			"centerwrap"	"1"
-		}
 	}
 	"TitleLabel"
 	{
diff --git a/resource/ui/econ/ConfirmApplyStrangePartApplicationDialog.res b/resource/ui/econ/ConfirmApplyStrangePartApplicationDialog.res
index 55194d7..2084784 100644
--- a/resource/ui/econ/ConfirmApplyStrangePartApplicationDialog.res
+++ b/resource/ui/econ/ConfirmApplyStrangePartApplicationDialog.res
@@ -35,40 +35,41 @@
 		"model_hide"		"1"
 		"resize_to_text"	"1"
 		"padding_height"	"15"
-		"BackColor"
+			"BackColor"
     	{
     		"ControlName"		"EditablePanel"
     		"fieldName"			"BackColor"
     		"xpos"				"0"
     		"ypos"				"0"
-    		"zpos"				"1"
+    		"zpos"				"-1"
     		"wide"				"f0"
     		"tall"	 			"f0"
     		"visible"			"1"
     		"enabled"			"1"
-			"pinCorner"		"0"
-			"autoResize"	"0"
-			"PaintBackgroundType"	"2"
-			"border"		"NoBorder"
+			"pinCorner"			"0"
+			"autoResize"		"0"
+			"PaintBackgroundType""1"
+			"border"			"NoBorder"
 			"bgcolor_override"	"35 35 35 255"
+			
+			"attriblabel"
+			{
+				"font"			"ItemFontAttribLarge"
+				"xpos"			"0"
+				"ypos"			"30"
+				"zpos"			"101"
+				"wide"			"140"
+				"tall"			"60"
+				"autoResize"	"0"
+				"pinCorner"		"0"
+				"visible"		"1"
+				"enabled"		"1"
+				"labelText"		"%attriblist%"
+				"textAlignment"	"center"
+				"fgcolor"		"117 107 94 255"
+				"centerwrap"	"1"
+			}
     	}
-		"attriblabel"
-		{
-			"font"			"ItemFontAttribLarge"
-			"xpos"			"0"
-			"ypos"			"30"
-			"zpos"			"2"
-			"wide"			"140"
-			"tall"			"60"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"labelText"		"%attriblist%"
-			"textAlignment"	"center"
-			"fgcolor"		"117 107 94 255"
-			"centerwrap"	"1"
-		}
 	}
 	"TitleLabel"
 	{
diff --git a/resource/ui/econ/ConfirmApplyTeamColorPaintCanDialog.res b/resource/ui/econ/ConfirmApplyTeamColorPaintCanDialog.res
index b58acc0..eef7a12 100644
--- a/resource/ui/econ/ConfirmApplyTeamColorPaintCanDialog.res
+++ b/resource/ui/econ/ConfirmApplyTeamColorPaintCanDialog.res
@@ -34,40 +34,41 @@
 		"model_hide"		"1"
 		"resize_to_text"	"1"
 		"padding_height"	"15"
-		"BackColor"
+			"BackColor"
     	{
     		"ControlName"		"EditablePanel"
     		"fieldName"			"BackColor"
     		"xpos"				"0"
     		"ypos"				"0"
-    		"zpos"				"1"
+    		"zpos"				"-1"
     		"wide"				"f0"
     		"tall"	 			"f0"
     		"visible"			"1"
     		"enabled"			"1"
-			"pinCorner"		"0"
-			"autoResize"	"0"
-			"PaintBackgroundType"	"2"
-			"border"		"NoBorder"
+			"pinCorner"			"0"
+			"autoResize"		"0"
+			"PaintBackgroundType""1"
+			"border"			"NoBorder"
 			"bgcolor_override"	"35 35 35 255"
+			
+			"attriblabel"
+			{
+				"font"			"ItemFontAttribLarge"
+				"xpos"			"0"
+				"ypos"			"30"
+				"zpos"			"101"
+				"wide"			"140"
+				"tall"			"60"
+				"autoResize"	"0"
+				"pinCorner"		"0"
+				"visible"		"1"
+				"enabled"		"1"
+				"labelText"		"%attriblist%"
+				"textAlignment"	"center"
+				"fgcolor"		"117 107 94 255"
+				"centerwrap"	"1"
+			}
     	}
-		"attriblabel"
-		{
-			"font"			"ItemFontAttribLarge"
-			"xpos"			"0"
-			"ypos"			"30"
-			"zpos"			"2"
-			"wide"			"140"
-			"tall"			"60"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"labelText"		"%attriblist%"
-			"textAlignment"	"center"
-			"fgcolor"		"117 107 94 255"
-			"centerwrap"	"1"
-		}
 	}
 	"TitleLabel"
 	{
diff --git a/resource/ui/econ/ConfirmCollectDialog.res b/resource/ui/econ/ConfirmCollectDialog.res
index 876537b..a727b5f 100644
--- a/resource/ui/econ/ConfirmCollectDialog.res
+++ b/resource/ui/econ/ConfirmCollectDialog.res
@@ -34,40 +34,41 @@
 		"model_hide"		"1"
 		"resize_to_text"	"1"
 		"padding_height"	"15"
-		"BackColor"
+			"BackColor"
     	{
     		"ControlName"		"EditablePanel"
     		"fieldName"			"BackColor"
     		"xpos"				"0"
     		"ypos"				"0"
-    		"zpos"				"1"
+    		"zpos"				"-1"
     		"wide"				"f0"
     		"tall"	 			"f0"
     		"visible"			"1"
     		"enabled"			"1"
-			"pinCorner"		"0"
-			"autoResize"	"0"
-			"PaintBackgroundType"	"2"
-			"border"		"NoBorder"
+			"pinCorner"			"0"
+			"autoResize"		"0"
+			"PaintBackgroundType""1"
+			"border"			"NoBorder"
 			"bgcolor_override"	"35 35 35 255"
+			
+			"attriblabel"
+			{
+				"font"			"ItemFontAttribLarge"
+				"xpos"			"0"
+				"ypos"			"30"
+				"zpos"			"101"
+				"wide"			"140"
+				"tall"			"60"
+				"autoResize"	"0"
+				"pinCorner"		"0"
+				"visible"		"1"
+				"enabled"		"1"
+				"labelText"		"%attriblist%"
+				"textAlignment"	"center"
+				"fgcolor"		"117 107 94 255"
+				"centerwrap"	"1"
+			}
     	}
-		"attriblabel"
-		{
-			"font"			"ItemFontAttribLarge"
-			"xpos"			"0"
-			"ypos"			"30"
-			"zpos"			"2"
-			"wide"			"140"
-			"tall"			"60"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"labelText"		"%attriblist%"
-			"textAlignment"	"center"
-			"fgcolor"		"117 107 94 255"
-			"centerwrap"	"1"
-		}
 	}
 	"TitleLabel"
 	{
diff --git a/resource/ui/econ/ConfirmCustomizeTextureDialog.res b/resource/ui/econ/ConfirmCustomizeTextureDialog.res
index c3b08ab..0ea9ffb 100644
--- a/resource/ui/econ/ConfirmCustomizeTextureDialog.res
+++ b/resource/ui/econ/ConfirmCustomizeTextureDialog.res
@@ -34,36 +34,41 @@
 		"model_hide"		"1"
 		"resize_to_text"	"1"
 		"padding_height"	"15"
-		"BackColor"
+			"BackColor"
     	{
     		"ControlName"		"EditablePanel"
     		"fieldName"			"BackColor"
     		"xpos"				"0"
     		"ypos"				"0"
-    		"zpos"				"1"
+    		"zpos"				"-1"
     		"wide"				"f0"
     		"tall"	 			"f0"
     		"visible"			"1"
     		"enabled"			"1"
-			"pinCorner"		"0"
-			"autoResize"	"0"
-			"PaintBackgroundType"	"2"
-			"border"		"NoBorder"
+			"pinCorner"			"0"
+			"autoResize"		"0"
+			"PaintBackgroundType""1"
+			"border"			"NoBorder"
 			"bgcolor_override"	"35 35 35 255"
+			
+			"attriblabel"
+			{
+				"font"			"ItemFontAttribLarge"
+				"xpos"			"0"
+				"ypos"			"30"
+				"zpos"			"101"
+				"wide"			"140"
+				"tall"			"60"
+				"autoResize"	"0"
+				"pinCorner"		"0"
+				"visible"		"1"
+				"enabled"		"1"
+				"labelText"		"%attriblist%"
+				"textAlignment"	"center"
+				"fgcolor"		"117 107 94 255"
+				"centerwrap"	"1"
+			}
     	}
-		"attriblabel"
-		{
-			"font"			"ItemFontAttribLarge"
-			"xpos"			"0"
-			"ypos"			"30"
-			"zpos"			"2"
-			"wide"			"140"
-			"tall"			"60"
-			"labelText"		"%attriblist%"
-			"textAlignment"	"center"
-			"fgcolor"		"117 107 94 255"
-			"centerwrap"	"1"
-		}
 	}
 	"ToolBG"
 	{
diff --git a/resource/ui/econ/ConfirmItemPreviewDialog.res b/resource/ui/econ/ConfirmItemPreviewDialog.res
index 43dfb80..9c9fd5e 100644
--- a/resource/ui/econ/ConfirmItemPreviewDialog.res
+++ b/resource/ui/econ/ConfirmItemPreviewDialog.res
@@ -34,40 +34,41 @@
 		"model_hide"		"1"
 		"resize_to_text"	"1"
 		"padding_height"	"15"
-		"BackColor"
+			"BackColor"
     	{
     		"ControlName"		"EditablePanel"
     		"fieldName"			"BackColor"
     		"xpos"				"0"
     		"ypos"				"0"
-    		"zpos"				"1"
+    		"zpos"				"-1"
     		"wide"				"f0"
     		"tall"	 			"f0"
     		"visible"			"1"
     		"enabled"			"1"
-			"pinCorner"		"0"
-			"autoResize"	"0"
-			"PaintBackgroundType"	"2"
-			"border"		"NoBorder"
+			"pinCorner"			"0"
+			"autoResize"		"0"
+			"PaintBackgroundType""1"
+			"border"			"NoBorder"
 			"bgcolor_override"	"35 35 35 255"
+			
+			"attriblabel"
+			{
+				"font"			"ItemFontAttribLarge"
+				"xpos"			"0"
+				"ypos"			"30"
+				"zpos"			"101"
+				"wide"			"140"
+				"tall"			"60"
+				"autoResize"	"0"
+				"pinCorner"		"0"
+				"visible"		"1"
+				"enabled"		"1"
+				"labelText"		"%attriblist%"
+				"textAlignment"	"center"
+				"fgcolor"		"117 107 94 255"
+				"centerwrap"	"1"
+			}
     	}
-		"attriblabel"
-		{
-			"font"			"ItemFontAttribLarge"
-			"xpos"			"0"
-			"ypos"			"30"
-			"zpos"			"2"
-			"wide"			"140"
-			"tall"			"60"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"labelText"		"%attriblist%"
-			"textAlignment"	"center"
-			"fgcolor"		"117 107 94 255"
-			"centerwrap"	"1"
-		}
 	}
 	"TitleLabel"
 	{
diff --git a/resource/ui/econ/ItemModelPanel.res b/resource/ui/econ/ItemModelPanel.res
index 6a324a3..ef50b9c 100644
--- a/resource/ui/econ/ItemModelPanel.res
+++ b/resource/ui/econ/ItemModelPanel.res
@@ -1,191 +1,262 @@
 "Resource/UI/ItemModelPanel.res"
 {
-	"itemmodelpanel"
-	{
-		"ControlName"		"CEmbeddedItemModelPanel"
-		"fieldName"		"itemmodelpanel"
-	
-		"xpos"			"0"
-		"ypos"			"0"
-		"zpos"			"1"		
-		"wide"			"140"
-		"tall"			"100"
-		"autoResize"		"0"
-		"pinCorner"		"0"
-		"visible"		"1"
-		"enabled"		"1"
-		"useparentbg"		"1"
-		
-		"inset_eq_x"	"2"
-		"inset_eq_y"	"2"
-
-		"fov"			"54"
-		"start_framed"		"1"
 
-		"disable_manipulation"	"1"
-
-		"model"
-		{
-			"angles_x"		"10"
-			"angles_y"		"130"
-			"angles_z"		"0"
-		}
-	}
-	
-	"namelabel"
+	"LoadingSpinner"
 	{
-		"ControlName"	"CExLabel"
-		"fieldName"		"namelabel"
-		"font"			"ItemFontNameLarge"
+		"ControlName"	"ImagePanel"
+		"fieldName"		"LoadingSpinner"
 		"xpos"			"0"
 		"ypos"			"0"
-		"zpos"			"2"
-		"wide"			"140"
-		"tall"			"30"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"1"
-		"enabled"		"1"
-		"labelText"		"%itemname%"
-		"textAlignment"	"south"
-		"fgcolor"		"235 226 202 255"
-		"centerwrap"	"1"
-	}
-	"attriblabel"
-	{
-		"ControlName"	"CExLabel"
-		"fieldName"		"attriblabel"
-		"font"			"ItemFontAttribLarge"
-		"xpos"			"0"
-		"ypos"			"30"
-		"zpos"			"2"
-		"wide"			"140"
-		"tall"			"60"
+		"zpos"			"1"		
+		"wide"			"f0"
+		"tall"			"f0"
 		"autoResize"	"0"
 		"pinCorner"		"0"
-		"visible"		"1"
+		"visible"		"0"
 		"enabled"		"1"
-		"labelText"		"%attriblist%"
-		"textAlignment"	"south"
-		"fgcolor"		"117 107 94 255"
-		"centerwrap"	"1"
+		"paintborder"	"0"
+		"image"			"animated/tf2_logo_hourglass"
+		"scaleImage"	"1"
 	}
 	
-	"equippedlabel"
-	{
-		"ControlName"	"CExLabel"
-		"fieldName"		"equippedlabel"
-		"font"			"ItemFontAttribSmall"
-		"xpos"			"37"
-		"ypos"			"28"
-		"zpos"			"2"
-		"wide"			"35"
-		"tall"			"10"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"1"
-		"enabled"		"1"
-		"labelText"		"#ItemPanelEquipped"
-		"textAlignment"	"center"
-		"fgcolor"		"200 80 60 255"
-		"bgcolor_override"		"0 0 0 255"
-		"PaintBackgroundType"	"2"
-		"PaintBackgroundType"	"0"
-		"border"		"NoBorder"
-	}
 	
-	"paint_icon"
+	"MainContentsContainer"
 	{
-		"ControlName"	"CItemMaterialCustomizationIconPanel"
-		"fieldName"		"paint_icon"
+		"ControlName"	"EditablePanel"
+		"fieldName"		"MainContentsContainer"
 		"xpos"			"0"
 		"ypos"			"0"
-		"zpos"			"2"
-		"wide"			"16"
-		"tall"			"16"
-		"visible"		"0"
-		"enabled"		"1"
-
-	}
+		"wide"			"f0"
+		"tall"			"f0"
+		"visible"		"1"
+		"bgcolor_override"		"0 0 0 0"
+	
+		"itemmodelpanel"
+		{
+			"ControlName"		"CEmbeddedItemModelPanel"
+			"fieldName"		"itemmodelpanel"
+		
+			"xpos"			"0"
+			"ypos"			"0"
+			"zpos"			"1"		
+			"wide"			"140"
+			"tall"			"100"
+			"autoResize"		"0"
+			"pinCorner"		"0"
+			"visible"		"1"
+			"enabled"		"1"
+			"useparentbg"		"1"
+			
+			"inset_eq_x"	"2"
+			"inset_eq_y"	"2"
 
-	"quantitylabel"
-	{
-		"ControlName"	"CExLabel"
-		"fieldName"		"quantitylabel"
-		"font"			"Cerbetica12"
-		"xpos"			"4"
-		"ypos"			"4"
-		"zpos"			"2"
-		"wide"			"18"
-		"tall"			"10"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"0"
-		"enabled"		"1"
-		"labelText"		""
-		"textAlignment"	"center"
-		"fgcolor"		"200 80 60 255"
-		"bgcolor_override"		"0 0 0 255"
-		"PaintBackgroundType"	"0"
-		"border"		"NoBorder"
-	}
+			"fov"			"54"
+			"start_framed"		"1"
 
-	"serieslabel"
-	{
-		"ControlName"	"CExLabel"
-		"fieldName"		"serieslabel"
-		"font"			"Cerbetica12"
-		"xpos"			"4"
-		"ypos"			"4"
-		"zpos"			"2"
-		"wide"			"18"
-		"tall"			"10"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"0"
-		"enabled"		"1"
-		"labelText"		""
-		"textAlignment"	"center"
-		"fgcolor"		"200 180 60 255"
-		"bgcolor_override"		"0 40 30 255"
-		"PaintBackgroundType"	"0"
-		"border"		"NoBorder"
-	}
+			"disable_manipulation"	"1"
 
-	"contained_item_panel"
-	{
-		"ControlName"	"CItemModelPanel"
-		"xpos"			"32"
-		"ypos"			"20"
-		"zpos"			"4"
-		"wide"			"18"
-		"tall"			"18"
-		"visible"		"0"
-		"bgcolor_override"		"0 0 0 200"
-		"noitem_textcolor"		"117 107 94 255"
-		"PaintBackgroundType"	"2"
-		"paintborder"	"0"
-		"useparentbg"	"0"
-		
-		"enabled"		"1"
+			"model"
+			{
+				"angles_x"		"10"
+				"angles_y"		"130"
+				"angles_z"		"0"
+			}
+		}
 		
-		"model_xpos"	"1"
-		"model_ypos"	"1"
-		"model_wide"	"16"
-		"model_tall"	"16"
-		"text_ypos"		"60"
-		"text_center"	"1"
-		"model_only"	"1"
+		"namelabel"
+		{
+			"ControlName"	"CExLabel"
+			"fieldName"		"namelabel"
+			"font"			"ItemFontNameLarge"
+			"xpos"			"0"
+			"ypos"			"0"
+			"zpos"			"2"
+			"wide"			"140"
+			"tall"			"30"
+			"autoResize"	"0"
+			"pinCorner"		"0"
+			"visible"		"1"
+			"enabled"		"1"
+			"labelText"		"%itemname%"
+			"textAlignment"	"south"
+			"fgcolor"		"235 226 202 255"
+			"centerwrap"	"1"
+		}
+		"attriblabel"
+		{
+			"ControlName"	"CExLabel"
+			"fieldName"		"attriblabel"
+			"font"			"ItemFontAttribLarge"
+			"xpos"			"0"
+			"ypos"			"30"
+			"zpos"			"2"
+			"wide"			"140"
+			"tall"			"60"
+			"autoResize"	"0"
+			"pinCorner"		"0"
+			"visible"		"1"
+			"enabled"		"1"
+			"labelText"		"%attriblist%"
+			"textAlignment"	"south"
+			"fgcolor"		"117 107 94 255"
+			"centerwrap"	"1"
+		}
 		
-		"inset_eq_x"	"2"
-		"inset_eq_y"	"2"
+		"equippedlabel"
+		{
+			"ControlName"	"CExLabel"
+			"fieldName"		"equippedlabel"
+			"font"			"ItemFontAttribSmall"
+			"xpos"			"37"
+			"ypos"			"28"
+			"zpos"			"2"
+			"wide"			"35"
+			"tall"			"10"
+			"autoResize"	"0"
+			"pinCorner"		"0"
+			"visible"		"1"
+			"enabled"		"1"
+			"labelText"		"#ItemPanelEquipped"
+			"textAlignment"	"center"
+			"fgcolor"		"200 80 60 255"
+			"bgcolor_override"		"0 0 0 255"
+			"PaintBackgroundType"	"2"
+			"PaintBackgroundType"	"0"
+			"border"		"NoBorder"
+		}
 		
-		"itemmodelpanel"
+		"paint_icon"
+		{
+			"ControlName"	"CItemMaterialCustomizationIconPanel"
+			"fieldName"		"paint_icon"
+			"xpos"			"0"
+			"ypos"			"0"
+			"zpos"			"2"
+			"wide"			"16"
+			"tall"			"16"
+			"visible"		"0"
+			"enabled"		"1"
+
+		}
+
+		"quantitylabel"
 		{
-			"use_item_rendertarget" "0"
-			"allow_rot"				"0"
+			"ControlName"	"CExLabel"
+			"fieldName"		"quantitylabel"
+			"font"			"Cerbetica12"
+			"xpos"			"4"
+			"ypos"			"4"
+			"zpos"			"2"
+			"wide"			"18"
+			"tall"			"10"
+			"autoResize"	"0"
+			"pinCorner"		"0"
+			"visible"		"0"
+			"enabled"		"1"
+			"labelText"		""
+			"textAlignment"	"center"
+			"fgcolor"		"200 80 60 255"
+			"bgcolor_override"		"0 0 0 255"
+			"PaintBackgroundType"	"0"
+			"border"		"NoBorder"
+		}
+
+		"serieslabel"
+		{
+			"ControlName"	"CExLabel"
+			"fieldName"		"serieslabel"
+			"font"			"Cerbetica12"
+			"xpos"			"4"
+			"ypos"			"4"
+			"zpos"			"2"
+			"wide"			"18"
+			"tall"			"10"
+			"autoResize"	"0"
+			"pinCorner"		"0"
+			"visible"		"0"
+			"enabled"		"1"
+			"labelText"		""
+			"textAlignment"	"center"
+			"fgcolor"		"200 180 60 255"
+			"bgcolor_override"		"0 40 30 255"
+			"PaintBackgroundType"	"0"
+			"border"		"NoBorder"
 		}
 		
-		"use_item_sounds"	"1"
+		"matcheslabel"
+		{
+			"ControlName"	"CExLabel"
+			"fieldName"		"matcheslabel"
+			"font"			"ItemFontAttribSmall"
+			"xpos"			"4"
+			"ypos"			"4"
+			"zpos"			"2"
+			"wide"			"24"
+			"tall"			"10"
+			"autoResize"	"0"
+			"pinCorner"		"0"
+			"visible"		"0"
+			"enabled"		"1"
+			"labelText"		""
+			"textAlignment"	"center"
+			"border"		"NoBorder"
+			"fgcolor"		"200 180 60 255"
+			"bgcolor_override"		"0 40 30 255"
+			"PaintBackgroundType"	"2"
+			}
+
+		"vision_restriction_icon"
+		{
+			"ControlName"	"ImagePanel"
+			"fieldName"		"vision_restriction_icon"
+			"xpos"			"4"
+			"ypos"			"4"
+			"zpos"			"2"
+			"autoResize"	"0"
+			"pinCorner"		"0"
+			"wide"			"20"
+			"border"		"NoBorder"
+			"tall"			"16"
+			"visible"		"0"
+			"enabled"		"1"
+			"scaleImage"	"1"
+			}
+
+		"contained_item_panel"
+		{
+			"ControlName"	"CItemModelPanel"
+			"xpos"			"32"
+			"ypos"			"20"
+			"zpos"			"4"
+			"wide"			"18"
+			"tall"			"18"
+			"visible"		"0"
+			"bgcolor_override"		"0 0 0 200"
+			"noitem_textcolor"		"117 107 94 255"
+			"PaintBackgroundType"	"2"
+			"paintborder"	"0"
+			"useparentbg"	"0"
+			
+			"enabled"		"1"
+			
+			"model_xpos"	"1"
+			"model_ypos"	"1"
+			"model_wide"	"16"
+			"model_tall"	"16"
+			"text_ypos"		"60"
+			"text_center"	"1"
+			"model_only"	"1"
+			
+			"inset_eq_x"	"2"
+			"inset_eq_y"	"2"
+			
+			"itemmodelpanel"
+			{
+				"use_item_rendertarget" "0"
+				"allow_rot"				"0"
+			}
+			
+			"use_item_sounds"	"1"
+		}
 	}
 }
diff --git a/resource/ui/econ/itemdiscardpanel.res b/resource/ui/econ/itemdiscardpanel.res
index 4c188ee..0b52c6b 100644
--- a/resource/ui/econ/itemdiscardpanel.res
+++ b/resource/ui/econ/itemdiscardpanel.res
@@ -52,46 +52,42 @@
 			"use_item_rendertarget" "0"
 			"allow_rot"				"0"
 			"inventory_image_type" "1"
-		}
-	}	
-	"ItemMouseOverItemPanel"
-	{
-		"ControlName"	"CItemModelPanel"
-		"fieldName"		"ItemMouseOverItemPanel"
-		"xpos"			"c-150"
-		"ypos"			"130"
-		"zpos"			"100"
-		"wide"			"300"
-		"tall"			"100"
-		"visible"		"0"
-		"bgcolor_override"		"0 0 0 0"
-		"noitem_textcolor"		"117 107 94 255"
-		"PaintBackgroundType"	"2"
-		"paintborder"	"1"
-		
-		"text_ypos"			"20"
-		"text_center"		"1"
-		"model_hide"		"1"
-		"resize_to_text"	"1"
-		"padding_height"	"15"
-		
-		"attriblabel"
-		{
-			"font"			"ItemFontAttribLarge"
-			"xpos"			"0"
-			"ypos"			"30"
-			"zpos"			"2"
-			"wide"			"140"
-			"tall"			"60"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"labelText"		"%attriblist%"
-			"textAlignment"	"center"
-			"fgcolor"		"117 107 94 255"
-			"centerwrap"	"1"
-		}
+		}	
+			"BackColor"
+    	{
+    		"ControlName"		"EditablePanel"
+    		"fieldName"			"BackColor"
+    		"xpos"				"0"
+    		"ypos"				"0"
+    		"zpos"				"-1"
+    		"wide"				"f0"
+    		"tall"	 			"f0"
+    		"visible"			"1"
+    		"enabled"			"1"
+			"pinCorner"			"0"
+			"autoResize"		"0"
+			"PaintBackgroundType""1"
+			"border"			"NoBorder"
+			"bgcolor_override"	"35 35 35 255"
+			
+			"attriblabel"
+			{
+				"font"			"ItemFontAttribLarge"
+				"xpos"			"0"
+				"ypos"			"30"
+				"zpos"			"101"
+				"wide"			"140"
+				"tall"			"60"
+				"autoResize"	"0"
+				"pinCorner"		"0"
+				"visible"		"1"
+				"enabled"		"1"
+				"labelText"		"%attriblist%"
+				"textAlignment"	"center"
+				"fgcolor"		"117 107 94 255"
+				"centerwrap"	"1"
+			}
+    	}
 	}
 	
 	"CaratLabel2"
diff --git a/resource/ui/econ/itempickuppanel.res b/resource/ui/econ/itempickuppanel.res
index 7e57bb7..83efc9b 100644
--- a/resource/ui/econ/itempickuppanel.res
+++ b/resource/ui/econ/itempickuppanel.res
@@ -45,16 +45,17 @@
     		"fieldName"			"BackColor"
     		"xpos"				"0"
     		"ypos"				"0"
-    		"zpos"				"1"
+    		"zpos"				"-1"
     		"wide"				"f0"
     		"tall"	 			"f0"
     		"visible"			"1"
     		"enabled"			"1"
-			"pinCorner"		"0"
-			"autoResize"	"0"
-			"PaintBackgroundType"	"0"
-			"border"		"NoBorder"
-			"bgcolor_override"	"30 30 30 255"
+			"pinCorner"			"0"
+			"autoResize"		"0"
+			"PaintBackgroundType""1"
+			"border"			"NoBorder"
+			"bgcolor_override"	"35 35 35 255"
+			
 			}
 			
 			"itemmodelpanel"
@@ -62,6 +63,8 @@
 				"use_item_rendertarget" "0"
 				"inventory_image_type" "1"
 			}
+		
+
 		}
 	}
 	
diff --git a/resource/ui/econ/store/v2/storehome_base.res b/resource/ui/econ/store/v2/storehome_base.res
index 2b4ed91..d3bbd3e 100644
--- a/resource/ui/econ/store/v2/storehome_base.res
+++ b/resource/ui/econ/store/v2/storehome_base.res
@@ -173,22 +173,41 @@
 		"noitem_textcolor"		"117 107 94 255"
 		"PaintBackgroundType"	"0"
 		"paintborder"	"0"
+		
 		"BackColor"
     	{
     		"ControlName"		"EditablePanel"
     		"fieldName"			"BackColor"
     		"xpos"				"0"
     		"ypos"				"0"
-    		"zpos"				"1"
+    		"zpos"				"-1"
     		"wide"				"f0"
     		"tall"	 			"f0"
     		"visible"			"1"
     		"enabled"			"1"
-			"pinCorner"		"0"
-			"autoResize"	"0"
-			"PaintBackgroundType"	"0"
-			"border"		"NoBorder"
-			"bgcolor_override"	"30 30 30 255"
+			"pinCorner"			"0"
+			"autoResize"		"0"
+			"PaintBackgroundType""1"
+			"border"			"NoBorder"
+			"bgcolor_override"	"35 35 35 255"
+			
+			"attriblabel"
+			{
+				"font"			"ItemFontAttribLarge"
+				"xpos"			"0"
+				"ypos"			"30"
+				"zpos"			"101"
+				"wide"			"140"
+				"tall"			"60"
+				"autoResize"	"0"
+				"pinCorner"		"0"
+				"visible"		"1"
+				"enabled"		"1"
+				"labelText"		"%attriblist%"
+				"textAlignment"	"center"
+				"fgcolor"		"117 107 94 255"
+				"centerwrap"	"1"
+			}
     	}
 		
 		"text_ypos"			"20"
diff --git a/resource/ui/econ/store/v2/storepage.res b/resource/ui/econ/store/v2/storepage.res
index f699092..bb65139 100644
--- a/resource/ui/econ/store/v2/storepage.res
+++ b/resource/ui/econ/store/v2/storepage.res
@@ -76,6 +76,9 @@
 			"inset_eq_x"	"2"
 			"inset_eq_y"	"2"
 			
+			"deferred_description"	"1"
+			"deffered_icon"			"1"
+			
 			"itemmodelpanel"
 			{
 				"use_item_rendertarget" "0"
@@ -272,22 +275,40 @@
 		"noitem_textcolor"		"117 107 94 255"
 		"PaintBackgroundType"	"0"
 		"paintborder"	"0"
-		"BackColor"
+				"BackColor"
     	{
     		"ControlName"		"EditablePanel"
     		"fieldName"			"BackColor"
     		"xpos"				"0"
     		"ypos"				"0"
-    		"zpos"				"1"
+    		"zpos"				"-1"
     		"wide"				"f0"
     		"tall"	 			"f0"
     		"visible"			"1"
     		"enabled"			"1"
-			"pinCorner"		"0"
-			"autoResize"	"0"
-			"PaintBackgroundType"	"0"
-			"border"		"NoBorder"
-			"bgcolor_override"	"30 30 30 255"
+			"pinCorner"			"0"
+			"autoResize"		"0"
+			"PaintBackgroundType""1"
+			"border"			"NoBorder"
+			"bgcolor_override"	"35 35 35 255"
+			
+			"attriblabel"
+			{
+				"font"			"ItemFontAttribLarge"
+				"xpos"			"0"
+				"ypos"			"30"
+				"zpos"			"101"
+				"wide"			"140"
+				"tall"			"60"
+				"autoResize"	"0"
+				"pinCorner"		"0"
+				"visible"		"1"
+				"enabled"		"1"
+				"labelText"		"%attriblist%"
+				"textAlignment"	"center"
+				"fgcolor"		"117 107 94 255"
+				"centerwrap"	"1"
+			}
     	}
 		
 		"text_ypos"			"20"
@@ -295,24 +316,6 @@
 		"model_hide"		"1"
 		"resize_to_text"	"1"
 		"padding_height"	"15"
-		
-		"attriblabel"
-		{
-			"font"			"ItemFontAttribLarge"
-			"xpos"			"0"
-			"ypos"			"30"
-			"zpos"			"2"
-			"wide"			"140"
-			"tall"			"60"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"labelText"		"%attriblist%"
-			"textAlignment"	"center"
-			"fgcolor"		"117 107 94 255"
-			"centerwrap"	"1"
-		}
 	}
 
 	"ClassFilterTooltipLabel"