Updated Icons, Main Menu, Client Scheme

- Replaced multiple images with fonts to reduce space.
- Updated the main menu and the client scheme.
- Removed certain cp_icon files to correct visual glitches.
- Removed unused files.

38 files changed, 493 insertions, 2817 deletions

diff --git a/customizations/main_menu/mainmenuoverride-classic.res b/customizations/main_menu/mainmenuoverride-classic.res
index 757c621..8ec8e6a 100644
--- a/customizations/main_menu/mainmenuoverride-classic.res
+++ b/customizations/main_menu/mainmenuoverride-classic.res
@@ -176,36 +176,6 @@
 		"scaleImage"	"1"
 	}
 
-	"MainMenuSideBG"
-	{
-		"ControlName"	"EditablePanel"
-		"fieldName"		"MainMenuSideBG"
-		"xpos"			"75"
-		"ypos"			"0"
-		"zpos"			"-1"
-		"wide"			"200"
-		"tall"			"f0"
-		"visible"		"1"
-		"enabled"		"1"
-		"bgcolor_override"		"25 25 25 255"
-		"PaintBackgroundType"	"2"
-	}
-
-	"MainMenuSideBGOuter"
-	{
-		"ControlName"	"EditablePanel"
-		"fieldName"		"MainMenuSideBGOuter"
-		"xpos"			"72"
-		"ypos"			"0"
-		"zpos"			"-2"
-		"wide"			"205"
-		"tall"			"f0"
-		"visible"		"1"
-		"enabled"		"1"
-		"bgcolor_override"		"72 255 255 255"
-		"PaintBackgroundType"	"2"
-	}
-
 	"TFLogoImage"
 	{
 		"ControlName"	"ImagePanel"
@@ -214,9 +184,9 @@
 		"ypos"			"35"
 		"wide"			"180"
 		"tall"			"46"
-		"visible"		"0"
-		"enabled"		"0"
-		"image"			"replay/thumbnails/tflogo"
+		"visible"		"1"
+		"enabled"		"1"
+		"image"			"../logo/tf2_logo_black"
 		"scaleImage"	"1"
 		"command"		"engine play vo/heavy_battlecry02.mp3"
 	}
@@ -235,19 +205,13 @@
 		"scaleImage"	"1"
 	}
 
-	"DashboardDimmer"
-	{
-		"wide"			"0"
-		"tall"			"0"
-	}
-
 	"RankModelPanel"
 	{
 		"ControlName"	"CPvPRankPanel"
 		"fieldName"		"RankModelPanel"
 		"xpos"			"150"
 		"ypos"			"cs-0.46"
-		"zpos"			"1"
+		"zpos"			"0"
 		"wide"			"170"
 		"tall"			"800"
 		"visible"		"0"
@@ -263,7 +227,7 @@
 		"fieldName"		"CycleRankTypeButton"
 		"xpos"			"250"
 		"ypos"			"cs-0.5-10"
-		"zpos"			"2"
+		"zpos"			"1"
 		"wide"			"15"
 		"tall"			"15"
 		"autoResize"	"0"
@@ -385,6 +349,21 @@
 		"proportionaltoparent" "1"
 	}
 
+	"RankBorder"
+	{
+		"ControlName"	"EditablePanel"
+		"fieldName"		"RankBorder"
+		"xpos"			"30"
+		"ypos"			"57"
+		"zpos"			"-55"
+		"wide"			"260"
+		"tall"			"198"
+		"visible"		"0"
+		"PaintBackgroundType"	"2"
+		"border"		"MainMenuBGBorder"
+		"proportionaltoparent"	"1"
+	}
+
 	"TooltipPanel"
 	{
 		"ControlName"			"EditablePanel"
@@ -396,7 +375,7 @@
 		"tall"					"50"
 		"visible"				"0"
 		"PaintBackgroundType"	"2"
-		"border"				"CyanBorder"
+		"border"				"CyanBorderThick"
 
 		"TipSubLabel"
 		{
@@ -422,11 +401,11 @@
 		{
 			"ControlName"	"CExLabel"
 			"fieldName"		"TipLabel"
-			"font"			"HudFontSmallBold"
+			"font"			"Cerbetica12"
 			"labelText"		"%tiptext%"
 			"textAlignment"	"center"
-			"xpos"			"10"
-			"ypos"			"3"
+			"xpos"			"5"
+			"ypos"			"0"
 			"zpos"			"3"
 			"wide"			"140"
 			"tall"			"30"
@@ -446,29 +425,15 @@
 		"fieldName"			"Notifications_ShowButtonPanel"
 		"xpos"				"227"
 		"ypos"				"425"
-		"zpos"				"10"
+		"zpos"				"0"
 		"wide"				"20"
-		"tall"				"25"
+		"tall"				"20"
 		"autoResize"		"0"
 		"pinCorner"			"3"
 		"visible"			"1"
 		"enabled"			"1"
-
-		"SubImage"
-		{
-			"ControlName"		"ImagePanel"
-			"fieldName"			"SubImage"
-			"xpos"				"16"
-			"ypos"				"0"
-			"zpos"				"3"
-			"wide"				"16"
-			"tall"				"16"
-			"visible"			"0"
-			"enabled"			"0"
-			"image"				"glyph_achievements"
-			"scaleImage"		"1"
-			"drawcolor" 		"210 125 33 255"
-		}
+		"tabPosition"		"0"
+		"bgcolor_override"	"Transparent"
 
 		"Notifications_ShowButtonPanel_SB"
 		{
@@ -476,47 +441,27 @@
 			"fieldName"			"Notifications_ShowButtonPanel_SB"
 			"xpos"				"0"
 			"ypos"				"0"
-			"zpos"				"5"
-			"wide"				"15"
-			"tall"				"15"
+			"wide"				"20"
+			"tall"				"20"
 			"autoResize"		"0"
 			"pinCorner"			"3"
 			"visible"			"1"
 			"enabled"			"1"
 			"tabPosition"		"0"
-			"labelText"			""
-			"font"				""
+			"labelText"			"k"
+			"font"				"CustomIcons"
+			"Command"			"noti_show"
+			"use_proportional_insets" "1"
 			"textAlignment"		"center"
-			"dulltext"			"0"
-			"brighttext"		"0"
 			"default"			"1"
 			"actionsignallevel"	"2"
-			"Command"			"noti_show"
-
+			"paintbackground"	"0"
+			"paintborder"		"0"
 			"sound_depressed"	"UI/buttonclick.wav"
 			"sound_released"	"UI/buttonclickrelease.wav"
-			"paintbackground"	"0"
 
-			"image_drawcolor"			"235 226 202 255"
-			"image_armedcolor"			"72 255 255 255"
-
-			"defaultFgColor_override" 	"235 226 202 255"
+			"defaultFgColor_override"	"235 226 202 255"
 			"armedFgColor_override"		"72 255 255 255"
-
-			"SubImage"
-			{
-				"ControlName"	"ImagePanel"
-				"fieldName"		"SubImage"
-				"xpos"			"0"
-				"ypos"			"0"
-				"zpos"			"1"
-				"wide"			"16"
-				"tall"			"16"
-				"visible"		"1"
-				"enabled"		"1"
-				"scaleImage"	"1"
-				"image"			"replay/thumbnails/alert"
-			}
 		}
 	}
 
@@ -527,8 +472,8 @@
 		"xpos"			"r28"
 		"ypos"			"65"
 		"zpos"			"0"
-		"wide"			"30"
-		"tall"			"24"
+		"wide"			"20"
+		"tall"			"20"
 		"autoResize"	"0"
 		"pinCorner"		"3"
 		"visible"		"1"
@@ -541,49 +486,27 @@
 			"fieldName"		"SubButton"
 			"xpos"			"0"
 			"ypos"			"0"
-			"wide"			"30"
-			"tall"			"24"
+			"wide"			"20"
+			"tall"			"20"
 			"autoResize"	"0"
 			"pinCorner"		"3"
 			"visible"		"1"
 			"enabled"		"1"
 			"tabPosition"	"0"
-			"textinsetx"	"0"
-			"labelText"		""
-			"use_proportional_insets" "1"
-			"font"			""
+			"labelText"		"t"
+			"font"			"CustomIcons"
 			"command"		"watch_stream"
+			"use_proportional_insets" "1"
 			"textAlignment"	"center"
-			"dulltext"		"0"
-			"brighttext"	"0"
 			"default"		"1"
 			"actionsignallevel" "2"
-			"sound_depressed"	"UI/buttonclick.wav"
-			"sound_released"	"UI/buttonclickrelease.wav"
-
 			"paintbackground"	"0"
 			"paintborder"		"0"
+			"sound_depressed"	"UI/buttonclick.wav"
+			"sound_released"	"UI/buttonclickrelease.wav"
 
 			"defaultFgColor_override"	"235 226 202 255"
 			"armedFgColor_override"		"72 255 255 255"
-
-			"image_drawcolor"	"235 226 202 255"
-			"image_armedcolor"	"72 255 255 255"
-
-			"SubImage"
-			{
-				"ControlName"	"ImagePanel"
-				"fieldName"		"SubImage"
-				"xpos"			"2"
-				"ypos"			"0"
-				"zpos"			"1"
-				"wide"			"20"
-				"tall"			"20"
-				"visible"		"1"
-				"enabled"		"1"
-				"scaleImage"	"1"
-				"image"			"replay/thumbnails/twitch"
-			}
 		}
 	}
 
@@ -609,8 +532,8 @@
 		"xpos"			"r28"
 		"ypos"			"90"
 		"zpos"			"1"
-		"wide"			"30"
-		"tall"			"24"
+		"wide"			"20"
+		"tall"			"20"
 		"autoResize"	"0"
 		"pinCorner"		"3"
 		"visible"		"1"
@@ -623,49 +546,27 @@
 			"fieldName"		"SubButton"
 			"xpos"			"0"
 			"ypos"			"0"
-			"wide"			"30"
-			"tall"			"24"
+			"wide"			"20"
+			"tall"			"20"
 			"autoResize"	"0"
 			"pinCorner"		"3"
 			"visible"		"1"
 			"enabled"		"1"
 			"tabPosition"	"0"
-			"textinsetx"	"0"
-			"labelText"		""
-			"font"			""
+			"labelText"		"x"
+			"font"			"CustomIcons"
 			"command"		"questlog"
+			"proportionaltoparent"	"1"
 			"textAlignment"	"center"
-			"dulltext"		"0"
-			"brighttext"	"0"
 			"default"		"1"
-			"sound_depressed"	"UI/buttonclick.wav"
-			"sound_released"	"UI/buttonclickrelease.wav"
 			"actionsignallevel" "2"
-			"proportionaltoparent"	"1"
-
 			"paintbackground"	"0"
 			"paintborder"		"0"
-
-			"image_drawcolor"	"235 226 202 255"
-			"image_armedcolor"	"72 255 255 255"
+			"sound_depressed"	"UI/buttonclick.wav"
+			"sound_released"	"UI/buttonclickrelease.wav"
 
 			"defaultFgColor_override"	"235 226 202 255"
 			"armedFgColor_override"		"72 255 255 255"
-
-			"SubImage"
-			{
-				"ControlName"	"ImagePanel"
-				"fieldName"		"SubImage"
-				"xpos"			"5"
-				"ypos"			"3"
-				"zpos"			"1"
-				"wide"			"14"
-				"tall"			"14"
-				"visible"		"1"
-				"enabled"		"1"
-				"scaleImage"	"1"
-				"image"			"replay/thumbnails/contracts"
-			}
 		}
 	}
 
@@ -675,9 +576,9 @@
 		"fieldName"		"MOTD_ShowButtonPanel"
 		"xpos"			"r28"
 		"ypos"			"115"
-		"zpos"			"1"
-		"wide"			"30"
-		"tall"			"24"
+		"zpos"			"0"
+		"wide"			"20"
+		"tall"			"20"
 		"autoResize"	"0"
 		"pinCorner"		"3"
 		"visible"		"1"
@@ -690,49 +591,27 @@
 			"fieldName"		"MOTD_ShowButtonPanel_SB"
 			"xpos"			"0"
 			"ypos"			"0"
-			"wide"			"30"
-			"tall"			"24"
+			"wide"			"20"
+			"tall"			"20"
 			"autoResize"	"0"
 			"pinCorner"		"3"
 			"visible"		"1"
 			"enabled"		"1"
 			"tabPosition"	"0"
-			"textinsetx"	"0"
-			"labelText"		""
-			"font"			""
+			"labelText"		"o"
+			"font"			"CustomIcons"
 			"command"		"motd_show"
+			"use_proportional_insets" "1"
 			"textAlignment"	"center"
-			"dulltext"		"0"
-			"brighttext"	"0"
 			"default"		"1"
-			"sound_depressed"	"UI/buttonclick.wav"
-			"sound_released"	"UI/buttonclickrelease.wav"
 			"actionsignallevel" "2"
-			"proportionaltoparent"	"1"
-
 			"paintbackground"	"0"
 			"paintborder"		"0"
-
-			"image_drawcolor"	"235 226 202 255"
-			"image_armedcolor"	"72 255 255 255"
+			"sound_depressed"	"UI/buttonclick.wav"
+			"sound_released"	"UI/buttonclickrelease.wav"
 
 			"defaultFgColor_override"	"235 226 202 255"
 			"armedFgColor_override"		"72 255 255 255"
-
-			"SubImage"
-			{
-				"ControlName"	"ImagePanel"
-				"fieldName"		"SubImage"
-				"xpos"			"5"
-				"ypos"			"3"
-				"zpos"			"1"
-				"wide"			"14"
-				"tall"			"14"
-				"visible"		"1"
-				"enabled"		"1"
-				"scaleImage"	"1"
-				"image"			"replay/thumbnails/motd"
-			}
 		}
 	}
 
@@ -1110,8 +989,9 @@
 		"tall"			"80"
 		"visible"		"0"
 		"PaintBackgroundType"	"2"
-		"paintbackground"		"0"
-		"border"				"MainMenuHighlightBorder"
+		"paintbackground"		"1"
+		"border"				"NoBorder"
+		"bgcolor_override"		"DarkGrey"
 
 		"Notifications_CloseButton"
 		{
@@ -1144,7 +1024,7 @@
 			"depressedFgColor_override"	"72 255 255 255"
 
 			"image_drawcolor"			"235 226 202 255"
-			"image_armedcolor"			"72 255 255 255"
+			"image_armedcolor"			"255 0 0 255"
 
 			"SubImage"
 			{
@@ -1177,7 +1057,7 @@
 			"pinCorner"		"0"
 			"visible"		"1"
 			"enabled"		"1"
-			"fgcolor_override"	"46 43 42 255"
+			"fgcolor_override"	"TanLight"
 			"wrap"				"1"
 		}
 
@@ -1343,54 +1223,26 @@
 	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"VersionLabel"
-		"font"			"CerbeticaBold20"
+		"font"			"CerbeticaBold16"
 		"labelText"		"rayshud v2020.0415"
-		"xpos"			"112"
-		"ypos"			"35"
+		"xpos"			"r155"
+		"ypos"			"r20"
 		"wide"			"150"
 		"tall"			"20"
 		"autoResize"	"0"
 		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
+		"textAlignment"	"east"
 		"fgcolor_override"	"TanLight"
 	}
 
-	"GeneralStoreButton"
-	{
-		"ControlName"	"CExImageButton"
-		"fieldname"		"GeneralStoreButton"
-		"xpos"			"90"
-		"ypos"			"70"
-		"zpos"			"11"
-		"wide"			"100"
-		"tall"			"16"
-		"visible"		"1"
-		"enabled"		"1"
-		"labeltext"		"#StoreTitle"
-		"command" 		"engine open_store"
-		"font"			"CerbeticaBold16"
-		"textAlignment"	"west"
-		"textinsetx"	"0"
-		"sound_depressed"	"UI/buttonclick.wav"
-		"sound_released"	"UI/buttonclickrelease.wav"
-
-		"border_default"	"NoBorder"
-		"border_armed"		"NoBorder"
-
-		"defaultFgColor_override" 	"TanLight"
-		"armedFgColor_override" 	"ColorCyan"
-
-		"defaultBgColor_override" 	"Transparent"
-		"armedBgColor_override" 	"25 25 25 148"
-	}
-
 	"CharacterSetupButton"
 	{
 		"ControlName"	"CExImageButton"
 		"fieldname"		"CharacterSetupButton"
 		"xpos"			"90"
-		"ypos"			"90"
+		"ypos"			"75"
 		"zpos"			"11"
 		"wide"			"50"
 		"tall"			"16"
@@ -1414,20 +1266,19 @@
 		"armedBgColor_override" 	"25 25 25 148"
 	}
 
-	"Replay"
+	"GeneralStoreButton"
 	{
 		"ControlName"	"CExImageButton"
-		"fieldname"		"Replay"
+		"fieldname"		"GeneralStoreButton"
 		"xpos"			"90"
-		"ypos"			"110"
+		"ypos"			"95"
 		"zpos"			"11"
-		"wide"			"50"
+		"wide"			"100"
 		"tall"			"16"
 		"visible"		"1"
 		"enabled"		"1"
-		"AllCaps"		"1"
-		"labeltext"		"#MMenu_Replays"
-		"command"		"engine replay_reloadbrowser"
+		"labeltext"		"#StoreTitle"
+		"command" 		"engine open_store"
 		"font"			"CerbeticaBold16"
 		"textAlignment"	"west"
 		"textinsetx"	"0"
@@ -1444,19 +1295,19 @@
 		"armedBgColor_override" 	"25 25 25 148"
 	}
 
-	"WorkshopSteamButton"
+	"SteamWorkshopButton"
 	{
 		"ControlName"	"CExImageButton"
-		"fieldname"		"WorkshopSteamButton"
+		"fieldname"		"SteamWorkshopButton"
 		"xpos"			"90"
-		"ypos"			"130"
+		"ypos"			"115"
 		"zpos"			"11"
 		"wide"			"70"
 		"tall"			"16"
 		"visible"		"1"
 		"enabled"		"1"
 		"AllCaps"		"1"
-		"labeltext"		"#MMenu_Tooltip_Workshop"
+		"labeltext"		"#MMenu_SteamWorkshop"
 		"command"		"engine OpenSteamWorkshopDialog"
 		"font"			"CerbeticaBold16"
 		"textAlignment"	"west"
@@ -1479,7 +1330,7 @@
 		"ControlName"	"CExImageButton"
 		"fieldName"		"SettingButton"
 		"xpos"			"90"
-		"ypos"			"150"
+		"ypos"			"135"
 		"zpos"			"11"
 		"wide"			"50"
 		"tall"			"16"
@@ -1509,7 +1360,7 @@
 		"ControlName"	"CExImageButton"
 		"fieldName"		"AdvSettingsButton"
 		"xpos"			"90"
-		"ypos"			"170"
+		"ypos"			"155"
 		"zpos"			"11"
 		"wide"			"120"
 		"tall"			"16"
@@ -1538,8 +1389,8 @@
 	{
 		"ControlName"	"CExImageButton"
 		"fieldName"		"MinmodeToggle"
-		"xpos"			"91"
-		"ypos"			"190"
+		"xpos"			"90"
+		"ypos"			"175"
 		"zpos"			"11"
 		"wide"			"100"
 		"tall"			"16"
@@ -1564,15 +1415,15 @@
 		"armedBgColor_override" 	"25 25 25 148"
 	}
 
-	"SteamWorkshopButton"
+	"AchievementsButton"
 	{
 		"ControlName"	"EditablePanel"
-		"fieldname"		"SteamWorkshopButton"
-		"xpos"			"165"
-		"ypos"			"62"
+		"fieldname"		"AchievementsButton"
+		"xpos"			"90"
+		"ypos"			"200"
 		"zpos"			"12"
-		"wide"			"0"
-		"tall"			"0"
+		"wide"			"20"
+		"tall"			"20"
 		"visible"		"1"
 
 		"SubButton"
@@ -1589,7 +1440,7 @@
 			"enabled"		"1"
 			"tabPosition"	"0"
 			"textinsetx"	"0"
-			"font"			"CustomIcons20"
+			"font"			"FontRegular20"
 			"use_proportional_insets" "1"
 			"textAlignment"	"center"
 			"dulltext"		"0"
@@ -1622,12 +1473,12 @@
 		}
 	}
 
-	"ReportBugButton"
+	"ConsoleButton"
 	{
 		"ControlName"	"EditablePanel"
-		"fieldname"		"ReportBugButton"
-		"xpos"			"90"
-		"ypos"			"220"
+		"fieldname"		"ConsoleButton"
+		"xpos"			"110"
+		"ypos"			"200"
 		"zpos"			"12"
 		"wide"			"20"
 		"tall"			"20"
@@ -1647,7 +1498,7 @@
 			"enabled"		"1"
 			"tabPosition"	"0"
 			"textinsetx"	"0"
-			"font"			"CustomIcons20"
+			"font"			"FontRegular20"
 			"use_proportional_insets" "1"
 			"textAlignment"	"center"
 			"dulltext"		"0"
@@ -1680,12 +1531,12 @@
 		}
 	}
 
-	"AchievementsButton"
+	"ReplayButton"
 	{
 		"ControlName"	"EditablePanel"
-		"fieldname"		"AchievementsButton"
-		"xpos"			"110"
-		"ypos"			"220"
+		"fieldname"		"ReplayButton"
+		"xpos"			"130"
+		"ypos"			"200"
 		"zpos"			"12"
 		"wide"			"20"
 		"tall"			"20"
@@ -1705,7 +1556,7 @@
 			"enabled"		"1"
 			"tabPosition"	"0"
 			"textinsetx"	"0"
-			"font"			"CustomIcons20"
+			"font"			"Cerbetica20"
 			"use_proportional_insets" "1"
 			"textAlignment"	"center"
 			"dulltext"		"0"
@@ -1738,12 +1589,12 @@
 		}
 	}
 
-	"ConsoleButton"
+	"ReportBugButton"
 	{
 		"ControlName"	"EditablePanel"
-		"fieldname"		"ConsoleButton"
-		"xpos"			"130"
-		"ypos"			"220"
+		"fieldname"		"ReportBugButton"
+		"xpos"			"150"
+		"ypos"			"200"
 		"zpos"			"12"
 		"wide"			"20"
 		"tall"			"20"
@@ -1763,7 +1614,7 @@
 			"enabled"		"1"
 			"tabPosition"	"0"
 			"textinsetx"	"0"
-			"font"			"CustomIcons20"
+			"font"			"FontRegular20"
 			"use_proportional_insets" "1"
 			"textAlignment"	"center"
 			"dulltext"		"0"
@@ -1796,12 +1647,12 @@
 		}
 	}
 
-	"ReportPlayerButton"
+	"CoachPlayersButton"
 	{
 		"ControlName"	"EditablePanel"
-		"fieldname"		"ReportPlayerButton"
-		"xpos"			"150"
-		"ypos"			"220"
+		"fieldname"		"CoachPlayersButton"
+		"xpos"			"170"
+		"ypos"			"200"
 		"zpos"			"12"
 		"wide"			"20"
 		"tall"			"20"
@@ -1821,7 +1672,65 @@
 			"enabled"		"1"
 			"tabPosition"	"0"
 			"textinsetx"	"0"
-			"font"			"CustomIcons20"
+			"font"			"Cerbetica20"
+			"use_proportional_insets" "1"
+			"textAlignment"	"center"
+			"dulltext"		"0"
+			"brighttext"	"0"
+			"default"		"1"
+
+			"sound_depressed"	"UI/buttonclick.wav"
+			"sound_released"	"UI/buttonclickrelease.wav"
+
+			"border_default"	""
+			"border_armed"		""
+			"paintbackground"	"0"
+
+			"image_drawcolor"	"235 226 202 255"
+			"image_armedcolor"	"72 255 255 255"
+
+			"SubImage"
+			{
+				"ControlName"	"ImagePanel"
+				"fieldName"		"SubImage"
+				"xpos"			"2"
+				"ypos"			"2"
+				"zpos"			"1"
+				"wide"			"15"
+				"tall"			"15"
+				"visible"		"1"
+				"enabled"		"1"
+				"scaleImage"	"1"
+			}
+		}
+	}
+
+	"RequestCoachButton"
+	{
+		"ControlName"	"EditablePanel"
+		"fieldname"		"RequestCoachButton"
+		"xpos"			"190"
+		"ypos"			"200"
+		"zpos"			"12"
+		"wide"			"20"
+		"tall"			"20"
+		"visible"		"1"
+
+		"SubButton"
+		{
+			"ControlName"	"CExImageButton"
+			"fieldName"		"SubButton"
+			"xpos"			"0"
+			"ypos"			"0"
+			"wide"			"20"
+			"tall"			"20"
+			"autoResize"	"0"
+			"pinCorner"		"3"
+			"visible"		"1"
+			"enabled"		"1"
+			"tabPosition"	"0"
+			"textinsetx"	"0"
+			"font"			"FontRegular20"
 			"use_proportional_insets" "1"
 			"textAlignment"	"center"
 			"dulltext"		"0"
@@ -1858,8 +1767,8 @@
 	{
 		"ControlName"	"EditablePanel"
 		"fieldname"		"CallVoteButton"
-		"xpos"			"170"
-		"ypos"			"220"
+		"xpos"			"210"
+		"ypos"			"200"
 		"zpos"			"12"
 		"wide"			"20"
 		"tall"			"20"
@@ -1879,7 +1788,7 @@
 			"enabled"		"1"
 			"tabPosition"	"0"
 			"textinsetx"	"0"
-			"font"			"CustomIcons20"
+			"font"			"FontRegular20"
 			"use_proportional_insets" "1"
 			"textAlignment"	"center"
 			"dulltext"		"0"
@@ -1916,8 +1825,8 @@
 	{
 		"ControlName"	"EditablePanel"
 		"fieldname"		"MutePlayersButton"
-		"xpos"			"190"
-		"ypos"			"220"
+		"xpos"			"230"
+		"ypos"			"200"
 		"zpos"			"12"
 		"wide"			"20"
 		"tall"			"20"
@@ -1937,7 +1846,7 @@
 			"enabled"		"1"
 			"tabPosition"	"0"
 			"textinsetx"	"0"
-			"font"			"CustomIcons20"
+			"font"			"FontRegular20"
 			"use_proportional_insets" "1"
 			"textAlignment"	"center"
 			"dulltext"		"0"
@@ -1970,12 +1879,12 @@
 		}
 	}
 
-	"RequestCoachButton"
+	"ReportPlayerButton"
 	{
 		"ControlName"	"EditablePanel"
-		"fieldname"		"RequestCoachButton"
-		"xpos"			"210"
-		"ypos"			"220"
+		"fieldname"		"ReportPlayerButton"
+		"xpos"			"250"
+		"ypos"			"200"
 		"zpos"			"12"
 		"wide"			"20"
 		"tall"			"20"
@@ -1995,7 +1904,7 @@
 			"enabled"		"1"
 			"tabPosition"	"0"
 			"textinsetx"	"0"
-			"font"			"CustomIcons20"
+			"font"			"FontRegular20"
 			"use_proportional_insets" "1"
 			"textAlignment"	"center"
 			"dulltext"		"0"
@@ -2028,6 +1937,36 @@
 		}
 	}
 
+	"BGPanel1"
+	{
+		"ControlName"	"EditablePanel"
+		"fieldName"		"BGPanel1"
+		"xpos"			"75"
+		"ypos"			"0"
+		"zpos"			"-1"
+		"wide"			"200"
+		"tall"			"f0"
+		"visible"		"1"
+		"enabled"		"1"
+		"bgcolor_override"		"25 25 25 255"
+		"PaintBackgroundType"	"2"
+	}
+
+	"BGPanel2"
+	{
+		"ControlName"	"EditablePanel"
+		"fieldName"		"BGPanel2"
+		"xpos"			"72"
+		"ypos"			"0"
+		"zpos"			"-2"
+		"wide"			"205"
+		"tall"			"f0"
+		"visible"		"1"
+		"enabled"		"1"
+		"bgcolor_override"		"72 255 255 255"
+		"PaintBackgroundType"	"2"
+	}
+
 	"icon_generator"
 	{
 		"ControlName"	"CEmbeddedItemModelPanel"
diff --git a/customizations/main_menu/mainmenuoverride.res b/customizations/main_menu/mainmenuoverride.res
index 692c2b7..bb09e3b 100644
--- a/customizations/main_menu/mainmenuoverride.res
+++ b/customizations/main_menu/mainmenuoverride.res
@@ -176,21 +176,6 @@
 		"scaleImage"	"1"
 	}
 
-	"MainMenuSideBG"
-	{
-		"ControlName"	"EditablePanel"
-		"fieldName"		"MainMenuSideBG"
-		"xpos"			"30"
-		"ypos"			"57"
-		"zpos"			"-55"
-		"wide"			"260"
-		"tall"			"370"
-		"visible"		"1"
-		"enabled"		"1"
-		"bgcolor_override"		"25 25 25 148"
-		"PaintBackgroundType"	"2"
-	}
-
 	"HudName"
 	{
 		"ControlName"	"CExImageButton"
@@ -269,12 +254,6 @@
 		"scaleImage"	"1"
 	}
 
-	"DashboardDimmer"
-	{
-		"wide"			"0"
-		"tall"			"0"
-	}
-
 	"RankModelPanel"
 	{
 		"ControlName"	"CPvPRankPanel"
@@ -445,7 +424,7 @@
 		"tall"					"50"
 		"visible"				"0"
 		"PaintBackgroundType"	"2"
-		"border"				"CyanBorder"
+		"border"				"CyanBorderThick"
 
 		"TipSubLabel"
 		{
@@ -471,11 +450,11 @@
 		{
 			"ControlName"	"CExLabel"
 			"fieldName"		"TipLabel"
-			"font"			"HudFontSmallBold"
+			"font"			"Cerbetica12"
 			"labelText"		"%tiptext%"
 			"textAlignment"	"center"
-			"xpos"			"10"
-			"ypos"			"3"
+			"xpos"			"5"
+			"ypos"			"0"
 			"zpos"			"3"
 			"wide"			"140"
 			"tall"			"30"
@@ -495,29 +474,15 @@
 		"fieldName"			"Notifications_ShowButtonPanel"
 		"xpos"				"295"
 		"ypos"				"62"
-		"zpos"				"1"
+		"zpos"				"0"
 		"wide"				"20"
-		"tall"				"25"
+		"tall"				"20"
 		"autoResize"		"0"
 		"pinCorner"			"3"
 		"visible"			"1"
 		"enabled"			"1"
-
-		"SubImage"
-		{
-			"ControlName"		"ImagePanel"
-			"fieldName"			"SubImage"
-			"xpos"				"16"
-			"ypos"				"0"
-			"zpos"				"3"
-			"wide"				"16"
-			"tall"				"16"
-			"visible"			"0"
-			"enabled"			"0"
-			"image"				"glyph_achievements"
-			"scaleImage"		"1"
-			"drawcolor" 		"210 125 33 255"
-		}
+		"tabPosition"		"0"
+		"bgcolor_override"	"Transparent"
 
 		"Notifications_ShowButtonPanel_SB"
 		{
@@ -525,47 +490,27 @@
 			"fieldName"			"Notifications_ShowButtonPanel_SB"
 			"xpos"				"0"
 			"ypos"				"0"
-			"zpos"				"5"
-			"wide"				"15"
-			"tall"				"15"
+			"wide"				"20"
+			"tall"				"20"
 			"autoResize"		"0"
 			"pinCorner"			"3"
 			"visible"			"1"
 			"enabled"			"1"
 			"tabPosition"		"0"
-			"labelText"			""
-			"font"				""
+			"labelText"			"k"
+			"font"				"CustomIcons"
+			"Command"			"noti_show"
+			"use_proportional_insets" "1"
 			"textAlignment"		"center"
-			"dulltext"			"0"
-			"brighttext"		"0"
 			"default"			"1"
 			"actionsignallevel"	"2"
-			"Command"			"noti_show"
-
+			"paintbackground"	"0"
+			"paintborder"		"0"
 			"sound_depressed"	"UI/buttonclick.wav"
 			"sound_released"	"UI/buttonclickrelease.wav"
-			"paintbackground"	"0"
-
-			"image_drawcolor"			"235 226 202 255"
-			"image_armedcolor"			"72 255 255 255"
 
-			"defaultFgColor_override" 	"235 226 202 255"
+			"defaultFgColor_override"	"235 226 202 255"
 			"armedFgColor_override"		"72 255 255 255"
-
-			"SubImage"
-			{
-				"ControlName"	"ImagePanel"
-				"fieldName"		"SubImage"
-				"xpos"			"0"
-				"ypos"			"0"
-				"zpos"			"1"
-				"wide"			"16"
-				"tall"			"16"
-				"visible"		"1"
-				"enabled"		"1"
-				"scaleImage"	"1"
-				"image"			"replay/thumbnails/alert"
-			}
 		}
 	}
 
@@ -576,8 +521,8 @@
 		"xpos"			"r28"
 		"ypos"			"65"
 		"zpos"			"0"
-		"wide"			"30"
-		"tall"			"24"
+		"wide"			"20"
+		"tall"			"20"
 		"autoResize"	"0"
 		"pinCorner"		"3"
 		"visible"		"1"
@@ -590,49 +535,27 @@
 			"fieldName"		"SubButton"
 			"xpos"			"0"
 			"ypos"			"0"
-			"wide"			"30"
-			"tall"			"24"
+			"wide"			"20"
+			"tall"			"20"
 			"autoResize"	"0"
 			"pinCorner"		"3"
 			"visible"		"1"
 			"enabled"		"1"
 			"tabPosition"	"0"
-			"textinsetx"	"0"
-			"labelText"		""
-			"use_proportional_insets" "1"
-			"font"			""
+			"labelText"		"t"
+			"font"			"CustomIcons"
 			"command"		"watch_stream"
+			"use_proportional_insets" "1"
 			"textAlignment"	"center"
-			"dulltext"		"0"
-			"brighttext"	"0"
 			"default"		"1"
 			"actionsignallevel" "2"
-			"sound_depressed"	"UI/buttonclick.wav"
-			"sound_released"	"UI/buttonclickrelease.wav"
-
 			"paintbackground"	"0"
 			"paintborder"		"0"
+			"sound_depressed"	"UI/buttonclick.wav"
+			"sound_released"	"UI/buttonclickrelease.wav"
 
 			"defaultFgColor_override"	"235 226 202 255"
 			"armedFgColor_override"		"72 255 255 255"
-
-			"image_drawcolor"	"235 226 202 255"
-			"image_armedcolor"	"72 255 255 255"
-
-			"SubImage"
-			{
-				"ControlName"	"ImagePanel"
-				"fieldName"		"SubImage"
-				"xpos"			"2"
-				"ypos"			"0"
-				"zpos"			"1"
-				"wide"			"20"
-				"tall"			"20"
-				"visible"		"1"
-				"enabled"		"1"
-				"scaleImage"	"1"
-				"image"			"replay/thumbnails/twitch"
-			}
 		}
 	}
 
@@ -658,8 +581,8 @@
 		"xpos"			"r28"
 		"ypos"			"90"
 		"zpos"			"1"
-		"wide"			"30"
-		"tall"			"24"
+		"wide"			"20"
+		"tall"			"20"
 		"autoResize"	"0"
 		"pinCorner"		"3"
 		"visible"		"1"
@@ -672,49 +595,27 @@
 			"fieldName"		"SubButton"
 			"xpos"			"0"
 			"ypos"			"0"
-			"wide"			"30"
-			"tall"			"24"
+			"wide"			"20"
+			"tall"			"20"
 			"autoResize"	"0"
 			"pinCorner"		"3"
 			"visible"		"1"
 			"enabled"		"1"
 			"tabPosition"	"0"
-			"textinsetx"	"0"
-			"labelText"		""
-			"font"			""
+			"labelText"		"x"
+			"font"			"CustomIcons"
 			"command"		"questlog"
+			"proportionaltoparent"	"1"
 			"textAlignment"	"center"
-			"dulltext"		"0"
-			"brighttext"	"0"
 			"default"		"1"
-			"sound_depressed"	"UI/buttonclick.wav"
-			"sound_released"	"UI/buttonclickrelease.wav"
 			"actionsignallevel" "2"
-			"proportionaltoparent"	"1"
-
 			"paintbackground"	"0"
 			"paintborder"		"0"
-
-			"image_drawcolor"	"235 226 202 255"
-			"image_armedcolor"	"72 255 255 255"
+			"sound_depressed"	"UI/buttonclick.wav"
+			"sound_released"	"UI/buttonclickrelease.wav"
 
 			"defaultFgColor_override"	"235 226 202 255"
 			"armedFgColor_override"		"72 255 255 255"
-
-			"SubImage"
-			{
-				"ControlName"	"ImagePanel"
-				"fieldName"		"SubImage"
-				"xpos"			"5"
-				"ypos"			"3"
-				"zpos"			"1"
-				"wide"			"14"
-				"tall"			"14"
-				"visible"		"1"
-				"enabled"		"1"
-				"scaleImage"	"1"
-				"image"			"replay/thumbnails/contracts"
-			}
 		}
 	}
 
@@ -724,9 +625,9 @@
 		"fieldName"		"MOTD_ShowButtonPanel"
 		"xpos"			"r28"
 		"ypos"			"115"
-		"zpos"			"1"
-		"wide"			"30"
-		"tall"			"24"
+		"zpos"			"0"
+		"wide"			"20"
+		"tall"			"20"
 		"autoResize"	"0"
 		"pinCorner"		"3"
 		"visible"		"1"
@@ -739,49 +640,27 @@
 			"fieldName"		"MOTD_ShowButtonPanel_SB"
 			"xpos"			"0"
 			"ypos"			"0"
-			"wide"			"30"
-			"tall"			"24"
+			"wide"			"20"
+			"tall"			"20"
 			"autoResize"	"0"
 			"pinCorner"		"3"
 			"visible"		"1"
 			"enabled"		"1"
 			"tabPosition"	"0"
-			"textinsetx"	"0"
-			"labelText"		""
-			"font"			""
+			"labelText"		"o"
+			"font"			"CustomIcons"
 			"command"		"motd_show"
+			"use_proportional_insets" "1"
 			"textAlignment"	"center"
-			"dulltext"		"0"
-			"brighttext"	"0"
 			"default"		"1"
-			"sound_depressed"	"UI/buttonclick.wav"
-			"sound_released"	"UI/buttonclickrelease.wav"
 			"actionsignallevel" "2"
-			"proportionaltoparent"	"1"
-
 			"paintbackground"	"0"
 			"paintborder"		"0"
-
-			"image_drawcolor"	"235 226 202 255"
-			"image_armedcolor"	"72 255 255 255"
+			"sound_depressed"	"UI/buttonclick.wav"
+			"sound_released"	"UI/buttonclickrelease.wav"
 
 			"defaultFgColor_override"	"235 226 202 255"
 			"armedFgColor_override"		"72 255 255 255"
-
-			"SubImage"
-			{
-				"ControlName"	"ImagePanel"
-				"fieldName"		"SubImage"
-				"xpos"			"5"
-				"ypos"			"3"
-				"zpos"			"1"
-				"wide"			"14"
-				"tall"			"14"
-				"visible"		"1"
-				"enabled"		"1"
-				"scaleImage"	"1"
-				"image"			"replay/thumbnails/motd"
-			}
 		}
 	}
 
@@ -1465,10 +1344,10 @@
 		"armedBgColor_override" 	"25 25 25 148"
 	}
 
-	"Replay"
+	"SteamWorkshopButton"
 	{
 		"ControlName"	"CExImageButton"
-		"fieldname"		"Replay"
+		"fieldname"		"SteamWorkshopButton"
 		"xpos"			"30"
 		"ypos"			"122"
 		"zpos"			"11"
@@ -1477,8 +1356,8 @@
 		"visible"		"1"
 		"enabled"		"1"
 		"AllCaps"		"1"
-		"labeltext"		"#MMenu_Replays"
-		"command" 		"engine replay_reloadbrowser"
+		"labeltext"		"#MMenu_SteamWorkshop"
+		"command"		"engine OpenSteamWorkshopDialog"
 		"font"			"Cerbetica16"
 		"textAlignment"	"west"
 		"textinsetx"	"25"
@@ -1585,11 +1464,11 @@
 		"armedBgColor_override" 	"25 25 25 148"
 	}
 
-	"SteamWorkshopButton"
+	"AchievementsButton"
 	{
 		"ControlName"	"EditablePanel"
-		"fieldname"		"SteamWorkshopButton"
-		"xpos"			"105"
+		"fieldname"		"AchievementsButton"
+		"xpos"			"104"
 		"ypos"			"62"
 		"zpos"			"12"
 		"wide"			"20"
@@ -1610,7 +1489,7 @@
 			"enabled"		"1"
 			"tabPosition"	"0"
 			"textinsetx"	"0"
-			"font"			"CustomIcons20"
+			"font"			"FontRegular20"
 			"use_proportional_insets" "1"
 			"textAlignment"	"center"
 			"dulltext"		"0"
@@ -1643,10 +1522,10 @@
 		}
 	}
 
-	"ReportBugButton"
+	"ConsoleButton"
 	{
 		"ControlName"	"EditablePanel"
-		"fieldname"		"ReportBugButton"
+		"fieldname"		"ConsoleButton"
 		"xpos"			"124"
 		"ypos"			"62"
 		"zpos"			"12"
@@ -1668,7 +1547,7 @@
 			"enabled"		"1"
 			"tabPosition"	"0"
 			"textinsetx"	"0"
-			"font"			"CustomIcons20"
+			"font"			"FontRegular20"
 			"use_proportional_insets" "1"
 			"textAlignment"	"center"
 			"dulltext"		"0"
@@ -1701,10 +1580,10 @@
 		}
 	}
 
-	"AchievementsButton"
+	"ReplayButton"
 	{
 		"ControlName"	"EditablePanel"
-		"fieldname"		"AchievementsButton"
+		"fieldname"		"ReplayButton"
 		"xpos"			"144"
 		"ypos"			"62"
 		"zpos"			"12"
@@ -1726,7 +1605,7 @@
 			"enabled"		"1"
 			"tabPosition"	"0"
 			"textinsetx"	"0"
-			"font"			"CustomIcons20"
+			"font"			"Cerbetica20"
 			"use_proportional_insets" "1"
 			"textAlignment"	"center"
 			"dulltext"		"0"
@@ -1759,10 +1638,10 @@
 		}
 	}
 
-	"ConsoleButton"
+	"ReportBugButton"
 	{
 		"ControlName"	"EditablePanel"
-		"fieldname"		"ConsoleButton"
+		"fieldname"		"ReportBugButton"
 		"xpos"			"164"
 		"ypos"			"62"
 		"zpos"			"12"
@@ -1784,7 +1663,7 @@
 			"enabled"		"1"
 			"tabPosition"	"0"
 			"textinsetx"	"0"
-			"font"			"CustomIcons20"
+			"font"			"FontRegular20"
 			"use_proportional_insets" "1"
 			"textAlignment"	"center"
 			"dulltext"		"0"
@@ -1817,10 +1696,10 @@
 		}
 	}
 
-	"ReportPlayerButton"
+	"CoachPlayersButton"
 	{
 		"ControlName"	"EditablePanel"
-		"fieldname"		"ReportPlayerButton"
+		"fieldname"		"CoachPlayersButton"
 		"xpos"			"184"
 		"ypos"			"62"
 		"zpos"			"12"
@@ -1842,7 +1721,65 @@
 			"enabled"		"1"
 			"tabPosition"	"0"
 			"textinsetx"	"0"
-			"font"			"CustomIcons20"
+			"font"			"Cerbetica20"
+			"use_proportional_insets" "1"
+			"textAlignment"	"center"
+			"dulltext"		"0"
+			"brighttext"	"0"
+			"default"		"1"
+
+			"sound_depressed"	"UI/buttonclick.wav"
+			"sound_released"	"UI/buttonclickrelease.wav"
+
+			"border_default"	""
+			"border_armed"		""
+			"paintbackground"	"0"
+
+			"image_drawcolor"	"235 226 202 255"
+			"image_armedcolor"	"72 255 255 255"
+
+			"SubImage"
+			{
+				"ControlName"	"ImagePanel"
+				"fieldName"		"SubImage"
+				"xpos"			"2"
+				"ypos"			"2"
+				"zpos"			"1"
+				"wide"			"15"
+				"tall"			"15"
+				"visible"		"1"
+				"enabled"		"1"
+				"scaleImage"	"1"
+			}
+		}
+	}
+
+	"RequestCoachButton"
+	{
+		"ControlName"	"EditablePanel"
+		"fieldname"		"RequestCoachButton"
+		"xpos"			"204"
+		"ypos"			"62"
+		"zpos"			"12"
+		"wide"			"20"
+		"tall"			"20"
+		"visible"		"1"
+
+		"SubButton"
+		{
+			"ControlName"	"CExImageButton"
+			"fieldName"		"SubButton"
+			"xpos"			"0"
+			"ypos"			"0"
+			"wide"			"20"
+			"tall"			"20"
+			"autoResize"	"0"
+			"pinCorner"		"3"
+			"visible"		"1"
+			"enabled"		"1"
+			"tabPosition"	"0"
+			"textinsetx"	"0"
+			"font"			"FontRegular20"
 			"use_proportional_insets" "1"
 			"textAlignment"	"center"
 			"dulltext"		"0"
@@ -1879,7 +1816,7 @@
 	{
 		"ControlName"	"EditablePanel"
 		"fieldname"		"CallVoteButton"
-		"xpos"			"204"
+		"xpos"			"224"
 		"ypos"			"62"
 		"zpos"			"12"
 		"wide"			"20"
@@ -1900,7 +1837,7 @@
 			"enabled"		"1"
 			"tabPosition"	"0"
 			"textinsetx"	"0"
-			"font"			"CustomIcons20"
+			"font"			"FontRegular20"
 			"use_proportional_insets" "1"
 			"textAlignment"	"center"
 			"dulltext"		"0"
@@ -1937,7 +1874,7 @@
 	{
 		"ControlName"	"EditablePanel"
 		"fieldname"		"MutePlayersButton"
-		"xpos"			"224"
+		"xpos"			"244"
 		"ypos"			"62"
 		"zpos"			"12"
 		"wide"			"20"
@@ -1958,7 +1895,7 @@
 			"enabled"		"1"
 			"tabPosition"	"0"
 			"textinsetx"	"0"
-			"font"			"CustomIcons20"
+			"font"			"FontRegular20"
 			"use_proportional_insets" "1"
 			"textAlignment"	"center"
 			"dulltext"		"0"
@@ -1991,11 +1928,11 @@
 		}
 	}
 
-	"RequestCoachButton"
+	"ReportPlayerButton"
 	{
 		"ControlName"	"EditablePanel"
-		"fieldname"		"RequestCoachButton"
-		"xpos"			"244"
+		"fieldname"		"ReportPlayerButton"
+		"xpos"			"264"
 		"ypos"			"62"
 		"zpos"			"12"
 		"wide"			"20"
@@ -2016,7 +1953,7 @@
 			"enabled"		"1"
 			"tabPosition"	"0"
 			"textinsetx"	"0"
-			"font"			"CustomIcons20"
+			"font"			"FontRegular20"
 			"use_proportional_insets" "1"
 			"textAlignment"	"center"
 			"dulltext"		"0"
@@ -2049,6 +1986,21 @@
 		}
 	}
 
+	"BGPanel1"
+	{
+		"ControlName"	"EditablePanel"
+		"fieldName"		"BGPanel1"
+		"xpos"			"30"
+		"ypos"			"57"
+		"zpos"			"-55"
+		"wide"			"260"
+		"tall"			"370"
+		"visible"		"1"
+		"enabled"		"1"
+		"bgcolor_override"		"25 25 25 148"
+		"PaintBackgroundType"	"2"
+	}
+
 	"icon_generator"
 	{
 		"ControlName"	"CEmbeddedItemModelPanel"
diff --git a/materials/sprites/obj_icons/icon_obj_cap_blu.vmt b/materials/sprites/obj_icons/icon_obj_cap_blu.vmt
deleted file mode 100644
index e55c41e..0000000
--- a/materials/sprites/obj_icons/icon_obj_cap_blu.vmt
+++ /dev/null
@@ -1,9 +0,0 @@
-"UnlitGeneric"
-{
-	"$translucent"		"1"
-	"$baseTexture"		"vgui\replay\thumbnails\cp_icons\icon_obj_cap_blu"
-	"$vertexcolor"		"1"
-	"$no_fullbright"	"1"
-	"$ignorez"			"1"
-	"%keywords"			"tf"
-}
\ No newline at end of file
diff --git a/materials/sprites/obj_icons/icon_obj_cap_mask.vmt b/materials/sprites/obj_icons/icon_obj_cap_mask.vmt
deleted file mode 100644
index 2184614..0000000
--- a/materials/sprites/obj_icons/icon_obj_cap_mask.vmt
+++ /dev/null
@@ -1,8 +0,0 @@
-"UnlitGeneric"
-{
-	"$translucent"		"1"
-	"$baseTexture"		"vgui\replay\thumbnails\cp_icons\icon_obj_cap_mask"
-	"$no_fullbright"	"1"
-	"$ignorez"			"1"
-	"%keywords"			"tf"
-}
\ No newline at end of file
diff --git a/materials/sprites/obj_icons/icon_obj_cap_red.vmt b/materials/sprites/obj_icons/icon_obj_cap_red.vmt
deleted file mode 100644
index f2fc136..0000000
--- a/materials/sprites/obj_icons/icon_obj_cap_red.vmt
+++ /dev/null
@@ -1,9 +0,0 @@
-"UnlitGeneric"
-{
-	"$translucent"		"1"
-	"$baseTexture"		"vgui\replay\thumbnails\cp_icons\icon_obj_cap_red"
-	"$vertexcolor"		"1"
-	"$no_fullbright"	"1"
-	"$ignorez"			"1"
-	"%keywords"			"tf"
-}
\ No newline at end of file
diff --git a/materials/vgui/replay/thumbnails/alert.vmt b/materials/vgui/replay/thumbnails/alert.vmt
deleted file mode 100644
index c50ccf1..0000000
--- a/materials/vgui/replay/thumbnails/alert.vmt
+++ /dev/null
@@ -1,8 +0,0 @@
-"UnlitGeneric"
-{
-	"$baseTexture" "vgui\replay\thumbnails\alert"
-	"$vertexcolor" "1"
-	"$no_fullbright" "1"
-	"$ignorez" "1"
-	"$translucent" "1"
-}
\ No newline at end of file
diff --git a/materials/vgui/replay/thumbnails/alert.vtf b/materials/vgui/replay/thumbnails/alert.vtf
deleted file mode 100644
index 84fcee8..0000000
--- a/materials/vgui/replay/thumbnails/alert.vtf
+++ /dev/null
diff --git a/materials/vgui/replay/thumbnails/chat.vtf b/materials/vgui/replay/thumbnails/chat.vtf
deleted file mode 100644
index 72ba431..0000000
--- a/materials/vgui/replay/thumbnails/chat.vtf
+++ /dev/null
diff --git a/materials/vgui/replay/thumbnails/contracts.vmt b/materials/vgui/replay/thumbnails/contracts.vmt
deleted file mode 100644
index 018c214..0000000
--- a/materials/vgui/replay/thumbnails/contracts.vmt
+++ /dev/null
@@ -1,8 +0,0 @@
-"UnlitGeneric"
-{
-	"$baseTexture" "vgui\replay\thumbnails\contracts"
-	"$vertexcolor" "1"
-	"$no_fullbright" "1"
-	"$ignorez" "1"
-	"$translucent" "1"
-}
\ No newline at end of file
diff --git a/materials/vgui/replay/thumbnails/contracts.vtf b/materials/vgui/replay/thumbnails/contracts.vtf
deleted file mode 100644
index 49e75d7..0000000
--- a/materials/vgui/replay/thumbnails/contracts.vtf
+++ /dev/null
diff --git a/materials/vgui/replay/thumbnails/cp_icons/icon_obj_cap_blu.vtf b/materials/vgui/replay/thumbnails/cp_icons/icon_obj_cap_blu.vtf
deleted file mode 100644
index e7dbefb..0000000
--- a/materials/vgui/replay/thumbnails/cp_icons/icon_obj_cap_blu.vtf
+++ /dev/null
diff --git a/materials/vgui/replay/thumbnails/cp_icons/icon_obj_cap_mask.vtf b/materials/vgui/replay/thumbnails/cp_icons/icon_obj_cap_mask.vtf
deleted file mode 100644
index 5555b4c..0000000
--- a/materials/vgui/replay/thumbnails/cp_icons/icon_obj_cap_mask.vtf
+++ /dev/null
diff --git a/materials/vgui/replay/thumbnails/cp_icons/icon_obj_cap_red.vtf b/materials/vgui/replay/thumbnails/cp_icons/icon_obj_cap_red.vtf
deleted file mode 100644
index c362720..0000000
--- a/materials/vgui/replay/thumbnails/cp_icons/icon_obj_cap_red.vtf
+++ /dev/null
diff --git a/materials/vgui/replay/thumbnails/chat.vmt b/materials/vgui/replay/thumbnails/mmbg.vmt
index d565b84..b079707 100644
--- a/materials/vgui/replay/thumbnails/chat.vmt
+++ b/materials/vgui/replay/thumbnails/mmbg.vmt
@@ -1,6 +1,6 @@
 "UnlitGeneric"
 {
-	"$baseTexture" "vgui\replay\thumbnails\chat"
+	"$baseTexture" "vgui\replay\thumbnails\mmbg"
 	"$vertexcolor" "1"
 	"$no_fullbright" "1"
 	"$ignorez" "1"
diff --git a/materials/vgui/replay/thumbnails/mmbg.vtf b/materials/vgui/replay/thumbnails/mmbg.vtf
new file mode 100644
index 0000000..20d6aad
--- /dev/null
+++ b/materials/vgui/replay/thumbnails/mmbg.vtf
diff --git a/materials/vgui/replay/thumbnails/motd.vtf b/materials/vgui/replay/thumbnails/motd.vtf
deleted file mode 100644
index f68e205..0000000
--- a/materials/vgui/replay/thumbnails/motd.vtf
+++ /dev/null
diff --git a/materials/vgui/replay/thumbnails/motd.vmt b/materials/vgui/replay/thumbnails/nogc.vmt
index d4529a0..d1a45c3 100644
--- a/materials/vgui/replay/thumbnails/motd.vmt
+++ b/materials/vgui/replay/thumbnails/nogc.vmt
@@ -1,6 +1,6 @@
 "UnlitGeneric"
 {
-	"$baseTexture" "vgui\replay\thumbnails\motd"
+	"$basetexture" "vgui\replay\thumbnails\nogc"
 	"$vertexcolor" "1"
 	"$no_fullbright" "1"
 	"$ignorez" "1"
diff --git a/materials/vgui/replay/thumbnails/raysfox.vtf b/materials/vgui/replay/thumbnails/nogc.vtf
index e9527ac..e9527ac 100644
--- a/materials/vgui/replay/thumbnails/raysfox.vtf
+++ b/materials/vgui/replay/thumbnails/nogc.vtf
diff --git a/materials/vgui/replay/thumbnails/raysfox.vmt b/materials/vgui/replay/thumbnails/raysfox.vmt
deleted file mode 100644
index 2ca2c2e..0000000
--- a/materials/vgui/replay/thumbnails/raysfox.vmt
+++ /dev/null
@@ -1,8 +0,0 @@
-"UnlitGeneric"
-{
-	"$basetexture" "vgui\replay\thumbnails\raysfox"
-	"$vertexcolor" "1"
-	"$no_fullbright" "1"
-	"$ignorez" "1"
-	"$translucent" "1"
-}
\ No newline at end of file
diff --git a/materials/vgui/replay/thumbnails/twitch.vmt b/materials/vgui/replay/thumbnails/twitch.vmt
deleted file mode 100644
index a76e635..0000000
--- a/materials/vgui/replay/thumbnails/twitch.vmt
+++ /dev/null
@@ -1,8 +0,0 @@
-"UnlitGeneric"
-{
-	"$baseTexture" "vgui\replay\thumbnails\twitch"
-	"$vertexcolor" "1"
-	"$no_fullbright" "1"
-	"$ignorez" "1"
-	"$translucent" "1"
-}
\ No newline at end of file
diff --git a/materials/vgui/replay/thumbnails/twitch.vtf b/materials/vgui/replay/thumbnails/twitch.vtf
deleted file mode 100644
index 8132d48..0000000
--- a/materials/vgui/replay/thumbnails/twitch.vtf
+++ /dev/null
diff --git a/resource/clientscheme.res b/resource/clientscheme.res
index 992e072..6ec0ba1 100644
--- a/resource/clientscheme.res
+++ b/resource/clientscheme.res
@@ -3,4 +3,7 @@
 #base "scheme/clientscheme_fonts.res"
 #base "scheme/clientscheme_icons.res"
 #base "scheme/clientscheme_settings.res"
-#base "scheme/clientscheme_xhairs.res"
\ No newline at end of file
+#base "scheme/clientscheme_xhairs.res"
+#base "scheme/clientscheme_xhairs_blur.res"
+#base "scheme/clientscheme_xhairs_outline.res"
+#base "scheme/clientscheme_xhairs_shadow.res"
\ No newline at end of file
diff --git a/resource/fonts/FlawHUDIcons.otf b/resource/fonts/FlawHUDIcons.otf
deleted file mode 100644
index 3c5dde3..0000000
--- a/resource/fonts/FlawHUDIcons.otf
+++ /dev/null
diff --git a/resource/gamemenu.res b/resource/gamemenu.res
index 657b57a..521d3e8 100644
--- a/resource/gamemenu.res
+++ b/resource/gamemenu.res
@@ -1,12 +1,5 @@
 "GameMenu"
 {
-	"SteamWorkshopButton"
-	{
-		"label" 		""
-		"command"		"engine OpenSteamWorkshopDialog"
-		"subimage" 		"glyph_steamworkshop"
-		"tooltip" 		"#MMenu_Tooltip_Workshop"
-	}
 	"AchievementsButton"
 	{
 		"label"			""
@@ -14,6 +7,13 @@
 		"subimage" 		"glyph_achievements"
 		"tooltip" 		"#Achievements"
 	}
+	"ReplayButton"
+	{
+		"label"			""
+		"command"		"engine replay_reloadbrowser"
+		"subimage" 		"glyph_tv"
+		"tooltip" 		"#MMenu_Tooltip_Replay"
+	}
 	"ConsoleButton"
 	{
 		"label"			""
@@ -28,6 +28,13 @@
 		"subimage"		"glyph_bug"
 		"tooltip"		"#MMenu_Tooltip_ReportBug"
 	}
+	"CoachPlayersButton"
+	{
+		"label" 		""
+		"command" 		"engine cl_coach_toggle"
+		"subimage" 		"glyph_commentary"
+		"tooltip" 		"#MMenu_Tooltip_Coach"
+	}
 	"CallVoteButton"
 	{
 		"label"			""
diff --git a/resource/preload.res b/resource/preload.res
index d2a8c8b..3c795f4 100644
--- a/resource/preload.res
+++ b/resource/preload.res
@@ -119,34 +119,4 @@
 		"enabled"		"1"
 		"image"			"../sprites/obj_icons/icon_obj_e"
 	}
-
-	"cpiconcapblu"
-	{
-		"ControlName"	"ImagePanel"
-		"fieldName"		"cpiconcapblu"
-		"xpos"			"9999"
-		"visible"		"1"
-		"enabled"		"1"
-		"image"			"../sprites/obj_icons/icon_obj_cap_blu"
-	}
-
-	"cpiconcapred"
-	{
-		"ControlName"	"ImagePanel"
-		"fieldName"		"cpiconcapred"
-		"xpos"			"9999"
-		"visible"		"1"
-		"enabled"		"1"
-		"image"			"../sprites/obj_icons/icon_obj_cap_red"
-	}
-
-	"cpiconcapmask"
-	{
-		"ControlName"	"ImagePanel"
-		"fieldName"		"cpiconcapmask"
-		"xpos"			"9999"
-		"visible"		"1"
-		"enabled"		"1"
-		"image"			"../sprites/obj_icons/icon_obj_cap_mask"
-	}
 }
\ No newline at end of file
diff --git a/resource/scheme/clientscheme_borders.res b/resource/scheme/clientscheme_borders.res
index f15b6b4..5cf288a 100644
--- a/resource/scheme/clientscheme_borders.res
+++ b/resource/scheme/clientscheme_borders.res
@@ -2289,7 +2289,7 @@ Scheme
 		{
 			"bordertype"			"scalable_image"
 			"backgroundtype"		"2"
-			"image"					"button_holder_central"
+			"image"					"replay/thumbnails/mmbg"
 			"src_corner_height"		"32"			// pixels inside the image
 			"src_corner_width"		"32"
 			"draw_corner_width"		"0"				// screen size of the corners ( and sides ), proportional
diff --git a/resource/scheme/clientscheme_colors.res b/resource/scheme/clientscheme_colors.res
index c5bebfa..c29043b 100644
--- a/resource/scheme/clientscheme_colors.res
+++ b/resource/scheme/clientscheme_colors.res
@@ -22,11 +22,11 @@ Scheme
 		"ColorGreyMid"				"128 128 128 255"
 		"ColorGreyLight"			"192 192 192 255"
 		"ColorWhite"				"255 255 255 255"
+		"DullWhite"					"132 132 132 255"
 		"Grey"						"51 47 46 255"
 		"DarkGrey"					"27 27 27 255"
 		"DarkerGrey"				"22 22 22 255"
 		"TextColor"					"117 107 94 255"
-		"DullWhite"					"132 132 132 255"
 		//---------------------------------------------
 		// Gameplay
 		"Ammo In Clip"				"48 255 48 255"
@@ -38,7 +38,6 @@ Scheme
 		"Health Hurt"				"255 153 0 255"
 		"Heal Numbers"				"48 255 48 255"
 		"Last DamageHeal Info"		"72 255 255 255"
-		"TransparentPanelBG"		"25 25 25 148"
 		"ItemPanelBG"				"50 50 50 255"
 		"Button Color"				"72 255 255 255"
 		//---------------------------------------------
@@ -94,6 +93,7 @@ Scheme
 		"Red"									"192 28 0 140"
 		"RedSolid"								"192 28 0 255"
 		"Blue"									"0 28 162 140"
+		"BlueSolid"								"0 28 162 255"
 		"Yellow"								"251 235 202 255"
 		"TransparentYellow"						"251 235 202 140"
 		"BrightYellow"							"251 235 0 255"
diff --git a/resource/scheme/clientscheme_fonts.res b/resource/scheme/clientscheme_fonts.res
index dbf13dd..4578dd8 100644
--- a/resource/scheme/clientscheme_fonts.res
+++ b/resource/scheme/clientscheme_fonts.res
@@ -807,10 +807,9 @@ Scheme
 			"1"
 			{
 				"name"			"Cerbetica_edited"
-				"tall"			"10"
-				"weight"		"0"
-				"additive"		"0"
-				"antialias"		"1"
+				"tall"			"12"
+				"weight"		"700"
+				"yres"			"480 599"
 			}
 			"2"
 			{
@@ -850,7 +849,7 @@ Scheme
 				"tall"			"24"
 				"weight"		"500"
 				"additive"		"0"
-				"antialias" 	"1"
+				"antialias"		"1"
 				"yres"			"480 599"
 			}
 			"2"
@@ -2056,8 +2055,8 @@ Scheme
 			"1"
 			{
 				"name"			"Verdana"
-				"tall"			"11"  	[!$OSX]
-				"tall"			"9"  	[$OSX]
+				"tall"			"11"	[!$OSX]
+				"tall"			"9"		[$OSX]
 				"weight"		"800"
 				"additive"		"0"
 				"antialias" 	"1"
@@ -2339,7 +2338,7 @@ Scheme
 			"1"
 			{
 				"name"			"Cerbetica_edited"
-				"tall"			"8"
+				"tall"			"10"
 				"weight"		"500"
 				"additive"		"0"
 				"antialias" 	"1"
@@ -2367,17 +2366,6 @@ Scheme
 				"antialias" 	"1"
 			}
 		}
-		"ItemMeterFontSmall"
-		{
-			"1"
-			{
-				"name"			"Cerbetica_edited"
-				"tall"			"6"
-				"weight"		"500"
-				"additive"		"0"
-				"antialias" 	"1"
-			}
-		}
 
 		"AchievementTracker_Name"
 		{
@@ -2527,7 +2515,7 @@ Scheme
 				"tall"			"16"
 				"weight"		"400"
 				"additive"		"0"
-				"antialias" 	"1"
+				"antialias"		"1"
 			}
 		}
 		"QuestStickyText"
@@ -2642,7 +2630,7 @@ Scheme
 				"tall"			"13"
 				"weight"		"400"
 				"additive"		"0"
-				"antialias" 	"1"
+				"antialias"		"1"
 			}
 		}
 		"QuestLargeText_Merasmus"
@@ -2653,7 +2641,7 @@ Scheme
 				"tall"			"16"
 				"weight"		"400"
 				"additive"		"0"
-				"antialias" 	"1"
+				"antialias"		"1"
 			}
 		}
 
@@ -2676,7 +2664,7 @@ Scheme
 				"tall"			"8"
 				"weight"		"400"
 				"additive"		"0"
-				"antialias"	 	"1"
+				"antialias"		"1"
 			}
 		}
 		"AdFont_PurchaseButton"
@@ -2866,7 +2854,7 @@ Scheme
 				"tall"			"24"
 				"weight"		"500"
 				"additive"		"0"
-				"antialias" 	"1"
+				"antialias"		"1"
 			}
 		}
 		"ReplayLarger"
@@ -2967,18 +2955,6 @@ Scheme
 			}
 		}
 
-		"TF2ComboBox"
-		{
-			"1"
-			{
-				"name"			"TF2 Secondary"
-				"tall"			"11"
-				"weight"		"500"
-				"additive"		"0"
-				"antialias"		"1"
-			}
-		}
-
 		"QuestMap_Small_Blur"
 		{
 			"1"
@@ -3105,10 +3081,71 @@ Scheme
 		}
 		"7"
 		{
+			"font"	"resource/ocra.ttf"
+			"name"	"ocra"
+			"turkish"
+			{
+				"range" "0x0000 0x007E"
+			}
+			"swedish"
+			{
+				"range" "0x0000 0x007E"
+			}
+			"spanish"
+			{
+				"range" "0x0000 0x007E"
+			}
+			"romanian"
+			{
+				"range" "0x0000 0x007E"
+			}
+			"polish"
+			{
+				"range" "0x0000 0x007E"
+			}
+			"norwegian"
+			{
+				"range" "0x0000 0x007E"
+			}
+			"danish"
+			{
+				"range" "0x0000 0x007E"
+			}
+			"hungarian"
+			{
+				"range" "0x0000 0x007E"
+			}
+			"german"
+			{
+				"range" "0x0000 0x007E"
+			}
+			"french"
+			{
+				"range" "0x0000 0x007E"
+			}
+			"finnish"
+			{
+				"range" "0x0000 0x007E"
+			}
+			"czech"
+			{
+				"range" "0x0000 0x007E"
+			}
+			"bulgarian"
+			{
+				"range" "0x0000 0x007E"
+			}
+			"russian"
+			{
+				"range" "0x0000 0x007E"
+			}
+		}
+		"8"
+		{
 			"font"	"resource/fonts/Cerbetica_bold.ttf"
 			"name"	"Cerbetica Bold"
 		}
-		"8"
+		"9"
 		{
 			"font"	"resource/fonts/Cerbetica_edited.ttf"
 			"name"	"Cerbetica_edited"
diff --git a/resource/scheme/clientscheme_icons.res b/resource/scheme/clientscheme_icons.res
index 614a1a3..2dccc84 100644
--- a/resource/scheme/clientscheme_icons.res
+++ b/resource/scheme/clientscheme_icons.res
@@ -26,52 +26,7 @@ Scheme
 			}
 		}
 
-		"ClassIconsSmall"
-		{
-			"1"
-			{
-				"name"			"FlawHUDIcons"
-				"tall"			"42"
-				"weight"		"0"
-				"additive"		"0"
-				"antialias"		"1"
-			}
-		}
-
-		"CustomIcons10"
-		{
-			"1"
-			{
-				"name"			"FlawHUDIcons"
-				"tall"			"10"
-				"additive"		"0"
-				"antialias"		"1"
-			}
-		}
-
-		"CustomIcons12"
-		{
-			"1"
-			{
-				"name"			"FlawHUDIcons"
-				"tall"			"12"
-				"additive"		"0"
-				"antialias"		"1"
-			}
-		}
-
-		"CustomIcons14"
-		{
-			"1"
-			{
-				"name"			"FlawHUDIcons"
-				"tall"			"14"
-				"additive"		"0"
-				"antialias"		"1"
-			}
-		}
-
-		"CustomIcons18"
+		"CustomIcons"
 		{
 			"1"
 			{
@@ -81,24 +36,13 @@ Scheme
 				"antialias"		"1"
 			}
 		}
-
-		"CustomIcons20"
-		{
-			"1"
-			{
-				"name"			"FlawHUDIcons"
-				"tall"			"20"
-				"additive"		"0"
-				"antialias"		"1"
-			}
-		}
 	}
 
 	CustomFontFiles
 	{
 		"121"
 		{
-			"font"	"resource/fonts/FlawHUDIcons.otf"
+			"font"	"resource/fonts/Icons.otf"
 			"name"	"FlawHUDIcons"
 		}
 	}
diff --git a/resource/scheme/clientscheme_settings.res b/resource/scheme/clientscheme_settings.res
index 1f310a5..1f70bf4 100644
--- a/resource/scheme/clientscheme_settings.res
+++ b/resource/scheme/clientscheme_settings.res
@@ -2,6 +2,7 @@ Scheme
 {
 	BaseSettings
 	{
+		// vgui_controls color specifications
 		ReplayBrowser.BgColor							"DarkBrown"
 		ReplayBrowser.Details.TitleEdit.Carat.FgColor	"200 128 255 255"
 		ReplayBrowser.Button.ArmedBgColor				"TFOrange"
@@ -11,22 +12,22 @@ Scheme
 		ReplayBrowser.ScrollBar.SliderButton.FgColor	"TransparentYellow"
 		ReplayBrowser.Search.BgColor					"TanDark"
 		ReplayBrowser.Search.FgColor					"White"
-		Replay.RenderDialog.BgColor						"30 30 30 255"
+		Replay.RenderDialog.BgColor						"TanDark"
 
 		Econ.Dialog.BgColor						"Blank"
-		Econ.Button.BgColor						"25 25 25 255"
+		Econ.Button.BgColor						"TanDarker"
 		Econ.Button.FgColor						"TanDark"
-		Econ.Button.ArmedBgColor				"35 35 35 255"
+		Econ.Button.ArmedBgColor				"TanDark"
 		Econ.Button.ArmedFgColor				"TanLight"
-		Econ.Button.DepressedBgColor			"25 25 25 255"
+		Econ.Button.DepressedBgColor			"TanDarker"
 		Econ.Button.DepressedFgColor			"TanDark"
 		Econ.Button.PresetDefaultColorFg		"15 255 255 255"
 		Econ.Button.PresetArmedColorFg			"15 255 255 255"
 		Econ.Button.PresetDepressedColorFg		"15 255 255 255"
-		Econ.Button.PresetDefaultColorBg		"25 25 25 255"
+		Econ.Button.PresetDefaultColorBg		"TanDarker"
 		Econ.Button.PresetArmedColorBg			"50 50 50 255"
-		Econ.Button.PresetDepressedColorBg		"25 25 25 255"
-		Econ.Button.Border.Default				"25 25 25 255"
+		Econ.Button.PresetDepressedColorBg		"TanDarker"
+		Econ.Button.Border.Default				"TanDarker"
 		Econ.Button.Border.Armed				"50 50 50 255"
 
 		Border.Bright							"NoBorder"
@@ -34,13 +35,13 @@ Scheme
 		Border.Selection						"NoBorder"
 
 		Button.TextColor						"TanLight"
-		Button.BgColor							"25 25 25 255"
+		Button.BgColor							"TanDarker"
 		Button.ArmedTextColor					"TanLight"
-		Button.ArmedBgColor						"35 35 35 255"
+		Button.ArmedBgColor						"TanDark"
 		Button.SelectedTextColor				"TanLight"
-		Button.SelectedBgColor					"25 25 25 255"
+		Button.SelectedBgColor					"TanDarker"
 		Button.DepressedTextColor				"TanLight"
-		Button.DepressedBgColor					"35 35 35 255"
+		Button.DepressedBgColor					"TanDark"
 
 		CheckButton.TextColor					"Yellow"
 		CheckButton.SelectedTextColor			"Yellow"
diff --git a/resource/sourcescheme.res b/resource/sourcescheme.res
index 027f646..aed9b7a 100644
--- a/resource/sourcescheme.res
+++ b/resource/sourcescheme.res
@@ -7,12 +7,20 @@ Scheme
 		// HUD COLORS
 		//---------------------------------------------
 		"HudBlack"					"0 0 0 200"
-		"Cyan"						"15 255 255 255"
+		"Blue"						"72 112 125 255"
+		"DarkBlue"					"46 73 82 255"
+		"Red"						"158 64 61 255"
+		"DarkRed"					"102 48 46 255"
+		"Green"						"92 122 90 255"
+		"DarkGreen"					"38 53 36 255"
 		"Yellow"					"169 123 53 255"
+		"BrightYellow"				"218 165 32 255"
 		"White"						"242 242 242 255"
-		"DullWhite"					"142 142 142 255"
+		"DullWhite"					"132 132 132 255"
+		"Grey"						"51 47 46 255"
 		"DarkGrey"					"27 27 27 255"
-		"Black"						"15 15 15 255"
+		"DarkerGrey"				"22 22 22 255"
+		"Black"						"17 17 17 255"
 
 		// BASE COLORS
 		//---------------------------------------------
@@ -109,15 +117,15 @@ Scheme
 		ListPanel.SelectedOutOfFocusBgColor	"DullWhite"
 
 		MainMenu.TextColor					"DullWhite"
-		MainMenu.ArmedTextColor				"Cyan"
+		MainMenu.ArmedTextColor				"White"
 		MainMenu.Inset						"32"
 
 		Menu.TextInset						"6"
 		Menu.FgColor						"White"
 		Menu.BgColor						"HudBlack"
-		Menu.ArmedFgColor					"Cyan"
-		Menu.ArmedBgColor					"Cyan"
-		Menu.DividerColor					"Border.Dark"
+		Menu.ArmedFgColor					"Black"
+		Menu.ArmedBgColor					"White"
+`		Menu.DividerColor					"Border.Dark"
 
 		ScrollBarButton.FgColor				"White"
 		ScrollBarButton.BgColor				"Black"
@@ -137,7 +145,7 @@ Scheme
 
 		TextEntry.TextColor					"White"
 		TextEntry.DisabledTextColor	        "DullWhite"
-		TextEntry.SelectedBgColor			"Cyan"
+		TextEntry.SelectedBgColor			"White"
 	}
 
 	Fonts
diff --git a/resource/ui/econ/confirmapplycardupgradeapplicationdialog.res b/resource/ui/econ/confirmapplycardupgradeapplicationdialog.res
deleted file mode 100644
index 6dfa026..0000000
--- a/resource/ui/econ/confirmapplycardupgradeapplicationdialog.res
+++ /dev/null
@@ -1,276 +0,0 @@
-"Resource/UI/ConfirmApplyCardUpgradeApplicationDialog.res"
-{
-	"ConfirmApplyCardUpgradeApplicationDialog"
-	{
-		"fieldName"			"ConfirmApplyCardUpgradeApplicationDialog"
-		"visible"			"1"
-		"enabled"			"1"
-		"xpos"				"c-200"
-		"ypos"				"c-200"
-		"wide"				"400"
-		"tall"				"240"
-		"settitlebarvisible" "0"
-		"paintborder"		"2"
-		"paintbackground"	"1"
-		"border"			"CyanBorderThick"
-		"bgcolor_override"	"25 25 25 255"
-	}
-
-	"mouseoveritempanel"
-	{
-		"ControlName"		"CItemModelPanel"
-		"fieldName"			"mouseoveritempanel"
-		"xpos"				"c-70"
-		"ypos"				"270"
-		"zpos"				"100"
-		"wide"				"300"
-		"tall"				"300"
-		"visible"			"0"
-		"bgcolor_override"	"Transparent"
-		"noitem_textcolor"	"TextColor"
-		"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"			"101"
-			"wide"			"140"
-			"tall"			"60"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"labelText"		"%attriblist%"
-			"textAlignment"	"center"
-			"fgcolor"		"TextColor"
-			"centerwrap"	"1"
-		}
-    }
-
-	"TitleLabel"
-	{
-		"ControlName"		"CExLabel"
-		"fieldName"			"TitleLabel"
-		"font"				"Cerbetica22"
-		"labelText"			"dynamic"
-		"textAlignment"		"center"
-		"xpos"				"100"
-		"ypos"				"10"
-		"zpos"				"0"
-		"wide"				"200"
-		"tall"				"60"
-		"autoResize"		"1"
-		"pinCorner"			"0"
-		"visible"			"1"
-		"enabled"			"1"
-		"centerwrap"		"1"
-	}
-
-	"ToolBG"
-	{
-		"ControlName"		"CExLabel"
-		"fieldName"			"ToolBG"
-		"font"				"HudFontSmallBold"
-		"labelText"			""
-		"textAlignment"		"east"
-		"xpos"				"10"
-		"ypos"				"10"
-		"zpos"				"-1"
-		"wide"				"84"
-		"tall"				"64"
-		"autoResize"		"1"
-		"pinCorner"			"0"
-		"visible"			"1"
-		"enabled"			"1"
-		"paintbackground"	"0"
-		"border"			"BackpackItemBorder_SelfMade"
-	}
-	"tool_icon"
-	{
-		"ControlName"		"ScalableImagePanel"
-		"fieldName"			"tool_icon"
-		"xpos"				"10"
-		"ypos"				"10"
-		"zpos"				"2"
-		"wide"				"16"
-		"tall"				"16"
-		"visible"			"1"
-		"enabled"			"1"
-		"image"				"backpack_jewel_modify_target_b_g"
-		"tileImage"			"0"
-		"tileVertically"	"0"
-		"drawcolor"			"112 176 74 255"
-	}
-	"tool_modelpanel"
-	{
-		"ControlName"		"CItemModelPanel"
-		"fieldName"			"tool_modelpanel"
-		"xpos"				"10"
-		"ypos"				"10"
-		"zpos"				"1"
-		"wide"				"84"
-		"tall"				"64"
-		"visible"			"1"
-		"bgcolor_override"	"Transparent"
-		"noitem_textcolor"	"TextColor"
-		"PaintBackgroundType"	"2"
-		"paintborder"		"0"
-		"model_xpos"		"2"
-		"model_ypos"		"5"
-		"model_wide"		"80"
-		"model_tall"		"54"
-		"text_ypos"			"100"
-		"text_center"		"1"
-		"name_only"			"1"
-		"paint_icon_hide"	"1"
-
-		"itemmodelpanel"
-		{
-			"use_item_rendertarget" "0"
-			"allow_rot"				"0"
-			"inventory_image_type"	"1"
-		}
-	}
-	"SubjectBG"
-	{
-		"ControlName"		"CExLabel"
-		"fieldName"			"SubjectBG"
-		"font"				"HudFontSmallBold"
-		"labelText"			""
-		"textAlignment"		"east"
-		"xpos"				"300"
-		"ypos"				"10"
-		"zpos"				"-1"
-		"wide"				"84"
-		"tall"				"64"
-		"autoResize"		"1"
-		"pinCorner"			"0"
-		"visible"			"1"
-		"enabled"			"1"
-		"paintbackground"	"0"
-		"border"			"BackpackItemBorder_Vintage"
-	}
-	"subject_icon"
-	{
-		"ControlName"		"ScalableImagePanel"
-		"fieldName"			"subject_icon"
-		"xpos"				"300"
-		"ypos"				"10"
-		"zpos"				"2"
-		"wide"				"16"
-		"tall"				"16"
-		"visible"			"1"
-		"enabled"			"1"
-		"image"				"backpack_jewel_modify_target_b_g"
-		"tileImage"			"0"
-		"tileVertically"	"0"
-		"drawcolor"			"71 98 145 255"
-	}
-	"subject_modelpanel"
-	{
-		"ControlName"		"CItemModelPanel"
-		"fieldName"			"subject_modelpanel"
-		"xpos"				"300"
-		"ypos"				"10"
-		"zpos"				"1"
-		"wide"				"84"
-		"tall"				"64"
-		"visible"			"1"
-		"bgcolor_override"	"Transparent"
-		"noitem_textcolor"	"TextColor"
-		"PaintBackgroundType"	"2"
-		"paintborder"		"0"
-		"model_xpos"		"2"
-		"model_ypos"		"5"
-		"model_wide"		"80"
-		"model_tall"		"54"
-		"text_ypos"			"100"
-		"text_center"		"1"
-		"name_only"			"1"
-
-		"itemmodelpanel"
-		{
-			"use_item_rendertarget" "0"
-			"allow_rot"				"0"
-			"inventory_image_type"	"1"
-		}
-	}
-	"ConfirmLabel"
-	{
-		"ControlName"		"CExLabel"
-		"fieldName"			"ConfirmLabel"
-		"font"				"HudFontSmall"
-		"labelText"			"#ToolCardUpgradeApplyConfirm"
-		"textAlignment"		"center"
-		"xpos"				"20"
-		"ypos"				"80"
-		"zpos"				"0"
-		"wide"				"360"
-		"tall"				"120"
-		"autoResize"		"1"
-		"pinCorner"			"0"
-		"visible"			"1"
-		"enabled"			"1"
-		"fgcolor_override"	"Yellow"
-	}
-	"CancelButton"
-	{
-		"ControlName"		"CExButton"
-		"fieldName"			"CancelButton"
-		"xpos"				"50"
-		"ypos"				"200"
-		"zpos"				"1"
-		"wide"				"130"
-		"tall"				"25"
-		"autoResize"		"0"
-		"pinCorner"			"3"
-		"visible"			"1"
-		"enabled"			"1"
-		"tabPosition"		"0"
-		"labelText"			"#Cancel"
-		"font"				"HudFontSmall"
-		"textAlignment"		"center"
-		"dulltext"			"0"
-		"brighttext"		"0"
-		"default"			"0"
-		"Command"			"cancel"
-		"sound_depressed"	"UI/buttonclick.wav"
-		"sound_released"	"UI/buttonclickrelease.wav"
-		"border_default"	"ButtonHover"
-		"border_armed"		"ButtonHover"
-	}
-	"OkButton"
-	{
-		"ControlName"		"CExButton"
-		"fieldName"			"OkButton"
-		"xpos"				"220"
-		"ypos"				"200"
-		"zpos"				"1"
-		"wide"				"130"
-		"tall"				"25"
-		"autoResize"		"0"
-		"pinCorner"			"3"
-		"visible"			"1"
-		"enabled"			"1"
-		"tabPosition"		"0"
-		"labelText"			"#CraftNameConfirm"
-		"font"				"HudFontSmall"
-		"textAlignment"		"center"
-		"dulltext"			"0"
-		"brighttext"		"0"
-		"default"			"1"
-		"Command"			"apply"
-		"sound_depressed"	"UI/buttonclick.wav"
-		"sound_released"	"UI/buttonclickrelease.wav"
-		"border_default"	"ButtonHover"
-		"border_armed"		"ButtonHover"
-	}
-}
\ No newline at end of file
diff --git a/resource/ui/econ/confirmapplydecodedialog.res b/resource/ui/econ/confirmapplydecodedialog.res
deleted file mode 100644
index 606c27a..0000000
--- a/resource/ui/econ/confirmapplydecodedialog.res
+++ /dev/null
@@ -1,293 +0,0 @@
-"Resource/UI/ConfirmApplyDecodeDialog.res"
-{
-	"ConfirmApplyDecodeDialog"
-	{
-		"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"
-	}
-
-	"mouseoveritempanel"
-	{
-		"ControlName"		"CItemModelPanel"
-		"fieldName"			"mouseoveritempanel"
-		"xpos"				"c-70"
-		"ypos"				"270"
-		"zpos"				"100"
-		"wide"				"300"
-		"tall"				"300"
-		"visible"			"0"
-		"bgcolor_override"	"Transparent"
-		"noitem_textcolor"	"TextColor"
-		"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"			"101"
-			"wide"			"140"
-			"tall"			"60"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"labelText"		"%attriblist%"
-			"textAlignment"	"center"
-			"fgcolor"		"TextColor"
-			"centerwrap"	"1"
-		}
-	}
-
-	"TitleLabel"
-	{
-		"ControlName"		"CExLabel"
-		"fieldName"			"TitleLabel"
-		"font"				"Cerbetica22"
-		"labelText"			"dynamic"
-		"textAlignment"		"center"
-		"xpos"				"100"
-		"ypos"				"10"
-		"zpos"				"0"
-		"wide"				"200"
-		"tall"				"60"
-		"autoResize"		"1"
-		"pinCorner"			"0"
-		"visible"			"1"
-		"enabled"			"1"
-		"centerwrap"		"1"
-	}
-
-	"ToolBG"
-	{
-		"ControlName"		"CExLabel"
-		"fieldName"			"ToolBG"
-		"font"				"HudFontSmallBold"
-		"labelText"			""
-		"textAlignment"		"east"
-		"xpos"				"10"
-		"ypos"				"10"
-		"zpos"				"-1"
-		"wide"				"84"
-		"tall"				"64"
-		"autoResize"		"1"
-		"pinCorner"			"0"
-		"visible"			"1"
-		"enabled"			"1"
-		"paintbackground"	"0"
-		"border"			"BackpackItemBorder_SelfMade"
-	}
-	"tool_icon"
-	{
-		"ControlName"		"ScalableImagePanel"
-		"fieldName"			"tool_icon"
-		"xpos"				"10"
-		"ypos"				"10"
-		"zpos"				"2"
-		"wide"				"16"
-		"tall"				"16"
-		"visible"			"1"
-		"enabled"			"1"
-		"image"				"backpack_jewel_modify_target_b_g"
-		"tileImage"			"0"
-		"tileVertically"	"0"
-		"drawcolor"			"112 176 74 255"
-	}
-	"tool_modelpanel"
-	{
-		"ControlName"		"CItemModelPanel"
-		"fieldName"			"tool_modelpanel"
-		"xpos"				"10"
-		"ypos"				"10"
-		"zpos"				"1"
-		"wide"				"84"
-		"tall"				"64"
-		"visible"			"1"
-		"bgcolor_override"	"Transparent"
-		"noitem_textcolor"	"TextColor"
-		"PaintBackgroundType"	"2"
-		"paintborder"		"0"
-		"model_xpos"		"2"
-		"model_ypos"		"5"
-		"model_wide"		"80"
-		"model_tall"		"54"
-		"text_ypos"			"100"
-		"text_center"		"1"
-		"name_only"			"1"
-		"paint_icon_hide"	"1"
-
-		"itemmodelpanel"
-		{
-			"use_item_rendertarget" "0"
-			"allow_rot"				"0"
-			"inventory_image_type"	"1"
-		}
-	}
-	"SubjectBG"
-	{
-		"ControlName"		"CExLabel"
-		"fieldName"			"SubjectBG"
-		"font"				"HudFontSmallBold"
-		"labelText"			""
-		"textAlignment"		"east"
-		"xpos"				"300"
-		"ypos"				"10"
-		"zpos"				"-1"
-		"wide"				"84"
-		"tall"				"64"
-		"autoResize"		"1"
-		"pinCorner"			"0"
-		"visible"			"1"
-		"enabled"			"1"
-		"paintbackground"	"0"
-		"border"			"BackpackItemBorder_Vintage"
-	}
-	"subject_icon"
-	{
-		"ControlName"		"ScalableImagePanel"
-		"fieldName"			"subject_icon"
-		"xpos"				"300"
-		"ypos"				"10"
-		"zpos"				"2"
-		"wide"				"16"
-		"tall"				"16"
-		"visible"			"1"
-		"enabled"			"1"
-		"image"				"backpack_jewel_modify_target_b_g"
-		"tileImage"			"0"
-		"tileVertically"	"0"
-		"drawcolor"			"71 98 145 255"
-	}
-	"subject_modelpanel"
-	{
-		"ControlName"		"CItemModelPanel"
-		"fieldName"			"subject_modelpanel"
-		"xpos"				"300"
-		"ypos"				"10"
-		"zpos"				"1"
-		"wide"				"84"
-		"tall"				"64"
-		"visible"			"1"
-		"bgcolor_override"	"Transparent"
-		"noitem_textcolor"	"TextColor"
-		"PaintBackgroundType"	"2"
-		"paintborder"		"0"
-		"model_xpos"		"2"
-		"model_ypos"		"5"
-		"model_wide"		"80"
-		"model_tall"		"54"
-		"text_ypos"			"100"
-		"text_center"		"1"
-		"name_only"			"1"
-
-		"itemmodelpanel"
-		{
-			"use_item_rendertarget" "0"
-			"allow_rot"				"0"
-			"inventory_image_type"	"1"
-		}
-	}
-
-	"ConfirmLabel"
-	{
-		"ControlName"		"CExLabel"
-		"fieldName"			"ConfirmLabel"
-		"font"				"HudFontSmall"
-		"labelText"			"#ToolDecodeConfirm"
-		"textAlignment"		"center"
-		"xpos"				"20"
-		"ypos"				"80"
-		"zpos"				"0"
-		"wide"				"360"
-		"tall"				"20"
-		"autoResize"		"1"
-		"pinCorner"			"0"
-		"visible"			"1"
-		"enabled"			"1"
-		"fgcolor_override"	"Yellow"
-	}
-
-	"OptionalAppendLabel"
-	{
-		"ControlName"		"CExLabel"
-		"fieldName"			"OptionalAppendLabel"
-		"font"				"FontRegular12"
-		"labelText"			"%optional_append%"
-		"textAlignment"		"center"
-		"xpos"				"20"
-		"ypos"				"120"
-		"zpos"				"0"
-		"wide"				"360"
-		"tall"				"60"
-		"autoResize"		"1"
-		"pinCorner"			"0"
-		"visible"			"1"
-		"enabled"			"1"
-		"fgcolor_override" 	"LightRed"
-	}
-
-	"CancelButton"
-	{
-		"ControlName"		"CExButton"
-		"fieldName"			"CancelButton"
-		"xpos"				"50"
-		"ypos"				"200"
-		"zpos"				"1"
-		"wide"				"130"
-		"tall"				"25"
-		"autoResize"		"0"
-		"pinCorner"			"3"
-		"visible"			"1"
-		"enabled"			"1"
-		"tabPosition"		"0"
-		"labelText"			"#Cancel"
-		"font"				"HudFontSmall"
-		"textAlignment"		"center"
-		"dulltext"			"0"
-		"brighttext"		"0"
-		"default"			"0"
-		"Command"			"cancel"
-		"sound_depressed"	"UI/buttonclick.wav"
-		"sound_released"	"UI/buttonclickrelease.wav"
-	}
-
-	"OkButton"
-	{
-		"ControlName"		"CExButton"
-		"fieldName"			"OkButton"
-		"xpos"				"220"
-		"ypos"				"200"
-		"zpos"				"1"
-		"wide"				"130"
-		"tall"				"25"
-		"autoResize"		"0"
-		"pinCorner"			"3"
-		"visible"			"1"
-		"enabled"			"1"
-		"tabPosition"		"0"
-		"labelText"			"#CraftNameConfirm"
-		"font"				"HudFontSmall"
-		"textAlignment"		"center"
-		"dulltext"			"0"
-		"brighttext"		"0"
-		"default"			"1"
-		"Command"			"apply"
-		"sound_depressed"	"UI/buttonclick.wav"
-		"sound_released"	"UI/buttonclickrelease.wav"
-	}
-}
\ No newline at end of file
diff --git a/resource/ui/econ/confirmcustomizetexturedialog.res b/resource/ui/econ/confirmcustomizetexturedialog.res
deleted file mode 100644
index 9c30c6c..0000000
--- a/resource/ui/econ/confirmcustomizetexturedialog.res
+++ /dev/null
@@ -1,1017 +0,0 @@
-"Resource/UI/econ/ConfirmCustomizeTextureDialog.res"
-{
-	"ConfirmCustomizeTextureDialog"
-	{
-		"fieldName"			"ConfirmCustomizeTextureDialog"
-		"visible"			"1"
-		"enabled"			"1"
-		"xpos"				"c-280"
-		"ypos"				"c-225"
-		"wide"				"560"
-		"tall"				"345"
-		"settitlebarvisible" "0"
-		"paintborder"		"2"
-		"paintbackground"	"1"
-		"border"			"CyanBorderThick"
-		"bgcolor_override"	"25 25 25 255"
-	}
-
-	"mouseoveritempanel"
-	{
-		"ControlName"		"CItemModelPanel"
-		"fieldName"			"mouseoveritempanel"
-		"xpos"				"c-70"
-		"ypos"				"270"
-		"zpos"				"100"
-		"wide"				"300"
-		"tall"				"300"
-		"visible"			"0"
-		"bgcolor_override"	"Transparent"
-		"noitem_textcolor"	"TextColor"
-		"PaintBackgroundType"	"0"
-		"paintborder"		"0"
-		"text_ypos"			"20"
-		"text_center"		"1"
-		"model_hide"		"1"
-		"resize_to_text"	"1"
-		"padding_height"	"15"
-
-		"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"		"TextColor"
-				"centerwrap"	"1"
-			}
-    	}
-	}
-
-	"ToolBG"
-	{
-		"ControlName"		"CExLabel"
-		"fieldName"			"ToolBG"
-		"font"				"HudFontSmallBold"
-		"labelText"			""
-		"textAlignment"		"east"
-		"xpos"				"10"
-		"ypos"				"10"
-		"zpos"				"-1"
-		"wide"				"84"
-		"tall"				"64"
-		"paintbackground"	"0"
-		"border"			"BackpackItemBorder_SelfMade"
-	}
-
-	"tool_icon"
-	{
-		"ControlName"		"ScalableImagePanel"
-		"fieldName"			"tool_icon"
-		"xpos"				"10"
-		"ypos"				"10"
-		"zpos"				"2"
-		"wide"				"16"
-		"tall"				"16"
-		"visible"			"1"
-		"enabled"			"1"
-		"image"				"backpack_jewel_modify_target_b_g"
-		"tileImage"			"0"
-		"tileVertically"	"0"
-		"drawcolor"			"112 176 74 255"
-	}
-
-	"tool_modelpanel"
-	{
-		"ControlName"		"CItemModelPanel"
-		"fieldName"			"tool_modelpanel"
-		"xpos"				"10"
-		"ypos"				"10"
-		"zpos"				"1"
-		"wide"				"84"
-		"tall"				"64"
-		"visible"			"1"
-		"bgcolor_override"	"Transparent"
-		"noitem_textcolor"	"TextColor"
-		"PaintBackgroundType"	"2"
-		"paintborder"		"0"
-		"model_xpos"		"2"
-		"model_ypos"		"5"
-		"model_wide"		"80"
-		"model_tall"		"54"
-		"text_ypos"			"100"
-		"text_center"		"1"
-		"name_only"			"1"
-		"paint_icon_hide"	"1"
-
-		"itemmodelpanel"
-		{
-			"use_item_rendertarget" "0"
-			"allow_rot"				"0"
-		}
-	}
-
-	"TitleLabel"
-	{
-		"ControlName"		"CExLabel"
-		"fieldName"			"TitleLabel"
-		"font"				"Cerbetica32"
-		"labelText"			"dynamic"
-		"textAlignment"		"center"
-		"xpos"				"100"
-		"ypos"				"10"
-		"zpos"				"0"
-		"wide"				"365"
-		"tall"				"60"
-		"centerwrap"		"1"
-	}
-
-	"SubjectBG"
-	{
-		"ControlName"		"CExLabel"
-		"fieldName"			"SubjectBG"
-		"font"				"HudFontSmallBold"
-		"labelText"			""
-		"textAlignment"		"east"
-		"xpos"				"465"
-		"ypos"				"10"
-		"zpos"				"-1"
-		"wide"				"84"
-		"tall"				"64"
-		"paintbackground"	 "0"
-		"border"			"BackpackItemBorder_3"
-	}
-
-	"subject_icon"
-	{
-		"ControlName"		"ScalableImagePanel"
-		"fieldName"			"subject_icon"
-		"xpos"				"465"
-		"ypos"				"10"
-		"zpos"				"2"
-		"wide"				"16"
-		"tall"				"16"
-		"visible"			"1"
-		"enabled"			"1"
-		"image"				"backpack_jewel_modify_target_b_g"
-		"tileImage"			"0"
-		"tileVertically"	"0"
-		"drawcolor"			"71 98 145 255"
-	}
-
-	"subject_modelpanel"
-	{
-		"ControlName"		"CItemModelPanel"
-		"fieldName"			"subject_modelpanel"
-		"xpos"				"465"
-		"ypos"				"10"
-		"zpos"				"1"
-		"wide"				"84"
-		"tall"				"64"
-		"visible"			"1"
-		"bgcolor_override"	"Transparent"
-		"noitem_textcolor"	"TextColor"
-		"PaintBackgroundType"	"2"
-		"paintborder"		"0"
-		"model_xpos"		"2"
-		"model_ypos"		"5"
-		"model_wide"		"80"
-		"model_tall"		"54"
-		"text_ypos"			"100"
-		"text_center"		"1"
-		"name_only"			"1"
-
-		"itemmodelpanel"
-		{
-			"use_item_rendertarget" "0"
-			"allow_rot"				"0"
-		}
-	}
-
-	"paint_model"
-	{
-		"ControlName"		"CItemModelPanel"
-		"fieldName"			"paint_model"
-		"xpos"				"275"
-		"ypos"				"20"
-		"zpos"				"100"
-		"wide"				"160"
-		"tall"				"160"
-		"visible"			"1"
-		"bgcolor_override"	"Transparent"
-		"noitem_textcolor"	"TextColor"
-		"paintborder"		"0"
-		"model_xpos"		"00"
-		"model_ypos"		"00"
-		"model_wide"		"160"
-		"model_tall"		"160"
-		"model_only"		"1"
-		"paint_icon_hide"	"1"
-
-		"itemmodelpanel"
-		{
-			"force_use_model"		"1"
-			"use_item_rendertarget" "0"
-			"allow_rot"				"1"
-		}
-	}
-
-	"SelectImagePage"
-	{
-		"ControlName"		"EditablePanel"
-		"fieldName"			"SelectImagePage"
-		"xpos"				"10"
-		"ypos"				"80"
-		"wide"				"540"
-		"tall"				"260"
-		"visible"			"1"
-		"enabled"			"1"
-
-		"PageTitleLabel"
-		{
-			"ControlName"		"CExLabel"
-			"fieldName"			"PageTitleLabel"
-			"font"				"HudFontMediumSmall"
-			"labelText"			"#ToolCustomizeTextureStep1"
-			"textAlignment"		"north-west"
-			"xpos"				"0"
-			"ypos"				"0"
-			"zpos"				"0"
-			"wide"				"540"
-			"tall"				"20"
-		}
-		"ImagePaletteGroupBox"
-		{
-			"ControlName"		"EditablePanel"
-			"fieldName"			"ImagePaletteGroupBox"
-			"xpos"				"0"
-			"ypos"				"25"
-			"zpos"				"-1"
-			"wide"				"350"
-			"tall"				"200"
-			"border"			"GrayDialogBorder"
-
-			"UseAvatarRadio"
-			{
-				"ControlName"	"RadioButton"
-				"fieldName"		"UseAvatarRadio"
-				"xpos"			"10"
-				"ypos"			"10"
-				"wide"			"330"
-				"tall"			"20"
-				"labelText"		"#ToolCustomizeTextureUseAvatarImage"
-				"textAlignment"	"west"
-				"font"			"HudFontSmallBold"
-			}
-			"UseAnyImageRadio"
-			{
-				"ControlName"	"RadioButton"
-				"fieldName"		"UseAnyImageRadio"
-				"xpos"			"10"
-				"ypos"			"80"
-				"wide"			"330"
-				"tall"			"20"
-				"labelText"		"#ToolCustomizeTextureUseAnyImage"
-				"textAlignment"	"west"
-				"font"			"HudFontSmallBold"
-			}
-			"BrowseForNewImageButton"
-			{
-				"ControlName"	"CExButton"
-				"fieldName"		"BrowseForNewImageButton"
-				"xpos"			"40"
-				"ypos"			"110"
-				"zpos"			"1"
-				"wide"			"300"
-				"tall"			"20"
-				"labelText"		"#ToolCustomizeTextureBrowseButton"
-				"font"			"HudFontSmall"
-				"Command"		"pick_image"
-				"sound_depressed"	"UI/buttonclick.wav"
-				"sound_released"	"UI/buttonclickrelease.wav"
-				"paintbackground"	"1"
-				"defaultBgColor_override"	"15 15 15 255"
-				"armedBgColor_override"		"25 25 25 255"
-				"depressedBgColor_override"	"25 25 25 255"
-				"defaultFgColor_override"	"TanLight"
-				"armedFgColor_override" 	"TanLight"
-				"depressedFgColor_override" "TanLight"
-				"border_default"			"ButtonHover"
-				"border_armed"				"ButtonHover"
-			}
-			"ForBestResultsLabel"
-			{
-				"ControlName"	"CExLabel"
-				"fieldName"		"ForBestResultsLabel"
-				"font"			"HudFontSmall"
-				"xpos"			"40"
-				"ypos"			"140"
-				"wide"			"300"
-				"tall"			"40"
-				"labelText"		"#ToolCustomizeTextureBestResults"
-				"textAlignment"	"north-west"
-				"wrap" 			"1"
-			}
-		}
-		"PreviewImageGroupBox"
-		{
-			"ControlName"	"EditablePanel"
-			"fieldName"		"PreviewImageGroupBox"
-			"xpos"			"360"
-			"ypos"			"25"
-			"zpos"			"-1"
-			"wide"			"180"
-			"tall"			"200"
-			"border"		"GrayDialogBorder"
-
-			"PreviewCroppedImage"
-			{
-				"ControlName"	"CRGBAImagePanel"
-				"fieldName"		"PreviewCroppedImage"
-				"xpos"			"20"
-				"ypos"			"20"
-				"zpos"			"-1"
-				"wide"			"140"
-				"tall"			"140"
-			}
-			"SquarizeComboBox"
-			{
-				"ControlName"	"ComboBox"
-				"fieldName"		"SquarizeComboBox"
-				"xpos"			"20"
-				"ypos"			"170"
-				"zpos"			"-1"
-				"wide"			"140"
-				"tall"			"15"
-				"editable"		"0"
-				"font"			"HudFontSmall"
-				"bgcolor_override"					"ColorBlack"
-				"disabledBgColor_override" 			"ColorBlack"
-				"selectionColor_override" 			"ColorBlack"
-				"selectionTextColor_override" 		"TanLight"
-				"defaultSelectionBG2Color_override" "Transparent"
-			}
-		}
-		"CancelButton"
-		{
-			"ControlName"	"CExButton"
-			"fieldName"		"CancelButton"
-			"xpos"			"00"
-			"ypos"			"230"
-			"zpos"			"1"
-			"wide"			"130"
-			"tall"			"25"
-			"labelText"		"#Cancel"
-			"font"			"HudFontSmall"
-			"textAlignment"	"center"
-			"Command"		"cancel"
-			"sound_depressed"	"UI/buttonclick.wav"
-			"sound_released"	"UI/buttonclickrelease.wav"
-			"paintbackground"	"1"
-			"defaultBgColor_override"	"15 15 15 255"
-			"armedBgColor_override"		"25 25 25 255"
-			"depressedBgColor_override"	"25 25 25 255"
-			"defaultFgColor_override"	"TanLight"
-			"armedFgColor_override" 	"TanLight"
-			"depressedFgColor_override" "TanLight"
-			"border_default"			"ButtonHover"
-			"border_armed"				"ButtonHover"
-		}
-		"NextButton"
-		{
-			"ControlName"	"CExButton"
-			"fieldName"		"NextButton"
-			"xpos"			"410"
-			"ypos"			"230"
-			"zpos"			"1"
-			"wide"			"130"
-			"tall"			"25"
-			"labelText"		"#TF_NextCarat"
-			"font"			"HudFontSmall"
-			"textAlignment"	"center"
-			"Command"		"next_page"
-			"sound_depressed"	"UI/buttonclick.wav"
-			"sound_released"	"UI/buttonclickrelease.wav"
-			"paintbackground"	"1"
-			"defaultBgColor_override"	"15 15 15 255"
-			"armedBgColor_override"		"25 25 25 255"
-			"depressedBgColor_override"	"25 25 25 255"
-			"defaultFgColor_override"	"TanLight"
-			"armedFgColor_override" 	"TanLight"
-			"depressedFgColor_override" "TanLight"
-			"border_default"			"ButtonHover"
-			"border_armed"				"ButtonHover"
-		}
-	}
-
-	"AdjustFilterPage"
-	{
-		"ControlName"	"EditablePanel"
-		"fieldName"		"AdjustFilterPage"
-		"xpos"			"10"
-		"ypos"			"80"
-		"wide"			"540"
-		"tall"			"260"
-		"visible"		"1"
-		"enabled"		"1"
-
-		"PageTitleLabel"
-		{
-			"ControlName"	"CExLabel"
-			"fieldName"		"PageTitleLabel"
-			"font"			"HudFontMediumSmall"
-			"labelText"		"#ToolCustomizeTextureStep2"
-			"textAlignment"	"north-west"
-			"xpos"			"0"
-			"ypos"			"0"
-			"zpos"			"0"
-			"wide"			"540"
-			"tall"			"20"
-		}
-		"FilterOptionsGroupBox"
-		{
-			"ControlName"	"EditablePanel"
-			"fieldName"		"SelectFilterGroupBox"
-			"Font"			"HudFontSmallestBold"
-			"xpos"			"0"
-			"ypos"			"25"
-			"zpos"			"-1"
-			"wide"			"160"
-			"tall"			"200"
-			"border"		"GrayDialogBorder"
-
-			"FilterLabel"
-			{
-				"ControlName"	"CExLabel"
-				"fieldName"		"FilterLabel"
-				"font"			"HudFontSmallBold"
-				"xpos"			"10"
-				"ypos"			"10"
-				"wide"			"140"
-				"tall"			"20"
-				"labelText"		"Filter:"
-				"textAlignment"	"north-west"
-				"visible"		"0"
-			}
-			"FilterComboBox"
-			{
-				"ControlName"	"ComboBox"
-				"fieldName"		"FilterComboBox"
-				"xpos"			"10"
-				"ypos"			"30"
-				"zpos"			"-1"
-				"wide"			"140"
-				"tall"			"15"
-				"editable"		"0"
-				"font"			"HudFontSmall"
-				"visible"		"0"
-				"bgcolor_override"					"ColorBlack"
-				"disabledBgColor_override"			"ColorBlack"
-				"selectionColor_override"			"ColorBlack"
-				"selectionTextColor_override"		"TanLight"
-				"defaultSelectionBG2Color_override"	"Transparent"
-			}
-			"PainterlyOptions"
-			{
-				"ControlName"	"EditablePanel"
-				"fieldName"		"PainterlyOptions"
-				"xpos"			"10"
-				"ypos"			"50"
-				"zpos"			"-1"
-				"wide"			"140"
-				"tall"			"150"
-
-				"FilterDescriptionLabel"
-				{
-					"ControlName"	"CExLabel"
-					"fieldName"		"FilterDescriptionLabel"
-					"xpos"			"0"
-					"ypos"			"0"
-					"wide"			"140"
-					"tall"			"80"
-					"labelText"		"#ToolCustomizeTexturePainterlyDescription"
-					"textAlignment"	"north-west"
-					"font"			"HudFontSmall"
-					"wrap"			"1"
-				}
-			}
-			"StencilOptions"
-			{
-				"ControlName"	"EditablePanel"
-				"fieldName"		"StencilOptions"
-				"xpos"			"10"
-				"ypos"			"50"
-				"zpos"			"-1"
-				"wide"			"140"
-				"tall"			"150"
-
-				"FilterDescriptionLabel"
-				{
-					"ControlName"	"CExLabel"
-					"fieldName"		"FilterDescriptionLabel"
-					"xpos"			"0"
-					"ypos"			"0"
-					"wide"			"120"
-					"tall"			"60"
-					"labelText"		"#ToolCustomizeTextureStencilDescription"
-					"textAlignment"	"north-west"
-					"font"			"HudFontSmall"
-					"wrap"			"1"
-					"visible"		"0"
-				}
-				"ColorPaletteLabel"
-				{
-					"ControlName"	"CExLabel"
-					"fieldName"		"ColorPaletteLabel"
-					"xpos"			"0"
-					"ypos"			"60"
-					"wide"			"140"
-					"tall"			"15"
-					"labelText"		"#ToolCustomizeTextureColorPalette"
-					"textAlignment"	"north-west"
-					"font"			"HudFontSmallBold"
-				}
-				"PrevStencilPaletteButton"
-				{
-					"ControlName"	"CExButton"
-					"fieldName"		"PrevStencilPaletteButton"
-					"xpos"			"0"
-					"ypos"			"80"
-					"zpos"			"1"
-					"wide"			"65"
-					"tall"			"15"
-					"labelText"		"<<"
-					"font"			"HudFontSmall"
-					"textAlignment"	"center"
-					"Command"		"prev_stencil_palette"
-					"sound_depressed"	"UI/buttonclick.wav"
-					"sound_released"	"UI/buttonclickrelease.wav"
-					"paintbackground"	"1"
-					"defaultBgColor_override"	"15 15 15 255"
-					"armedBgColor_override"		"25 25 25 255"
-					"depressedBgColor_override"	"25 25 25 255"
-					"defaultFgColor_override"	"TanLight"
-					"armedFgColor_override" 	"TanLight"
-					"depressedFgColor_override" "TanLight"
-					"border_default"			"ButtonHover"
-					"border_armed"				"ButtonHover"
-				}
-				"NextStencilPaletteButton"
-				{
-					"ControlName"	"CExButton"
-					"fieldName"		"NextStencilPaletteButton"
-					"xpos"			"75"
-					"ypos"			"80"
-					"zpos"			"1"
-					"wide"			"65"
-					"tall"			"15"
-					"labelText"		">>"
-					"font"			"HudFontSmall"
-					"textAlignment"	"center"
-					"Command"		"next_stencil_palette"
-					"sound_depressed"	"UI/buttonclick.wav"
-					"sound_released"	"UI/buttonclickrelease.wav"
-					"paintbackground"	"1"
-					"defaultBgColor_override"	"15 15 15 255"
-					"armedBgColor_override"		"25 25 25 255"
-					"depressedBgColor_override"	"25 25 25 255"
-					"defaultFgColor_override"	"TanLight"
-					"armedFgColor_override" 	"TanLight"
-					"depressedFgColor_override" "TanLight"
-					"border_default"			"ButtonHover"
-					"border_armed"				"ButtonHover"
-				}
-				"StencilGradientMap"
-				{
-					"ControlName"	"CustomTextureStencilGradientMapWidget"
-					"fieldName"		"StencilGradientMap"
-					"xpos"			"0"
-					"ypos"			"100"
-					"zpos"			"1"
-					"wide"			"140"
-					"tall"			"20"
-				}
-				"StencilModeComboBox"
-				{
-					"ControlName"	"ComboBox"
-					"fieldName"		"StencilModeComboBox"
-					"xpos"			"0"
-					"ypos"			"125"
-					"zpos"			"-1"
-					"wide"			"140"
-					"tall"			"15"
-					"editable"		"0"
-					"font"			"HudFontSmall"
-					"bgcolor_override"					"ColorBlack"
-					"disabledBgColor_override" 			"ColorBlack"
-					"selectionColor_override" 			"ColorBlack"
-					"selectionTextColor_override"		"TanLight"
-					"defaultSelectionBG2Color_override" "Transparent"
-				}
-			}
-		}
-		"PreviewImageGroupBox"
-		{
-			"ControlName"	"EditablePanel"
-			"fieldName"		"PreviewImageGroupBox"
-			"xpos"			"170"
-			"ypos"			"25"
-			"zpos"			"-1"
-			"wide"			"180"
-			"tall"			"200"
-			"border"		"GrayDialogBorder"
-
-			"PreviewFilteredImage"
-			{
-				"ControlName"	"CRGBAImagePanel"
-				"fieldName"		"PreviewFilteredImage"
-				"xpos"			"20"
-				"ypos"			"30"
-				"zpos"			"-1"
-				"wide"			"140"
-				"tall"			"140"
-			}
-		}
-		"PreviewModelGroupBox"
-		{
-			"ControlName"	"EditablePanel"
-			"fieldName"		"PreviewModelGroupBox"
-			"xpos"			"360"
-			"ypos"			"25"
-			"zpos"			"-1"
-			"wide"			"180"
-			"tall"			"200"
-			"border"		"GrayDialogBorder"
-
-			"GradientBgPanel"
-			{
-				"ControlName"	"ImagePanel"
-				"FieldName"		"GradientBgPanel"
-				"xpos"			"10"
-				"ypos"			"10"
-				"zpos"			"1"
-				"wide"			"160"
-				"tall"			"180"
-				"visible"		"1"
-				"tileImage"		"0"
-				"scaleImage"	"1"
-				"image"			"loadout_bottom_gradient"
-				"border"		"ButtonBorder"
-				"paintbackgroundtype"	"2"
-				"paintbackground"		"1"
-			}
-			"DragToRotateLabel"
-			{
-				"ControlName"	"CExLabel"
-				"fieldName"		"DragToRotateLabel"
-				"font"			"HudFontSmall"
-				"labelText"		"#ToolCustomizeTextureDragToRotate"
-				"textAlignment"	"center"
-				"xpos"			"10"
-				"ypos"			"170"
-				"zpos"			"2"
-				"wide"			"160"
-				"tall"			"20"
-				"centerwrap"	"1"
-			}
-		}
-		"CancelButton"
-		{
-			"ControlName"	"CExButton"
-			"fieldName"		"CancelButton"
-			"xpos"			"00"
-			"ypos"			"230"
-			"zpos"			"1"
-			"wide"			"130"
-			"tall"			"25"
-			"labelText"		"#Cancel"
-			"font"			"HudFontSmall"
-			"textAlignment"	"center"
-			"Command"		"cancel"
-			"sound_depressed"	"UI/buttonclick.wav"
-			"sound_released"	"UI/buttonclickrelease.wav"
-			"paintbackground"	"1"
-			"defaultBgColor_override"	"15 15 15 255"
-			"armedBgColor_override"		"25 25 25 255"
-			"depressedBgColor_override"	"25 25 25 255"
-			"defaultFgColor_override"	"TanLight"
-			"armedFgColor_override" 	"TanLight"
-			"depressedFgColor_override" "TanLight"
-			"border_default"			"ButtonHover"
-			"border_armed"				"ButtonHover"
-		}
-		"BackButton"
-		{
-			"ControlName"	"CExButton"
-			"fieldName"		"BackButton"
-			"xpos"			"270"
-			"ypos"			"230"
-			"zpos"			"1"
-			"wide"			"130"
-			"tall"			"25"
-			"labelText"		"#TF_BackCarat"
-			"font"			"HudFontSmall"
-			"textAlignment"	"center"
-			"Command"		"prev_page"
-			"sound_depressed"	"UI/buttonclick.wav"
-			"sound_released"	"UI/buttonclickrelease.wav"
-			"paintbackground"	"1"
-			"defaultBgColor_override"	"15 15 15 255"
-			"armedBgColor_override"		"25 25 25 255"
-			"depressedBgColor_override"	"25 25 25 255"
-			"defaultFgColor_override"	"TanLight"
-			"armedFgColor_override" 	"TanLight"
-			"depressedFgColor_override" "TanLight"
-			"border_default"			"ButtonHover"
-			"border_armed"				"ButtonHover"
-		}
-		"NextButton"
-		{
-			"ControlName"	"CExButton"
-			"fieldName"		"NextButton"
-			"xpos"			"410"
-			"ypos"			"230"
-			"zpos"			"1"
-			"wide"			"130"
-			"tall"			"25"
-			"labelText"		"#TF_NextCarat"
-			"font"			"HudFontSmall"
-			"textAlignment"	"center"
-			"Command"		"next_page"
-			"sound_depressed"	"UI/buttonclick.wav"
-			"sound_released"	"UI/buttonclickrelease.wav"
-			"paintbackground"	"1"
-			"defaultBgColor_override"	"15 15 15 255"
-			"armedBgColor_override"		"25 25 25 255"
-			"depressedBgColor_override"	"25 25 25 255"
-			"defaultFgColor_override"	"TanLight"
-			"armedFgColor_override" 	"TanLight"
-			"depressedFgColor_override" "TanLight"
-			"border_default"			"ButtonHover"
-			"border_armed"				"ButtonHover"
-		}
-	}
-
-	"FinalConfirmPage"
-	{
-		"ControlName"	"EditablePanel"
-		"fieldName"		"FinalConfirmPage"
-		"xpos"			"10"
-		"ypos"			"80"
-		"wide"			"540"
-		"tall"			"260"
-
-		"PageTitleLabel"
-		{
-			"ControlName"	"CExLabel"
-			"fieldName"		"PageTitleLabel"
-			"font"			"HudFontMediumSmall"
-			"labelText"		"#ToolCustomizeTextureStep3"
-			"textAlignment"	"north-west"
-			"xpos"			"0"
-			"ypos"			"0"
-			"zpos"			"0"
-			"wide"			"540"
-			"tall"			"20"
-		}
-		"WarningTextGroupBox"
-		{
-			"ControlName"	"EditablePanel"
-			"fieldName"		"WarningTextGroupBox"
-			"Font"			"HudFontSmallestBold"
-			"xpos"			"0"
-			"ypos"			"25"
-			"zpos"			"-1"
-			"wide"			"350"
-			"tall"			"200"
-			"border"		"GrayDialogBorder"
-
-			"WarningText"
-			{
-				"ControlName"	"CExLabel"
-				"fieldName"		"WarningText"
-				"font"			"HudFontSmall"
-				"xpos"			"10"
-				"ypos"			"10"
-				"wide"			"330"
-				"tall"			"180"
-				"labelText"		 "#ToolCustomizeTextureConfirmWarning"
-				"textAlignment"	"west"
-				"wrap"			"1"
-			}
-		}
-		"PreviewModelGroupBox"
-		{
-			"ControlName"	"EditablePanel"
-			"fieldName"		"PreviewModelGroupBox"
-			"xpos"			"360"
-			"ypos"			"25"
-			"zpos"			"-1"
-			"wide"			"180"
-			"tall"			"200"
-			"border"		"GrayDialogBorder"
-
-			"GradientBgPanel"
-			{
-				"ControlName"	"ImagePanel"
-				"FieldName"		"GradientBgPanel"
-				"xpos"			"10"
-				"ypos"			"10"
-				"zpos"			"1"
-				"wide"			"160"
-				"tall"			"180"
-				"visible"		"1"
-				"tileImage"		"0"
-				"scaleImage"	"1"
-				"image"			"loadout_bottom_gradient"
-				"border"		"ButtonBorder"
-				"paintbackgroundtype"	"2"
-				"paintbackground"		"1"
-			}
-			"DragToRotateLabel"
-			{
-				"ControlName"	"CExLabel"
-				"fieldName"		"DragToRotateLabel"
-				"font"			"HudFontSmall"
-				"labelText"		"#ToolCustomizeTextureDragToRotate"
-				"textAlignment"	"center"
-				"xpos"			"10"
-				"ypos"			"170"
-				"zpos"			"2"
-				"wide"			"160"
-				"tall"			"20"
-				"centerwrap"	"1"
-			}
-		}
-		"CancelButton"
-		{
-			"ControlName"	"CExButton"
-			"fieldName"		"CancelButton"
-			"xpos"			"00"
-			"ypos"			"230"
-			"zpos"			"1"
-			"wide"			"130"
-			"tall"			"25"
-			"labelText"		"#Cancel"
-			"font"			"HudFontSmall"
-			"textAlignment"	"center"
-			"default"		"0"
-			"Command"		"cancel"
-			"sound_depressed"	"UI/buttonclick.wav"
-			"sound_released"	"UI/buttonclickrelease.wav"
-			"paintbackground"	"1"
-			"defaultBgColor_override"	"15 15 15 255"
-			"armedBgColor_override"		"25 25 25 255"
-			"depressedBgColor_override"	"25 25 25 255"
-			"defaultFgColor_override"	"TanLight"
-			"armedFgColor_override" 	"TanLight"
-			"depressedFgColor_override" "TanLight"
-			"border_default"			"ButtonHover"
-			"border_armed"				"ButtonHover"
-		}
-		"BackButton"
-		{
-			"ControlName"	"CExButton"
-			"fieldName"		"BackButton"
-			"xpos"			"270"
-			"ypos"			"230"
-			"zpos"			"1"
-			"wide"			"130"
-			"tall"			"25"
-			"labelText"		"#TF_BackCarat"
-			"font"			"HudFontSmall"
-			"textAlignment"	"center"
-			"Command"		"prev_page"
-			"sound_depressed"	"UI/buttonclick.wav"
-			"sound_released"	"UI/buttonclickrelease.wav"
-			"paintbackground"	"1"
-			"defaultBgColor_override"	"15 15 15 255"
-			"armedBgColor_override"		"25 25 25 255"
-			"depressedBgColor_override"	"25 25 25 255"
-			"defaultFgColor_override"	"TanLight"
-			"armedFgColor_override" 	"TanLight"
-			"depressedFgColor_override" "TanLight"
-			"border_default"			"ButtonHover"
-			"border_armed"				"ButtonHover"
-		}
-		"OkButton"
-		{
-			"ControlName"	"CExButton"
-			"fieldName"		"OkButton"
-			"xpos"			"410"
-			"ypos"			"230"
-			"zpos"			"1"
-			"wide"			"130"
-			"tall"			"25"
-			"labelText"		"#ToolCustomizeTextureOKButton"
-			"font"			"HudFontSmall"
-			"textAlignment"	"center"
-			"default"		"1"
-			"Command"		"apply"
-			"sound_depressed"	"UI/buttonclick.wav"
-			"sound_released"	"UI/buttonclickrelease.wav"
-			"paintbackground"	"1"
-			"defaultBgColor_override"	"15 15 15 255"
-			"armedBgColor_override"		"25 25 25 255"
-			"depressedBgColor_override"	"25 25 25 255"
-			"defaultFgColor_override"	"TanLight"
-			"armedFgColor_override" 	"TanLight"
-			"depressedFgColor_override" "TanLight"
-			"border_default"			"ButtonHover"
-			"border_armed"				"ButtonHover"
-		}
-	}
-
-	"PerformingActionPage"
-	{
-		"ControlName"	"EditablePanel"
-		"fieldName"		"PerformingActionPage"
-		"xpos"			"10"
-		"ypos"			"80"
-		"wide"			"540"
-		"tall"			"260"
-
-		"PleaseWaitLabel"
-		{
-			"ControlName"	"CExLabel"
-			"fieldName"		"PleaseWaitLabel"
-			"font"			"HudFontSmallBold"
-			"labelText"		"#ToolCustomizeTexturePleaseWait"
-			"textAlignment"	"center"
-			"xpos"			"20"
-			"ypos"			"25"
-			"zpos"			"0"
-			"wide"			"340"
-			"tall"			"200"
-			"centerwrap"	"1"
-		}
-		"PreviewModelGroupBox"
-		{
-			"ControlName"	"EditablePanel"
-			"fieldName"		"PreviewModelGroupBox"
-			"xpos"			"360"
-			"ypos"			"25"
-			"zpos"			"-1"
-			"wide"			"180"
-			"tall"			"200"
-			"border"		"GrayDialogBorder"
-
-			"GradientBgPanel"
-			{
-				"ControlName"	"ImagePanel"
-				"FieldName"		"GradientBgPanel"
-				"xpos"			"10"
-				"ypos"			"10"
-				"zpos"			"1"
-				"wide"			"160"
-				"tall"			"180"
-				"visible"		"1"
-				"tileImage"		"0"
-				"scaleImage"	"1"
-				"image"			"loadout_bottom_gradient"
-				"border"		"ButtonBorder"
-				"paintbackgroundtype"	"2"
-				"paintbackground"		"1"
-			}
-			"DragToRotateLabel"
-			{
-				"ControlName"	"CExLabel"
-				"fieldName"		"DragToRotateLabel"
-				"font"			"HudFontSmall"
-				"labelText"		"#ToolCustomizeTextureDragToRotate"
-				"textAlignment"	"center"
-				"xpos"			"10"
-				"ypos"			"170"
-				"zpos"			"2"
-				"wide"			"160"
-				"tall"			"20"
-				"centerwrap"	"1"
-			}
-		}
-	}
-}
\ No newline at end of file
diff --git a/resource/ui/econ/confirmdialogoptout.res b/resource/ui/econ/confirmdialogoptout.res
deleted file mode 100644
index 628cd9a..0000000
--- a/resource/ui/econ/confirmdialogoptout.res
+++ /dev/null
@@ -1,145 +0,0 @@
-"Resource/UI/ConfirmDialogOptOut.res"
-{
-	"ConfirmDialog"
-	{
-		"ControlName"		"Frame"
-		"fieldName"			"ConfirmDialog"
-		"xpos"				"c-150"
-		"ypos"				"140"
-		"wide"				"300"
-		"tall"				"250"
-		"autoResize"		"0"
-		"pinCorner"			"0"
-		"visible"			"1"
-		"enabled"			"1"
-		"tabPosition"		"0"
-		"settitlebarvisible"	"0"
-		"paintborder"	 		"2"
-		"paintbackground"		"1"
-		"border"				"CyanBorderThick"
-		"bgcolor_override"		"25 25 25 255"
-	}
-
-	"TitleLabel"
-	{
-		"ControlName"		"CExLabel"
-		"fieldName"			"TitleLabel"
-		"font"				"Cerbetica32"
-		"labelText"			"#ConfirmTitle"
-		"textAlignment"		"north"
-		"xpos"				"0"
-		"ypos"				"15"
-		"zpos"				"1"
-		"wide"				"300"
-		"tall"				"40"
-		"autoResize"		"1"
-		"pinCorner"			"0"
-		"visible"			"1"
-		"enabled"			"1"
-	}
-
-	"ExplanationLabel"
-	{
-		"ControlName"		"CExLabel"
-		"fieldName"			"ExplanationLabel"
-		"font"				"HudFontSmallBold"
-		"labelText"			"%text%"
-		"textAlignment"		"center"
-		"xpos"				"40"
-		"ypos"				"45"
-		"zpos"				"1"
-		"wide"				"220"
-		"tall"				"130"
-		"autoResize"		"0"
-		"pinCorner"			"0"
-		"visible"			"1"
-		"enabled"			"1"
-		"centerwrap"		"1"
-		"fgcolor_override"	"ColorCyan"
-	}
-
-	"CancelButton"
-	{
-		"ControlName"		"CExButton"
-		"fieldName"			"CancelButton"
-		"xpos"				"165"
-		"ypos"				"185"
-		"zpos"				"20"
-		"wide"				"125"
-		"tall"				"25"
-		"autoResize"		"0"
-		"pinCorner"			"0"
-		"visible"			"1"
-		"enabled"			"1"
-		"tabPosition"		"0"
-		"labelText"			"#Cancel"
-		"font"				"HudFontSmallBold"
-		"textAlignment"		"center"
-		"textinsetx"		"50"
-		"dulltext"			"0"
-		"brighttext"		"0"
-		"Command"			"cancel"
-		"sound_depressed"	"UI/buttonclick.wav"
-		"sound_released"	"UI/buttonclickrelease.wav"
-		"paintbackground"	"1"
-		"defaultBgColor_override"	"15 15 15 255"
-		"armedBgColor_override"		"25 25 25 255"
-		"depressedBgColor_override"	"25 25 25 255"
-		"defaultFgColor_override"	"TanLight"
-		"armedFgColor_override" 	"TanLight"
-		"depressedFgColor_override" "TanLight"
-		"border_default"			"ButtonHover"
-		"border_armed"				"ButtonHover"
-	}
-
-	"ConfirmButton"
-	{
-		"ControlName"		"CExButton"
-		"fieldName"			"ConfirmButton"
-		"xpos"				"10"
-		"ypos"				"185"
-		"zpos"				"20"
-		"wide"				"125"
-		"tall"				"25"
-		"default"			"1"
-		"autoResize"		"0"
-		"pinCorner"			"0"
-		"visible"			"1"
-		"enabled"			"1"
-		"tabPosition"		"0"
-		"labelText"			"#ConfirmButtonText"
-		"font"				"HudFontSmallBold"
-		"textAlignment"		"center"
-		"textinsetx"		"50"
-		"dulltext"			"0"
-		"brighttext"		"0"
-		"Command"			"confirm"
-		"sound_depressed"	"UI/buttonclick.wav"
-		"sound_released"	"UI/buttonclickrelease.wav"
-		"border_default"	"ButtonHover"
-		"border_armed"		"ButtonHover"
-	}
-
-	"OptOutCheckbox"
-	{
-		"ControlName"		"CheckButton"
-		"fieldName"			"OptOutCheckbox"
-		"xpos"				"0"
-		"ypos"				"217"
-		"zpos"				"2"
-		"wide"				"300"
-		"tall"				"25"
-		"autoResize"		"0"
-		"pinCorner"			"0"
-		"visible"			"1"
-		"enabled"			"1"
-		"tabPosition"		"0"
-		"labelText"			"#TF_Confirm_Opt_Out"
-		"textAlignment"		"center"
-		"dulltext"			"0"
-		"brighttext"		"0"
-		"wrap"				"0"
-		"font"				"HudFontSmallest"
-		"selected_fgcolor_override" "ColorRed"
-	}
-}
\ No newline at end of file
diff --git a/resource/ui/econ/confirmitempreviewdialog.res b/resource/ui/econ/confirmitempreviewdialog.res
deleted file mode 100644
index 70c53e6..0000000
--- a/resource/ui/econ/confirmitempreviewdialog.res
+++ /dev/null
@@ -1,226 +0,0 @@
-"Resource/UI/ConfirmItemPreviewDialog.res"
-{
-	"ConfirmItemPreviewDialog"
-	{
-		"fieldName"			"ConfirmItemPreviewDialog"
-		"visible"			"1"
-		"enabled"			"1"
-		"xpos"				"c-200"
-		"ypos"				"105"
-		"wide"				"400"
-		"tall"				"240"
-		"settitlebarvisible" "0"
-		"paintborder"		"2"
-		"paintbackground"	"1"
-		"border"			"CyanBorderThick"
-		"bgcolor_override"	"25 25 25 255"
-	}
-	"mouseoveritempanel"
-	{
-		"ControlName"		"CItemModelPanel"
-		"fieldName"			"mouseoveritempanel"
-		"xpos"				"c-70"
-		"ypos"				"270"
-		"zpos"				"100"
-		"wide"				"300"
-		"tall"				"300"
-		"visible"			"0"
-		"bgcolor_override"	"Transparent"
-		"noitem_textcolor"	"TextColor"
-		"PaintBackgroundType" "0"
-		"paintborder"		"0"
-		"text_ypos"			"20"
-		"text_center"		"1"
-		"model_hide"		"1"
-		"resize_to_text"	"1"
-		"padding_height"	"15"
-
-		"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"		"TextColor"
-				"centerwrap"	"1"
-			}
-    	}
-	}
-	"TitleLabel"
-	{
-		"ControlName"		"CExLabel"
-		"fieldName"			"TitleLabel"
-		"font"				"Cerbetica32"
-		"labelText"			"dynamic"
-		"textAlignment"		"center"
-		"xpos"				"100"
-		"ypos"				"80"
-		"zpos"				"0"
-		"wide"				"200"
-		"tall"				"30"
-		"autoResize"		"1"
-		"pinCorner"			"0"
-		"visible"			"1"
-		"enabled"			"1"
-		"centerwrap"		"1"
-	}
-	"ToolBG"
-	{
-		"ControlName"		"CExLabel"
-		"fieldName"			"ToolBG"
-		"font"				"HudFontSmallBold"
-		"labelText"			""
-		"textAlignment"		"east"
-		"xpos"				"158"
-		"ypos"				"14"
-		"zpos"				"-1"
-		"wide"				"84"
-		"tall"				"64"
-		"autoResize"		"1"
-		"pinCorner"			"0"
-		"visible"			"1"
-		"enabled"			"1"
-		"paintbackground"	"0"
-		"border"			"BackpackItemBorder_SelfMade"
-	}
-	"tool_icon"
-	{
-		"ControlName"		"ScalableImagePanel"
-		"fieldName"			"tool_icon"
-		"xpos"				"158"
-		"ypos"				"14"
-		"zpos"				"2"
-		"wide"				"16"
-		"tall"				"16"
-		"visible"			"1"
-		"enabled"			"1"
-		"image"				"backpack_jewel_modify_target_b_g"
-		"tileImage"			"0"
-		"tileVertically"	"0"
-		"drawcolor"			"112 176 74 255"
-	}
-	"tool_modelpanel"
-	{
-		"ControlName"		"CItemModelPanel"
-		"fieldName"			"tool_modelpanel"
-		"xpos"				"158"
-		"ypos"				"14"
-		"zpos"				"1"
-		"wide"				"84"
-		"tall"				"64"
-		"visible"			"1"
-		"bgcolor_override"	"Transparent"
-		"noitem_textcolor"	"TextColor"
-		"PaintBackgroundType"	"2"
-		"paintborder"		"0"
-		"model_xpos"		"2"
-		"model_ypos"		"5"
-		"model_wide"		"80"
-		"model_tall"		"54"
-		"text_ypos"			"100"
-		"text_center"		"1"
-		"name_only"			"1"
-		"paint_icon_hide"	"1"
-
-		"itemmodelpanel"
-		{
-			"use_item_rendertarget" "0"
-			"allow_rot"				"0"
-		}
-	}
-	"ConfirmLabel"
-	{
-		"ControlName"		"CExLabel"
-		"fieldName"			"ConfirmLabel"
-		"font"				"HudFontSmall"
-		"labelText"			"#ItemPreview_Confirm"
-		"textAlignment"		"center"
-		"xpos"				"20"
-		"ypos"				"100"
-		"zpos"				"0"
-		"wide"				"360"
-		"tall"				"80"
-		"autoResize"		"1"
-		"pinCorner"			"0"
-		"visible"			"1"
-		"enabled"			"1"
-		"fgcolor_override"	"ColorCyan"
-	}
-	"CancelButton"
-	{
-		"ControlName"		"CExButton"
-		"fieldName"			"CancelButton"
-		"xpos"				"50"
-		"ypos"				"200"
-		"zpos"				"1"
-		"wide"				"130"
-		"tall"				"25"
-		"autoResize"		"0"
-		"pinCorner"			"3"
-		"visible"			"1"
-		"enabled"			"1"
-		"tabPosition"		"0"
-		"labelText"			"#Cancel"
-		"font"				"HudFontSmall"
-		"textAlignment"		"center"
-		"dulltext"			"0"
-		"brighttext"		"0"
-		"default"			"0"
-		"Command"			"cancel"
-		"sound_depressed"	"UI/buttonclick.wav"
-		"sound_released"	"UI/buttonclickrelease.wav"
-		"border_default"	"ButtonHover"
-		"border_armed"		"ButtonHover"
-	}
-	"OkButton"
-	{
-		"ControlName"		"CExButton"
-		"fieldName"			"OkButton"
-		"xpos"				"220"
-		"ypos"				"200"
-		"zpos"				"1"
-		"wide"				"130"
-		"tall"				"25"
-		"autoResize"		"0"
-		"pinCorner"			"3"
-		"visible"			"1"
-		"enabled"			"1"
-		"tabPosition"		"0"
-		"labelText"			"#CraftNameConfirm"
-		"font"				"HudFontSmall"
-		"textAlignment"		"center"
-		"dulltext"			"0"
-		"brighttext"		"0"
-		"default"			"1"
-		"Command"			"apply"
-		"sound_depressed"	"UI/buttonclick.wav"
-		"sound_released"	"UI/buttonclickrelease.wav"
-		"border_default"	"ButtonHover"
-		"border_armed"		"ButtonHover"
-	}
-}
\ No newline at end of file
diff --git a/resource/ui/hudammoweapons-white.res b/resource/ui/hudammoweapons-white.res
deleted file mode 100644
index 660f0b7..0000000
--- a/resource/ui/hudammoweapons-white.res
+++ /dev/null
@@ -1,153 +0,0 @@
-"Resource/UI/HudAmmoWeapons.res"
-{
-	"HudWeaponAmmoBG"
-	{
-		"ControlName"	"CTFImagePanel"
-		"fieldName"		"HudWeaponAmmoBG"
-		"xpos"			"9999"
-		"ypos"			"9999"
-		"zpos"			"1"
-		"wide"			"90"
-		"tall"			"45"
-		"visible"		"0"
-		"enabled"		"1"
-		"image"			"../hud/ammo_blue_bg"
-		"scaleImage"	"1"
-		"teambg_2"		"../hud/ammo_red_bg"
-		"teambg_2_lodef"	"../hud/ammo_red_bg_lodef"
-		"teambg_3"		"../hud/ammo_blue_bg"
-		"teambg_3_lodef"	"../hud/ammo_blue_bg_lodef"
-	}
-	"HudWeaponLowAmmoImage"
-	{
-		"ControlName"	"ImagePanel"
-		"fieldName"		"HudWeaponLowAmmoImage"
-		"xpos"			"9999"
-		"ypos"			"9999"
-		"zpos"			"0"
-		"wide"			"90"
-		"tall"			"45"
-		"visible"		"0"
-		"enabled"		"0"
-		"image"			"../hud/ammo_red_bg"
-		"scaleImage"	"1"
-		"teambg_2"		"../hud/ammo_red_bg"
-		"teambg_2_lodef"	"../hud/ammo_red_bg_lodef"
-		"teambg_3"		"../hud/ammo_blue_bg"
-		"teambg_3_lodef"	"../hud/ammo_blue_bg_lodef"
-	}
-	"AmmoInClip"
-	{
-		"ControlName"	"CExLabel"
-		"fieldName"		"AmmoInClip"
-		"font"			"CerbeticaBold56"
-		"font_minmode"	"CerbeticaBold32"
-		"fgcolor"		"TanLight"
-		"xpos"			"-18"
-		"ypos"			"-11"
-		"xpos_minmode"	"-16"
-		"ypos_minmode"	"-1"
-		"zpos"			"5"
-		"wide"			"80"
-		"tall"			"80"
-		"visible"		"0"
-		"enabled"		"1"
-		"textAlignment"	"east"
-		"labelText"		"%Ammo%"
-	}
-	"AmmoInClipShadow"
-	{
-		"ControlName"	"CExLabel"
-		"fieldName"		"AmmoInClipShadow"
-		"font"			"CerbeticaBold56"
-		"font_minmode"	"CerbeticaBold32"
-		"fgcolor"		"TransparentBlack"
-		"xpos"			"-16"
-		"ypos"			"-9"
-		"xpos_minmode"	"-14"
-		"ypos_minmode"	"1"
-		"zpos"			"5"
-		"wide"			"80"
-		"tall"			"80"
-		"visible"		"0"
-		"enabled"		"1"
-		"textAlignment"	"east"
-		"labelText"		"%Ammo%"
-	}
-	"AmmoInReserve"
-	{
-		"ControlName"	"CExLabel"
-		"fieldName"		"AmmoInReserve"
-		"font"			"CerbeticaBold32"
-		"font_minmode"	"CerbeticaBold20"
-		"fgcolor"		"TanLight"
-		"xpos"			"67"
-		"ypos"			"-10"
-		"xpos_minmode"	"69"
-		"ypos_minmode"	"-1"
-		"zpos"			"7"
-		"wide"			"60"
-		"tall"			"80"
-		"visible"		"0"
-		"enabled"		"1"
-		"textAlignment"	"west"
-		"labelText"		"%AmmoInReserve%"
-	}
-	"AmmoInReserveShadow"
-	{
-		"ControlName"	"CExLabel"
-		"fieldName"		"AmmoInReserveShadow"
-		"font"			"CerbeticaBold32"
-		"font_minmode"	"CerbeticaBold20"
-		"fgcolor"		"TransparentBlack"
-		"xpos"			"68"
-		"ypos"			"-9"
-		"xpos_minmode"	"70"
-		"ypos_minmode"	"0"
-		"zpos"			"7"
-		"wide"			"60"
-		"tall"			"80"
-		"visible"		"0"
-		"enabled"		"1"
-		"textAlignment"	"west"
-		"labelText"		"%AmmoInReserve%"
-	}
-	"AmmoNoClip"
-	{
-		"ControlName"	"CExLabel"
-		"fieldName"		"AmmoNoClip"
-		"font"			"CerbeticaBold56"
-		"font_minmode"	"CerbeticaBold32"
-		"fgcolor"		"TanLight"
-		"xpos"			"26"
-		"ypos"			"-11"
-		"xpos_minmode"	"22"
-		"ypos_minmode"	"-1"
-		"zpos"			"5"
-		"wide"			"100"
-		"tall"			"80"
-		"visible"		"0"
-		"enabled"		"1"
-		"textAlignment"	"center"
-		"labelText"		"%Ammo%"
-	}
-	"AmmoNoClipShadow"
-	{
-		"ControlName"	"CExLabel"
-		"fieldName"		"AmmoNoClipShadow"
-		"font"			"CerbeticaBold56"
-		"font_minmode"	"CerbeticaBold32"
-		"fgcolor"		"TransparentBlack"
-		"xpos"			"28"
-		"ypos"			"-9"
-		"xpos_minmode"	"24"
-		"ypos_minmode"	"1"
-		"zpos"			"5"
-		"wide"			"100"
-		"tall"			"80"
-		"visible"		"0"
-		"enabled"		"1"
-		"textAlignment"	"center"
-		"labelText"		"%Ammo%"
-	}
-}
\ No newline at end of file
diff --git a/resource/ui/matchmakingdashboard.res b/resource/ui/matchmakingdashboard.res
index 1b4c63a..a846a6a 100644
--- a/resource/ui/matchmakingdashboard.res
+++ b/resource/ui/matchmakingdashboard.res
@@ -94,13 +94,13 @@
 			"visible"		"1"
 			"enabled"		"1"
 			"tabPosition"	"0"
-			"font"			"HudFontSmallestBold"
+			"labeltext"		"l"
+			"font"			"CustomIcons"
 			"textAlignment"	"center"
 			"dulltext"		"0"
 			"brighttext"	"0"
 			"Command"		"toggle_chat"
 			"proportionaltoparent"	"1"
-			"labeltext"		""
 			"mouseinputenabled"	"1"
 			"keyboardinputenabled"	"0"
 			"actionsignallevel"	"2"
@@ -110,27 +110,11 @@
 			"sound_depressed"	"UI/buttonclick.wav"
 			"sound_released"	"UI/buttonclickrelease.wav"
 
-			"image_drawcolor"	"TanLight"
-			"image_armedcolor"	"72 255 255 255"
+			"defaultFgColor_override"	"TanLight"
+			"armedFgColor_override"		"72 255 255 255"
 
 			"armedBgColor_override"		"Transparent"
 			"defaultBgColor_override"	"Transparent"
-
-			"SubImage"
-			{
-				"ControlName"	"ImagePanel"
-				"fieldName"		"SubImage"
-				"xpos"			"cs-0.5"
-				"ypos"			"rs1-2"
-				"zpos"			"1"
-				"wide"			"20"
-				"tall"			"20"
-				"visible"		"1"
-				"enabled"		"1"
-				"scaleImage"	"1"
-				"proportionaltoparent"	"1"
-				"image"			"replay/thumbnails/chat"
-			}
 		}
 
 		"PartySlot0"
@@ -694,7 +678,7 @@
 			"brighttext"	"0"
 			"Command"		"resume_game"
 			"proportionaltoparent"	"1"
-			"labeltext"		"Resume"
+			"labeltext"		"#MMenu_ResumeGame"
 			"mouseinputenabled"	"1"
 			"keyboardinputenabled"	"0"
 			"actionsignallevel"	"2"
@@ -702,7 +686,6 @@
 			"textinsety"	"5"
 			"textinsetx"	"22"
 			"use_proportional_insets"	"1"
-
 			"sound_depressed"	"UI/buttonclick.wav"
 			"sound_released"	"UI/buttonclickrelease.wav"