Added Hypnotize's Icons

- Updated to Hypnotize's icon pack.
- Updated multiple files, removed unused code.

130 files changed, 4480 insertions, 8101 deletions

diff --git a/customizations/main_menu/mainmenuoverride.res b/customizations/main_menu/mainmenuoverride.res
index d17f3c3..1dd261f 100644
--- a/customizations/main_menu/mainmenuoverride.res
+++ b/customizations/main_menu/mainmenuoverride.res
@@ -17,6 +17,7 @@
 		"button_x_offset"	"-285"
 		"button_y"			"120"
 		"button_y_delta"	"5"
+		
 		"button_kv"
 		{
 			"xpos"			"0"
@@ -55,24 +56,6 @@
 				"defaultFgColor_override"	"235 226 202 255"
 				"armedFgColor_override"		"72 255 255 255"
 				"depressedFgColor_override" "72 255 255 255"
-
-				"image_drawcolor"	"235 226 202 255"
-				"image_armedcolor"	"72 255 255 255"
-				"image_depressedcolor" "72 255 255 255"
-
-				"SubImage"
-				{
-					"ControlName"	"ImagePanel"
-					"fieldName"		"SubImage"
-					"xpos"			"6"
-					"ypos"			"6"
-					"zpos"			"1"
-					"wide"			"14"
-					"tall"			"14"
-					"visible"		"1"
-					"enabled"		"1"
-					"scaleImage"	"1"
-				}
 			}
 		}
 
@@ -163,17 +146,30 @@
 
 	"Background"
 	{
-		"ControlName"	"ImagePanel"
+		"ControlName"	"ScalableImagePanel"
 		"fieldName"		"Background"
-		"xpos"			"0"
+		"xpos"			"cs-0.5"
 		"ypos"			"0"
 		"zpos"			"-200"
-		"wide"			"0"
-		"tall"			"0"
+		"wide"			"o1.6"
+		"tall"			"f0"
 		"visible"		"0"
 		"enabled"		"1"
 		"image"			""
 		"scaleImage"	"1"
+		"proportionaltoparent"	"1"
+		
+		if_wider
+		{
+			"wide"		"f0"
+			"tall"		"o0.628"
+		}
+		
+		if_taller
+		{
+			"wide"		"o1.6"
+			"tall"		"f0"
+		}
 	}
 
 	"HudName"
@@ -208,21 +204,6 @@
 
 		"image_drawcolor"	"235 226 202 255"
 		"image_armedcolor"	"72 255 255 255"
-
-		"SubImage"
-		{
-			"ControlName"	"ImagePanel"
-			"fieldName"		"SubImage"
-			"xpos"			"16"
-			"ypos"			"6"
-			"zpos"			"1"
-			"wide"			"0"
-			"tall"			"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"scaleImage"	"1"
-			"image"			"glyph_quit"
-		}
 	}
 
 	"TFLogoImage"
@@ -276,7 +257,6 @@
 		"fieldName"		"CycleRankTypeButton"
 		"xpos"			"270"
 		"ypos"			"cs-0.5-33"
-		"zpos"			"1"
 		"wide"			"15"
 		"tall"			"15"
 		"autoResize"	"0"
@@ -284,45 +264,22 @@
 		"visible"		"1"
 		"enabled"		"1"
 		"tabPosition"	"0"
-		"textinsetx"	"25"
-		"labelText"		""
-		"use_proportional_insets" "1"
-		"font"			"HudFontSmallBold"
-		"command"		"open_rank_type_menu"
-		"textAlignment"	"west"
+		"labelText"		"v"
+		"font"			"CustomIcons"
+		"textAlignment"	"center"
 		"dulltext"		"0"
 		"brighttext"	"0"
 		"default"		"1"
-		"sound_depressed"	"UI/buttonclick.wav"
-		"sound_released"	"vo/null.mp3"
 		"actionsignallevel" "1"
-		"proportionaltoparent"	"1"
-
+		"command"			"open_rank_type_menu"
+		"paintbackground"	"0"
+		
 		"sound_depressed"	"UI/buttonclick.wav"
 		"sound_released"	"UI/buttonclickrelease.wav"
-		"paintbackground"	"0"
-		"paintborder"		"0"
-		"image_drawcolor"	"235 226 202 255"
-		"image_armedcolor"	"72 255 255 255"
-
-		"SubImage"
-		{
-			"ControlName"	"ImagePanel"
-			"fieldName"		"SubImage"
-			"xpos"			"cs-0.5"
-			"ypos"			"cs-0.5"
-			"zpos"			"1"
-			"wide"			"f2"
-			"tall"			"f2"
-			"visible"		"1"
-			"enabled"		"1"
-			"scaleImage"	"1"
-			"image"			"glyph_options"
-
-			"proportionaltoparent"	"1"
-			"mouseinputenabled"	"0"
-			"keyboardinputenabled" "0"
-		}
+		
+		"defaultFgColor_override" 	"235 226 202 255"
+		"armedFgColor_override" 	"72 255 255 255"
+		"depressedFgColor_override" "235 226 202 255"
 	}
 
 	"RankTooltipPanel"
@@ -514,70 +471,58 @@
 		}
 	}
 
-	"WatchStreamButton"
+	"QuestLogButton"
 	{
-		"ControlName"	"CExImageButton"
-		"fieldName"		"WatchStreamButton"
-		"xpos"			"r28"
+		"ControlName"	"EditablePanel"
+		"fieldName"		"QuestLogButton"
+		"xpos"			"rs1-10"
 		"ypos"			"65"
-		"zpos"			"0"
+		"zpos"			"1"
 		"wide"			"20"
 		"tall"			"20"
 		"autoResize"	"0"
-		"pinCorner"		"0"
+		"pinCorner"		"3"
 		"visible"		"1"
 		"enabled"		"1"
 		"tabPosition"	"0"
-		"labelText"		""
-		"Command"		"engine hud_reloadscheme"
-		
-		"defaultBgColor_override" "Transparent"
-		"armedBgColor_override" "Transparent"
-		"depressedBgColor_override" "Transparent"
-		
-		"image_drawcolor"	"235 226 202 255"
-		"image_armedcolor"	"72 255 255 255"
 
-		"SubImage"
+		"SubButton"
 		{
-			"ControlName"	"ImagePanel"
-			"fieldName"		"SubImage"
-			"xpos"			"2"
-			"ypos"			"2"
-			"zpos"			"1"
-			"wide"			"18"
-			"tall"			"18"
-			"visible"		"1"
-			"enabled"		"1"
-			"scaleImage"	"1"
+			"ControlName"		"CExImageButton"
+			"fieldName"			"SubButton"
+			"xpos"				"0"
+			"ypos"				"0"
+			"wide"				"20"
+			"tall"				"20"
+			"autoResize"		"0"
+			"pinCorner"			"3"
+			"visible"			"1"
+			"enabled"			"1"
+			"tabPosition"		"0"
+			"labelText"			"r"
+			"font"				"CustomIcons"
+			"command"			"questlog"
 			"proportionaltoparent"	"1"
-			"image"			"icon_resume"
-			"drawcolor_override" "235 226 202 255"
-		}
-	}
+			"textAlignment"		"center"
+			"default"			"1"
+			"actionsignallevel" "2"
+			"paintbackground"	"0"
+			"paintborder"		"0"
+			"sound_depressed"	"UI/buttonclick.wav"
+			"sound_released"	"UI/buttonclickrelease.wav"
 
-	"StreamListPanel"
-	{
-		"ControlName"	"CTFStreamListPanel"
-		"fieldName"		"StreamListPanel"
-		"xpos"			"r330"
-		"ypos"			"65"
-		"zpos"			"1"
-		"wide"			"300"
-		"tall"			"325"
-		"visible"		"0"
-		"PaintBackgroundType"	"0"
-		"paintbackground"		"2"
-		"bgcolor_override"		"DarkGrey"
+			"defaultFgColor_override"	"235 226 202 255"
+			"armedFgColor_override"		"72 255 255 255"
+		}
 	}
 
-	"QuestLogButton"
+	"MOTD_ShowButtonPanel"
 	{
 		"ControlName"	"EditablePanel"
-		"fieldName"		"QuestLogButton"
-		"xpos"			"r28"
+		"fieldName"		"MOTD_ShowButtonPanel"
+		"xpos"			"rs1-10"
 		"ypos"			"90"
-		"zpos"			"1"
+		"zpos"			"0"
 		"wide"			"20"
 		"tall"			"20"
 		"autoResize"	"0"
@@ -588,23 +533,23 @@
 
 		"SubButton"
 		{
-			"ControlName"	"CExImageButton"
-			"fieldName"		"SubButton"
-			"xpos"			"0"
-			"ypos"			"0"
-			"wide"			"20"
-			"tall"			"20"
-			"autoResize"	"0"
-			"pinCorner"		"3"
-			"visible"		"1"
-			"enabled"		"1"
-			"tabPosition"	"0"
-			"labelText"		"x"
-			"font"			"CustomIcons"
-			"command"		"questlog"
-			"proportionaltoparent"	"1"
-			"textAlignment"	"center"
-			"default"		"1"
+			"ControlName"		"CExImageButton"
+			"fieldName"			"SubButton"
+			"xpos"				"0"
+			"ypos"				"0"
+			"wide"				"20"
+			"tall"				"20"
+			"autoResize"		"0"
+			"pinCorner"			"3"
+			"visible"			"1"
+			"enabled"			"1"
+			"tabPosition"		"0"
+			"labelText"			"o"
+			"font"				"CustomIcons"
+			"command"			"motd_show"
+			"use_proportional_insets" "1"
+			"textAlignment"		"center"
+			"default"			"1"
 			"actionsignallevel" "2"
 			"paintbackground"	"0"
 			"paintborder"		"0"
@@ -616,40 +561,34 @@
 		}
 	}
 
-	"MOTD_ShowButtonPanel"
+	"RefreshHUDButton"
 	{
 		"ControlName"	"EditablePanel"
-		"fieldName"		"MOTD_ShowButtonPanel"
-		"xpos"			"r28"
+		"fieldName"		"RefreshHUDButton"
+		"xpos"			"rs1-09"
 		"ypos"			"115"
-		"zpos"			"0"
+		"zpos"			"1"
 		"wide"			"20"
 		"tall"			"20"
-		"autoResize"	"0"
-		"pinCorner"		"3"
 		"visible"		"1"
-		"enabled"		"1"
-		"tabPosition"	"0"
-
-		"MOTD_ShowButtonPanel_SB"
+		
+		"SubButton"
 		{
-			"ControlName"	"CExImageButton"
-			"fieldName"		"MOTD_ShowButtonPanel_SB"
-			"xpos"			"0"
-			"ypos"			"0"
-			"wide"			"20"
-			"tall"			"20"
-			"autoResize"	"0"
-			"pinCorner"		"3"
-			"visible"		"1"
-			"enabled"		"1"
-			"tabPosition"	"0"
-			"labelText"		"o"
-			"font"			"CustomIcons"
-			"command"		"motd_show"
+			"ControlName"		"CExImageButton"
+			"fieldName"			"SubButton"
+			"xpos"				"0"
+			"ypos"				"0"
+			"wide"				"20"
+			"tall"				"20"
+			"autoResize"		"0"
+			"pinCorner"			"3"
+			"visible"			"1"
+			"enabled"			"1"
+			"tabPosition"		"0"
+			"font"				"CustomIcons"
 			"use_proportional_insets" "1"
-			"textAlignment"	"center"
-			"default"		"1"
+			"textAlignment"		"center"
+			"default"			"1"
 			"actionsignallevel" "2"
 			"paintbackground"	"0"
 			"paintborder"		"0"
@@ -721,42 +660,22 @@
 			"visible"		"1"
 			"enabled"		"1"
 			"tabPosition"	"0"
-			"labeltext"		""
-			"font"			""
+			"labeltext"		"("
+			"font"			"CustomIcons"
 			"textAlignment"	"center"
 			"dulltext"		"0"
 			"brighttext"	"0"
 			"default"		"0"
 			"actionsignallevel"	"2"
-
-			"sound_depressed"	"UI/buttonclick.wav"
-			"sound_released"	"UI/buttonclickrelease.wav"
 			"Command"			"motd_hide"
 			"paintbackground"	"0"
-
-			//"defaultFgColor_override" "TanLight"
-			//"armedFgColor_override" "TanDarker"
-			"defaultFgColor_override" "Blank"
-			"armedFgColor_override" "Blank"
-			"depressedFgColor_override" "Blank"
-
-			"image_drawcolor"	"TanLight"
-			"image_armedcolor"	"255 0 0 255"
-
-			"SubImage"
-			{
-				"ControlName"	"ImagePanel"
-				"fieldName"		"SubImage"
-				"xpos"			"0"
-				"ypos"			"0"
-				"zpos"			"1"
-				"wide"			"14"
-				"tall"			"14"
-				"visible"		"1"
-				"enabled"		"1"
-				"image"			"replay/thumbnails/close"
-				"scaleImage"	"1"
-			}
+			
+			"sound_depressed"	"UI/buttonclick.wav"
+			"sound_released"	"UI/buttonclickrelease.wav"
+			
+			"defaultFgColor_override" 	"TanLight"
+			"armedFgColor_override" 	"255 0 0 255"
+			"depressedFgColor_override" "TanLight"
 		}
 
 		"MOTD_HeaderIcon"
@@ -1030,7 +949,7 @@
 		"fieldName"		"Notifications_Panel"
 		"xpos"			"c-120"
 		"ypos"			"80"
-		"zpos"			"1"
+		"zpos"			"100"
 		"wide"			"210"
 		"tall"			"80"
 		"visible"		"0"
@@ -1053,39 +972,22 @@
 			"visible"		"1"
 			"enabled"		"1"
 			"tabPosition"	"0"
-			"labeltext"		""
-			"font"			"HudFontSmallBold"
+			"labeltext"		"("
+			"font"			"CustomIcons"
 			"textAlignment"	"center"
 			"dulltext"		"0"
 			"brighttext"	"0"
 			"default"		"0"
 			"actionsignallevel"	"2"
 			"Command"			"noti_hide"
+			"paintbackground"	"0"
+			
 			"sound_depressed"	"UI/buttonclick.wav"
 			"sound_released"	"UI/buttonclickrelease.wav"
-			"paintbackground"	"0"
-
-			"defaultFgColor_override"	"235 226 202 255"
-			"armedFgColor_override"		"72 255 255 255"
-			"depressedFgColor_override"	"72 255 255 255"
-
-			"image_drawcolor"			"235 226 202 255"
-			"image_armedcolor"			"255 0 0 255"
-
-			"SubImage"
-			{
-				"ControlName"	"ImagePanel"
-				"fieldName"		"SubImage"
-				"xpos"			"0"
-				"ypos"			"0"
-				"zpos"			"1"
-				"wide"			"14"
-				"tall"			"14"
-				"visible"		"1"
-				"enabled"		"1"
-				"image"			"replay/thumbnails/close"
-				"scaleImage"	"1"
-			}
+			
+			"defaultFgColor_override" 	"235 226 202 255"
+			"armedFgColor_override" 	"255 0 0 255"
+			"depressedFgColor_override" "235 226 202 255"
 		}
 
 		"Notifications_TitleLabel"
@@ -1116,7 +1018,7 @@
 			"wide"			"210"
 			"tall"			"135"
 			"PaintBackgroundType"	"2"
-			"fgcolor_override"		"TextColor"
+			"fgcolor_override"	"TextColor"
 
 			"Notifications_Control"
 			{
@@ -1146,14 +1048,14 @@
 	"FriendsContainer"
 	{
 		"ControlName"	"EditablePanel"
-		"fieldname"		"FriendsContainer"
+		"fieldName"		"FriendsContainer"
 		"xpos"			"40"
 		"ypos"			"270"
 		"zpos"			"5"
 		"wide"			"260"
 		"tall"			"150"
 		"visible"		"1"
-		"border"			"NoBorder"
+		"border"		"NoBorder"
 		"bgcolor_override"	"Transparent"
 
 		"TitleLabel"
@@ -1175,7 +1077,7 @@
 		"InnerShadow"
 		{
 			"ControlName"	"EditablePanel"
-			"fieldname"		"InnerShadow"
+			"fieldName"		"InnerShadow"
 			"xpos"			"0"
 			"ypos"			"0"
 			"zpos"			"501"
@@ -1193,7 +1095,7 @@
 		"SteamFriendsList"
 		{
 			"ControlName"	"CSteamFriendsListPanel"
-			"fieldname"		"SteamFriendsList"
+			"fieldName"		"SteamFriendsList"
 			"xpos"			"0"
 			"ypos"			"0"
 			"zpos"			"500"
@@ -1251,7 +1153,7 @@
 		"BelowDarken"
 		{
 			"ControlName"	"EditablePanel"
-			"fieldname"		"BelowDarken"
+			"fieldName"		"BelowDarken"
 			"xpos"			"0"
 			"ypos"			"0"
 			"zpos"			"499"
@@ -1286,7 +1188,7 @@
 	"CharacterSetupButton"
 	{
 		"ControlName"	"CExImageButton"
-		"fieldname"		"CharacterSetupButton"
+		"fieldName"		"CharacterSetupButton"
 		"xpos"			"30"
 		"ypos"			"82"
 		"zpos"			"11"
@@ -1315,7 +1217,7 @@
 	"GeneralStoreButton"
 	{
 		"ControlName"	"CExImageButton"
-		"fieldname"		"GeneralStoreButton"
+		"fieldName"		"GeneralStoreButton"
 		"xpos"			"30"
 		"ypos"			"102"
 		"zpos"			"11"
@@ -1344,7 +1246,7 @@
 	"SteamWorkshopButton"
 	{
 		"ControlName"	"CExImageButton"
-		"fieldname"		"SteamWorkshopButton"
+		"fieldName"		"SteamWorkshopButton"
 		"xpos"			"30"
 		"ypos"			"122"
 		"zpos"			"11"
@@ -1485,37 +1387,18 @@
 			"visible"		"1"
 			"enabled"		"1"
 			"tabPosition"	"0"
-			"textinsetx"	"0"
-			"font"			"HudFontMediumSecondary"
+			"font"			"CustomIcons"
 			"use_proportional_insets" "1"
 			"textAlignment"	"center"
-			"dulltext"		"0"
-			"brighttext"	"0"
-			"default"		"1"
-
+			"default"			"1"
+			"actionsignallevel" "2"
+			"paintbackground"	"0"
+			"paintborder"		"0"
 			"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"
-			}
+			"defaultFgColor_override"	"235 226 202 255"
+			"armedFgColor_override"		"72 255 255 255"
 		}
 	}
 
@@ -1523,13 +1406,17 @@
 	{
 		"ControlName"	"EditablePanel"
 		"fieldname"		"ConsoleButton"
-		"xpos"			"124"
-		"ypos"			"62"
+		"xpos"			"20"
+		"ypos"			"0"
 		"zpos"			"12"
 		"wide"			"20"
 		"tall"			"20"
 		"visible"		"1"
 
+		"pin_to_sibling"			"AchievementsButton"
+		"pin_corner_to_sibling" 	"PIN_TOPRIGHT"
+		"pin_to_sibling_corner" 	"PIN_TOPRIGHT"
+
 		"SubButton"
 		{
 			"ControlName"	"CExImageButton"
@@ -1543,37 +1430,18 @@
 			"visible"		"1"
 			"enabled"		"1"
 			"tabPosition"	"0"
-			"textinsetx"	"0"
-			"font"			"HudFontMediumSecondary"
+			"font"			"CustomIcons"
 			"use_proportional_insets" "1"
 			"textAlignment"	"center"
-			"dulltext"		"0"
-			"brighttext"	"0"
 			"default"		"1"
-
+			"actionsignallevel" "2"
+			"paintbackground"	"0"
+			"paintborder"		"0"
 			"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"
-			}
+			"defaultFgColor_override"	"235 226 202 255"
+			"armedFgColor_override"		"72 255 255 255"
 		}
 	}
 
@@ -1581,13 +1449,17 @@
 	{
 		"ControlName"	"EditablePanel"
 		"fieldname"		"ReplayButton"
-		"xpos"			"144"
-		"ypos"			"62"
+		"xpos"			"20"
+		"ypos"			"0"
 		"zpos"			"12"
 		"wide"			"20"
 		"tall"			"20"
 		"visible"		"1"
 
+		"pin_to_sibling"			"ConsoleButton"
+		"pin_corner_to_sibling" 	"PIN_TOPRIGHT"
+		"pin_to_sibling_corner" 	"PIN_TOPRIGHT"
+
 		"SubButton"
 		{
 			"ControlName"	"CExImageButton"
@@ -1601,37 +1473,18 @@
 			"visible"		"1"
 			"enabled"		"1"
 			"tabPosition"	"0"
-			"textinsetx"	"0"
-			"font"			"HudFontMediumSecondary"
+			"font"			"CustomIcons"
 			"use_proportional_insets" "1"
 			"textAlignment"	"center"
-			"dulltext"		"0"
-			"brighttext"	"0"
 			"default"		"1"
-
+			"actionsignallevel" "2"
+			"paintbackground"	"0"
+			"paintborder"		"0"
 			"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"
-			}
+			"defaultFgColor_override"	"235 226 202 255"
+			"armedFgColor_override"		"72 255 255 255"
 		}
 	}
 
@@ -1639,13 +1492,17 @@
 	{
 		"ControlName"	"EditablePanel"
 		"fieldname"		"ReportBugButton"
-		"xpos"			"164"
-		"ypos"			"62"
+		"xpos"			"20"
+		"ypos"			"0"
 		"zpos"			"12"
 		"wide"			"20"
 		"tall"			"20"
 		"visible"		"1"
 
+		"pin_to_sibling"			"ReplayButton"
+		"pin_corner_to_sibling" 	"PIN_TOPRIGHT"
+		"pin_to_sibling_corner" 	"PIN_TOPRIGHT"
+
 		"SubButton"
 		{
 			"ControlName"	"CExImageButton"
@@ -1659,37 +1516,18 @@
 			"visible"		"1"
 			"enabled"		"1"
 			"tabPosition"	"0"
-			"textinsetx"	"0"
-			"font"			"HudFontMediumSecondary"
+			"font"			"CustomIcons"
 			"use_proportional_insets" "1"
 			"textAlignment"	"center"
-			"dulltext"		"0"
-			"brighttext"	"0"
 			"default"		"1"
-
+			"actionsignallevel" "2"
+			"paintbackground"	"0"
+			"paintborder"		"0"
 			"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"
-			}
+			"defaultFgColor_override"	"235 226 202 255"
+			"armedFgColor_override"		"72 255 255 255"
 		}
 	}
 
@@ -1697,13 +1535,17 @@
 	{
 		"ControlName"	"EditablePanel"
 		"fieldname"		"CoachPlayersButton"
-		"xpos"			"184"
-		"ypos"			"62"
+		"xpos"			"20"
+		"ypos"			"0"
 		"zpos"			"12"
 		"wide"			"20"
 		"tall"			"20"
 		"visible"		"1"
 
+		"pin_to_sibling"			"ReportBugButton"
+		"pin_corner_to_sibling" 	"PIN_TOPRIGHT"
+		"pin_to_sibling_corner" 	"PIN_TOPRIGHT"
+
 		"SubButton"
 		{
 			"ControlName"	"CExImageButton"
@@ -1717,37 +1559,18 @@
 			"visible"		"1"
 			"enabled"		"1"
 			"tabPosition"	"0"
-			"textinsetx"	"0"
-			"font"			"HudFontMediumSecondary"
+			"font"			"CustomIcons"
 			"use_proportional_insets" "1"
 			"textAlignment"	"center"
-			"dulltext"		"0"
-			"brighttext"	"0"
 			"default"		"1"
-
+			"actionsignallevel" "2"
+			"paintbackground"	"0"
+			"paintborder"		"0"
 			"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"
-			}
+			"defaultFgColor_override"	"235 226 202 255"
+			"armedFgColor_override"		"72 255 255 255"
 		}
 	}
 
@@ -1755,13 +1578,17 @@
 	{
 		"ControlName"	"EditablePanel"
 		"fieldname"		"RequestCoachButton"
-		"xpos"			"204"
-		"ypos"			"62"
+		"xpos"			"20"
+		"ypos"			"0"
 		"zpos"			"12"
 		"wide"			"20"
 		"tall"			"20"
 		"visible"		"1"
 
+		"pin_to_sibling"			"CoachPlayersButton"
+		"pin_corner_to_sibling" 	"PIN_TOPRIGHT"
+		"pin_to_sibling_corner" 	"PIN_TOPRIGHT"
+
 		"SubButton"
 		{
 			"ControlName"	"CExImageButton"
@@ -1775,37 +1602,18 @@
 			"visible"		"1"
 			"enabled"		"1"
 			"tabPosition"	"0"
-			"textinsetx"	"0"
-			"font"			"HudFontMediumSecondary"
+			"font"			"CustomIcons"
 			"use_proportional_insets" "1"
 			"textAlignment"	"center"
-			"dulltext"		"0"
-			"brighttext"	"0"
 			"default"		"1"
-
+			"actionsignallevel" "2"
+			"paintbackground"	"0"
+			"paintborder"		"0"
 			"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"
-			}
+			"defaultFgColor_override"	"235 226 202 255"
+			"armedFgColor_override"		"72 255 255 255"
 		}
 	}
 
@@ -1813,13 +1621,17 @@
 	{
 		"ControlName"	"EditablePanel"
 		"fieldname"		"CallVoteButton"
-		"xpos"			"224"
-		"ypos"			"62"
+		"xpos"			"20"
+		"ypos"			"0"
 		"zpos"			"12"
 		"wide"			"20"
 		"tall"			"20"
 		"visible"		"1"
 
+		"pin_to_sibling"			"RequestCoachButton"
+		"pin_corner_to_sibling" 	"PIN_TOPRIGHT"
+		"pin_to_sibling_corner" 	"PIN_TOPRIGHT"
+
 		"SubButton"
 		{
 			"ControlName"	"CExImageButton"
@@ -1833,37 +1645,18 @@
 			"visible"		"1"
 			"enabled"		"1"
 			"tabPosition"	"0"
-			"textinsetx"	"0"
-			"font"			"HudFontMediumSecondary"
+			"font"			"CustomIcons"
 			"use_proportional_insets" "1"
 			"textAlignment"	"center"
-			"dulltext"		"0"
-			"brighttext"	"0"
 			"default"		"1"
-
+			"actionsignallevel" "2"
+			"paintbackground"	"0"
+			"paintborder"		"0"
 			"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"
-			}
+			"defaultFgColor_override"	"235 226 202 255"
+			"armedFgColor_override"		"72 255 255 255"
 		}
 	}
 
@@ -1871,13 +1664,17 @@
 	{
 		"ControlName"	"EditablePanel"
 		"fieldname"		"MutePlayersButton"
-		"xpos"			"244"
-		"ypos"			"62"
+		"xpos"			"20"
+		"ypos"			"0"
 		"zpos"			"12"
 		"wide"			"20"
 		"tall"			"20"
 		"visible"		"1"
 
+		"pin_to_sibling"			"CallVoteButton"
+		"pin_corner_to_sibling" 	"PIN_TOPRIGHT"
+		"pin_to_sibling_corner" 	"PIN_TOPRIGHT"
+
 		"SubButton"
 		{
 			"ControlName"	"CExImageButton"
@@ -1891,37 +1688,18 @@
 			"visible"		"1"
 			"enabled"		"1"
 			"tabPosition"	"0"
-			"textinsetx"	"0"
-			"font"			"HudFontMediumSecondary"
+			"font"			"CustomIcons"
 			"use_proportional_insets" "1"
 			"textAlignment"	"center"
-			"dulltext"		"0"
-			"brighttext"	"0"
 			"default"		"1"
-
+			"actionsignallevel" "2"
+			"paintbackground"	"0"
+			"paintborder"		"0"
 			"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"
-			}
+			"defaultFgColor_override"	"235 226 202 255"
+			"armedFgColor_override"		"72 255 255 255"
 		}
 	}
 
@@ -1929,13 +1707,17 @@
 	{
 		"ControlName"	"EditablePanel"
 		"fieldname"		"ReportPlayerButton"
-		"xpos"			"264"
-		"ypos"			"62"
+		"xpos"			"20"
+		"ypos"			"0"
 		"zpos"			"12"
 		"wide"			"20"
 		"tall"			"20"
 		"visible"		"1"
 
+		"pin_to_sibling"			"MutePlayersButton"
+		"pin_corner_to_sibling" 	"PIN_TOPRIGHT"
+		"pin_to_sibling_corner" 	"PIN_TOPRIGHT"
+
 		"SubButton"
 		{
 			"ControlName"	"CExImageButton"
@@ -1949,37 +1731,18 @@
 			"visible"		"1"
 			"enabled"		"1"
 			"tabPosition"	"0"
-			"textinsetx"	"0"
-			"font"			"HudFontMediumSecondary"
+			"font"			"CustomIcons"
 			"use_proportional_insets" "1"
 			"textAlignment"	"center"
-			"dulltext"		"0"
-			"brighttext"	"0"
 			"default"		"1"
-
+			"actionsignallevel" "2"
+			"paintbackground"	"0"
+			"paintborder"		"0"
 			"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"
-			}
+			"defaultFgColor_override"	"235 226 202 255"
+			"armedFgColor_override"		"72 255 255 255"
 		}
 	}
 
@@ -1993,36 +1756,7 @@
 		"wide"			"260"
 		"tall"			"370"
 		"visible"		"1"
-		"enabled"		"1"
-		"bgcolor_override"		"25 25 25 168"
+		"bgcolor_override"	"25 25 25 168"
 		"PaintBackgroundType"	"2"
 	}
-
-	"icon_generator"
-	{
-		"ControlName"	"CEmbeddedItemModelPanel"
-		"fieldName"		"icon_generator"
-		"xpos"			"0"
-		"ypos"			"0"
-		"zpos"			"1"
-		"wide"			"300"
-		"tall"			"300"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"1"
-		"enabled"		"1"
-		"useparentbg"	"1"
-		"inset_eq_x"	"2"
-		"inset_eq_y"	"2"
-		"fov"			"54"
-		"start_framed"	"1"
-		"disable_manipulation"	"1"
-
-		"model"
-		{
-			"angles_x"		"10"
-			"angles_y"		"130"
-			"angles_z"		"0"
-		}
-	}
 }
\ No newline at end of file
diff --git a/materials/vgui/replay/thumbnails/close.vmt b/materials/vgui/replay/thumbnails/close.vmt
deleted file mode 100644
index cfc66cd..0000000
--- a/materials/vgui/replay/thumbnails/close.vmt
+++ /dev/null
@@ -1,8 +0,0 @@
-"UnlitGeneric"
-{
-	"$baseTexture" "vgui\replay\thumbnails\close"
-	"$vertexcolor" "1"
-	"$no_fullbright" "1"
-	"$ignorez" "1"
-	"$translucent" "1"
-}
\ No newline at end of file
diff --git a/materials/vgui/replay/thumbnails/close.vtf b/materials/vgui/replay/thumbnails/close.vtf
deleted file mode 100644
index 22a8c98..0000000
--- a/materials/vgui/replay/thumbnails/close.vtf
+++ /dev/null
diff --git a/materials/vgui/replay/thumbnails/reel.vmt b/materials/vgui/replay/thumbnails/reel.vmt
deleted file mode 100644
index 345157b..0000000
--- a/materials/vgui/replay/thumbnails/reel.vmt
+++ /dev/null
@@ -1,8 +0,0 @@
-"UnlitGeneric"
-{
-	"$basetexture" "vgui\replay\thumbnails\reel"
-	"$vertexcolor" "1"
-	"$no_fullbright" "1"
-	"$ignorez" "1"
-	"$translucent" "1"
-}
\ No newline at end of file
diff --git a/materials/vgui/replay/thumbnails/reel.vtf b/materials/vgui/replay/thumbnails/reel.vtf
deleted file mode 100644
index 01abc6f..0000000
--- a/materials/vgui/replay/thumbnails/reel.vtf
+++ /dev/null
diff --git a/resource/fonts/Icons.otf b/resource/fonts/Icons.otf
index 857e32b..51ce542 100644
--- a/resource/fonts/Icons.otf
+++ b/resource/fonts/Icons.otf
diff --git a/resource/gamemenu.res b/resource/gamemenu.res
index d40948b..ff2961b 100644
--- a/resource/gamemenu.res
+++ b/resource/gamemenu.res
@@ -2,69 +2,66 @@
 {
 	"AchievementsButton"
 	{
-		"label"			""
+		"label"			"b"
 		"command"		"OpenAchievementsDialog"
-		"subimage" 		"glyph_achievements"
 		"tooltip" 		"#Achievements"
 	}
-	"ReplayButton"
-	{
-		"label"			""
-		"command"		"engine replay_reloadbrowser"
-		"subimage" 		"glyph_tv"
-		"tooltip" 		"#MMenu_Tooltip_Replay"
-	}
 	"ConsoleButton"
 	{
-		"label"			""
+		"label"			"c"
 		"command"		"engine toggleconsole"
-		"subimage"		"glyph_view"
 		"tooltip"		"Console"
 	}
+	"ReplayButton"
+	{
+		"label"			"d"
+		"command"		"engine replay_reloadbrowser"
+		"tooltip" 		"#MMenu_Tooltip_Replay"
+	}
 	"ReportBugButton"
 	{
-		"label"			""
+		"label"			"e"
 		"command"		"engine bug"
-		"subimage"		"glyph_bug"
 		"tooltip"		"#MMenu_Tooltip_ReportBug"
 	}
 	"CoachPlayersButton"
 	{
-		"label" 		""
+		"label" 		"g"
 		"command" 		"engine cl_coach_toggle"
-		"subimage" 		"glyph_commentary"
 		"tooltip" 		"#MMenu_Tooltip_Coach"
 	}
+	"RequestCoachButton"
+	{
+		"label"			"h"
+		"command"		"engine cl_coach_find_coach"
+		"OnlyInGame"	"1"
+		"tooltip"		"#MMenu_RequestCoach"
+	}
 	"CallVoteButton"
 	{
-		"label"			""
+		"label"			"i"
 		"command"		"callvote"
 		"OnlyInGame"	"1"
-		"subimage"		"icon_checkbox"
 		"tooltip"		"#MMenu_CallVote"
 	}
 	"MutePlayersButton"
 	{
-		"label"			""
+		"label"			"j"
 		"command"		"OpenMutePlayerDialog"
 		"OnlyInGame"	"1"
-		"subimage"		"glyph_muted"
 		"tooltip"		"#MMenu_MutePlayers"
 	}
-	"RequestCoachButton"
-	{
-		"label"			""
-		"command"		"engine cl_coach_find_coach"
-		"OnlyInGame"	"1"
-		"subimage"		"glyph_tutorial"
-		"tooltip"		"#MMenu_RequestCoach"
-	}
 	"ReportPlayerButton"
 	{
-		"label"			""
+		"label"			"k"
 		"command"		"OpenReportPlayerDialog"
 		"OnlyInGame"	"1"
-		"subimage"		"glyph_quest_icon"
 		"tooltip"		"#MMenu_ReportPlayer"
 	}
+	"RefreshHUDButton"
+	{
+		"label"			"."
+		"command"		"engine hud_reloadscheme"
+		"tooltip"		"Refresh HUD"
+	}
 }
\ No newline at end of file
diff --git a/resource/scheme/clientscheme_colors.res b/resource/scheme/clientscheme_colors.res
index 95a71fd..f4e6759 100644
--- a/resource/scheme/clientscheme_colors.res
+++ b/resource/scheme/clientscheme_colors.res
@@ -1,5 +1,6 @@
 Scheme
 {
+	//////////////////////// COLORS ///////////////////////////
 	Colors
 	{
 		// HUD COLORS
diff --git a/resource/scheme/clientscheme_fonts.res b/resource/scheme/clientscheme_fonts.res
index fc0053c..8755210 100644
--- a/resource/scheme/clientscheme_fonts.res
+++ b/resource/scheme/clientscheme_fonts.res
@@ -271,7 +271,7 @@ Scheme
 				"antialias"		"1"
 			}
 		}
-		DefaultLarge
+		"DefaultLarge"
 		{
 			"1"
 			{
@@ -332,7 +332,7 @@ Scheme
 			}
 		}
 
-		CenterPrintText
+		"CenterPrintText"
 		{
 			"1"
 			{
@@ -357,7 +357,7 @@ Scheme
 			}
 		}
 
-		HudHintText
+		"HudHintText"
 		{
 			"1"
 			{
@@ -736,7 +736,7 @@ Scheme
 			}
 		}
 
-		GameUIButtons
+		"GameUIButtons"
 		{
 			"1"	//[$X360]
 			{
@@ -746,7 +746,7 @@ Scheme
 				"scaley"		"0.5"
 			}
 		}
-		GameUIButtonsSmall
+		"GameUIButtonsSmall"
 		{
 			"1"	[$X360]
 			{
@@ -756,7 +756,7 @@ Scheme
 				"scaley"		"0.5"
 			}
 		}
-		GameUIButtonsSmallest
+		"GameUIButtonsSmallest"
 		{
 			"1"	[$X360]
 			{
@@ -766,7 +766,7 @@ Scheme
 				"scaley"		"0.4"
 			}
 		}
-		GameUIButtonsSteamController
+		"GameUIButtonsSteamController"
 		{
 			"1"
 			{
@@ -776,7 +776,7 @@ Scheme
 				"scaley"		"0.5"
 			}
 		}
-		GameUIButtonsSteamControllerSmall
+		"GameUIButtonsSteamControllerSmall"
 		{
 			"1"
 			{
@@ -786,7 +786,7 @@ Scheme
 				"scaley"		"0.25"
 			}
 		}
-		GameUIButtonsSteamControllerSmallest
+		"GameUIButtonsSteamControllerSmallest"
 		{
 			"1"
 			{
@@ -917,7 +917,7 @@ Scheme
 			}
 		}
 
-		DebugOverlay
+		"DebugOverlay"
 		{
 			"1"
 			{
@@ -929,7 +929,7 @@ Scheme
 			}
 		}
 
-		TFTypeDeath
+		"TFTypeDeath"
 		{
 			"1"
 			{
@@ -941,7 +941,7 @@ Scheme
 			}
 		}
 
-		Icons
+		"Icons"
 		{
 			"1"
 			 {
@@ -966,7 +966,7 @@ Scheme
 			}
 		}
 
-		HudNumbers
+		"HudNumbers"
 		{
 			"1"
 			{
@@ -1534,7 +1534,7 @@ Scheme
 			}
 		}
 
-		MenuSmallestFont
+		"MenuSmallestFont"
 		{
 			"1"
 			{
@@ -1545,7 +1545,7 @@ Scheme
 				"antialias"		"1"
 			}
 		}
-		MenuSmallFont
+		"MenuSmallFont"
 		{
 			"1"
 			{
@@ -1557,7 +1557,7 @@ Scheme
 			}
 		}
 
-		CapPlayerFont
+		"CapPlayerFont"
 		{
 			"1"
 			{
@@ -1569,7 +1569,7 @@ Scheme
 				"antialias" 	"1"
 			}
 		}
-		CapPlayerFontSmall
+		"CapPlayerFontSmall"
 		{
 			"1"
 			{
@@ -1582,7 +1582,7 @@ Scheme
 			}
 		}
 
-		TFFontSmall
+		"TFFontSmall"
 		{
 			"1"
 			{
@@ -1593,7 +1593,7 @@ Scheme
 				"antialias" 	"1"
 			}
 		}
-		TFFontMedium
+		"TFFontMedium"
 		{
 			"1"
 			{
@@ -1605,7 +1605,7 @@ Scheme
 			}
 		}
 
-		InstructionalText
+		"InstructionalText"
 		{
 			"1"
 			{
@@ -1618,7 +1618,7 @@ Scheme
 			}
 		}
 
-		MatchmakingDialogTitle
+		"MatchmakingDialogTitle"
 		{
 			"1"
 			{
@@ -1627,7 +1627,7 @@ Scheme
 				"weight"		"500"
 			}
 		}
-		MatchmakingDialogSessionOptionsTitle
+		"MatchmakingDialogSessionOptionsTitle"
 		{
 			"1"
 			{
@@ -1636,7 +1636,7 @@ Scheme
 				"weight"		"500"
 			}
 		}
-		MatchmakingDialogMenuLarge
+		"MatchmakingDialogMenuLarge"
 		{
 			"1"
 			{
@@ -1645,7 +1645,7 @@ Scheme
 				"weight"		"500"
 			}
 		}
-		MatchmakingDialogMenuBrowserHostname
+		"MatchmakingDialogMenuBrowserHostname"
 		{
 			"1"
 			{
@@ -1654,7 +1654,7 @@ Scheme
 				"weight"		"900"
 			}
 		}
-		MatchmakingDialogMenuBrowserDetails
+		"MatchmakingDialogMenuBrowserDetails"
 		{
 			"1"
 			{
@@ -1663,7 +1663,7 @@ Scheme
 				"weight"		"900"
 			}
 		}
-		MatchmakingDialogMenuMedium
+		"MatchmakingDialogMenuMedium"
 		{
 			"1"
 			{
@@ -1672,7 +1672,7 @@ Scheme
 				"weight"		"500"
 			}
 		}
-		MatchmakingDialogMenuMediumSmall
+		"MatchmakingDialogMenuMediumSmall"
 		{
 			"1"
 			{
@@ -1681,7 +1681,7 @@ Scheme
 				"weight"		"500"
 			}
 		}
-		MatchmakingDialogMenuSmall
+		"MatchmakingDialogMenuSmall"
 		{
 			"1"
 			{
@@ -1690,7 +1690,7 @@ Scheme
 				"weight"		"900"
 			}
 		}
-		MatchmakingDialogMenuSmallest
+		"MatchmakingDialogMenuSmallest"
 		{
 			"1"
 			{
@@ -1700,7 +1700,7 @@ Scheme
 			}
 		}
 
-		RankingDialogHeaders
+		"RankingDialogHeaders"
 		{
 			"1"
 			{
diff --git a/resource/scheme/clientscheme_icons.res b/resource/scheme/clientscheme_icons.res
index 2dccc84..0f6f30d 100644
--- a/resource/scheme/clientscheme_icons.res
+++ b/resource/scheme/clientscheme_icons.res
@@ -6,7 +6,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"			"FlawHUDIcons"
+				"name"			"Icons"
 				"tall"			"15"
 				"weight"		"400"
 				"additive"		"0"
@@ -18,7 +18,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"			"FlawHUDIcons"
+				"name"			"Icons"
 				"tall"			"62"
 				"weight"		"0"
 				"additive"		"0"
@@ -30,12 +30,23 @@ Scheme
 		{
 			"1"
 			{
-				"name"			"FlawHUDIcons"
+				"name"			"Icons"
 				"tall"			"18"
 				"additive"		"0"
 				"antialias"		"1"
 			}
 		}
+
+		"LargeIcons"
+		{
+			"1"
+			{
+				"name"			"Icons"
+				"tall"			"62"
+				"additive"		"0"
+				"antialias"		"1"
+			}
+		}
 	}
 
 	CustomFontFiles
@@ -43,7 +54,7 @@ Scheme
 		"121"
 		{
 			"font"	"resource/fonts/Icons.otf"
-			"name"	"FlawHUDIcons"
+			"name"	"Icons"
 		}
 	}
 }
\ No newline at end of file
diff --git a/resource/sourcescheme.res b/resource/sourcescheme.res
index 4e471b9..f2a2354 100644
--- a/resource/sourcescheme.res
+++ b/resource/sourcescheme.res
@@ -9,21 +9,13 @@ Scheme
 	{
 		// HUD COLORS
 		//---------------------------------------------
-		"HudBlack"					"0 0 0 200"
-		"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"					"132 132 132 255"
-		"Grey"						"51 47 46 255"
 		"DarkGrey"					"27 27 27 255"
-		"DarkerGrey"				"22 22 22 255"
 		"Black"						"17 17 17 255"
+		"Blank"						"0 0 0 0"
+		"HudBlack"					"0 0 0 200"
 
 		// BASE COLORS
 		//---------------------------------------------
@@ -66,6 +58,7 @@ Scheme
 		Border.Bright					"Blank"
 		Border.Dark						"Blank"
 		Border.Selection				"Blank"
+		Border.DarkSolid				"32 32 32 255"
 
 		Button.TextColor				"White"
 		Button.BgColor					"Black"
@@ -150,7 +143,73 @@ Scheme
 		TextEntry.DisabledTextColor	        "DullWhite"
 		TextEntry.SelectedBgColor			"White"
 	}
-
+	
+	Borders
+	{
+		BaseBorder							SubtleBorder
+		ButtonBorder						RaisedBorder
+		ComboBoxBorder						DepressedBorder
+		MenuBorder							SubtleBorder
+		BrowserBorder						DepressedBorder
+		PropertySheetBorder					RaisedBorder
+		
+		FrameBorder
+		{
+			Left
+			{
+				"1"
+				{
+					"color" 				"Border.DarkSolid"
+					"offset" 				"0 0"
+				}
+				"2"
+				{
+					"color" 				"Border.DarkSolid"
+					"offset" 				"0 0"
+				}
+			}
+			Right
+			{
+				"1"
+				{
+					"color" 				"Border.DarkSolid"
+					"offset" 				"0 0"
+				}
+				"2"
+				{
+					"color" 				"Border.DarkSolid"
+					"offset" 				"0 0"
+				}
+			}
+			Top
+			{
+				"1"
+				{
+					"color" 				"Border.DarkSolid"
+					"offset" 				"0 0"
+				}
+				"2"
+				{
+					"color" 				"Border.DarkSolid"
+					"offset" 				"0 0"
+				}
+			}
+			Bottom
+			{
+				"1"
+				{
+					"color" 				"Border.DarkSolid"
+					"offset" 				"0 0"
+				}
+				"2"
+				{
+					"color"					"Border.DarkSolid"
+					"offset" 				"0 0"
+				}
+			}
+		}
+	}
+	
 	Fonts
 	{
 		"MainMenuFont"
diff --git a/resource/ui/build_menu/hudmenuengybuild.res b/resource/ui/build_menu/hudmenuengybuild.res
index 92f1bae..f917781 100644
--- a/resource/ui/build_menu/hudmenuengybuild.res
+++ b/resource/ui/build_menu/hudmenuengybuild.res
@@ -19,14 +19,6 @@
 		"ControlName"		"CIconPanel"
 		"fieldName"			"BuildIcon"
 		"xpos"				"9999"
-		"ypos"				"9999"
-		"zpos"				"1"
-		"wide"				"48"
-		"tall"				"48"
-		"visible"			"0"
-		"enabled"			"0"
-		"scaleImage"		"1"
-		"icon"				"ico_build"
 	}
 
 	"TitleLabel"
diff --git a/resource/ui/build_menu/hudmenueurekaeffect.res b/resource/ui/build_menu/hudmenueurekaeffect.res
index 6b4bd86..c1a997a 100644
--- a/resource/ui/build_menu/hudmenueurekaeffect.res
+++ b/resource/ui/build_menu/hudmenueurekaeffect.res
@@ -20,15 +20,6 @@
 		"ControlName"		"CIconPanel"
 		"fieldName"			"BuildIcon"
 		"xpos"				"9999"
-		"ypos"				"9999"
-		"zpos"				"1"
-		"wide"				"48"
-		"tall"				"48"
-		"visible"			"0"
-		"enabled"			"0"
-		"scaleImage"		"1"
-		"icon"				"ico_build"
-		"iconColor"			"White"
 	}
 
 	"TitleLabel"
diff --git a/resource/ui/build_menu/pipboy/base_already_built.res b/resource/ui/build_menu/pipboy/base_already_built.res
index be1a9ac..66d0c3e 100644
--- a/resource/ui/build_menu/pipboy/base_already_built.res
+++ b/resource/ui/build_menu/pipboy/base_already_built.res
@@ -1,6 +1 @@
-#base "../base_already_built.res"
-
-"Resource/UI/build_menu/base_already_built.res"
-{
-
-}
\ No newline at end of file
+#base "../base_already_built.res"
\ No newline at end of file
diff --git a/resource/ui/build_menu/pipboy/base_cant_afford.res b/resource/ui/build_menu/pipboy/base_cant_afford.res
index 4ada1f3..9104f13 100644
--- a/resource/ui/build_menu/pipboy/base_cant_afford.res
+++ b/resource/ui/build_menu/pipboy/base_cant_afford.res
@@ -1,6 +1 @@
-#base "../base_cant_afford.res"
-
-"Resource/UI/build_menu/base_cant_afford.res"
-{
-
-}
\ No newline at end of file
+#base "../base_cant_afford.res"
\ No newline at end of file
diff --git a/resource/ui/build_menu/pipboy/base_unavailable.res b/resource/ui/build_menu/pipboy/base_unavailable.res
index c057534..6a6514e 100644
--- a/resource/ui/build_menu/pipboy/base_unavailable.res
+++ b/resource/ui/build_menu/pipboy/base_unavailable.res
@@ -1,5 +1 @@
-#base "../base_unavailable.res"
-
-"Resource/UI/build_menu/base_unavailable.res"
-{
-}
\ No newline at end of file
+#base "../base_unavailable.res"
\ No newline at end of file
diff --git a/resource/ui/build_menu/pipboy/base_unavailable_teleport_target.res b/resource/ui/build_menu/pipboy/base_unavailable_teleport_target.res
index 297d30d..be6e83f 100644
--- a/resource/ui/build_menu/pipboy/base_unavailable_teleport_target.res
+++ b/resource/ui/build_menu/pipboy/base_unavailable_teleport_target.res
@@ -1,5 +1 @@
-#base "../base_unavailable_teleport_target.res"
-
-"Resource/UI/build_menu/base_unavailable.res"
-{
-}
\ No newline at end of file
+#base "../base_unavailable_teleport_target.res"
\ No newline at end of file
diff --git a/resource/ui/build_menu/pipboy/hudmenueurekaeffect.res b/resource/ui/build_menu/pipboy/hudmenueurekaeffect.res
index f8e9d1e..0057ea2 100644
--- a/resource/ui/build_menu/pipboy/hudmenueurekaeffect.res
+++ b/resource/ui/build_menu/pipboy/hudmenueurekaeffect.res
@@ -8,7 +8,7 @@
 		"fieldName"			"ItemBackground"
 		"xpos"				"0"
 		"ypos"				"20"
-		"zpos"				"-2"
+		"zpos"				"0"
 		"wide"				"200"
 		"tall"				"120"
 		"visible"			"1"
diff --git a/resource/ui/charinfoarmorysubpanel.res b/resource/ui/charinfoarmorysubpanel.res
index 8b5ba72..8149655 100644
--- a/resource/ui/charinfoarmorysubpanel.res
+++ b/resource/ui/charinfoarmorysubpanel.res
@@ -2,15 +2,15 @@
 {
 	"armory_panel"
 	{
-		"ControlName"		"Frame"
-		"fieldName"			"armory_panel"
-		"wide"				"f0"
-		"zpos"				"501"
-		"visible"			"1"
-		"autoResize"		"0"
-		"pinCorner"			"0"
-		"enabled"			"1"
-		"tabPosition"		"0"
+		"ControlName"			"Frame"
+		"fieldName"				"armory_panel"
+		"wide"					"f0"
+		"zpos"					"501"
+		"visible"				"1"
+		"autoResize"			"0"
+		"pinCorner"				"0"
+		"enabled"				"1"
+		"tabPosition"			"0"
 		"settitlebarvisible"	"0"
 		"PaintBackgroundType"	"0"
 		"bgcolor_override"				"DarkGrey"
@@ -19,37 +19,38 @@
 		"thumbnail_bgcolor"				"Grey"
 		"thumbnail_bgcolor_mouseover"	"156 146 128 255"
 		"thumbnail_bgcolor_selected"	"176 166 148 255"
-		"thumbnails_rows"		"4"
-		"thumbnails_columns"	"4"
-		"thumbnails_x"			"c-300"
-		"thumbnails_y"			"60"
-		"thumbnails_delta_x"	"8"
-		"thumbnails_delta_y"	"8"
+		"thumbnails_rows"				"4"
+		"thumbnails_columns"			"4"
+		"thumbnails_x"					"c-300"
+		"thumbnails_y"					"60"
+		"thumbnails_delta_x"			"8"
+		"thumbnails_delta_y"			"8"
 
 		"thumbnail_modelpanels_kv"
 		{
-			"ControlName"	"CItemModelPanel"
-			"zpos"			"13"
-			"wide"			"70"
-			"tall"			"49"
-			"visible"		"0"
+			"ControlName"			"CItemModelPanel"
+			"zpos"					"13"
+			"wide"					"70"
+			"tall"					"49"
+			"visible"				"0"
 			"bgcolor_override"		"ColorBlack"
 			"noitem_textcolor"		"TextColor"
 			"PaintBackgroundType"	"2"
-			"paintborder"	"0"
-			"model_xpos"	"7"
-			"model_ypos"	"5"
-			"model_wide"	"58"
-			"model_tall"	"38"
-			"text_ypos"		"60"
-			"text_center"	"1"
-			"name_only"		"1"
-			"inset_eq_x"	"2"
-			"inset_eq_y"	"2"
+			"paintborder"			"0"
+			"model_xpos"			"7"
+			"model_ypos"			"5"
+			"model_wide"			"58"
+			"model_tall"			"38"
+			"text_ypos"				"60"
+			"text_center"			"1"
+			"name_only"				"1"
+			"inset_eq_x"			"2"
+			"inset_eq_y"			"2"
 
 			"itemmodelpanel"
 			{
 				"use_item_rendertarget" "0"
+				"inventory_image_type" 	"1"
 				"allow_rot"				"0"
 			}
 		}
@@ -57,67 +58,67 @@
 
 	"CaratLabel"
 	{
-		"ControlName"	"CExLabel"
-		"fieldName"		"CaratLabel"
-		"xpos"			"9999"
+		"ControlName"			"CExLabel"
+		"fieldName"				"CaratLabel"
+		"xpos"					"9999"
 	}
 
 	"ArmoryLabel"
 	{
-		"ControlName"	"Label"
-		"fieldName"		"ArmoryLabel"
-		"font"			"HudFontMedium"
-		"labelText"		"#Armory"
-		"textAlignment"	"west"
-		"xpos"			"c-300"
-		"ypos"			"5"
-		"zpos"			"1"
-		"wide"			"560"
-		"tall"			"25"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"1"
-		"enabled"		"1"
+		"ControlName"			"Label"
+		"fieldName"				"ArmoryLabel"
+		"font"					"HudFontMedium"
+		"labelText"				"#Armory"
+		"textAlignment"			"west"
+		"xpos"					"c-300"
+		"ypos"					"5"
+		"zpos"					"1"
+		"wide"					"560"
+		"tall"					"25"
+		"autoResize"			"0"
+		"pinCorner"				"0"
+		"visible"				"1"
+		"enabled"				"1"
 	}
 
 	"FiltersLabel"
 	{
-		"ControlName"	"CExLabel"
-		"fieldName"		"FiltersLabel"
-		"font"			"HudFontSmall"
-		"labelText"		"#Store_FilterLabel"
-		"textAlignment"	"west"
-		"xpos"			"c-300"
-		"ypos"			"32"
-		"zpos"			"1"
-		"wide"			"60"
-		"tall"			"20"
-		"autoResize"	"1"
-		"pinCorner"		"0"
-		"visible"		"1"
-		"enabled"		"1"
+		"ControlName"			"CExLabel"
+		"fieldName"				"FiltersLabel"
+		"font"					"HudFontSmall"
+		"labelText"				"#Store_FilterLabel"
+		"textAlignment"			"west"
+		"xpos"					"c-300"
+		"ypos"					"32"
+		"zpos"					"1"
+		"wide"					"60"
+		"tall"					"20"
+		"autoResize"			"1"
+		"pinCorner"				"0"
+		"visible"				"1"
+		"enabled"				"1"
 	}
 
 	"FilterComboBox"
 	{
-		"ControlName"		"ComboBox"
-		"fieldName"			"FilterComboBox"
-		"font"				"HudFontSmall"
-		"xpos"				"c-260"
-		"ypos"				"32"
-		"zpos"				"1"
-		"wide"				"150"
-		"tall"				"20"
-		"autoResize"		"0"
-		"pinCorner"			"0"
-		"visible"			"1"
-		"enabled"			"1"
-		"tabPosition"		"1"
-		"textHidden"		"0"
-		"editable"			"0"
-		"maxchars"			"-1"
-		"NumericInputOnly"	"0"
-		"unicode"			"0"
+		"ControlName"			"ComboBox"
+		"fieldName"				"FilterComboBox"
+		"font"					"HudFontSmall"
+		"xpos"					"c-260"
+		"ypos"					"32"
+		"zpos"					"1"
+		"wide"					"150"
+		"tall"					"20"
+		"autoResize"			"0"
+		"pinCorner"				"0"
+		"visible"				"1"
+		"enabled"				"1"
+		"tabPosition"			"1"
+		"textHidden"			"0"
+		"editable"				"0"
+		"maxchars"				"-1"
+		"NumericInputOnly"		"0"
+		"unicode"				"0"
 
 		"fgcolor_override"					"TanLight"
 		"bgcolor_override"					"DarkerGrey"
@@ -130,63 +131,62 @@
 
 	"DataPanel"
 	{
-		"ControlName"	"EditablePanel"
-		"fieldName"		"DataPanel"
-		"xpos"			"c20"
-		"ypos"			"30"
-		"zpos"			"1"
-		"wide"			"270"
-		"tall"			"253"
-		"visible"		"1"
+		"ControlName"			"EditablePanel"
+		"fieldName"				"DataPanel"
+		"xpos"					"c20"
+		"ypos"					"30"
+		"zpos"					"1"
+		"wide"					"270"
+		"tall"					"253"
+		"visible"				"1"
 		"PaintBackgroundType"	"0"
-		"paintborder"	"1"
-		"border"		"NoBorder"
+		"paintborder"			"1"
+		"border"				"NoBorder"
 
 		"Data_TextRichText"
 		{
-			"ControlName"	"CEconItemDetailsRichText"
-			"fieldName"		"Data_TextRichText"
-			"font"			"HudFontSmallest"
-			"labelText"		"%datatext%"
-			"textAlignment"	"north-west"
-			"xpos"			"10"
-			"ypos"			"118"
-			"wide"			"250"
-			"tall"			"125"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"fgcolor"		"TanLight"
-			"wrap"			"1"
-			"highlight_color"	"ColorCyan"
-			"itemset_color"		"216 244 9 255"
-			"link_color"		"ColorPurple"
+			"ControlName"			"CEconItemDetailsRichText"
+			"fieldName"				"Data_TextRichText"
+			"font"					"HudFontSmallest"
+			"labelText"				"%datatext%"
+			"textAlignment"			"north-west"
+			"xpos"					"10"
+			"ypos"					"118"
+			"wide"					"250"
+			"tall"					"125"
+			"autoResize"			"0"
+			"pinCorner"				"0"
+			"visible"				"1"
+			"enabled"				"1"
+			"fgcolor"				"TanLight"
+			"wrap"					"1"
+			"highlight_color"		"ColorCyan"
+			"itemset_color"			"216 244 9 255"
+			"link_color"			"ColorPurple"
 			"image_up_arrow"				"scroll_up_off"
 			"image_up_arrow_mouseover"		"scroll_up_on"
 			"image_down_arrow"				"scroll_down_off"
 			"image_down_arrow_mouseover"	"scroll_down_on"
-			"image_line"		"ArmoryScrollbarWell"
-			"image_box"			"ArmoryScrollbarBox"
+			"image_line"					"ArmoryScrollbarWell"
+			"image_box"						"ArmoryScrollbarBox"
 		}
 	}
 
 	"SelectedItemModelPanel"
 	{
-		"ControlName"		"CItemModelPanel"
-		"fieldName"			"SelectedItemModelPanel"
-		"xpos"				"c25"
-		"ypos"				"40"
-		"zpos"				"1"
-		"wide"				"260"
-		"tall"				"135"
-		"visible"			"1"
-		"bgcolor_override"		"Transparent"
-		"PaintBackgroundType"	"0"
-		"paintborder"		"0"
-		"model_hide"		"1"
-		"text_center"		"1"
-		"resize_to_text" 	"0"
+		"ControlName"			"CItemModelPanel"
+		"fieldName"				"SelectedItemModelPanel"
+		"xpos"					"c25"
+		"ypos"					"40"
+		"zpos"					"1"
+		"wide"					"260"
+		"tall"					"135"
+		"visible"				"1"
+		"PaintBackground"		"0"
+		"paintborder"			"0"
+		"model_hide"			"1"
+		"text_center"			"1"
+		"resize_to_text" 		"0"
 
 		"itemmodelpanel"
 		{
@@ -198,23 +198,23 @@
 
 	"SelectedItemImageModelPanel"
 	{
-		"ControlName"	"CItemModelPanel"
-		"fieldName"		"SelectedItemImageModelPanel"
-		"xpos"			"c-280"
-		"ypos"			"160"
-		"zpos"			"1"
-		"wide"			"290"
-		"tall"			"140"
-		"visible"		"0"
-		"bgcolor_override"		"Transparent"
+		"ControlName"			"CItemModelPanel"
+		"fieldName"				"SelectedItemImageModelPanel"
+		"xpos"					"c-280"
+		"ypos"					"160"
+		"zpos"					"1"
+		"wide"					"290"
+		"tall"					"140"
+		"visible"				"0"
+		"paintbackground"		"0"
 		"PaintBackgroundType"	"2"
-		"paintborder"	"0"
-		"model_ypos"	"10"
-		"model_tall"	"120"
-		"name_only"		"0"
-		"attrib_only"	"0"
-		"model_only"	"1"
-		"paint_icon_hide"	"1"
+		"paintborder"			"0"
+		"model_ypos"			"10"
+		"model_tall"			"120"
+		"name_only"				"0"
+		"attrib_only"			"0"
+		"model_only"			"1"
+		"paint_icon_hide"		"1"
 
 		"itemmodelpanel"
 		{
@@ -226,205 +226,177 @@
 
 	"mouseoveritempanel"
 	{
-		"ControlName"	"CItemModelPanel"
-		"fieldName"		"mouseoveritempanel"
-		"xpos"			"c-70"
-		"ypos"			"270"
-		"zpos"			"10000"
-		"wide"			"250"
-		"tall"			"180"
-		"visible"		"0"
-		"bgcolor_override"		"ColorBlack"
+		"ControlName"			"CItemModelPanel"
+		"fieldName"				"mouseoveritempanel"
+		"xpos"					"c-70"
+		"ypos"					"270"
+		"zpos"					"1001"
+		"wide"					"200"
+		"tall"					"150"
+		"visible"				"0"
+		"bgcolor_override"		"Transparent"
 		"noitem_textcolor"		"TextColor"
 		"PaintBackgroundType"	"2"
-		"paintborder"		"1"
+		"paintborder"			"1"
 
-		"text_ypos"			"20"
-		"text_center"		"1"
-		"model_hide"		"0"
-		"resize_to_text"	"0"
-		"padding_height"	"15"
-		"name_only"			"1"
+		"text_center_x"			"1"
+		"model_hide"			"0"
+		"resize_to_text"		"1"
+		"padding_height"		"15"
+		"name_only"				"1"
 
-		"model_ypos"		"40"
-		"model_xpos"		"50"
-		"model_wide"		"156"
-		"model_tall"		"100"
+		"model_ypos"			"15"
+		"model_wide"			"150"
+		"model_tall"			"100"
 
-		"text_forcesize"	"1"
-		"is_mouseover"		"1"
+		"model_center_x"		"1"
+		"hide_collection_panel"	"1"
 
 		"itemmodelpanel"
 		{
-			"use_item_rendertarget" "0"
-			"inventory_image_type" "1"
+			"use_item_rendertarget"	"0"
+			"inventory_image_type"	"1"
 			"allow_rot"				"0"
 		}
 	}
 
 	"PrevPageButton"
 	{
-		"ControlName"	"CExButton"
-		"fieldName"		"PrevPageButton"
-		"xpos"			"c-300"
-		"ypos"			"290"
-		"zpos"			"5"
-		"wide"			"20"
-		"tall"			"20"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"1"
-		"enabled"		"1"
-		"tabPosition"	"0"
-		"labelText"		"&A"
-		"font"			"MenuArrows"
-		"textAlignment"	"center"
-		"dulltext"		"0"
-		"brighttext"	"0"
-		"Command"		"prevpage"
-		"sound_depressed"	"UI/buttonclick.wav"
-		"sound_released"	"UI/buttonclickrelease.wav"
+		"ControlName"			"CExButton"
+		"fieldName"				"PrevPageButton"
+		"xpos"					"c-300"
+		"ypos"					"290"
+		"zpos"					"5"
+		"wide"					"20"
+		"tall"					"20"
+		"autoResize"			"0"
+		"pinCorner"				"0"
+		"visible"				"1"
+		"enabled"				"1"
+		"tabPosition"			"0"
+		"labelText"				"&A"
+		"font"					"MenuArrows"
+		"textAlignment"			"center"
+		"dulltext"				"0"
+		"brighttext"			"0"
+		"Command"				"prevpage"
+		"sound_depressed"		"UI/buttonclick.wav"
+		"sound_released"		"UI/buttonclickrelease.wav"
 	}
 
 	"CurPageLabel"
 	{
-		"ControlName"	"CExLabel"
-		"fieldName"		"CurPageLabel"
-		"font"			"HudFontSmall"
-		"labelText"		"%thumbnailpage%"
-		"textAlignment"	"center"
-		"xpos"			"c-278"
-		"ypos"			"290"
-		"zpos"			"5"
-		"wide"			"45"
-		"tall"			"20"
-		"autoResize"	"1"
-		"pinCorner"		"0"
-		"visible"		"1"
-		"enabled"		"1"
-		"fgcolor_override" "ColorCyan"
+		"ControlName"			"CExLabel"
+		"fieldName"				"CurPageLabel"
+		"font"					"HudFontSmall"
+		"labelText"				"%thumbnailpage%"
+		"textAlignment"			"center"
+		"xpos"					"c-278"
+		"ypos"					"290"
+		"zpos"					"5"
+		"wide"					"45"
+		"tall"					"20"
+		"autoResize"			"1"
+		"pinCorner"				"0"
+		"visible"				"1"
+		"enabled"				"1"
+		"fgcolor_override"		"ColorCyan"
 	}
 
 	"NextPageButton"
 	{
-		"ControlName"	"CExButton"
-		"fieldName"		"NextPageButton"
-		"xpos"			"c-233"
-		"ypos"			"290"
-		"zpos"			"5"
-		"wide"			"20"
-		"tall"			"20"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"1"
-		"enabled"		"1"
-		"tabPosition"	"0"
-		"labelText"		"&D"
-		"font"			"MenuArrows"
-		"textAlignment"	"center"
-		"dulltext"		"0"
-		"brighttext"	"0"
-		"Command"		"nextpage"
-		"sound_depressed"	"UI/buttonclick.wav"
-		"sound_released"	"UI/buttonclickrelease.wav"
+		"ControlName"			"CExButton"
+		"fieldName"				"NextPageButton"
+		"xpos"					"c-233"
+		"ypos"					"290"
+		"zpos"					"5"
+		"wide"					"20"
+		"tall"					"20"
+		"autoResize"			"0"
+		"pinCorner"				"0"
+		"visible"				"1"
+		"enabled"				"1"
+		"tabPosition"			"0"
+		"labelText"				"&D"
+		"font"					"MenuArrows"
+		"textAlignment"			"center"
+		"dulltext"				"0"
+		"brighttext"			"0"
+		"Command"				"nextpage"
+		"sound_depressed"		"UI/buttonclick.wav"
+		"sound_released"		"UI/buttonclickrelease.wav"
 	}
 
 	"WikiButton"
 	{
-		"ControlName"	"CExButton"
-		"fieldName"		"WikiButton"
-		"xpos"			"c130"
-		"ypos"			"290"
-		"zpos"			"20"
-		"wide"			"160"
-		"tall"			"20"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"1"
-		"enabled"		"1"
-		"tabPosition"	"0"
-		"labelText"		"#ArmoryButton_Wiki"
-		"font"			"HudFontSmall"
-		"textAlignment"	"center"
-		"textinsetx"	"50"
-		"dulltext"		"0"
-		"brighttext"	"0"
-		"Command"		"wiki"
-		"sound_depressed"	"UI/buttonclick.wav"
-		"sound_released"	"UI/buttonclickrelease.wav"
+		"ControlName"			"CExButton"
+		"fieldName"				"WikiButton"
+		"xpos"					"c130"
+		"ypos"					"290"
+		"zpos"					"20"
+		"wide"					"160"
+		"tall"					"20"
+		"autoResize"			"0"
+		"pinCorner"				"0"
+		"visible"				"1"
+		"enabled"				"1"
+		"tabPosition"			"0"
+		"labelText"				"#ArmoryButton_Wiki"
+		"font"					"HudFontSmall"
+		"textAlignment"			"center"
+		"dulltext"				"0"
+		"brighttext"			"0"
+		"Command"				"wiki"
+		"sound_depressed"		"UI/buttonclick.wav"
+		"sound_released"		"UI/buttonclickrelease.wav"
 	}
 
 	"ViewSetButton"
 	{
-		"ControlName"	"CExButton"
-		"fieldName"		"ViewSetButton"
-		"xpos"			"c20"
-		"ypos"			"290"
-		"zpos"			"20"
-		"wide"			"100"
-		"tall"			"20"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"1"
-		"enabled"		"1"
-		"tabPosition"	"0"
-		"labelText"		"#ArmoryButton_SetDetails"
-		"font"			"HudFontSmall"
-		"textAlignment"	"center"
-		"textinsetx"	"50"
-		"dulltext"		"0"
-		"brighttext"	"0"
-		"Command"		"viewset"
-		"sound_depressed"	"UI/buttonclick.wav"
-		"sound_released"	"UI/buttonclickrelease.wav"
+		"ControlName"			"CExButton"
+		"fieldName"				"ViewSetButton"
+		"xpos"					"c20"
+		"ypos"					"290"
+		"zpos"					"20"
+		"wide"					"100"
+		"tall"					"20"
+		"autoResize"			"0"
+		"pinCorner"				"0"
+		"visible"				"1"
+		"enabled"				"1"
+		"tabPosition"			"0"
+		"labelText"				"#ArmoryButton_SetDetails"
+		"font"					"HudFontSmall"
+		"textAlignment"			"center"
+		"dulltext"				"0"
+		"brighttext"			"0"
+		"Command"				"viewset"
+		"sound_depressed"		"UI/buttonclick.wav"
+		"sound_released"		"UI/buttonclickrelease.wav"
 	}
 
 	"StoreButton"
 	{
-		"ControlName"	"CExButton"
-		"fieldName"		"StoreButton"
-		"xpos"			"c-197"
-		"ypos"			"290"
-		"zpos"			"20"
-		"wide"			"200"
-		"tall"			"20"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"0"
-		"enabled"		"1"
-		"tabPosition"	"0"
-		"labelText"		"#ArmoryButton_Store"
-		"font"			"HudFontSmall"
-		"textAlignment"	"center"
-		"dulltext"		"0"
-		"brighttext"	"0"
-		"Command"		"openstore"
-		"sound_depressed"	"UI/buttonclick.wav"
-		"sound_released"	"UI/buttonclickrelease.wav"
-	}
-
-	"ReloadSchemeButton"
-	{
-		"ControlName"	"CExButton"
-		"fieldName"		"ReloadSchemeButton"
-		"xpos"			"c-180"
-		"ypos"			"345"
-		"zpos"			"25"
-		"wide"			"100"
-		"tall"			"15"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"0"
-		"enabled"		"0"
-		"tabPosition"	"0"
-		"labelText"		"RELOADSCHEME"
-		"font"			"HudFontSmallestBold"
-		"textAlignment"	"center"
-		"textinsetx"	"50"
-		"dulltext"		"0"
-		"brighttext"	"0"
-		"Command"		"reloadscheme"
-		"sound_depressed"	"UI/buttonclick.wav"
-		"sound_released"	"UI/buttonclickrelease.wav"
+		"ControlName"			"CExButton"
+		"fieldName"				"StoreButton"
+		"xpos"					"c-197"
+		"ypos"					"290"
+		"zpos"					"20"
+		"wide"					"200"
+		"tall"					"20"
+		"autoResize"			"0"
+		"pinCorner"				"0"
+		"visible"				"0"
+		"enabled"				"1"
+		"tabPosition"			"0"
+		"labelText"				"#ArmoryButton_Store"
+		"font"					"HudFontSmall"
+		"textAlignment"			"center"
+		"dulltext"				"0"
+		"brighttext"			"0"
+		"Command"				"openstore"
+		
+		"sound_depressed"		"UI/buttonclick.wav"
+		"sound_released"		"UI/buttonclickrelease.wav"
 	}
 }
\ No newline at end of file
diff --git a/resource/ui/charinfoloadoutsubpanel.res b/resource/ui/charinfoloadoutsubpanel.res
index 77fd6f2..f916aad 100644
--- a/resource/ui/charinfoloadoutsubpanel.res
+++ b/resource/ui/charinfoloadoutsubpanel.res
@@ -2,21 +2,21 @@
 {
 	"CharInfoLoadoutSubPanel"
 	{
-		"ControlName"		"Frame"
-		"fieldName"			"CharInfoLoadoutSubPanel"
-		"xpos"				"0"
-		"ypos"				"40"
-		"wide"				"f0"
-		"tall"				"480"
-		"autoResize"		"0"
-		"pinCorner"			"0"
-		"visible"			"1"
-		"enabled"			"1"
-		"tabPosition"		"0"
-		"settitlebarvisible"	"0"
-		"PaintBackgroundType"	"0"
-		"bgcolor_override"				"DarkGrey"
-		"infocus_bgcolor_override"		"DarkGrey"
+		"ControlName"				"Frame"
+		"fieldName"					"CharInfoLoadoutSubPanel"
+		"xpos"						"0"
+		"ypos"						"0"
+		"wide"						"f0"
+		"tall"						"480"
+		"autoResize"				"0"
+		"pinCorner"					"0"
+		"visible"					"1"
+		"enabled"					"1"
+		"tabPosition"				"0"
+		"settitlebarvisible"		"0"
+		"PaintBackgroundType"		"0"
+		"bgcolor_override"			"DarkGrey"
+		"infocus_bgcolor_override"	"DarkGrey"
 		"outoffocus_bgcolor_override"	"DarkGrey"
 		"selectlabely_default"		"25"
 		"selectlabely_onchanges"	"15"
@@ -34,297 +34,297 @@
 
 	"scout"
 	{
-		"ControlName"		"ImageButton"
-		"fieldName"			"scout"
-		"xpos"				"c-300"
-		"ypos"				"120"
-		"zpos"				"6"
-		"wide"				"60"
-		"tall"				"120"
-		"autoResize"		"0"
-		"pinCorner"			"0"
-		"visible"			"1"
-		"enabled"			"1"
-		"tabPosition"		"0"
-		"labelText"			"&1"
-		"textAlignment"		"south-west"
-		"textinsetx"		"-9999"
-		"textinsety"		"-9999"
-		"Command"			"loadout scout"
-		"Default"			"0"
-		"font"				"MenuKeys"
-		"scaleImage"		"1"
-		"activeimage"		"class_sel_sm_scout_blu"
-		"inactiveimage"		"class_sel_sm_scout_inactive"
-		"sound_depressed"	"UI/buttonclick.wav"
-		"sound_released"	"UI/buttonclickrelease.wav"
+		"ControlName"				"ImageButton"
+		"fieldName"					"scout"
+		"xpos"						"c-300"
+		"ypos"						"120"
+		"zpos"						"6"
+		"wide"						"60"
+		"tall"						"120"
+		"autoResize"				"0"
+		"pinCorner"					"0"
+		"visible"					"1"
+		"enabled"					"1"
+		"tabPosition"				"0"
+		"labelText"					"&1"
+		"textAlignment"				"south-west"
+		"textinsetx"				"-9999"
+		"textinsety"				"-9999"
+		"Command"					"loadout scout"
+		"Default"					"0"
+		"font"						"MenuKeys"
+		"scaleImage"				"1"
+		"activeimage"				"class_sel_sm_scout_blu"
+		"inactiveimage"				"class_sel_sm_scout_inactive"
+		"sound_depressed"			"UI/buttonclick.wav"
+		"sound_released"			"UI/buttonclickrelease.wav"
 	}
 
 	"soldier"
 	{
-		"ControlName"		"ImageButton"
-		"fieldName"			"soldier"
-		"xpos"				"c-250"
-		"ypos"				"120"
-		"zpos"				"6"
-		"wide"				"60"
-		"tall"				"120"
-		"autoResize"		"0"
-		"pinCorner"			"0"
-		"visible"			"1"
-		"enabled"			"1"
-		"tabPosition"		"0"
-		"labelText"			"&2"
-		"textAlignment"		"south-west"
-		"textinsetx"		"-9999"
-		"textinsety"		"-9999"
-		"Command"			"loadout soldier"
-		"Default"			"0"
-		"font"				"MenuKeys"
-		"scaleImage"		"1"
-		"activeimage"		"class_sel_sm_soldier_blu"
-		"inactiveimage"		"class_sel_sm_soldier_inactive"
-		"sound_depressed"	"UI/buttonclick.wav"
-		"sound_released"	"UI/buttonclickrelease.wav"
+		"ControlName"				"ImageButton"
+		"fieldName"					"soldier"
+		"xpos"						"c-250"
+		"ypos"						"120"
+		"zpos"						"6"
+		"wide"						"60"
+		"tall"						"120"
+		"autoResize"				"0"
+		"pinCorner"					"0"
+		"visible"					"1"
+		"enabled"					"1"
+		"tabPosition"				"0"
+		"labelText"					"&2"
+		"textAlignment"				"south-west"
+		"textinsetx"				"-9999"
+		"textinsety"				"-9999"
+		"Command"					"loadout soldier"
+		"Default"					"0"
+		"font"						"MenuKeys"
+		"scaleImage"				"1"
+		"activeimage"				"class_sel_sm_soldier_blu"
+		"inactiveimage"				"class_sel_sm_soldier_inactive"
+		"sound_depressed"			"UI/buttonclick.wav"
+		"sound_released"			"UI/buttonclickrelease.wav"
 	}
 
 	"pyro"
 	{
-		"ControlName"		"ImageButton"
-		"fieldName"			"pyro"
-		"xpos"				"c-200"
-		"ypos"				"120"
-		"zpos"				"6"
-		"wide"				"60"
-		"tall"				"120"
-		"autoResize"		"0"
-		"pinCorner"			"0"
-		"visible"			"1"
-		"enabled"			"1"
-		"tabPosition"		"0"
-		"labelText"			"&3"
-		"textAlignment"		"south-west"
-		"textinsetx"		"-9999"
-		"textinsety"		"-9999"
-		"Command"			"loadout pyro"
-		"Default"			"0"
-		"font"				"MenuKeys"
-		"scaleImage"		"1"
-		"activeimage"		"class_sel_sm_pyro_blu"
-		"inactiveimage"		"class_sel_sm_pyro_inactive"
-		"sound_depressed"	"UI/buttonclick.wav"
-		"sound_released"	"UI/buttonclickrelease.wav"
+		"ControlName"				"ImageButton"
+		"fieldName"					"pyro"
+		"xpos"						"c-200"
+		"ypos"						"120"
+		"zpos"						"6"
+		"wide"						"60"
+		"tall"						"120"
+		"autoResize"				"0"
+		"pinCorner"					"0"
+		"visible"					"1"
+		"enabled"					"1"
+		"tabPosition"				"0"
+		"labelText"					"&3"
+		"textAlignment"				"south-west"
+		"textinsetx"				"-9999"
+		"textinsety"				"-9999"
+		"Command"					"loadout pyro"
+		"Default"					"0"
+		"font"						"MenuKeys"
+		"scaleImage"				"1"
+		"activeimage"				"class_sel_sm_pyro_blu"
+		"inactiveimage"				"class_sel_sm_pyro_inactive"
+		"sound_depressed"			"UI/buttonclick.wav"
+		"sound_released"			"UI/buttonclickrelease.wav"
 	}
 
 	"demoman"
 	{
-		"ControlName"		"ImageButton"
-		"fieldName"			"demoman"
-		"xpos"				"c-110"
-		"ypos"				"120"
-		"zpos"				"6"
-		"wide"				"60"
-		"tall"				"120"
-		"autoResize"		"0"
-		"pinCorner"			"0"
-		"visible"			"1"
-		"enabled"			"1"
-		"tabPosition"		"0"
-		"labelText"			"&4"
-		"textAlignment"		"south-west"
-		"textinsetx"		"-9999"
-		"textinsety"		"-9999"
-		"Command"			"loadout demoman"
-		"Default"			"0"
-		"font"				"MenuKeys"
-		"scaleImage"		"1"
-		"activeimage"		"class_sel_sm_demo_blu"
-		"inactiveimage"		"class_sel_sm_demo_inactive"
-		"sound_depressed"	"UI/buttonclick.wav"
-		"sound_released"	"UI/buttonclickrelease.wav"
+		"ControlName"				"ImageButton"
+		"fieldName"					"demoman"
+		"xpos"						"c-110"
+		"ypos"						"120"
+		"zpos"						"6"
+		"wide"						"60"
+		"tall"						"120"
+		"autoResize"				"0"
+		"pinCorner"					"0"
+		"visible"					"1"
+		"enabled"					"1"
+		"tabPosition"				"0"
+		"labelText"					"&4"
+		"textAlignment"				"south-west"
+		"textinsetx"				"-9999"
+		"textinsety"				"-9999"
+		"Command"					"loadout demoman"
+		"Default"					"0"
+		"font"						"MenuKeys"
+		"scaleImage"				"1"
+		"activeimage"				"class_sel_sm_demo_blu"
+		"inactiveimage"				"class_sel_sm_demo_inactive"
+		"sound_depressed"			"UI/buttonclick.wav"
+		"sound_released"			"UI/buttonclickrelease.wav"
 	}
 
 	"heavyweapons"
 	{
-		"ControlName"		"ImageButton"
-		"fieldName"			"heavyweapons"
-		"xpos"				"c-60"
-		"ypos"				"120"
-		"zpos"				"6"
-		"wide"				"60"
-		"tall"				"120"
-		"autoResize"		"0"
-		"pinCorner"			"0"
-		"visible"			"1"
-		"enabled"			"1"
-		"tabPosition"		"0"
-		"labelText"			"&5"
-		"textAlignment"		"south-west"
-		"textinsetx"		"-9999"
-		"textinsety"		"-9999"
-		"Command"			"loadout heavy"
-		"Default"			"0"
-		"font"				"MenuKeys"
-		"scaleImage"		"1"
-		"activeimage"		"class_sel_sm_heavy_blu"
-		"inactiveimage"		"class_sel_sm_heavy_inactive"
-		"sound_depressed"	"UI/buttonclick.wav"
-		"sound_released"	"UI/buttonclickrelease.wav"
+		"ControlName"				"ImageButton"
+		"fieldName"					"heavyweapons"
+		"xpos"						"c-60"
+		"ypos"						"120"
+		"zpos"						"6"
+		"wide"						"60"
+		"tall"						"120"
+		"autoResize"				"0"
+		"pinCorner"					"0"
+		"visible"					"1"
+		"enabled"					"1"
+		"tabPosition"				"0"
+		"labelText"					"&5"
+		"textAlignment"				"south-west"
+		"textinsetx"				"-9999"
+		"textinsety"				"-9999"
+		"Command"					"loadout heavy"
+		"Default"					"0"
+		"font"						"MenuKeys"
+		"scaleImage"				"1"
+		"activeimage"				"class_sel_sm_heavy_blu"
+		"inactiveimage"				"class_sel_sm_heavy_inactive"
+		"sound_depressed"			"UI/buttonclick.wav"
+		"sound_released"			"UI/buttonclickrelease.wav"
 	}
 
 	"engineer"
 	{
-		"ControlName"		"ImageButton"
-		"fieldName"			"engineer"
-		"xpos"				"c-10"
-		"ypos"				"120"
-		"zpos"				"6"
-		"wide"				"60"
-		"tall"				"120"
-		"autoResize"		"0"
-		"pinCorner"			"0"
-		"visible"			"1"
-		"enabled"			"1"
-		"tabPosition"		"0"
-		"labelText"			"&6"
-		"textAlignment"		"south-west"
-		"textinsetx"		"-9999"
-		"textinsety"		"-9999"
-		"Command"			"loadout engineer"
-		"Default"			"0"
-		"font"				"MenuKeys"
-		"scaleImage"		"1"
-		"activeimage"		"class_sel_sm_engineer_blu"
-		"inactiveimage"		"class_sel_sm_engineer_inactive"
-		"sound_depressed"	"UI/buttonclick.wav"
-		"sound_released"	"UI/buttonclickrelease.wav"
+		"ControlName"				"ImageButton"
+		"fieldName"					"engineer"
+		"xpos"						"c-10"
+		"ypos"						"120"
+		"zpos"						"6"
+		"wide"						"60"
+		"tall"						"120"
+		"autoResize"				"0"
+		"pinCorner"					"0"
+		"visible"					"1"
+		"enabled"					"1"
+		"tabPosition"				"0"
+		"labelText"					"&6"
+		"textAlignment"				"south-west"
+		"textinsetx"				"-9999"
+		"textinsety"				"-9999"
+		"Command"					"loadout engineer"
+		"Default"					"0"
+		"font"						"MenuKeys"
+		"scaleImage"				"1"
+		"activeimage"				"class_sel_sm_engineer_blu"
+		"inactiveimage"				"class_sel_sm_engineer_inactive"
+		"sound_depressed"			"UI/buttonclick.wav"
+		"sound_released"			"UI/buttonclickrelease.wav"
 	}
 
 	"medic"
 	{
-		"ControlName"		"ImageButton"
-		"fieldName"			"medic"
-		"xpos"				"c78"
-		"ypos"				"120"
-		"zpos"				"6"
-		"wide"				"60"
-		"tall"				"120"
-		"autoResize"		"0"
-		"pinCorner"			"0"
-		"visible"			"1"
-		"enabled"			"1"
-		"tabPosition"		"0"
-		"labelText"			"&7"
-		"textAlignment"		"south-west"
-		"textinsetx"		"-9999"
-		"textinsety"		"-9999"
-		"Command"			"loadout medic"
-		"Default"			"0"
-		"font"				"MenuKeys"
-		"scaleImage"		"1"
-		"activeimage"		"class_sel_sm_medic_blu"
-		"inactiveimage"		"class_sel_sm_medic_inactive"
-		"sound_depressed"	"UI/buttonclick.wav"
-		"sound_released"	"UI/buttonclickrelease.wav"
+		"ControlName"				"ImageButton"
+		"fieldName"					"medic"
+		"xpos"						"c78"
+		"ypos"						"120"
+		"zpos"						"6"
+		"wide"						"60"
+		"tall"						"120"
+		"autoResize"				"0"
+		"pinCorner"					"0"
+		"visible"					"1"
+		"enabled"					"1"
+		"tabPosition"				"0"
+		"labelText"					"&7"
+		"textAlignment"				"south-west"
+		"textinsetx"				"-9999"
+		"textinsety"				"-9999"
+		"Command"					"loadout medic"
+		"Default"					"0"
+		"font"						"MenuKeys"
+		"scaleImage"				"1"
+		"activeimage"				"class_sel_sm_medic_blu"
+		"inactiveimage"				"class_sel_sm_medic_inactive"
+		"sound_depressed"			"UI/buttonclick.wav"
+		"sound_released"			"UI/buttonclickrelease.wav"
 	}
 
 	"sniper"
 	{
-		"ControlName"		"ImageButton"
-		"fieldName"			"sniper"
-		"xpos"				"c128"
-		"ypos"				"120"
-		"zpos"				"6"
-		"wide"				"60"
-		"tall"				"120"
-		"autoResize"		"0"
-		"pinCorner"			"0"
-		"visible"			"1"
-		"enabled"			"1"
-		"tabPosition"		"0"
-		"labelText"			"&8"
-		"textAlignment"		"south-west"
-		"textinsetx"		"-9999"
-		"textinsety"		"-9999"
-		"Command"			"loadout sniper"
-		"Default"			"0"
-		"font"				"MenuKeys"
-		"scaleImage"		"1"
-		"activeimage"		"class_sel_sm_sniper_blu"
-		"inactiveimage"		"class_sel_sm_sniper_inactive"
-		"sound_depressed"	"UI/buttonclick.wav"
-		"sound_released"	"UI/buttonclickrelease.wav"
+		"ControlName"				"ImageButton"
+		"fieldName"					"sniper"
+		"xpos"						"c128"
+		"ypos"						"120"
+		"zpos"						"6"
+		"wide"						"60"
+		"tall"						"120"
+		"autoResize"				"0"
+		"pinCorner"					"0"
+		"visible"					"1"
+		"enabled"					"1"
+		"tabPosition"				"0"
+		"labelText"					"&8"
+		"textAlignment"				"south-west"
+		"textinsetx"				"-9999"
+		"textinsety"				"-9999"
+		"Command"					"loadout sniper"
+		"Default"					"0"
+		"font"						"MenuKeys"
+		"scaleImage"				"1"
+		"activeimage"				"class_sel_sm_sniper_blu"
+		"inactiveimage"				"class_sel_sm_sniper_inactive"
+		"sound_depressed"			"UI/buttonclick.wav"
+		"sound_released"			"UI/buttonclickrelease.wav"
 	}
 
 	"spy"
 	{
-		"ControlName"		"ImageButton"
-		"fieldName"			"spy"
-		"xpos"				"c178"
-		"ypos"				"120"
-		"zpos"				"6"
-		"wide"				"60"
-		"tall"				"120"
-		"autoResize"		"0"
-		"pinCorner"			"0"
-		"visible"			"1"
-		"enabled"			"1"
-		"tabPosition"		"0"
-		"labelText"			"&9"
-		"textAlignment"		"south-west"
-		"textinsetx"		"-9999"
-		"textinsety"		"-9999"
-		"Command"			"loadout spy"
-		"Default"			"0"
-		"font"				"MenuKeys"
-		"scaleImage"		"1"
-		"activeimage"		"class_sel_sm_spy_blu"
-		"inactiveimage"		"class_sel_sm_spy_inactive"
-		"sound_depressed"	"UI/buttonclick.wav"
-		"sound_released"	"UI/buttonclickrelease.wav"
+		"ControlName"				"ImageButton"
+		"fieldName"					"spy"
+		"xpos"						"c178"
+		"ypos"						"120"
+		"zpos"						"6"
+		"wide"						"60"
+		"tall"						"120"
+		"autoResize"				"0"
+		"pinCorner"					"0"
+		"visible"					"1"
+		"enabled"					"1"
+		"tabPosition"				"0"
+		"labelText"					"&9"
+		"textAlignment"				"south-west"
+		"textinsetx"				"-9999"
+		"textinsety"				"-9999"
+		"Command"					"loadout spy"
+		"Default"					"0"
+		"font"						"MenuKeys"
+		"scaleImage"				"1"
+		"activeimage"				"class_sel_sm_spy_blu"
+		"inactiveimage"				"class_sel_sm_spy_inactive"
+		"sound_depressed"			"UI/buttonclick.wav"
+		"sound_released"			"UI/buttonclickrelease.wav"
 	}
 
 	"ShowBackpackButton"
 	{
-		"ControlName"		"ImageButton"
-		"fieldName"			"ShowBackpackButton"
-		"xpos"				"c-290"
-		"ypos"				"235"
-		"zpos"				"6"
-		"wide"				"60"
-		"tall"				"60"
-		"autoResize"		"0"
-		"pinCorner"			"0"
-		"visible"			"1"
-		"enabled"			"1"
-		"tabPosition"		"0"
-		"labelText"			""
-		"textAlignment"		"south-west"
-		"Command"			"backpack"
-		"Default"			"0"
-		"font"				"MenuKeys"
-		"scaleImage"		"1"
-		"activeimage"		"..\hud\backpack_01"
-		"inactiveimage"		"..\hud\backpack_01_grey"
-		"sound_depressed"	"UI/buttonclick.wav"
-		"sound_released"	"UI/buttonclickrelease.wav"
+		"ControlName"				"ImageButton"
+		"fieldName"					"ShowBackpackButton"
+		"xpos"						"c-290"
+		"ypos"						"235"
+		"zpos"						"6"
+		"wide"						"60"
+		"tall"						"60"
+		"autoResize"				"0"
+		"pinCorner"					"0"
+		"visible"					"1"
+		"enabled"					"1"
+		"tabPosition"				"0"
+		"labelText"					""
+		"textAlignment"				"south-west"
+		"Command"					"backpack"
+		"Default"					"0"
+		"font"						"MenuKeys"
+		"scaleImage"				"1"
+		"activeimage"				"..\hud\backpack_01"
+		"inactiveimage"				"..\hud\backpack_01_grey"
+		"sound_depressed"			"UI/buttonclick.wav"
+		"sound_released"			"UI/buttonclickrelease.wav"
 	}
 	"ShowBackpackLabel"
 	{
-		"ControlName"		"CExLabel"
-		"fieldName"			"ShowBackpackLabel"
-		"font"				"HudFontSmall"
-		"labelText"			"#BackpackTitle"
-		"textAlignment"		"north"
-		"xpos"				"0"
-		"ypos"				"5"
-		"zpos"				"7"
-		"wide"				"120"
-		"tall"				"20"
-		"autoResize"		"0"
-		"pinCorner"			"0"
-		"visible"			"1"
-		"enabled"			"1"
+		"ControlName"				"CExLabel"
+		"fieldName"					"ShowBackpackLabel"
+		"font"						"HudFontSmall"
+		"labelText"					"#BackpackTitle"
+		"textAlignment"				"north"
+		"xpos"						"0"
+		"ypos"						"5"
+		"zpos"						"7"
+		"wide"						"120"
+		"tall"						"20"
+		"autoResize"				"0"
+		"pinCorner"					"0"
+		"visible"					"1"
+		"enabled"					"1"
 
 		"pin_to_sibling"			"ShowBackpackButton"
 		"pin_corner_to_sibling"		"4"
@@ -333,47 +333,47 @@
 
 	"ShowCraftingButton"
 	{
-		"ControlName"		"ImageButton"
-		"fieldName"			"ShowCraftingButton"
-		"xpos"				"c-160"
-		"ypos"				"235"
-		"zpos"				"6"
-		"wide"				"60"
-		"tall"				"60"
-		"autoResize"		"0"
-		"pinCorner"			"0"
-		"visible"			"1"
-		"enabled"			"1"
-		"tabPosition"		"0"
-		"labelText"			""
-		"textAlignment"		"south-west"
-		"Command"			"crafting"
-		"Default"			"0"
-		"font"				"MenuKeys"
-		"scaleImage"		"1"
-		"activeimage"		"crafting_anvil"
-		"inactiveimage"		"crafting_anvil_gray"
-		"sound_depressed"	"UI/buttonclick.wav"
-		"sound_released"	"UI/buttonclickrelease.wav"
+		"ControlName"				"ImageButton"
+		"fieldName"					"ShowCraftingButton"
+		"xpos"						"c-160"
+		"ypos"						"235"
+		"zpos"						"6"
+		"wide"						"60"
+		"tall"						"60"
+		"autoResize"				"0"
+		"pinCorner"					"0"
+		"visible"					"1"
+		"enabled"					"1"
+		"tabPosition"				"0"
+		"labelText"					""
+		"textAlignment"				"south-west"
+		"Command"					"crafting"
+		"Default"					"0"
+		"font"						"MenuKeys"
+		"scaleImage"				"1"
+		"activeimage"				"crafting_anvil"
+		"inactiveimage"				"crafting_anvil_gray"
+		"sound_depressed"			"UI/buttonclick.wav"
+		"sound_released"			"UI/buttonclickrelease.wav"
 	}
 
 	"ShowCraftingLabel"
 	{
-		"ControlName"		"CExLabel"
-		"fieldName"			"ShowCraftingLabel"
-		"font"				"HudFontSmall"
-		"labelText"			"#CraftingExplanation_Title"
-		"textAlignment"		"north"
-		"xpos"				"0"
-		"ypos"				"5"
-		"zpos"				"7"
-		"wide"				"120"
-		"tall"				"20"
-		"autoResize"		"0"
-		"pinCorner"			"0"
-		"visible"			"1"
-		"enabled"			"1"
-		"allcaps"			"1"
+		"ControlName"				"CExLabel"
+		"fieldName"					"ShowCraftingLabel"
+		"font"						"HudFontSmall"
+		"labelText"					"#CraftingExplanation_Title"
+		"textAlignment"				"north"
+		"xpos"						"0"
+		"ypos"						"5"
+		"zpos"						"7"
+		"wide"						"120"
+		"tall"						"20"
+		"autoResize"				"0"
+		"pinCorner"					"0"
+		"visible"					"1"
+		"enabled"					"1"
+		"allcaps"					"1"
 
 		"pin_to_sibling"			"ShowCraftingButton"
 		"pin_corner_to_sibling"		"4"
@@ -382,46 +382,46 @@
 
 	"ShowArmoryButton"
 	{
-		"ControlName"		"ImageButton"
-		"fieldName"			"ShowArmoryButton"
-		"xpos"				"c-30"
-		"ypos"				"235"
-		"zpos"				"6"
-		"wide"				"60"
-		"tall"				"60"
-		"autoResize"		"0"
-		"pinCorner"			"0"
-		"visible"			"1"
-		"enabled"			"1"
-		"tabPosition"		"0"
-		"labelText"			""
-		"textAlignment"		"south-west"
-		"Command"			"armory"
-		"Default"			"0"
-		"font"				"MenuKeys"
-		"scaleImage"		"1"
-		"activeimage"		"catalog_book"
-		"inactiveimage"		"catalog_book_gray"
-		"sound_depressed"	"UI/buttonclick.wav"
-		"sound_released"	"UI/buttonclickrelease.wav"
+		"ControlName"				"ImageButton"
+		"fieldName"					"ShowArmoryButton"
+		"xpos"						"c-30"
+		"ypos"						"235"
+		"zpos"						"6"
+		"wide"						"60"
+		"tall"						"60"
+		"autoResize"				"0"
+		"pinCorner"					"0"
+		"visible"					"1"
+		"enabled"					"1"
+		"tabPosition"				"0"
+		"labelText"					""
+		"textAlignment"				"south-west"
+		"Command"					"armory"
+		"Default"					"0"
+		"font"						"MenuKeys"
+		"scaleImage"				"1"
+		"activeimage"				"catalog_book"
+		"inactiveimage"				"catalog_book_gray"
+		"sound_depressed"			"UI/buttonclick.wav"
+		"sound_released"			"UI/buttonclickrelease.wav"
 	}
 
 	"ShowArmoryLabel"
 	{
-		"ControlName"		"CExLabel"
-		"fieldName"			"ShowArmoryLabel"
-		"font"				"HudFontSmall"
-		"labelText"			"#Armory"
-		"textAlignment"		"north"
-		"xpos"				"0"
-		"ypos"				"5"
-		"zpos"				"7"
-		"wide"				"120"
-		"tall"				"20"
-		"autoResize"		"0"
-		"pinCorner"			"0"
-		"visible"			"1"
-		"enabled"			"1"
+		"ControlName"				"CExLabel"
+		"fieldName"					"ShowArmoryLabel"
+		"font"						"HudFontSmall"
+		"labelText"					"#Armory"
+		"textAlignment"				"north"
+		"xpos"						"0"
+		"ypos"						"5"
+		"zpos"						"7"
+		"wide"						"120"
+		"tall"						"20"
+		"autoResize"				"0"
+		"pinCorner"					"0"
+		"visible"					"1"
+		"enabled"					"1"
 
 		"pin_to_sibling"			"ShowArmoryButton"
 		"pin_corner_to_sibling"		"4"
@@ -430,101 +430,100 @@
 
 	"ShowTradeButton"
 	{
-		"ControlName"		"ImageButton"
-		"fieldName"			"ShowTradeButton"
-		"xpos"				"c100"
-		"ypos"				"235"
-		"zpos"				"6"
-		"wide"				"60"
-		"tall"				"60"
-		"autoResize"		"0"
-		"pinCorner"			"0"
-		"visible"			"1"
-		"enabled"			"1"
-		"tabPosition"		"0"
-		"labelText"			""
-		"textAlignment"		"south-west"
-		"Command"			"trading"
-		"Default"			"0"
-		"font"				"MenuKeys"
-		"scaleImage"		"1"
-		"activeimage"		"trading_parcel"
-		"inactiveimage"		"trading_parcel_gray"
-		"sound_depressed"	"UI/buttonclick.wav"
-		"sound_released"	"UI/buttonclickrelease.wav"
+		"ControlName"				"ImageButton"
+		"fieldName"					"ShowTradeButton"
+		"xpos"						"c100"
+		"ypos"						"235"
+		"zpos"						"6"
+		"wide"						"60"
+		"tall"						"60"
+		"autoResize"				"0"
+		"pinCorner"					"0"
+		"visible"					"1"
+		"enabled"					"1"
+		"tabPosition"				"0"
+		"labelText"					""
+		"textAlignment"				"south-west"
+		"Command"					"trading"
+		"Default"					"0"
+		"font"						"MenuKeys"
+		"scaleImage"				"1"
+		"activeimage"				"trading_parcel"
+		"inactiveimage"				"trading_parcel_gray"
+		"sound_depressed"			"UI/buttonclick.wav"
+		"sound_released"			"UI/buttonclickrelease.wav"
 	}
 
 	"ShowTradeLabel"
 	{
-		"ControlName"		"CExLabel"
-		"fieldName"			"ShowTradeLabel"
-		"font"				"HudFontSmall"
-		"labelText"			"#TradingExplanation_Title"
-		"textAlignment"		"north"
-		"xpos"				"0"
-		"ypos"				"5"
-		"zpos"				"7"
-		"wide"				"120"
-		"tall"				"20"
-		"autoResize"		"0"
-		"pinCorner"			"0"
-		"visible"			"1"
-		"enabled"			"1"
-		"wrap"				"0"
-		"allcaps"			"1"
-
-		"pin_to_sibling"               "ShowTradeButton"
-		"pin_corner_to_sibling"        "4"
-		"pin_to_sibling_corner"        "6"
+		"ControlName"				"CExLabel"
+		"fieldName"					"ShowTradeLabel"
+		"font"						"HudFontSmall"
+		"labelText"					"#TradingExplanation_Title"
+		"textAlignment"				"north"
+		"xpos"						"0"
+		"ypos"						"5"
+		"zpos"						"7"
+		"wide"						"120"
+		"tall"						"20"
+		"autoResize"				"0"
+		"pinCorner"					"0"
+		"visible"					"1"
+		"enabled"					"1"
+		"wrap"						"0"
+		"allcaps"					"1"
+
+		"pin_to_sibling"			"ShowTradeButton"
+		"pin_corner_to_sibling"		"4"
+		"pin_to_sibling_corner"		"6"
 	}
 
 	"ShowPaintkitsButton"
 	{
-		"ControlName"		"ImageButton"
-		"fieldName"			"ShowPaintkitsButton"
-		"xpos"				"c230"
-		"ypos"				"235"
-		"zpos"				"6"
-		"wide"				"60"
-		"tall"				"60"
-		"autoResize"		"0"
-		"pinCorner"			"0"
-		"visible"			"1"
-		"enabled"			"1"
-		"tabPosition"		"0"
-		"labelText"			""
-		"textAlignment"		"south-west"
-		"Command"			"paintkit_preview"
-		"Default"			"0"
-		"font"				"MenuKeys"
-		"scaleImage"		"1"
-		"activeimage"		"paintkit_tool"
-		"inactiveimage"		"paintkit_tool_bw"
-		"sound_depressed"	"UI/buttonclick.wav"
-		"sound_released"	"UI/buttonclickrelease.wav"
+		"ControlName"				"ImageButton"
+		"fieldName"					"ShowPaintkitsButton"
+		"xpos"						"c230"
+		"ypos"						"235"
+		"zpos"						"6"
+		"wide"						"60"
+		"tall"						"60"
+		"autoResize"				"0"
+		"pinCorner"					"0"
+		"visible"					"1"
+		"enabled"					"1"
+		"tabPosition"				"0"
+		"labelText"					""
+		"textAlignment"				"south-west"
+		"Command"					"paintkit_preview"
+		"Default"					"0"
+		"font"						"MenuKeys"
+		"scaleImage"				"1"
+		"activeimage"				"paintkit_tool"
+		"inactiveimage"				"paintkit_tool_bw"
+		"sound_depressed"			"UI/buttonclick.wav"
+		"sound_released"			"UI/buttonclickrelease.wav"
 	}
-
 	"ShowPaintkitsLabel"
 	{
-		"ControlName"		"CExLabel"
-		"fieldName"			"ShowPaintkitsLabel"
-		"font"				"HudFontSmall"
-		"labelText"			"#PaintkitTitle"
-		"textAlignment"		"north"
-		"xpos"				"0"
-		"ypos"				"5"
-		"zpos"				"7"
-		"wide"				"120"
-		"tall"				"20"
-		"autoResize"		"0"
-		"pinCorner"			"0"
-		"visible"			"1"
-		"enabled"			"1"
-		"wrap"				"0"
-
-		"pin_to_sibling"               "ShowPaintkitsButton"
-		"pin_corner_to_sibling"        "4"
-		"pin_to_sibling_corner"        "6"
+		"ControlName"				"CExLabel"
+		"fieldName"					"ShowPaintkitsLabel"
+		"font"						"HudFontSmall"
+		"labelText"					"#PaintkitTitle"
+		"textAlignment"				"north"
+		"xpos"						"0"
+		"ypos"						"5"
+		"zpos"						"7"
+		"wide"						"120"
+		"tall"						"20"
+		"autoResize"				"0"
+		"pinCorner"					"0"
+		"visible"					"1"
+		"enabled"					"1"
+		"wrap"						"0"
+
+		"pin_to_sibling"			"ShowPaintkitsButton"
+		"pin_corner_to_sibling"		"4"
+		"pin_to_sibling_corner"		"6"
 	}
 
 	"ClassLabel"
@@ -602,7 +601,7 @@
 		"enabled"			"1"
 		"fgcolor_override"	"TanLight"
 	}
-
+	
 	"SelectLabel"
 	{
 		"ControlName"		"CExLabel"
@@ -764,37 +763,21 @@
 			"visible"		"1"
 			"enabled"		"1"
 			"tabPosition"	"0"
-			"labeltext"		""
-			"font"			"HudFontSmallBold"
+			"labeltext"		"("
+			"font"			"CustomIcons"
 			"textAlignment"	"center"
 			"dulltext"		"0"
 			"brighttext"	"0"
 			"default"		"0"
-			"sound_depressed"	"UI/buttonclick.wav"
-			"sound_released"	"UI/buttonclickrelease.wav"
 			"Command"			"close"
 			"paintbackground"	"0"
-
-			"defaultFgColor_override" "TanDarker"
-			"armedFgColor_override" "TanLight"
-			"depressedFgColor_override" "TanDarker"
-			"image_drawcolor"	"TextColor"
-			"image_armedcolor"	"TanLight"
-
-			"SubImage"
-			{
-				"ControlName"	"ImagePanel"
-				"fieldName"		"SubImage"
-				"xpos"			"0"
-				"ypos"			"0"
-				"zpos"			"1"
-				"wide"			"14"
-				"tall"			"14"
-				"visible"		"1"
-				"enabled"		"1"
-				"image"			"replay/thumbnails/close"
-				"scaleImage"	"1"
-			}
+			
+			"sound_depressed"	"UI/buttonclick.wav"
+			"sound_released"	"UI/buttonclickrelease.wav"
+			
+			"defaultFgColor_override" 	"TanLight"
+			"armedFgColor_override" 	"LightRed"
+			"depressedFgColor_override" "TanLight"
 		}
 		"PositionLabel"
 		{
@@ -834,10 +817,11 @@
 			"dulltext"		"0"
 			"brighttext"	"0"
 			"default"		"0"
-			"sound_depressed"	"UI/buttonclick.wav"
-			"sound_released"	"UI/buttonclickrelease.wav"
 			"Command"			"nextexplanation"
 			"paintbackground"	"0"
+			
+			"sound_depressed"	"UI/buttonclick.wav"
+			"sound_released"	"UI/buttonclickrelease.wav"
 
 			"defaultFgColor_override" "TanDarker"
 			"armedFgColor_override" "TanLight"
@@ -937,37 +921,21 @@
 			"visible"		"1"
 			"enabled"		"1"
 			"tabPosition"	"0"
-			"labeltext"		""
-			"font"			"HudFontSmallBold"
+			"labeltext"		"("
+			"font"			"CustomIcons"
 			"textAlignment"	"center"
 			"dulltext"		"0"
 			"brighttext"	"0"
 			"default"		"0"
-			"sound_depressed"	"UI/buttonclick.wav"
-			"sound_released"	"UI/buttonclickrelease.wav"
 			"Command"			"close"
 			"paintbackground"	"0"
-
-			"defaultFgColor_override" "TanDarker"
-			"armedFgColor_override" "TanLight"
-			"depressedFgColor_override" "TanDarker"
-			"image_drawcolor"	"TextColor"
-			"image_armedcolor"	"TanLight"
-
-			"SubImage"
-			{
-				"ControlName"	"ImagePanel"
-				"fieldName"		"SubImage"
-				"xpos"			"0"
-				"ypos"			"0"
-				"zpos"			"1"
-				"wide"			"14"
-				"tall"			"14"
-				"visible"		"1"
-				"enabled"		"1"
-				"image"			"replay/thumbnails/close"
-				"scaleImage"	"1"
-			}
+			
+			"sound_depressed"	"UI/buttonclick.wav"
+			"sound_released"	"UI/buttonclickrelease.wav"
+			
+			"defaultFgColor_override" 	"TanLight"
+			"armedFgColor_override" 	"LightRed"
+			"depressedFgColor_override" "TanLight"
 		}
 
 		"PrevButton"
@@ -990,10 +958,11 @@
 			"dulltext"		"0"
 			"brighttext"	"0"
 			"default"		"0"
-			"sound_depressed"	"UI/buttonclick.wav"
-			"sound_released"	"UI/buttonclickrelease.wav"
 			"Command"			"prevexplanation"
 			"paintbackground"	"0"
+			
+			"sound_depressed"	"UI/buttonclick.wav"
+			"sound_released"	"UI/buttonclickrelease.wav"
 
 			"defaultFgColor_override" "TanDarker"
 			"armedFgColor_override" "TanLight"
@@ -1056,10 +1025,11 @@
 			"dulltext"		"0"
 			"brighttext"	"0"
 			"default"		"0"
-			"sound_depressed"	"UI/buttonclick.wav"
-			"sound_released"	"UI/buttonclickrelease.wav"
 			"Command"			"nextexplanation"
 			"paintbackground"	"0"
+			
+			"sound_depressed"	"UI/buttonclick.wav"
+			"sound_released"	"UI/buttonclickrelease.wav"
 
 			"defaultFgColor_override" "TanDarker"
 			"armedFgColor_override" "TanLight"
@@ -1158,37 +1128,21 @@
 			"visible"		"1"
 			"enabled"		"1"
 			"tabPosition"	"0"
-			"labeltext"		""
-			"font"			"HudFontSmallBold"
+			"labeltext"		"("
+			"font"			"CustomIcons"
 			"textAlignment"	"center"
 			"dulltext"		"0"
 			"brighttext"	"0"
 			"default"		"0"
-			"sound_depressed"	"UI/buttonclick.wav"
-			"sound_released"	"UI/buttonclickrelease.wav"
 			"Command"			"close"
 			"paintbackground"	"0"
-
-			"defaultFgColor_override" "TanDarker"
-			"armedFgColor_override" "TanLight"
-			"depressedFgColor_override" "TanDarker"
-			"image_drawcolor"	"TextColor"
-			"image_armedcolor"	"TanLight"
-
-			"SubImage"
-			{
-				"ControlName"	"ImagePanel"
-				"fieldName"		"SubImage"
-				"xpos"			"0"
-				"ypos"			"0"
-				"zpos"			"1"
-				"wide"			"14"
-				"tall"			"14"
-				"visible"		"1"
-				"enabled"		"1"
-				"image"			"replay/thumbnails/close"
-				"scaleImage"	"1"
-			}
+			
+			"sound_depressed"	"UI/buttonclick.wav"
+			"sound_released"	"UI/buttonclickrelease.wav"
+			
+			"defaultFgColor_override" 	"TanLight"
+			"armedFgColor_override" 	"LightRed"
+			"depressedFgColor_override" "TanLight"
 		}
 
 		"PrevButton"
@@ -1211,10 +1165,11 @@
 			"dulltext"		"0"
 			"brighttext"	"0"
 			"default"		"0"
-			"sound_depressed"	"UI/buttonclick.wav"
-			"sound_released"	"UI/buttonclickrelease.wav"
 			"Command"			"prevexplanation"
 			"paintbackground"	"0"
+			
+			"sound_depressed"	"UI/buttonclick.wav"
+			"sound_released"	"UI/buttonclickrelease.wav"
 
 			"defaultFgColor_override" "TanDarker"
 			"armedFgColor_override" "TanLight"
@@ -1277,10 +1232,11 @@
 			"dulltext"		"0"
 			"brighttext"	"0"
 			"default"		"0"
-			"sound_depressed"	"UI/buttonclick.wav"
-			"sound_released"	"UI/buttonclickrelease.wav"
 			"Command"			"nextexplanation"
 			"paintbackground"	"0"
+			
+			"sound_depressed"	"UI/buttonclick.wav"
+			"sound_released"	"UI/buttonclickrelease.wav"
 
 			"defaultFgColor_override" "TanDarker"
 			"armedFgColor_override" "TanLight"
@@ -1379,37 +1335,21 @@
 			"visible"		"1"
 			"enabled"		"1"
 			"tabPosition"	"0"
-			"labeltext"		""
-			"font"			"HudFontSmallBold"
+			"labeltext"		"("
+			"font"			"CustomIcons"
 			"textAlignment"	"center"
 			"dulltext"		"0"
 			"brighttext"	"0"
 			"default"		"0"
-			"sound_depressed"	"UI/buttonclick.wav"
-			"sound_released"	"UI/buttonclickrelease.wav"
 			"Command"			"close"
 			"paintbackground"	"0"
-
-			"defaultFgColor_override" "TanDarker"
-			"armedFgColor_override" "TanLight"
-			"depressedFgColor_override" "TanDarker"
-			"image_drawcolor"	"TextColor"
-			"image_armedcolor"	"TanLight"
-
-			"SubImage"
-			{
-				"ControlName"	"ImagePanel"
-				"fieldName"		"SubImage"
-				"xpos"			"0"
-				"ypos"			"0"
-				"zpos"			"1"
-				"wide"			"14"
-				"tall"			"14"
-				"visible"		"1"
-				"enabled"		"1"
-				"image"			"replay/thumbnails/close"
-				"scaleImage"	"1"
-			}
+			
+			"sound_depressed"	"UI/buttonclick.wav"
+			"sound_released"	"UI/buttonclickrelease.wav"
+			
+			"defaultFgColor_override" 	"TanLight"
+			"armedFgColor_override" 	"LightRed"
+			"depressedFgColor_override" "TanLight"
 		}
 
 		"PrevButton"
@@ -1432,10 +1372,11 @@
 			"dulltext"		"0"
 			"brighttext"	"0"
 			"default"		"0"
-			"sound_depressed"	"UI/buttonclick.wav"
-			"sound_released"	"UI/buttonclickrelease.wav"
 			"Command"			"prevexplanation"
 			"paintbackground"	"0"
+			
+			"sound_depressed"	"UI/buttonclick.wav"
+			"sound_released"	"UI/buttonclickrelease.wav"
 
 			"defaultFgColor_override" "TanDarker"
 			"armedFgColor_override" "TanLight"
@@ -1498,10 +1439,11 @@
 			"dulltext"		"0"
 			"brighttext"	"0"
 			"default"		"0"
-			"sound_depressed"	"UI/buttonclick.wav"
-			"sound_released"	"UI/buttonclickrelease.wav"
 			"Command"			"nextexplanation"
 			"paintbackground"	"0"
+			
+			"sound_depressed"	"UI/buttonclick.wav"
+			"sound_released"	"UI/buttonclickrelease.wav"
 
 			"defaultFgColor_override" "TanDarker"
 			"armedFgColor_override" "TanLight"
@@ -1600,37 +1542,21 @@
 			"visible"		"1"
 			"enabled"		"1"
 			"tabPosition"	"0"
-			"labeltext"		""
-			"font"			"HudFontSmallBold"
+			"labeltext"		"("
+			"font"			"CustomIcons"
 			"textAlignment"	"center"
 			"dulltext"		"0"
 			"brighttext"	"0"
 			"default"		"0"
-			"sound_depressed"	"UI/buttonclick.wav"
-			"sound_released"	"UI/buttonclickrelease.wav"
 			"Command"			"close"
 			"paintbackground"	"0"
-
-			"defaultFgColor_override" "TanDarker"
-			"armedFgColor_override" "TanLight"
-			"depressedFgColor_override" "TanDarker"
-			"image_drawcolor"	"TextColor"
-			"image_armedcolor"	"TanLight"
-
-			"SubImage"
-			{
-				"ControlName"	"ImagePanel"
-				"fieldName"		"SubImage"
-				"xpos"			"0"
-				"ypos"			"0"
-				"zpos"			"1"
-				"wide"			"14"
-				"tall"			"14"
-				"visible"		"1"
-				"enabled"		"1"
-				"image"			"replay/thumbnails/close"
-				"scaleImage"	"1"
-			}
+			
+			"sound_depressed"	"UI/buttonclick.wav"
+			"sound_released"	"UI/buttonclickrelease.wav"
+			
+			"defaultFgColor_override" 	"TanLight"
+			"armedFgColor_override" 	"LightRed"
+			"depressedFgColor_override" "TanLight"
 		}
 
 		"PrevButton"
@@ -1653,10 +1579,11 @@
 			"dulltext"		"0"
 			"brighttext"	"0"
 			"default"		"0"
-			"sound_depressed"	"UI/buttonclick.wav"
-			"sound_released"	"UI/buttonclickrelease.wav"
 			"Command"			"prevexplanation"
 			"paintbackground"	"0"
+			
+			"sound_depressed"	"UI/buttonclick.wav"
+			"sound_released"	"UI/buttonclickrelease.wav"
 
 			"defaultFgColor_override" "TanDarker"
 			"armedFgColor_override" "LightRed"
@@ -1719,10 +1646,11 @@
 			"dulltext"		"0"
 			"brighttext"	"0"
 			"default"		"0"
-			"sound_depressed"	"UI/buttonclick.wav"
-			"sound_released"	"UI/buttonclickrelease.wav"
 			"Command"			"nextexplanation"
 			"paintbackground"	"0"
+			
+			"sound_depressed"	"UI/buttonclick.wav"
+			"sound_released"	"UI/buttonclickrelease.wav"
 
 			"defaultFgColor_override" "TanDarker"
 			"armedFgColor_override" "LightRed"
@@ -1821,37 +1749,21 @@
 			"visible"		"1"
 			"enabled"		"1"
 			"tabPosition"	"0"
-			"labeltext"		""
-			"font"			"HudFontSmallBold"
+			"labeltext"		"("
+			"font"			"CustomIcons"
 			"textAlignment"	"center"
 			"dulltext"		"0"
 			"brighttext"	"0"
 			"default"		"0"
-			"sound_depressed"	"UI/buttonclick.wav"
-			"sound_released"	"UI/buttonclickrelease.wav"
 			"Command"			"close"
 			"paintbackground"	"0"
-
-			"defaultFgColor_override" "TanDarker"
-			"armedFgColor_override" "TanLight"
-			"depressedFgColor_override" "TanDarker"
-			"image_drawcolor"	"TextColor"
-			"image_armedcolor"	"LightRed"
-
-			"SubImage"
-			{
-				"ControlName"	"ImagePanel"
-				"fieldName"		"SubImage"
-				"xpos"			"0"
-				"ypos"			"0"
-				"zpos"			"1"
-				"wide"			"14"
-				"tall"			"14"
-				"visible"		"1"
-				"enabled"		"1"
-				"image"			"replay/thumbnails/close"
-				"scaleImage"	"1"
-			}
+			
+			"sound_depressed"	"UI/buttonclick.wav"
+			"sound_released"	"UI/buttonclickrelease.wav"
+			
+			"defaultFgColor_override" 	"TanLight"
+			"armedFgColor_override" 	"LightRed"
+			"depressedFgColor_override" "TanLight"
 		}
 
 		"PrevButton"
@@ -1874,10 +1786,11 @@
 			"dulltext"		"0"
 			"brighttext"	"0"
 			"default"		"0"
-			"sound_depressed"	"UI/buttonclick.wav"
-			"sound_released"	"UI/buttonclickrelease.wav"
 			"Command"			"prevexplanation"
 			"paintbackground"	"0"
+			
+			"sound_depressed"	"UI/buttonclick.wav"
+			"sound_released"	"UI/buttonclickrelease.wav"
 
 			"defaultFgColor_override" "TanDarker"
 			"armedFgColor_override" "TanLight"
@@ -1940,10 +1853,11 @@
 			"dulltext"		"0"
 			"brighttext"	"0"
 			"default"		"0"
-			"sound_depressed"	"UI/buttonclick.wav"
-			"sound_released"	"UI/buttonclickrelease.wav"
 			"Command"			"nextexplanation"
 			"paintbackground"	"0"
+			
+			"sound_depressed"	"UI/buttonclick.wav"
+			"sound_released"	"UI/buttonclickrelease.wav"
 
 			"defaultFgColor_override" "TanDarker"
 			"armedFgColor_override" "TanLight"
@@ -2041,37 +1955,21 @@
 			"visible"		"1"
 			"enabled"		"1"
 			"tabPosition"	"0"
-			"labeltext"		""
-			"font"			"HudFontSmallBold"
+			"labeltext"		"("
+			"font"			"CustomIcons"
 			"textAlignment"	"center"
 			"dulltext"		"0"
 			"brighttext"	"0"
 			"default"		"0"
-			"sound_depressed"	"UI/buttonclick.wav"
-			"sound_released"	"UI/buttonclickrelease.wav"
 			"Command"			"close"
 			"paintbackground"	"0"
-
-			"defaultFgColor_override" "TanDarker"
-			"armedFgColor_override" "TanLight"
-			"depressedFgColor_override" "TanDarker"
-			"image_drawcolor"	"TextColor"
-			"image_armedcolor"	"TanLight"
-
-			"SubImage"
-			{
-				"ControlName"	"ImagePanel"
-				"fieldName"		"SubImage"
-				"xpos"			"0"
-				"ypos"			"0"
-				"zpos"			"1"
-				"wide"			"14"
-				"tall"			"14"
-				"visible"		"1"
-				"enabled"		"1"
-				"image"			"replay/thumbnails/close"
-				"scaleImage"	"1"
-			}
+			
+			"sound_depressed"	"UI/buttonclick.wav"
+			"sound_released"	"UI/buttonclickrelease.wav"
+			
+			"defaultFgColor_override" 	"TanLight"
+			"armedFgColor_override" 	"LightRed"
+			"depressedFgColor_override" "TanLight"
 		}
 
 		"PrevButton"
@@ -2094,10 +1992,11 @@
 			"dulltext"		"0"
 			"brighttext"	"0"
 			"default"		"0"
-			"sound_depressed"	"UI/buttonclick.wav"
-			"sound_released"	"UI/buttonclickrelease.wav"
 			"Command"			"prevexplanation"
 			"paintbackground"	"0"
+			
+			"sound_depressed"	"UI/buttonclick.wav"
+			"sound_released"	"UI/buttonclickrelease.wav"
 
 			"defaultFgColor_override" "TanDarker"
 			"armedFgColor_override" "TanLight"
@@ -2150,19 +2049,19 @@
 		"wide"				"f0"
 		"tall"				"400"
 		"zpos"				"500"
-		"visible"			"1"
+		"visible"			"0"
 	}
 
 	"InspectionPanel"
 	{
-		"fieldName"		"InspectionPanel"
-		"xpos"			"cs-0.5"
-		"ypos"			"0"
-		"zpos"			"2000"
-		"wide"			"f0"
-		"tall"			"f100"
-		"visible"		"0"
+		"fieldName"			"InspectionPanel"
+		"xpos"				"cs-0.5"
+		"ypos"				"0"
+		"zpos"				"2000"
+		"wide"				"f0"
+		"tall"				"f100"
+		"visible"			"0"
 		"proportionaltoparent"	"1"
-		"bgcolor_override"	"DarkGrey"
+		"bgcolor_override"		"DarkGrey"
 	}
 }
\ No newline at end of file
diff --git a/resource/ui/charinfopanel.res b/resource/ui/charinfopanel.res
index 804fc26..e64fef3 100644
--- a/resource/ui/charinfopanel.res
+++ b/resource/ui/charinfopanel.res
@@ -2,104 +2,104 @@
 {
 	"character_info"
 	{
-		"ControlName"	"EditablePanel"
-		"fieldName"		"character_info"
-		"xpos"			"0"
-		"ypos"			"0"
-		"wide"			"f0"
-		"tall"			"480"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"1"
-		"enabled"		"1"
-		"tabPosition"	"0"
+		"ControlName"			"EditablePanel"
+		"fieldName"				"character_info"
+		"xpos"					"0"
+		"ypos"					"0"
+		"wide"					"f0"
+		"tall"					"480"
+		"autoResize"			"0"
+		"pinCorner"				"0"
+		"visible"				"1"
+		"enabled"				"1"
+		"tabPosition"			"0"
 		"settitlebarvisible"	"1"
 		"PaintBackgroundType"	"0"
-		"bgcolor_override"				"27 27 27 0"
-		"infocus_bgcolor_override"		"27 27 27 0"
-		"outoffocus_bgcolor_override"	"27 27 27 0"
+		"bgcolor_override"					"27 27 27 0"
+		"infocus_bgcolor_override"			"27 27 27 0"
+		"outoffocus_bgcolor_override"		"27 27 27 0"
 
-		"title"			"#CharInfoAndSetup"
-		"title_font"	"HudFontMediumBold"
-		"titletextinsetX"	"40"
-		"titletextinsetY"	"0"
-		"titlebarfgcolor_override"				"HudOffWhite"
-		"titlebardisabledfgcolor_override"		"HudOffWhite"
-		"titlebarbgcolor_override"				"DarkGrey"
+		"title"								"#CharInfoAndSetup"
+		"title_font"						"HudFontMediumBold"
+		"titletextinsetX"					"40"
+		"titletextinsetY"					"0"
+		"titlebarfgcolor_override"			"HudOffWhite"
+		"titlebardisabledfgcolor_override"	"HudOffWhite"
+		"titlebarbgcolor_override"			"DarkGrey"
 
-		"clientinsetx_override"			"0"
-		"sheetinset_bottom"				"40"
+		"clientinsetx_override"				"0"
+		"sheetinset_bottom"					"40"
 	}
 
 	"BackgroundHeader"
 	{
-		"ControlName"	"ImagePanel"
-		"fieldName"		"BackgroundHeader"
-		"xpos"			"0"
-		"ypos"			"0"
-		"zpos"			"-2"
-		"wide"			"f0"
-		"tall"			"120"
-		"visible"		"1"
-		"enabled"		"1"
-		"image"			"loadout_header"
-		"tileImage"		"1"
+		"ControlName"		"ImagePanel"
+		"fieldName"			"BackgroundHeader"
+		"xpos"				"0"
+		"ypos"				"0"
+		"zpos"				"-2"
+		"wide"				"f0"
+		"tall"				"120"
+		"visible"			"1"
+		"enabled"			"1"
+		"image"				"loadout_header"
+		"tileImage"			"1"
 	}
 	"BackgroundHeader2"
 	{
-		"ControlName"	"ImagePanel"
-		"fieldName"		"BackgroundHeader2"
-		"xpos"			"0"
-		"ypos"			"0"
-		"zpos"			"-2"
-		"wide"			"f0"
-		"tall"			"120"
-		"visible"		"1"
-		"enabled"		"1"
-		"fillcolor"		"27 27 27 200"
-		"tileImage"		"1"
+		"ControlName"		"ImagePanel"
+		"fieldName"			"BackgroundHeader2"
+		"xpos"				"0"
+		"ypos"				"0"
+		"zpos"				"-2"
+		"wide"				"f0"
+		"tall"				"120"
+		"visible"			"1"
+		"enabled"			"1"
+		"fillcolor"			"27 27 27 200"
+		"tileImage"			"1"
 	}
 
 	"BackgroundFooter"
 	{
-		"ControlName"	"ImagePanel"
-		"fieldName"		"BackgroundFooter"
-		"xpos"			"0"
-		"ypos"			"420"
-		"zpos"			"0"
-		"wide"			"f0"
-		"tall"			"60"
-		"visible"		"1"
-		"enabled"		"1"
-		"image"			"loadout_header"
-		"tileImage"		"1"
+		"ControlName"		"ImagePanel"
+		"fieldName"			"BackgroundFooter"
+		"xpos"				"0"
+		"ypos"				"420"
+		"zpos"				"0"
+		"wide"				"f0"
+		"tall"				"60"
+		"visible"			"1"
+		"enabled"			"1"
+		"image"				"loadout_header"
+		"tileImage"			"1"
 	}
 	"BackgroundFooter2"
 	{
-		"ControlName"	"ImagePanel"
-		"fieldName"		"BackgroundFooter2"
-		"xpos"			"0"
-		"ypos"			"420"
-		"zpos"			"1"
-		"wide"			"f0"
-		"tall"			"60"
-		"visible"		"1"
-		"enabled"		"1"
-		"fillcolor"		"27 27 27 200"
-		"tileImage"		"1"
+		"ControlName"		"ImagePanel"
+		"fieldName"			"BackgroundFooter2"
+		"xpos"				"0"
+		"ypos"				"420"
+		"zpos"				"1"
+		"wide"				"f0"
+		"tall"				"60"
+		"visible"			"1"
+		"enabled"			"1"
+		"fillcolor"			"27 27 27 200"
+		"tileImage"			"1"
 	}
 
 	"FooterLine"
 	{
-		"ControlName"	"EditablePanel"
-		"fieldName"		"FooterLine"
-		"xpos"			"0"
-		"ypos"			"420"
-		"zpos"			"2"
-		"wide"			"f0"
-		"tall"			"2"
-		"visible"		"1"
-		"enabled"		"1"
+		"ControlName"		"ImagePanel"
+		"fieldName"			"FooterLine"
+		"xpos"				"0"
+		"ypos"				"420"
+		"zpos"				"2"
+		"wide"				"f0"
+		"tall"				"2"
+		"visible"			"1"
+		"enabled"			"1"
 		"PaintBackgroundType"	"2"
 		"bgcolor_override"		"ColorCyan"
 	}
@@ -132,56 +132,57 @@
 
 		"tabskv"
 		{
-			"textinsetx"		"25"
-			"textinsety"		"5"
-			"textAlignment"		"north"
-			"font"				"HudFontSmall"
-			"selectedcolor"		"TanLight"
-			"unselectedcolor"	"TanDark"
+			"textinsetx"				"25"
+			"textinsety"				"5"
+			"textAlignment"				"north"
+			"font"						"HudFontSmall"
+			"selectedcolor"				"TanLight"
+			"unselectedcolor"			"TanDark"
 			"defaultBgColor_override"	"DarkGrey"
 			"paintbackground"			"1"
 			"activeborder_override"		"CyanBorderTabs"
 			"normalborder_override"		"CyanBorderTabsInactive"
-			"unselectedBgColor_override"	"10 10 10 255"
-			"depressedBgColor_override"		"10 10 10 255"
+			"armedBgColor_override"		"10 10 10 255"
+			"selectedBgColor_override"	"10 10 10 255"
 		}
 	}
 
 	"BackButton"
 	{
-		"ControlName"	"CExButton"
-		"fieldName"		"BackButton"
-		"xpos"			"c-295"
-		"ypos"			"437"
-		"zpos"			"2"
-		"wide"			"100"
-		"tall"			"20"
-		"autoResize"	"0"
-		"pinCorner"		"3"
-		"visible"		"1"
-		"enabled"		"1"
-		"tabPosition"	"0"
-		"labelText"		"Back (&Q)"
-		"font"			"HudFontSmall"
-		"textAlignment"	"center"
-		"dulltext"		"0"
-		"brighttext"	"0"
-		"default"		"0"
-		"Command"		"back"
+		"ControlName"		"CExButton"
+		"fieldName"			"BackButton"
+		"xpos"				"c-295"
+		"ypos"				"437"
+		"zpos"				"2"
+		"wide"				"100"
+		"tall"				"20"
+		"autoResize"		"0"
+		"pinCorner"			"3"
+		"visible"			"1"
+		"enabled"			"1"
+		"tabPosition"		"0"
+		"labelText"			"Back (&Q)"
+		"font"				"HudFontSmall"
+		"textAlignment"		"center"
+		"dulltext"			"0"
+		"brighttext"		"0"
+		"default"			"0"
+		"Command"			"back"
+		
 		"sound_depressed"	"UI/buttonclick.wav"
 		"sound_released"	"UI/buttonclickrelease.wav"
 	}
 
 	"NotificationsPresentPanel"
 	{
-		"ControlName"	"CNotificationsPresentPanel"
-		"fieldName"		"NotificationsPresentPanel"
-		"xpos"			"r200"
-		"ypos"			"10"
-		"zpos"			"10000"
-		"wide"			"190"
-		"tall"			"50"
-		"visible"		"0"
-		"enabled"		"1"
+		"ControlName"		"CNotificationsPresentPanel"
+		"fieldName"			"NotificationsPresentPanel"
+		"xpos"				"r200"
+		"ypos"				"10"
+		"zpos"				"10000"
+		"wide"				"190"
+		"tall"				"50"
+		"visible"			"0"
+		"enabled"			"1"
 	}
 }
\ No newline at end of file
diff --git a/resource/ui/classloadoutpanel.res b/resource/ui/classloadoutpanel.res
index 88aaf8d..cefbdd9 100644
--- a/resource/ui/classloadoutpanel.res
+++ b/resource/ui/classloadoutpanel.res
@@ -2,65 +2,65 @@
 {
 	"class_loadout_panel"
 	{
-		"ControlName"	"Frame"
-		"fieldName"		"class_loadout_panel"
-		"xpos"			"0"
-		"ypos"			"0"
-		"wide"			"f0"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"1"
-		"enabled"		"1"
-		"tabPosition"	"0"
+		"ControlName"			"Frame"
+		"fieldName"				"class_loadout_panel"
+		"xpos"					"0"
+		"ypos"					"0"
+		"wide"					"f0"
+		"autoResize"			"0"
+		"pinCorner"				"0"
+		"visible"				"1"
+		"enabled"				"1"
+		"tabPosition"			"0"
 		"settitlebarvisible"	"0"
 		"PaintBackgroundType"	"0"
 		"bgcolor_override"				"DarkGrey"
 		"infocus_bgcolor_override"		"DarkGrey"
 		"outoffocus_bgcolor_override"	"DarkGrey"
 
-		"item_xpos_offcenter_a"	"-310"
-		"item_xpos_offcenter_b"	"165"
-		"item_ypos"				"60"
-		"item_ydelta"			"75"
-		"item_mod_wide"			"40"
+		"item_xpos_offcenter_a"			"-310"
+		"item_xpos_offcenter_b"			"165"
+		"item_ypos"						"60"
+		"item_ydelta"					"75"
+		"item_mod_wide"					"40"
 
 		"item_backpack_offcenter_x"		"-288"
 		"item_backpack_xdelta"			"4"
 		"item_backpack_ydelta"			"3"
 
-		"button_xpos_offcenter"	"175"
-		"button_ypos"			"85"
-		"button_ydelta"			"80"
-		"button_override_delete_xpos" "0"
+		"button_xpos_offcenter"			"175"
+		"button_ypos"					"85"
+		"button_ydelta"					"80"
+		"button_override_delete_xpos"	"0"
 
 		"modelpanels_kv"
 		{
-			"ControlName"	"CItemModelPanel"
-			"xpos"			"c-70"
-			"ypos"			"270"
-			"wide"			"140"
-			"tall"			"70"
-			"visible"		"0"
+			"ControlName"			"CItemModelPanel"
+			"xpos"					"c-70"
+			"ypos"					"270"
+			"wide"					"140"
+			"tall"					"70"
+			"visible"				"0"
 			"bgcolor_override"		"Transparent"
 			"noitem_textcolor"		"TextColor"
 			"PaintBackgroundType"	"2"
-			"paintborder"	"1"
-
-			"model_center_x"	"1"
-			"model_ypos"		"5"
-			"model_tall"		"55"
-			"model_wide"		"82"
-			"text_ypos"			"0"
-			"text_forcesize"	"2"
-			"text_center"		"0"
-			"text_yoffset"		"2"
-			"inset_eq_y"		"55"
-			"name_only"			"1"
+			"paintborder"			"1"
+
+			"model_center_x"		"1"
+			"model_ypos"			"5"
+			"model_tall"			"55"
+			"model_wide"			"82"
+			"text_ypos"				"0"
+			"text_forcesize"		"2"
+			"text_center"			"0"
+			"text_yoffset"			"2"
+			"inset_eq_y"			"55"
+			"name_only"				"1"
 
 			"attriblabel"
 			{
-				"font"			"ItemFontAttribLarge"
-				"visible"		"0"
+				"font"				"ItemFontAttribLarge"
+				"visible"			"0"
 			}
 
 			"itemmodelpanel"
@@ -73,151 +73,152 @@
 
 		"itemoptionpanels_kv"
 		{
-			"ControlName"	"CExButton"
-			"xpos"			"1"
-			"ypos"			"1"
-			"zpos"			"1"
-			"wide"			"20"
-			"tall"			"20"
-			"autoResize"	"0"
-			"visible"		"0"
-			"enabled"		"1"
-			"tabPosition"	"0"
-			"labelText"		"M"
-			"font"			"CustomIcons"
-			"textAlignment"	"center"
-			"dulltext"		"0"
-			"brighttext"	"0"
-			"default"		"1"
+			"ControlName"		"CExButton"
+			"xpos"				"1"
+			"ypos"				"1"
+			"zpos"				"1"
+			"wide"				"20"
+			"tall"				"20"
+			"autoResize"		"0"
+			"visible"			"0"
+			"enabled"			"1"
+			"tabPosition"		"0"
+			"labelText"			"w"
+			"font"				"CustomIcons"
+			"textAlignment"		"center"
+			"dulltext"			"0"
+			"brighttext"		"0"
+			"default"			"1"
 			"sound_depressed"	"UI/buttonclick.wav"
 			"sound_released"	"UI/buttonclickrelease.wav"
 			"paintbackground"	"0"
-			"image_drawcolor"	"TanLight"
-			"image_armedcolor"	"ColorCyan"
+			
+			"defaultFgColor_override"	"TanLight"
+			"armedFgColor_override"		"ColorCyan"
+			"depressedFgColor_override"	"TanLight"
 		}
 	}
 
 	"CaratLabel"
 	{
-		"ControlName"	"CExLabel"
-		"fieldName"		"CaratLabel"
-		"font"			"HudFontSmallishBold"
-		"labelText"		">>"
-		"textAlignment"	"west"
-		"xpos"			"c-290"
-		"ypos"			"15"
-		"zpos"			"1"
-		"wide"			"20"
-		"tall"			"25"
-		"autoResize"	"1"
-		"pinCorner"		"0"
-		"visible"		"1"
-		"enabled"		"1"
-		"fgcolor_override" "ColorPurple"
+		"ControlName"		"CExLabel"
+		"fieldName"			"CaratLabel"
+		"xpos"				"HudFontSmallishBold"
+		"labelText"			">>"
+		"textAlignment"		"west"
+		"xpos"				"c-290"
+		"ypos"				"15"
+		"zpos"				"1"
+		"wide"				"20"
+		"tall"				"25"
+		"autoResize"		"1"
+		"pinCorner"			"0"
+		"visible"			"1"
+		"enabled"			"1"
+		"fgcolor_override"	"ColorPurple"
 	}
 
 	"ClassLabel"
 	{
-		"ControlName"	"CExLabel"
-		"fieldName"		"ClassLabel"
-		"font"			"HudFontMediumBold"
-		"labelText"		"#ClassBeingEquipped"
-		"textAlignment"	"west"
-		"xpos"			"c-270"
-		"ypos"			"15"
-		"zpos"			"1"
-		"wide"			"250"
-		"tall"			"25"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"1"
-		"enabled"		"1"
+		"ControlName"		"CExLabel"
+		"fieldName"			"ClassLabel"
+		"font"				"HudFontMediumBold"
+		"labelText"			"#ClassBeingEquipped"
+		"textAlignment"		"west"
+		"xpos"				"c-270"
+		"ypos"				"15"
+		"zpos"				"1"
+		"wide"				"250"
+		"tall"				"25"
+		"autoResize"		"0"
+		"pinCorner"			"0"
+		"visible"			"1"
+		"enabled"			"1"
 	}
 
 	"TauntCaratLabel"
 	{
-		"ControlName"	"CExLabel"
-		"fieldName"		"TauntCaratLabel"
-		"xpos"			"9999"
+		"ControlName"		"CExLabel"
+		"fieldName"			"TauntCaratLabel"
+		"xpos"				"9999"
 	}
 
 	"TauntLabel"
 	{
-		"ControlName"	"CExLabel"
-		"fieldName"		"TauntLabel"
-		"xpos"			"9999"
+		"ControlName"		"CExLabel"
+		"fieldName"			"TauntLabel"
+		"xpos"				"9999"
 	}
 
 	"CurrentlyEquippedLabel"
 	{
-		"ControlName"	"CExLabel"
-		"fieldName"		"CurrentlyEquippedLabel"
-		"xpos"			"9999"
+		"ControlName"		"CExLabel"
+		"fieldName"			"CurrentlyEquippedLabel"
+		"xpos"				"9999"
 	}
 
 	"TopLine"
 	{
-		"ControlName"	"ImagePanel"
-		"fieldName"		"TopLine"
-		"xpos"			"c-305"
-		"ypos"			"40"
-		"zpos"			"2"
-		"wide"			"610"
-		"tall"			"10"
-		"visible"		"0"
-		"enabled"		"0"
-		"image"			"loadout_dotted_line"
-		"tileImage"		"1"
-		"tileVertically" "0"
+		"ControlName"		"ImagePanel"
+		"fieldName"			"TopLine"
+		"xpos"				"c-305"
+		"ypos"				"40"
+		"zpos"				"2"
+		"wide"				"610"
+		"tall"				"10"
+		"visible"			"0"
+		"enabled"			"0"
+		"image"				"loadout_dotted_line"
+		"tileImage"			"1"
+		"tileVertically"	"0"
 	}
 
 	"classmodelpanel"
 	{
-		"ControlName"	"CTFPlayerModelPanel"
-		"fieldName"		"classmodelpanel"
-		"xpos"			"c-135"
-		"ypos"			"20"
-		"zpos"			"-1"
-		"wide"			"270"
-		"tall"			"340"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"1"
-		"enabled"		"1"
+		"ControlName"		"CTFPlayerModelPanel"
+		"fieldName"			"classmodelpanel"
+		"xpos"				"c-135"
+		"ypos"				"20"
+		"zpos"				"-1"
+		"wide"				"270"
+		"tall"				"340"
+		"autoResize"		"0"
+		"pinCorner"			"0"
+		"visible"			"1"
+		"enabled"			"1"
 		"render_texture"	"0"
 		"fov"				"30"
 		"allow_manip"		"1"
 
 		"model"
 		{
-			"force_pos"	"1"
-			"angles_x" "0"
-			"angles_y" "170"
-			"angles_z" "0"
-			"origin_x" "190"
-			"origin_y" "0"
-			"origin_z" "-48"
+			"force_pos"			"1"
+			"angles_x" 			"0"
+			"angles_y" 			"170"
+			"angles_z" 			"0"
+			"origin_x" 			"190"
+			"origin_y" 			"0"
+			"origin_z" 			"-48"
 			"frame_origin_x"	"0"
 			"frame_origin_y"	"0"
 			"frame_origin_z"	"0"
-			"spotlight" "1"
-			"modelname"		""
+			"spotlight" 		"1"
+			"modelname"			""
 		}
 	}
 
 	"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"
+		"ControlName"		"CItemModelPanel"
+		"fieldName"			"mouseoveritempanel"
+		"xpos"				"c-70"
+		"ypos"				"270"
+		"zpos"				"100"
+		"wide"				"300"
+		"tall"				"300"
+		"visible"			"0"
+		"bgcolor_override"	"Transparent"
+		"noitem_textcolor"	"TextColor"
 		"paintborder"		"1"
 		"text_ypos"			"15"
 		"text_center"		"1"
@@ -246,69 +247,69 @@
 
 	"PassiveAttribsLabel"
 	{
-		"ControlName"	"CExLabel"
-		"fieldName"		"PassiveAttribsLabel"
-		"font"			"ItemFontAttribLarge"
-		"xpos"			"c-135"
-		"ypos"			"125"
-		"zpos"			"0"
-		"wide"			"270"
-		"tall"			"240"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"1"
-		"enabled"		"1"
-		"labelText"		""
-		"textAlignment"	"south"
-		"fgcolor"		"75 255 75 255"
-		"centerwrap"	"1"
+		"ControlName"		"CExLabel"
+		"fieldName"			"PassiveAttribsLabel"
+		"font"				"ItemFontAttribLarge"
+		"xpos"				"c-135"
+		"ypos"				"125"
+		"zpos"				"0"
+		"wide"				"270"
+		"tall"				"240"
+		"autoResize"		"0"
+		"pinCorner"			"0"
+		"visible"			"1"
+		"enabled"			"1"
+		"labelText"			""
+		"textAlignment"		"south"
+		"fgcolor"			"75 255 75 255"
+		"centerwrap"		"1"
 	}
 
 	"loadout_preset_panel"
 	{
-		"ControlName"	"CLoadoutPresetPanel"
-		"FieldName"		"loadout_preset_panel"
-		"zpos"			"20"
-		"wide"			"150"
-		"tall"			"25"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"1"
-		"enabled"		"1"
-		"tabPosition"	"0"
+		"ControlName"		"CLoadoutPresetPanel"
+		"FieldName"			"loadout_preset_panel"
+		"zpos"				"20"
+		"wide"				"150"
+		"tall"				"25"
+		"autoResize"		"0"
+		"pinCorner"			"0"
+		"visible"			"1"
+		"enabled"			"1"
+		"tabPosition"		"0"
 		"paintbackground"	"0"
 	}
 
 	"PresetsExplanation"
 	{
-		"ControlName"	"CExplanationPopup"
-		"fieldName"		"PresetsExplanation"
-		"xpos"			"9999"
-		"wide"			"0"
-		"tall"			"0"
-		"visible"		"0"
+		"ControlName"		"CExplanationPopup"
+		"fieldName"			"PresetsExplanation"
+		"xpos"				"9999"
+		"wide"				"0"
+		"tall"				"0"
+		"visible"			"0"
 	}
 
 	"ItemOptionsPanel"
 	{
-		"ControlName"	"CLoadoutParticleSlider"
-		"fieldname"		"ItemOptionsPanel"
-		"xpos"			"0"
-		"ypos"			"0"
-		"zpos"			"100"
-		"wide"			"100"
-		"tall"			"75"
-		"autoResize"	"1"
-		"visible"		"0"
-		"bgcolor_override"		"DarkerGrey"
+		"ControlName"		"CLoadoutParticleSlider"
+		"fieldname"			"ItemOptionsPanel"
+		"xpos"				"0"
+		"ypos"				"0"
+		"zpos"				"100"
+		"wide"				"100"
+		"tall"				"75"
+		"autoResize"		"1"
+		"visible"			"0"
+		"bgcolor_override"	"DarkerGrey"
 		"PaintBackgroundType"	"0"
 	}
 
 	"TauntHintLabel"
 	{
-		"ControlName"	"CExLabel"
-		"fieldName"		"TauntHintLabel"
-		"xpos"			"9999"
+		"ControlName"		"CExLabel"
+		"fieldName"			"TauntHintLabel"
+		"xpos"				"9999"
 	}
 
 	"RedButton"
@@ -330,14 +331,13 @@
 		"font"				"Cerbetica28"
 		"scaleImage"		"1"
 		"command"			"sv_cheats 1;r_skin 0"
+		"paintbackground"	"1"
 
 		"defaultFgColor_override"	"180 92 77 127"
 		"armedFgColor_override"		"180 92 77 127"
 
 		"sound_depressed"	"UI/buttonclick.wav"
 		"sound_released"	"UI/buttonclickrelease.wav"
-		"keyboardinputenabled"	"0"
-		"paintbackground"		"1"
 	}
 
 	"BlueButton"
@@ -359,91 +359,77 @@
 		"font"				"Cerbetica28"
 		"scaleImage"		"1"
 		"command"			"sv_cheats 1;r_skin 1"
+		"paintbackground"	"1"
 
 		"defaultFgColor_override"	"104 124 155 127"
 		"armedFgColor_override"		"104 124 155 127"
 
 		"sound_depressed"	"UI/buttonclick.wav"
 		"sound_released"	"UI/buttonclickrelease.wav"
-
-		"keyboardinputenabled"	"0"
-		"paintbackground"		"1"
 	}
 
 	"CharacterLoadoutButton"
 	{
-		"ControlName"	"CExImageButton"
-		"fieldName"		"CharacterLoadoutButton"
-		"labelText"		""
-		"xpos"			"c-166"
-		"ypos"			"c-180"
-		"zpos"			"2"
-		"wide"			"25"
-		"tall"			"25"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"1"
-		"enabled"		"1"
-		"tabPosition"	"0"
-		"dulltext"		"0"
-		"brighttext"	"0"
-		"default"		"0"
-		"Command"		"characterloadout"
+		"ControlName"		"CExImageButton"
+		"fieldName"			"CharacterLoadoutButton"
+		"xpos"				"c-166"
+		"ypos"				"c-180"
+		"zpos"				"2"
+		"wide"				"25"
+		"tall"				"25"
+		"autoResize"		"0"
+		"pinCorner"			"0"
+		"visible"			"1"
+		"enabled"			"1"
+		"tabPosition"		"0"
+		"labelText"			"["
+		"textAlignment"		"center"
+		"font"				"CustomIcons"
+		"scaleImage"		"1"
+		"Command"			"characterloadout"
+		"paintbackground"	"1"
+		
 		"sound_depressed"	"UI/buttonclick.wav"
 		"sound_released"	"UI/buttonclickrelease.wav"
 
-		"SubImage"
-		{
-			"ControlName"	"ImagePanel"
-			"fieldName"		"SubImage"
-			"xpos"			"4"
-			"ypos"			"4"
-			"zpos"			"1"
-			"wide"			"17"
-			"tall"			"17"
-			"visible"		"1"
-			"enabled"		"1"
-			"scaleImage"	"1"
-			"image"			"glyph_items"
-		}
+		"defaultFgColor_override"		"White"
+		"armedFgColor_override"			"White"
+		"depressedFgColor_override" 	"White"
+		
+		"defaultBgColor_override"		"ColorCyan"
+		"depressedBgColor_override" 	"ColorCyan"
 	}
 
 	"TauntLoadoutButton"
 	{
-		"ControlName"	"CExImageButton"
-		"fieldName"		"TauntLoadoutButton"
-		"labelText"		""
-		"xpos"			"c-166"
-		"ypos"			"c-153"
-		"zpos"			"2"
-		"wide"			"25"
-		"tall"			"25"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"1"
-		"enabled"		"1"
-		"tabPosition"	"0"
-		"dulltext"		"0"
-		"brighttext"	"0"
-		"default"		"0"
-		"Command"		"tauntloadout"
+		"ControlName"		"CExImageButton"
+		"fieldName"			"TauntLoadoutButton"
+		"xpos"				"c-166"
+		"ypos"				"c-153"
+		"zpos"				"2"
+		"wide"				"25"
+		"tall"				"25"
+		"autoResize"		"0"
+		"pinCorner"			"0"
+		"visible"			"1"
+		"enabled"			"1"
+		"tabPosition"		"0"
+		"labelText"			"]"
+		"textAlignment"		"center"
+		"font"				"CustomIcons"
+		"scaleImage"		"1"
+		"Command"			"tauntloadout"
+		"paintbackground"	"1"
+		
 		"sound_depressed"	"UI/buttonclick.wav"
 		"sound_released"	"UI/buttonclickrelease.wav"
 
-		"SubImage"
-		{
-			"ControlName"	"ImagePanel"
-			"fieldName"		"SubImage"
-			"xpos"			"4"
-			"ypos"			"4"
-			"zpos"			"1"
-			"wide"			"17"
-			"tall"			"17"
-			"visible"		"1"
-			"enabled"		"1"
-			"scaleImage"	"1"
-			"image"			"../vgui/replay/thumbnails/reel"
-		}
+		"defaultFgColor_override"		"White"
+		"armedFgColor_override"			"White"
+		"depressedFgColor_override" 	"White"
+		
+		"defaultBgColor_override"		"ColorCyan"
+		"depressedBgColor_override" 	"ColorCyan"
 	}
 
 	"TauntsExplanation"
diff --git a/resource/ui/compstats.res b/resource/ui/compstats.res
index 11d045c..c3c9067 100644
--- a/resource/ui/compstats.res
+++ b/resource/ui/compstats.res
@@ -68,13 +68,14 @@
 			"font"				"HudFontSmallest"
 			"fgcolor_override"	"TanLight"
 			"textAlignment"		"center"
+			
 			"sound_depressed"	"UI/buttonclick.wav"
 			"sound_released"	"UI/buttonclickrelease.wav"
 		}
 
 		"ShowMatchHistoryButton"
 		{
-			"ControlName"		"Button"
+			"ControlName"		"CExButton"
 			"fieldName"			"ShowMatchHistoryButton"
 			"xpos"				"10"
 			"ypos"				"38"
@@ -89,6 +90,7 @@
 			"font"				"HudFontSmallest"
 			"fgcolor_override"	"TanLight"
 			"textAlignment"		"center"
+			
 			"sound_depressed"	"UI/buttonclick.wav"
 			"sound_released"	"UI/buttonclickrelease.wav"
 		}
@@ -182,14 +184,14 @@
 					"tall"			"18"
 					"proportionaltoparent"	"1"
 					"visible"				"1"
-					"paintbackground"		"0"
-					"border_default"		"SortCategoryBorder"
 					"labeltext"				"#TF_Competitive_Result"
 					"font"					"HudFontSmallest"
-					"fgcolor_override"		"141 63 63 255"
 					"textAlignment"			"west"
 					"textinsetx"			"15"
-
+					"fgcolor_override"		"141 63 63 255"
+					"paintbackground"		"0"
+					"border_default"		"SortCategoryBorder"
+					
 					"defaultFgColor_override" 	"TanDark"
 					"armedFgColor_override"		"Orange"
 					"selectedFgColor_override"	"TanLight"
diff --git a/resource/ui/controlpointcountdown.res b/resource/ui/controlpointcountdown.res
index 5c01488..f99839f 100644
--- a/resource/ui/controlpointcountdown.res
+++ b/resource/ui/controlpointcountdown.res
@@ -2,22 +2,22 @@
 {
 	"CapCountdownLabel"
 	{
-		"ControlName"	"CExLabel"
-		"fieldName"		"CapCountdownLabel"
-		"font"			"HudFontSmallishBold"
-		"xpos"			"0"
-		"ypos"			"0"
-		"zpos"			"1"
-		"wide"			"30"
-		"tall"			"30"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"1"
-		"enabled"		"1"
-		"wrap"			"0"
-		"labelText"		"%capturetime%"
-		"textAlignment"	"center"
-		"fgcolor"		"TanLight"
-		"bgcolor"		"TanLight"
+		"ControlName"		"CExLabel"
+		"fieldName"			"CapCountdownLabel"
+		"font"				"HudFontSmallishBold"
+		"xpos"				"0"
+		"ypos"				"0"
+		"zpos"				"1"
+		"wide"				"30"
+		"tall"				"30"
+		"autoResize"		"0"
+		"pinCorner"			"0"
+		"visible"			"1"
+		"enabled"			"1"
+		"wrap"				"0"
+		"labelText"			"%capturetime%"
+		"textAlignment"		"center"
+		"fgcolor"			"TanLight"
+		"bgcolor"			"TanLight"
 	}
 }
\ No newline at end of file
diff --git a/resource/ui/craftingpanel.res b/resource/ui/craftingpanel.res
index 05b5207..cbcded2 100644
--- a/resource/ui/craftingpanel.res
+++ b/resource/ui/craftingpanel.res
@@ -19,7 +19,7 @@
 		"bgcolor_override"				"DarkGrey"
 		"infocus_bgcolor_override"		"DarkGrey"
 		"outoffocus_bgcolor_override"	"DarkGrey"
-
+		
 		"item_ypos"						"85"
 		"output_item_ypos"				"255"
 		"item_crafting_offcenter_x"		"0"
@@ -107,6 +107,7 @@
 			"centerwrap"	"0"
 			"textAlignment" "west"
 			"textinsetx"	"0"
+			
 			"defaultFgColor_override"	"TextColor"
 			"defaultBgColor_override"	"Transparent"
 			"armedFgColor_override"		"TanLight"
@@ -271,6 +272,7 @@
 			"dulltext"		"0"
 			"brighttext"	"0"
 			"Command"		"craft"
+			
 			"sound_depressed"	"UI/buttonclick.wav"
 			"sound_released"	"UI/buttonclickrelease.wav"
 		}
@@ -316,6 +318,7 @@
 			"dulltext"		"0"
 			"brighttext"	"0"
 			"Command"		"upgrade"
+			
 			"sound_depressed"	"UI/buttonclick.wav"
 			"sound_released"	"UI/buttonclickrelease.wav"
 
@@ -328,90 +331,90 @@
 
 	"recipecontainerscroller"
 	{
-		"ControlName"		"EditablePanel"
-		"fieldName"			"recipecontainerscroller"
-		"xpos"				"c-290"
-		"ypos"				"70"
-		"zpos"				"5"
-		"wide"				"280"
-		"tall"				"240"
+		"ControlName"			"EditablePanel"
+		"fieldName"				"recipecontainerscroller"
+		"xpos"					"c-290"
+		"ypos"					"70"
+		"zpos"					"5"
+		"wide"					"280"
+		"tall"					"240"
 		"PaintBackgroundType"	"2"
-		"fgcolor_override"	"59 54 48 255"
-		"bgcolor_override"	"200 187 161 0"
-		"autohide_buttons"	"1"
+		"fgcolor_override"		"59 54 48 255"
+		"bgcolor_override"		"200 187 161 0"
+		"autohide_buttons"		"1"
 	}
 
 	"recipecontainer"
 	{
-		"ControlName"		"EditablePanel"
-		"fieldName"			"recipecontainer"
-		"xpos"				"0"
-		"ypos"				"0"
-		"zpos"				"5"
-		"wide"				"280"
-		"tall"				"240"
+		"ControlName"			"EditablePanel"
+		"fieldName"				"recipecontainer"
+		"xpos"					"0"
+		"ypos"					"0"
+		"zpos"					"5"
+		"wide"					"280"
+		"tall"					"240"
 		"PaintBackgroundType"	"2"
 		"bgcolor_override"		"200 187 161 0"
 	}
 
 	"mouseoveritempanel"
 	{
-		"ControlName"		"CItemModelPanel"
-		"fieldName"			"mouseoveritempanel"
-		"xpos"				"c-70"
-		"ypos"				"270"
-		"zpos"				"100"
-		"wide"				"300"
-		"tall"				"300"
-		"visible"			"0"
-		"bgcolor_override"	"Transparent"
-		"noitem_textcolor"	"TextColor"
+		"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"
+		"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"
+			"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"
 		}
 	}
 
 	"mousedragitempanel"
 	{
-		"ControlName"		"CItemModelPanel"
-		"fieldName"			"mousedragitempanel"
-		"xpos"				"c-70"
-		"ypos"				"270"
-		"zpos"				"100"
-		"wide"				"54"
-		"tall"				"42"
-		"visible"			"0"
-		"bgcolor_override"	"Transparent"
-		"noitem_textcolor"	"TextColor"
+		"ControlName"			"CItemModelPanel"
+		"fieldName"				"mousedragitempanel"
+		"xpos"					"c-70"
+		"ypos"					"270"
+		"zpos"					"100"
+		"wide"					"54"
+		"tall"					"42"
+		"visible"				"0"
+		"bgcolor_override"		"Transparent"
+		"noitem_textcolor"		"TextColor"
 		"PaintBackgroundType"	"2"
-		"paintborder"		"1"
-		"model_ypos"		"5"
-		"model_tall"		"35"
-		"text_ypos"			"60"
-		"text_center"		"1"
-		"name_only"			"1"
+		"paintborder"			"1"
+		"model_ypos"			"5"
+		"model_tall"			"35"
+		"text_ypos"				"60"
+		"text_center"			"1"
+		"name_only"				"1"
 
 		"itemmodelpanel"
 		{
diff --git a/resource/ui/craftingstatusdialog.res b/resource/ui/craftingstatusdialog.res
index 7cbef76..a5229b3 100644
--- a/resource/ui/craftingstatusdialog.res
+++ b/resource/ui/craftingstatusdialog.res
@@ -2,14 +2,14 @@
 {
 	"CraftingStatusDialog"
 	{
-		"fieldName"			"CraftingStatusDialog"
-		"visible"			"1"
-		"enabled"			"1"
-		"xpos"				"c-100"
-		"ypos"				"200"
-		"wide"				"200"
-		"tall"				"110"
-		"bgcolor_override"	"DarkGrey"
+		"fieldName"				"CraftingStatusDialog"
+		"visible"				"1"
+		"enabled"				"1"
+		"xpos"					"c-100"
+		"ypos"					"200"
+		"wide"					"200"
+		"tall"					"110"
+		"bgcolor_override"		"DarkGrey"
 		"paintbackgroundtype"	"0"
 		"settitlebarvisible"	"0"
 		"border"				"CyanBorder"
@@ -17,105 +17,105 @@
 
 	"CenterPositioner"
 	{
-		"ControlName"		"Label"
-		"fieldName"			"CenterPositioner"
-		"font"				"HudFontSmallBold"
-		"xpos"				"0"
-		"ypos"				"10"
-		"zpos"				"0"
-		"wide"				"200"
-		"tall"				"0"
-		"autoResize"		"0"
-		"pinCorner"			"0"
-		"visible"			"1"
-		"enabled"			"1"
-		"wrap"				"0"
-		"centerwrap"		"0"
-		"labelText"			""
-		"textAlignment"		"center"
-		"bgcolor_override"	"Transparent"
+		"ControlName"			"Label"
+		"fieldName"				"CenterPositioner"
+		"font"					"HudFontSmallBold"
+		"xpos"					"0"
+		"ypos"					"10"
+		"zpos"					"0"
+		"wide"					"200"
+		"tall"					"0"
+		"autoResize"			"0"
+		"pinCorner"				"0"
+		"visible"				"1"
+		"enabled"				"1"
+		"wrap"					"0"
+		"centerwrap"			"0"
+		"labelText"				""
+		"textAlignment"			"center"
+		"bgcolor_override"		"Transparent"
 	}
 
 	"RecipeItemModelPanel"
 	{
-		"ControlName"		"CItemModelPanel"
-		"fieldName"			"RecipeItemModelPanel"
-		"visible"			"0"
+		"ControlName"			"CItemModelPanel"
+		"fieldName"				"RecipeItemModelPanel"
+		"visible"				"0"
 	}
 
 	"TitleLabel"
 	{
-		"ControlName"		"Label"
-		"fieldName"			"TitleLabel"
-		"font"				"HudFontSmallBold"
-		"xpos"				"0"
-		"ypos"				"0"
-		"zpos"				"0"
-		"wide"				"200"
-		"tall"				"60"
-		"autoResize"		"0"
-		"pinCorner"			"0"
-		"visible"			"1"
-		"enabled"			"1"
-		"wrap"				"0"
-		"centerwrap"		"1"
-		"labelText"			"%updatetext%"
-		"textAlignment"		"center"
-		"fgcolor_override" 	"TanLight"
-		"bgcolor_override" 	"Transparent"
-		"auto_wide_tocontents" "1"
+		"ControlName"			"Label"
+		"fieldName"				"TitleLabel"
+		"font"					"HudFontSmallBold"
+		"xpos"					"0"
+		"ypos"					"0"
+		"zpos"					"0"
+		"wide"					"200"
+		"tall"					"60"
+		"autoResize"			"0"
+		"pinCorner"				"0"
+		"visible"				"1"
+		"enabled"				"1"
+		"wrap"					"0"
+		"centerwrap"			"1"
+		"labelText"				"%updatetext%"
+		"textAlignment"			"center"
+		"fgcolor_override" 		"TanLight"
+		"bgcolor_override" 		"Transparent"
+		"auto_wide_tocontents"	"1"
 
-		"pin_to_sibling"			"CenterPositioner"
-        "pin_corner_to_sibling"		"4"
-        "pin_to_sibling_corner"		"4"
+		"pin_to_sibling"		"CenterPositioner"
+        "pin_corner_to_sibling"	"4"
+        "pin_to_sibling_corner"	"4"
 	}
 
 	"EllipsesLabel"
 	{
-		"ControlName"		"Label"
-		"fieldName"			"EllipsesLabel"
-		"font"				"HudFontSmall"
-		"xpos"				"0"
-		"ypos"				"0"
-		"zpos"				"0"
-		"wide"				"200"
-		"tall"				"60"
-		"autoResize"		"0"
-		"pinCorner"			"0"
-		"visible"			"1"
-		"enabled"			"1"
-		"labelText"			"%ellipses%"
-		"textAlignment"		"west"
-		"fgcolor_override"	"TanLight"
-		"bgcolor_override"	"Transparent"
+		"ControlName"			"Label"
+		"fieldName"				"EllipsesLabel"
+		"font"					"HudFontSmall"
+		"xpos"					"0"
+		"ypos"					"0"
+		"zpos"					"0"
+		"wide"					"200"
+		"tall"					"60"
+		"autoResize"			"0"
+		"pinCorner"				"0"
+		"visible"				"1"
+		"enabled"				"1"
+		"labelText"				"%ellipses%"
+		"textAlignment"			"west"
+		"fgcolor_override"		"TanLight"
+		"bgcolor_override"		"Transparent"
 
-		"pin_to_sibling"               "TitleLabel"
-        "pin_corner_to_sibling"        "0"
-        "pin_to_sibling_corner"        "1"
+		"pin_to_sibling"		"TitleLabel"
+        "pin_corner_to_sibling"	"0"
+        "pin_to_sibling_corner"	"1"
 	}
 
 	"CloseButton"
 	{
-		"ControlName"		"CExButton"
-		"fieldName"			"CloseButton"
-		"xpos"				"50"
-		"ypos"				"75"
-		"zpos"				"1"
-		"wide"				"100"
-		"tall"				"25"
-		"autoResize"		"0"
-		"pinCorner"			"3"
-		"visible"			"1"
-		"enabled"			"1"
-		"tabPosition"		"0"
-		"labelText"			"#GameUI_Ok"
-		"font"				"HudFontSmall"
-		"textAlignment"		"center"
-		"dulltext"			"0"
-		"brighttext"		"0"
-		"default"			"1"
-		"Command"			"close"
-		"sound_depressed"	"UI/buttonclick.wav"
-		"sound_released"	"UI/buttonclickrelease.wav"
+		"ControlName"			"CExButton"
+		"fieldName"				"CloseButton"
+		"xpos"					"50"
+		"ypos"					"75"
+		"zpos"					"1"
+		"wide"					"100"
+		"tall"					"25"
+		"autoResize"			"0"
+		"pinCorner"				"3"
+		"visible"				"1"
+		"enabled"				"1"
+		"tabPosition"			"0"
+		"labelText"				"#GameUI_Ok"
+		"font"					"HudFontSmall"
+		"textAlignment"			"center"
+		"dulltext"				"0"
+		"brighttext"			"0"
+		"default"				"1"
+		"Command"				"close"
+		"sound_depressed"		"UI/buttonclick.wav"
+		"sound_released"		"UI/buttonclickrelease.wav"
 	}
 }
\ No newline at end of file
diff --git a/resource/ui/destroy_menu/hudmenuengydestroy.res b/resource/ui/destroy_menu/hudmenuengydestroy.res
index 35accc6..dd7a6c7 100644
--- a/resource/ui/destroy_menu/hudmenuengydestroy.res
+++ b/resource/ui/destroy_menu/hudmenuengydestroy.res
@@ -19,14 +19,6 @@
 		"ControlName"		"CIconPanel"
 		"fieldName"			"DestroyIcon"
 		"xpos"				"9999"
-		"ypos"				"9999"
-		"zpos"				"1"
-		"wide"				"48"
-		"tall"				"48"
-		"visible"			"0"
-		"enabled"			"0"
-		"scaleImage"		"1"
-		"icon"				"ico_demolish"
 	}
 
 	"TitleLabel"
diff --git a/resource/ui/disguisestatuspanel.res b/resource/ui/disguisestatuspanel.res
index dd185c2..8e4c35e 100644
--- a/resource/ui/disguisestatuspanel.res
+++ b/resource/ui/disguisestatuspanel.res
@@ -2,20 +2,20 @@
 {
 	"itemmodelpanel"
 	{
-		"ControlName"	"CEmbeddedItemModelPanel"
-		"fieldName"		"itemmodelpanel"
-		"xpos"			"0"
-		"ypos"			"0"
-		"zpos"			"1"
-		"wide"			"100"
-		"tall"			"100"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"1"
-		"enabled"		"1"
-		"useparentbg"	"1"
-		"fov"			"54"
-		"start_framed"	"1"
+		"ControlName"		"CEmbeddedItemModelPanel"
+		"fieldName"			"itemmodelpanel"
+		"xpos"				"0"
+		"ypos"				"0"
+		"zpos"				"1"
+		"wide"				"100"
+		"tall"				"100"
+		"autoResize"		"0"
+		"pinCorner"			"0"
+		"visible"			"1"
+		"enabled"			"1"
+		"useparentbg"		"1"
+		"fov"				"54"
+		"start_framed"		"1"
 		"disable_manipulation"	"1"
 
 		"model"
@@ -43,22 +43,23 @@
 
 	"DisguiseStatusBG"
 	{
-		"ControlName"	"CTFImagePanel"
-		"fieldName"		"DisguiseStatusBG"
-		"xpos"			"30"
-		"ypos"			"0"
-		"zpos"			"0"
-		"wide"			"150"
-		"tall"			"15"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"1"
-		"enabled"		"1"
-		"image"			"../hud/color_panel_brown"
-		"scaleImage"	"1"
-		"teambg_1"		"../hud/color_panel_brown"
-		"teambg_2"		"../hud/color_panel_red"
-		"teambg_3"		"../hud/color_panel_blu"
+		"ControlName"		"CTFImagePanel"
+		"fieldName"			"DisguiseStatusBG"
+		"xpos"				"30"
+		"ypos"				"0"
+		"zpos"				"0"
+		"wide"				"150"
+		"tall"				"15"
+		"autoResize"		"0"
+		"pinCorner"			"0"
+		"visible"			"1"
+		"enabled"			"1"
+		"image"				"../hud/color_panel_brown"
+		"scaleImage"		"1"
+		"teambg_1"			"../hud/color_panel_brown"
+		"teambg_2"			"../hud/color_panel_red"
+		"teambg_3"			"../hud/color_panel_blu"
+		
 		"src_corner_height"		"23"
 		"src_corner_width"		"23"
 		"draw_corner_width"		"0"
@@ -104,10 +105,7 @@
 		"dulltext"			"0"
 		"brighttext"		"0"
 		"fgcolor_override"	"TransparentBlack"
-
-		"pin_to_sibling"		"DisguiseNameLabel"
-		"pin_corner_to_sibling"	"PIN_TOPLEFT"
-		"pin_to_sibling_corner"	"PIN_TOPLEFT"
+		"pin_to_sibling"	"DisguiseNameLabel"
 	}
 
 	"WeaponNameLabel"
@@ -129,7 +127,6 @@
 		"dulltext"			"0"
 		"brighttext"		"0"
 	}
-
 	"WeaponNameLabelShadow"
 	{
 		"ControlName"		"Label"
@@ -149,10 +146,7 @@
 		"dulltext"			"0"
 		"brighttext"		"0"
 		"fgcolor_override"	"TransparentBlack"
-
-		"pin_to_sibling"		"WeaponNameLabel"
-		"pin_corner_to_sibling"	"PIN_TOPLEFT"
-		"pin_to_sibling_corner"	"PIN_TOPLEFT"
+		"pin_to_sibling"	"WeaponNameLabel"
 	}
 
 	"SpectatorGUIHealth"
diff --git a/resource/ui/econ/backpackpanel.res b/resource/ui/econ/backpackpanel.res
index 67398f6..bd95d7a 100644
--- a/resource/ui/econ/backpackpanel.res
+++ b/resource/ui/econ/backpackpanel.res
@@ -2,70 +2,70 @@
 {
 	"backpack_panel"
 	{
-		"ControlName"		"Frame"
-		"fieldName"			"backpack_panel"
-		"xpos"				"0"
-		"ypos"				"0"
-		"wide"				"f0"
-		"autoResize"		"0"
-		"pinCorner"			"0"
-		"visible"			"1"
-		"enabled"			"1"
-		"tabPosition"		"0"
+		"ControlName"			"Frame"
+		"fieldName"				"backpack_panel"
+		"xpos"					"0"
+		"ypos"					"0"
+		"wide"					"f0"
+		"autoResize"			"0"
+		"pinCorner"				"0"
+		"visible"				"1"
+		"enabled"				"1"
+		"tabPosition"			"0"
 		"settitlebarvisible"	"0"
 		"PaintBackgroundType"	"0"
 		"bgcolor_override"				"DarkGrey"
 		"infocus_bgcolor_override"		"DarkGrey"
 		"outoffocus_bgcolor_override" 	"DarkGrey"
 
-		"item_xpos_offcenter_a"	"-310"
-		"item_xpos_offcenter_b"	"165"
-		"item_ypos"				"60"
-		"item_ydelta"			"80"
-		"item_mod_wide"			"40"
+		"item_xpos_offcenter_a"			"-310"
+		"item_xpos_offcenter_b"			"165"
+		"item_ypos"						"60"
+		"item_ydelta"					"80"
+		"item_mod_wide"					"40"
 
-		"item_backpack_offcenter_x"	"-288"
-		"item_backpack_xdelta"		"4"
-		"item_backpack_ydelta"		"3"
+		"item_backpack_offcenter_x"		"-288"
+		"item_backpack_xdelta"			"4"
+		"item_backpack_ydelta"			"3"
 
-		"button_xpos_offcenter"		"175"
-		"button_ypos"				"85"
-		"button_ydelta"				"80"
-		"button_override_delete_xpos" "0"
+		"button_xpos_offcenter"			"175"
+		"button_ypos"					"85"
+		"button_ydelta"					"80"
+		"button_override_delete_xpos"	"0"
 
-		"page_button_y"			"288"
-		"page_button_x_delta"	"3"
-		"page_button_y_delta"	"3"
-		"page_button_per_row"	"20"
-		"page_button_height"	"13"
+		"page_button_y"					"288"
+		"page_button_x_delta"			"3"
+		"page_button_y_delta"			"3"
+		"page_button_per_row"			"20"
+		"page_button_height"			"13"
 
 		"pagebuttons_kv"
 		{
-			"ControlName"		"EditablePanel"
-			"wide"				"10"
-			"tall"				"10"
-			"visible"			"0"
-			"bgcolor_override"	"Transparent"
-			"noitem_textcolor"	"TextColor"
+			"ControlName"			"EditablePanel"
+			"wide"					"10"
+			"tall"					"10"
+			"visible"				"0"
+			"bgcolor_override"		"Transparent"
+			"noitem_textcolor"		"TextColor"
 			"PaintBackgroundType"	"2"
 			"paintborder"			"1"
 
 			"Button"
 			{
-				"fieldName"			"Button"
-				"ControlName"		"CExButton"
-				"wide"				"25"
-				"tall"				"13"
-				"visible"			"1"
-				"bgcolor_override"	"Transparent"
-				"noitem_textcolor"	"TextColor"
+				"fieldName"				"Button"
+				"ControlName"			"CExButton"
+				"wide"					"25"
+				"tall"					"13"
+				"visible"				"1"
+				"bgcolor_override"		"Transparent"
+				"noitem_textcolor"		"TextColor"
 				"PaintBackgroundType"	"2"
-				"paintborder"		"1"
-				"textAlignment"		"center"
-				"labelText"			"%page%"
-				"font"				"HudFontSmallest"
-				"sound_depressed"	"UI/buttonclick.wav"
-				"sound_released"	"UI/buttonclickrelease.wav"
+				"paintborder"			"1"
+				"textAlignment"			"center"
+				"labelText"				"%page%"
+				"font"					"HudFontSmallest"
+				"sound_depressed"		"UI/buttonclick.wav"
+				"sound_released"		"UI/buttonclickrelease.wav"
 			}
 
 			"New"
@@ -95,27 +95,27 @@
 
 		"modelpanels_kv"
 		{
-			"ControlName"	"CItemModelPanel"
-			"xpos"			"c-70"
-			"ypos"			"270"
-			"wide"			"54"
-			"tall"			"42"
-			"visible"		"0"
+			"ControlName"			"CItemModelPanel"
+			"xpos"					"c-70"
+			"ypos"					"270"
+			"wide"					"54"
+			"tall"					"42"
+			"visible"				"0"
 			"bgcolor_override"		"Transparent"
 			"noitem_textcolor"		"TextColor"
 			"PaintBackgroundType"	"2"
-			"paintborder"	"1"
+			"paintborder"			"1"
 
-			"model_xpos"	"2"
-			"model_ypos"	"5"
-			"model_wide"	"50"
-			"model_tall"	"35"
-			"text_ypos"		"60"
-			"text_center"	"1"
-			"name_only"		"1"
+			"model_xpos"			"2"
+			"model_ypos"			"5"
+			"model_wide"			"50"
+			"model_tall"			"35"
+			"text_ypos"				"60"
+			"text_center"			"1"
+			"name_only"				"1"
 
-			"inset_eq_x"	"2"
-			"inset_eq_y"	"2"
+			"inset_eq_x"			"2"
+			"inset_eq_y"			"2"
 
 			"itemmodelpanel"
 			{
@@ -126,27 +126,27 @@
 
 			"New"
 			{
-				"ControlName"	"CExLabel"
-				"fieldName"		"New"
-				"font"			"FontStorePrice"
-				"textAlignment"	"east"
-				"xpos"			"rs1"
-				"ypos"			"0"
-				"zpos"			"15"
-				"wide"			"25"
-				"tall"			"12"
-				"textinsetx"	"8"
-				"autoResize"	"0"
+				"ControlName"		"CExLabel"
+				"fieldName"			"New"
+				"font"				"FontStorePrice"
+				"textAlignment"		"east"
+				"xpos"				"rs1"
+				"ypos"				"0"
+				"zpos"				"15"
+				"wide"				"25"
+				"tall"				"12"
+				"textinsetx"		"8"
+				"autoResize"		"0"
 				"skip_autoresize"	"1"
-				"pinCorner"		"0"
-				"visible"		"0"
-				"enabled"		"1"
-				"labelText"		"#Store_Price_New"
+				"pinCorner"			"0"
+				"visible"			"0"
+				"enabled"			"1"
+				"labelText"			"#Store_Price_New"
 				"mouseinputenabled" "0"
 				"paintbackground"	"0"
 				"proportionaltoparent"	"1"
-				"border"		"StoreNewBorder"
-				"fgcolor"		"10 10 10 255"
+				"border"			"StoreNewBorder"
+				"fgcolor"			"10 10 10 255"
 			}
 
 			"use_item_sounds"	"1"
@@ -531,6 +531,7 @@
 		"dulltext"		"0"
 		"brighttext"	"0"
 		"Command"		"canceltool"
+		
 		"sound_depressed"	"UI/buttonclick.wav"
 		"sound_released"	"UI/buttonclickrelease.wav"
 		"bgcolor_override"	"DarkerGrey"
@@ -621,37 +622,21 @@
 			"visible"		"1"
 			"enabled"		"1"
 			"tabPosition"	"0"
-			"labeltext"		""
-			"font"			"HudFontSmallBold"
+			"labeltext"		"("
+			"font"			"CustomIcons"
 			"textAlignment"	"center"
 			"dulltext"		"0"
 			"brighttext"	"0"
 			"default"		"0"
-			"sound_depressed"	"UI/buttonclick.wav"
-			"sound_released"	"UI/buttonclickrelease.wav"
 			"Command"			"close"
 			"paintbackground"	"0"
-
-			"defaultFgColor_override" "TanDarker"
-			"armedFgColor_override" "LightRed"
-			"depressedFgColor_override" "TanDarker"
-			"image_drawcolor"	"TextColor"
-			"image_armedcolor"	"LightRed"
-
-			"SubImage"
-			{
-				"ControlName"	"ImagePanel"
-				"fieldName"		"SubImage"
-				"xpos"			"0"
-				"ypos"			"0"
-				"zpos"			"1"
-				"wide"			"14"
-				"tall"			"14"
-				"visible"		"1"
-				"enabled"		"1"
-				"image"			"replay/thumbnails/close"
-				"scaleImage"	"1"
-			}
+			
+			"sound_depressed"	"UI/buttonclick.wav"
+			"sound_released"	"UI/buttonclickrelease.wav"
+			
+			"defaultFgColor_override" 	"White"
+			"armedFgColor_override" 	"LightRed"
+			"depressedFgColor_override" "White"
 		}
 
 		"PositionLabel"
@@ -795,37 +780,21 @@
 			"visible"		"1"
 			"enabled"		"1"
 			"tabPosition"	"0"
-			"labeltext"		""
-			"font"			"HudFontSmallBold"
+			"labeltext"		"("
+			"font"			"CustomIcons"
 			"textAlignment"	"center"
 			"dulltext"		"0"
 			"brighttext"	"0"
 			"default"		"0"
-			"sound_depressed"	"UI/buttonclick.wav"
-			"sound_released"	"UI/buttonclickrelease.wav"
 			"Command"			"close"
 			"paintbackground"	"0"
-
-			"defaultFgColor_override" "TanDarker"
-			"armedFgColor_override" "LightRed"
-			"depressedFgColor_override" "TanDarker"
-			"image_drawcolor"	"TextColor"
-			"image_armedcolor"	"LightRed"
-
-			"SubImage"
-			{
-				"ControlName"	"ImagePanel"
-				"fieldName"		"SubImage"
-				"xpos"			"0"
-				"ypos"			"0"
-				"zpos"			"1"
-				"wide"			"14"
-				"tall"			"14"
-				"visible"		"1"
-				"enabled"		"1"
-				"image"			"replay/thumbnails/close"
-				"scaleImage"	"1"
-			}
+			
+			"sound_depressed"	"UI/buttonclick.wav"
+			"sound_released"	"UI/buttonclickrelease.wav"
+			
+			"defaultFgColor_override" 	"White"
+			"armedFgColor_override" 	"LightRed"
+			"depressedFgColor_override" "White"
 		}
 
 		"PrevButton"
@@ -1016,37 +985,21 @@
 			"visible"		"1"
 			"enabled"		"1"
 			"tabPosition"	"0"
-			"labeltext"		""
-			"font"			"HudFontSmallBold"
+			"labeltext"		"("
+			"font"			"CustomIcons"
 			"textAlignment"	"center"
 			"dulltext"		"0"
 			"brighttext"	"0"
 			"default"		"0"
-			"sound_depressed"	"UI/buttonclick.wav"
-			"sound_released"	"UI/buttonclickrelease.wav"
 			"Command"			"close"
 			"paintbackground"	"0"
-
-			"defaultFgColor_override" "TanDarker"
-			"armedFgColor_override" "LightRed"
-			"depressedFgColor_override" "TanDarker"
-			"image_drawcolor"	"TextColor"
-			"image_armedcolor"	"LightRed"
-
-			"SubImage"
-			{
-				"ControlName"	"ImagePanel"
-				"fieldName"		"SubImage"
-				"xpos"			"0"
-				"ypos"			"0"
-				"zpos"			"1"
-				"wide"			"14"
-				"tall"			"14"
-				"visible"		"1"
-				"enabled"		"1"
-				"image"			"replay/thumbnails/close"
-				"scaleImage"	"1"
-			}
+			
+			"sound_depressed"	"UI/buttonclick.wav"
+			"sound_released"	"UI/buttonclickrelease.wav"
+			
+			"defaultFgColor_override" 	"White"
+			"armedFgColor_override" 	"LightRed"
+			"depressedFgColor_override" "White"
 		}
 
 		"PrevButton"
@@ -1238,37 +1191,21 @@
 			"visible"		"1"
 			"enabled"		"1"
 			"tabPosition"	"0"
-			"labeltext"		""
-			"font"			"HudFontSmallBold"
+			"labeltext"		"("
+			"font"			"CustomIcons"
 			"textAlignment"	"center"
 			"dulltext"		"0"
 			"brighttext"	"0"
 			"default"		"0"
-			"sound_depressed"	"UI/buttonclick.wav"
-			"sound_released"	"UI/buttonclickrelease.wav"
 			"Command"			"close"
 			"paintbackground"	"0"
-
-			"defaultFgColor_override"	"TanDarker"
-			"armedFgColor_override"		"LightRed"
-			"depressedFgColor_override"	"TanDarker"
-			"image_drawcolor"			"TextColor"
-			"image_armedcolor"			"LightRed"
-
-			"SubImage"
-			{
-				"ControlName"	"ImagePanel"
-				"fieldName"		"SubImage"
-				"xpos"			"0"
-				"ypos"			"0"
-				"zpos"			"1"
-				"wide"			"14"
-				"tall"			"14"
-				"visible"		"1"
-				"enabled"		"1"
-				"image"			"replay/thumbnails/close"
-				"scaleImage"	"1"
-			}
+			
+			"sound_depressed"	"UI/buttonclick.wav"
+			"sound_released"	"UI/buttonclickrelease.wav"
+			
+			"defaultFgColor_override" 	"White"
+			"armedFgColor_override" 	"LightRed"
+			"depressedFgColor_override" "White"
 		}
 
 		"PrevButton"
@@ -1459,37 +1396,21 @@
 			"visible"		"1"
 			"enabled"		"1"
 			"tabPosition"	"0"
-			"labeltext"		""
-			"font"			"HudFontSmallBold"
+			"labeltext"		"("
+			"font"			"CustomIcons"
 			"textAlignment"	"center"
 			"dulltext"		"0"
 			"brighttext"	"0"
 			"default"		"0"
-			"sound_depressed"	"UI/buttonclick.wav"
-			"sound_released"	"UI/buttonclickrelease.wav"
 			"Command"			"close"
 			"paintbackground"	"0"
-
-			"defaultFgColor_override"	"TanDarker"
-			"armedFgColor_override"		"LightRed"
-			"depressedFgColor_override"	"TanDarker"
-			"image_drawcolor"			"TextColor"
-			"image_armedcolor"			"LightRed"
-
-			"SubImage"
-			{
-				"ControlName"	"ImagePanel"
-				"fieldName"		"SubImage"
-				"xpos"			"0"
-				"ypos"			"0"
-				"zpos"			"1"
-				"wide"			"14"
-				"tall"			"14"
-				"visible"		"1"
-				"enabled"		"1"
-				"image"			"replay/thumbnails/close"
-				"scaleImage"	"1"
-			}
+			
+			"sound_depressed"	"UI/buttonclick.wav"
+			"sound_released"	"UI/buttonclickrelease.wav"
+			
+			"defaultFgColor_override" 	"White"
+			"armedFgColor_override" 	"LightRed"
+			"depressedFgColor_override" "White"
 		}
 
 		"PrevButton"
diff --git a/resource/ui/econ/comboboxbackpackoverlaydialog.res b/resource/ui/econ/comboboxbackpackoverlaydialog.res
index 0771a93..94f76d3 100644
--- a/resource/ui/econ/comboboxbackpackoverlaydialog.res
+++ b/resource/ui/econ/comboboxbackpackoverlaydialog.res
@@ -17,46 +17,46 @@
 
 	"TitleLabel"
 	{
-		"ControlName"		"CExLabel"
-		"fieldName"			"TitleLabel"
-		"font"				"HudFontMediumBold"
-		"labelText"			"#TF_Item_SelectStyle"
-		"textAlignment"		"center"
-		"xpos"				"0"
-		"ypos"				"0"
-		"zpos"				"0"
-		"wide"				"280"
-		"tall"				"60"
-		"autoResize"		"1"
-		"pinCorner"			"0"
-		"visible"			"1"
-		"enabled"			"1"
-		"centerwrap"		"1"
+		"ControlName"			"CExLabel"
+		"fieldName"				"TitleLabel"
+		"font"					"HudFontMediumBold"
+		"labelText"				"#TF_Item_SelectStyle"
+		"textAlignment"			"center"
+		"xpos"					"0"
+		"ypos"					"0"
+		"zpos"					"0"
+		"wide"					"280"
+		"tall"					"60"
+		"autoResize"			"1"
+		"pinCorner"				"0"
+		"visible"				"1"
+		"enabled"				"1"
+		"centerwrap"			"1"
 	}
 
 	"preview_model"
 	{
-		"ControlName"		"CItemModelPanel"
-		"fieldName"			"preview_model"
-		"xpos"				"60"
-		"ypos"				"40"
-		"zpos"				"1"
-		"wide"				"160"
-		"tall"				"120"
-		"visible"			"1"
-		"enabled"			"1"
-		"bgcolor_override"	"Transparent"
-		"noitem_textcolor"	"TextColor"
+		"ControlName"			"CItemModelPanel"
+		"fieldName"				"preview_model"
+		"xpos"					"60"
+		"ypos"					"40"
+		"zpos"					"1"
+		"wide"					"160"
+		"tall"					"120"
+		"visible"				"1"
+		"enabled"				"1"
+		"bgcolor_override"		"Transparent"
+		"noitem_textcolor"		"TextColor"
 		"PaintBackgroundType"	"2"
-		"paintborder"		"1"
-		"model_xpos"		"2"
-		"model_ypos"		"5"
-		"model_wide"		"160"
-		"model_tall"		"120"
-		"text_ypos"			"120"		// Hide it off the bottom
-		"text_center"		"1"
-		"name_only"			"1"
-		"paint_icon_hide"	"1"
+		"paintborder"			"1"
+		"model_xpos"			"2"
+		"model_ypos"			"5"
+		"model_wide"			"160"
+		"model_tall"			"120"
+		"text_ypos"				"120"		// Hide it off the bottom
+		"text_center"			"1"
+		"name_only"				"1"
+		"paint_icon_hide"		"1"
 
 		"itemmodelpanel"
 		{
@@ -69,81 +69,81 @@
 
 	"ComboBox"
 	{
-		"ControlName"		"ComboBox"
-		"fieldName"			"ComboBox"
-		"Font"				"HudFontSmallest"
-		"xpos"				"30"
-		"ypos"				"170"
-		"zpos"				"1"
-		"wide"				"220"
-		"tall"				"15"
-		"autoResize"		"0"
-		"pinCorner"			"0"
-		"visible"			"1"
-		"enabled"			"1"
-		"tabPosition"		"1"
-		"textHidden"		"0"
-		"editable"			"0"
-		"maxchars"			"-1"
-		"NumericInputOnly"	"0"
-		"unicode"			"0"
-
-		"fgcolor_override"	"White"
-		"bgcolor_override"	"Black"
-		"disabledFgColor_override" "White"
-		"disabledBgColor_override" "Black"
-		"selectionColor_override" "Black"
-		"selectionTextColor_override" "White"
-		"defaultSelectionBG2Color_override" "Black"
+		"ControlName"			"ComboBox"
+		"fieldName"				"ComboBox"
+		"Font"					"HudFontSmallest"
+		"xpos"					"30"
+		"ypos"					"170"
+		"zpos"					"1"
+		"wide"					"220"
+		"tall"					"15"
+		"autoResize"			"0"
+		"pinCorner"				"0"
+		"visible"				"1"
+		"enabled"				"1"
+		"tabPosition"			"1"
+		"textHidden"			"0"
+		"editable"				"0"
+		"maxchars"				"-1"
+		"NumericInputOnly"		"0"
+		"unicode"				"0"
+		
+		"fgcolor_override"					"White"
+		"bgcolor_override"					"Black"
+		"disabledFgColor_override"			"White"
+		"disabledBgColor_override"			"Black"
+		"selectionColor_override"			"Black"
+		"selectionTextColor_override" 		"White"
+		"defaultSelectionBG2Color_override"	"Black"
 	}
 
 	"CancelButton"
 	{
-		"ControlName"		"CExButton"
-		"fieldName"			"CancelButton"
-		"xpos"				"60"
-		"ypos"				"200"
-		"zpos"				"1"
-		"wide"				"70"
-		"tall"				"20"
-		"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"
+		"ControlName"			"CExButton"
+		"fieldName"				"CancelButton"
+		"xpos"					"60"
+		"ypos"					"200"
+		"zpos"					"1"
+		"wide"					"70"
+		"tall"					"20"
+		"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"				"150"
-		"ypos"				"200"
-		"zpos"				"1"
-		"wide"				"70"
-		"tall"				"20"
-		"autoResize"		"0"
-		"pinCorner"			"3"
-		"visible"			"1"
-		"enabled"			"1"
-		"tabPosition"		"0"
-		"labelText"			"#TF_OK"
-		"font"				"HudFontSmall"
-		"textAlignment"		"center"
-		"dulltext"			"0"
-		"brighttext"		"0"
-		"default"			"1"
-		"Command"			"apply"
-		"sound_depressed"	"UI/buttonclick.wav"
-		"sound_released"	"UI/buttonclickrelease.wav"
+		"ControlName"			"CExButton"
+		"fieldName"				"OkButton"
+		"xpos"					"150"
+		"ypos"					"200"
+		"zpos"					"1"
+		"wide"					"70"
+		"tall"					"20"
+		"autoResize"			"0"
+		"pinCorner"				"3"
+		"visible"				"1"
+		"enabled"				"1"
+		"tabPosition"			"0"
+		"labelText"				"#TF_OK"
+		"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/confirmapplygiftwrapdialog.res b/resource/ui/econ/confirmapplygiftwrapdialog.res
index ea7e427..219c190 100644
--- a/resource/ui/econ/confirmapplygiftwrapdialog.res
+++ b/resource/ui/econ/confirmapplygiftwrapdialog.res
@@ -123,6 +123,7 @@
 			"inventory_image_type"	"1"
 		}
 	}
+	
 	"SubjectBG"
 	{
 		"ControlName"	"CExLabel"
diff --git a/resource/ui/econ/confirmapplypaintcandialog.res b/resource/ui/econ/confirmapplypaintcandialog.res
index 20a49e1..1870e0f 100644
--- a/resource/ui/econ/confirmapplypaintcandialog.res
+++ b/resource/ui/econ/confirmapplypaintcandialog.res
@@ -17,103 +17,103 @@
 
 	"mouseoveritempanel"
 	{
-		"ControlName"	"CItemModelPanel"
-		"fieldName"		"mouseoveritempanel"
-		"xpos"			"c-70"
-		"ypos"			"270"
-		"zpos"			"100"
-		"wide"			"300"
-		"tall"			"300"
-		"visible"		"0"
+		"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"
+		"paintborder"			"1"
+		"text_ypos"				"20"
+		"text_center"			"1"
+		"model_hide"			"1"
+		"resize_to_text"		"1"
+		"padding_height"		"15"
 
 		"attriblabel"
 		{
-			"font"			"ItemFontAttribLarge"
-			"xpos"			"0"
-			"ypos"			"30"
-			"zpos"			"2"
-			"wide"			"140"
-			"tall"			"60"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"labelText"		"%attriblist%"
-			"textAlignment"	"center"
-			"fgcolor"		"TextColor"
-			"centerwrap"	"1"
+			"font"				"ItemFontAttribLarge"
+			"xpos"				"0"
+			"ypos"				"30"
+			"zpos"				"2"
+			"wide"				"140"
+			"tall"				"60"
+			"autoResize"		"0"
+			"pinCorner"			"0"
+			"visible"			"1"
+			"enabled"			"1"
+			"labelText"			"%attriblist%"
+			"textAlignment"		"center"
+			"fgcolor"			"TextColor"
+			"centerwrap"		"1"
 		}
 	}
 
 	"TitleLabel"
 	{
-		"ControlName"	"CExLabel"
-		"fieldName"		"TitleLabel"
-		"font"			"HudFontMediumBold"
-		"labelText"		"dynamic"
-		"textAlignment"	"center"
-		"xpos"			"100"
-		"ypos"			"10"
-		"zpos"			"0"
-		"wide"			"200"
-		"tall"			"60"
-		"autoResize"	"1"
-		"pinCorner"		"0"
-		"visible"		"1"
-		"enabled"		"1"
-		"centerwrap"	"1"
+		"ControlName"			"CExLabel"
+		"fieldName"				"TitleLabel"
+		"font"					"HudFontMediumBold"
+		"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"
+		"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_modelpanel"
 	{
-		"ControlName"	"CItemModelPanel"
-		"fieldName"		"tool_modelpanel"
-		"xpos"			"10"
-		"ypos"			"10"
-		"zpos"			"1"
-		"wide"			"84"
-		"tall"			"64"
-		"visible"		"1"
+		"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"
+		"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"
 		{
@@ -122,169 +122,173 @@
 			"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"
+		"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_modelpanel"
 	{
-		"ControlName"	"CItemModelPanel"
-		"fieldName"		"subject_modelpanel"
-		"xpos"			"300"
-		"ypos"			"10"
-		"zpos"			"1"
-		"wide"			"84"
-		"tall"			"64"
-		"visible"		"1"
+		"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"
+		"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"		"#ToolPaintConfirm"
-		"textAlignment"	"center"
-		"xpos"			"20"
-		"ypos"			"80"
-		"zpos"			"0"
-		"wide"			"360"
-		"tall"			"20"
-		"autoResize"	"1"
-		"pinCorner"		"0"
-		"visible"		"1"
-		"enabled"		"1"
-		"fgcolor_override" "Yellow"
+		"ControlName"			"CExLabel"
+		"fieldName"				"ConfirmLabel"
+		"font"					"HudFontSmall"
+		"labelText"				"#ToolPaintConfirm"
+		"textAlignment"			"center"
+		"xpos"					"20"
+		"ypos"					"80"
+		"zpos"					"0"
+		"wide"					"360"
+		"tall"					"20"
+		"autoResize"			"1"
+		"pinCorner"				"0"
+		"visible"				"1"
+		"enabled"				"1"
+		"fgcolor_override"		"Yellow"
 	}
 
 	"paint_model"
 	{
-		"ControlName"	"CItemModelPanel"
-		"fieldName"		"paint_model"
-		"xpos"			"150"
-		"ypos"			"95"
-		"zpos"			"1"
-		"wide"			"100"
-		"tall"			"100"
-		"visible"		"1"
+		"ControlName"			"CItemModelPanel"
+		"fieldName"				"paint_model"
+		"xpos"					"150"
+		"ypos"					"95"
+		"zpos"					"1"
+		"wide"					"100"
+		"tall"					"100"
+		"visible"				"1"
 		"bgcolor_override"		"Transparent"
 		"noitem_textcolor"		"TextColor"
 		"PaintBackgroundType"	"2"
-		"paintborder"	"0"
-		"model_xpos"	"2"
-		"model_ypos"	"5"
-		"model_wide"	"100"
-		"model_tall"	"100"
-		"text_ypos"		"100"
-		"text_center"	"1"
-		"name_only"		"1"
-		"paint_icon_hide" "1"
+		"paintborder"			"0"
+		"model_xpos"			"2"
+		"model_ypos"			"5"
+		"model_wide"			"100"
+		"model_tall"			"100"
+		"text_ypos"				"100"
+		"text_center"			"1"
+		"name_only"				"1"
+		"paint_icon_hide"		"1"
+		
 		"itemmodelpanel"
 		{
 			"force_use_model"		"1"
 			"use_item_rendertarget" "1"
 			"allow_rot"				"1"
+			"inventory_image_type"	"1"
 		}
 	}
 
 	"WarningLabel"
 	{
-		"ControlName"	"CExLabel"
-		"fieldName"		"WarningLabel"
-		"font"			"HudFontSmall"
-		"labelText"		"#ToolPaintConfirmWarning"
-		"textAlignment"	"center"
-		"xpos"			"0"
-		"ypos"			"170"
-		"zpos"			"0"
-		"wide"			"400"
-		"tall"			"20"
-		"autoResize"	"1"
-		"pinCorner"		"0"
-		"visible"		"0"
-		"enabled"		"1"
-		"fgcolor_override" "Yellow"
+		"ControlName"			"CExLabel"
+		"fieldName"				"WarningLabel"
+		"font"					"HudFontSmall"
+		"labelText"				"#ToolPaintConfirmWarning"
+		"textAlignment"			"center"
+		"xpos"					"0"
+		"ypos"					"170"
+		"zpos"					"0"
+		"wide"					"400"
+		"tall"					"20"
+		"autoResize"			"1"
+		"pinCorner"				"0"
+		"visible"				"0"
+		"enabled"				"1"
+		"fgcolor_override"		"Yellow"
 	}
 
 	"CancelButton"
 	{
-		"ControlName"	"CExButton"
-		"fieldName"		"CancelButton"
-		"xpos"			"50"
-		"ypos"			"200"
-		"zpos"			"1"
-		"wide"			"130"
-		"tall"			"20"
-		"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"
+		"ControlName"			"CExButton"
+		"fieldName"				"CancelButton"
+		"xpos"					"50"
+		"ypos"					"200"
+		"zpos"					"1"
+		"wide"					"130"
+		"tall"					"20"
+		"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"			"20"
-		"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"
+		"ControlName"			"CExButton"
+		"fieldName"				"OkButton"
+		"xpos"					"220"
+		"ypos"					"200"
+		"zpos"					"1"
+		"wide"					"130"
+		"tall"					"20"
+		"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/confirmapplystrangepartapplicationdialog.res b/resource/ui/econ/confirmapplystrangepartapplicationdialog.res
index 92d0343..e1a9cc2 100644
--- a/resource/ui/econ/confirmapplystrangepartapplicationdialog.res
+++ b/resource/ui/econ/confirmapplystrangepartapplicationdialog.res
@@ -17,23 +17,23 @@
 
 	"mouseoveritempanel"
 	{
-		"ControlName"		"CItemModelPanel"
-		"fieldName"			"mouseoveritempanel"
-		"xpos"				"c-70"
-		"ypos"				"270"
-		"zpos"				"100"
-		"wide"				"300"
-		"tall"				"300"
-		"visible"			"0"
-		"bgcolor_override"	"Transparent"
-		"noitem_textcolor"	"TextColor"
+		"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"
+		"paintborder"			"1"
+		"text_ypos"				"20"
+		"text_center"			"1"
+		"model_hide"			"1"
+		"resize_to_text"		"1"
+		"padding_height"		"15"
 
 		"attriblabel"
 		{
@@ -122,6 +122,7 @@
 			"inventory_image_type"	"1"
 		}
 	}
+	
 	"SubjectBG"
 	{
 		"ControlName"	"CExLabel"
@@ -159,15 +160,15 @@
 		"model_ypos"	"5"
 		"model_wide"	"80"
 		"model_tall"	"54"
-		"text_ypos"		"100"
+		"text_ypos"		"100"		// Hide it off the bottom
 		"text_center"	"1"
 		"name_only"		"1"
 
 		"itemmodelpanel"
 		{
 			"use_item_rendertarget" "0"
-			"allow_rot"				"0"
 			"inventory_image_type"	"1"
+			"allow_rot"				"0"
 		}
 	}
 
diff --git a/resource/ui/econ/confirmapplystrangerestrictionapplicationdialog.res b/resource/ui/econ/confirmapplystrangerestrictionapplicationdialog.res
index 16edfa4..c9a1397 100644
--- a/resource/ui/econ/confirmapplystrangerestrictionapplicationdialog.res
+++ b/resource/ui/econ/confirmapplystrangerestrictionapplicationdialog.res
@@ -17,23 +17,23 @@
 
 	"mouseoveritempanel"
 	{
-		"ControlName"		"CItemModelPanel"
-		"fieldName"			"mouseoveritempanel"
-		"xpos"				"c-70"
-		"ypos"				"270"
-		"zpos"				"100"
-		"wide"				"300"
-		"tall"				"300"
-		"visible"			"0"
-		"bgcolor_override"	"Transparent"
-		"noitem_textcolor"	"TextColor"
+		"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"
+		"paintborder"			"1"
+		"text_ypos"				"20"
+		"text_center"			"1"
+		"model_hide"			"1"
+		"resize_to_text"		"1"
+		"padding_height"		"15"
 
 		"attriblabel"
 		{
@@ -110,11 +110,11 @@
 		"model_ypos"	"5"
 		"model_wide"	"80"
 		"model_tall"	"54"
-		"text_ypos"		"100"
+		"text_ypos"		"100"		// Hide it off the bottom
 		"text_center"	"1"
 		"name_only"		"1"
 		"paint_icon_hide" "1"
-
+		
 		"itemmodelpanel"
 		{
 			"use_item_rendertarget" "0"
@@ -122,6 +122,7 @@
 			"inventory_image_type"	"1"
 		}
 	}
+	
 	"SubjectBG"
 	{
 		"ControlName"	"CExLabel"
@@ -160,15 +161,15 @@
 		"model_ypos"	"5"
 		"model_wide"	"80"
 		"model_tall"	"54"
-		"text_ypos"		"100"
+		"text_ypos"		"100"		// Hide it off the bottom
 		"text_center"	"1"
 		"name_only"		"1"
-
+		
 		"itemmodelpanel"
 		{
 			"use_item_rendertarget" "0"
-			"allow_rot"				"0"
 			"inventory_image_type"	"1"
+			"allow_rot"				"0"
 		}
 	}
 
diff --git a/resource/ui/econ/confirmapplystrangifierdialog.res b/resource/ui/econ/confirmapplystrangifierdialog.res
index b31c461..a20c064 100644
--- a/resource/ui/econ/confirmapplystrangifierdialog.res
+++ b/resource/ui/econ/confirmapplystrangifierdialog.res
@@ -17,23 +17,23 @@
 
 	"mouseoveritempanel"
 	{
-		"ControlName"		"CItemModelPanel"
-		"fieldName"			"mouseoveritempanel"
-		"xpos"				"c-70"
-		"ypos"				"270"
-		"zpos"				"100"
-		"wide"				"300"
-		"tall"				"300"
-		"visible"			"0"
-		"bgcolor_override"	"Transparent"
-		"noitem_textcolor"	"TextColor"
+		"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"
+		"paintborder"			"1"
+		"text_ypos"				"20"
+		"text_center"			"1"
+		"model_hide"			"1"
+		"resize_to_text"		"1"
+		"padding_height"		"15"
 
 		"attriblabel"
 		{
@@ -110,7 +110,7 @@
 		"model_ypos"	"5"
 		"model_wide"	"80"
 		"model_tall"	"54"
-		"text_ypos"		"100"
+		"text_ypos"		"100"		// Hide it off the bottom
 		"text_center"	"1"
 		"name_only"		"1"
 		"paint_icon_hide" "1"
@@ -122,6 +122,7 @@
 			"inventory_image_type"	"1"
 		}
 	}
+	
 	"SubjectBG"
 	{
 		"ControlName"	"CExLabel"
@@ -160,15 +161,15 @@
 		"model_ypos"	"5"
 		"model_wide"	"80"
 		"model_tall"	"54"
-		"text_ypos"		"100"
+		"text_ypos"		"100"		// Hide it off the bottom
 		"text_center"	"1"
 		"name_only"		"1"
 
 		"itemmodelpanel"
 		{
 			"use_item_rendertarget" "0"
-			"allow_rot"				"0"
 			"inventory_image_type"	"1"
+			"allow_rot"				"0"
 		}
 	}
 
diff --git a/resource/ui/econ/confirmapplyteamcolorpaintcandialog.res b/resource/ui/econ/confirmapplyteamcolorpaintcandialog.res
index a088d91..7093e68 100644
--- a/resource/ui/econ/confirmapplyteamcolorpaintcandialog.res
+++ b/resource/ui/econ/confirmapplyteamcolorpaintcandialog.res
@@ -17,23 +17,23 @@
 
 	"mouseoveritempanel"
 	{
-		"ControlName"		"CItemModelPanel"
-		"fieldName"			"mouseoveritempanel"
-		"xpos"				"c-70"
-		"ypos"				"270"
-		"zpos"				"100"
-		"wide"				"300"
-		"tall"				"300"
-		"visible"			"0"
-		"bgcolor_override"	"Transparent"
-		"noitem_textcolor"	"TextColor"
+		"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"
+		"paintborder"			"1"
+		"text_ypos"				"20"
+		"text_center"			"1"
+		"model_hide"			"1"
+		"resize_to_text"		"1"
+		"padding_height"		"15"
 
 		"attriblabel"
 		{
@@ -122,6 +122,7 @@
 			"inventory_image_type"	"1"
 		}
 	}
+	
 	"SubjectBG"
 	{
 		"ControlName"	"CExLabel"
@@ -216,6 +217,7 @@
 		{
 			"force_use_model"		"1"
 			"use_item_rendertarget" "1"
+			"inventory_image_type"	"1"
 			"allow_rot"				"1"
 		}
 	}
@@ -246,6 +248,7 @@
 		{
 			"force_use_model"		"1"
 			"use_item_rendertarget" "1"
+			"inventory_image_type"	"1"
 			"allow_rot"				"1"
 		}
 	}
diff --git a/resource/ui/econ/confirmcustomizetexturedialog.res b/resource/ui/econ/confirmcustomizetexturedialog.res
index b5e3696..ded340c 100644
--- a/resource/ui/econ/confirmcustomizetexturedialog.res
+++ b/resource/ui/econ/confirmcustomizetexturedialog.res
@@ -184,6 +184,7 @@
 		"itemmodelpanel"
 		{
 			"use_item_rendertarget" "0"
+			"inventory_image_type"	"1"
 			"allow_rot"				"0"
 		}
 	}
@@ -212,9 +213,11 @@
 		//"name_only"		"1"
 		"model_only"		"1"
 		"paint_icon_hide" "1"
+		
 		"itemmodelpanel"
 		{
 			"force_use_model"		"1"
+			"inventory_image_type"	"1"
 			"use_item_rendertarget" "0"
 			"allow_rot"				"1"
 		}
@@ -302,60 +305,60 @@
 
 			"ForBestResultsLabel"
 			{
-				"ControlName"		"CExLabel"
+				"ControlName"	"CExLabel"
 				"fieldName"		"ForBestResultsLabel"
 				"font"			"HudFontSmall"
-				"xpos"		"40"
-				"ypos"		"140"
-				"wide"		"300"
-				"tall"		"40"
+				"xpos"			"40"
+				"ypos"			"140"
+				"wide"			"300"
+				"tall"			"40"
 				"labelText"		"#ToolCustomizeTextureBestResults"
 				"textAlignment"	"north-west"
-				"wrap" "1"
+				"wrap" 			"1"
 			}
 		}
 
 		"PreviewImageGroupBox"
 		{
 			"ControlName"		"EditablePanel"
-			"fieldName"		"PreviewImageGroupBox"
-			"xpos"		"360"
-			"ypos"		"25"
-			"zpos"		"-1"
-			"wide"		"180"
-			"tall"		"200"
-			"border"		"GrayDialogBorder"
-			"bgcolor_override"		"DarkGrey"
+			"fieldName"			"PreviewImageGroupBox"
+			"xpos"				"360"
+			"ypos"				"25"
+			"zpos"				"-1"
+			"wide"				"180"
+			"tall"				"200"
+			"border"			"GrayDialogBorder"
+			"bgcolor_override"	"DarkGrey"
 
 			"PreviewCroppedImage"
 			{
 				"ControlName"		"CRGBAImagePanel"
-				"fieldName"		"PreviewCroppedImage"
-				"xpos"		"20"
-				"ypos"		"20"
-				"zpos"		"-1"
-				"wide"		"140"
-				"tall"		"140"
+				"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"
-
-				//"fgcolor_override"	"235 226 202 255"
-				"bgcolor_override"	"0 0 0 255"
-				//"disabledFgColor_override" "235 226 202 255"
-				"disabledBgColor_override" "0 0 0 255"
-				"selectionColor_override" "0 0 0 255"
-				"selectionTextColor_override" "235 226 202 255"
+				"fieldName"			"SquarizeComboBox"
+				"xpos"				"20"
+				"ypos"				"170"
+				"zpos"				"-1"
+				"wide"				"140"
+				"tall"				"15"
+				"editable"			"0"
+				"font"				"HudFontSmall"
+
+				//"fgcolor_override"				"235 226 202 255"
+				"bgcolor_override"					"0 0 0 255"
+				//"disabledFgColor_override" 		"235 226 202 255"
+				"disabledBgColor_override" 			"0 0 0 255"
+				"selectionColor_override" 			"0 0 0 255"
+				"selectionTextColor_override" 		"235 226 202 255"
 				"defaultSelectionBG2Color_override" "0 0 0 0"
 			}
 		}
@@ -364,7 +367,7 @@
 		{
 			"ControlName"	"CExButton"
 			"fieldName"		"CancelButton"
-			"xpos"			"00"
+			"xpos"			"0"
 			"ypos"			"230"
 			"zpos"			"1"
 			"wide"			"130"
@@ -424,70 +427,70 @@
 		"FilterOptionsGroupBox"
 		{
 			"ControlName"		"EditablePanel"
-			"fieldName"		"SelectFilterGroupBox"
-			"Font"		"HudFontSmallestBold"
-			"xpos"		"0"
-			"ypos"		"25"
-			"zpos"		"-1"
-			"wide"		"160"
-			"tall"		"200"
-			"border"		"GrayDialogBorder"
-			"bgcolor_override"		"DarkGrey"
+			"fieldName"			"SelectFilterGroupBox"
+			"Font"				"HudFontSmallestBold"
+			"xpos"				"0"
+			"ypos"				"25"
+			"zpos"				"-1"
+			"wide"				"160"
+			"tall"				"200"
+			"border"			"GrayDialogBorder"
+			"bgcolor_override"	"DarkGrey"
 
 			"FilterLabel"
 			{
-				"ControlName"		"CExLabel"
+				"ControlName"	"CExLabel"
 				"fieldName"		"FilterLabel"
 				"font"			"HudFontSmallBold"
-				"xpos"		"10"
-				"ypos"		"10"
-				"wide"		"140"
-				"tall"		"20"
+				"xpos"			"10"
+				"ypos"			"10"
+				"wide"			"140"
+				"tall"			"20"
 				"labelText"		"Filter:" // !FIXME! Localize
 				"textAlignment"	"north-west"
-				"visible"	"0"
+				"visible"		"0"
 			}
 
 			"FilterComboBox"
 			{
-				"ControlName"		"ComboBox"
+				"ControlName"	"ComboBox"
 				"fieldName"		"FilterComboBox"
-				"xpos"		"10"
-				"ypos"		"30"
-				"zpos"		"-1"
-				"wide"		"140"
-				"tall"		"15"
+				"xpos"			"10"
+				"ypos"			"30"
+				"zpos"			"-1"
+				"wide"			"140"
+				"tall"			"15"
 				"editable"		"0"
 				"font"			"HudFontSmall"
-				"visible"	"0"
-
-				//"fgcolor_override"	"235 226 202 255"
-				"bgcolor_override"	"0 0 0 255"
-				//"disabledFgColor_override" "235 226 202 255"
-				"disabledBgColor_override" "0 0 0 255"
-				"selectionColor_override" "0 0 0 255"
-				"selectionTextColor_override" "235 226 202 255"
+				"visible"		"0"
+
+				//"fgcolor_override"				"235 226 202 255"
+				"bgcolor_override"					"0 0 0 255"
+				//"disabledFgColor_override" 		"235 226 202 255"
+				"disabledBgColor_override" 			"0 0 0 255"
+				"selectionColor_override" 			"0 0 0 255"
+				"selectionTextColor_override" 		"235 226 202 255"
 				"defaultSelectionBG2Color_override" "0 0 0 0"
 			}
 
 			"PainterlyOptions"
 			{
-				"ControlName"		"EditablePanel"
+				"ControlName"	"EditablePanel"
 				"fieldName"		"PainterlyOptions"
-				"xpos"		"10"
-				"ypos"		"50"
-				"zpos"		"-1"
-				"wide"		"140"
-				"tall"		"150"
+				"xpos"			"10"
+				"ypos"			"50"
+				"zpos"			"-1"
+				"wide"			"140"
+				"tall"			"150"
 
 				"FilterDescriptionLabel"
 				{
-					"ControlName"		"CExLabel"
+					"ControlName"	"CExLabel"
 					"fieldName"		"FilterDescriptionLabel"
-					"xpos"		"0"
-					"ypos"		"0"
-					"wide"		"140"
-					"tall"		"80"
+					"xpos"			"0"
+					"ypos"			"0"
+					"wide"			"140"
+					"tall"			"80"
 					"labelText"		"#ToolCustomizeTexturePainterlyDescription"
 					"textAlignment"	"north-west"
 					"font"			"HudFontSmall"
@@ -497,37 +500,37 @@
 
 			"StencilOptions"
 			{
-				"ControlName"		"EditablePanel"
+				"ControlName"	"EditablePanel"
 				"fieldName"		"StencilOptions"
-				"xpos"		"10"
-				"ypos"		"50"
-				"zpos"		"-1"
-				"wide"		"140"
-				"tall"		"150"
+				"xpos"			"10"
+				"ypos"			"50"
+				"zpos"			"-1"
+				"wide"			"140"
+				"tall"			"150"
 
 				"FilterDescriptionLabel"
 				{
-					"ControlName"		"CExLabel"
+					"ControlName"	"CExLabel"
 					"fieldName"		"FilterDescriptionLabel"
-					"xpos"		"0"
-					"ypos"		"0"
-					"wide"		"120"
-					"tall"		"60"
+					"xpos"			"0"
+					"ypos"			"0"
+					"wide"			"120"
+					"tall"			"60"
 					"labelText"		"#ToolCustomizeTextureStencilDescription"
 					"textAlignment"	"north-west"
 					"font"			"HudFontSmall"
 					"wrap"			"1"
-					"visible"	"0"
+					"visible"		"0"
 				}
 
 				"ColorPaletteLabel"
 				{
-					"ControlName"		"CExLabel"
+					"ControlName"	"CExLabel"
 					"fieldName"		"ColorPaletteLabel"
-					"xpos"		"0"
-					"ypos"		"60"
-					"wide"		"140"
-					"tall"		"15"
+					"xpos"			"0"
+					"ypos"			"60"
+					"wide"			"140"
+					"tall"			"15"
 					"labelText"		"#ToolCustomizeTextureColorPalette"
 					"textAlignment"	"north-west"
 					"font"			"HudFontSmallBold"
@@ -580,22 +583,22 @@
 
 				"StencilModeComboBox"
 				{
-					"ControlName"		"ComboBox"
+					"ControlName"	"ComboBox"
 					"fieldName"		"StencilModeComboBox"
-					"xpos"		"0"
-					"ypos"		"125"
-					"zpos"		"-1"
-					"wide"		"140"
-					"tall"		"15"
+					"xpos"			"0"
+					"ypos"			"125"
+					"zpos"			"-1"
+					"wide"			"140"
+					"tall"			"15"
 					"editable"		"0"
 					"font"			"HudFontSmall"
 
-					//"fgcolor_override"	"235 226 202 255"
-					"bgcolor_override"	"0 0 0 255"
-					//"disabledFgColor_override" "235 226 202 255"
-					"disabledBgColor_override" "0 0 0 255"
-					"selectionColor_override" "0 0 0 255"
-					"selectionTextColor_override" "235 226 202 255"
+					//"fgcolor_override"				"235 226 202 255"
+					"bgcolor_override"					"0 0 0 255"
+					//"disabledFgColor_override" 		"235 226 202 255"
+					"disabledBgColor_override" 			"0 0 0 255"
+					"selectionColor_override" 			"0 0 0 255"
+					"selectionTextColor_override" 		"235 226 202 255"
 					"defaultSelectionBG2Color_override" "0 0 0 0"
 				}
 			}
@@ -603,39 +606,39 @@
 
 		"PreviewImageGroupBox"
 		{
-			"ControlName"		"EditablePanel"
+			"ControlName"	"EditablePanel"
 			"fieldName"		"PreviewImageGroupBox"
-			"xpos"		"170"
-			"ypos"		"25"
-			"zpos"		"-1"
-			"wide"		"180"
-			"tall"		"200"
+			"xpos"			"170"
+			"ypos"			"25"
+			"zpos"			"-1"
+			"wide"			"180"
+			"tall"			"200"
 			"border"		"GrayDialogBorder"
-			"bgcolor_override"		"DarkGrey"
+			"bgcolor_override"	"DarkGrey"
 
 			"PreviewFilteredImage"
 			{
-				"ControlName"		"CRGBAImagePanel"
+				"ControlName"	"CRGBAImagePanel"
 				"fieldName"		"PreviewFilteredImage"
-				"xpos"		"20"
-				"ypos"		"30"
-				"zpos"		"-1"
-				"wide"		"140"
-				"tall"		"140"
+				"xpos"			"20"
+				"ypos"			"30"
+				"zpos"			"-1"
+				"wide"			"140"
+				"tall"			"140"
 			}
 		}
 
 		"PreviewModelGroupBox"
 		{
-			"ControlName"		"EditablePanel"
+			"ControlName"	"EditablePanel"
 			"fieldName"		"PreviewModelGroupBox"
-			"xpos"		"360"
-			"ypos"		"25"
-			"zpos"		"-1"
-			"wide"		"180"
-			"tall"		"200"
+			"xpos"			"360"
+			"ypos"			"25"
+			"zpos"			"-1"
+			"wide"			"180"
+			"tall"			"200"
 			"border"		"GrayDialogBorder"
-			"bgcolor_override"		"DarkGrey"
+			"bgcolor_override"	"DarkGrey"
 
 			"GradientBgPanel"
 			{
@@ -652,7 +655,7 @@
 				"image"			"loadout_bottom_gradient"
 				"border"		"ButtonBorder"
 				"paintbackgroundtype"	"2"
-				"paintbackground"	"1"
+				"paintbackground"		"1"
 			}
 
 			"DragToRotateLabel"
@@ -749,43 +752,43 @@
 
 		"WarningTextGroupBox"
 		{
-			"ControlName"		"EditablePanel"
+			"ControlName"	"EditablePanel"
 			"fieldName"		"WarningTextGroupBox"
-			"Font"		"HudFontSmallestBold"
-			"xpos"		"0"
-			"ypos"		"25"
-			"zpos"		"-1"
-			"wide"		"350"
-			"tall"		"200"
+			"Font"			"HudFontSmallestBold"
+			"xpos"			"0"
+			"ypos"			"25"
+			"zpos"			"-1"
+			"wide"			"350"
+			"tall"			"200"
 			"border"		"GrayDialogBorder"
-			"bgcolor_override"		"DarkGrey"
+			"bgcolor_override"	"DarkGrey"
 
 			"WarningText"
 			{
-				"ControlName"		"CExLabel"
+				"ControlName"	"CExLabel"
 				"fieldName"		"WarningText"
 				"font"			"HudFontSmall"
-				"xpos"		"10"
-				"ypos"		"10"
-				"wide"		"330"
-				"tall"		"180"
-				"labelText"		 "#ToolCustomizeTextureConfirmWarning"
+				"xpos"			"10"
+				"ypos"			"10"
+				"wide"			"330"
+				"tall"			"180"
+				"labelText"		"#ToolCustomizeTextureConfirmWarning"
 				"textAlignment"	"west"
-				"wrap"	"1"
+				"wrap"			"1"
 			}
 		}
 
 		"PreviewModelGroupBox"
 		{
-			"ControlName"		"EditablePanel"
+			"ControlName"	"EditablePanel"
 			"fieldName"		"PreviewModelGroupBox"
-			"xpos"		"360"
-			"ypos"		"25"
-			"zpos"		"-1"
-			"wide"		"180"
-			"tall"		"200"
+			"xpos"			"360"
+			"ypos"			"25"
+			"zpos"			"-1"
+			"wide"			"180"
+			"tall"			"200"
 			"border"		"GrayDialogBorder"
-			"bgcolor_override"		"DarkGrey"
+			"bgcolor_override"	"DarkGrey"
 
 			"GradientBgPanel"
 			{
@@ -802,7 +805,7 @@
 				"image"			"loadout_bottom_gradient"
 				"border"		"ButtonBorder"
 				"paintbackgroundtype"	"2"
-				"paintbackground"	"1"
+				"paintbackground"		"1"
 			}
 
 			"DragToRotateLabel"
diff --git a/resource/ui/econ/genericwaitingdialog.res b/resource/ui/econ/genericwaitingdialog.res
index b09ec91..fa122eb 100644
--- a/resource/ui/econ/genericwaitingdialog.res
+++ b/resource/ui/econ/genericwaitingdialog.res
@@ -14,91 +14,91 @@
 		"settitlebarvisible"	"0"
 		"border"				"NoBorder"
 	}
-
+	
 	"TitleLabel"
 	{
-		"ControlName"	"Label"
-		"fieldName"		"TitleLabel"
-		"font"			"HudFontMediumSmall"
-		"xpos"			"0"
-		"ypos"			"8"
-		"zpos"			"0"
-		"wide"			"200"
-		"tall"			"42"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"1"
-		"enabled"		"1"
-		"wrap"			"0"
-		"centerwrap"	"1"
-		"labelText"		"%updatetext%"
-		"textAlignment"		"center"
-		"fgcolor_override" 	"255 255 255 255"
-		"bgcolor_override" 	"Transparent"
+		"ControlName"			"Label"
+		"fieldName"				"TitleLabel"
+		"font"					"HudFontMediumSmall"
+		"xpos"					"0"
+		"ypos"					"8"
+		"zpos"					"0"
+		"wide"					"200"
+		"tall"					"42"
+		"autoResize"			"0"
+		"pinCorner"				"0"
+		"visible"				"1"
+		"enabled"				"1"
+		"wrap"					"0"
+		"centerwrap"			"1"
+		"labelText"				"%updatetext%"
+		"textAlignment"			"center"
+		"fgcolor_override" 		"White"
+		"bgcolor_override" 		"Transparent"
 	}
-
+	
 	"EllipsesLabel"
 	{
-		"ControlName"	"Label"
-		"fieldName"		"EllipsesLabel"
-		"font"			"HudFontSmallest"
-		"xpos"			"0"
-		"ypos"			"42"
-		"zpos"			"0"
-		"wide"			"200"
-		"tall"			"20"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"1"
-		"enabled"		"1"
-		"labelText"		"%ellipses%"
-		"textAlignment"		"north"
-		"fgcolor_override" "255 255 255 255"
-		"bgcolor_override" "Transparent"
+		"ControlName"			"Label"
+		"fieldName"				"EllipsesLabel"
+		"font"					"HudFontSmallest"
+		"xpos"					"0"
+		"ypos"					"42"
+		"zpos"					"0"
+		"wide"					"200"
+		"tall"					"20"
+		"autoResize"			"0"
+		"pinCorner"				"0"
+		"visible"				"1"
+		"enabled"				"1"
+		"labelText"				"%ellipses%"
+		"textAlignment"			"north"
+		"fgcolor_override"		"White"
+		"bgcolor_override"		"Transparent"
 	}
-
+	
 	"DurationLabel"
 	{
-		"ControlName"	"Label"
-		"fieldName"		"DurationLabel"
-		"font"			"HudFontSmallest"
-		"xpos"			"0"
-		"ypos"			"52"
-		"zpos"			"0"
-		"wide"			"200"
-		"tall"			"60"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"1"
-		"enabled"		"1"
-		"labelText"		"%duration%"
-		"textAlignment"		"north"
-		"fgcolor_override" "255 255 255 255"
-		"bgcolor_override" "Transparent"
+		"ControlName"			"Label"
+		"fieldName"				"DurationLabel"
+		"font"					"HudFontSmallest"
+		"xpos"					"0"
+		"ypos"					"52"
+		"zpos"					"0"
+		"wide"					"200"
+		"tall"					"60"
+		"autoResize"			"0"
+		"pinCorner"				"0"
+		"visible"				"1"
+		"enabled"				"1"
+		"labelText"				"%duration%"
+		"textAlignment"			"north"
+		"fgcolor_override"		"White"
+		"bgcolor_override"		"Transparent"
 	}
-
+	
 	"CloseButton"
 	{
-		"ControlName"	"CExImageButton"
-		"fieldName"		"CloseButton"
-		"xpos"			"50"
-		"ypos"			"70"
-		"zpos"			"1"
-		"wide"			"100"
-		"tall"			"25"
-		"autoResize"	"0"
-		"pinCorner"		"3"
-		"visible"		"1"
-		"enabled"		"1"
-		"tabPosition"	"0"
-		"labelText"		"#Cancel"
-		"font"			"HudFontSmallest"
-		"textAlignment"	"center"
-		"dulltext"		"0"
-		"brighttext"	"0"
-		"default"		"1"
-		"Command"		"user_close"
-		"sound_depressed"	"UI/buttonclick.wav"
-		"sound_released"	"UI/buttonclickrelease.wav"
+		"ControlName"			"CExImageButton"
+		"fieldName"				"CloseButton"
+		"xpos"					"50"
+		"ypos"					"70"
+		"zpos"					"1"
+		"wide"					"100"
+		"tall"					"25"
+		"autoResize"			"0"
+		"pinCorner"				"3"
+		"visible"				"1"
+		"enabled"				"1"
+		"tabPosition"			"0"
+		"labelText"				"#Cancel"
+		"font"					"HudFontSmallest"
+		"textAlignment"			"center"
+		"dulltext"				"0"
+		"brighttext"			"0"
+		"default"				"1"
+		"Command"				"user_close"
+		"sound_depressed"		"UI/buttonclick.wav"
+		"sound_released"		"UI/buttonclickrelease.wav"
 	}
 }
\ No newline at end of file
diff --git a/resource/ui/econ/inspectionpanel.res b/resource/ui/econ/inspectionpanel.res
index dc4a79f..3c42ff4 100644
--- a/resource/ui/econ/inspectionpanel.res
+++ b/resource/ui/econ/inspectionpanel.res
@@ -361,7 +361,7 @@
 
 			"fixed_paintkit"
 			{
-				"ypos"		"10"
+				"ypos"			"10"
 			}
 
 			"zpos"				"100"
@@ -609,8 +609,8 @@
 
 			"defaultFgColor_override"	"White"
 			"defaultBgColor_override"	"72 103 32 255"
-			"armedFgColor_override"		"White"
-			"armedBgColor_override"		"72 133 32 255"
+			"selectedFgColor_override"	"White"
+			"selectedBgColor_override"	"72 133 32 255"
 
 			"sound_armed"		"ui/item_info_mouseover.wav"
 			"sound_depressed"	"UI/buttonclick.wav"
diff --git a/resource/ui/econ/inspectionpanel_cosmetic.res b/resource/ui/econ/inspectionpanel_cosmetic.res
index 79fae37..e2796e5 100644
--- a/resource/ui/econ/inspectionpanel_cosmetic.res
+++ b/resource/ui/econ/inspectionpanel_cosmetic.res
@@ -123,9 +123,10 @@
 				"dulltext"		"0"
 				"brighttext"	"0"
 				"default"		"0"
+				"Command"			"zoom_toggle"
+				
 				"sound_depressed"	"UI/buttonclick.wav"
 				"sound_released"	"UI/buttonclickrelease.wav"
-				"Command"			"zoom_toggle"
 				"paintbackground"	"0"
 				"image_drawcolor"	"118 107 94 200"
 				"image_armedcolor"	"246 247 213 255"
@@ -1023,35 +1024,21 @@
 		"visible"		"1"
 		"enabled"		"1"
 		"tabPosition"	"0"
-		"labeltext"		""
-		"font"			""
+		"labeltext"		"("
+		"font"			"CustomIcons"
 		"textAlignment"	"center"
 		"dulltext"		"0"
 		"brighttext"	"0"
 		"default"		"0"
+		"Command"			"closex"
+		"paintbackground"	"0"
+		
 		"sound_depressed"	"UI/buttonclick.wav"
 		"sound_released"	"UI/buttonclickrelease.wav"
-		"Command"		"closex"	// Intentionally using "closex" instead of "close" for stats
-		"paintbackground"	"0"
-
-		"image_drawcolor"	"118 107 94 255"
-		"image_armedcolor"	"246 247 213 255"
-
-		"SubImage"
-		{
-			"ControlName"	"ImagePanel"
-			"fieldName"		"SubImage"
-			"xpos"			"cs-0.5"
-			"ypos"			"cs-0.5"
-			"zpos"			"1"
-			"wide"			"9"
-			"tall"			"9"
-			"visible"		"1"
-			"enabled"		"1"
-			"image"			"replay/thumbnails/close"
-			"scaleImage"	"1"
-			"proportionaltoparent"	"1"
-		}
+		
+		"defaultFgColor_override" 	"118 107 94 255"
+		"armedFgColor_override" 	"246 247 213 255"
+		"depressedFgColor_override" "118 107 94 255"
 	}
 
 	"mouseoveritempanel"
diff --git a/resource/ui/econ/itemmodelpanel.res b/resource/ui/econ/itemmodelpanel.res
index 4f6ed8d..18dcc4d 100644
--- a/resource/ui/econ/itemmodelpanel.res
+++ b/resource/ui/econ/itemmodelpanel.res
@@ -2,14 +2,14 @@
 {
 	"mouseoveritempanel"
 	{
-		"fieldName"				"mouseoveritempanel"
-		"collection_list_xpos"	"250"
-		"is_mouseover"			"1"
-		"text_xpos_collection"	"0"
-		"text_ypos"				"15"
-		"text_forcesize" 		"0"
-		"text_xpos"				"15"
-		"text_wide"				"270"
+		"fieldName"					"mouseoveritempanel"
+		"collection_list_xpos"		"250"
+		"is_mouseover"				"1"
+		"text_xpos_collection"		"0"
+		"text_ypos"					"15"
+		"text_forcesize" 			"0"
+		"text_xpos"					"15"
+		"text_wide"					"270"
 		//"model_xpos_collection"	"77"
 		//"model_ypos_collection"	"20"
 		//"model_wide_collection"	"156"
@@ -18,32 +18,32 @@
 
 	"LoadingSpinner"
 	{
-		"ControlName"	"ImagePanel"
-		"fieldName"		"LoadingSpinner"
-		"xpos"			"0"
-		"ypos"			"0"
-		"zpos"			"1"
-		"wide"			"f0"
-		"tall"			"f0"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"0"
-		"enabled"		"1"
-		"paintborder"	"0"
-		"image"			"animated/tf2_logo_hourglass"
-		"scaleImage"	"1"
+		"ControlName"		"ImagePanel"
+		"fieldName"			"LoadingSpinner"
+		"xpos"				"0"
+		"ypos"				"0"
+		"zpos"				"1"
+		"wide"				"f0"
+		"tall"				"f0"
+		"autoResize"		"0"
+		"pinCorner"			"0"
+		"visible"			"0"
+		"enabled"			"1"
+		"paintborder"		"0"
+		"image"				"animated/tf2_logo_hourglass"
+		"scaleImage"		"1"
 	}
 
 	"MainContentsContainer"
 	{
-		"ControlName"	"EditablePanel"
-		"fieldName"		"MainContentsContainer"
-		"xpos"			"0"
-		"ypos"			"0"
-		"wide"			"f0"
-		"tall"			"f0"
-		"visible"		"1"
-		"bgcolor_override"		"Transparent"
+		"ControlName"		"EditablePanel"
+		"fieldName"			"MainContentsContainer"
+		"xpos"				"0"
+		"ypos"				"0"
+		"wide"				"f0"
+		"tall"				"f0"
+		"visible"			"1"
+		"bgcolor_override"	"Transparent"
 
 		"itemmodelpanel"
 		{
diff --git a/resource/ui/econ/itempickuppanel.res b/resource/ui/econ/itempickuppanel.res
index cbc303d..512c0ba 100644
--- a/resource/ui/econ/itempickuppanel.res
+++ b/resource/ui/econ/itempickuppanel.res
@@ -270,14 +270,12 @@
 		"dulltext"		"0"
 		"brighttext"	"0"
 		"Command"		"discarditem"
+		"paintbackground"	"0"
 		"sound_depressed"	"UI/buttonclick.wav"
 		"sound_released"	"UI/buttonclickrelease.wav"
 
-		"defaultBgColor_override" "Transparent"
-		"armedBgColor_override" "Transparent"
-		"depressedBgColor_override" "Transparent"
-		"image_drawcolor"	"TanLight"
-		"image_armedcolor"	"ColorCyan"
+		"defaultFgColor_override"	"TanLight"
+		"armedFgColor_override"		"ColorCyan"
 
 		"SubImage"
 		{
diff --git a/resource/ui/econ/notificationtoastcontainer.res b/resource/ui/econ/notificationtoastcontainer.res
index 6f78626..38ec259 100644
--- a/resource/ui/econ/notificationtoastcontainer.res
+++ b/resource/ui/econ/notificationtoastcontainer.res
@@ -2,38 +2,38 @@
 {
 	"NotificationToastContainer"
 	{
-		"ControlName"	"CNotificationToastControl"
-		"fieldName"		"NotificationToastContainer"
-		"xpos"			"0"
-		"ypos"			"0"
-		"zpos"			"1"
-		"wide"			"150"
-		"tall"			"50"
-		"visible"		"1"
-		"enabled"		"1"
+		"ControlName"		"CNotificationToastControl"
+		"fieldName"			"NotificationToastContainer"
+		"xpos"				"0"
+		"ypos"				"0"
+		"zpos"				"1"
+		"wide"				"150"
+		"tall"				"50"
+		"visible"			"1"
+		"enabled"			"1"
 		"bgcolor_override"	"DarkGrey"
 		"border"			"CyanBorder"
 	}
-
+	
 	"HelpTextLabel"
 	{
-		"ControlName"	"CExLabel"
-		"fieldName"		"HelpTextLabel"
-		"fgcolor"		"RedSolid"
-		"xpos"			"5"
-		"ypos"			"0"
-		"zpos"			"2"
-		"wide"			"140"
-		"tall"			"38"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"1"
-		"enabled"		"1"
-		"wrap"			"1"
-		"labelText"		""
-		"textAlignment"	"North"
-		"font"			"TeamMenu"
-		"textinsetx"	"2"
-		"textinsety"	"7"
+		"ControlName"		"CExLabel"
+		"fieldName"			"HelpTextLabel"
+		"fgcolor"			"RedSolid"
+		"xpos"				"5"
+		"ypos"				"0"
+		"zpos"				"2"
+		"wide"				"140"
+		"tall"				"38"
+		"autoResize"		"0"
+		"pinCorner"			"0"
+		"visible"			"1"
+		"enabled"			"1"
+		"wrap"				"1"
+		"labelText"			""
+		"textAlignment"		"North"
+		"font"				"Cerbetica14"
+		"textinsetx"		"2"
+		"textinsety"		"7"
 	}
 }
\ No newline at end of file
diff --git a/resource/ui/econ/notificationtoastcontrol.res b/resource/ui/econ/notificationtoastcontrol.res
index ad6f35d..380323e 100644
--- a/resource/ui/econ/notificationtoastcontrol.res
+++ b/resource/ui/econ/notificationtoastcontrol.res
@@ -2,16 +2,16 @@
 {
 	"NotificationToastControl"
 	{
-		"ControlName"	"CNotificationToastControl"
-		"fieldName"		"NotificationToastControl"
-		"xpos"			"0"
-		"ypos"			"0"
-		"zpos"			"1"
-		"wide"			"190"
-		"tall"			"30"
-		"visible"		"1"
-		"enabled"		"1"
-		"border"		"NoBorder"
+		"ControlName"			"CNotificationToastControl"
+		"fieldName"				"NotificationToastControl"
+		"xpos"					"0"
+		"ypos"					"0"
+		"zpos"					"1"
+		"wide"					"190"
+		"tall"					"30"
+		"visible"				"1"
+		"enabled"				"1"
+		"border"				"NoBorder"
 		"paintborder"			"1"
 		"paintbackground"		"1"
 		"PaintBackgroundType"	"0"
@@ -21,173 +21,127 @@
 
 	"DeleteButton"
 	{
-		"ControlName"	"CExImageButton"
-		"fieldName"		"DeleteButton"
-		"xpos"			"165"
-		"ypos"			"5"
-		"zpos"			"10"
-		"wide"			"20"
-		"tall"			"20"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"0"
-		"enabled"		"1"
-		"tabPosition"	"0"
-		"labeltext"		""
-		"font"			"TFFontSmall"
-		"textAlignment"	"center"
-		"dulltext"		"0"
-		"brighttext"	"0"
-		"default"		"1"
-		"sound_depressed"	"UI/buttonclick.wav"
-		"sound_released"	"UI/buttonclickrelease.wav"
-		"Command"			"delete"
-		"armedBgColor_override"	"LightRed"
-
-		"SubImage"
-		{
-			"ControlName"	"ImagePanel"
-			"fieldName"		"SubImage"
-			"xpos"			"2"
-			"ypos"			"2"
-			"zpos"			"1"
-			"wide"			"16"
-			"tall"			"16"
-			"visible"		"1"
-			"enabled"		"1"
-			"image"			"replay/thumbnails/close"
-			"scaleImage"	"1"
-		}
+		"ControlName"			"CExImageButton"
+		"fieldName"				"DeleteButton"
+		"xpos"					"165"
+		"ypos"					"5"
+		"zpos"					"10"
+		"wide"					"20"
+		"tall"					"20"
+		"autoResize"			"0"
+		"pinCorner"				"0"
+		"visible"				"1"
+		"enabled"				"1"
+		"tabPosition"			"0"
+		"labeltext"				"("
+		"font"					"CustomIcons"
+		"textAlignment"			"center"
+		"dulltext"				"0"
+		"brighttext"			"0"
+		"default"				"1"
+		"Command"				"delete"
+		"paintbackground"		"1"
+		
+		"defaultBgColor_override" 	"Black"
+		"armedBgColor_override" 	"LightRed"
+		"depressedBgColor_override" "Black"
 	}
 
 	"TriggerButton"
 	{
-		"ControlName"	"CExImageButton"
-		"fieldName"		"TriggerButton"
-		"xpos"			"144"
+		"ControlName"			"CExImageButton"
+		"fieldName"				"TriggerButton"
+		"xpos"					"144"
 		"if_one_button"
 		{
-			"xpos"		"165"
-		}
-		"ypos"			"5"
-		"zpos"			"10"
-		"wide"			"20"
-		"tall"			"20"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"0"
-		"enabled"		"1"
-		"tabPosition"	"0"
-		"labeltext"		""
-		"font"			"TFFontSmall"
-		"textAlignment"	"center"
-		"dulltext"		"0"
-		"brighttext"	"0"
-		"default"		"1"
-		"sound_depressed"	"UI/buttonclick.wav"
-		"sound_released"	"UI/buttonclickrelease.wav"
-		"Command"			"trigger"
-		"armedBgColor_override"	"CreditsGreen"
-
-		"SubImage"
-		{
-			"ControlName"	"ImagePanel"
-			"fieldName"		"SubImage"
-			"xpos"			"2"
-			"ypos"			"2"
-			"zpos"			"1"
-			"wide"			"16"
-			"tall"			"16"
-			"visible"		"1"
-			"enabled"		"1"
-			"image"			"glyph_view"
-			"scaleImage"	"1"
+			"xpos"				"165"
 		}
+		"ypos"					"5"
+		"zpos"					"10"
+		"wide"					"20"
+		"tall"					"20"
+		"autoResize"			"0"
+		"pinCorner"				"0"
+		"visible"				"0"
+		"enabled"				"1"
+		"tabPosition"			"0"
+		"labeltext"				"s"
+		"font"					"CustomIcons"
+		"textAlignment"			"center"
+		"dulltext"				"0"
+		"brighttext"			"0"
+		"default"				"1"
+		"Command"				"trigger"
+		"paintbackground"		"1"
+		"sound_depressed"		"UI/buttonclick.wav"
+		"sound_released"		"UI/buttonclickrelease.wav"
+		
+		"defaultBgColor_override" 	"Black"
+		"armedBgColor_override" 	"CreditsGreen"
+		"depressedBgColor_override" "Black"
 	}
 
 	"AcceptButton"
 	{
-		"ControlName"	"CExImageButton"
-		"fieldName"		"AcceptButton"
-		"xpos"			"144"
+		"ControlName"			"CExImageButton"
+		"fieldName"				"AcceptButton"
+		"xpos"					"144"
 		"if_one_button"
 		{
-			"xpos"		"165"
-		}
-		"ypos"			"5"
-		"zpos"			"10"
-		"wide"			"20"
-		"tall"			"20"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"0"
-		"enabled"		"1"
-		"tabPosition"	"0"
-		"labeltext"		""
-		"font"			"TFFontSmall"
-		"textAlignment"	"center"
-		"dulltext"		"0"
-		"brighttext"	"0"
-		"default"		"1"
-		"sound_depressed"	"UI/buttonclick.wav"
-		"sound_released"	"UI/buttonclickrelease.wav"
-		"Command"			"accept"
-		"armedBgColor_override"	"CreditsGreen"
-
-		"SubImage"
-		{
-			"ControlName"	"ImagePanel"
-			"fieldName"		"SubImage"
-			"xpos"			"2"
-			"ypos"			"2"
-			"zpos"			"1"
-			"wide"			"16"
-			"tall"			"16"
-			"visible"		"1"
-			"enabled"		"1"
-			"image"			"glyph_view"
-			"scaleImage"	"1"
+			"xpos"				"165"
 		}
+		"ypos"					"5"
+		"zpos"					"10"
+		"wide"					"20"
+		"tall"					"20"
+		"autoResize"			"0"
+		"pinCorner"				"0"
+		"visible"				"0"
+		"enabled"				"1"
+		"tabPosition"			"0"
+		"labeltext"				"s"
+		"font"					"CustomIcons"
+		"textAlignment"			"center"
+		"dulltext"				"0"
+		"brighttext"			"0"
+		"default"				"1"
+		"Command"				"accept"
+		"paintbackground"		"1"
+		"sound_depressed"		"UI/buttonclick.wav"
+		"sound_released"		"UI/buttonclickrelease.wav"
+		
+		"defaultBgColor_override" 	"Black"
+		"armedBgColor_override"		"CreditsGreen"
+		"depressedBgColor_override" "Black"
 	}
 
 	"DeclineButton"
 	{
-		"ControlName"	"CExImageButton"
-		"fieldName"		"DeclineButton"
-		"xpos"			"165"
-		"ypos"			"5"
-		"zpos"			"10"
-		"wide"			"20"
-		"tall"			"20"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"0"
-		"enabled"		"1"
-		"tabPosition"	"0"
-		"labeltext"		""
-		"font"			"TFFontSmall"
-		"textAlignment"	"center"
-		"dulltext"		"0"
-		"brighttext"	"0"
-		"default"		"1"
-		"sound_depressed"	"UI/buttonclick.wav"
-		"sound_released"	"UI/buttonclickrelease.wav"
-		"Command"			"decline"
-		"armedBgColor_override"	"LightRed"
-
-		"SubImage"
-		{
-			"ControlName"	"ImagePanel"
-			"fieldName"		"SubImage"
-			"xpos"			"2"
-			"ypos"			"2"
-			"zpos"			"1"
-			"wide"			"16"
-			"tall"			"16"
-			"visible"		"1"
-			"enabled"		"1"
-			"image"			"replay/thumbnails/close"
-			"scaleImage"	"1"
-		}
+		"ControlName"			"CExImageButton"
+		"fieldName"				"DeclineButton"
+		"xpos"					"165"
+		"ypos"					"5"
+		"zpos"					"10"
+		"wide"					"20"
+		"tall"					"20"
+		"autoResize"			"0"
+		"pinCorner"				"0"
+		"visible"				"0"
+		"enabled"				"1"
+		"tabPosition"			"0"
+		"labeltext"				"("
+		"font"					"CustomIcons"
+		"textAlignment"			"center"
+		"dulltext"				"0"
+		"brighttext"			"0"
+		"default"				"1"
+		"Command"				"decline"
+		"paintbackground"		"1"
+		"sound_depressed"		"UI/buttonclick.wav"
+		"sound_released"		"UI/buttonclickrelease.wav"
+		
+		"defaultBgColor_override" 	"Black"
+		"armedBgColor_override" 	"LightRed"
+		"depressedBgColor_override" "Black"
 	}
 }
\ No newline at end of file
diff --git a/resource/ui/econ/paintkitconsumedialog.res b/resource/ui/econ/paintkitconsumedialog.res
index f338514..24f6186 100644
--- a/resource/ui/econ/paintkitconsumedialog.res
+++ b/resource/ui/econ/paintkitconsumedialog.res
@@ -2,13 +2,13 @@
 {
 	"PaintkitConsume"
 	{
-		"fieldName"	"PaintkitConsume"
-		"xpos"		"cs-0.5"
-		"ypos"		"cs-0.5"
-		"wide"		"400"
-		"tall"		"400"
-		"visible"	"1"
-		"zpos"		"1000"
+		"fieldName"		"PaintkitConsume"
+		"xpos"			"cs-0.5"
+		"ypos"			"cs-0.5"
+		"wide"			"400"
+		"tall"			"400"
+		"visible"		"1"
+		"zpos"			"1000"
 	}
 
 	"Title"
@@ -250,14 +250,8 @@
 		"brighttext"	"0"
 		"Command"		"cancel"
 		"proportionaltoparent"	"1"
-		"sound_depressed"			"UI/buttonclick.wav"
-		"sound_released"			"UI/buttonclickrelease.wav"
-		"border_default"			"Econ.Button.Border.Default"
-		"border_armed"				"Econ.Button.Border.Armed"
-		"armedBgColor_override"		"Econ.Button.ArmedBgColor"
-		"armedFgColor_override"		"Econ.Button.ArmedFgColor"
-		"depressedBgColor_override"	"Econ.Button.DepressedBgColor"
-		"depressedFgColor_override"	"Econ.Button.DepressedFgColor"
+		"sound_depressed"		"UI/buttonclick.wav"
+		"sound_released"		"UI/buttonclickrelease.wav"
 	}
 
 	"ConfirmButton"
@@ -283,13 +277,7 @@
 		"brighttext"	"0"
 		"Command"		"accept"
 		"proportionaltoparent"	"1"
-		"sound_depressed"	"UI/buttonclick.wav"
-		"sound_released"	"UI/buttonclickrelease.wav"
-		"border_default"			"Econ.Button.Border.Default"
-		"border_armed"				"Econ.Button.Border.Armed"
-		"armedBgColor_override"		"Econ.Button.ArmedBgColor"
-		"armedFgColor_override"		"Econ.Button.ArmedFgColor"
-		"depressedBgColor_override"	"Econ.Button.DepressedBgColor"
-		"depressedFgColor_override"	"Econ.Button.DepressedFgColor"
+		"sound_depressed"		"UI/buttonclick.wav"
+		"sound_released"		"UI/buttonclickrelease.wav"
 	}
 }
\ No newline at end of file
diff --git a/resource/ui/econ/questnotificationpanel_base.res b/resource/ui/econ/questnotificationpanel_base.res
index 8031c06..27ff26f 100644
--- a/resource/ui/econ/questnotificationpanel_base.res
+++ b/resource/ui/econ/questnotificationpanel_base.res
@@ -2,18 +2,17 @@
 {
 	"QuestNotificationPanel"
 	{
-		"ControlName"	"EditablePanel"
-		"fieldName"		"QuestNotificationPanel"
-		"xpos"			"0"
-		"ypos"			"100"
-		"zpos"			"2"
-		"wide"			"f0"
-		"tall"			"f0"
-		"visible"		"0"
+		"ControlName"			"EditablePanel"
+		"fieldName"				"QuestNotificationPanel"
+		"xpos"					"0"
+		"ypos"					"100"
+		"zpos"					"2"
+		"wide"					"f0"
+		"tall"					"f0"
+		"visible"				"0"
 		"proportionaltoparent"	"1"
-
-		"output_step" "50"
-
+		"output_step"			"50"
+		
 		"MainContainer"
 		{
 			"ControlName"			"EditablePanel"
@@ -24,41 +23,40 @@
 			"tall"					"20"
 			"visible"				"1"
 			"proportionaltoparent"	"1"
-
-			"border"	"NoBorder"	//QuestStatusBorder
-			"paintborder"	"2"
-
+			"border"				"NoBorder"	//QuestStatusBorder
+			"paintborder"			"2"
+			
 			"ItemName"
 			{
-				"ControlName"	"Label"
-				"fieldName"		"ItemName"
-				"labeltext"		"#QuestNotification_Incoming"
-				"xpos"			"0"
-				"ypos"			"cs-0.5"
-				"wide"			"f0"
-				"tall"			"18"
-				"zpos"			"4"
-				"textinsetx"	"5"
+				"ControlName"			"Label"
+				"fieldName"				"ItemName"
+				"labeltext"				"#QuestNotification_Incoming"
+				"xpos"					"0"
+				"ypos"					"cs-0.5"
+				"wide"					"f0"
+				"tall"					"18"
+				"zpos"					"4"
+				"textinsetx"			"5"
 				"fgcolor_override"		"255 255 255 255"	//235 226 202 255
-				"font"			"AchievementTracker_Name"
-				//"wrap"			"1"
-				"TextAlignment"		"east"
-				"proportionaltoparent" "1"
+				"font"					"AchievementTracker_Name"
+				//"wrap"				"1"
+				"TextAlignment"			"east"
+				"proportionaltoparent"	"1"
 			}
-
+			
 			"CharacterImage"
 			{
-				"ControlName"	"CTFImagePanel"
-				"fieldName"		"CharacterImage"
-				"xpos"			"3"
-				"ypos"			"cs-0.5"
-				"zpos"			"0"
-				"wide"			"o1"
-				"tall"			"p0.8"
-				"visible"		"1"
-				"enabled"		"1"
-				"image"			"animated/tf2_speaker_icon"
-				"scaleImage"	"1"
+				"ControlName"			"CTFImagePanel"
+				"fieldName"				"CharacterImage"
+				"xpos"					"3"
+				"ypos"					"cs-0.5"
+				"zpos"					"0"
+				"wide"					"o1"
+				"tall"					"p0.8"
+				"visible"				"1"
+				"enabled"				"1"
+				"image"					"animated/tf2_speaker_icon"
+				"scaleImage"			"1"
 				"proportionaltoparent"	"1"
 			}
 		}
diff --git a/resource/ui/econ/store/v2/storehome_base.res b/resource/ui/econ/store/v2/storehome_base.res
index 7a02259..4830e2f 100644
--- a/resource/ui/econ/store/v2/storehome_base.res
+++ b/resource/ui/econ/store/v2/storehome_base.res
@@ -211,58 +211,14 @@
 	{
 		"ControlName"	"EditablePanel"
 		"fieldName"		"SaxtonBackgroundPanel"
-		"xpos"			"c-415"
-		"ypos"			"10"
-		"zpos"			"-1"
-		"wide"			"300"
-		"tall"			"300"
-		"visible"		"1"
-		"enabled"		"1"
-
-		"MannCoImage"
-		{
-			"ControlName"	"ImagePanel"
-			"fieldName"		"MannCoImage"
-			"xpos"			"15"
-			"ypos"			"0"
-			"zpos"			"0"
-			"wide"			"420"
-			"tall"			"220"
-			"visible"		"0"
-			"enabled"		"1"
-			"image"			"store/saxton_welcome"
-			"scaleImage"	"1"
-		}
+		"xpos"			"9999"
 	}
 
 	"StoreBackgroundPanel"
 	{
 		"ControlName"	"EditablePanel"
 		"fieldName"		"StoreBackgroundPanel"
-		"xpos"			"0"
-		"ypos"			"0"
-		"zpos"			"-1"
-		"wide"			"f0"
-		"tall"			"f0"
-		"visible"		"0"
-		"enabled"		"0"
-		"proportiontoparent"	"1"
-
-		"StoreBackgroundImage"
-		{
-			"ControlName"	"ScalableImagePanel"
-			"fieldName"		"StoreBackgroundImage"
-			"xpos"			"0"
-			"ypos"			"0"
-			"zpos"			"0"
-			"wide"			"f0"
-			"tall"			"f0"
-			"visible"		"1"
-			"enable"		"1"
-			"image"			"store/store_bg001"
-			"scale_image"	"1"
-			"proportiontoparent"	"1"
-		}
+		"xpos"			"9999"
 	}
 
 	"ReloadSchemeButton"
diff --git a/resource/ui/econ/store/v2/storehome_premium.res b/resource/ui/econ/store/v2/storehome_premium.res
index d5fab06..ad7fb17 100644
--- a/resource/ui/econ/store/v2/storehome_premium.res
+++ b/resource/ui/econ/store/v2/storehome_premium.res
@@ -6,26 +6,6 @@
 	{
 		"ControlName"	"EditablePanel"
 		"fieldName"		"PremiumCallout"
-		"xpos"			"c-323"
-		"ypos"			"c-45"
-		"zpos"			"-1"
-		"wide"			"300"
-		"tall"			"300"
-		"visible"		"1"
-		"enabled"		"1"
-
-		"MannCoImage"
-		{
-			"ControlName"	"ImagePanel"
-			"fieldName"		"MannCoImage"
-			"wide"			"420"
-			"tall"			"220"
-			"visible"		"0"
-			"enabled"		"1"
-			"scaleImage"	"1"
-			"xpos"			"15"
-			"ypos"			"0"
-			"zpos"			"0"
-		}
+		"xpos"			"9999"
 	}
 }
\ No newline at end of file
diff --git a/resource/ui/econ/store/v2/storepanel.res b/resource/ui/econ/store/v2/storepanel.res
index 202b658..e1b48d0 100644
--- a/resource/ui/econ/store/v2/storepanel.res
+++ b/resource/ui/econ/store/v2/storepanel.res
@@ -105,14 +105,14 @@
 
 	"Sheet"
 	{
-		"ControlName"	"EditablePanel"
-		"fieldName"		"Sheet"
-		"tabxindent"	"80"
-		"tabxdelta"		"10"
-		"tabxfittotext"	"1"
-		"tabheight"		"20"
-		"yoffset"		"14"
-		"transition_time" "0"
+		"ControlName"		"EditablePanel"
+		"fieldName"			"Sheet"
+		"tabxindent"		"80"
+		"tabxdelta"			"10"
+		"tabxfittotext"		"1"
+		"tabheight"			"20"
+		"yoffset"			"14"
+		"transition_time"	"0"
 
 		"HeaderLine"
 		{
@@ -139,11 +139,11 @@
 			"selectedcolor"		"TanLight"
 			"unselectedcolor"	"TanDark"
 			"defaultBgColor_override"	"DarkGrey"
-			"paintbackground"		"1"
-			"activeborder_override"	"CyanBorderTabs"
-			"normalborder_override" "CyanBorderTabsInactive"
-			"unselectedBgColor_override"	"10 10 10 255"
-			"depressedBgColor_override"		"10 10 10 255"
+			"paintbackground"			"1"
+			"activeborder_override"		"CyanBorderTabs"
+			"normalborder_override" 	"CyanBorderTabsInactive"
+			"armedBgColor_override"		"10 10 10 255"
+			"selectedBgColor_override"	"10 10 10 255"
 		}
 	}
 
diff --git a/resource/ui/econ/store/v2/storepreviewitempanel.res b/resource/ui/econ/store/v2/storepreviewitempanel.res
index 89c57b5..498f376 100644
--- a/resource/ui/econ/store/v2/storepreviewitempanel.res
+++ b/resource/ui/econ/store/v2/storepreviewitempanel.res
@@ -958,9 +958,10 @@
 		"dulltext"		"0"
 		"brighttext"	"0"
 		"command"		"icons_right"
+		"paintbackground"	"0"
 		"sound_depressed"	"UI/buttonclick.wav"
 		"sound_released"	"UI/buttonclickrelease.wav"
-		"paintbackground"	"0"
+
 		"defaultFgColor_override"	"118 107 94 255"
 		"armedFgColor_override"		"128 117 104 255"
 		"depressedFgColor_override"	"236 227 203 255"
@@ -1009,9 +1010,11 @@
 		"dulltext"		"0"
 		"brighttext"	"0"
 		"Command"		"-1"
+		"paintbackground"	"0"
+		
 		"sound_depressed"	"UI/buttonclick.wav"
 		"sound_released"	"UI/buttonclickrelease.wav"
-		"paintbackground"	"0"
+
 		"defaultFgColor_override"	"118 107 94 255"
 		"armedFgColor_override"		"128 117 104 255"
 		"depressedFgColor_override"	"236 227 203 255"
@@ -1038,9 +1041,11 @@
 		"dulltext"		"0"
 		"brighttext"	"0"
 		"Command"		"1"
+		"paintbackground"	"0"
+		
 		"sound_depressed"	"UI/buttonclick.wav"
 		"sound_released"	"UI/buttonclickrelease.wav"
-		"paintbackground"	"0"
+
 		"defaultFgColor_override"	"118 107 94 255"
 		"armedFgColor_override"		"128 117 104 255"
 		"depressedFgColor_override"	"236 227 203 255"
@@ -1088,10 +1093,12 @@
 		"dulltext"		"0"
 		"brighttext"	"0"
 		"default"		"0"
-		"sound_depressed"	"UI/buttonclick.wav"
-		"sound_released"	"UI/buttonclickrelease.wav"
 		"Command"		"gofullscreen"
 		"paintbackground"	"0"
+		
+		"sound_depressed"	"UI/buttonclick.wav"
+		"sound_released"	"UI/buttonclickrelease.wav"
+
 		"image_drawcolor"		"118 107 94 200"
 		"image_armedcolor"		"128 117 104 255"
 
@@ -1131,10 +1138,12 @@
 		"dulltext"		"0"
 		"brighttext"	"0"
 		"default"		"0"
-		"sound_depressed"	"UI/buttonclick.wav"
-		"sound_released"	"UI/buttonclickrelease.wav"
 		"Command"			"zoom_toggle"
 		"paintbackground"	"0"
+		
+		"sound_depressed"	"UI/buttonclick.wav"
+		"sound_released"	"UI/buttonclickrelease.wav"
+
 		"image_drawcolor"		"118 107 94 200"
 		"image_armedcolor"		"128 117 104 255"
 
@@ -1371,38 +1380,21 @@
 		"visible"		"1"
 		"enabled"		"1"
 		"tabPosition"	"0"
-		"labeltext"		""
-		"font"			""
+		"labeltext"		"("
+		"font"			"CustomIcons"
 		"textAlignment"	"center"
 		"dulltext"		"0"
 		"brighttext"	"0"
 		"default"		"0"
+		"Command"			"closex"
+		"paintbackground"	"0"
+		
 		"sound_depressed"	"UI/buttonclick.wav"
 		"sound_released"	"UI/buttonclickrelease.wav"
-		"Command"		"closex"	// Intentionally using "closex" instead of "close" for stats
-		"paintbackground"	"0"
-
-		"defaultFgColor_override" "Blank"
-		"armedFgColor_override" "Blank"
-		"depressedFgColor_override" "Blank"
-		"image_drawcolor"	"White"
-		"image_armedcolor"	"255 0 0 255"
-
-		"SubImage"
-		{
-			"ControlName"	"ImagePanel"
-			"fieldName"		"SubImage"
-			"xpos"			"cs-0.5"
-			"ypos"			"cs-0.5"
-			"zpos"			"1"
-			"wide"			"9"
-			"tall"			"9"
-			"visible"		"1"
-			"enabled"		"1"
-			"image"			"replay/thumbnails/close"
-			"scaleImage"	"1"
-			"proportionaltoparent"	"1"
-		}
+		
+		"defaultFgColor_override" 	"TanLight"
+		"armedFgColor_override" 	"255 0 0 255"
+		"depressedFgColor_override" "TanLight"
 	}
 
 	"BackButton"
@@ -1425,6 +1417,7 @@
 		"brighttext"	"0"
 		"default"		"1"
 		"Command"		"close"
+		
 		"sound_depressed"	"UI/buttonclick.wav"
 		"sound_released"	"UI/buttonclickrelease.wav"
 	}
@@ -1449,6 +1442,7 @@
 		"brighttext"	"0"
 		"default"		"1"
 		"Command"		"tryitout"
+		
 		"sound_depressed"	"UI/buttonclick.wav"
 		"sound_released"	"UI/buttonclickrelease.wav"
 	}
@@ -1473,6 +1467,7 @@
 		"brighttext"	"0"
 		"default"		"1"
 		"Command"		"addtocart"
+		
 		"sound_depressed"	"UI/buttonclick.wav"
 		"sound_released"	"UI/buttonclickrelease.wav"
 	}
diff --git a/resource/ui/econ/store/v2/storepreviewitempanel_maps.res b/resource/ui/econ/store/v2/storepreviewitempanel_maps.res
index 18c7440..f8eaf13 100644
--- a/resource/ui/econ/store/v2/storepreviewitempanel_maps.res
+++ b/resource/ui/econ/store/v2/storepreviewitempanel_maps.res
@@ -496,35 +496,21 @@
 		"visible"		"1"
 		"enabled"		"1"
 		"tabPosition"	"0"
-		"labeltext"		""
-		"font"			"HudFontSmallBold"
+		"labeltext"		"("
+		"font"			"CustomIcons"
 		"textAlignment"	"center"
 		"dulltext"		"0"
 		"brighttext"	"0"
 		"default"		"0"
-		"sound_depressed"	"UI/buttonclick.wav"
-		"sound_released"	"UI/buttonclickrelease.wav"
 		"Command"			"close"
 		"paintbackground"	"0"
-
-		"image_drawcolor"	"White"
-		"image_armedcolor"	"255 0 0 255"
-
-		"SubImage"
-		{
-			"ControlName"	"ImagePanel"
-			"fieldName"		"SubImage"
-			"xpos"			"cs-0.5"
-			"ypos"			"cs-0.5"
-			"zpos"			"1"
-			"wide"			"9"
-			"tall"			"9"
-			"visible"		"1"
-			"enabled"		"1"
-			"image"			"replay/thumbnails/close"
-			"scaleImage"	"1"
-			"proportionaltoparent"	"1"
-		}
+		
+		"sound_depressed"	"UI/buttonclick.wav"
+		"sound_released"	"UI/buttonclickrelease.wav"
+		
+		"defaultFgColor_override" 	"White"
+		"armedFgColor_override" 	"255 0 0 255"
+		"depressedFgColor_override" "White"
 	}
 
 	"BackButton"
diff --git a/resource/ui/econ/store/v2/storeviewcartpanel.res b/resource/ui/econ/store/v2/storeviewcartpanel.res
index 0d2b1c3..94e6b50 100644
--- a/resource/ui/econ/store/v2/storeviewcartpanel.res
+++ b/resource/ui/econ/store/v2/storeviewcartpanel.res
@@ -331,6 +331,7 @@
 				}
 
 				"nobuttons"		"1"
+				
 				"UpButton"
 				{
 					"ControlName"	"Button"
diff --git a/resource/ui/econ/strangecounttransferdialog.res b/resource/ui/econ/strangecounttransferdialog.res
index 4c16925..3fb462f 100644
--- a/resource/ui/econ/strangecounttransferdialog.res
+++ b/resource/ui/econ/strangecounttransferdialog.res
@@ -91,6 +91,7 @@
 			"name_only"		"1"
 			"paint_icon_hide" "1"
 			"actionsignallevel"	"2"
+			
 			"itemmodelpanel"
 			{
 				"use_item_rendertarget" "0"
@@ -98,6 +99,7 @@
 				"inventory_image_type"	"1"
 			}
 		}
+		
 		"SubjectBG"
 		{
 			"ControlName"	"CExLabel"
@@ -117,6 +119,7 @@
 			"paintbackground" "0"
 			"border"		"BackpackItemBorder_Vintage"
 		}
+		
 		"TargetItem"
 		{
 			"ControlName"	"CItemModelPanel"
@@ -139,6 +142,7 @@
 			"text_center"	"1"
 			"name_only"		"1"
 			"actionsignallevel"	"2"
+			
 			"itemmodelpanel"
 			{
 				"use_item_rendertarget" "0"
@@ -187,10 +191,10 @@
 			"dulltext"		"0"
 			"brighttext"	"0"
 			"default"		"0"
-			"Command"		"cancel"
+			"actionsignallevel"	"2"
+			"Command"			"cancel"
 			"sound_depressed"	"UI/buttonclick.wav"
 			"sound_released"	"UI/buttonclickrelease.wav"
-			"actionsignallevel"	"2"
 		}
 
 		"OkButton"
@@ -213,10 +217,10 @@
 			"dulltext"		"0"
 			"brighttext"	"0"
 			"default"		"1"
-			"Command"		"apply"
+			"actionsignallevel"	"2"
+			"Command"			"apply"
 			"sound_depressed"	"UI/buttonclick.wav"
 			"sound_released"	"UI/buttonclickrelease.wav"
-			"actionsignallevel"	"2"
 		}
 	}
 }
\ No newline at end of file
diff --git a/resource/ui/econ/tradingstartdialog.res b/resource/ui/econ/tradingstartdialog.res
index ff6f033..a192e77 100644
--- a/resource/ui/econ/tradingstartdialog.res
+++ b/resource/ui/econ/tradingstartdialog.res
@@ -16,10 +16,10 @@
 
 		"button_kv"
 		{
-			"xpos"			"10"
-			"ypos"			"0"
-			"wide"			"350"
-			"tall"			"30"
+			"xpos"				"10"
+			"ypos"				"0"
+			"wide"				"350"
+			"tall"				"30"
 
 			"button"
 			{
diff --git a/resource/ui/flagstatus.res b/resource/ui/flagstatus.res
index daffae7..085cb8f 100644
--- a/resource/ui/flagstatus.res
+++ b/resource/ui/flagstatus.res
@@ -13,7 +13,8 @@
 		"enabled"		"1"
 		"scaleImage"	"1"
 
-		"if_mvm"  {
+		"if_mvm" 
+		{
 			"ypos"		"0"
 		}
 	}
diff --git a/resource/ui/freezepanel_basic.res b/resource/ui/freezepanel_basic.res
index 2e7f8cc..db9447d 100644
--- a/resource/ui/freezepanel_basic.res
+++ b/resource/ui/freezepanel_basic.res
@@ -91,41 +91,41 @@
 
 	"FreezePanelBase"
 	{
-		"ControlName"	"EditablePanel"
-		"fieldName"		"FreezePanelBase"
-		"xpos"			"r249"
-		"ypos"			"c-20"
-		"wide"			"240"
-		"tall"			"200"
-		"visible"		"1"
+		"ControlName"		"EditablePanel"
+		"fieldName"			"FreezePanelBase"
+		"xpos"				"r249"
+		"ypos"				"c-20"
+		"wide"				"240"
+		"tall"				"200"
+		"visible"			"1"
 
 		"FreezePanelBGTitle"
 		{
-			"ControlName"	"ImagePanel"
-			"fieldName"		"FreezePanelBGTitle"
-			"xpos" 			"0"
-			"ypos" 			"15"
-			"zpos" 			"-1"
-			"wide" 			"240"
-			"tall" 			"31"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible" 		"1"
-			"enabled" 		"1"
-			"fillcolor" 	"0 0 0 128"
+			"ControlName"		"ImagePanel"
+			"fieldName"			"FreezePanelBGTitle"
+			"xpos" 				"0"
+			"ypos" 				"15"
+			"zpos" 				"-1"
+			"wide" 				"240"
+			"tall" 				"31"
+			"autoResize"		"0"
+			"pinCorner"			"0"
+			"visible" 			"1"
+			"enabled" 			"1"
+			"fillcolor" 		"0 0 0 128"
 		}
 		"FreezePanelBG"
 		{
-			"ControlName"	"CTFImagePanel"
-			"fieldName"		"FreezePanelBG"
-			"xpos"			"0"
-			"ypos"			"46"
-			"zpos"			"0"
-			"wide"			"240"
-			"tall"			"3"
-			"visible"		"1"
-			"enabled"		"1"
-			"image"			"../hud/color_panel_blu"
+			"ControlName"		"CTFImagePanel"
+			"fieldName"			"FreezePanelBG"
+			"xpos"				"0"
+			"ypos"				"46"
+			"zpos"				"0"
+			"wide"				"240"
+			"tall"				"3"
+			"visible"			"1"
+			"enabled"			"1"
+			"image"				"../hud/color_panel_blu"
 			"scaleImage"		"1"
 
 			"src_corner_height"		"23"
@@ -136,35 +136,35 @@
 
 		"FreezeLabel"
 		{
-			"ControlName"	"Label"
-			"fieldName"		"FreezeLabel"
-			"font"			"HudFontSmall"
-			"xpos"			"25"
-			"ypos"			"15"
-			"zpos"			"1"
-			"wide"			"198"
-			"tall"			"15"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"labelText"		"#FreezePanel_Killer"
-			"textAlignment"	"center"
-			"dulltext"		"0"
-			"brighttext"	"0"
+			"ControlName"		"CExLabel"
+			"fieldName"			"FreezeLabel"
+			"font"				"HudFontSmall"
+			"xpos"				"25"
+			"ypos"				"15"
+			"zpos"				"1"
+			"wide"				"198"
+			"tall"				"15"
+			"autoResize"		"0"
+			"pinCorner"			"0"
+			"visible"			"1"
+			"enabled"			"1"
+			"labelText"			"#FreezePanel_Killer"
+			"textAlignment"		"center"
+			"dulltext"			"0"
+			"brighttext"		"0"
 		}
 
 		"FreezePanelHealth"
 		{
-			"ControlName"	"CTFFreezePanelHealth"
-			"fieldName"		"FreezePanelHealth"
-			"xpos"			"0"
-			"ypos"			"6"
-			"zpos"			"1"
-			"wide"			"30"
-			"tall"			"30"
-			"visible"		"1"
-			"enabled"		"1"
+			"ControlName"		"CTFFreezePanelHealth"
+			"fieldName"			"FreezePanelHealth"
+			"xpos"				"0"
+			"ypos"				"6"
+			"zpos"				"1"
+			"wide"				"30"
+			"tall"				"30"
+			"visible"			"1"
+			"enabled"			"1"
 			"HealthBonusPosAdj"			"9"
 			"HealthDeathWarning"		"0.49"
 			"TFFont"					"HudFontSmall"
@@ -174,56 +174,55 @@
 
 		"FreezeLabelKiller"
 		{
-			"ControlName"	"CExLabel"
-			"fieldName"		"FreezeLabelKiller"
-			"font"			"HudFontSmall"
-			"xpos"			"25"
-			"ypos"			"30"
-			"zpos"			"1"
-			"wide"			"196"
-			"tall"			"15"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"labelText"		"%killername%"
-			"textAlignment"	"center"
+			"ControlName"		"CExLabel"
+			"fieldName"			"FreezeLabelKiller"
+			"font"				"HudFontSmall"
+			"xpos"				"25"
+			"ypos"				"30"
+			"zpos"				"1"
+			"wide"				"196"
+			"tall"				"15"
+			"autoResize"		"0"
+			"pinCorner"			"0"
+			"visible"			"1"
+			"enabled"			"1"
+			"labelText"			"%killername%"
+			"textAlignment"		"center"
 		}
 
 		"AvatarImage"
 		{
-			"ControlName"	"CAvatarImagePanel"
-			"fieldName"		"AvatarImage"
-			"xpos"			"7"
-			"ypos"			"30"
-			"zpos"			"0"
-			"wide"			"14"
-			"tall"			"14"
-			"visible"		"1"
-			"enabled"		"1"
-			"image"			""
-			"scaleImage"	"1"
-			"color_outline"	"HudTimerProgressInActive"
+			"ControlName"		"CAvatarImagePanel"
+			"fieldName"			"AvatarImage"
+			"xpos"				"7"
+			"ypos"				"30"
+			"zpos"				"0"
+			"wide"				"14"
+			"tall"				"14"
+			"visible"			"1"
+			"enabled"			"1"
+			"image"				""
+			"scaleImage"		"1"
+			"color_outline"		"HudTimerProgressInActive"
 		}
 
 		"NemesisSubPanel"
 		{
-			"ControlName"	"EditablePanel"
-			"fieldName"		"NemesisSubPanel"
-			"wide"			"0"
-			"tall"			"0"
-			"visible"		"0"
-			"enabled"		"0"
+			"ControlName"		"EditablePanel"
+			"fieldName"			"NemesisSubPanel"
+			"wide"				"0"
+			"tall"				"0"
+			"visible"			"0"
+			"enabled"			"0"
 		}
 	}
 
 	"ScreenshotPanel"
 	{
-		"ControlName"	"EditablePanel"
-		"fieldName"		"ScreenshotPanel"
-		"wide"			"0"
-		"tall"			"0"
-		"visible"		"0"
-		"enabled"		"0"
+		"ControlName"		"EditablePanel"
+		"fieldName"			"ScreenshotPanel"
+		"wide"				"0"
+		"tall"				"0"
+		"visible"			"0"
 	}
 }
\ No newline at end of file
diff --git a/resource/ui/hud_obj_dispenser.res b/resource/ui/hud_obj_dispenser.res
index cca6819..b70be62 100644
--- a/resource/ui/hud_obj_dispenser.res
+++ b/resource/ui/hud_obj_dispenser.res
@@ -67,6 +67,7 @@
 			"textAlignment"	"Left"
 			"dulltext"		"0"
 			"brighttext"	"0"
+			"proportionaltoparent"	"1"
 		}
 	}
 
@@ -79,6 +80,7 @@
 		"wide"			"160"
 		"tall"			"30"
 		"visible"		"0"
+		"proportionaltoparent"	"1"
 
 		"Icon_Upgrade_1"
 		{
@@ -94,6 +96,7 @@
 			"scaleImage"	"1"
 			"icon"			"obj_status_upgrade_1"
 			"iconColor"		"White"
+			"proportionaltoparent"	"1"
 		}
 
 		"Icon_Upgrade_2"
@@ -110,6 +113,7 @@
 			"scaleImage"	"1"
 			"icon"			"obj_status_upgrade_2"
 			"iconColor"		"White"
+			"proportionaltoparent"	"1"
 		}
 
 		"Icon_Upgrade_3"
@@ -126,6 +130,7 @@
 			"scaleImage"	"1"
 			"icon"			"obj_status_upgrade_3"
 			"iconColor"		"White"
+			"proportionaltoparent"	"1"
 		}
 
 		"AlertTray"
@@ -189,6 +194,7 @@
 			"textAlignment"	"Left"
 			"dulltext"		"0"
 			"brighttext"	"0"
+			"proportionaltoparent"	"1"
 		}
 
 		"BuildingPanel"
@@ -248,6 +254,7 @@
 			"wide"			"100"
 			"tall"			"30"
 			"visible"		"0"
+			"proportionaltoparent"	"1"
 
 			"AmmoIcon"
 			{
@@ -263,6 +270,7 @@
 				"scaleImage"	"1"
 				"image"			"../hud/hud_obj_status_ammo_64"
 				"drawcolor"		"ProgressOffWhite"
+				"proportionaltoparent"	"1"
 			}
 
 			"Ammo"
@@ -281,6 +289,7 @@
 				"textAlignment"	"Left"
 				"dulltext"		"0"
 				"brighttext"	"0"
+				"proportionaltoparent"	"1"
 			}
 
 			"UpgradeIcon"
@@ -297,6 +306,7 @@
 				"scaleImage"	"1"
 				"icon"			"ico_metal"
 				"iconColor"		"ProgressOffWhite"
+				"proportionaltoparent"	"1"
 			}
 
 			"Upgrade"
@@ -315,6 +325,7 @@
 				"textAlignment"	"Left"
 				"dulltext"		"0"
 				"brighttext"	"0"
+				"proportionaltoparent"	"1"
 			}
 		}
 	}
diff --git a/resource/ui/hud_obj_sapper.res b/resource/ui/hud_obj_sapper.res
index a2b5868..b66fd76 100644
--- a/resource/ui/hud_obj_sapper.res
+++ b/resource/ui/hud_obj_sapper.res
@@ -67,6 +67,7 @@
 			"textAlignment"	"Left"
 			"dulltext"		"0"
 			"brighttext"	"0"
+			"proportionaltoparent"	"1"
 		}
 	}
 
@@ -79,6 +80,7 @@
 		"wide"			"160"
 		"tall"			"43"
 		"visible"		"0"
+		"proportionaltoparent"	"1"
 
 		"Health"
 		{
@@ -96,6 +98,7 @@
 			"textAlignment"	"Left"
 			"dulltext"		"0"
 			"brighttext"	"0"
+			"proportionaltoparent"	"1"
 		}
 
 		"BuildingPanel"
@@ -155,6 +158,7 @@
 			"wide"			"100"
 			"tall"			"31"
 			"visible"		"0"
+			"proportionaltoparent"	"1"
 
 			"TargetIcon"
 			{
@@ -169,6 +173,7 @@
 				"scaleImage"	"1"
 				"icon"			"obj_status_sentrygun_1"
 				"iconColor"		"White"
+				"proportionaltoparent"	"1"
 			}
 
 			"TargetHealth"
@@ -187,6 +192,7 @@
 				"textAlignment"	"Left"
 				"dulltext"		"0"
 				"brighttext"	"0"
+				"proportionaltoparent"	"1"
 			}
 		}
 	}
diff --git a/resource/ui/hud_obj_sentrygun.res b/resource/ui/hud_obj_sentrygun.res
index 4002ccb..344c393 100644
--- a/resource/ui/hud_obj_sentrygun.res
+++ b/resource/ui/hud_obj_sentrygun.res
@@ -97,6 +97,7 @@
 			"textAlignment"	"Left"
 			"dulltext"		"0"
 			"brighttext"	"0"
+			"proportionaltoparent"	"1"
 		}
 	}
 
@@ -109,6 +110,7 @@
 		"wide"			"160"
 		"tall"			"35"
 		"visible"		"0"
+		"proportionaltoparent"	"1"
 
 		"Icon_Upgrade_1"
 		{
@@ -124,6 +126,7 @@
 			"scaleImage"	"1"
 			"icon"			"obj_status_upgrade_1"
 			"iconColor"		"White"
+			"proportionaltoparent"	"1"
 		}
 
 		"Icon_Upgrade_2"
@@ -140,6 +143,7 @@
 			"scaleImage"	"1"
 			"icon"			"obj_status_upgrade_2"
 			"iconColor"		"White"
+			"proportionaltoparent"	"1"
 		}
 
 		"Icon_Upgrade_3"
@@ -156,6 +160,7 @@
 			"scaleImage"	"1"
 			"icon"			"obj_status_upgrade_3"
 			"iconColor"		"White"
+			"proportionaltoparent"	"1"
 		}
 
 		"AlertTray"
@@ -219,6 +224,7 @@
 			"textAlignment"	"Left"
 			"dulltext"		"0"
 			"brighttext"	"0"
+			"proportionaltoparent"	"1"
 		}
 
 		"BuildingPanel"
@@ -278,6 +284,7 @@
 			"wide"			"100"
 			"tall"			"35"
 			"visible"		"0"
+			"proportionaltoparent"	"1"
 
 			"KillIcon"
 			{
@@ -293,6 +300,7 @@
 				"scaleImage"	"1"
 				"image"			"../hud/hud_obj_status_kill_64"
 				"drawcolor"		"ProgressOffWhite"
+				"proportionaltoparent"	"1"
 			}
 
 			"KillsLabel"
@@ -312,6 +320,7 @@
 				"textAlignment"	"center"
 				"dulltext"		"0"
 				"brighttext"	"0"
+				"proportionaltoparent"	"1"
 			}
 
 			"ShellIcon"
@@ -328,6 +337,7 @@
 				"scaleImage"	"1"
 				"image"			"../hud/hud_obj_status_ammo_64"
 				"drawcolor"		"ProgressOffWhite"
+				"proportionaltoparent"	"1"
 			}
 
 			"Shells"
@@ -346,6 +356,7 @@
 				"textAlignment"	"Left"
 				"dulltext"		"0"
 				"brighttext"	"0"
+				"proportionaltoparent"	"1"
 			}
 
 			"RocketIcon"
@@ -362,6 +373,7 @@
 				"scaleImage"	"1"
 				"image"			"../hud/hud_obj_status_rockets_64"
 				"drawcolor"		"ProgressOffWhite"
+				"proportionaltoparent"	"1"
 			}
 
 			"Rockets"
@@ -380,6 +392,7 @@
 				"textAlignment"	"Left"
 				"dulltext"		"0"
 				"brighttext"	"0"
+				"proportionaltoparent"	"1"
 			}
 
 			"UpgradeIcon"
@@ -396,6 +409,7 @@
 				"scaleImage"	"1"
 				"icon"			"ico_metal"
 				"iconColor"		"ProgressOffWhite"
+				"proportionaltoparent"	"1"
 			}
 
 			"Upgrade"
@@ -414,6 +428,7 @@
 				"textAlignment"	"Left"
 				"dulltext"		"0"
 				"brighttext"	"0"
+				"proportionaltoparent"	"1"
 			}
 		}
 	}
diff --git a/resource/ui/hud_obj_sentrygun_disp.res b/resource/ui/hud_obj_sentrygun_disp.res
index b003286..3faba2e 100644
--- a/resource/ui/hud_obj_sentrygun_disp.res
+++ b/resource/ui/hud_obj_sentrygun_disp.res
@@ -67,6 +67,7 @@
 			"textAlignment"	"Left"
 			"dulltext"		"0"
 			"brighttext"	"0"
+			"proportionaltoparent"	"1"
 		}
 	}
 
@@ -79,66 +80,34 @@
 		"wide"			"160"
 		"tall"			"30"
 		"visible"		"0"
+		"proportionaltoparent"	"1"
 
 		"Icon_Upgrade_1"
 		{
 			"ControlName"	"CIconPanel"
 			"fieldName"		"Icon_Upgrade_1"
-			"xpos"			"46"
-			"ypos"			"20"
-			"zpos"			"1"
-			"wide"			"10"
-			"tall"			"10"
-			"visible"		"0"
-			"enabled"		"0"
-			"scaleImage"	"1"
-			"icon"			""
-			"iconColor"		"White"
+			"xpos"			"9999"
 		}
 
 		"AlertTray"
 		{
 			"ControlName"	"CBuildingStatusAlertTray"
 			"fieldName"		"AlertTray"
-			"xpos"			"113"
-			"ypos"			"0"
-			"wide"			"34"
-			"tall"			"3"
-			"visible"		"0"
-			"enabled"		"0"
-			"icon"			"obj_status_alert_background_tall"
+			"xpos"			"9999"
 		}
 
 		"WrenchIcon"
 		{
 			"ControlName"	"CIconPanel"
 			"fieldName"		"WrenchIcon"
-			"xpos"			"121"
-			"ypos"			"15"
-			"zpos"			"1"
-			"wide"			"19"
-			"tall"			"19"
-			"visible"		"0"
-			"enabled"		"0"
-			"scaleImage"	"1"
-			"icon"			"obj_status_icon_wrench"
-			"iconColor"		"White"
+			"xpos"			"9999"
 		}
 
 		"SapperIcon"
 		{
 			"ControlName"	"CIconPanel"
 			"fieldName"		"SapperIcon"
-			"xpos"			"117"
-			"ypos"			"15"
-			"zpos"			"1"
-			"wide"			"25"
-			"tall"			"25"
-			"visible"		"0"
-			"enabled"		"0"
-			"scaleImage"	"1"
-			"icon"			"obj_status_icon_sapper"
-			"iconColor"		"White"
+			"xpos"			"9999"
 		}
 
 		"Health"
@@ -157,6 +126,7 @@
 			"textAlignment"	"Left"
 			"dulltext"		"0"
 			"brighttext"	"0"
+			"proportionaltoparent"	"1"
 		}
 
 		"BuildingPanel"
@@ -216,6 +186,7 @@
 			"wide"			"100"
 			"tall"			"30"
 			"visible"		"0"
+			"proportionaltoparent"	"1"
 
 			"KillIcon"
 			{
@@ -231,6 +202,7 @@
 				"scaleImage"	"1"
 				"image"			"../hud/hud_obj_status_kill_64"
 				"drawcolor"		"ProgressOffWhite"
+				"proportionaltoparent"	"1"
 			}
 
 			"KillsLabel"
@@ -250,6 +222,7 @@
 				"textAlignment"	"center"
 				"dulltext"		"0"
 				"brighttext"	"0"
+				"proportionaltoparent"	"1"
 			}
 
 			"ShellIcon"
@@ -266,6 +239,7 @@
 				"scaleImage"	"1"
 				"image"			"../hud/hud_obj_status_ammo_64"
 				"drawcolor"		"ProgressOffWhite"
+				"proportionaltoparent"	"1"
 			}
 
 			"Shells"
@@ -284,6 +258,7 @@
 				"textAlignment"	"Left"
 				"dulltext"		"0"
 				"brighttext"	"0"
+				"proportionaltoparent"	"1"
 			}
 		}
 	}
diff --git a/resource/ui/hud_obj_tele_entrance.res b/resource/ui/hud_obj_tele_entrance.res
index 5251c9c..397b4d1 100644
--- a/resource/ui/hud_obj_tele_entrance.res
+++ b/resource/ui/hud_obj_tele_entrance.res
@@ -63,10 +63,11 @@
 			"pinCorner"		"0"
 			"visible"		"1"
 			"enabled"		"1"
-			"labelText"		"#Building_hud_tele_enter_not_built_360"
+			"labelText"		"#Building_hud_tele_enter_not_built"
 			"textAlignment"	"Left"
 			"dulltext"		"0"
 			"brighttext"	"0"
+			"proportionaltoparent"	"1"
 		}
 	}
 
@@ -79,6 +80,7 @@
 		"wide"			"160"
 		"tall"			"30"
 		"visible"		"0"
+		"proportionaltoparent"	"1"
 
 		"Icon_Upgrade_1"
 		{
@@ -94,6 +96,7 @@
 			"scaleImage"	"1"
 			"icon"			"obj_status_upgrade_1"
 			"iconColor"		"White"
+			"proportionaltoparent"	"1"
 		}
 
 		"Icon_Upgrade_2"
@@ -110,6 +113,7 @@
 			"scaleImage"	"1"
 			"icon"			"obj_status_upgrade_2"
 			"iconColor"		"White"
+			"proportionaltoparent"	"1"
 		}
 
 		"Icon_Upgrade_3"
@@ -126,6 +130,7 @@
 			"scaleImage"	"1"
 			"icon"			"obj_status_upgrade_3"
 			"iconColor"		"White"
+			"proportionaltoparent"	"1"
 		}
 
 		"AlertTray"
@@ -189,6 +194,7 @@
 			"textAlignment"	"Left"
 			"dulltext"		"0"
 			"brighttext"	"0"
+			"proportionaltoparent"	"1"
 		}
 
 		"BuildingPanel"
@@ -248,6 +254,7 @@
 			"wide"			"100"
 			"tall"			"30"
 			"visible"		"0"
+			"proportionaltoparent"	"1"
 
 			"TeleportedIcon"
 			{
@@ -260,9 +267,10 @@
 				"tall"			"10"
 				"visible"		"1"
 				"enabled"		"1"
+				"scaleImage"	"1"
 				"image"			"../hud/hud_obj_status_teleport_64"
 				"drawcolor"		"ProgressOffWhite"
-				"scaleImage"	"1"
+				"proportionaltoparent"	"1"
 			}
 
 			"ChargingPanel"
@@ -291,6 +299,7 @@
 					"textAlignment"	"Left"
 					"dulltext"		"0"
 					"brighttext"	"0"
+					"proportionaltoparent"	"1"
 				}
 			}
 
@@ -321,6 +330,7 @@
 					"textAlignment"	"center"
 					"dulltext"		"0"
 					"brighttext"	"0"
+					"proportionaltoparent"	"1"
 				}
 			}
 
@@ -338,6 +348,7 @@
 				"scaleImage"	"1"
 				"icon"			"ico_metal"
 				"iconColor"		"ProgressOffWhite"
+				"proportionaltoparent"	"1"
 			}
 
 			"Upgrade"
@@ -356,6 +367,7 @@
 				"textAlignment"	"Left"
 				"dulltext"		"0"
 				"brighttext"	"0"
+				"proportionaltoparent"	"1"
 			}
 		}
 	}
diff --git a/resource/ui/hud_obj_tele_exit.res b/resource/ui/hud_obj_tele_exit.res
index 77d4cc0..987d4d9 100644
--- a/resource/ui/hud_obj_tele_exit.res
+++ b/resource/ui/hud_obj_tele_exit.res
@@ -67,6 +67,7 @@
 			"textAlignment"	"Left"
 			"dulltext"		"0"
 			"brighttext"	"0"
+			"proportionaltoparent"	"1"
 		}
 	}
 
@@ -79,6 +80,7 @@
 		"wide"			"160"
 		"tall"			"30"
 		"visible"		"0"
+		"proportionaltoparent"	"1"
 
 		"Icon_Upgrade_1"
 		{
@@ -94,6 +96,7 @@
 			"scaleImage"	"1"
 			"icon"			"obj_status_upgrade_1"
 			"iconColor"		"White"
+			"proportionaltoparent"	"1"
 		}
 
 		"Icon_Upgrade_2"
@@ -110,6 +113,7 @@
 			"scaleImage"	"1"
 			"icon"			"obj_status_upgrade_2"
 			"iconColor"		"White"
+			"proportionaltoparent"	"1"
 		}
 
 		"Icon_Upgrade_3"
@@ -126,6 +130,7 @@
 			"scaleImage"	"1"
 			"icon"			"obj_status_upgrade_3"
 			"iconColor"		"White"
+			"proportionaltoparent"	"1"
 		}
 
 		"AlertTray"
@@ -189,6 +194,7 @@
 			"textAlignment"	"Left"
 			"dulltext"		"0"
 			"brighttext"	"0"
+			"proportionaltoparent"	"1"
 		}
 
 		"BuildingPanel"
@@ -248,6 +254,7 @@
 			"wide"			"100"
 			"tall"			"30"
 			"visible"		"0"
+			"proportionaltoparent"	"1"
 
 			"UpgradeIcon"
 			{
@@ -263,6 +270,7 @@
 				"scaleImage"	"1"
 				"icon"			"ico_metal"
 				"iconColor"		"ProgressOffWhite"
+				"proportionaltoparent"	"1"
 			}
 
 			"Upgrade"
@@ -281,6 +289,7 @@
 				"textAlignment"	"Left"
 				"dulltext"		"0"
 				"brighttext"	"0"
+				"proportionaltoparent"	"1"
 			}
 		}
 	}
diff --git a/resource/ui/hudaccountpanel.res b/resource/ui/hudaccountpanel.res
index bf0cc16..7152576 100644
--- a/resource/ui/hudaccountpanel.res
+++ b/resource/ui/hudaccountpanel.res
@@ -17,103 +17,87 @@
 
 	"AccountBG"
 	{
-		"ControlName"	"CTFImagePanel"
-		"fieldName"		"AccountBG"
-		"xpos"			"5"
-		"ypos"			"103"
-		"zpos"			"0"
-		"wide"			"84"
-		"tall"			"42"
-		"visible"		"0"
-		"enabled"		"0"
-		"image"			"../hud/misc_ammo_area_blue"
-		"scaleImage"	"1"
-		"teambg_2"		"../hud/misc_ammo_area_red"
-		"teambg_3"		"../hud/misc_ammo_area_blue"
+		"ControlName"			"CTFImagePanel"
+		"fieldName"				"AccountBG"
+		"xpos"					"9999"
 	}
 
 	"MetalIcon"
 	{
-		"ControlName"	"CIconPanel"
-		"fieldName"		"MetalIcon"
-		"xpos"			"0"
-		"ypos"			"5"
-		"zpos"			"1"
-		"wide"			"10"
-		"tall"			"10"
-		"visible"		"1"
-		"enabled"		"1"
-		"scaleImage"	"1"
-		"icon"			"ico_metal"
-		"iconColor"		"TanLight"
+		"ControlName"			"CIconPanel"
+		"fieldName"				"MetalIcon"
+		"xpos"					"0"
+		"ypos"					"5"
+		"zpos"					"1"
+		"wide"					"10"
+		"tall"					"10"
+		"visible"				"1"
+		"enabled"				"1"
+		"scaleImage"			"1"
+		"icon"					"ico_metal"
+		"iconColor"				"TanLight"
 	}
 
 	"MetalIconShadow"
 	{
-		"ControlName"	"CIconPanel"
-		"fieldName"		"MetalIconShadow"
-		"xpos"			"-2"
-		"ypos"			"-2"
-		"zpos"			"1"
-		"wide"			"10"
-		"tall"			"10"
-		"visible"		"1"
-		"enabled"		"1"
-		"scaleImage"	"1"
-		"icon"			"ico_metal"
-		"iconColor"		"TransparentBlack"
-
+		"ControlName"			"CIconPanel"
+		"fieldName"				"MetalIconShadow"
+		"xpos"					"-2"
+		"ypos"					"-2"
+		"zpos"					"1"
+		"wide"					"10"
+		"tall"					"10"
+		"visible"				"1"
+		"enabled"				"1"
+		"scaleImage"			"1"
+		"icon"					"ico_metal"
+		"iconColor"				"TransparentBlack"
 		"pin_to_sibling"		"MetalIcon"
-		"pin_corner_to_sibling" "PIN_TOPLEFT"
-		"pin_to_sibling_corner" "PIN_TOPLEFT"
 	}
 
 	"AccountValue"
 	{
-		"ControlName"		"CExLabel"
-		"fieldName"			"AccountValue"
-		"xpos"				"5"
-		"ypos"				"0"
-		"zpos"				"2"
-		"wide"				"50"
-		"tall"				"20"
-		"autoResize"		"1"
-		"pinCorner"			"2"
-		"visible"			"1"
-		"enabled"			"1"
-		"tabPosition"		"0"
-		"labelText"			"%metal%"
-		"textAlignment"		"center"
-		"dulltext"			"0"
-		"brighttext"		"0"
-		"font"				"HudFontMedium"
-		"font_minmode"		"HudFontMediumSecondary"
+		"ControlName"			"CExLabel"
+		"fieldName"				"AccountValue"
+		"xpos"					"5"
+		"ypos"					"0"
+		"zpos"					"2"
+		"wide"					"50"
+		"tall"					"20"
+		"autoResize"			"1"
+		"pinCorner"				"2"
+		"visible"				"1"
+		"enabled"				"1"
+		"tabPosition"			"0"
+		"labelText"				"%metal%"
+		"textAlignment"			"center"
+		"dulltext"				"0"
+		"brighttext"			"0"
+		"font"					"HudFontMedium"
+		"font_minmode"			"HudFontMediumSecondary"
 	}
 
 	"AccountValueShadow"
 	{
-		"ControlName"		"CExLabel"
-		"fieldName"			"AccountValueShadow"
-		"xpos"				"-2"
-		"ypos"				"-2"
-		"zpos"				"2"
-		"wide"				"50"
-		"tall"				"20"
-		"autoResize"		"1"
-		"pinCorner"			"2"
-		"visible"			"1"
-		"enabled"			"1"
-		"tabPosition"		"0"
-		"labelText"			"%metal%"
-		"textAlignment"		"center"
-		"dulltext"			"0"
-		"brighttext"		"0"
-		"font"				"HudFontMedium"
-		"font_minmode"		"HudFontMediumSecondary"
-		"fgcolor"			"TransparentBlack"
-
+		"ControlName"			"CExLabel"
+		"fieldName"				"AccountValueShadow"
+		"xpos"					"-2"
+		"ypos"					"-2"
+		"zpos"					"2"
+		"wide"					"50"
+		"tall"					"20"
+		"autoResize"			"1"
+		"pinCorner"				"2"
+		"visible"				"1"
+		"enabled"				"1"
+		"tabPosition"			"0"
+		"labelText"				"%metal%"
+		"textAlignment"			"center"
+		"dulltext"				"0"
+		"brighttext"			"0"
+		"font"					"HudFontMedium"
+		"font_minmode"			"HudFontMediumSecondary"
+		"fgcolor"				"TransparentBlack"
 		"pin_to_sibling"		"AccountValue"
-		"pin_corner_to_sibling" "PIN_TOPLEFT"
-		"pin_to_sibling_corner" "PIN_TOPLEFT"
 	}
 }
\ No newline at end of file
diff --git a/resource/ui/hudammoweapons.res b/resource/ui/hudammoweapons.res
index 26ef7cb..22d0666 100644
--- a/resource/ui/hudammoweapons.res
+++ b/resource/ui/hudammoweapons.res
@@ -2,132 +2,123 @@
 {
 	"HudWeaponAmmoBG"
 	{
-		"ControlName"	"CTFImagePanel"
-		"fieldName"		"HudWeaponAmmoBG"
-		"xpos"			"9999"
+		"ControlName"		"CTFImagePanel"
+		"fieldName"			"HudWeaponAmmoBG"
+		"xpos"				"9999"
 	}
 
 	"HudWeaponLowAmmoImage"
 	{
-		"ControlName"	"ImagePanel"
-		"fieldName"		"HudWeaponLowAmmoImage"
-		"xpos"			"9999"
+		"ControlName"		"ImagePanel"
+		"fieldName"			"HudWeaponLowAmmoImage"
+		"xpos"				"9999"
 	}
 
 	"AmmoInClip"
 	{
-		"ControlName"	"CExLabel"
-		"fieldName"		"AmmoInClip"
-		"font"			"Cerbetica56"
-		"font_minmode"	"Cerbetica32"
-		"fgcolor"		"Ammo In Clip"
-		"xpos"			"0"
-		"ypos"			"0"
-		"zpos"			"5"
-		"wide"			"60"
-		"tall"			"50"
-		"visible"		"0"
-		"enabled"		"1"
-		"textAlignment"	"east"
-		"labelText"		"%Ammo%"
+		"ControlName"		"CExLabel"
+		"fieldName"			"AmmoInClip"
+		"font"				"Cerbetica56"
+		"font_minmode"		"Cerbetica32"
+		"fgcolor"			"Ammo In Clip"
+		"xpos"				"0"
+		"ypos"				"0"
+		"zpos"				"5"
+		"wide"				"60"
+		"tall"				"50"
+		"visible"			"0"
+		"enabled"			"1"
+		"textAlignment"		"east"
+		"labelText"			"%Ammo%"
 	}
 	"AmmoInClipShadow"
 	{
-		"ControlName"	"CExLabel"
-		"fieldName"		"AmmoInClipShadow"
-		"font"			"Cerbetica56"
-		"font_minmode"	"Cerbetica32"
-		"fgcolor"		"TransparentBlack"
-		"xpos"			"-2"
-		"ypos"			"-2"
-		"zpos"			"5"
-		"wide"			"60"
-		"tall"			"50"
-		"visible"		"0"
-		"enabled"		"1"
-		"textAlignment"	"east"
-		"labelText"		"%Ammo%"
-
-		"pin_to_sibling"		"AmmoInClip"
-		"pin_corner_to_sibling"	"PIN_TOPLEFT"
-		"pin_to_sibling_corner"	"PIN_TOPLEFT"
+		"ControlName"		"CExLabel"
+		"fieldName"			"AmmoInClipShadow"
+		"font"				"Cerbetica56"
+		"font_minmode"		"Cerbetica32"
+		"fgcolor"			"TransparentBlack"
+		"xpos"				"-2"
+		"ypos"				"-2"
+		"zpos"				"5"
+		"wide"				"60"
+		"tall"				"50"
+		"visible"			"0"
+		"enabled"			"1"
+		"textAlignment"		"east"
+		"labelText"			"%Ammo%"
+		"pin_to_sibling"	"AmmoInClip"
 	}
 
 	"AmmoInReserve"
 	{
-		"ControlName"	"CExLabel"
-		"fieldName"		"AmmoInReserve"
-		"font"			"Cerbetica32"
-		"font_minmode"	"Cerbetica20"
-		"fgcolor"		"Ammo In Reserve"
-		"xpos"			"65"
-		"ypos"			"0"
-		"zpos"			"7"
-		"wide"			"f0"
-		"tall"			"50"
-		"visible"		"0"
-		"enabled"		"1"
-		"textAlignment"	"west"
-		"labelText"		"%AmmoInReserve%"
+		"ControlName"		"CExLabel"
+		"fieldName"			"AmmoInReserve"
+		"font"				"Cerbetica32"
+		"font_minmode"		"Cerbetica20"
+		"fgcolor"			"Ammo In Reserve"
+		"xpos"				"65"
+		"ypos"				"0"
+		"zpos"				"7"
+		"wide"				"f0"
+		"tall"				"50"
+		"visible"			"0"
+		"enabled"			"1"
+		"textAlignment"		"west"
+		"labelText"			"%AmmoInReserve%"
 	}
 	"AmmoInReserveShadow"
 	{
-		"ControlName"	"CExLabel"
-		"fieldName"		"AmmoInReserveShadow"
-		"font"			"Cerbetica32"
-		"font_minmode"	"Cerbetica20"
-		"fgcolor"		"TransparentBlack"
-		"xpos"			"-2"
-		"ypos"			"-2"
-		"zpos"			"7"
-		"wide"			"f0"
-		"tall"			"50"
-		"visible"		"0"
-		"enabled"		"1"
-		"textAlignment"	"west"
-		"labelText"		"%AmmoInReserve%"
-
-		"pin_to_sibling"		"AmmoInReserve"
-		"pin_corner_to_sibling"	"PIN_TOPLEFT"
-		"pin_to_sibling_corner"	"PIN_TOPLEFT"
+		"ControlName"		"CExLabel"
+		"fieldName"			"AmmoInReserveShadow"
+		"font"				"Cerbetica32"
+		"font_minmode"		"Cerbetica20"
+		"fgcolor"			"TransparentBlack"
+		"xpos"				"-2"
+		"ypos"				"-2"
+		"zpos"				"7"
+		"wide"				"f0"
+		"tall"				"50"
+		"visible"			"0"
+		"enabled"			"1"
+		"textAlignment"		"west"
+		"labelText"			"%AmmoInReserve%"
+		"pin_to_sibling"	"AmmoInReserve"
 	}
 
 	"AmmoNoClip"
 	{
-		"ControlName"	"CExLabel"
-		"fieldName"		"AmmoNoClip"
-		"font"			"Cerbetica56"
-		"font_minmode"	"Cerbetica32"
-		"fgcolor"		"Ammo In Clip"
-		"xpos"			"0"
-		"ypos"			"0"
-		"zpos"			"5"
-		"wide"			"110"
-		"tall"			"50"
-		"visible"		"0"
-		"enabled"		"1"
-		"textAlignment"	"center"
-		"labelText"		"%Ammo%"
+		"ControlName"		"CExLabel"
+		"fieldName"			"AmmoNoClip"
+		"font"				"Cerbetica56"
+		"font_minmode"		"Cerbetica32"
+		"fgcolor"			"Ammo In Clip"
+		"xpos"				"0"
+		"ypos"				"0"
+		"zpos"				"5"
+		"wide"				"110"
+		"tall"				"50"
+		"visible"			"0"
+		"enabled"			"1"
+		"textAlignment"		"center"
+		"labelText"			"%Ammo%"
 	}
 	"AmmoNoClipShadow"
 	{
-		"ControlName"	"CExLabel"
-		"fieldName"		"AmmoNoClipShadow"
-		"font"			"Cerbetica56"
-		"font_minmode"	"Cerbetica32"
-		"fgcolor"		"TransparentBlack"
-		"xpos"			"-2"
-		"ypos"			"-2"
-		"zpos"			"4"
-		"wide"			"110"
-		"tall"			"50"
-		"visible"		"0"
-		"enabled"		"1"
-		"textAlignment"	"center"
-		"labelText"		"%Ammo%"
-
-		"pin_to_sibling"		"AmmoNoClip"
-		"pin_corner_to_sibling"	"PIN_TOPLEFT"
-		"pin_to_sibling_corner"	"PIN_TOPLEFT"
+		"ControlName"		"CExLabel"
+		"fieldName"			"AmmoNoClipShadow"
+		"font"				"Cerbetica56"
+		"font_minmode"		"Cerbetica32"
+		"fgcolor"			"TransparentBlack"
+		"xpos"				"-2"
+		"ypos"				"-2"
+		"zpos"				"4"
+		"wide"				"110"
+		"tall"				"50"
+		"visible"			"0"
+		"enabled"			"1"
+		"textAlignment"		"center"
+		"labelText"			"%Ammo%"
+		"pin_to_sibling"	"AmmoNoClip"
 	}
 }
\ No newline at end of file
diff --git a/resource/ui/hudarenaclasslayout.res b/resource/ui/hudarenaclasslayout.res
index 50f3863..20b1812 100644
--- a/resource/ui/hudarenaclasslayout.res
+++ b/resource/ui/hudarenaclasslayout.res
@@ -2,22 +2,22 @@
 {
 	"background"
 	{
-		"ControlName"	"CTFImagePanel"
-		"fieldName"		"background"
-		"xpos"			"0"
-		"ypos"			"69"
-		"zpos"			"1"
-		"wide"			"20"
-		"tall"			"60"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"1"
-		"enabled"		"1"
-		"image"			"../hud/color_panel_blu"
-		"scaleImage"	"1"
-		"teambg_2"		"../hud/color_panel_red"
-		"teambg_3"		"../hud/color_panel_blu"
-		"paintborder"	"0"
+		"ControlName"		"CTFImagePanel"
+		"fieldName"			"background"
+		"xpos"				"0"
+		"ypos"				"69"
+		"zpos"				"1"
+		"wide"				"20"
+		"tall"				"60"
+		"autoResize"		"0"
+		"pinCorner"			"0"
+		"visible"			"1"
+		"enabled"			"1"
+		"image"				"../hud/color_panel_blu"
+		"scaleImage"		"1"
+		"teambg_2"			"../hud/color_panel_red"
+		"teambg_3"			"../hud/color_panel_blu"
+		"paintborder"		"0"
 
 		"src_corner_height"		"23"
 		"src_corner_width"		"23"
@@ -27,22 +27,22 @@
 
 	"localPlayerBG"
 	{
-		"ControlName"	"CTFImagePanel"
-		"fieldName"		"localPlayerBG"
-		"xpos"			"0"
-		"ypos"			"40"
-		"zpos"			"2"
-		"wide"			"45"
-		"tall"			"80"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"1"
-		"enabled"		"1"
-		"image"			"../hud/color_panel_clear"
-		"scaleImage"	"1"
-		"teambg_2"		"../hud/color_panel_clear"
-		"teambg_3"		"../hud/color_panel_clear"
-		"paintborder"	"0"
+		"ControlName"		"CTFImagePanel"
+		"fieldName"			"localPlayerBG"
+		"xpos"				"0"
+		"ypos"				"40"
+		"zpos"				"2"
+		"wide"				"45"
+		"tall"				"80"
+		"autoResize"		"0"
+		"pinCorner"			"0"
+		"visible"			"1"
+		"enabled"			"1"
+		"image"				"../hud/color_panel_clear"
+		"scaleImage"		"1"
+		"teambg_2"			"../hud/color_panel_clear"
+		"teambg_3"			"../hud/color_panel_clear"
+		"paintborder"		"0"
 
 		"src_corner_height"		"23"
 		"src_corner_width"		"23"
@@ -52,252 +52,246 @@
 
 	"title"
 	{
-		"ControlName"	"CExLabel"
-		"fieldName"		"title"
-		"xpos"			"c-200"
-		"ypos"			"22"
-		"zpos"			"6"
-		"wide"			"400"
-		"tall"			"20"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"0"
-		"enabled"		"0"
-		"font"			"Cerbetica20"
-		"labelText"		"#TF_Arena_Team_Layout"
-		"textAlignment"	"center"
-		"fgcolor"		"TanLight"
+		"ControlName"		"CExLabel"
+		"fieldName"			"title"
+		"xpos"				"c-200"
+		"ypos"				"22"
+		"zpos"				"6"
+		"wide"				"400"
+		"tall"				"20"
+		"autoResize"		"0"
+		"pinCorner"			"0"
+		"visible"			"0"
+		"enabled"			"0"
+		"font"				"Cerbetica20"
+		"labelText"			"#TF_Arena_Team_Layout"
+		"textAlignment"		"center"
+		"fgcolor"			"TanLight"
 	}
 	"titleShadow"
 	{
-		"ControlName"	"CExLabel"
-		"fieldName"		"titleShadow"
-		"xpos"			"-1"
-		"ypos"			"-1"
-		"zpos"			"5"
-		"wide"			"400"
-		"tall"			"20"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"0"
-		"enabled"		"0"
-		"font"			"Cerbetica20"
-		"labelText"		"#TF_Arena_Team_Layout"
-		"textAlignment"	"center"
-		"fgcolor"		"TransparentBlack"
-
-		"pin_to_sibling"		"title"
-		"pin_corner_to_sibling"	"PIN_TOPLEFT"
-		"pin_to_sibling_corner"	"PIN_TOPLEFT"
+		"ControlName"		"CExLabel"
+		"fieldName"			"titleShadow"
+		"xpos"				"-1"
+		"ypos"				"-1"
+		"zpos"				"5"
+		"wide"				"400"
+		"tall"				"20"
+		"autoResize"		"0"
+		"pinCorner"			"0"
+		"visible"			"0"
+		"enabled"			"0"
+		"font"				"Cerbetica20"
+		"labelText"			"#TF_Arena_Team_Layout"
+		"textAlignment"		"center"
+		"fgcolor"			"TransparentBlack"
+		"pin_to_sibling"	"title"
 	}
 
 	"changeLabel"
 	{
-		"ControlName"	"CExLabel"
-		"fieldName"		"changeLabel"
-		"xpos"			"c-220"
-		"ypos"			"130"
-		"zpos"			"6"
-		"wide"			"440"
-		"tall"			"20"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"1"
-		"enabled"		"1"
-		"font"			"HudFontSmallBold"
-		"labelText"		"#TF_Arena_F4_ChangeClass"
-		"textAlignment"	"center"
-		"fgcolor"		"TanLight"
+		"ControlName"		"CExLabel"
+		"fieldName"			"changeLabel"
+		"xpos"				"c-220"
+		"ypos"				"130"
+		"zpos"				"6"
+		"wide"				"440"
+		"tall"				"20"
+		"autoResize"		"0"
+		"pinCorner"			"0"
+		"visible"			"1"
+		"enabled"			"1"
+		"font"				"HudFontSmallBold"
+		"labelText"			"#TF_Arena_F4_ChangeClass"
+		"textAlignment"		"center"
+		"fgcolor"			"TanLight"
 	}
 	"changeLabelShadow"
 	{
-		"ControlName"	"CExLabel"
-		"fieldName"		"changeLabelShadow"
-		"xpos"			"-1"
-		"ypos"			"-1"
-		"zpos"			"5"
-		"wide"			"440"
-		"tall"			"20"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"1"
-		"enabled"		"1"
-		"font"			"HudFontSmallBold"
-		"labelText"		"#TF_Arena_F4_ChangeClass"
-		"textAlignment"	"center"
-		"fgcolor"		"TransparentBlack"
-
-		"pin_to_sibling"		"changeLabel"
-		"pin_corner_to_sibling"	"PIN_TOPLEFT"
-		"pin_to_sibling_corner"	"PIN_TOPLEFT"
+		"ControlName"		"CExLabel"
+		"fieldName"			"changeLabelShadow"
+		"xpos"				"-1"
+		"ypos"				"-1"
+		"zpos"				"5"
+		"wide"				"440"
+		"tall"				"20"
+		"autoResize"		"0"
+		"pinCorner"			"0"
+		"visible"			"1"
+		"enabled"			"1"
+		"font"				"HudFontSmallBold"
+		"labelText"			"#TF_Arena_F4_ChangeClass"
+		"textAlignment"		"center"
+		"fgcolor"			"TransparentBlack"
+		"pin_to_sibling"	"changeLabel"
 	}
 
 	"classImage0"
 	{
-		"ControlName"	"CTFImagePanel"
-		"fieldName"		"classImage0"
-		"xpos"			"0"
-		"ypos"			"25"
-		"zpos"			"3"
-		"wide"			"45"
-		"tall"			"90"
-		"visible"		"0"
-		"enabled"		"1"
-		"image"			""
-		"scaleImage"	"1"
+		"ControlName"		"CTFImagePanel"
+		"fieldName"			"classImage0"
+		"xpos"				"0"
+		"ypos"				"25"
+		"zpos"				"3"
+		"wide"				"45"
+		"tall"				"90"
+		"visible"			"0"
+		"enabled"			"1"
+		"image"				""
+		"scaleImage"		"1"
 	}
 	"classImage1"
 	{
-		"ControlName"	"CTFImagePanel"
-		"fieldName"		"classImage1"
-		"xpos"			"0"
-		"ypos"			"0"
-		"zpos"			"3"
-		"wide"			"45"
-		"tall"			"90"
-		"visible"		"0"
-		"enabled"		"1"
-		"image"			""
-		"scaleImage"	"1"
+		"ControlName"		"CTFImagePanel"
+		"fieldName"			"classImage1"
+		"xpos"				"0"
+		"ypos"				"0"
+		"zpos"				"3"
+		"wide"				"45"
+		"tall"				"90"
+		"visible"			"0"
+		"enabled"			"1"
+		"image"				""
+		"scaleImage"		"1"
 	}
 	"classImage2"
 	{
-		"ControlName"	"CTFImagePanel"
-		"fieldName"		"classImage2"
-		"xpos"			"0"
-		"ypos"			"0"
-		"zpos"			"3"
-		"wide"			"45"
-		"tall"			"90"
-		"visible"		"0"
-		"enabled"		"1"
-		"image"			""
-		"scaleImage"	"1"
+		"ControlName"		"CTFImagePanel"
+		"fieldName"			"classImage2"
+		"xpos"				"0"
+		"ypos"				"0"
+		"zpos"				"3"
+		"wide"				"45"
+		"tall"				"90"
+		"visible"			"0"
+		"enabled"			"1"
+		"image"				""
+		"scaleImage"		"1"
 	}
 	"classImage3"
 	{
-		"ControlName"	"CTFImagePanel"
-		"fieldName"		"classImage3"
-		"xpos"			"0"
-		"ypos"			"0"
-		"zpos"			"3"
-		"wide"			"45"
-		"tall"			"90"
-		"visible"		"0"
-		"enabled"		"1"
-		"image"			""
-		"scaleImage"	"1"
+		"ControlName"		"CTFImagePanel"
+		"fieldName"			"classImage3"
+		"xpos"				"0"
+		"ypos"				"0"
+		"zpos"				"3"
+		"wide"				"45"
+		"tall"				"90"
+		"visible"			"0"
+		"enabled"			"1"
+		"image"				""
+		"scaleImage"		"1"
 	}
 	"classImage4"
 	{
-		"ControlName"	"CTFImagePanel"
-		"fieldName"		"classImage4"
-		"xpos"			"0"
-		"ypos"			"0"
-		"zpos"			"3"
-		"wide"			"45"
-		"tall"			"90"
-		"visible"		"0"
-		"enabled"		"1"
-		"image"			""
-		"scaleImage"	"1"
+		"ControlName"		"CTFImagePanel"
+		"fieldName"			"classImage4"
+		"xpos"				"0"
+		"ypos"				"0"
+		"zpos"				"3"
+		"wide"				"45"
+		"tall"				"90"
+		"visible"			"0"
+		"enabled"			"1"
+		"image"				""
+		"scaleImage"		"1"
 	}
 	"classImage5"
 	{
-		"ControlName"	"CTFImagePanel"
-		"fieldName"		"classImage5"
-		"xpos"			"0"
-		"ypos"			"0"
-		"zpos"			"3"
-		"wide"			"45"
-		"tall"			"90"
-		"visible"		"0"
-		"enabled"		"1"
-		"image"			""
-		"scaleImage"	"1"
+		"ControlName"		"CTFImagePanel"
+		"fieldName"			"classImage5"
+		"xpos"				"0"
+		"ypos"				"0"
+		"zpos"				"3"
+		"wide"				"45"
+		"tall"				"90"
+		"visible"			"0"
+		"enabled"			"1"
+		"image"				""
+		"scaleImage"		"1"
 	}
 	"classImage6"
 	{
-		"ControlName"	"CTFImagePanel"
-		"fieldName"		"classImage6"
-		"xpos"			"0"
-		"ypos"			"0"
-		"zpos"			"3"
-		"wide"			"45"
-		"tall"			"90"
-		"visible"		"0"
-		"enabled"		"1"
-		"image"			""
-		"scaleImage"	"1"
+		"ControlName"		"CTFImagePanel"
+		"fieldName"			"classImage6"
+		"xpos"				"0"
+		"ypos"				"0"
+		"zpos"				"3"
+		"wide"				"45"
+		"tall"				"90"
+		"visible"			"0"
+		"enabled"			"1"
+		"image"				""
+		"scaleImage"		"1"
 	}
 	"classImage7"
 	{
-		"ControlName"	"CTFImagePanel"
-		"fieldName"		"classImage7"
-		"xpos"			"0"
-		"ypos"			"0"
-		"zpos"			"3"
-		"wide"			"45"
-		"tall"			"90"
-		"visible"		"0"
-		"enabled"		"1"
-		"image"			""
-		"scaleImage"	"1"
+		"ControlName"		"CTFImagePanel"
+		"fieldName"			"classImage7"
+		"xpos"				"0"
+		"ypos"				"0"
+		"zpos"				"3"
+		"wide"				"45"
+		"tall"				"90"
+		"visible"			"0"
+		"enabled"			"1"
+		"image"				""
+		"scaleImage"		"1"
 	}
 	"classImage8"
 	{
-		"ControlName"	"CTFImagePanel"
-		"fieldName"		"classImage8"
-		"xpos"			"0"
-		"ypos"			"0"
-		"zpos"			"3"
-		"wide"			"45"
-		"tall"			"90"
-		"visible"		"0"
-		"enabled"		"1"
-		"image"			""
-		"scaleImage"	"1"
+		"ControlName"		"CTFImagePanel"
+		"fieldName"			"classImage8"
+		"xpos"				"0"
+		"ypos"				"0"
+		"zpos"				"3"
+		"wide"				"45"
+		"tall"				"90"
+		"visible"			"0"
+		"enabled"			"1"
+		"image"				""
+		"scaleImage"		"1"
 	}
 	"classImage9"
 	{
-		"ControlName"	"CTFImagePanel"
-		"fieldName"		"classImage9"
-		"xpos"			"0"
-		"ypos"			"0"
-		"zpos"			"3"
-		"wide"			"45"
-		"tall"			"90"
-		"visible"		"0"
-		"enabled"		"1"
-		"image"			""
-		"scaleImage"	"1"
+		"ControlName"		"CTFImagePanel"
+		"fieldName"			"classImage9"
+		"xpos"				"0"
+		"ypos"				"0"
+		"zpos"				"3"
+		"wide"				"45"
+		"tall"				"90"
+		"visible"			"0"
+		"enabled"			"1"
+		"image"				""
+		"scaleImage"		"1"
 	}
 	"classImage10"
 	{
-		"ControlName"	"CTFImagePanel"
-		"fieldName"		"classImage10"
-		"xpos"			"0"
-		"ypos"			"0"
-		"zpos"			"3"
-		"wide"			"45"
-		"tall"			"90"
-		"visible"		"0"
-		"enabled"		"1"
-		"image"			""
-		"scaleImage"	"1"
+		"ControlName"		"CTFImagePanel"
+		"fieldName"			"classImage10"
+		"xpos"				"0"
+		"ypos"				"0"
+		"zpos"				"3"
+		"wide"				"45"
+		"tall"				"90"
+		"visible"			"0"
+		"enabled"			"1"
+		"image"				""
+		"scaleImage"		"1"
 	}
 	"classImage11"
 	{
-		"ControlName"	"CTFImagePanel"
-		"fieldName"		"classImage11"
-		"xpos"			"0"
-		"ypos"			"0"
-		"zpos"			"3"
-		"wide"			"45"
-		"tall"			"90"
-		"visible"		"0"
-		"enabled"		"1"
-		"image"			""
-		"scaleImage"	"1"
+		"ControlName"		"CTFImagePanel"
+		"fieldName"			"classImage11"
+		"xpos"				"0"
+		"ypos"				"0"
+		"zpos"				"3"
+		"wide"				"45"
+		"tall"				"90"
+		"visible"			"0"
+		"enabled"			"1"
+		"image"				""
+		"scaleImage"		"1"
 	}
 }
\ No newline at end of file
diff --git a/resource/ui/hudarenaplayercount.res b/resource/ui/hudarenaplayercount.res
index 96cd136..610ab5a 100644
--- a/resource/ui/hudarenaplayercount.res
+++ b/resource/ui/hudarenaplayercount.res
@@ -13,72 +13,69 @@
 
 		"background"
 		{
-			"ControlName"	"EditablePanel"
-			"fieldName"		"background"
-			"xpos"			"0"
-			"ypos"			"0"
-			"zpos"			"0"
-			"wide"			"46"
-			"tall"			"23"
-			"visible"		"1"
-			"enabled"		"1"
+			"ControlName"		"EditablePanel"
+			"fieldName"			"background"
+			"xpos"				"0"
+			"ypos"				"0"
+			"zpos"				"0"
+			"wide"				"46"
+			"tall"				"23"
+			"visible"			"1"
+			"enabled"			"1"
 			"bgcolor_override"	"104 124 155 255"
 		}
 
 		"count"
 		{
-			"ControlName"	"CExLabel"
-			"fieldName"		"count"
-			"xpos"			"13"
-			"ypos"			"0"
-			"zpos"			"2"
-			"wide"			"30"
-			"tall"			"23"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"font"			"Cerbetica28"
-			"labelText"		"%blue_alive%"
-			"textAlignment"	"east"
-			"fgcolor"		"TanLight"
+			"ControlName"		"CExLabel"
+			"fieldName"			"count"
+			"xpos"				"13"
+			"ypos"				"0"
+			"zpos"				"2"
+			"wide"				"30"
+			"tall"				"23"
+			"autoResize"		"0"
+			"pinCorner"			"0"
+			"visible"			"1"
+			"enabled"			"1"
+			"font"				"Cerbetica28"
+			"labelText"			"%blue_alive%"
+			"textAlignment"		"east"
+			"fgcolor"			"TanLight"
 		}
 		"countshadow"
 		{
-			"ControlName"	"CExLabel"
-			"fieldName"		"countshadow"
-			"xpos"			"-2"
-			"ypos"			"-2"
-			"zpos"			"1"
-			"wide"			"30"
-			"tall"			"23"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"font"			"Cerbetica28"
-			"labelText"		"%blue_alive%"
-			"textAlignment"	"east"
-			"fgcolor"		"TransparentBlack"
-
-			"pin_to_sibling"		"count"
-			"pin_corner_to_sibling"	"PIN_TOPLEFT"
-			"pin_to_sibling_corner"	"PIN_TOPLEFT"
+			"ControlName"		"CExLabel"
+			"fieldName"			"countshadow"
+			"xpos"				"-2"
+			"ypos"				"-2"
+			"zpos"				"1"
+			"wide"				"30"
+			"tall"				"23"
+			"autoResize"		"0"
+			"pinCorner"			"0"
+			"visible"			"1"
+			"enabled"			"1"
+			"font"				"Cerbetica28"
+			"labelText"			"%blue_alive%"
+			"textAlignment"		"east"
+			"fgcolor"			"TransparentBlack"
+			"pin_to_sibling"	"count"
 		}
 
 		"playerimage"
 		{
-			"ControlName"	"ImagePanel"
-			"fieldName"		"playerimage"
-			"xpos"			"3"
-			"ypos"			"3"
-			"zpos"			"3"
-			"wide"			"10"
-			"tall"			"18"
-			"visible"		"1"
-			"enabled"		"1"
-			"image"			"capture_icon_white"
-			"scaleImage"	"1"
+			"ControlName"		"ImagePanel"
+			"fieldName"			"playerimage"
+			"xpos"				"3"
+			"ypos"				"3"
+			"zpos"				"3"
+			"wide"				"10"
+			"tall"				"18"
+			"visible"			"1"
+			"enabled"			"1"
+			"image"				"capture_icon_white"
+			"scaleImage"		"1"
 		}
 	}
 
@@ -95,72 +92,69 @@
 
 		"background"
 		{
-			"ControlName"	"EditablePanel"
-			"fieldName"		"background"
-			"xpos"			"0"
-			"ypos"			"0"
-			"zpos"			"0"
-			"wide"			"46"
-			"tall"			"23"
-			"visible"		"1"
-			"enabled"		"1"
+			"ControlName"		"EditablePanel"
+			"fieldName"			"background"
+			"xpos"				"0"
+			"ypos"				"0"
+			"zpos"				"0"
+			"wide"				"46"
+			"tall"				"23"
+			"visible"			"1"
+			"enabled"			"1"
 			"bgcolor_override"	"180 92 77 255"
 		}
 
 		"count"
 		{
-			"ControlName"	"CExLabel"
-			"fieldName"		"count"
-			"xpos"			"3"
-			"ypos"			"0"
-			"zpos"			"2"
-			"wide"			"30"
-			"tall"			"23"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"font"			"Cerbetica28"
-			"labelText"		"%red_alive%"
-			"textAlignment"	"west"
-			"fgcolor"		"TanLight"
+			"ControlName"		"CExLabel"
+			"fieldName"			"count"
+			"xpos"				"3"
+			"ypos"				"0"
+			"zpos"				"2"
+			"wide"				"30"
+			"tall"				"23"
+			"autoResize"		"0"
+			"pinCorner"			"0"
+			"visible"			"1"
+			"enabled"			"1"
+			"font"				"Cerbetica28"
+			"labelText"			"%red_alive%"
+			"textAlignment"		"west"
+			"fgcolor"			"TanLight"
 		}
 		"countshadow"
 		{
-			"ControlName"	"CExLabel"
-			"fieldName"		"countshadow"
-			"xpos"			"-2"
-			"ypos"			"-2"
-			"zpos"			"1"
-			"wide"			"30"
-			"tall"			"23"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"font"			"Cerbetica28"
-			"labelText"		"%red_alive%"
-			"textAlignment"	"west"
-			"fgcolor"		"TransparentBlack"
-
-			"pin_to_sibling"		"count"
-			"pin_corner_to_sibling"	"PIN_TOPLEFT"
-			"pin_to_sibling_corner"	"PIN_TOPLEFT"
+			"ControlName"		"CExLabel"
+			"fieldName"			"countshadow"
+			"xpos"				"-2"
+			"ypos"				"-2"
+			"zpos"				"1"
+			"wide"				"30"
+			"tall"				"23"
+			"autoResize"		"0"
+			"pinCorner"			"0"
+			"visible"			"1"
+			"enabled"			"1"
+			"font"				"Cerbetica28"
+			"labelText"			"%red_alive%"
+			"textAlignment"		"west"
+			"fgcolor"			"TransparentBlack"
+			"pin_to_sibling"	"count"
 		}
 
 		"playerimage"
 		{
-			"ControlName"	"ImagePanel"
-			"fieldName"		"playerimage"
-			"xpos"			"33"
-			"ypos"			"3"
-			"zpos"			"3"
-			"wide"			"10"
-			"tall"			"18"
-			"visible"		"1"
-			"enabled"		"1"
-			"image"			"capture_icon_white"
-			"scaleImage"	"1"
+			"ControlName"		"ImagePanel"
+			"fieldName"			"playerimage"
+			"xpos"				"33"
+			"ypos"				"3"
+			"zpos"				"3"
+			"wide"				"10"
+			"tall"				"18"
+			"visible"			"1"
+			"enabled"			"1"
+			"image"				"capture_icon_white"
+			"scaleImage"		"1"
 		}
 	}
 }
\ No newline at end of file
diff --git a/resource/ui/hudarenateammenu.res b/resource/ui/hudarenateammenu.res
index 58c369e..004f455 100644
--- a/resource/ui/hudarenateammenu.res
+++ b/resource/ui/hudarenateammenu.res
@@ -12,8 +12,8 @@
 		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
-		"fgcolor"		"255 0 0 255"
 		"tabPosition"	"0"
+		"fgcolor"		"255 0 0 255"
 	}
 
 	"SidePanelBG"
@@ -95,13 +95,13 @@
 		"textAlignment"	"center"
 		"dulltext"		"0"
 		"brighttext"	"0"
-		"paintborder"	"0"
 		"command"		"jointeam spectate"
 		"font"			"Cerbetica20"
-		"defaultFgColor_override" 	"255 255 255 128"
+		
+		"defaultFgColor_override"	"255 255 255 128"
 		"armedFgColor_override"		"235 226 202 255"
-		"depressedFgColor_override" "255 255 255 128"
-		"selectedFgColor_override" 	"235 226 202 255"
+		"depressedFgColor_override"	"255 255 255 128"
+		"selectedFgColor_override"	"235 226 202 255"
 	}
 
 	"teambutton3"
@@ -122,13 +122,20 @@
 		"textAlignment"	"center"
 		"dulltext"		"0"
 		"brighttext"	"0"
-		"paintborder"	"0"
 		"command"		"jointeam spectatearena"
 		"font"			"Cerbetica20"
-		"defaultFgColor_override" 	"255 255 255 128"
+
+		"defaultFgColor_override"	"255 255 255 128"
 		"armedFgColor_override"		"235 226 202 255"
-		"depressedFgColor_override" "255 255 255 128"
-		"selectedFgColor_override" 	"235 226 202 255"
+		"depressedFgColor_override"	"255 255 255 128"
+		"selectedFgColor_override"	"235 226 202 255"
+	}
+
+	"CancelButton"
+	{
+		"ControlName"	"CExButton"
+		"fieldName"		"CancelButton"
+		"wide"			"0"
 	}
 
 	"SpectateBG"
@@ -161,10 +168,38 @@
 		"fillcolor"		"255 255 255 200"
 	}
 
-	"CancelButton"
+	"TeamMenuAuto"
 	{
-		"ControlName"	"CExButton"
-		"fieldName"		"CancelButton"
-		"wide"			"0"
+		"ControlName"	"CExLabel"
+		"fieldName"		"TeamMenuAuto"
+		"xpos"			"9999"
+	}
+
+	"TeamMenuSpectate"
+	{
+		"ControlName"	"CExLabel"
+		"fieldName"		"TeamMenuSpectate"
+		"xpos"			"9999"
+	}
+
+	"ShadedBar"
+	{
+		"ControlName"	"ImagePanel"
+		"fieldName"		"ShadedBar"
+		"xpos"			"9999"
+	}
+
+	"autodoor"
+	{
+		"ControlName"	"CModelPanel"
+		"fieldName"		"autodoor"
+		"xpos"			"9999"
+	}
+
+	"spectate"
+	{
+		"ControlName"	"CModelPanel"
+		"fieldName"		"spectate"
+		"xpos"			"9999"
 	}
 }
\ No newline at end of file
diff --git a/resource/ui/hudarenawinpanel.res b/resource/ui/hudarenawinpanel.res
index cd4d2a3..55b2d97 100644
--- a/resource/ui/hudarenawinpanel.res
+++ b/resource/ui/hudarenawinpanel.res
@@ -12,7 +12,7 @@
 
 		"BlueScoreBG"
 		{
-			"ControlName"	"ImagePanel"
+			"ControlName"	"EditablePanel"
 			"fieldName"		"BlueScoreBG"
 			"xpos"			"25"
 			"ypos"			"35"
@@ -21,12 +21,11 @@
 			"tall"			"25"
 			"visible"		"1"
 			"enabled"		"1"
-			"fillcolor"		"70 130 180 255"
-			"scaleImage"	"1"
+			"bgcolor_override"	"70 130 180 255"
 		}
 		"RedScoreBG"
 		{
-			"ControlName"	"ImagePanel"
+			"ControlName"	"EditablePanel"
 			"fieldName"		"RedScoreBG"
 			"xpos"			"225"
 			"ypos"			"35"
@@ -35,9 +34,9 @@
 			"tall"			"25"
 			"visible"		"1"
 			"enabled"		"1"
-			"PaintBackgroundType"	"2"
-			"fillcolor"		"205 50 50 255"
+			"bgcolor_override"	"205 50 50 255"
 		}
+		
 		"BlueTeamLabel"
 		{
 			"ControlName"	"CExLabel"
@@ -54,6 +53,7 @@
 			"visible"		"1"
 			"enabled"		"1"
 		}
+		
 		"BlueTeamScore"
 		{
 			"ControlName"	"CExLabel"
@@ -71,10 +71,10 @@
 			"visible"		"1"
 			"enabled"		"1"
 		}
-		"BlueTeamScoreDropshadow"
+		"BlueTeamScoreShadow"
 		{
 			"ControlName"	"CExLabel"
-			"fieldName"		"BlueTeamScoreDropshadow"
+			"fieldName"		"BlueTeamScoreShadow"
 			"font"			"Cerbetica40"
 			"fgcolor"		"TransparentBlack"
 			"labelText"		"%blueteamscore%"
@@ -88,11 +88,9 @@
 			"pinCorner"		"0"
 			"visible"		"1"
 			"enabled"		"1"
-
-			"pin_to_sibling"		"BlueTeamScore"
-			"pin_corner_to_sibling"	"PIN_TOPLEFT"
-			"pin_to_sibling_corner"	"PIN_TOPLEFT"
+			"pin_to_sibling"	"BlueTeamScore"
 		}
+		
 		"RedTeamLabel"
 		{
 			"ControlName"	"CExLabel"
@@ -126,10 +124,10 @@
 			"visible"		"1"
 			"enabled"		"1"
 		}
-		"RedTeamScoreDropshadow"
+		"RedTeamScoreShadow"
 		{
 			"ControlName"	"CExLabel"
-			"fieldName"		"RedTeamScoreDropshadow"
+			"fieldName"		"RedTeamScoreShadow"
 			"font"			"Cerbetica40"
 			"fgcolor"		"TransparentBlack"
 			"labelText"		"%redteamscore%"
@@ -143,10 +141,7 @@
 			"pinCorner"		"0"
 			"visible"		"1"
 			"enabled"		"1"
-
-			"pin_to_sibling"		"RedTeamScore"
-			"pin_corner_to_sibling"	"PIN_TOPLEFT"
-			"pin_to_sibling_corner"	"PIN_TOPLEFT"
+			"pin_to_sibling"	"RedTeamScore"
 		}
 
 		"ArenaStreaksBG"
@@ -154,42 +149,12 @@
 			"ControlName"	"ScalableImagePanel"
 			"fieldName"		"ArenaStreaksBG"
 			"xpos"			"9999"
-			"ypos"			"9999"
-			"zpos"			"2"
-			"wide"			"176"
-			"tall"			"20"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"image"			"../HUD/tournament_panel_black"
-			"scaleImage"	"1"
-
-			"src_corner_height"	"23"
-			"src_corner_width"	"23"
-			"draw_corner_width"	"6"
-			"draw_corner_height" "6"
 		}
-
 		"ArenaStreakLabel"
 		{
 			"ControlName"	"CExLabel"
 			"fieldName"		"ArenaStreakLabel"
-			"font"			"Cerbetica14"
-			"fgcolor"		"TanLight"
 			"xpos"			"9999"
-			"ypos"			"9999"
-			"zpos"			"3"
-			"wide"			"176"
-			"tall"			"20"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"labelText"		"%arenastreaktext%"
-			"textAlignment"	"Center"
-			"dulltext"		"0"
-			"brighttext"	"0"
 		}
 	}
 
@@ -198,17 +163,10 @@
 		"ControlName"	"ImagePanel"
 		"fieldName"		"WinPanelBG"
 		"xpos"			"9999"
-		"ypos"			"9999"
-		"zpos"			"0"
-		"wide"			"700"
-		"tall"			"174"
-		"visible"		"1"
-		"enabled"		"1"
-		"scaleImage"	"1"
 	}
 	"WinPanelBG2"
 	{
-		"ControlName"	"ImagePanel"
+		"ControlName"	"EditablePanel"
 		"fieldName"		"WinPanelBG2"
 		"xpos"			"25"
 		"ypos"			"60"
@@ -217,12 +175,7 @@
 		"tall"			"118"
 		"visible"		"1"
 		"enabled"		"1"
-		"scaleImage"	"1"
-		"fillcolor"		"0 0 0 250"
-		"src_corner_height" "3"
-		"src_corner_width" "3"
-		"draw_corner_width" "0"
-		"draw_corner_height" "0"
+		"bgcolor_override"	"0 0 0 250"
 	}
 
 	"WinningTeamLabel"
@@ -304,6 +257,7 @@
 		"dulltext"		"0"
 		"brighttext"	"0"
 	}
+	
 	"WinReasonLabel"
 	{
 		"ControlName"	"CExLabel"
@@ -342,6 +296,7 @@
 		"dulltext"		"0"
 		"brighttext"	"0"
 	}
+	
 	"ShadedBar"
 	{
 		"ControlName"	"ImagePanel"
@@ -359,6 +314,7 @@
 		"fillcolor"		"0 0 0 150"
 		"PaintBackgroundType"	"0"
 	}
+	
 	"TopPlayersLabel"
 	{
 		"ControlName"	"CExLabel"
@@ -378,6 +334,7 @@
 		"dulltext"		"0"
 		"brighttext"	"0"
 	}
+	
 	"DamageThisRoundLabel"
 	{
 		"ControlName"	"CExLabel"
@@ -397,6 +354,7 @@
 		"dulltext"		"0"
 		"brighttext"	"0"
 	}
+	
 	"HealingThisRoundLabel"
 	{
 		"ControlName"	"CExLabel"
@@ -416,6 +374,7 @@
 		"dulltext"		"0"
 		"brighttext"	"0"
 	}
+	
 	"LifetimeThisRoundLabel"
 	{
 		"ControlName"	"CExLabel"
@@ -435,6 +394,7 @@
 		"dulltext"		"0"
 		"brighttext"	"0"
 	}
+	
 	"KillingBlowsThisRoundLabel"
 	{
 		"ControlName"	"CExLabel"
@@ -454,6 +414,7 @@
 		"dulltext"		"0"
 		"brighttext"	"0"
 	}
+	
 	"HorizontalLine"
 	{
 		"ControlName"	"ImagePanel"
diff --git a/resource/ui/hudcurrencyaccount.res b/resource/ui/hudcurrencyaccount.res
index 5437b3c..5d89d54 100644
--- a/resource/ui/hudcurrencyaccount.res
+++ b/resource/ui/hudcurrencyaccount.res
@@ -19,17 +19,18 @@
 
 	"CurrencyBG"
 	{
-		"ControlName"	"EditablePanel"
+		"ControlName"	"ImagePanel"
 		"fieldName"		"CurrencyBG"
 		"xpos"			"0"
 		"ypos"			"0"
 		"zpos"			"0"
 		"wide"			"100"
 		"tall"			"20"
+		"autoResize"	"0"
+		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
-		"bgcolor_override"	"TransparentBlack"
-		"PaintBackgroundType"	"2"
+		"fillcolor"		"TransparentBlack"
 	}
 
 	"CurrencyLabel"
diff --git a/resource/ui/huddamageaccount.res b/resource/ui/huddamageaccount.res
index 5722af4..2ddeef0 100644
--- a/resource/ui/huddamageaccount.res
+++ b/resource/ui/huddamageaccount.res
@@ -7,7 +7,7 @@
 		"text_y"				"0"
 		"delta_item_end_y"		"0"
 		"PositiveColor"			"Heal Numbers"
-		"NegativeColor"			"Damage Numbers"
+		"NegativeColor"			""	// Unused
 		"delta_lifetime"		"2"
 		"delta_item_font"		"Cerbetica24Outline"
 		"delta_item_font_big"	"Cerbetica24Outline"
@@ -15,43 +15,40 @@
 
 	"DamageAccountValue"
 	{
-		"ControlName"		"CExLabel"
-		"fieldName"			"DamageAccountValue"
-		"xpos"				"c108"
-		"ypos"				"288"
-		"xpos_minmode"		"c58"
-		"ypos_minmode"		"263"
-		"zpos"				"2"
-		"wide"				"100"
-		"tall"				"26"
-		"visible"			"1"
-		"enabled"			"1"
-		"labelText"			"%metal%"
-		"textAlignment"		"center"
-		"font"				"Cerbetica28"
-		"font_minmode"		"Cerbetica20"
-		"fgcolor"			"Last DamageHeal Info"
+		"ControlName"			"CExLabel"
+		"fieldName"				"DamageAccountValue"
+		"xpos"					"c108"
+		"ypos"					"288"
+		"xpos_minmode"			"c58"
+		"ypos_minmode"			"263"
+		"zpos"					"2"
+		"wide"					"100"
+		"tall"					"26"
+		"visible"				"1"
+		"enabled"				"1"
+		"labelText"				"%metal%"
+		"textAlignment"			"center"
+		"font"					"Cerbetica28"
+		"font_minmode"			"Cerbetica20"
+		"fgcolor"				"Last DamageHeal Info"
 	}
 
 	"DamageAccountValueShadow"
 	{
-		"ControlName"		"CExLabel"
-		"fieldName"			"DamageAccountValueShadow"
-		"xpos"				"-2"
-		"ypos"				"-2"
-		"zpos"				"1"
-		"wide"				"100"
-		"tall"				"26"
-		"visible"			"1"
-		"enabled"			"1"
-		"labelText"			"%metal%"
-		"textAlignment"		"center"
-		"font"				"Cerbetica28"
-		"font_minmode"		"Cerbetica20"
-		"fgcolor"			"TransparentBlack"
-
+		"ControlName"			"CExLabel"
+		"fieldName"				"DamageAccountValueShadow"
+		"xpos"					"-2"
+		"ypos"					"-2"
+		"zpos"					"1"
+		"wide"					"100"
+		"tall"					"26"
+		"visible"				"1"
+		"enabled"				"1"
+		"labelText"				"%metal%"
+		"textAlignment"			"center"
+		"font"					"Cerbetica28"
+		"font_minmode"			"Cerbetica20"
+		"fgcolor"				"TransparentBlack"
 		"pin_to_sibling"		"DamageAccountValue"
-		"pin_corner_to_sibling"	"PIN_TOPLEFT"
-		"pin_to_sibling_corner"	"PIN_TOPLEFT"
 	}
 }
diff --git a/resource/ui/huddemomancharge.res b/resource/ui/huddemomancharge.res
index 85d6a4c..dc31608 100644
--- a/resource/ui/huddemomancharge.res
+++ b/resource/ui/huddemomancharge.res
@@ -37,11 +37,8 @@
 		"enabled"			"1"
 		"visible_minmode"	"0"
 		"enabled_minmode"	"0"
-		"tabPosition"		"0"
 		"labelText"			"#TF_Charge"
 		"textAlignment"		"west"
-		"dulltext"			"0"
-		"brighttext"		"0"
 		"font"				"HudFontSmallest"
 		"fgcolor_override"	"White"
 	}
diff --git a/resource/ui/huddemomanpipes.res b/resource/ui/huddemomanpipes.res
index 868a74b..09484f1 100644
--- a/resource/ui/huddemomanpipes.res
+++ b/resource/ui/huddemomanpipes.res
@@ -14,7 +14,6 @@
 		"pinCorner"			"2"
 		"visible"			"1"
 		"enabled"			"1"
-		"tabPosition"		"0"
 		"labelText"			"#TF_Charge"
 		"textAlignment"		"west"
 		"dulltext"			"0"
@@ -57,53 +56,57 @@
 
 		"NumPipesLabel"
 		{
-			"ControlName"	"CExLabel"
-			"fieldName"		"NumPipesLabel"
-			"xpos"			"34"
-			"ypos"			"8"
-			"ypos_minmode"	"10"
-			"zpos"			"2"
-			"wide"			"35"
-			"tall"			"24"
-			"tall_minmode"	"20"
-			"autoResize"	"1"
-			"pinCorner"		"2"
-			"visible"		"1"
-			"enabled"		"1"
-			"tabPosition"	"0"
-			"labelText"		"%activepipes%"
-			"textAlignment"	"center"
-			"dulltext"		"0"
-			"brighttext"	"0"
-			"font"			"Cerbetica28"
-			"font_minmode"	"Cerbetica20"
+			"ControlName"		"CExLabel"
+			"fieldName"			"NumPipesLabel"
+			"xpos"				"34"
+			"ypos"				"8"
+			"ypos_minmode"		"10"
+			"zpos"				"2"
+			"wide"				"35"
+			"tall"				"24"
+			"tall_minmode"		"20"
+			"autoResize"		"1"
+			"pinCorner"			"2"
+			"visible"			"1"
+			"enabled"			"1"
+			"tabPosition"		"0"
+			"labelText"			"%activepipes%"
+			"textAlignment"		"center"
+			"dulltext"			"0"
+			"brighttext"		"0"
+			"font"				"Cerbetica28"
+			"font_minmode"		"Cerbetica20"
 		}
 		"NumPipesLabelDropshadow"
 		{
-			"ControlName"	"CExLabel"
-			"fieldName"		"NumPipesLabelDropshadow"
-			"xpos"			"-2"
-			"ypos"			"-2"
-			"zpos"			"2"
-			"wide"			"35"
-			"tall"			"24"
-			"tall_minmode"	"20"
-			"autoResize"	"1"
-			"pinCorner"		"2"
-			"visible"		"1"
-			"enabled"		"1"
-			"tabPosition"	"0"
-			"labelText"		"%activepipes%"
-			"textAlignment"	"center"
-			"dulltext"		"0"
-			"brighttext"	"0"
-			"font"			"Cerbetica28"
-			"font_minmode"	"Cerbetica20"
-			"fgcolor"		"TransparentBlack"
+			"ControlName"		"CExLabel"
+			"fieldName"			"NumPipesLabelDropshadow"
+			"xpos"				"-2"
+			"ypos"				"-2"
+			"zpos"				"2"
+			"wide"				"35"
+			"tall"				"24"
+			"tall_minmode"		"20"
+			"autoResize"		"1"
+			"pinCorner"			"2"
+			"visible"			"1"
+			"enabled"			"1"
+			"tabPosition"		"0"
+			"labelText"			"%activepipes%"
+			"textAlignment"		"center"
+			"dulltext"			"0"
+			"brighttext"		"0"
+			"font"				"Cerbetica28"
+			"font_minmode"		"Cerbetica20"
+			"fgcolor"			"TransparentBlack"
+			"pin_to_sibling"	"NumPipesLabel"
+		}
 
-			"pin_to_sibling"		"NumPipesLabel"
-			"pin_corner_to_sibling" "PIN_TOPLEFT"
-			"pin_to_sibling_corner" "PIN_TOPLEFT"
+		"PipeIcon"
+		{
+			"ControlName"		"CTFImagePanel"
+			"fieldName"			"PipeIcon"
+			"xpos"				"9999"
 		}
 	}
 
@@ -112,62 +115,5 @@
 		"ControlName"		"EditablePanel"
 		"fieldName"			"NoPipesPresentPanel"
 		"xpos"				"9999"
-		"ypos"				"9999"
-		"zpos"				"1"
-		"wide"				"100"
-		"tall"				"50"
-		"visible"			"1"
-
-		"NumPipesLabel"
-		{
-			"ControlName"	"CExLabel"
-			"fieldName"		"NumPipesLabel"
-			"xpos"			"50"
-			"ypos"			"18"
-			"xpos_minmode"	"42"
-			"ypos_minmode"	"12"
-			"zpos"			"2"
-			"wide"			"35"
-			"tall"			"24"
-			"tall_minmode"	"20"
-			"autoResize"	"1"
-			"pinCorner"		"2"
-			"visible"		"1"
-			"enabled"		"1"
-			"tabPosition"	"0"
-			"labelText"		"%activepipes%"
-			"textAlignment"	"west"
-			"dulltext"		"1"
-			"brighttext"	"0"
-			"font"			"HudFontMedium"
-			"font_minmode"	"HudFontSmall"
-		}
-		"NumPipesLabelDropshadow"
-		{
-			"ControlName"	"CExLabel"
-			"fieldName"		"NumPipesLabelDropshadow"
-			"xpos"			"-2"
-			"ypos"			"-2"
-			"zpos"			"1"
-			"wide"			"35"
-			"tall"			"24"
-			"tall_minmode"	"20"
-			"autoResize"	"1"
-			"pinCorner"		"2"
-			"visible"		"1"
-			"enabled"		"1"
-			"tabPosition"	"0"
-			"labelText"		"%activepipes%"
-			"textAlignment"	"west"
-			"dulltext"		"1"
-			"brighttext"	"0"
-			"font"			"HudFontMedium"
-			"font_minmode"	"HudFontSmall"
-			"fgcolor"		"TransparentBlack"
-
-			"pin_to_sibling"		"NumPipesLabel"
-			"pin_corner_to_sibling" "PIN_TOPLEFT"
-			"pin_to_sibling_corner" "PIN_TOPLEFT"
-		}
 	}
 }
\ No newline at end of file
diff --git a/resource/ui/huditemeffectmeter.res b/resource/ui/huditemeffectmeter.res
index 64c7fe6..499ede4 100644
--- a/resource/ui/huditemeffectmeter.res
+++ b/resource/ui/huditemeffectmeter.res
@@ -29,7 +29,6 @@
 		"visible"			"1"
 		"enabled"			"1"
 		"visible_minmode"	"0"
-		"tabPosition"		"0"
 		"labelText"			"#TF_Ball"
 		"textAlignment"		"west"
 		"dulltext"			"0"
@@ -53,7 +52,7 @@
 		"pinCorner"			"0"
 		"visible"			"1"
 		"enabled"			"1"
-		"textAlignment"		"Center"
+		"textAlignment"		"center"
 		"dulltext"			"0"
 		"brighttext"		"0"
 	}
diff --git a/resource/ui/huditemeffectmeter_cleaver.res b/resource/ui/huditemeffectmeter_cleaver.res
index e819cb4..b7a6c65 100644
--- a/resource/ui/huditemeffectmeter_cleaver.res
+++ b/resource/ui/huditemeffectmeter_cleaver.res
@@ -4,7 +4,7 @@
 {
 	"HudItemEffectMeter"
 	{
-		"ypos"					"c93"
-		"ypos_minmode"			"c54"
+		"ypos"				"c93"
+		"ypos_minmode"		"c54"
 	}
 }
\ No newline at end of file
diff --git a/resource/ui/huditemeffectmeter_demoman.res b/resource/ui/huditemeffectmeter_demoman.res
index 6560156..8c44d4e 100644
--- a/resource/ui/huditemeffectmeter_demoman.res
+++ b/resource/ui/huditemeffectmeter_demoman.res
@@ -98,9 +98,6 @@
 		"font"					"Cerbetica28"
 		"font_minmode"			"Cerbetica16"
 		"fgcolor"				"TransparentBlack"
-
 		"pin_to_sibling"		"ItemEffectMeterCount"
-		"pin_corner_to_sibling"	"PIN_TOPLEFT"
-		"pin_to_sibling_corner"	"PIN_TOPLEFT"
 	}
 }
\ No newline at end of file
diff --git a/resource/ui/huditemeffectmeter_engineer.res b/resource/ui/huditemeffectmeter_engineer.res
index 0eb8684..d5f53b3 100644
--- a/resource/ui/huditemeffectmeter_engineer.res
+++ b/resource/ui/huditemeffectmeter_engineer.res
@@ -1,6 +1 @@
-#base "huditemeffectmeter_demoman.res"
-
-"Resource/UI/HudItemEffectMeter_Engineer.res"
-{
-
-}
\ No newline at end of file
+#base "huditemeffectmeter_demoman.res"
\ No newline at end of file
diff --git a/resource/ui/huditemeffectmeter_heavy.res b/resource/ui/huditemeffectmeter_heavy.res
index f45179b..792ec39 100644
--- a/resource/ui/huditemeffectmeter_heavy.res
+++ b/resource/ui/huditemeffectmeter_heavy.res
@@ -1,10 +1 @@
-#base "huditemeffectmeter.res"
-
-"Resource/UI/HudItemEffectMeter_Scout.res"
-{
-	"HudItemEffectMeter"
-	{
-		"ypos"					"c93"
-		"ypos_minmode"			"c54"
-	}
-}
\ No newline at end of file
+#base "huditemeffectmeter_cleaver.res"
\ No newline at end of file
diff --git a/resource/ui/huditemeffectmeter_kartcharge.res b/resource/ui/huditemeffectmeter_kartcharge.res
index e05d2b6..ec4ce26 100644
--- a/resource/ui/huditemeffectmeter_kartcharge.res
+++ b/resource/ui/huditemeffectmeter_kartcharge.res
@@ -103,9 +103,6 @@
 		"font"					"Cerbetica28"
 		"font_minmode"			"Cerbetica20"
 		"fgcolor"				"TransparentBlack"
-
 		"pin_to_sibling"		"ItemEffectMeterCount"
-		"pin_corner_to_sibling" "PIN_TOPLEFT"
-		"pin_to_sibling_corner" "PIN_TOPLEFT"
 	}
 }
\ No newline at end of file
diff --git a/resource/ui/huditemeffectmeter_killstreak.res b/resource/ui/huditemeffectmeter_killstreak.res
index 2e83239..e39e1f6 100644
--- a/resource/ui/huditemeffectmeter_killstreak.res
+++ b/resource/ui/huditemeffectmeter_killstreak.res
@@ -7,7 +7,6 @@
 		"xpos"				"c115"
 		"xpos_minmode"		"c65"
 	}
-
 	"ItemEffectMeterLabel"
 	{
 		"labelText"			"#TF_KillStreak"
diff --git a/resource/ui/huditemeffectmeter_organs.res b/resource/ui/huditemeffectmeter_organs.res
index 6429453..d5f53b3 100644
--- a/resource/ui/huditemeffectmeter_organs.res
+++ b/resource/ui/huditemeffectmeter_organs.res
@@ -1,6 +1 @@
-#base "huditemeffectmeter_demoman.res"
-
-"Resource/UI/HudItemEffectMeter_Scout.res"
-{
-
-}
\ No newline at end of file
+#base "huditemeffectmeter_demoman.res"
\ No newline at end of file
diff --git a/resource/ui/huditemeffectmeter_particlecannon.res b/resource/ui/huditemeffectmeter_particlecannon.res
index d832ac3..792ec39 100644
--- a/resource/ui/huditemeffectmeter_particlecannon.res
+++ b/resource/ui/huditemeffectmeter_particlecannon.res
@@ -1,10 +1 @@
-#base "huditemeffectmeter.res"
-
-"Resource/UI/HudItemEffectMeter_ParticleCannon.res"
-{
-	"HudItemEffectMeter"
-	{
-		"ypos"					"c93"
-		"ypos_minmode"			"c54"
-	}
-}
\ No newline at end of file
+#base "huditemeffectmeter_cleaver.res"
\ No newline at end of file
diff --git a/resource/ui/huditemeffectmeter_pomson.res b/resource/ui/huditemeffectmeter_pomson.res
index f2515e8..792ec39 100644
--- a/resource/ui/huditemeffectmeter_pomson.res
+++ b/resource/ui/huditemeffectmeter_pomson.res
@@ -1,10 +1 @@
-#base "huditemeffectmeter.res"
-
-"Resource/UI/HudItemEffectMeter_Pomson.res"
-{
-	"HudItemEffectMeter"
-	{
-		"ypos"					"c93"
-		"ypos_minmode"			"c54"
-	}
-}
\ No newline at end of file
+#base "huditemeffectmeter_cleaver.res"
\ No newline at end of file
diff --git a/resource/ui/huditemeffectmeter_powerupbottle.res b/resource/ui/huditemeffectmeter_powerupbottle.res
index 6fc06f4..5ba9542 100644
--- a/resource/ui/huditemeffectmeter_powerupbottle.res
+++ b/resource/ui/huditemeffectmeter_powerupbottle.res
@@ -29,7 +29,7 @@
 		"bgcolor_override"	"TransparentBlack"
 		"PaintBackgroundType"	"2"
 	}
-
+	
 	"ItemEffectIcon"
 	{
 		"ControlName"		"CTFImagePanel"
@@ -50,21 +50,6 @@
 		"ControlName"		"CExLabel"
 		"fieldName"			"ItemEffectMeterLabel"
 		"xpos"				"9999"
-		"ypos"				"9999"
-		"zpos"				"2"
-		"wide"				"80"
-		"tall"				"40"
-		"autoResize"		"1"
-		"pinCorner"			"2"
-		"visible"			"1"
-		"enabled"			"1"
-		"tabPosition"		"0"
-		"labelText"			"#TF_Ball"
-		"textAlignment"		"center"
-		"centerwrap"		"1"
-		"dulltext"			"0"
-		"brighttext"		"0"
-		"font"				"HudFontSmallest"
 	}
 
 	"CanteenLabel"
diff --git a/resource/ui/huditemeffectmeter_pyro.res b/resource/ui/huditemeffectmeter_pyro.res
index 33d3999..792ec39 100644
--- a/resource/ui/huditemeffectmeter_pyro.res
+++ b/resource/ui/huditemeffectmeter_pyro.res
@@ -1,10 +1 @@
-#base "huditemeffectmeter.res"
-
-"Resource/UI/HudItemEffectMeter_Pyro.res"
-{
-	"HudItemEffectMeter"
-	{
-		"ypos"					"c93"
-		"ypos_minmode"			"c54"
-	}
-}
\ No newline at end of file
+#base "huditemeffectmeter_cleaver.res"
\ No newline at end of file
diff --git a/resource/ui/huditemeffectmeter_raygun.res b/resource/ui/huditemeffectmeter_raygun.res
index c446de0..dcb5638 100644
--- a/resource/ui/huditemeffectmeter_raygun.res
+++ b/resource/ui/huditemeffectmeter_raygun.res
@@ -1,5 +1 @@
-#base "huditemeffectmeter.res"
-
-"Resource/UI/HudItemEffectMeter_Raygun.res"
-{
-}
\ No newline at end of file
+#base "huditemeffectmeter.res"
\ No newline at end of file
diff --git a/resource/ui/huditemeffectmeter_sapper.res b/resource/ui/huditemeffectmeter_sapper.res
index 9e3aeb8..9d54ba7 100644
--- a/resource/ui/huditemeffectmeter_sapper.res
+++ b/resource/ui/huditemeffectmeter_sapper.res
@@ -1,10 +1 @@
-#base "huditemeffectmeter.res"
-
-"Resource/UI/HudItemEffectMeter_Sapper.res"
-{
-	"HudItemEffectMeter"
-	{
-		"ypos"					"c83"
-		"ypos_minmode"			"c60"
-	}
-}
\ No newline at end of file
+#base "HudItemEffectMeter_SodaPopper.res"
\ No newline at end of file
diff --git a/resource/ui/huditemeffectmeter_scout.res b/resource/ui/huditemeffectmeter_scout.res
index f45179b..792ec39 100644
--- a/resource/ui/huditemeffectmeter_scout.res
+++ b/resource/ui/huditemeffectmeter_scout.res
@@ -1,10 +1 @@
-#base "huditemeffectmeter.res"
-
-"Resource/UI/HudItemEffectMeter_Scout.res"
-{
-	"HudItemEffectMeter"
-	{
-		"ypos"					"c93"
-		"ypos_minmode"			"c54"
-	}
-}
\ No newline at end of file
+#base "huditemeffectmeter_cleaver.res"
\ No newline at end of file
diff --git a/resource/ui/huditemeffectmeter_sniper.res b/resource/ui/huditemeffectmeter_sniper.res
index 8e04da3..d5f53b3 100644
--- a/resource/ui/huditemeffectmeter_sniper.res
+++ b/resource/ui/huditemeffectmeter_sniper.res
@@ -1,6 +1 @@
-#base "huditemeffectmeter_demoman.res"
-
-"Resource/UI/HudItemEffectMeter_Sniper.res"
-{
-
-}
\ No newline at end of file
+#base "huditemeffectmeter_demoman.res"
\ No newline at end of file
diff --git a/resource/ui/huditemeffectmeter_sniperfocus.res b/resource/ui/huditemeffectmeter_sniperfocus.res
index 4ea7364..792ec39 100644
--- a/resource/ui/huditemeffectmeter_sniperfocus.res
+++ b/resource/ui/huditemeffectmeter_sniperfocus.res
@@ -1,10 +1 @@
-#base "huditemeffectmeter.res"
-
-"Resource/UI/HudItemEffectMeter_SniperFocus.res"
-{
-	"HudItemEffectMeter"
-	{
-		"ypos"					"c93"
-		"ypos_minmode"			"c54"
-	}
-}
\ No newline at end of file
+#base "huditemeffectmeter_cleaver.res"
\ No newline at end of file
diff --git a/resource/ui/huditemeffectmeter_sodapopper.res b/resource/ui/huditemeffectmeter_sodapopper.res
index ce68c9b..f572f91 100644
--- a/resource/ui/huditemeffectmeter_sodapopper.res
+++ b/resource/ui/huditemeffectmeter_sodapopper.res
@@ -4,7 +4,7 @@
 {
 	"HudItemEffectMeter"
 	{
-		"ypos"					"c83"
-		"ypos_minmode"			"c60"
+		"ypos"				"c83"
+		"ypos_minmode"		"c60"
 	}
 }
\ No newline at end of file
diff --git a/resource/ui/huditemeffectmeter_spy.res b/resource/ui/huditemeffectmeter_spy.res
index 46d23df..d5f53b3 100644
--- a/resource/ui/huditemeffectmeter_spy.res
+++ b/resource/ui/huditemeffectmeter_spy.res
@@ -1,6 +1 @@
-#base "huditemeffectmeter_demoman.res"
-
-"Resource/UI/HudItemEffectMeter_Spy.res"
-{
-
-}
\ No newline at end of file
+#base "huditemeffectmeter_demoman.res"
\ No newline at end of file
diff --git a/resource/ui/huditemeffectmeter_spyknife.res b/resource/ui/huditemeffectmeter_spyknife.res
index 3ef775d..792ec39 100644
--- a/resource/ui/huditemeffectmeter_spyknife.res
+++ b/resource/ui/huditemeffectmeter_spyknife.res
@@ -1,10 +1 @@
-#base "huditemeffectmeter.res"
-
-"Resource/UI/HudItemEffectMeter_SpyKnife.res"
-{
-	"HudItemEffectMeter"
-	{
-		"ypos"					"c93"
-		"ypos_minmode"			"c54"
-	}
-}
\ No newline at end of file
+#base "huditemeffectmeter_cleaver.res"
\ No newline at end of file
diff --git a/resource/ui/hudkillstreaknotice.res b/resource/ui/hudkillstreaknotice.res
index cca6602..478af6d 100644
--- a/resource/ui/hudkillstreaknotice.res
+++ b/resource/ui/hudkillstreaknotice.res
@@ -20,7 +20,7 @@
 	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"SplashLabel"
-		"font"			"ScoreboardSmall"
+		"font_override"	"ScoreboardSmall"
 		"labelText"		""
 		"textAlignment" "center"
 		"xpos"			"c-250"
diff --git a/resource/ui/hudmatchstatus.res b/resource/ui/hudmatchstatus.res
index 400c293..45c6a89 100644
--- a/resource/ui/hudmatchstatus.res
+++ b/resource/ui/hudmatchstatus.res
@@ -12,50 +12,7 @@
 	"RoundSignModel"
 	{
 		"ControlName"	"CModelPanel"
-		"fieldName"		"RoundSignModel"
-		"xpos"			"0"
-		"ypos"			"0"
-		"zpos"			"10"
-		"wide"			"f0"
-		"tall"			"f0"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"1"
-		"enabled"		"1"
-		"fov"			"70"
-		"proportionaltoparent"	"1"
-
-		"model"
-		{
-			"modelname"	"models/props_ui/banner.mdl"
-			"skin"		"0"
-			"angles_x"	"30"
-			"angles_y"	"180"
-			"angles_z"	"0"
-			"origin_x"	"150"
-			"origin_y"	"0"
-			"origin_z"	"62"
-			"spotlight"	"1"
-
-			"animation"
-			{
-				"name"			"ref"
-				"sequence"		"ref"
-				"default"		"1"
-			}
-
-			"animation"
-			{
-				"name"			"intro"
-				"sequence"		"intro"
-			}
-
-			"animation"
-			{
-				"name"			"outro"
-				"sequence"		"outro"
-			}
-		}
+		"xpos"			"9999"
 	}
 
 	"CountdownLabel"
@@ -78,7 +35,6 @@
 		"fgcolor"		"TanLight"
 		"proportionaltoparent"	"1"
 	}
-
 	"CountdownLabelShadow"
 	{
 		"ControlName"	"CExLabel"
@@ -196,16 +152,9 @@
 
 	"BGFrame"
 	{
-		"ControlName"		"EditablePanel"
-		"fieldName"			"BGFrame"
-		"xpos"				"cs-0.5"
-		"ypos"				"-5"
-		"zpos"				"0"
-		"wide"				"365"
-		"tall"				"28"
-		"visible"			"0"
-		"proportionaltoaparent"	"1"
-		"border"			"NoBorder"
+		"ControlName"	"EditablePanel"
+		"fieldName"		"BGFrame"
+		"xpos"			"9999"
 	}
 
 	"RankUpLabel"
@@ -278,10 +227,6 @@
 			"delta_item_x"			"35"
 			"delta_item_start_y"	"12"
 			"delta_item_end_y"		"50"
-			"PositiveColor"			"ColorGreen"
-			"NegativeColor"			"ColorRed"
-			"delta_lifetime"		"1.5"
-			"delta_item_font"		"HudFontMediumSmall"
 		}
 
 		"TimePanelValue"
@@ -306,7 +251,6 @@
 				"ypos"			"13"
 				"tall"			"10"
 				"font"			"HudFontSmall"
-				"proportionaltoparent"	"1"
 			}
 		}
 	}
@@ -341,18 +285,19 @@
 			"wide"			"25"
 			"tall"			"50"
 			"zpos"			"1"
-
-			"color_portrait_bg_red"		"Red"
-			"color_portrait_bg_blue"	"Blue"
-			"color_portrait_bg_red_dead"	"79 54 52 255"
-			"color_portrait_bg_blue_dead"	"44 49 51 255"
-			"color_bar_health_high"	"84 191 58 255"
-			"color_bar_health_med"	"191 183 58 255"
-			"percentage_health_med"	"0.6"
-			"color_bar_health_low"	"191 58 58 255"
-			"percentage_health_low"	"0.3"
-			"color_portrait_blend_dead_red"	"White"
-			"color_portrait_blend_dead_blue" "White"
+			"proportionaltoparent"	"1"
+
+			"color_portrait_bg_red"				"Red"
+			"color_portrait_bg_blue"			"Blue"
+			"color_portrait_bg_red_dead"		"79 54 52 255"
+			"color_portrait_bg_blue_dead"		"44 49 51 255"
+			"color_bar_health_high"				"84 191 58 255"
+			"color_bar_health_med"				"191 183 58 255"
+			"percentage_health_med"				"0.6"
+			"color_bar_health_low"				"191 58 58 255"
+			"percentage_health_low"				"0.3"
+			"color_portrait_blend_dead_red"		"White"
+			"color_portrait_blend_dead_blue"	"White"
 
 			"playername"
 			{
@@ -423,7 +368,7 @@
 				"fieldName"		"overhealbar"
 				"font"			"Default"
 				"xpos"			"0"
-				"ypos"			"19"
+				"ypos"			"0"
 				"zpos"			"6"
 				"wide"			"f0"
 				"tall"			"3"
@@ -437,59 +382,25 @@
 				"bgcolor_override"		"Transparent"
 				"fgcolor_override"		"255 255 255 160"
 				"proportionaltoparent"	"1"
+				"pin_to_sibling" 		"healthbar"
 			}
 			"HealthIcon"
 			{
 				"ControlName"	"EditablePanel"
 				"fieldName"		"HealthIcon"
-				"xpos"			"22"
-				"ypos"			"-3"
-				"zpos"			"3"
-				"wide"			"32"
-				"tall"			"32"
-				"visible"		"0"
-				"enabled"		"1"
-				"HealthBonusPosAdj"			"10"
-				"HealthDeathWarning"		"0.49"
-				"TFFont"					"HudFontSmallest"
-				"HealthDeathWarningColor"	"HUDDeathWarning"
-				"TextColor"					"HudOffWhite"
+				"xpos"			"9999"
 			}
 			"ReadyBG"
 			{
 				"ControlName"	"ScalableImagePanel"
 				"fieldName"		"ReadyBG"
-				"xpos"			"30"
-				"ypos"			"6"
-				"zpos"			"-1"
-				"wide"			"16"
-				"tall"			"16"
-				"autoResize"	"0"
-				"pinCorner"		"0"
-				"visible"		"0"
-				"enabled"		"1"
-				"image"			"../HUD/tournament_panel_brown"
-
-				"src_corner_height"	"22"
-				"src_corner_width"	"22"
-				"draw_corner_width"	"3"
-				"draw_corner_height" 	"3"
+				"xpos"			"9999"
 			}
 			"ReadyImage"
 			{
 				"ControlName"	"ImagePanel"
 				"fieldName"		"ReadyImage"
-				"xpos"			"32"
-				"ypos"			"8"
-				"zpos"			"0"
-				"wide"			"12"
-				"tall"			"12"
-				"autoResize"	"0"
-				"pinCorner"		"0"
-				"visible"		"0"
-				"enabled"		"1"
-				"image"			"hud/checkmark"
-				"scaleImage"	"1"
+				"xpos"			"9999"
 			}
 			"respawntime"
 			{
@@ -512,64 +423,25 @@
 			{
 				"ControlName"	"CExLabel"
 				"fieldName"		"chargeamount"
-				"font"			"DefaultSmall"
-				"xpos"			"25"
-				"ypos"			"17"
-				"zpos"			"6"
-				"wide"			"25"
-				"tall"			"15"
-				"autoResize"	"0"
-				"pinCorner"		"0"
-				"visible"		"0"
-				"labelText"		"%chargeamount%"
-				"textAlignment"	"north"
-				"fgcolor"		"ColorGreen"
+				"xpos"			"9999"
 			}
 			"specindex"
 			{
 				"ControlName"	"CExLabel"
 				"fieldName"		"specindex"
-				"font"			"DefaultVerySmall"
-				"xpos"			"4"
-				"ypos"			"2"
-				"zpos"			"5"
-				"wide"			"50"
-				"tall"			"8"
-				"autoResize"	"0"
-				"pinCorner"		"0"
-				"visible"		"0"
-				"labelText"		"%specindex%"
-				"textAlignment"	"north-west"
-				//"fgcolor"		"TanLight"
+				"xpos"			"9999"
 			}
 			"DeathPanel"
 			{
 				"ControlName"	"ImagePanel"
 				"fieldName"		"DeathPanel"
-				"xpos"			"cs-0.5"
-				"ypos"			"0"
-				"zpos"			"0"
-				"wide"			"f0"
-				"tall"			"24"
-				"visible"		"0"
-				"enabled"		"1"
-				"image"			"../HUD/comp_player_status"
-				"scaleImage"	"1"
-				"proportionaltoparent"	"1"
+				"xpos"			"9999"
 			}
 			"SkullPanel"
 			{
 				"ControlName"	"ImagePanel"
 				"fieldName"		"SkullPanel"
-				"xpos"			"cs-0.5"
-				"zpos"			"1"
-				"wide"			"o1.2"
-				"tall"			"p0.15"
-				"visible"		"0"
-				"enabled"		"1"
-				"image"			"../HUD/comp_player_status_skull"
-				"scaleImage"	"1"
-				"proportionaltoparent"	"1"
+				"xpos"			"9999"
 			}
 		}
 	}
diff --git a/resource/ui/hudmatchsummary.res b/resource/ui/hudmatchsummary.res
index 9b076a9..24d39b8 100644
--- a/resource/ui/hudmatchsummary.res
+++ b/resource/ui/hudmatchsummary.res
@@ -210,10 +210,7 @@
 				"pinCorner"		"0"
 				"visible"		"1"
 				"enabled"		"1"
-
-				"pin_to_sibling"		"StatsAndMedals"
-				"pin_corner_to_sibling"	"PIN_TOPLEFT"
-				"pin_to_sibling_corner"	"PIN_TOPLEFT"
+				"pin_to_sibling"	"StatsAndMedals"
 			}
 		}
 
@@ -293,8 +290,8 @@
 					"fgcolor"		"TransparentBlack"
 					"labelText"		"%blueteamscore%"
 					"textAlignment"	"east"
-					"xpos"			"7"
-					"ypos"			"103"
+					"xpos"			"6"
+					"ypos"			"102"
 					"zpos"			"3"
 					"wide"			"p.19"
 					"tall"			"30"
@@ -338,8 +335,8 @@
 					"fgcolor"		"TransparentBlack"
 					"labelText"		"%blueteamwinner%"
 					"textAlignment"	"east"
-					"xpos"			"-1"
-					"ypos"			"-1"
+					"xpos"			"6"
+					"ypos"			"102"
 					"zpos"			"3"
 					"wide"			"p.19"
 					"tall"			"30"
@@ -348,10 +345,6 @@
 					"visible"		"1"
 					"enabled"		"1"
 
-					"pin_to_sibling"		"BlueTeamWinner"
-					"pin_corner_to_sibling"	"PIN_TOPLEFT"
-					"pin_to_sibling_corner"	"PIN_TOPLEFT"
-
 					if_large
 					{
 						"ypos"		"42"
@@ -612,8 +605,8 @@
 					"fgcolor"		"TransparentBlack"
 					"labelText"		"%redteamwinner%"
 					"textAlignment"	"west"
-					"xpos"			"-1"
-					"ypos"			"-1"
+					"xpos"			"r4-p.19"
+					"ypos"			"102"
 					"zpos"			"3"
 					"wide"			"p.19"
 					"tall"			"30"
@@ -622,9 +615,10 @@
 					"visible"		"1"
 					"enabled"		"1"
 
-					"pin_to_sibling"		"RedTeamWinner"
-					"pin_corner_to_sibling"	"PIN_TOPLEFT"
-					"pin_to_sibling_corner"	"PIN_TOPLEFT"
+					if_large
+					{
+						"ypos"		"42"
+					}
 				}
 				"RedTeamImage"
 				{
diff --git a/resource/ui/hudmediccharge.res b/resource/ui/hudmediccharge.res
index d7fb932..869a860 100644
--- a/resource/ui/hudmediccharge.res
+++ b/resource/ui/hudmediccharge.res
@@ -87,8 +87,8 @@
 		"visible"			"1"
 		"enabled"			"1"
 		"defaultbgcolor_override"	"25 25 25 255"
-		"PaintBackgroundType"	"0"
-        "textinsety" 			"99"
+		"PaintBackgroundType"		"0"
+        "textinsety" 				"99"
 	}
 
 	"ChargeMeterLabel"
@@ -135,8 +135,8 @@
 		"textAlignment"		"Left"
 		"dulltext"			"0"
 		"brighttext"		"0"
-		"bgcolor" 			"32 32 32 128"
-		"fgcolor_override"	"Uber Bar Color"
+		"fgcolor_override"		"Uber Bar Color"
+		"bgcolor_override"		"32 32 32 128"
 	}
 
 	"ChargeMeter1"
@@ -159,10 +159,7 @@
 		"dulltext"			"0"
 		"brighttext"		"0"
 		"fgcolor_override"	"Uber Bar Color"
-
-		"pin_to_sibling"		"IndividualChargesLabel"
-		"pin_corner_to_sibling"	"PIN_TOPLEFT"
-		"pin_to_sibling_corner"	"PIN_TOPLEFT"
+		"pin_to_sibling"	"IndividualChargesLabel"
 	}
 
 	"ChargeMeter2"
@@ -285,9 +282,6 @@
 		"enabled"			"1"
 		"image"				"../HUD/defense_buff_bullet_blue"
 		"scaleImage"		"1"
-
-		"pin_to_sibling"		"ResistIconAnchor"
-		"pin_corner_to_sibling"	"PIN_TOPLEFT"
-		"pin_to_sibling_corner"	"PIN_TOPLEFT"
+		"pin_to_sibling"	"ResistIconAnchor"
 	}
 }
\ No newline at end of file
diff --git a/resource/ui/hudmenutauntselection.res b/resource/ui/hudmenutauntselection.res
index 9d4ba80..f49829f 100644
--- a/resource/ui/hudmenutauntselection.res
+++ b/resource/ui/hudmenutauntselection.res
@@ -50,10 +50,10 @@
 		"brighttext"	"0"
 	}
 
-	"TitleLabelDropshadow"
+	"TitleLabelShadow"
 	{
 		"ControlName"	"CExLabel"
-		"fieldName"		"TitleLabelDropshadow"
+		"fieldName"		"TitleLabelShadow"
 		"font"			"Cerbetica28"
 		"fgcolor"		"TransparentBlack"
 		"xpos"			"-2"
@@ -69,10 +69,7 @@
 		"textAlignment"	"Left"
 		"dulltext"		"1"
 		"brighttext"	"0"
-
-		"pin_to_sibling"		"TitleLabel"
-		"pin_corner_to_sibling" "PIN_TOPLEFT"
-		"pin_to_sibling_corner" "PIN_TOPLEFT"
+		"pin_to_sibling"	"TitleLabel"
 	}
 
 	"WeaponTauntLabel"
diff --git a/resource/ui/hudminigame_base.res b/resource/ui/hudminigame_base.res
index 4290172..f54fe09 100644
--- a/resource/ui/hudminigame_base.res
+++ b/resource/ui/hudminigame_base.res
@@ -29,22 +29,14 @@
 		"fillcolor"		"205 50 50 153"
 		"scaleImage"	"1"
 	}
-
+	
 	"OutlineBG"
 	{
 		"ControlName"	"ImagePanel"
 		"fieldName"		"OutlineBG"
-		"xpos"			"cs-0.5"
-		"ypos"			"r77"
-		"zpos"			"2"
-		"wide"			"280"
-		"tall"			"80"
-		"visible"		"0"
-		"enabled"		"0"
-		"image"			"../hud/objectives_flagpanel_bg_outline"
-		"scaleImage"	"1"
+		"xpos"			"9999"
 	}
-
+	
 	"BlueScore"
 	{
 		"ControlName"	"CExLabel"
@@ -61,14 +53,13 @@
 		"font"			"Cerbetica40"
 		"fgcolor"		"TanLight"
 	}
-
 	"BlueScoreShadow"
 	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"BlueScoreShadow"
-		"xpos"			"c-56"
-		"ypos"			"r32"
-		"zpos"			"8"
+		"xpos"			"-2"
+		"ypos"			"-2"
+		"zpos"			"7"
 		"wide"			"50"
 		"tall"			"35"
 		"visible"		"1"
@@ -77,6 +68,7 @@
 		"labelText"		"%bluescore%"
 		"font"			"Cerbetica40"
 		"fgcolor"		"TransparentBlack"
+		"pin_to_sibling"	"BlueScore"
 	}
 
 	"RedScore"
@@ -95,14 +87,13 @@
 		"font"			"Cerbetica40"
 		"fgcolor"		"TanLight"
 	}
-
 	"RedScoreShadow"
 	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"RedScoreShadow"
-		"xpos"			"c8"
-		"ypos"			"r32"
-		"zpos"			"8"
+		"xpos"			"-2"
+		"ypos"			"-2"
+		"zpos"			"7"
 		"wide"			"50"
 		"tall"			"35"
 		"visible"		"1"
@@ -111,8 +102,9 @@
 		"labelText"		"%redscore%"
 		"font"			"Cerbetica40"
 		"fgcolor"		"TransparentBlack"
+		"pin_to_sibling"	"RedScore"
 	}
-
+	
 	"PlayingTo"
 	{
 		"ControlName"	"CExLabel"
@@ -131,10 +123,10 @@
 		"font"			"HudFontSmall"
 		"fgcolor"		"TanLight"
 	}
-
+	
 	"PlayingToBG"
 	{
-		"ControlName"	"ImagePanel"
+		"ControlName"	"EditablePanel"
 		"fieldName"		"PlayingToBG"
 		"xpos"			"c-50"
 		"ypos"			"r50"
@@ -143,8 +135,8 @@
 		"tall"			"20"
 		"visible"		"1"
 		"enabled"		"1"
-		"fillcolor"		"Transparent"
-		"scaleImage"	"1"
+		"bgcolor_override"		"Transparent"
+		"PaintBackgroundType"	"0"
 	}
 
 	"GameImage"
diff --git a/resource/ui/hudobjectiveflagpanel.res b/resource/ui/hudobjectiveflagpanel.res
index ce2e021..4b08501 100644
--- a/resource/ui/hudobjectiveflagpanel.res
+++ b/resource/ui/hudobjectiveflagpanel.res
@@ -30,7 +30,6 @@
 		"visible"		"1"
 		"enabled"		"1"
 		"fillcolor"		"70 130 180 153"
-		"scaleImage"	"1"
 
 		"if_hybrid"
 		{
@@ -60,7 +59,6 @@
 		"visible"		"1"
 		"enabled"		"1"
 		"fillcolor"		"205 50 50 153"
-		"scaleImage"	"1"
 
 		"if_hybrid"
 		{
@@ -116,7 +114,6 @@
 			"visible"	"0"
 		}
 	}
-
 	"BlueScoreShadow"
 	{
 		"ControlName"	"CExLabel"
@@ -132,10 +129,7 @@
 		"labelText"		"%bluescore%"
 		"font"			"Cerbetica40"
 		"fgcolor"		"TransparentBlack"
-
-		"pin_to_sibling"		"BlueScore"
-		"pin_corner_to_sibling"	"PIN_TOPLEFT"
-		"pin_to_sibling_corner"	"PIN_TOPLEFT"
+		"pin_to_sibling"	"BlueScore"
 
 		"if_hybrid"
 		{
@@ -200,10 +194,7 @@
 		"labelText"		"%redscore%"
 		"font"			"Cerbetica40"
 		"fgcolor"		"TransparentBlack"
-
-		"pin_to_sibling"		"RedScore"
-		"pin_corner_to_sibling"	"PIN_TOPLEFT"
-		"pin_to_sibling_corner"	"PIN_TOPLEFT"
+		"pin_to_sibling"	"RedScore"
 
 		"if_hybrid"
 		{
@@ -429,7 +420,6 @@
 		"image"			"marked_for_death"
 		"scaleImage"	"1"
 	}
-
 	"PoisonTimeLabel"
 	{
 		"ControlName"	"CExLabel"
diff --git a/resource/ui/hudobjectivetimepanel.res b/resource/ui/hudobjectivetimepanel.res
index e4daef3..6f0f9c6 100644
--- a/resource/ui/hudobjectivetimepanel.res
+++ b/resource/ui/hudobjectivetimepanel.res
@@ -16,31 +16,14 @@
 
 		if_match
 		{
-			"visible"		"0"
+			"xpos"			"9999"
 		}
 	}
 	"TimePanelProgressBar"
 	{
 		"ControlName"		"CTFProgressBar"
 		"fieldName"			"TimePanelProgressBar"
-		"xpos"				"67"
-		"ypos"				"16"
-		"zpos"				"4"
-		"wide"				"20"
-		"tall"				"20"
-		"visible"			"0"
-		"enabled"			"1"
-		"scaleImage"		"1"
-		"image"				"../hud/objectives_timepanel_progressbar"
-		"color_active"		"TimerProgress.Active"
-		"color_inactive"	"TimerProgress.InActive"
-		"color_warning"		"TimerProgress.Warning"
-		"percent_warning"	"0.75"
-
-		if_match
-		{
-			"visible"		"0"
-		}
+		"xpos"				"9999"
 	}
 
 	"WaitingForPlayersLabel"
@@ -107,24 +90,7 @@
 	{
 		"ControlName"		"CExLabel"
 		"fieldName"			"SuddenDeathLabel"
-		"xpos"				"25"
-		"ypos"				"20"
-		"zpos"				"5"
-		"wide"				"50"
-		"tall"				"24"
-		"visible"			"0"
-		"enabled"			"1"
-		"labelText"			"#game_SuddenDeath"
-		"textAlignment"		"center"
-		"dulltext"			"0"
-		"brighttext"		"0"
-		"wrap"				"0"
-		"font"				"HudFontSmall"
-
-		if_match
-		{
-			"xpos"			"30"
-		}
+		"xpos"				"9999"
 	}
 	"SuddenDeathBG"
 	{
@@ -188,7 +154,7 @@
 
 		if_mvm
 		{
-			"visible"		"0"
+			"xpos"			"9999"
 		}
 	}
 
diff --git a/resource/ui/hudrocketpack.res b/resource/ui/hudrocketpack.res
index e67f658..a9fd7d4 100644
--- a/resource/ui/hudrocketpack.res
+++ b/resource/ui/hudrocketpack.res
@@ -4,63 +4,63 @@
 {
 	HudItemEffectMeter
 	{
-		"tall"			"20"
+		"tall"				"20"
 	}
 
 	"ItemEffectMeterBG"
 	{
-		"ControlName"	"CTFImagePanel"
-		"fieldName"		"ItemEffectMeterBG"
-		"xpos"			"9999"
+		"ControlName"		"CTFImagePanel"
+		"fieldName"			"ItemEffectMeterBG"
+		"xpos"				"9999"
 	}
 
 	"ItemEffectIcon"
 	{
-		"ControlName"	"CTFImagePanel"
-		"fieldName"		"ItemEffectIcon"
-		"xpos"			"125"
-		"ypos"			"-2"
-		"zpos"			"2"
-		"wide"			"32"
-		"tall"			"32"
-		"visible"		"1"
-		"enabled"		"1"
-		"image"			"../hud/pyro_jetpack_off2"
-		"scaleImage"	"1"
+		"ControlName"		"CTFImagePanel"
+		"fieldName"			"ItemEffectIcon"
+		"xpos"				"125"
+		"ypos"				"-2"
+		"zpos"				"2"
+		"wide"				"32"
+		"tall"				"32"
+		"visible"			"1"
+		"enabled"			"1"
+		"image"				"../hud/pyro_jetpack_off2"
+		"scaleImage"		"1"
 		"visible_minmode"	"0"
 	}
 
 	"ItemEffectMeterLabel"
 	{
-		"visible"		"0"
-		"labelText"		"#TF_RocketPack_Disabled"
+		"visible"			"0"
+		"labelText"			"#TF_RocketPack_Disabled"
 	}
 
 	"ItemEffectMeter"
 	{
-		"wide"			"60"
-		"wide_minmode"	"55"
+		"wide"				"60"
+		"wide_minmode"		"55"
 	}
 
 	"ItemEffectMeter2"
 	{
-		"ControlName"	"ContinuousProgressBar"
-		"fieldName"		"ItemEffectMeter2"
-		"font"			"Default"
-		"xpos"			"60"
-		"xpos_minmode"	"55"
-		"ypos"			"0"
-		"zpos"			"2"
-		"wide"			"60"
-		"tall"			"8"
-		"wide_minmode"	"55"
-		"tall_minmode"	"5"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"1"
-		"enabled"		"1"
-		"textAlignment"	"Center"
-		"dulltext"		"0"
-		"brighttext"	"0"
+		"ControlName"		"ContinuousProgressBar"
+		"fieldName"			"ItemEffectMeter2"
+		"font"				"Default"
+		"xpos"				"60"
+		"xpos_minmode"		"55"
+		"ypos"				"0"
+		"zpos"				"2"
+		"wide"				"60"
+		"tall"				"8"
+		"wide_minmode"		"55"
+		"tall_minmode"		"5"
+		"autoResize"		"0"
+		"pinCorner"			"0"
+		"visible"			"1"
+		"enabled"			"1"
+		"textAlignment"		"Center"
+		"dulltext"			"0"
+		"brighttext"		"0"
 	}
 }
\ No newline at end of file
diff --git a/resource/ui/hudspellselection.res b/resource/ui/hudspellselection.res
index f940d09..8ceb60f 100644
--- a/resource/ui/hudspellselection.res
+++ b/resource/ui/hudspellselection.res
@@ -2,98 +2,87 @@
 {
 	"ItemEffectMeterBG"
 	{
-		"ControlName"	"CTFImagePanel"
-		"fieldName"		"ItemEffectMeterBG"
-		"xpos"			"9999"
+		"ControlName"		"CTFImagePanel"
+		"fieldName"			"ItemEffectMeterBG"
+		"xpos"				"9999"
 	}
 
 	"Spellbook"
 	{
-		"ControlName"	"CTFImagePanel"
-		"fieldName"		"Spellbook"
-		"xpos"			"9999"
+		"ControlName"		"CTFImagePanel"
+		"fieldName"			"Spellbook"
+		"xpos"				"9999"
 	}
 
 	"SpellIcon"
 	{
-		"ControlName"	"ImagePanel"
-		"fieldName"		"SpellIcon"
-		"xpos"			"25"
-		"ypos"			"0"
-		"zpos"			"7"
-		"wide"			"20"
-		"tall"			"20"
-		"visible"		"1"
-		"enabled"		"1"
-		"scaleImage"	"1"
-		"image"			"../signs/death_wheel_whammy"
-		"fgcolor"		"TanDark"
+		"ControlName"		"ImagePanel"
+		"fieldName"			"SpellIcon"
+		"xpos"				"25"
+		"ypos"				"0"
+		"zpos"				"7"
+		"wide"				"20"
+		"tall"				"20"
+		"visible"			"1"
+		"enabled"			"1"
+		"scaleImage"		"1"
+		"image"				"../signs/death_wheel_whammy"
+		"fgcolor"			"TanDark"
 	}
 
 	"ActionText"
 	{
-		"ControlName"	"CExLabel"
-		"fieldName"		"ActionText"
-		"font"			"Default"
-		"labelText"		"%actiontext%"
-		"textAlignment" "west"
-		"xpos"			"9999"
-		"ypos"			"9999"
-		"wide"			"100"
-		"tall"			"10"
-		"fgcolor"		"TanLight"
-		"visible"		"1"
+		"ControlName"		"CExLabel"
+		"fieldName"			"ActionText"
+		"font"				"Default"
+		"labelText"			"%actiontext%"
+		"textAlignment"		"west"
+		"xpos"				"9999"
+		"ypos"				"9999"
+		"wide"				"100"
+		"tall"				"10"
+		"fgcolor"			"TanLight"
+		"visible"			"1"
 	}
 
 	"SpellText"
 	{
-		"ControlName"	"CExLabel"
-		"fieldName"		"SpellText"
-		"font"			"Default"
-		"labelText"		"%selectedspell%"
-		"textAlignment" "west"
-		"xpos"			"35"
-		"ypos"			"25"
-		"wide"			"100"
-		"tall"			"10"
-		"fgcolor"		"tanlight"
-		"visible"		"0"
+		"ControlName"		"CExLabel"
+		"fieldName"			"SpellText"
+		"xpos"				"9999"
 	}
 
 	"CountText"
 	{
-		"ControlName"	"CExLabel"
-		"fieldName"		"CountText"
-		"font"			"Cerbetica28"
-		"font_minmode"	"Cerbetica16"
-		"labelText"		"%counttext%"
-		"textAlignment" "center"
-		"xpos"			"0"
-		"ypos"			"0"
-		"zpos"			"1"
-		"xpos_minmode"	"5"
-		"wide"			"20"
-		"tall"			"20"
-		"fgcolor"		"TanLight"
+		"ControlName"		"CExLabel"
+		"fieldName"			"CountText"
+		"font"				"Cerbetica28"
+		"font_minmode"		"Cerbetica16"
+		"labelText"			"%counttext%"
+		"textAlignment"		"center"
+		"xpos"				"0"
+		"ypos"				"0"
+		"zpos"				"1"
+		"xpos_minmode"		"5"
+		"wide"				"20"
+		"tall"				"20"
+		"fgcolor"			"TanLight"
 	}
 
 	"CountTextShadow"
 	{
-		"ControlName"	"CExLabel"
-		"fieldName"		"CountTextShadow"
-		"font"			"Cerbetica28"
-		"font_minmode"	"Cerbetica16"
-		"labelText"		"%counttext%"
-		"textAlignment" "center"
-		"xpos"			"-2"
-		"ypos"			"-2"
-		"zpos"			"0"
-		"wide"			"20"
-		"tall"			"20"
-		"fgcolor"		"TransparentBlack"
-
-		"pin_to_sibling"		"CountText"
-		"pin_corner_to_sibling" "PIN_TOPLEFT"
-		"pin_to_sibling_corner" "PIN_TOPLEFT"
+		"ControlName"		"CExLabel"
+		"fieldName"			"CountTextShadow"
+		"font"				"Cerbetica28"
+		"font_minmode"		"Cerbetica16"
+		"labelText"			"%counttext%"
+		"textAlignment"		"center"
+		"xpos"				"-2"
+		"ypos"				"-2"
+		"zpos"				"0"
+		"wide"				"20"
+		"tall"				"20"
+		"fgcolor"			"TransparentBlack"
+		"pin_to_sibling"	"CountText"
 	}
 }
\ No newline at end of file
diff --git a/resource/ui/hudtournament.res b/resource/ui/hudtournament.res
index bede8f2..de38a92 100644
--- a/resource/ui/hudtournament.res
+++ b/resource/ui/hudtournament.res
@@ -27,11 +27,7 @@
 
 		if_mvm
 		{
-			"xpos"						"0"
 			"ypos"						"0"
-			"wide"						"f0"
-			"tall"						"480"
-
 			"team1_player_base_y"		"66"
 			"team2_player_base_y"		"66"
 			"team2_player_delta_x"		"52"
@@ -39,11 +35,6 @@
 
 		if_competitive
 		{
-			"xpos"						"0"
-			"ypos"						"25"
-			"wide"						"f0"
-			"tall"						"480"
-
 			"team1_player_base_y"		"66"
 			"team2_player_base_y"		"66"
 			"team2_player_base_offset_x" "5"
@@ -51,11 +42,6 @@
 
 		if_readymode
 		{
-			"xpos"						"0"
-			"ypos"						"25"
-			"wide"						"f0"
-			"tall"						"480"
-
 			"team1_player_base_y"		"66"
 			"team2_player_base_y"		"66"
 			"team2_player_delta_x"		"52"
@@ -92,13 +78,7 @@
 			"zpos"			"1"
 			"color_ready"		"0 255 0 220"
 			"color_notready"	"TransparentBlack"
-
-			if_competitive
-			{
-				"wide"		"40"
-				"tall"		"29"
-			}
-
+			
 			"PanelBG"
 			{
 				"ControlName"	"ImagePanel"
@@ -113,12 +93,6 @@
 				"visible"		"1"
 				"enabled"		"1"
 				"fillcolor"		"TransparentBlack"
-
-				if_competitive
-				{
-					"wide"		"38"
-					"tall"		"20"
-				}
 			}
 
 			"playername"
@@ -136,15 +110,6 @@
 				"visible"		"1"
 				"labelText"		"%playername%"
 				"textAlignment"	"center"
-
-				if_competitive
-				{
-					"xpos"		"1"
-					"ypos"		"20"
-					"wide"		"39"
-					"tall"		"10"
-					"font"		"DefaultVerySmall"
-				}
 			}
 
 			"classimage"
@@ -168,8 +133,6 @@
 
 				if_competitive
 				{
-					"wide"		"20"
-					"tall"		"20"
 					"image"		"../vgui/hud_connecting"
 				}
 
@@ -200,8 +163,6 @@
 
 				if_competitive
 				{
-					"wide"			"20"
-					"tall"			"20"
 					"visible"		"1"
 				}
 
@@ -249,25 +210,25 @@
 				"enabled"		"0"
 				"image"			"../HUD/tournament_panel_brown"
 
-				"src_corner_height"	"22"			// pixels inside the image
-				"src_corner_width"	"22"
+				"src_corner_height"		"22"			// pixels inside the image
+				"src_corner_width"		"22"
 
-				"draw_corner_width"	"0"				// screen size of the corners ( and sides ), proportional
+				"draw_corner_width"		"0"				// screen size of the corners ( and sides ), proportional
 				"draw_corner_height" 	"0"
 
 				if_mvm
 				{
-					"visible"		"1"
+					"visible"			"1"
 				}
 
 				if_competitive
 				{
-					"visible"		"1"
+					"visible"			"1"
 				}
 
 				if_readymode
 				{
-					"visible"		"1"
+					"visible"			"1"
 				}
 			}
 
@@ -289,17 +250,17 @@
 
 				if_mvm
 				{
-					"visible"		"1"
+					"visible"	"1"
 				}
 
 				if_competitive
 				{
-					"visible"		"1"
+					"visible"	"1"
 				}
 
 				if_readymode
 				{
-					"visible"		"1"
+					"visible"	"1"
 				}
 			}
 
@@ -366,50 +327,51 @@
 
 	"MainBG"
 	{
-		"ControlName"	"ImagePanel"
-		"fieldName"		"MainBG"
-		"xpos"			"c-125"
-		"ypos"			"16"
-		"zpos"			"-1"
-		"wide"			"250"
-		"tall"			"14"
-		"pinCorner"		"0"
-		"visible"		"1"
-		"enabled"		"1"
-		"fillcolor"		"TransparentBlack"
+		"ControlName"			"ImagePanel"
+		"fieldName"				"MainBG"
+		"xpos"					"c-125"
+		"ypos"					"16"
+		"zpos"					"-1"
+		"wide"					"250"
+		"tall"					"14"
+		"autoResize"			"0"
+		"pinCorner"				"0"
+		"visible"				"1"
+		"enabled"				"1"
+		"fillcolor"				"TransparentBlack"
 
 		if_mvm
 		{
-			"visible"		"0"
+			"visible"			"0"
 		}
 	}
 
 	"HudTournamentBG"
 	{
-		"ControlName"	"ScalableImagePanel"
-		"fieldName"		"HudTournamentBG"
-		"wide"			"0"
+		"ControlName"			"ScalableImagePanel"
+		"fieldName"				"HudTournamentBG"
+		"wide"					"0"
 	}
 
 	"TournamentLabel"
 	{
-		"ControlName"	"Label"
-		"fieldName"		"TournamentLabel"
-		"wide"			"0"
+		"ControlName"			"Label"
+		"fieldName"				"TournamentLabel"
+		"wide"					"0"
 	}
 
 	"HudTournamentBLUEBG"
 	{
-		"ControlName"	"ScalableImagePanel"
-		"fieldName"		"HudTournamentBLUEBG"
-		"xpos"			"c-125"
-		"ypos"			"0"
-		"zpos"			"-1"
-		"wide"			"125"
-		"tall"			"16"
-		"visible"		"1"
-		"enabled"		"1"
-		"image"			"../HUD/tournament_panel_blu"
+		"ControlName"			"ScalableImagePanel"
+		"fieldName"				"HudTournamentBLUEBG"
+		"xpos"					"c-125"
+		"ypos"					"0"
+		"zpos"					"-1"
+		"wide"					"125"
+		"tall"					"16"
+		"visible"				"1"
+		"enabled"				"1"
+		"image"					"../HUD/tournament_panel_blu"
 
 		"src_corner_height"		"15"
 		"src_corner_width"		"15"
@@ -418,37 +380,37 @@
 
 		if_mvm
 		{
-			"visible"		"0"
+			"visible"			"0"
 		}
 
 		if_competitive
 		{
-			"visible"		"0"
+			"visible"			"0"
 		}
 
 		if_readymode
 		{
-			"visible"		"0"
+			"visible"			"0"
 		}
 	}
 
 	"TournamentBLUELabel"
 	{
-		"ControlName"	"Label"
-		"fieldName"		"TournamentBLUELabel"
-		"font"			"HudFontSmall"
-		"xpos"			"-5"
-		"ypos"			"0"
-		"zpos"			"1"
-		"wide"			"65"
-		"tall"			"16"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"1"
-		"enabled"		"1"
-		"wrap"			"0"
-		"labelText"		"%bluenamelabel%"
-		"textAlignment"	"west"
+		"ControlName"			"Label"
+		"fieldName"				"TournamentBLUELabel"
+		"font"					"HudFontSmall"
+		"xpos"					"-5"
+		"ypos"					"0"
+		"zpos"					"1"
+		"wide"					"65"
+		"tall"					"16"
+		"autoResize"			"0"
+		"pinCorner"				"0"
+		"visible"				"1"
+		"enabled"				"1"
+		"wrap"					"0"
+		"labelText"				"%bluenamelabel%"
+		"textAlignment"			"west"
 
 		"pin_to_sibling"		"HudTournamentBLUEBG"
 		"pin_corner_to_sibling"	"PIN_TOPLEFT"
@@ -456,37 +418,37 @@
 
 		if_mvm
 		{
-			"visible"		"0"
+			"visible"			"0"
 		}
 
 		if_competitive
 		{
-			"visible"		"0"
+			"visible"			"0"
 		}
 
 		if_readymode
 		{
-			"visible"		"0"
+			"visible"			"0"
 		}
 	}
 
 	"TournamentBLUEStateLabel"
 	{
-		"ControlName"	"Label"
-		"fieldName"		"TournamentBLUEStateLabel"
-		"font"			"HudFontSmallest"
-		"xpos"			"-5"
-		"ypos"			"0"
-		"zpos"			"1"
-		"wide"			"65"
-		"tall"			"16"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"1"
-		"enabled"		"1"
-		"wrap"			"0"
-		"labelText"		"%bluestate%"
-		"textAlignment"	"east"
+		"ControlName"			"Label"
+		"fieldName"				"TournamentBLUEStateLabel"
+		"font"					"HudFontSmallest"
+		"xpos"					"-5"
+		"ypos"					"0"
+		"zpos"					"1"
+		"wide"					"65"
+		"tall"					"16"
+		"autoResize"			"0"
+		"pinCorner"				"0"
+		"visible"				"1"
+		"enabled"				"1"
+		"wrap"					"0"
+		"labelText"				"%bluestate%"
+		"textAlignment"			"east"
 
 		"pin_to_sibling"		"HudTournamentBLUEBG"
 		"pin_corner_to_sibling"	"PIN_TOPRIGHT"
@@ -494,34 +456,32 @@
 
 		if_mvm
 		{
-			"visible"		"0"
+			"visible"			"0"
 		}
 
 		if_competitive
 		{
-			"visible"		"0"
+			"visible"			"0"
 		}
 
 		if_readymode
 		{
-			"visible"		"0"
+			"visible"			"0"
 		}
 	}
 
 	"HudTournamentREDBG"
 	{
-		"ControlName"	"ScalableImagePanel"
-		"fieldName"		"HudTournamentREDBG"
-		"xpos"			"c0"
-		"ypos"			"0"
-		"zpos"			"-1"
-		"wide"			"125"
-		"tall"			"16"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"1"
-		"enabled"		"1"
-		"image"			"../HUD/tournament_panel_red"
+		"ControlName"			"ScalableImagePanel"
+		"fieldName"				"HudTournamentREDBG"
+		"xpos"					"c0"
+		"ypos"					"0"
+		"zpos"					"-1"
+		"wide"					"125"
+		"tall"					"16"
+		"visible"				"1"
+		"enabled"				"1"
+		"image"					"../HUD/tournament_panel_red"
 
 		"src_corner_height"		"15"
 		"src_corner_width"		"15"
@@ -530,35 +490,35 @@
 
 		if_mvm
 		{
-			"visible"		"0"
+			"visible"			"0"
 		}
 		if_competitive
 		{
-			"visible"		"0"
+			"visible"			"0"
 		}
 		if_readymode
 		{
-			"visible"		"0"
+			"visible"			"0"
 		}
 	}
 
 	"TournamentREDLabel"
 	{
-		"ControlName"	"Label"
-		"fieldName"		"TournamentREDLabel"
-		"font"			"HudFontSmall"
-		"xpos"			"-5"
-		"ypos"			"0"
-		"zpos"			"1"
-		"wide"			"65"
-		"tall"			"16"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"1"
-		"enabled"		"1"
-		"wrap"			"0"
-		"labelText"		"%rednamelabel%"
-		"textAlignment"	"east"
+		"ControlName"			"Label"
+		"fieldName"				"TournamentREDLabel"
+		"font"					"HudFontSmall"
+		"xpos"					"-5"
+		"ypos"					"0"
+		"zpos"					"1"
+		"wide"					"65"
+		"tall"					"16"
+		"autoResize"			"0"
+		"pinCorner"				"0"
+		"visible"				"1"
+		"enabled"				"1"
+		"wrap"					"0"
+		"labelText"				"%rednamelabel%"
+		"textAlignment"			"east"
 
 		"pin_to_sibling"		"HudTournamentREDBG"
 		"pin_corner_to_sibling"	"PIN_TOPRIGHT"
@@ -566,37 +526,37 @@
 
 		if_mvm
 		{
-			"visible"		"0"
+			"visible"			"0"
 		}
 
 		if_competitive
 		{
-			"visible"		"0"
+			"visible"			"0"
 		}
 
 		if_readymode
 		{
-			"visible"		"0"
+			"visible"			"0"
 		}
 	}
 
 	"TournamentREDStateLabel"
 	{
-		"ControlName"	"Label"
-		"fieldName"		"TournamentREDStateLabel"
-		"font"			"HudFontSmallest"
-		"xpos"			"-5"
-		"ypos"			"0"
-		"zpos"			"1"
-		"wide"			"65"
-		"tall"			"16"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"1"
-		"enabled"		"1"
-		"wrap"			"0"
-		"labelText"		"%redstate%"
-		"textAlignment"	"west"
+		"ControlName"			"Label"
+		"fieldName"				"TournamentREDStateLabel"
+		"font"					"HudFontSmallest"
+		"xpos"					"-5"
+		"ypos"					"0"
+		"zpos"					"1"
+		"wide"					"65"
+		"tall"					"16"
+		"autoResize"			"0"
+		"pinCorner"				"0"
+		"visible"				"1"
+		"enabled"				"1"
+		"wrap"					"0"
+		"labelText"				"%redstate%"
+		"textAlignment"			"west"
 
 		"pin_to_sibling"		"HudTournamentREDBG"
 		"pin_corner_to_sibling"	"PIN_TOPLEFT"
@@ -604,139 +564,138 @@
 
 		if_mvm
 		{
-			"visible"		"0"
+			"visible"			"0"
 		}
 
 		if_competitive
 		{
-			"visible"		"0"
+			"visible"			"0"
 		}
 
 		if_readymode
 		{
-			"visible"		"0"
+			"visible"			"0"
 		}
 	}
 
 	"TournamentConditionLabel"
 	{
-		"ControlName"	"CExLabel"
-		"fieldName"		"TournamentConditionLabel"
-		"font"			"HudFontSmallest"
-		"fgcolor"		"TanLight"
-		"xpos"			"c-125"
-		"ypos"			"16"
-		"zpos"			"1"
-		"wide"			"250"
-		"tall"			"14"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"1"
-		"enabled"		"1"
-		"wrap"			"0"
-		"labelText"		"%winconditions%"
-		"textAlignment"	"center"
+		"ControlName"			"CExLabel"
+		"fieldName"				"TournamentConditionLabel"
+		"font"					"HudFontSmallest"
+		"fgcolor"				"TanLight"
+		"xpos"					"c-125"
+		"ypos"					"16"
+		"zpos"					"1"
+		"wide"					"250"
+		"tall"					"14"
+		"autoResize"			"0"
+		"pinCorner"				"0"
+		"visible"				"1"
+		"enabled"				"1"
+		"wrap"					"0"
+		"labelText"				"%winconditions%"
+		"textAlignment"			"center"
 
 		if_mvm
 		{
-			"visible"		"0"
+			"visible"			"0"
 		}
 
 		if_competitive
 		{
-			"ypos"			"25"
+			"ypos"				"25"
 		}
 	}
 
 	"HudTournamentBGHelp"
 	{
-		"ControlName"	"ScalableImagePanel"
-		"fieldName"		"HudTournamentBGHelp"
-		"wide"			"0"
+		"ControlName"			"ScalableImagePanel"
+		"fieldName"				"HudTournamentBGHelp"
+		"wide"					"0"
 	}
 
 	"TournamentInstructionsLabel"
 	{
-		"ControlName"	"CExLabel"
-		"fieldName"		"TournamentInstructionsLabel"
-		"font"			"HudFontSmallest"
-		"xpos"			"c-125"
-		"ypos"			"30"
-		"wide"			"250"
-		"tall"			"12"
-		"zpos"			"1"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"1"
-		"enabled"		"1"
-		"wrap"			"0"
-		"labelText"		"%readylabel%"
-		"textAlignment"	"center"
+		"ControlName"			"CExLabel"
+		"fieldName"				"TournamentInstructionsLabel"
+		"font"					"HudFontSmallest"
+		"xpos"					"c-125"
+		"ypos"					"30"
+		"wide"					"250"
+		"tall"					"12"
+		"zpos"					"1"
+		"autoResize"			"0"
+		"pinCorner"				"0"
+		"visible"				"1"
+		"enabled"				"1"
+		"wrap"					"0"
+		"labelText"				"%readylabel%"
+		"textAlignment"			"center"
 
 		if_mvm
 		{
-			"ypos"			"105"
-			"visible"		"1"
+			"ypos"				"105"
 		}
 
 		if_competitive
 		{
-			"ypos"			"36"
+			"ypos"				"36"
 		}
 	}
 
 	"TournamentReadyHintIcon"
 	{
-		"ControlName"	"CExLabel"
-		"fieldName"		"TournamentReadyHintIcon"
-		"wide"			"0"
+		"ControlName"			"CExLabel"
+		"fieldName"				"TournamentReadyHintIcon"
+		"wide"					"0"
 	}
 
 	"CountdownBG"
 	{
-		"ControlName"	"ScalableImagePanel"
-		"fieldName"		"CountdownBG"
-		"wide"			"0"
+		"ControlName"			"ScalableImagePanel"
+		"fieldName"				"CountdownBG"
+		"wide"					"0"
 	}
 
 	"CountdownLabel"
 	{
-		"ControlName"	"CExLabel"
-		"fieldName"		"CountdownLabel"
-		"font"			"HudFontMedium"
-		"xpos"			"cs-0.5"
-		"ypos"			"cs-0.1"
-		"wide"			"40"
-		"tall"			"40"
-		"zpos"			"4"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"0"
-		"enabled"		"1"
-		"wrap"			"0"
-		"labelText"		"%tournamentstatelabel%"
-		"textAlignment"	"center"
+		"ControlName"			"CExLabel"
+		"fieldName"				"CountdownLabel"
+		"font"					"HudFontMedium"
+		"xpos"					"cs-0.5"
+		"ypos"					"cs-0.1"
+		"wide"					"40"
+		"tall"					"40"
+		"zpos"					"4"
+		"autoResize"			"0"
+		"pinCorner"				"0"
+		"visible"				"0"
+		"enabled"				"1"
+		"wrap"					"0"
+		"labelText"				"%tournamentstatelabel%"
+		"textAlignment"			"center"
 		"proportionaltoparent"	"1"
 	}
 
 	"CountdownLabelShadow"
 	{
-		"ControlName"	"CExLabel"
-		"fieldName"		"CountdownLabelShadow"
-		"font"			"HudFontMedium"
-		"xpos"			"cs-0.49"
-		"ypos"			"cs-0.09"
-		"wide"			"40"
-		"tall"			"40"
-		"zpos"			"3"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"0"
-		"enabled"		"1"
-		"wrap"			"0"
-		"labelText"		"%tournamentstatelabel%"
-		"textAlignment"	"center"
-		"fgcolor"		"TransparentBlack"
+		"ControlName"			"CExLabel"
+		"fieldName"				"CountdownLabelShadow"
+		"font"					"HudFontMedium"
+		"xpos"					"cs-0.49"
+		"ypos"					"cs-0.09"
+		"wide"					"40"
+		"tall"					"40"
+		"zpos"					"3"
+		"autoResize"			"0"
+		"pinCorner"				"0"
+		"visible"				"0"
+		"enabled"				"1"
+		"wrap"					"0"
+		"labelText"				"%tournamentstatelabel%"
+		"textAlignment"			"center"
+		"fgcolor"				"TransparentBlack"
 		"proportionaltoparent"	"1"
 	}
 }
\ No newline at end of file
diff --git a/resource/ui/importfiledialog.res b/resource/ui/importfiledialog.res
index 72ab31d..9025c88 100644
--- a/resource/ui/importfiledialog.res
+++ b/resource/ui/importfiledialog.res
@@ -374,30 +374,25 @@
 			"wide"				"15"
 			"tall"				"15"
 			"autoResize"		"0"
-			"pinCorner"			"3"
-			"textinsetx"		"15"
-			"font"				"Cerbetica12"
-			"textAlignment"		"west"
-			"labelText"			""
-			"command"			"ClearIcon"
-			"image_drawcolor"	"TanLight"
-			"image_armedcolor"	"200 10 20 255"
-			"image_disabledcolor"		"0 0 0 255"
-			"use_proportional_insets"	"1"
-			"paintbackground"			"0"
-
-			"SubImage"
-			{
-				"ControlName"	"ImagePanel"
-				"fieldName"		"SubImage"
-				"xpos"			"1"
-				"ypos"			"1"
-				"zpos"			"1"
-				"wide"			"13"
-				"tall"			"13"
-				"scaleImage"	"1"
-				"image"			"replay/thumbnails/close"
-			}		
+			"pinCorner"			"0"
+			"visible"			"1"
+			"enabled"			"1"
+			"tabPosition"		"0"
+			"labeltext"			"("
+			"font"				"CustomIcons"
+			"textAlignment"		"center"
+			"dulltext"			"0"
+			"brighttext"		"0"
+			"default"			"0"
+			"Command"			"ClearIcon"
+			"paintbackground"	"0"
+			
+			"sound_depressed"	"UI/buttonclick.wav"
+			"sound_released"	"UI/buttonclickrelease.wav"
+			
+			"defaultFgColor_override" 	"White"
+			"armedFgColor_override" 	"LightRed"
+			"depressedFgColor_override" "White"
 		}
 
 		"ButtonIconBrowse"
@@ -1001,30 +996,25 @@
 				"wide"			"15"
 				"tall"			"15"
 				"autoResize"	"0"
-				"pinCorner"		"3"
-				"textinsetx"	"15"
-				"use_proportional_insets" "1"
-				"font"			"Cerbetica12"
-				"textAlignment"	"west"
-				"labelText"		""
-				"command"		"ClearLOD0"
-				"image_drawcolor"	"TanLight"
-				"image_armedcolor"	"200 10 20 255"
-				"image_disabledcolor"		"0 0 0 255"
-				"paintbackground"			"0"
-
-				"SubImage"
-				{
-					"ControlName"	"ImagePanel"
-					"fieldName"		"SubImage"
-					"xpos"			"1"
-					"ypos"			"1"
-					"zpos"			"1"
-					"wide"			"13"
-					"tall"			"13"
-					"scaleImage"	"1"
-					"image"			"replay/thumbnails/close"
-				}		
+				"pinCorner"		"0"
+				"visible"		"1"
+				"enabled"		"1"
+				"tabPosition"	"0"
+				"labeltext"		"("
+				"font"			"CustomIcons"
+				"textAlignment"	"center"
+				"dulltext"		"0"
+				"brighttext"	"0"
+				"default"		"0"
+				"Command"			"ClearLOD0"
+				"paintbackground"	"0"
+				
+				"sound_depressed"	"UI/buttonclick.wav"
+				"sound_released"	"UI/buttonclickrelease.wav"
+				
+				"defaultFgColor_override" 	"White"
+				"armedFgColor_override" 	"LightRed"
+				"depressedFgColor_override" "White"
 			}
 			"ButtonLOD0Browse"
 			{
@@ -1062,57 +1052,57 @@
 			}
 			"LOD0File"
 			{
-				"ControlName"		"Label"
+				"ControlName"	"Label"
 				"fieldName"		"LOD0File"
-				"xpos"		"4"
-				"ypos"		"20"
-				"wide"		"150"
-				"tall"		"15"
-				"autoResize"		"0"
+				"xpos"			"4"
+				"ypos"			"20"
+				"wide"			"150"
+				"tall"			"15"
+				"autoResize"	"0"
 				"pinCorner"		"0"
-				"labelText"			"#TF_PublishFile_NoFileSelected"
-				"font"		"Cerbetica12"
+				"labelText"		"#TF_PublishFile_NoFileSelected"
+				"font"			"Cerbetica12"
 			}
 			"LOD0Details"
 			{
-				"ControlName"		"Label"
+				"ControlName"	"Label"
 				"fieldName"		"LOD0Details"
-				"xpos"		"4"
-				"ypos"		"35"
-				"wide"		"150"
-				"tall"		"15"
-				"autoResize"		"0"
+				"xpos"			"4"
+				"ypos"			"35"
+				"wide"			"150"
+				"tall"			"15"
+				"autoResize"	"0"
 				"pinCorner"		"0"
-				"labelText"			""
-				"font"		"Cerbetica12"
+				"labelText"		""
+				"font"			"Cerbetica12"
 			}
 		}
 	
 		"LOD1Panel"
 		{
-			"ControlName"	"EditablePanel"
-			"fieldName"		"LOD1Panel"
-			"xpos"			"0"
-			"ypos"			"60"
-			"wide"			"150"
-			"tall"			"50"
-			"visible"		"1"
-			"paintbackground" "0"
-			"border"				"NoBorder"
+			"ControlName"		"EditablePanel"
+			"fieldName"			"LOD1Panel"
+			"xpos"				"0"
+			"ypos"				"60"
+			"wide"				"150"
+			"tall"				"50"
+			"visible"			"1"
+			"paintbackground"	"0"
+			"border"			"NoBorder"
 
 			"LOD1Label"
 			{
-				"ControlName"		"Label"
+				"ControlName"	"Label"
 				"fieldName"		"LOD1Label"
-				"xpos"		"4"
-				"ypos"		"-3"
-				"wide"		"150"
-				"tall"		"25"
-				"autoResize"		"0"
+				"xpos"			"4"
+				"ypos"			"-3"
+				"wide"			"150"
+				"tall"			"25"
+				"autoResize"	"0"
 				"pinCorner"		"0"
 				"labelText"		"#TF_ImportFile_LOD1"
-				"textAlignment"		"west"
-				"font"		"Cerbetica12"
+				"textAlignment"	"west"
+				"font"			"Cerbetica12"
 				"enabled"		"0"
 			}
 			"ButtonLOD1Clear"
@@ -1124,31 +1114,25 @@
 				"wide"			"15"
 				"tall"			"15"
 				"autoResize"	"0"
-				"pinCorner"		"3"
-				"textinsetx"	"15"
-				"use_proportional_insets" "1"
-				"font"			"Cerbetica12"
-				"textAlignment"	"west"
-				"enabled"		"0"
-				"labelText"		""
-				"command"		"ClearLOD1"
-				"image_drawcolor"	"TanLight"
-				"image_armedcolor"	"200 10 20 255"
-				"image_disabledcolor"		"0 0 0 255"
-				"paintbackground"			"0"
-
-				"SubImage"
-				{
-					"ControlName"	"ImagePanel"
-					"fieldName"		"SubImage"
-					"xpos"			"1"
-					"ypos"			"1"
-					"zpos"			"1"
-					"wide"			"13"
-					"tall"			"13"
-					"scaleImage"	"1"
-					"image"			"replay/thumbnails/close"
-				}		
+				"pinCorner"		"0"
+				"visible"		"1"
+				"enabled"		"1"
+				"tabPosition"	"0"
+				"labeltext"		"("
+				"font"			"CustomIcons"
+				"textAlignment"	"center"
+				"dulltext"		"0"
+				"brighttext"	"0"
+				"default"		"0"
+				"Command"			"ClearLOD1"
+				"paintbackground"	"0"
+				
+				"sound_depressed"	"UI/buttonclick.wav"
+				"sound_released"	"UI/buttonclickrelease.wav"
+				
+				"defaultFgColor_override" 	"White"
+				"armedFgColor_override" 	"LightRed"
+				"depressedFgColor_override" "White"
 			}
 			"ButtonLOD1Browse"
 			{
@@ -1187,30 +1171,30 @@
 			}
 			"LOD1File"
 			{
-				"ControlName"		"Label"
+				"ControlName"	"Label"
 				"fieldName"		"LOD1File"
-				"xpos"		"4"
-				"ypos"		"20"
-				"wide"		"150"
-				"tall"		"15"
-				"autoResize"		"0"
+				"xpos"			"4"
+				"ypos"			"20"
+				"wide"			"150"
+				"tall"			"15"
+				"autoResize"	"0"
 				"pinCorner"		"0"
-				"labelText"			"#TF_PublishFile_NoFileSelected"
-				"font"		"Cerbetica12"
+				"labelText"		"#TF_PublishFile_NoFileSelected"
+				"font"			"Cerbetica12"
 				"enabled"		"0"
 			}
 			"LOD1Details"
 			{
-				"ControlName"		"Label"
+				"ControlName"	"Label"
 				"fieldName"		"LOD1Details"
-				"xpos"		"4"
-				"ypos"		"35"
-				"wide"		"150"
-				"tall"		"15"
-				"autoResize"		"0"
+				"xpos"			"4"
+				"ypos"			"35"
+				"wide"			"150"
+				"tall"			"15"
+				"autoResize"	"0"
 				"pinCorner"		"0"
-				"labelText"			""
-				"font"		"Cerbetica12"
+				"labelText"		""
+				"font"			"Cerbetica12"
 				"enabled"		"0"
 			}
 		}
@@ -1229,17 +1213,17 @@
 
 			"LOD2Label"
 			{
-				"ControlName"		"Label"
+				"ControlName"	"Label"
 				"fieldName"		"LOD2Label"
-				"xpos"		"4"
-				"ypos"		"-3"
-				"wide"		"150"
-				"tall"		"25"
-				"autoResize"		"0"
+				"xpos"			"4"
+				"ypos"			"-3"
+				"wide"			"150"
+				"tall"			"25"
+				"autoResize"	"0"
 				"pinCorner"		"0"
 				"labelText"		"#TF_ImportFile_LOD2"
-				"textAlignment"		"west"
-				"font"		"Cerbetica12"
+				"textAlignment"	"west"
+				"font"			"Cerbetica12"
 				"enabled"		"0"
 			}
 			"ButtonLOD2Clear"
@@ -1251,31 +1235,25 @@
 				"wide"			"15"
 				"tall"			"15"
 				"autoResize"	"0"
-				"pinCorner"		"3"
-				"textinsetx"	"15"
-				"use_proportional_insets" "1"
-				"font"			"Cerbetica12"
-				"textAlignment"	"west"
-				"enabled"		"0"
-				"labelText"		""
-				"command"		"ClearLOD2"
-				"image_drawcolor"	"TanLight"
-				"image_armedcolor"	"200 10 20 255"
-				"image_disabledcolor"		"0 0 0 255"
-				"paintbackground"			"0"
-
-				"SubImage"
-				{
-					"ControlName"	"ImagePanel"
-					"fieldName"		"SubImage"
-					"xpos"			"1"
-					"ypos"			"1"
-					"zpos"			"1"
-					"wide"			"13"
-					"tall"			"13"
-					"scaleImage"	"1"
-					"image"			"replay/thumbnails/close"
-				}		
+				"pinCorner"		"0"
+				"visible"		"1"
+				"enabled"		"1"
+				"tabPosition"	"0"
+				"labeltext"		"("
+				"font"			"CustomIcons"
+				"textAlignment"	"center"
+				"dulltext"		"0"
+				"brighttext"	"0"
+				"default"		"0"
+				"Command"			"ClearLOD2"
+				"paintbackground"	"0"
+				
+				"sound_depressed"	"UI/buttonclick.wav"
+				"sound_released"	"UI/buttonclickrelease.wav"
+				
+				"defaultFgColor_override" 	"White"
+				"armedFgColor_override" 	"LightRed"
+				"depressedFgColor_override" "White"
 			}
 			"ButtonLOD2Browse"
 			{
@@ -1314,37 +1292,37 @@
 			}
 			"LOD2File"
 			{
-				"ControlName"		"Label"
+				"ControlName"	"Label"
 				"fieldName"		"LOD2File"
-				"xpos"		"4"
-				"ypos"		"20"
-				"wide"		"150"
-				"tall"		"15"
-				"autoResize"		"0"
+				"xpos"			"4"
+				"ypos"			"20"
+				"wide"			"150"
+				"tall"			"15"
+				"autoResize"	"0"
 				"pinCorner"		"0"
-				"labelText"			"#TF_PublishFile_NoFileSelected"
-				"font"		"Cerbetica12"
+				"labelText"		"#TF_PublishFile_NoFileSelected"
+				"font"			"Cerbetica12"
 				"enabled"		"0"
 			}
 			"LOD2Details"
 			{
-				"ControlName"		"Label"
+				"ControlName"	"Label"
 				"fieldName"		"LOD2Details"
-				"xpos"		"4"
-				"ypos"		"35"
-				"wide"		"150"
-				"tall"		"15"
-				"autoResize"		"0"
+				"xpos"			"4"
+				"ypos"			"35"
+				"wide"			"150"
+				"tall"			"15"
+				"autoResize"	"0"
 				"pinCorner"		"0"
-				"labelText"			""
-				"font"		"Cerbetica12"
+				"labelText"		""
+				"font"			"Cerbetica12"
 				"enabled"		"0"
 			}
 		}
 
 		"ButtonEditQC"
 		{
-			"ControlName"		"Button"
+			"ControlName"	"Button"
 			"fieldName"		"ButtonEditQC"
 			"xpos"			"0"
 			"ypos"			"195"
@@ -1837,30 +1815,25 @@
 				"wide"			"15"
 				"tall"			"15"
 				"autoResize"	"0"
-				"pinCorner"		"3"
-				"textinsetx"	"15"
-				"use_proportional_insets" "1"
-				"font"			"Cerbetica12"
-				"textAlignment"	"west"
-				"labelText"		""
-				"command"		"ClearAnimationSource"
-				"image_drawcolor"	"TanLight"
-				"image_armedcolor"	"200 10 20 255"
-				"image_disabledcolor"		"0 0 0 255"
-				"paintbackground"			"0"
-
-				"SubImage"
-				{
-					"ControlName"	"ImagePanel"
-					"fieldName"		"SubImage"
-					"xpos"			"1"
-					"ypos"			"1"
-					"zpos"			"1"
-					"wide"			"13"
-					"tall"			"13"
-					"scaleImage"	"1"
-					"image"			"replay/thumbnails/close"
-				}		
+				"pinCorner"		"0"
+				"visible"		"1"
+				"enabled"		"1"
+				"tabPosition"	"0"
+				"labeltext"		"("
+				"font"			"CustomIcons"
+				"textAlignment"	"center"
+				"dulltext"		"0"
+				"brighttext"	"0"
+				"default"		"0"
+				"Command"			"ClearAnimationSource"
+				"paintbackground"	"0"
+				
+				"sound_depressed"	"UI/buttonclick.wav"
+				"sound_released"	"UI/buttonclickrelease.wav"
+				
+				"defaultFgColor_override" 	"White"
+				"armedFgColor_override" 	"LightRed"
+				"depressedFgColor_override" "White"
 			}
 			"ButtonAnimationSourceBrowse"
 			{
@@ -1960,30 +1933,25 @@
 				"wide"			"15"
 				"tall"			"15"
 				"autoResize"	"0"
-				"pinCorner"		"3"
-				"textinsetx"	"15"
-				"use_proportional_insets" "1"
-				"font"			"Cerbetica12"
-				"textAlignment"	"west"
-				"labelText"		""
-				"command"		"ClearAnimationVCD"
-				"image_drawcolor"	"TanLight"
-				"image_armedcolor"	"200 10 20 255"
-				"image_disabledcolor"		"0 0 0 255"
-				"paintbackground"			"0"
-
-				"SubImage"
-				{
-					"ControlName"	"ImagePanel"
-					"fieldName"		"SubImage"
-					"xpos"			"1"
-					"ypos"			"1"
-					"zpos"			"1"
-					"wide"			"13"
-					"tall"			"13"
-					"scaleImage"	"1"
-					"image"			"replay/thumbnails/close"
-				}		
+				"pinCorner"		"0"
+				"visible"		"1"
+				"enabled"		"1"
+				"tabPosition"	"0"
+				"labeltext"		"("
+				"font"			"CustomIcons"
+				"textAlignment"	"center"
+				"dulltext"		"0"
+				"brighttext"	"0"
+				"default"		"0"
+				"Command"			"ClearAnimationVCD"
+				"paintbackground"	"0"
+				
+				"sound_depressed"	"UI/buttonclick.wav"
+				"sound_released"	"UI/buttonclickrelease.wav"
+				
+				"defaultFgColor_override" 	"White"
+				"armedFgColor_override" 	"LightRed"
+				"depressedFgColor_override" "White"
 			}
 			"ButtonAnimationVCDBrowse"
 			{
@@ -2036,16 +2004,16 @@
 
 		"AnimDurationLabel"
 		{
-			"ControlName"	"Label"
-			"fieldName"		"AnimDurationLabel"
-			"xpos"			"0"
-			"ypos"			"120"
-			"wide"			"120"
-			"tall"			"15"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"labelText"		"#TF_ImportFile_AnimationDuration"
-			"font"			"Cerbetica12"
+			"ControlName"		"Label"
+			"fieldName"			"AnimDurationLabel"
+			"xpos"				"0"
+			"ypos"				"120"
+			"wide"				"120"
+			"tall"				"15"
+			"autoResize"		"0"
+			"pinCorner"			"0"
+			"labelText"			"#TF_ImportFile_AnimationDuration"
+			"font"				"Cerbetica12"
 		}
 
 		"AnimationLoopCheckButton"
diff --git a/resource/ui/itemrenameconfirmationdialog.res b/resource/ui/itemrenameconfirmationdialog.res
index befe771..6bb5fd6 100644
--- a/resource/ui/itemrenameconfirmationdialog.res
+++ b/resource/ui/itemrenameconfirmationdialog.res
@@ -79,8 +79,8 @@
 		"itemmodelpanel"
 		{
 			"use_item_rendertarget" "0"
-			"allow_rot"				"0"
 			"inventory_image_type"	"1"
+			"allow_rot"				"0"
 		}
 	}
 	"SubjectBG"
@@ -127,6 +127,7 @@
 		"itemmodelpanel"
 		{
 			"use_item_rendertarget" "0"
+			"inventory_image_type"	"1"
 			"allow_rot"				"0"
 		}
 	}
diff --git a/resource/ui/itemrenamedialog.res b/resource/ui/itemrenamedialog.res
index ec6c0a8..36ac9fc 100644
--- a/resource/ui/itemrenamedialog.res
+++ b/resource/ui/itemrenamedialog.res
@@ -125,7 +125,6 @@
 		"noitem_textcolor"		"TextColor"
 		"PaintBackgroundType"	"2"
 		"paintborder"	"0"
-
 		"model_xpos"	"2"
 		"model_ypos"	"5"
 		"model_wide"	"80"
@@ -175,7 +174,6 @@
 		"noitem_textcolor"		"TextColor"
 		"PaintBackgroundType"	"2"
 		"paintborder"	"0"
-
 		"model_xpos"	"2"
 		"model_ypos"	"5"
 		"model_wide"	"80"
diff --git a/resource/ui/itemselectionpanel.res b/resource/ui/itemselectionpanel.res
index 32360a0..48a6e62 100644
--- a/resource/ui/itemselectionpanel.res
+++ b/resource/ui/itemselectionpanel.res
@@ -39,6 +39,7 @@
 			"deferred_description"	"1"
 			"deferred_icon"			"1"
 		}
+		
 		"modelpanels_kv"
 		{
 			"ControlName"	"CItemModelPanel"
@@ -50,8 +51,7 @@
 			"bgcolor_override"		"Transparent"
 			"noitem_textcolor"		"TextColor"
 			"PaintBackgroundType"	"2"
-			"paintborder"	"1"
-
+			"paintborder"			"1"
 			"model_xpos"	"2"
 			"model_ypos"	"5"
 			"model_wide"	"50"
@@ -59,7 +59,6 @@
 			"text_ypos"		"60"
 			"text_center"	"1"
 			"name_only"		"1"
-
 			"inset_eq_x"	"4"
 			"inset_eq_y"	"2"
 			"deferred_description"	"1"
@@ -73,6 +72,7 @@
 
 			"use_item_sounds"	"1"
 		}
+		
 		"duplicatelabels_kv"
 		{
 			"font"			"ItemFontNameSmallest"
@@ -253,6 +253,7 @@
 		"dulltext"		"0"
 		"brighttext"	"0"
 		"Command"		"vguicancel"
+		
 		"sound_depressed"	"UI/buttonclick.wav"
 		"sound_released"	"UI/buttonclickrelease.wav"
 	}
@@ -298,6 +299,7 @@
 		"dulltext"		"0"
 		"brighttext"	"0"
 		"Command"		"show_backpack"
+		
 		"sound_depressed"	"UI/buttonclick.wav"
 		"sound_released"	"UI/buttonclickrelease.wav"
 	}
@@ -322,6 +324,7 @@
 		"dulltext"		"0"
 		"brighttext"	"0"
 		"Command"		"show_selection"
+		
 		"sound_depressed"	"UI/buttonclick.wav"
 		"sound_released"	"UI/buttonclickrelease.wav"
 	}
@@ -346,6 +349,7 @@
 		"dulltext"		"0"
 		"brighttext"	"0"
 		"Command"		"prevpage"
+		
 		"sound_depressed"	"UI/buttonclick.wav"
 		"sound_released"	"UI/buttonclickrelease.wav"
 	}
@@ -408,7 +412,6 @@
 		"PaintBackgroundType"	"2"
 		"paintborder"			"1"
 		"paintbackground"		"0"
-
 		"text_ypos"			"20"
 		"text_center"		"1"
 		"model_hide"		"1"
diff --git a/resource/ui/mainmenuplaylistentry.res b/resource/ui/mainmenuplaylistentry.res
index 4d34014..2a5ade7 100644
--- a/resource/ui/mainmenuplaylistentry.res
+++ b/resource/ui/mainmenuplaylistentry.res
@@ -63,23 +63,6 @@
 		"eatmouseinput"	"0"
 	}
 
-	"ToolTipButtonHack"
-	{
-		"ControlName"	"EditablePanel"
-		"fieldName"		"ToolTipButtonHack"
-		"xpos"			"rs1-6"
-		"ypos"			"2"
-		"zpos"			"51"
-		"wide"			"122"
-		"tall"			"15"
-		"visible"		"0"
-		"enabled"		"1"
-		"mouseinputenabled"	"1"
-		"eatmouseinput"	"0"
-		"showtooltipswhenmousedisabled"	"1"
-		"proportionaltoparent" "1"
-	}
-
 	"ModeButton"
 	{
 		"ControlName"	"CExButton"
@@ -149,7 +132,6 @@
 			"autoResize"	"1"
 			"pinCorner"		"0"
 			"proportionaltoparent"	"1"
-
 			"paintbackground"	"0"
 		}
 	}
@@ -168,8 +150,8 @@
 		"tall"			"35"
 		"autoResize"	"0"
 		"pinCorner"		"0"
-		"visible"		"0"
-		"enabled"		"0"
+		"visible"		"1"
+		"enabled"		"1"
 		"wrap"			"1"
 		"fgcolor_override" "TanLight"
 		"proportionaltoparent" "1"
@@ -190,8 +172,8 @@
 		"tall"			"35"
 		"autoResize"	"0"
 		"pinCorner"		"0"
-		"visible"		"0"
-		"enabled"		"0"
+		"visible"		"1"
+		"enabled"		"1"
 		"wrap"			"1"
 		"fgcolor_override" "TransparentBlack"
 		"proportionaltoparent" "1"
diff --git a/resource/ui/matchmakingdashboard.res b/resource/ui/matchmakingdashboard.res
index fb0bce6..1f2d963 100644
--- a/resource/ui/matchmakingdashboard.res
+++ b/resource/ui/matchmakingdashboard.res
@@ -141,8 +141,8 @@
 		{
 			"ControlName"	"CDashboardPartyMember"
 			"fieldName"		"PartySlot1"
-			"xpos"			"54"
-			"ypos"			"rs1-6"
+			"xpos"			"0"
+			"ypos"			"0"
 			"zpos"			"100"
 			"wide"			"o1"
 			"tall"			"24"
@@ -155,14 +155,18 @@
 			"mouseinputenabled"	"1"
 			"keyboardinputenabled"	"0"
 			"party_slot"	"1"
+			
+			"pin_to_sibling"			"PartySlot0"
+			"pin_corner_to_sibling"		"PIN_TOPLEFT"
+			"pin_to_sibling_corner"		"PIN_TOPRIGHT"
 		}
 
 		"PartySlot2"
 		{
 			"ControlName"	"CDashboardPartyMember"
 			"fieldName"		"PartySlot2"
-			"xpos"			"78"
-			"ypos"			"rs1-6"
+			"xpos"			"0"
+			"ypos"			"0"
 			"zpos"			"100"
 			"wide"			"o1"
 			"tall"			"24"
@@ -175,14 +179,18 @@
 			"mouseinputenabled"	"1"
 			"keyboardinputenabled"	"0"
 			"party_slot"	"2"
+			
+			"pin_to_sibling"			"PartySlot1"
+			"pin_corner_to_sibling"		"PIN_TOPLEFT"
+			"pin_to_sibling_corner"		"PIN_TOPRIGHT"
 		}
 
 		"PartySlot3"
 		{
 			"ControlName"	"CDashboardPartyMember"
 			"fieldName"		"PartySlot3"
-			"xpos"			"102"
-			"ypos"			"rs1-6"
+			"xpos"			"0"
+			"ypos"			"0"
 			"zpos"			"100"
 			"wide"			"o1"
 			"tall"			"24"
@@ -195,14 +203,18 @@
 			"mouseinputenabled"	"1"
 			"keyboardinputenabled"	"0"
 			"party_slot"	"3"
+			
+			"pin_to_sibling"			"PartySlot2"
+			"pin_corner_to_sibling"		"PIN_TOPLEFT"
+			"pin_to_sibling_corner"		"PIN_TOPRIGHT"
 		}
 
 		"PartySlot4"
 		{
 			"ControlName"	"CDashboardPartyMember"
 			"fieldName"		"PartySlot4"
-			"xpos"			"126"
-			"ypos"			"rs1-6"
+			"xpos"			"0"
+			"ypos"			"0"
 			"zpos"			"100"
 			"wide"			"o1"
 			"tall"			"24"
@@ -215,14 +227,18 @@
 			"mouseinputenabled"	"1"
 			"keyboardinputenabled"	"0"
 			"party_slot"	"4"
+			
+			"pin_to_sibling"			"PartySlot3"
+			"pin_corner_to_sibling"		"PIN_TOPLEFT"
+			"pin_to_sibling_corner"		"PIN_TOPRIGHT"
 		}
 
 		"PartySlot5"
 		{
 			"ControlName"	"CDashboardPartyMember"
 			"fieldName"		"PartySlot5"
-			"xpos"			"150"
-			"ypos"			"rs1-6"
+			"xpos"			"0"
+			"ypos"			"0"
 			"zpos"			"100"
 			"wide"			"o1"
 			"tall"			"24"
@@ -235,6 +251,10 @@
 			"mouseinputenabled"	"1"
 			"keyboardinputenabled"	"0"
 			"party_slot"	"5"
+			
+			"pin_to_sibling"			"PartySlot4"
+			"pin_corner_to_sibling"		"PIN_TOPLEFT"
+			"pin_to_sibling_corner"		"PIN_TOPRIGHT"
 		}
 
 		"QueueContainer"
@@ -405,41 +425,23 @@
 				"visible"		"1"
 				"enabled"		"1"
 				"tabPosition"	"0"
-				"labeltext"		""
-				"font"			"HudFontSmallBold"
+				"labeltext"		"("
+				"font"			"CustomIcons"
 				"textAlignment"	"center"
 				"dulltext"		"0"
 				"brighttext"	"0"
 				"default"		"1"
-				"sound_depressed"	"UI/buttonclick.wav"
-				"sound_released"	"UI/buttonclickrelease.wav"
 				"Command"		"leave_queue"
 				"proportionaltoparent"	"1"
-				"actionsignallevel"	"3"
-				"paintbackground"	"0"
-
-				"defaultFgColor_override" "46 43 42 255"
-				"armedFgColor_override" "235 226 202 255"
-				"depressedFgColor_override" "46 43 42 255"
-
-				"image_drawcolor"	"235 226 202 255"
-				"image_armedcolor"	"255 0 0 255"
-
-				"SubImage"
-				{
-					"ControlName"	"ImagePanel"
-					"fieldName"		"SubImage"
-					"xpos"			"cs-0.5"
-					"ypos"			"cs-0.5"
-					"zpos"			"1"
-					"wide"			"9"
-					"tall"			"9"
-					"visible"		"1"
-					"enabled"		"1"
-					"image"			"replay/thumbnails/close"
-					"scaleImage"	"1"
-					"proportionaltoparent"	"1"
-				}
+				"actionsignallevel"		"3"
+				"paintbackground"		"0"
+				
+				"sound_depressed"	"UI/buttonclick.wav"
+				"sound_released"	"UI/buttonclickrelease.wav"
+				
+				"defaultFgColor_override" 	"TanLight"
+				"armedFgColor_override" 	"LightRed"
+				"depressedFgColor_override" "TanLight"
 			}
 		}
 
diff --git a/resource/ui/matchmakingdashboardmvmmodeselect.res b/resource/ui/matchmakingdashboardmvmmodeselect.res
index 92b64cd..8be9d1d 100644
--- a/resource/ui/matchmakingdashboardmvmmodeselect.res
+++ b/resource/ui/matchmakingdashboardmvmmodeselect.res
@@ -134,14 +134,9 @@
 			"actionsignallevel"		"2"
 			"proportionaltoparent"	"1"
 
-			"NavUp"					"Sheet"
-			"NavDown"				"BackButton"
-			"NavLeft"				"Sheet"
-			"NavRight"				"PracticeButton"
-
 			"sound_depressed"		"UI/buttonclick.wav"
 			"sound_released"		"UI/buttonclickrelease.wav"
-			"defaultBgColor_override"		"TransparentBlack"
+			"defaultBgColor_override"	"TransparentBlack"
 		}
 
 		"PlayForBraggingRightsExplanation"
@@ -251,11 +246,6 @@
 			"actionsignallevel"		"2"
 			"proportionaltoparent"	"1"
 
-			"NavUp"					"Sheet"
-			"NavDown"				"LearnMoreButton"
-			"NavLeft"				"PlayNowButton"
-			"NavRight"				"StartPartyButton"
-
 			"sound_depressed"		"UI/buttonclick.wav"
 			"sound_released"		"UI/buttonclickrelease.wav"
 			"defaultBgColor_override"		"TransparentBlack"
diff --git a/resource/ui/matchmakingdashboardpopup_newmatch.res b/resource/ui/matchmakingdashboardpopup_newmatch.res
index becfea1..85db475 100644
--- a/resource/ui/matchmakingdashboardpopup_newmatch.res
+++ b/resource/ui/matchmakingdashboardpopup_newmatch.res
@@ -124,7 +124,7 @@
 				"keyboardinputenabled"	"0"
 				"actionsignallevel"	"2"
 				"paintbackground"	"1"
-
+				
 				"sound_depressed"	"UI/buttonclick.wav"
 				"sound_released"	"UI/buttonclickrelease.wav"
 			}
diff --git a/resource/ui/mvmscoreboard.res b/resource/ui/mvmscoreboard.res
index 0ae5505..f2a42a8 100644
--- a/resource/ui/mvmscoreboard.res
+++ b/resource/ui/mvmscoreboard.res
@@ -59,7 +59,7 @@
 		"pinCorner"			"0"
 		"visible"			"1"
 		"enabled"			"1"
-		"bgcolor_override"	"TransparentBlack"
+		"bgcolor_override"		"TransparentBlack"
 		"PaintBackgroundType"	"0"
 	}
 
diff --git a/resource/ui/objectivestatusescort.res b/resource/ui/objectivestatusescort.res
index 63c45a5..3f8c7c1 100644
--- a/resource/ui/objectivestatusescort.res
+++ b/resource/ui/objectivestatusescort.res
@@ -401,29 +401,6 @@
 			"ControlName"	"ImagePanel"
 			"fieldName"		"CapPlayerImage"
 			"xpos"			"9999"
-			"ypos"			"9999"
-			"zpos"			"3"
-			"wide"			"6"
-			"tall"			"12"
-			"visible"		"0"
-			"enabled"		"0"
-			"image"			"capture_icon_white"
-			"scaleImage"	"1"
-
-			"if_multiple_trains"
-			{
-				"xpos"		"9999"
-			}
-
-			"if_multiple_trains_top"
-			{
-				"ypos"		"45"
-			}
-
-			"if_multiple_trains_bottom"
-			{
-				"ypos"		"81"
-			}
 		}
 
 		"CapNumPlayers"
@@ -503,108 +480,6 @@
 			"ControlName"	"EditablePanel"
 			"fieldName"		"EscortTeardrop"
 			"xpos"			"9999"
-			"ypos"			"9999"
-			"zpos"			"10"
-			"wide"			"50"
-			"tall"			"42"
-			"visible"		"0"
-			"enabled"		"0"
-
-			"Teardrop"
-			{
-				"ControlName"	"CIconPanel"
-				"fieldName"		"Teardrop"
-				"xpos"			"0"
-				"ypos"			"0"
-				"zpos"			"0"
-				"wide"			"34"
-				"tall"			"41"
-				"visible"		"0"
-				"enabled"		"1"
-				"scaleImage"	"1"
-				"icon"			"cappoint_progressbar_teardrop"
-				"iconColor"		"White"
-			}
-
-			"ProgressText"
-			{
-				"ControlName"	"Label"
-				"fieldName"		"ProgressText"
-				"font"			"DefaultSmall"
-				"xpos"			"0"
-				"ypos"			"8"
-				"zpos"			"23"
-				"wide"			"0"
-				"tall"			"0"
-				"autoResize"	"0"
-				"pinCorner"		"0"
-				"visible"		"0"
-				"enabled"		"0"
-				"labelText"		"#Questlog_Progress"
-				"dulltext"		"0"
-				"brighttext"	"0"
-				"centerwrap"	"1"
-
-				"if_multiple_trains"
-				{
-					"font"		"DefaultVerySmall"
-					"xpos"		"0"
-					"ypos"		"3"
-					"wide"		"0"
-					"tall"		"0"
-				}
-			}
-
-			"Blocked"
-			{
-				"ControlName"	"CIconPanel"
-				"fieldName"		"Blocked"
-				"xpos"			"2"
-				"ypos"			"3"
-				"zpos"			"1"
-				"wide"			"30"
-				"tall"			"30"
-				"visible"		"1"
-				"enabled"		"1"
-				"scaleImage"	"1"
-				"icon"			"cappoint_progressbar_blocked"
-				"iconColor"		"White"
-
-				"if_multiple_trains"
-				{
-					"xpos"		"2"
-					"ypos"		"2"
-					"wide"		"31"
-					"tall"		"31"
-				}
-			}
-
-			"Capping"
-			{
-				"ControlName"	"ImagePanel"
-				"fieldName"		"Capping"
-				"xpos"			"6"
-				"ypos"			"6"
-				"zpos"			"1"
-				"wide"			"24"
-				"tall"			"24"
-				"autoResize"	"0"
-				"pinCorner"		"0"
-				"visible"		"0"
-				"enabled"		"1"
-				"tabPosition"	"0"
-				"labelText"		""
-				"image"			"../hud/cart_arrow_right"
-				"scaleImage"	"1"
-
-				"if_multiple_trains"
-				{
-					"xpos"		"8"
-					"ypos"		"8"
-					"wide"		"20"
-					"tall"		"20"
-				}
-			}
 		}
 	}
 }
\ No newline at end of file
diff --git a/resource/ui/publishfiledialog.res b/resource/ui/publishfiledialog.res
index 8899f5e..4da9536 100644
--- a/resource/ui/publishfiledialog.res
+++ b/resource/ui/publishfiledialog.res
@@ -332,19 +332,6 @@
 		"Command"			"MainFileCosmetics"
 		"Default"			"1"
 		"font"				"HudFontSmallBold"
-
-		"SubImage"
-		{
-			"ControlName"	"ImagePanel"
-			"fieldName"		"SubImage"
-			"xpos"			"115"
-			"ypos"			"0"
-			"zpos"			"1"
-			"wide"			"25"
-			"tall"			"25"
-			"scaleImage"	"1"
-			"image"			"importtool_goldstar"
-		}
 	}
 
 	"ButtonSourceOther"
@@ -391,19 +378,6 @@
 		"Command"			"MainFileMaps"
 		"Default"			"1"
 		"font"				"HudFontSmallBold"
-
-		"SubImage"
-		{
-			"ControlName"	"ImagePanel"
-			"fieldName"		"SubImage"
-			"xpos"			"115"
-			"ypos"			"0"
-			"zpos"			"1"
-			"wide"			"25"
-			"tall"			"25"
-			"scaleImage"	"1"
-			"image"			"beta"
-		}
 	}
 
 	"BrowseDescription"
diff --git a/resource/ui/pvprankpanel.res b/resource/ui/pvprankpanel.res
index b76491c..09d780c 100644
--- a/resource/ui/pvprankpanel.res
+++ b/resource/ui/pvprankpanel.res
@@ -339,10 +339,6 @@
 					if_mini
 					{
 						"xpos"			"40"
-						"zpos"			"0"
-						"wide"			"100"
-						"tall"			"20"
-						"textAlignment"	"south-west"
 					}
 				}
 
diff --git a/resource/ui/replaybrowser/basepage.res b/resource/ui/replaybrowser/basepage.res
deleted file mode 100644
index 4f7b93d..0000000
--- a/resource/ui/replaybrowser/basepage.res
+++ /dev/null
@@ -1,59 +0,0 @@
-"resource/ui/basepage.res"
-{
-	"BasePage"
-	{
-		"ControlName"		"Frame"
-		"fieldName"			"BasePage"
-		"xpos"				"0"
-		"ypos"				"40"
-		"wide"				"f0"
-		"tall"				"480"
-		"autoResize"		"0"
-		"pinCorner"			"0"
-		"visible"			"0"
-		"enabled"			"1"
-		"tabPosition"		"0"
-		"settitlebarvisible"	"0"
-		"PaintBackgroundType"	"0"
-		"bgcolor_override"		"DarkGrey"
-	}
-
-	"SearchTextEntry"
-	{
-		"ControlName"		"TextEntry"
-		"fieldName"			"SearchTextEntry"
-		"maxchars"			"255"
-		"textHidden"		"0"
-		"textAlignment"		"west"
-		"unicode"			"1"
-		"wrap"				"0"
-		"xpos"				"c+80"
-		"ypos"				"5"
-		"tall"				"15"
-		"wide"				"160"
-		"autoResize"		"0"
-		"pinCorner"			"0"
-		"visible"			"1"
-		"enabled"			"1"
-		"tabPosition"		"0"
-		"fgcolor_override"	"White"
-		"bgcolor_override"	"DarkerGrey"
-		"Font"				"Cerbetica14"
-	}
-
-	"ReplayList"
-	{
-		"ControlName"		"PanelListPanel"
-		"fieldName"			"ReplayList"
-		"xpos"				"c-300"
-		"ypos"				"20"
-		"wide"				"605"
-		"tall"				"350"
-		"visible"			"1"
-		"enabled"			"1"
-		"tabPosition"		"0"
-		"paintbackground"	"1"
-		"bgcolor_override"	"Transparent"
-		"autohide_scrollbar" "1"
-	}
-}
\ No newline at end of file
diff --git a/resource/ui/replaybrowser/mainpanel.res b/resource/ui/replaybrowser/mainpanel.res
index 855ad68..e1ddd86 100644
--- a/resource/ui/replaybrowser/mainpanel.res
+++ b/resource/ui/replaybrowser/mainpanel.res
@@ -141,8 +141,8 @@
 			"paintbackground"			"1"
 			"activeborder_override"		"CyanBorderTabs"
 			"normalborder_override"		"CyanBorderTabsInactive"
-			"unselectedBgColor_override"	"10 10 10 255"
-			"depressedBgColor_override"		"10 10 10 255"
+			"armedBgColor_override"		"10 10 10 255"
+			"selectedBgColor_override"	"10 10 10 255"
 		}
 	}
 
diff --git a/resource/ui/replaybrowser/thumbnailcollection.res b/resource/ui/replaybrowser/thumbnailcollection.res
deleted file mode 100644
index 5d33167..0000000
--- a/resource/ui/replaybrowser/thumbnailcollection.res
+++ /dev/null
@@ -1,205 +0,0 @@
-"resource/ui/replaybrowser/thumbnailcollection.res"
-{
-	"ThumbnailCollection"
-	{
-		"ControlName"			"Panel"
-		"fieldName"				"ThumbnailCollection"
-		"wide"					"f0"
-		"tall"					"180"
-		"autoResize"			"0"
-		"pinCorner"				"0"
-		"visible"				"1"
-		"enabled"				"1"
-		"tabPosition"			"0"
-		"settitlebarvisible"	"1"
-		"bgcolor_override"		"DarkGrey"
-	}
-
-	"RenderAllButton"
-	{
-		"ControlName"	"CExButton"
-		"fieldName"		"RenderAllButton"
-		"wide"			"140"
-		"tall"			"15"
-		"zpos"			"5"
-		"visible"		"0"
-		"enabled"		"1"
-		"font"			"Cerbetica14"
-		"textAlignment"	"center"
-		"text"			"#Replay_RenderAll"
-		"Command"		"render_queued_replays"
-		"sound_depressed"	"UI/buttonclick.wav"
-		"sound_released"	"UI/buttonclickrelease.wav"
-	}
-
-	"CaratLabel"
-	{
-		"ControlName"	"CExLabel"
-		"fieldName"		"CaratLabel"
-		"font"			"Cerbetica14"
-		"textAlignment"	"west"
-		"labelText"		""
-		"auto_wide_tocontents" "1"
-		"tall"			"15"
-		"zpos"			"2"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"0"
-		"enabled"		"0"
-		"wide"			"0"
-		"fgcolor"		"200 80 60 0"
-	}
-
-	"TitleLabel"
-	{
-		"ControlName"	"CExLabel"
-		"fieldName"		"TitleLabel"
-		"font"			"Cerbetica14"
-		"labelText"		"%titleandcount%"
-		"textAlignment"	"west"
-		"zpos"			"2"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"1"
-		"enabled"		"1"
-		"wide"			"f0"
-		"fgcolor"		"White"
-	}
-
-	"DateLabel"
-	{
-		"ControlName"	"CExLabel"
-		"fieldName"		"DateLabel"
-		"font"			"Cerbetica14"
-		"textAlignment"	"west"
-		"zpos"			"2"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"0"
-		"enabled"		"1"
-		"wide"			"f0"
-		"fgcolor_override" "White"
-	}
-
-	"WarningLabel"
-	{
-		"ControlName"	"CExLabel"
-		"fieldName"		"WarningLabel"
-		"font"			"Cerbetica14"
-		"textAlignment"	"west"
-		"zpos"			"1"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"0"
-		"enabled"		"1"
-		"wrap"			"1"
-		"fgcolor_override" "White"
-	}
-
-	"Line"
-	{
-		"ControlName"	"Panel"
-		"FieldName"		"Line"
-		"zpos"			"2"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"0"
-		"enabled"		"0"
-		"bgcolor_override" "106 91 86 0"
-	}
-
-	"CaratLabel"
-	{
-		"ControlName"	"CExLabel"
-		"fieldName"		"CaratLabel"
-		"font"			"Cerbetica14"
-		"textAlignment"	"west"
-		"labelText"		""
-		"auto_wide_tocontents" "1"
-		"tall"			"15"
-		"zpos"			"2"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"0"
-		"enabled"		"0"
-		"wide"			"f0"
-		"fgcolor_override" "199 80 48 255"
-	}
-
-	"UnconvertedBg"
-	{
-		"ControlName"	"Panel"
-		"fieldName"		"UnconvertedBg"
-		"zpos"			"1"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"0"
-		"enabled"		"1"
-		"bgcolor_override" "DarkerGrey"
-	}
-
-	"NoReplayItemsLabel"
-	{
-		"ControlName"	"CExLabel"
-		"fieldName"		"NoReplayItemsLabel"
-		"font"			"Cerbetica14"
-		"wide"			"400"
-		"tall"			"40"
-		"zpos"			"5"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"1"
-		"enabled"		"1"
-		"centerwrap"	"1"
-		"fgcolor_override"	"TextColor"
-	}
-
-	"ShowPrevButton"
-	{
-		"ControlName"	"CExButton"
-		"fieldName"		"ShowPrevButton"
-		"xpos"			"0"
-		"ypos"			"0"
-		"zpos"			"100"
-		"wide"			"100"
-		"tall"			"12"
-		"autoResize"	"0"
-		"pinCorner"		"3"
-		"visible"		"1"
-		"enabled"		"1"
-		"tabPosition"	"0"
-		"labelText"		"%prevbuttontext%"
-		"font"			"ItemFontNameSmall"
-		"textAlignment"	"center"
-		"dulltext"		"0"
-		"brighttext"	"0"
-		"default"		"1"
-		"Command"		"show_prev"
-		"sound_depressed"	"UI/buttonclick.wav"
-		"sound_released"	"UI/buttonclickrelease.wav"
-	}
-	"ShowNextButton"
-	{
-		"ControlName"	"CExButton"
-		"fieldName"		"ShowNextButton"
-		"xpos"			"100"
-		"ypos"			"20"
-		"zpos"			"100"
-		"wide"			"100"
-		"tall"			"12"
-		"autoResize"	"0"
-		"pinCorner"		"3"
-		"visible"		"1"
-		"enabled"		"1"
-		"tabPosition"	"0"
-		"labelText"		"%nextbuttontext%"
-		"font"			"ItemFontNameSmall"
-		"textAlignment"	"center"
-		"dulltext"		"0"
-		"brighttext"	"0"
-		"default"		"1"
-		"Command"		"show_next"
-		"sound_depressed"	"UI/buttonclick.wav"
-		"sound_released"	"UI/buttonclickrelease.wav"
-	}
-}
\ No newline at end of file
diff --git a/resource/ui/spectator.res b/resource/ui/spectator.res
index d18efc5..8d772a1 100644
--- a/resource/ui/spectator.res
+++ b/resource/ui/spectator.res
@@ -1,3 +1,5 @@
+#base "hudinspectpanel.res"
+
 "Resource/UI/Spectator.res"
 {
 	"Spectator"
@@ -112,7 +114,6 @@
 		"ControlName"	"CExLabel"
 		"fieldName"		"SwitchCamModeKeyLabel"
 		"xpos"			"9999"
-
 	}
 	"SwitchCamModeLabel"
 	{
@@ -150,79 +151,6 @@
 		"fieldName"		"TipLabel"
 		"xpos"			"9999"
 	}
-	"itempanel"
-	{
-		"ControlName"	"CItemModelPanel"
-		"fieldName"		"itempanel"
-		"xpos"			"r249"
-		"ypos"			"c50"
-		"zpos"			"10"
-		"wide"			"240"
-		"tall"			"100"
-		"visible"		"0"
-		"bgcolor_override"		"255 255 255 0"
-		"paintbackground"		"1"
-		"PaintBackgroundType"	"0"
-
-		"model_ypos"		"20"
-		"model_center_x"	"1"
-		"model_wide"		"90"
-		"model_tall"		"60"
-
-		"text_xpos"			"10"
-		"text_ypos"			"10"
-		"text_wide"			"220"
-		"text_center"		"1"
-
-		"max_text_height"	"100"
-		"padding_height"	"10"
-		"resize_to_text"	"1"
-		"text_forcesize"	"2"
-
-		"ItemBG"
-		{
-			"ControlName"	"ImagePanel"
-			"fieldName"		"ItemBG"
-			"xpos"			"0"
-			"ypos"			"0"
-			"zpos"			"-1"
-			"wide"			"240"
-			"tall"			"900"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"fillcolor"		"HudBlack"
-		}
-
-		"itemmodelpanel"
-		{
-			"fieldName"		"itemmodelpanel"
-			"use_item_rendertarget" "0"
-			"useparentbg"	"1"
-			"inventory_image_type"	"1"
-		}
-
-		"ItemLabel"
-		{
-			"ControlName"	"Label"
-			"fieldName"		"ItemLabel"
-			"font"			"HudFontSmallest"
-			"xpos"			"10"
-			"ypos"			"3"
-			"zpos"			"1"
-			"wide"			"270"
-			"tall"			"16"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"labelText"		"#FreezePanel_Item"
-			"textAlignment"	"Left"
-			"dulltext"		"0"
-			"brighttext"	"0"
-		}
-	}
 
 	"spectator_extras"
 	{
diff --git a/resource/ui/spectatortournament.res b/resource/ui/spectatortournament.res
index 43284eb..96ced69 100644
--- a/resource/ui/spectatortournament.res
+++ b/resource/ui/spectatortournament.res
@@ -1,3 +1,5 @@
+#base "hudinspectpanel.res"
+
 "Resource/UI/SpectatorTournament.res"
 {
 	"specgui"
@@ -43,6 +45,7 @@
 				"enabled"			"1"
 				"image"				"../hud/class_scoutred"
 				"scaleImage"		"1"
+				"proportionaltoparent"	"1"
 			}
 
 			"classimagebg"
@@ -58,6 +61,7 @@
 				"enabled"			"1"
 				"bgcolor_override"	"Black"
 				"PaintBackgroundType"	"0"
+				"proportionaltoparent"	"1"
 			}
 
 			"PanelLeftFringe"
@@ -330,6 +334,7 @@
 		"textAlignment"	"center"
 		"font"			"HudFontMedium"
 	}
+
 	"BuyBackLabel"
 	{
 		"ControlName"	"CExLabel"
diff --git a/resource/ui/statsummary.res b/resource/ui/statsummary.res
index f4b4f27..6dea61f 100644
--- a/resource/ui/statsummary.res
+++ b/resource/ui/statsummary.res
@@ -26,10 +26,10 @@
 		"scaleImage"	"1"
 	}
 
-	"MainBG"
+	"Background"
 	{
 		"ControlName"	"ImagePanel"
-		"fieldName"		"MainBackground"
+		"fieldName"		"Background"
 		"xpos"			"0"
 		"ypos"			"0"
 		"wide"			"f0"
@@ -44,98 +44,7 @@
 	{
 		"ControlName"	"EditablePanel"
 		"fieldName"		"MapInfo"
-		"xpos"			"0"
-		"ypos"			"0"
-		"wide"			"0"
-		"tall"			"0"
-		"visible"		"0"
-		"enabled"		"0"
-		"bgcolor_override"	"TanDarker"
-
-		"MainBG"
-		{
-			"ControlName"	"ImagePanel"
-			"fieldName"		"MainBackground"
-			"xpos"			"0"
-			"ypos"			"0"
-			"wide"			"f0"
-			"tall"			"480"
-			"visible"		"1"
-			"enabled"		"1"
-			"image"			"../console/background_upward"
-			"scaleImage"	"1"
-		}
-
-		"InfoBG"
-		{
-			"ControlName"	"EditablePanel"
-			"fieldName"		"InfoBG"
-			"xpos"			"c+10"
-			"ypos"			"120"
-			"wide"			"285"
-			"tall"			"280"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"bgcolor_override"	"15 15 15 150"
-		}
-
-		"Title"
-		{
-			"ControlName"	"CExLabel"
-			"fieldName"		"Title"
-			"font"			"HudFontSmallBold"
-			"labelText"		"%title%"
-			"textAlignment"	"north"
-			"xpos"			"c20"
-			"ypos"			"135"
-			"zpos"			"2"
-			"wide"			"275"
-			"tall"			"30"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"fgcolor_override" "ColorCyan"
-		}
-		"MapAuthors"
-		{
-			"ControlName"	"CExLabel"
-			"fieldName"		"MapAuthors"
-			"font"			"HudFontSmallBold"
-			"labelText"		"%authors%"
-			"textAlignment"	"north"
-			"xpos"			"c20"
-			"ypos"			"155"
-			"zpos"			"2"
-			"wide"			"275"
-			"tall"			"275"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"wrap"			"0"
-		}
-
-		"MapLeaderboardTitle"
-		{
-			"ControlName"	"CExLabel"
-			"fieldName"		"MapLeaderboardTitle"
-			"font"			"HudFontSmallBold"
-			"labelText"		"%map_leaderboard_title%"
-			"textAlignment"	"north"
-			"xpos"			"c20"
-			"ypos"			"230"
-			"zpos"			"2"
-			"wide"			"275"
-			"tall"			"30"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"fgcolor_override" "137 191 60 255"
-		}
+		"xpos"			"9999"
 	}
 
 	"OnYourWayLabel"
@@ -215,1754 +124,7 @@
 	{
 		"ControlName"	"EditablePanel"
 		"fieldName"		"StatData"
-		"xpos"			"0"
-		"ypos"			"-130"
-		"zpos"			"1"
-		"wide"			"0"
-		"tall"			"480"
-		"visible"		"1"
-		"enabled"		"1"
-
-		"NonInteractiveHeaders"
-		{
-			"ControlName"	"EditablePanel"
-			"fieldName"		"NonInteractiveHeaders"
-			"xpos"			"0"
-			"ypos"			"0"
-			"zpos"			"2"
-			"wide"			"f0"
-			"tall"			"480"
-			"visible"		"1"
-			"enabled"		"1"
-
-			"BarChartLabelA"
-			{
-				"ControlName"		"Label"
-				"fieldName"			"BarChartLabelA"
-				"font"				"Cerbetica12"
-				"labelText"			"#StatSummary_StatTitle_MostPoints"
-				"textAlignment"		"east"
-				"xpos"				"c-282"
-				"ypos"				"212"
-				"zpos"				"5"
-				"wide"				"150"
-				"tall"				"20"
-				"autoResize"		"0"
-				"pinCorner"			"0"
-				"visible"			"1"
-				"enabled"			"1"
-			}
-			"BarChartLabelB"
-			{
-				"ControlName"		"Label"
-				"fieldName"			"BarChartLabelB"
-				"font"				"Cerbetica12"
-				"labelText"			"#StatSummary_StatTitle_TotalPlaytime"
-				"textAlignment"		"west"
-				"xpos"				"c-127"
-				"ypos"				"212"
-				"zpos"				"5"
-				"wide"				"150"
-				"tall"				"20"
-				"autoResize"		"0"
-				"pinCorner"			"0"
-				"visible"			"1"
-				"enabled"			"1"
-			}
-			"OverallRecordLabel"
-			{
-				"ControlName"		"Label"
-				"fieldName"			"OverallRecordLabel"
-				"font"				"Cerbetica12"
-				"labelText"			"#StatSummary_Label_AsAnyClass"
-				"textAlignment"		"west"
-				"xpos"				"c+130"
-				"ypos"				"200"
-				"zpos"				"5"
-				"wide"				"200"
-				"tall"				"20"
-				"autoResize"		"0"
-				"pinCorner"			"0"
-				"visible"			"1"
-				"enabled"			"1"
-			}
-		}
-
-		"AveragesBG"
-		{
-			"ControlName"	"EditablePanel"
-			"fieldName"		"AveragesBG"
-			"xpos"			"c-295"
-			"ypos"			"165"
-			"wide"			"600"
-			"tall"			"300"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"bgcolor_override"	"15 15 15 255"
-		}
-		"AveragesLabel"
-		{
-			"ControlName"	"Label"
-			"fieldName"		"AveragesLabel"
-			"font"			"ScoreboardMedium"
-			"labelText"		"#StatSummary_Label_PerformanceReport"
-			"textAlignment"	"west"
-			"xpos"			"c-285"
-			"ypos"			"185"
-			"wide"			"300"
-			"tall"			"20"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-		}
-		"ClassBarBG1A"
-		{
-			"ControlName"	"ImagePanel"
-			"fieldName"		"ClassBarBG1A"
-			"xpos"			"c-285"
-			"ypos"			"230"
-			"zpos"			"2"
-			"wide"			"312"
-			"tall"			"16"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"tabPosition"	"0"
-			"fillcolor"		"0 0 0 80"
-			"PaintBackgroundType"	"0"
-		}
-		"ClassBarBG1B"
-		{
-			"ControlName"	"ImagePanel"
-			"fieldName"		"ClassBarBG1B"
-			"xpos"			"c+30"
-			"ypos"			"230"
-			"zpos"			"2"
-			"wide"			"70"
-			"tall"			"16"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"tabPosition"	"0"
-			"fillcolor"		"0 0 0 80"
-			"PaintBackgroundType"	"0"
-		}
-		"ClassBar1A"
-		{
-			"ControlName"	"ImagePanel"
-			"fieldName"		"ClassBar1A"
-			"xpos"			"c-282"
-			"ypos"			"232"
-			"zpos"			"3"
-			"wide"			"151"
-			"tall"			"12"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"tabPosition"	"0"
-			"fillcolor"		"StatBar1"
-			"PaintBackgroundType"	"0"
-		}
-		"ClassBar1B"
-		{
-			"ControlName"	"ImagePanel"
-			"fieldName"		"ClassBar1B"
-			"xpos"			"c-127"
-			"ypos"			"232"
-			"zpos"			"3"
-			"wide"			"151"
-			"tall"			"12"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"tabPosition"	"0"
-			"fillcolor"		"StatBar1"
-			"PaintBackgroundType"	"0"
-		}
-		"ClassBarLabel1A"
-		{
-			"ControlName"	"Label"
-			"fieldName"		"ClassBarLabel1A"
-			"font"			"Cerbetica12"
-			"labelText"		"%classbarlabel1A%"
-			"textAlignment"	"west"
-			"xpos"			"c-282"
-			"ypos"			"228"
-			"zpos"			"6"
-			"wide"			"100"
-			"tall"			"20"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-		}
-		"ClassBarLabel1B"
-		{
-			"ControlName"	"Label"
-			"fieldName"		"ClassBarLabel1B"
-			"font"			"Cerbetica12"
-			"labelText"		"%classbarlabel1B%"
-			"textAlignment"	"west"
-			"xpos"			"c-127"
-			"ypos"			"228"
-			"zpos"			"6"
-			"wide"			"100"
-			"tall"			"20"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-		}
-		"ClassLabel1"
-		{
-			"ControlName"	"Label"
-			"fieldName"		"ClassLabel1"
-			"font"			"Cerbetica12"
-			"labelText"		"%class1%"
-			"textAlignment"	"west"
-			"xpos"			"c+34"
-			"ypos"			"228"
-			"zpos"			"5"
-			"wide"			"300"
-			"tall"			"20"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-		}
-		"ClassBarBG2A"
-		{
-			"ControlName"	"ImagePanel"
-			"fieldName"		"ClassBarBG2A"
-			"xpos"			"c-285"
-			"ypos"			"248"
-			"zpos"			"2"
-			"wide"			"312"
-			"tall"			"16"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"tabPosition"	"0"
-			"fillcolor"		"0 0 0 80"
-			"PaintBackgroundType"	"0"
-		}
-		"ClassBarBG2B"
-		{
-			"ControlName"	"ImagePanel"
-			"fieldName"		"ClassBarBG2B"
-			"xpos"			"c+30"
-			"ypos"			"248"
-			"zpos"			"2"
-			"wide"			"70"
-			"tall"			"16"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"tabPosition"	"0"
-			"fillcolor"		"0 0 0 80"
-			"PaintBackgroundType"	"0"
-		}
-		"ClassBar2A"
-		{
-			"ControlName"	"ImagePanel"
-			"fieldName"		"ClassBar2A"
-			"xpos"			"c-282"
-			"ypos"			"250"
-			"zpos"			"3"
-			"wide"			"151"
-			"tall"			"12"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"tabPosition"	"0"
-			"fillcolor"		"StatBar2"
-			"PaintBackgroundType"	"0"
-		}
-		"ClassBar2B"
-		{
-			"ControlName"	"ImagePanel"
-			"fieldName"		"ClassBar2B"
-			"xpos"			"c-127"
-			"ypos"			"250"
-			"zpos"			"3"
-			"wide"			"151"
-			"tall"			"12"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"tabPosition"	"0"
-			"fillcolor"		"StatBar2"
-			"PaintBackgroundType"	"0"
-		}
-		"ClassBarLabel2A"
-		{
-			"ControlName"	"Label"
-			"fieldName"		"ClassBarLabel2A"
-			"font"			"Cerbetica12"
-			"labelText"		"%classbarlabel2A%"
-			"textAlignment"	"west"
-			"xpos"			"c-282"
-			"ypos"			"246"
-			"zpos"			"6"
-			"wide"			"100"
-			"tall"			"20"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-		}
-		"ClassBarLabel2B"
-		{
-			"ControlName"	"Label"
-			"fieldName"		"ClassBarLabel2B"
-			"font"			"Cerbetica12"
-			"labelText"		"%classbarlabel2B%"
-			"textAlignment"	"west"
-			"xpos"			"c-127"
-			"ypos"			"246"
-			"zpos"			"6"
-			"wide"			"100"
-			"tall"			"20"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-		}
-		"ClassLabel2"
-		{
-			"ControlName"	"Label"
-			"fieldName"		"ClassLabel2"
-			"font"			"Cerbetica12"
-			"labelText"		"%class2%"
-			"textAlignment"	"west"
-			"xpos"			"c+34"
-			"ypos"			"246"
-			"zpos"			"5"
-			"wide"			"300"
-			"tall"			"20"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-		}
-		"ClassBarBG3A"
-		{
-			"ControlName"	"ImagePanel"
-			"fieldName"		"ClassBarBG3A"
-			"xpos"			"c-285"
-			"ypos"			"266"
-			"zpos"			"2"
-			"wide"			"312"
-			"tall"			"16"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"tabPosition"	"0"
-			"fillcolor"		"0 0 0 80"
-			"PaintBackgroundType"	"0"
-		}
-		"ClassBarBG3B"
-		{
-			"ControlName"	"ImagePanel"
-			"fieldName"		"ClassBarBG3B"
-			"xpos"			"c+30"
-			"ypos"			"266"
-			"zpos"			"2"
-			"wide"			"70"
-			"tall"			"16"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"tabPosition"	"0"
-			"fillcolor"		"0 0 0 80"
-			"PaintBackgroundType"	"0"
-		}
-		"ClassBar3A"
-		{
-			"ControlName"	"ImagePanel"
-			"fieldName"		"ClassBar3A"
-			"xpos"			"c-282"
-			"ypos"			"268"
-			"zpos"			"3"
-			"wide"			"151"
-			"tall"			"12"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"tabPosition"	"0"
-			"fillcolor"		"StatBar3"
-			"PaintBackgroundType"	"0"
-		}
-		"ClassBar3B"
-		{
-			"ControlName"	"ImagePanel"
-			"fieldName"		"ClassBar3B"
-			"xpos"			"c-127"
-			"ypos"			"268"
-			"zpos"			"3"
-			"wide"			"151"
-			"tall"			"12"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"tabPosition"	"0"
-			"fillcolor"		"StatBar3"
-			"PaintBackgroundType"	"0"
-		}
-		"ClassBarLabel3A"
-		{
-			"ControlName"	"Label"
-			"fieldName"		"ClassBarLabel3A"
-			"font"			"Cerbetica12"
-			"labelText"		"%classbarlabel3A%"
-			"textAlignment"	"west"
-			"xpos"			"c-282"
-			"ypos"			"264"
-			"zpos"			"6"
-			"wide"			"100"
-			"tall"			"20"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-		}
-		"ClassBarLabel3B"
-		{
-			"ControlName"	"Label"
-			"fieldName"		"ClassBarLabel3B"
-			"font"			"Cerbetica12"
-			"labelText"		"%classbarlabel3B%"
-			"textAlignment"	"west"
-			"xpos"			"c-127"
-			"ypos"			"264"
-			"zpos"			"6"
-			"wide"			"100"
-			"tall"			"20"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-		}
-		"ClassLabel3"
-		{
-			"ControlName"	"Label"
-			"fieldName"		"ClassLabel3"
-			"font"			"Cerbetica12"
-			"labelText"		"%class3%"
-			"textAlignment"	"west"
-			"xpos"			"c+34"
-			"ypos"			"264"
-			"zpos"			"5"
-			"wide"			"300"
-			"tall"			"20"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-		}
-		"ClassBarBG4A"
-		{
-			"ControlName"	"ImagePanel"
-			"fieldName"		"ClassBarBG4A"
-			"xpos"			"c-285"
-			"ypos"			"284"
-			"zpos"			"2"
-			"wide"			"312"
-			"tall"			"16"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"tabPosition"	"0"
-			"fillcolor"		"0 0 0 80"
-			"PaintBackgroundType"	"0"
-		}
-		"ClassBarBG4B"
-		{
-			"ControlName"	"ImagePanel"
-			"fieldName"		"ClassBarBG4B"
-			"xpos"			"c+30"
-			"ypos"			"284"
-			"zpos"			"2"
-			"wide"			"70"
-			"tall"			"16"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"tabPosition"	"0"
-			"fillcolor"		"0 0 0 80"
-			"PaintBackgroundType"	"0"
-		}
-		"ClassBar4A"
-		{
-			"ControlName"	"ImagePanel"
-			"fieldName"		"ClassBar4A"
-			"xpos"			"c-282"
-			"ypos"			"286"
-			"zpos"			"3"
-			"wide"			"151"
-			"tall"			"12"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"tabPosition"	"0"
-			"fillcolor"		"StatBar4"
-			"PaintBackgroundType"	"0"
-		}
-		"ClassBar4B"
-		{
-			"ControlName"	"ImagePanel"
-			"fieldName"		"ClassBar4B"
-			"xpos"			"c-127"
-			"ypos"			"286"
-			"zpos"			"3"
-			"wide"			"151"
-			"tall"			"12"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"tabPosition"	"0"
-			"fillcolor"		"StatBar4"
-			"PaintBackgroundType"	"0"
-		}
-		"ClassBarLabel4A"
-		{
-			"ControlName"	"Label"
-			"fieldName"		"ClassBarLabel4A"
-			"font"			"Cerbetica12"
-			"labelText"		"%classbarlabel4A%"
-			"textAlignment"	"west"
-			"xpos"			"c-282"
-			"ypos"			"282"
-			"zpos"			"6"
-			"wide"			"100"
-			"tall"			"20"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-		}
-		"ClassBarLabel4B"
-		{
-			"ControlName"	"Label"
-			"fieldName"		"ClassBarLabel4B"
-			"font"			"Cerbetica12"
-			"labelText"		"%classbarlabel4B%"
-			"textAlignment"	"west"
-			"xpos"			"c-127"
-			"ypos"			"282"
-			"zpos"			"6"
-			"wide"			"100"
-			"tall"			"20"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-		}
-		"ClassLabel4"
-		{
-			"ControlName"	"Label"
-			"fieldName"		"ClassLabel4"
-			"font"			"Cerbetica12"
-			"labelText"		"%class4%"
-			"textAlignment"	"west"
-			"xpos"			"c+34"
-			"ypos"			"282"
-			"zpos"			"5"
-			"wide"			"300"
-			"tall"			"20"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-		}
-		"ClassBarBG5A"
-		{
-			"ControlName"	"ImagePanel"
-			"fieldName"		"ClassBarBG5A"
-			"xpos"			"c-285"
-			"ypos"			"302"
-			"zpos"			"2"
-			"wide"			"312"
-			"tall"			"16"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"tabPosition"	"0"
-			"fillcolor"		"0 0 0 80"
-			"PaintBackgroundType"	"0"
-		}
-		"ClassBarBG5B"
-		{
-			"ControlName"	"ImagePanel"
-			"fieldName"		"ClassBarBG5B"
-			"xpos"			"c+30"
-			"ypos"			"302"
-			"zpos"			"2"
-			"wide"			"70"
-			"tall"			"16"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"tabPosition"	"0"
-			"fillcolor"		"0 0 0 80"
-			"PaintBackgroundType"	"0"
-		}
-		"ClassBar5A"
-		{
-			"ControlName"	"ImagePanel"
-			"fieldName"		"ClassBar5A"
-			"xpos"			"c-282"
-			"ypos"			"304"
-			"zpos"			"3"
-			"wide"			"151"
-			"tall"			"12"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"tabPosition"	"0"
-			"fillcolor"		"StatBar5"
-			"PaintBackgroundType"	"0"
-		}
-		"ClassBar5B"
-		{
-			"ControlName"	"ImagePanel"
-			"fieldName"		"ClassBar5B"
-			"xpos"			"c-127"
-			"ypos"			"304"
-			"zpos"			"3"
-			"wide"			"151"
-			"tall"			"12"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"tabPosition"	"0"
-			"fillcolor"		"StatBar5"
-			"PaintBackgroundType"	"0"
-		}
-		"ClassBarLabel5A"
-		{
-			"ControlName"	"Label"
-			"fieldName"		"ClassBarLabel5A"
-			"font"			"Cerbetica12"
-			"labelText"		"%classbarlabel5A%"
-			"textAlignment"	"west"
-			"xpos"			"c-282"
-			"ypos"			"300"
-			"zpos"			"6"
-			"wide"			"100"
-			"tall"			"20"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-		}
-		"ClassBarLabel5B"
-		{
-			"ControlName"	"Label"
-			"fieldName"		"ClassBarLabel5B"
-			"font"			"Cerbetica12"
-			"labelText"		"%classbarlabel5B%"
-			"textAlignment"	"west"
-			"xpos"			"c-127"
-			"ypos"			"300"
-			"zpos"			"6"
-			"wide"			"100"
-			"tall"			"20"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-		}
-		"ClassLabel5"
-		{
-			"ControlName"	"Label"
-			"fieldName"		"ClassLabel5"
-			"font"			"Cerbetica12"
-			"labelText"		"%class5%"
-			"textAlignment"	"west"
-			"xpos"			"c+34"
-			"ypos"			"300"
-			"zpos"			"5"
-			"wide"			"282"
-			"tall"			"20"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-		}
-		"ClassBarBG6A"
-		{
-			"ControlName"	"ImagePanel"
-			"fieldName"		"ClassBarBG6A"
-			"xpos"			"c-285"
-			"ypos"			"320"
-			"zpos"			"2"
-			"wide"			"312"
-			"tall"			"16"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"tabPosition"	"0"
-			"fillcolor"		"0 0 0 80"
-			"PaintBackgroundType"	"0"
-		}
-		"ClassBarBG6B"
-		{
-			"ControlName"	"ImagePanel"
-			"fieldName"		"ClassBarBG6B"
-			"xpos"			"c+30"
-			"ypos"			"320"
-			"zpos"			"2"
-			"wide"			"70"
-			"tall"			"16"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"tabPosition"	"0"
-			"fillcolor"		"0 0 0 80"
-			"PaintBackgroundType"	"0"
-		}
-		"ClassBar6A"
-		{
-			"ControlName"	"ImagePanel"
-			"fieldName"		"ClassBar6A"
-			"xpos"			"c-282"
-			"ypos"			"322"
-			"zpos"			"3"
-			"wide"			"151"
-			"tall"			"12"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"tabPosition"	"0"
-			"fillcolor"		"StatBar6"
-			"PaintBackgroundType"	"0"
-		}
-		"ClassBar6B"
-		{
-			"ControlName"	"ImagePanel"
-			"fieldName"		"ClassBar6B"
-			"xpos"			"c-127"
-			"ypos"			"322"
-			"zpos"			"3"
-			"wide"			"151"
-			"tall"			"12"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"tabPosition"	"0"
-			"fillcolor"		"StatBar6"
-			"PaintBackgroundType"	"0"
-		}
-		"ClassBarLabel6A"
-		{
-			"ControlName"	"Label"
-			"fieldName"		"ClassBarLabel6A"
-			"font"			"Cerbetica12"
-			"labelText"		"%classbarlabel6A%"
-			"textAlignment"	"west"
-			"xpos"			"c-282"
-			"ypos"			"318"
-			"zpos"			"6"
-			"wide"			"100"
-			"tall"			"20"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-		}
-		"ClassBarLabel6B"
-		{
-			"ControlName"	"Label"
-			"fieldName"		"ClassBarLabel6B"
-			"font"			"Cerbetica12"
-			"labelText"		"%classbarlabel6B%"
-			"textAlignment"	"west"
-			"xpos"			"c-127"
-			"ypos"			"318"
-			"zpos"			"6"
-			"wide"			"100"
-			"tall"			"20"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-		}
-		"ClassLabel6"
-		{
-			"ControlName"	"Label"
-			"fieldName"		"ClassLabel6"
-			"font"			"Cerbetica12"
-			"labelText"		"%class6%"
-			"textAlignment"	"west"
-			"xpos"			"c+34"
-			"ypos"			"318"
-			"zpos"			"5"
-			"wide"			"300"
-			"tall"			"20"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-		}
-		"ClassBarBG7A"
-		{
-			"ControlName"	"ImagePanel"
-			"fieldName"		"ClassBarBG7A"
-			"xpos"			"c-285"
-			"ypos"			"338"
-			"zpos"			"2"
-			"wide"			"312"
-			"tall"			"16"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"tabPosition"	"0"
-			"fillcolor"		"0 0 0 80"
-			"PaintBackgroundType"	"0"
-		}
-		"ClassBarBG7B"
-		{
-			"ControlName"	"ImagePanel"
-			"fieldName"		"ClassBarBG7B"
-			"xpos"			"c+30"
-			"ypos"			"338"
-			"zpos"			"2"
-			"wide"			"70"
-			"tall"			"16"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"tabPosition"	"0"
-			"fillcolor"		"0 0 0 80"
-			"PaintBackgroundType"	"0"
-		}
-		"ClassBar7A"
-		{
-			"ControlName"	"ImagePanel"
-			"fieldName"		"ClassBar7A"
-			"xpos"			"c-282"
-			"ypos"			"340"
-			"zpos"			"3"
-			"wide"			"151"
-			"tall"			"12"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"tabPosition"	"0"
-			"fillcolor"		"StatBar7"
-			"PaintBackgroundType"	"0"
-		}
-		"ClassBar7B"
-		{
-			"ControlName"	"ImagePanel"
-			"fieldName"		"ClassBar7B"
-			"xpos"			"c-127"
-			"ypos"			"340"
-			"zpos"			"3"
-			"wide"			"151"
-			"tall"			"12"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"tabPosition"	"0"
-			"fillcolor"		"StatBar7"
-			"PaintBackgroundType"	"0"
-		}
-		"ClassBarLabel7A"
-		{
-			"ControlName"	"Label"
-			"fieldName"		"ClassBarLabel7A"
-			"font"			"Cerbetica12"
-			"labelText"		"%classbarlabel7A%"
-			"textAlignment"	"west"
-			"xpos"			"c-282"
-			"ypos"			"336"
-			"zpos"			"6"
-			"wide"			"100"
-			"tall"			"20"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-		}
-		"ClassBarLabel7B"
-		{
-			"ControlName"	"Label"
-			"fieldName"		"ClassBarLabel7B"
-			"font"			"Cerbetica12"
-			"labelText"		"%classbarlabel7B%"
-			"textAlignment"	"west"
-			"xpos"			"c-127"
-			"ypos"			"336"
-			"zpos"			"6"
-			"wide"			"100"
-			"tall"			"20"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-		}
-		"ClassLabel7"
-		{
-			"ControlName"	"Label"
-			"fieldName"		"ClassLabel7"
-			"font"			"Cerbetica12"
-			"labelText"		"%class7%"
-			"textAlignment"	"west"
-			"xpos"			"c+34"
-			"ypos"			"336"
-			"zpos"			"5"
-			"wide"			"300"
-			"tall"			"20"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-		}
-		"ClassBarBG8A"
-		{
-			"ControlName"	"ImagePanel"
-			"fieldName"		"ClassBarBG8A"
-			"xpos"			"c-285"
-			"ypos"			"356"
-			"zpos"			"2"
-			"wide"			"312"
-			"tall"			"16"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"tabPosition"	"0"
-			"fillcolor"		"0 0 0 80"
-			"PaintBackgroundType"	"0"
-		}
-		"ClassBarBG8B"
-		{
-			"ControlName"	"ImagePanel"
-			"fieldName"		"ClassBarBG8B"
-			"xpos"			"c+30"
-			"ypos"			"356"
-			"zpos"			"2"
-			"wide"			"70"
-			"tall"			"16"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"tabPosition"	"0"
-			"fillcolor"		"0 0 0 80"
-			"PaintBackgroundType"	"0"
-		}
-		"ClassBar8A"
-		{
-			"ControlName"	"ImagePanel"
-			"fieldName"		"ClassBar8A"
-			"xpos"			"c-282"
-			"ypos"			"358"
-			"zpos"			"3"
-			"wide"			"151"
-			"tall"			"12"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"tabPosition"	"0"
-			"fillcolor"		"StatBar8"
-			"PaintBackgroundType"	"0"
-		}
-		"ClassBar8B"
-		{
-			"ControlName"	"ImagePanel"
-			"fieldName"		"ClassBar8B"
-			"xpos"			"c-127"
-			"ypos"			"358"
-			"zpos"			"3"
-			"wide"			"151"
-			"tall"			"12"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"tabPosition"	"0"
-			"fillcolor"		"StatBar8"
-			"PaintBackgroundType"	"0"
-		}
-		"ClassBarLabel8A"
-		{
-			"ControlName"	"Label"
-			"fieldName"		"ClassBarLabel8A"
-			"font"			"Cerbetica12"
-			"labelText"		"%classbarlabel8A%"
-			"textAlignment"	"west"
-			"xpos"			"c-282"
-			"ypos"			"354"
-			"zpos"			"6"
-			"wide"			"100"
-			"tall"			"20"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-		}
-		"ClassBarLabel8B"
-		{
-			"ControlName"	"Label"
-			"fieldName"		"ClassBarLabel8B"
-			"font"			"Cerbetica12"
-			"labelText"		"%classbarlabel8B%"
-			"textAlignment"	"west"
-			"xpos"			"c-127"
-			"ypos"			"354"
-			"zpos"			"6"
-			"wide"			"100"
-			"tall"			"20"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-		}
-		"ClassLabel8"
-		{
-			"ControlName"	"Label"
-			"fieldName"		"ClassLabel8"
-			"font"			"Cerbetica12"
-			"labelText"		"%class8%"
-			"textAlignment"	"west"
-			"xpos"			"c+34"
-			"ypos"			"354"
-			"zpos"			"5"
-			"wide"			"300"
-			"tall"			"20"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-		}
-		"ClassBarBG9A"
-		{
-			"ControlName"	"ImagePanel"
-			"fieldName"		"ClassBarBG9A"
-			"xpos"			"c-285"
-			"ypos"			"374"
-			"zpos"			"2"
-			"wide"			"312"
-			"tall"			"16"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"tabPosition"	"0"
-			"fillcolor"		"0 0 0 80"
-			"PaintBackgroundType"	"0"
-		}
-		"ClassBarBG9B"
-		{
-			"ControlName"	"ImagePanel"
-			"fieldName"		"ClassBarBG9B"
-			"xpos"			"c+30"
-			"ypos"			"374"
-			"zpos"			"2"
-			"wide"			"70"
-			"tall"			"16"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"tabPosition"	"0"
-			"fillcolor"		"0 0 0 80"
-			"PaintBackgroundType"	"0"
-		}
-		"ClassBar9A"
-		{
-			"ControlName"	"ImagePanel"
-			"fieldName"		"ClassBar9A"
-			"xpos"			"c-282"
-			"ypos"			"376"
-			"zpos"			"3"
-			"wide"			"151"
-			"tall"			"12"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"tabPosition"	"0"
-			"fillcolor"		"StatBar9"
-			"PaintBackgroundType"	"0"
-		}
-		"ClassBar9B"
-		{
-			"ControlName"	"ImagePanel"
-			"fieldName"		"ClassBar9B"
-			"xpos"			"c-127"
-			"ypos"			"376"
-			"zpos"			"3"
-			"wide"			"151"
-			"tall"			"12"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"tabPosition"	"0"
-			"fillcolor"		"StatBar9"
-			"PaintBackgroundType"	"0"
-		}
-		"ClassBarLabel9A"
-		{
-			"ControlName"	"Label"
-			"fieldName"		"ClassBarLabel9A"
-			"font"			"Cerbetica12"
-			"labelText"		"%classbarlabel9A%"
-			"textAlignment"	"west"
-			"xpos"			"c-282"
-			"ypos"			"372"
-			"zpos"			"6"
-			"wide"			"100"
-			"tall"			"20"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-		}
-		"ClassBarLabel9B"
-		{
-			"ControlName"	"Label"
-			"fieldName"		"ClassBarLabel9B"
-			"font"			"Cerbetica12"
-			"labelText"		"%classbarlabel9B%"
-			"textAlignment"	"west"
-			"xpos"			"c-127"
-			"ypos"			"372"
-			"zpos"			"6"
-			"wide"			"100"
-			"tall"			"20"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-		}
-		"ClassLabel9"
-		{
-			"ControlName"	"Label"
-			"fieldName"		"ClassLabel9"
-			"font"			"Cerbetica12"
-			"labelText"		"%class9%"
-			"textAlignment"	"west"
-			"xpos"			"c+34"
-			"ypos"			"372"
-			"zpos"			"5"
-			"wide"			"300"
-			"tall"			"20"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-		}
-		"RecordsBG"
-		{
-			"ControlName"	"EditablePanel"
-			"fieldName"		"RecordsBG"
-			"xpos"			"9999"
-			"ypos"			"9999"
-			"wide"			"200"
-			"tall"			"260"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"bgcolor_override"	"15 15 15 255"
-		}
-		"RecordsLabel1"
-		{
-			"ControlName"	"Label"
-			"fieldName"		"RecordsLabel1"
-			"font"			"ScoreboardMedium"
-			"labelText"		"#StatSummary_Label_BestMoments"
-			"textAlignment"	"west"
-			"xpos"			"c+124"
-			"ypos"			"185"
-			"wide"			"300"
-			"tall"			"20"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-		}
-		"RecordsSubBG1"
-		{
-			"ControlName"	"ImagePanel"
-			"fieldName"		"RecordsSubBG1"
-			"xpos"			"c+124"
-			"ypos"			"230"
-			"zpos"			"2"
-			"wide"			"167"
-			"tall"			"160"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"tabPosition"	"0"
-			"fillcolor"		"0 0 0 80"
-			"PaintBackgroundType"	"0"
-		}
-		"RecordsLabel"
-		{
-			"ControlName"	"Label"
-			"fieldName"		"RecordsLabel"
-			"font"			"ScoreboardMedium"
-			"labelText"		"#StatSummary_Records"
-			"textAlignment"	"west"
-			"xpos"			"c-265"
-			"ypos"			"232"
-			"zpos"			"5"
-			"wide"			"220"
-			"tall"			"20"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"0"
-			"enabled"		"1"
-		}
-		"OverallRecord1Label"
-		{
-			"ControlName"	"Label"
-			"fieldName"		"OverallRecord1Label"
-			"font"			"HudFontSmallest"
-			"labelText"		"%classrecord1label%"
-			"textAlignment"	"west"
-			"xpos"			"c+128"
-			"ypos"			"230"
-			"zpos"			"5"
-			"wide"			"200"
-			"tall"			"20"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-		}
-		"OverallRecord1Value"
-		{
-			"ControlName"	"Label"
-			"fieldName"		"OverallRecord1Value"
-			"font"			"HudFontSmallest"
-			"labelText"		"%classrecord1value%"
-			"textAlignment"	"west"
-			"xpos"			"c+210"
-			"ypos"			"230"
-			"zpos"			"5"
-			"wide"			"200"
-			"tall"			"20"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-		}
-		"OverallRecord2Label"
-		{
-			"ControlName"	"Label"
-			"fieldName"		"OverallRecord2Label"
-			"font"			"HudFontSmallest"
-			"labelText"		"%classrecord2label%"
-			"textAlignment"	"west"
-			"xpos"			"c+128"
-			"ypos"			"242"
-			"zpos"			"5"
-			"wide"			"200"
-			"tall"			"20"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-		}
-		"OverallRecord2Value"
-		{
-			"ControlName"	"Label"
-			"fieldName"		"OverallRecord2Value"
-			"font"			"HudFontSmallest"
-			"labelText"		"%classrecord2value%"
-			"textAlignment"	"west"
-			"xpos"			"c+210"
-			"ypos"			"242"
-			"zpos"			"5"
-			"wide"			"200"
-			"tall"			"20"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-		}
-		"OverallRecord3Label"
-		{
-			"ControlName"	"Label"
-			"fieldName"		"OverallRecord3Label"
-			"font"			"HudFontSmallest"
-			"labelText"		"%classrecord3label%"
-			"textAlignment"	"west"
-			"xpos"			"c+128"
-			"ypos"			"254"
-			"zpos"			"5"
-			"wide"			"200"
-			"tall"			"20"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-		}
-		"OverallRecord3Value"
-		{
-			"ControlName"	"Label"
-			"fieldName"		"OverallRecord3Value"
-			"font"			"HudFontSmallest"
-			"labelText"		"%classrecord3value%"
-			"textAlignment"	"west"
-			"xpos"			"c+210"
-			"ypos"			"254"
-			"zpos"			"5"
-			"wide"			"200"
-			"tall"			"20"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-		}
-		"OverallRecord4Label"
-		{
-			"ControlName"	"Label"
-			"fieldName"		"OverallRecord4Label"
-			"font"			"HudFontSmallest"
-			"labelText"		"%classrecord4label%"
-			"textAlignment"	"west"
-			"xpos"			"c+128"
-			"ypos"			"266"
-			"zpos"			"5"
-			"wide"			"200"
-			"tall"			"20"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-		}
-		"OverallRecord4Value"
-		{
-			"ControlName"	"Label"
-			"fieldName"		"OverallRecord4Value"
-			"font"			"HudFontSmallest"
-			"labelText"		"%classrecord4value%"
-			"textAlignment"	"west"
-			"xpos"			"c+210"
-			"ypos"			"266"
-			"zpos"			"5"
-			"wide"			"200"
-			"tall"			"20"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-		}
-		"OverallRecord5Label"
-		{
-			"ControlName"	"Label"
-			"fieldName"		"OverallRecord5Label"
-			"font"			"HudFontSmallest"
-			"labelText"		"%classrecord5label%"
-			"textAlignment"	"west"
-			"xpos"			"c+128"
-			"ypos"			"278"
-			"zpos"			"5"
-			"wide"			"200"
-			"tall"			"20"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-		}
-		"OverallRecord5Value"
-		{
-			"ControlName"	"Label"
-			"fieldName"		"OverallRecord5Value"
-			"font"			"HudFontSmallest"
-			"labelText"		"%classrecord5value%"
-			"textAlignment"	"west"
-			"xpos"			"c+210"
-			"ypos"			"278"
-			"zpos"			"5"
-			"wide"			"200"
-			"tall"			"20"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-		}
-		"OverallRecord6Label"
-		{
-			"ControlName"	"Label"
-			"fieldName"		"OverallRecord6Label"
-			"font"			"HudFontSmallest"
-			"labelText"		"%classrecord6label%"
-			"textAlignment"	"west"
-			"xpos"			"c+128"
-			"ypos"			"290"
-			"zpos"			"5"
-			"wide"			"200"
-			"tall"			"20"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-		}
-		"OverallRecord6Value"
-		{
-			"ControlName"	"Label"
-			"fieldName"		"OverallRecord6Value"
-			"font"			"HudFontSmallest"
-			"labelText"		"%classrecord6value%"
-			"textAlignment"	"west"
-			"xpos"			"c+210"
-			"ypos"			"290"
-			"zpos"			"5"
-			"wide"			"200"
-			"tall"			"20"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-		}
-		"OverallRecord7Label"
-		{
-			"ControlName"	"Label"
-			"fieldName"		"OverallRecord7Label"
-			"font"			"HudFontSmallest"
-			"labelText"		"%classrecord7label%"
-			"textAlignment"	"west"
-			"xpos"			"c+128"
-			"ypos"			"302"
-			"zpos"			"5"
-			"wide"			"200"
-			"tall"			"20"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-		}
-		"OverallRecord7Value"
-		{
-			"ControlName"	"Label"
-			"fieldName"		"OverallRecord7Value"
-			"font"			"HudFontSmallest"
-			"labelText"		"%classrecord7value%"
-			"textAlignment"	"west"
-			"xpos"			"c+210"
-			"ypos"			"302"
-			"zpos"			"5"
-			"wide"			"200"
-			"tall"			"20"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-		}
-		"OverallRecord8Label"
-		{
-			"ControlName"	"Label"
-			"fieldName"		"OverallRecord8Label"
-			"font"			"HudFontSmallest"
-			"labelText"		"%classrecord8label%"
-			"textAlignment"	"west"
-			"xpos"			"c+128"
-			"ypos"			"314"
-			"zpos"			"5"
-			"wide"			"200"
-			"tall"			"20"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-		}
-		"OverallRecord8Value"
-		{
-			"ControlName"	"Label"
-			"fieldName"		"OverallRecord8Value"
-			"font"			"HudFontSmallest"
-			"labelText"		"%classrecord8value%"
-			"textAlignment"	"west"
-			"xpos"			"c+210"
-			"ypos"			"314"
-			"zpos"			"5"
-			"wide"			"200"
-			"tall"			"20"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-		}
-		"OverallRecord9Label"
-		{
-			"ControlName"	"Label"
-			"fieldName"		"OverallRecord9Label"
-			"font"			"HudFontSmallest"
-			"labelText"		"%classrecord9label%"
-			"textAlignment"	"west"
-			"xpos"			"c+128"
-			"ypos"			"326"
-			"zpos"			"5"
-			"wide"			"200"
-			"tall"			"20"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-		}
-		"OverallRecord9Value"
-		{
-			"ControlName"	"Label"
-			"fieldName"		"OverallRecord9Value"
-			"font"			"HudFontSmallest"
-			"labelText"		"%classrecord9value%"
-			"textAlignment"	"west"
-			"xpos"			"c+210"
-			"ypos"			"326"
-			"zpos"			"5"
-			"wide"			"200"
-			"tall"			"20"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-		}
-		"OverallRecord10Label"
-		{
-			"ControlName"	"Label"
-			"fieldName"		"OverallRecord10Label"
-			"font"			"HudFontSmallest"
-			"labelText"		"%classrecord10label%"
-			"textAlignment"	"west"
-			"xpos"			"c+128"
-			"ypos"			"338"
-			"zpos"			"5"
-			"wide"			"200"
-			"tall"			"20"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-		}
-		"OverallRecord10Value"
-		{
-			"ControlName"	"Label"
-			"fieldName"		"OverallRecord10Value"
-			"font"			"HudFontSmallest"
-			"labelText"		"%classrecord10value%"
-			"textAlignment"	"west"
-			"xpos"			"c+210"
-			"ypos"			"338"
-			"zpos"			"5"
-			"wide"			"200"
-			"tall"			"20"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-		}
-		"OverallRecord11Label"
-		{
-			"ControlName"	"Label"
-			"fieldName"		"OverallRecord11Label"
-			"font"			"HudFontSmallest"
-			"labelText"		"%classrecord11label%"
-			"textAlignment"	"west"
-			"xpos"			"c+128"
-			"ypos"			"350"
-			"zpos"			"5"
-			"wide"			"200"
-			"tall"			"20"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-		}
-		"OverallRecord11Value"
-		{
-			"ControlName"	"Label"
-			"fieldName"		"OverallRecord11Value"
-			"font"			"HudFontSmallest"
-			"labelText"		"%classrecord11value%"
-			"textAlignment"	"west"
-			"xpos"			"c+210"
-			"ypos"			"350"
-			"zpos"			"5"
-			"wide"			"200"
-			"tall"			"20"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-		}
-		"OverallRecord12Label"
-		{
-			"ControlName"	"Label"
-			"fieldName"		"OverallRecord12Label"
-			"font"			"HudFontSmallest"
-			"labelText"		"%classrecord12label%"
-			"textAlignment"	"west"
-			"xpos"			"c+128"
-			"ypos"			"362"
-			"zpos"			"5"
-			"wide"			"200"
-			"tall"			"20"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-		}
-		"OverallRecord12Value"
-		{
-			"ControlName"	"Label"
-			"fieldName"		"OverallRecord12Value"
-			"font"			"HudFontSmallest"
-			"labelText"		"%classrecord12value%"
-			"textAlignment"	"west"
-			"xpos"			"c+210"
-			"ypos"			"362"
-			"zpos"			"5"
-			"wide"			"200"
-			"tall"			"20"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-		}
-		"OverallRecord13Label"
-		{
-			"ControlName"	"Label"
-			"fieldName"		"OverallRecord13Label"
-			"font"			"HudFontSmallest"
-			"labelText"		"%classrecord13label%"
-			"textAlignment"	"west"
-			"xpos"			"c+128"
-			"ypos"			"374"
-			"zpos"			"5"
-			"wide"			"200"
-			"tall"			"20"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-		}
-		"OverallRecord13Value"
-		{
-			"ControlName"	"Label"
-			"fieldName"		"OverallRecord13Value"
-			"font"			"HudFontSmallest"
-			"labelText"		"%classrecord13value%"
-			"textAlignment"	"west"
-			"xpos"			"c+210"
-			"ypos"			"374"
-			"zpos"			"5"
-			"wide"			"200"
-			"tall"			"20"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-		}
-		"OverallRecord14Label"
-		{
-			"ControlName"	"Label"
-			"fieldName"		"OverallRecord14Label"
-			"font"			"HudFontSmallest"
-			"labelText"		"%classrecord14label%"
-			"textAlignment"	"west"
-			"xpos"			"c+128"
-			"ypos"			"386"
-			"zpos"			"5"
-			"wide"			"200"
-			"tall"			"20"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-		}
-		"OverallRecord14Value"
-		{
-			"ControlName"	"Label"
-			"fieldName"		"OverallRecord14Value"
-			"font"			"HudFontSmallest"
-			"labelText"		"%classrecord14value%"
-			"textAlignment"	"west"
-			"xpos"			"c+210"
-			"ypos"			"386"
-			"zpos"			"5"
-			"wide"			"200"
-			"tall"			"20"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-		}
-		"OverallRecord15Label"
-		{
-			"ControlName"	"Label"
-			"fieldName"		"OverallRecord15Label"
-			"font"			"HudFontSmallest"
-			"labelText"		"%classrecord15label%"
-			"textAlignment"	"west"
-			"xpos"			"c+128"
-			"ypos"			"398"
-			"zpos"			"5"
-			"wide"			"200"
-			"tall"			"20"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-		}
-		"OverallRecord15Value"
-		{
-			"ControlName"	"Label"
-			"fieldName"		"OverallRecord15Value"
-			"font"			"HudFontSmallest"
-			"labelText"		"%classrecord15value%"
-			"textAlignment"	"west"
-			"xpos"			"c+210"
-			"ypos"			"398"
-			"zpos"			"5"
-			"wide"			"200"
-			"tall"			"20"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-		}
+		"xpos"			"9999"
 	}
 
 	"TipImage"
@@ -1970,100 +132,29 @@
 		"ControlName"	"CTFImagePanel"
 		"fieldName"		"TipImage"
 		"xpos"			"9999"
-		"ypos"			"270"
-		"zpos"			"12"
-		"wide"			"35"
-		"tall"			"35"
-		"visible"		"0"
-		"enabled"		"1"
-		"image"			""
-		"scaleImage"	"1"
 	}
 	"TipText"
 	{
 		"ControlName"	"Label"
 		"fieldName"		"TipText"
-		"font"			"HudFontSmallest"
-		"labelText"		"%tiptext%"
-		"textAlignment"	"west"
 		"xpos"			"9999"
-		"ypos"			"263"
-		"zpos"			"12"
-		"wide"			"350"
-		"tall"			"48"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"1"
-		"enabled"		"1"
-		"wrap"			"1"
 	}
-
 	"NextTipButton"
 	{
 		"ControlName"	"Button"
 		"fieldName"		"NextTipButton"
 		"xpos"			"9999"
-		"ypos"			"310"
-		"zpos"			"6"
-		"wide"			"90"
-		"tall"			"15"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"1"
-		"enabled"		"1"
-		"tabPosition"	"0"
-		"labelText"		"#TF_NextTip"
-		"textAlignment"	"center"
-		"dulltext"		"0"
-		"brighttext"	"0"
-		"Command"		"nexttip"
-		"border_default"	"ButtonHover"
-		"border_armed"		"ButtonHover"
 	}
-
 	"ResetStatsButton"
 	{
 		"ControlName"	"Button"
 		"fieldName"		"ResetStatsButton"
 		"xpos"			"9999"
-		"ypos"			"290"
-		"zpos"			"6"
-		"wide"			"150"
-		"tall"			"30"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"1"
-		"enabled"		"1"
-		"tabPosition"	"0"
-		"labelText"		"#TF_ResetStats"
-		"textAlignment"	"center"
-		"dulltext"		"0"
-		"brighttext"	"0"
-		"Command"		"resetstatsbutton"
-		"border_default"	"ButtonHover"
-		"border_armed"		"ButtonHover"
 	}
-
 	"CloseButton"
 	{
 		"ControlName"	"Button"
 		"fieldName"		"CloseButton"
-		"xpos"			"r190"
-		"ypos"			"r50"
-		"zpos"			"6"
-		"wide"			"150"
-		"tall"			"30"
-		"autoResize"	"0"
-		"pinCorner"		"2"
-		"visible"		"0"
-		"enabled"		"0"
-		"tabPosition"	"0"
-		"labelText"		"#TF_Close"
-		"textAlignment"	"center"
-		"dulltext"		"0"
-		"brighttext"	"0"
-		"Command"		"vguicancel"
-		"border_default"	"ButtonHover"
-		"border_armed"		"ButtonHover"
+		"xpos"			"9999"
 	}
 }
\ No newline at end of file
diff --git a/resource/ui/statsummary_embedded.res b/resource/ui/statsummary_embedded.res
index 574d2f7..351b6c7 100644
--- a/resource/ui/statsummary_embedded.res
+++ b/resource/ui/statsummary_embedded.res
@@ -1,4 +1,4 @@
-"Resource/UI/statsummary.res"
+"Resource/UI/statsummary_embedded.res"
 {
 	"TFStatsSummary"
 	{
@@ -17,68 +17,28 @@
 	{
 		"ControlName"	"ImagePanel"
 		"fieldName"		"MainBackground"
-		"xpos"			"0"
-		"ypos"			"0"
-		"wide"			"f0"
-		"tall"			"480"
-		"visible"		"0"
-		"enabled"		"1"
-		"image"			""
-		"scaleImage"	"1"
+		"xpos"			"9999"
 	}
 
 	"OnYourWayLabel"
 	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"OnYourWayLabel"
-		"font"			"Cerbetica24"
-		"labelText"		"#LoadingMap"
-		"textAlignment"	"west"
-		"xpos"			"0"
-		"ypos"			"0"
-		"zpos"			"50"
-		"wide"			"0"
-		"tall"			"0"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"0"
-		"enabled"		"0"
+		"xpos"			"9999"
 	}
 
 	"MapLabel"
 	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"MapLabel"
-		"font"			"HudFontMediumBigBold"
-		"labelText"		"%maplabel%"
-		"textAlignment"	"center"
-		"xpos"			"5"
-		"ypos"			"92"
-		"zpos"			"50"
-		"wide"			"350"
-		"tall"			"35"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"0"
-		"enabled"		"1"
+		"xpos"			"9999"
 	}
 
 	"MapType"
 	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"MapType"
-		"font"			"HudFontMediumBigBold"
-		"labelText"		"%maptype%"
-		"textAlignment"	"center"
-		"xpos"			"5"
-		"ypos"			"117"
-		"zpos"			"50"
-		"wide"			"350"
-		"tall"			"35"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"0"
-		"enabled"		"1"
+		"xpos"			"9999"
 	}
 
 	"StatData"
diff --git a/resource/ui/steamworkshopdialog.res b/resource/ui/steamworkshopdialog.res
index 2afee9e..7b01daf 100644
--- a/resource/ui/steamworkshopdialog.res
+++ b/resource/ui/steamworkshopdialog.res
@@ -261,8 +261,8 @@
 				"visible"		"1"
 				"enabled"		"1"
 				"tabPosition"	"0"
-				"labelText"		"<"
-				"font"			"HudFontSmall"
+				"labelText"		"&A"
+				"font"			"CustomIcons"
 				"textAlignment"	"center"
 				"dulltext"		"0"
 				"brighttext"	"0"
@@ -304,8 +304,8 @@
 				"visible"		"1"
 				"enabled"		"1"
 				"tabPosition"	"0"
-				"labelText"		">"
-				"font"			"HudFontSmall"
+				"labelText"		"&D"
+				"font"			"CustomIcons"
 				"textAlignment"	"center"
 				"dulltext"		"0"
 				"brighttext"	"0"
diff --git a/resource/ui/tankprogressbar.res b/resource/ui/tankprogressbar.res
index d5e9353..a74f696 100644
--- a/resource/ui/tankprogressbar.res
+++ b/resource/ui/tankprogressbar.res
@@ -2,44 +2,44 @@
 {
 	"TankProgressBar"
 	{
-		"ControlName"	"CTankProgressBar"
-		"fieldName"		"TankProgressBar"
-		"xpos"			"0"
-		"ypos"			"0"
-		"zpos"			"3"
-		"wide"			"190"
-		"tall"			"18"
-		"visible"		"0"
-		"enabled"		"1"
+		"ControlName"			"CTankProgressBar"
+		"fieldName"				"TankProgressBar"
+		"xpos"					"0"
+		"ypos"					"0"
+		"zpos"					"3"
+		"wide"					"190"
+		"tall"					"18"
+		"visible"				"0"
+		"enabled"				"1"
 	}
 
 	"TankImage"
 	{
-		"ControlName"	"CTFImagePanel"
-		"fieldName"		"TankImage"
-		"xpos"			"5"
-		"ypos"			"0"
-		"zpos"			"3"
-		"wide"			"18"
-		"tall"			"18"
-		"visible"		"1"
-		"enabled"		"1"
-		"image"			"../hud/leaderboard_class_tank"
-		"scaleImage"	"1"
+		"ControlName"			"CTFImagePanel"
+		"fieldName"				"TankImage"
+		"xpos"					"5"
+		"ypos"					"0"
+		"zpos"					"3"
+		"wide"					"18"
+		"tall"					"18"
+		"visible"				"1"
+		"enabled"				"1"
+		"image"					"../hud/leaderboard_class_tank"
+		"scaleImage"			"1"
 	}
 
 	"ProgressBar"
 	{
-		"ControlName"	"ScalableImagePanel"
-		"fieldName"		"ProgressBar"
-		"xpos"			"30"
-		"ypos"			"5"
-		"zpos"			"2"
-		"wide"			"153"
-		"tall"			"8"
-		"visible"		"1"
-		"enabled"		"1"
-		"image"			""
+		"ControlName"			"ScalableImagePanel"
+		"fieldName"				"ProgressBar"
+		"xpos"					"30"
+		"ypos"					"5"
+		"zpos"					"2"
+		"wide"					"153"
+		"tall"					"8"
+		"visible"				"1"
+		"enabled"				"1"
+		"image"					""
 
  		"src_corner_height"		"22"			// pixels inside the image
  		"src_corner_width"		"22"
@@ -50,16 +50,16 @@
 
 	"ProgressBarBG"
 	{
-		"ControlName"	"ScalableImagePanel"
-		"fieldName"		"ProgressBarBG"
-		"xpos"			"29"
-		"ypos"			"3"
-		"zpos"			"1"
-		"wide"			"155"
-		"tall"			"12"
-		"visible"		"0"
-		"enabled"		"0"
-		"image"			"../HUD/tournament_panel_tan"
+		"ControlName"			"ScalableImagePanel"
+		"fieldName"				"ProgressBarBG"
+		"xpos"					"29"
+		"ypos"					"3"
+		"zpos"					"1"
+		"wide"					"155"
+		"tall"					"12"
+		"visible"				"0"
+		"enabled"				"0"
+		"image"					"../HUD/tournament_panel_tan"
 
 		"src_corner_height"		"22"			// pixels inside the image
 		"src_corner_width"		"22"
@@ -70,17 +70,17 @@
 
 	"ProgressBarBG2"
 	{
-		"ControlName"	"ImagePanel"
-		"fieldName"		"ProgressBarBG2"
-		"xpos"			"30"
-		"ypos"			"5"
-		"zpos"			"2"
-		"wide"			"153"
-		"tall"			"8"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"1"
-		"enabled"		"1"
-		"fillcolor"		"ColorCyan"
+		"ControlName"			"ImagePanel"
+		"fieldName"				"ProgressBarBG2"
+		"xpos"					"30"
+		"ypos"					"5"
+		"zpos"					"2"
+		"wide"					"153"
+		"tall"					"8"
+		"autoResize"			"0"
+		"pinCorner"				"0"
+		"visible"				"1"
+		"enabled"				"1"
+		"fillcolor"				"ColorCyan"
 	}
 }
\ No newline at end of file
diff --git a/resource/ui/targetid.res b/resource/ui/targetid.res
index de60c3c..8cfbe4f 100644
--- a/resource/ui/targetid.res
+++ b/resource/ui/targetid.res
@@ -94,10 +94,7 @@
 		"labelText"			"%targetname%"
 		"textAlignment"		"west"
 		"fgcolor_override"	"TransparentBlack"
-
-		"pin_to_sibling"		"TargetNameLabel"
-		"pin_corner_to_sibling" "PIN_TOPLEFT"
-		"pin_to_sibling_corner" "PIN_TOPLEFT"
+		"pin_to_sibling"	"TargetNameLabel"
 	}
 
 	"TargetDataLabel"
diff --git a/resource/ui/textwindow.res b/resource/ui/textwindow.res
index 60171aa..b3c4d30 100644
--- a/resource/ui/textwindow.res
+++ b/resource/ui/textwindow.res
@@ -12,8 +12,6 @@
 		"pinCorner"			"0"
 		"visible"			"1"
 		"enabled"			"1"
-		"tabPosition"		"0"
-		"settitlebarvisible" "0"
 	}
 
 	"MainBG"
@@ -47,8 +45,6 @@
 		"enabled"			"1"
 		"labelText"			"#TF_WELCOME"
 		"textAlignment"		"center"
-		"dulltext"			"0"
-		"brighttext"		"0"
 		"font"				"HudFontMedium"
 		"fgcolor"			"TanLight"
 	}
@@ -57,8 +53,7 @@
 	{
 		"ControlName"		"TextEntry"
 		"fieldName"			"TextMessage"
-		"visible"			"0"
-		"enabled"			"0"
+		"xpos"				"9999"
 	}
 
 	"TFTextMessage"
@@ -110,22 +105,18 @@
 		"pinCorner"			"2"
 		"visible"			"1"
 		"enabled"			"1"
-		"tabPosition"		"0"
 		"labelText"			"#TF_Continue"
 		"textAlignment"		"center"
 		"dulltext"			"0"
 		"brighttext"		"0"
-		"wrap"				"0"
 		"command"			"okay"
 		"default"			"1"
 		"font"				"HudFontMedium"
 		"paintbackground"	"0"
-
-		"fgcolor"					"TanLight"
+		
 		"defaultFgColor_override" 	"TanLight"
 		"armedFgColor_override"		"TanDark"
-		"depressedFgColor_override" "TanDark"
-		"selectedFgColor_override" 	"TanDark"
+		"depressedFgColor_override" "TanLight"
 	}
 
 	"MenuBG"
@@ -146,19 +137,18 @@
 	{
 		"ControlName"		"Label"
 		"fieldName"			"MessageTitle"
-		"visible"			"0"
-		"enabled"			"0"
+		"xpos"				"9999"
 	}
 
 	"teambutton0SC"
 	{
-		"ControlName"	"CExButton"
-		"fieldName"		"teambutton0SC"
-		"wide"			"0"
-		"tall"			"0"
-		"visible"		"1"
-		"enabled"		"1"
-		"labelText"		"&E"
-		"command"		"okay"
+		"ControlName"		"CExButton"
+		"fieldName"			"teambutton0SC"
+		"wide"				"0"
+		"tall"				"0"
+		"visible"			"1"
+		"enabled"			"1"
+		"labelText"			"&E"
+		"command"			"okay"
 	}
 }
\ No newline at end of file
diff --git a/resource/ui/textwindowcustomserver.res b/resource/ui/textwindowcustomserver.res
index e8cae99..7d6206b 100644
--- a/resource/ui/textwindowcustomserver.res
+++ b/resource/ui/textwindowcustomserver.res
@@ -1,6 +1 @@
-#base "TextWindow.res"
-
-"Resource/UI/TextWindowCustomServer.res"
-{
-
-}
\ No newline at end of file
+#base "textwindow.res"
\ No newline at end of file
diff --git a/resource/ui/votehud.res b/resource/ui/votehud.res
index c59599a..afe817c 100644
--- a/resource/ui/votehud.res
+++ b/resource/ui/votehud.res
@@ -2,17 +2,17 @@
 {
 	"VotePassed"
 	{
-		"ControlName"		"EditablePanel"
-		"fieldName"			"VotePassed"
-		"xpos"				"10"
-		"ypos"				"r315"
-		"wide"				"150"
-		"tall"				"67"
-		"visible"			"0"
-		"enabled"			"1"
-		"paintborder"		"1"
-		"border"			"CyanBorderThick"
-		"bgcolor_override"	"DarkGrey"
+		"ControlName"			"EditablePanel"
+		"fieldName"				"VotePassed"
+		"xpos"					"10"
+		"ypos"					"r315"
+		"wide"					"150"
+		"tall"					"67"
+		"visible"				"0"
+		"enabled"				"1"
+		"paintborder"			"1"
+		"border"				"CyanBorderThick"
+		"bgcolor_override"		"DarkGrey"
 		"PaintBackgroundType"	"2"
 
 		"PassedIcon"
@@ -71,17 +71,17 @@
 
 	"VoteActive"
 	{
-		"ControlName"		"EditablePanel"
-		"fieldName"			"VoteActive"
-		"xpos"				"10"
-		"ypos"				"r315"
-		"wide"				"150"
-		"tall"				"144"
-		"visible"			"0"
-		"enabled"			"1"
-		"paintborder"		"1"
-		"border"			"CyanBorderThick"
-		"bgcolor_override"	"DarkGrey"
+		"ControlName"			"EditablePanel"
+		"fieldName"				"VoteActive"
+		"xpos"					"10"
+		"ypos"					"r315"
+		"wide"					"150"
+		"tall"					"144"
+		"visible"				"0"
+		"enabled"				"1"
+		"paintborder"			"1"
+		"border"				"CyanBorderThick"
+		"bgcolor_override"		"DarkGrey"
 		"PaintBackgroundType"	"2"
 
 		"Header"
@@ -138,6 +138,7 @@
 			"color_outline"		"52 48 45 255"
 		}
 
+		// divider
 		"Divider"
 		{
 			"ControlName"		"ImagePanel"
@@ -349,6 +350,7 @@
 			"visible"			"0"
 		}
 
+		// divider
 		"Divider2"
 		{
 			"ControlName"		"ImagePanel"
@@ -402,17 +404,17 @@
 	// This is sent to the vote caller when they're not able to start the vote
 	"CallVoteFailed"
 	{
-		"ControlName"		"EditablePanel"
-		"fieldName"			"CallVoteFailed"
-		"xpos"				"10"
-		"ypos"				"c-80"
-		"wide"				"150"
-		"tall"				"67"
-		"visible"			"0"
-		"enabled"			"1"
-		"paintborder"		"1"
-		"border"			"CyanBorderThick"
-		"bgcolor_override"	"DarkGrey"
+		"ControlName"			"EditablePanel"
+		"fieldName"				"CallVoteFailed"
+		"xpos"					"10"
+		"ypos"					"c-80"
+		"wide"					"150"
+		"tall"					"67"
+		"visible"				"0"
+		"enabled"				"1"
+		"paintborder"			"1"
+		"border"				"CyanBorderThick"
+		"bgcolor_override"		"DarkGrey"
 		"PaintBackgroundType"	"2"
 
 		"FailedIcon"
@@ -471,17 +473,17 @@
 	// This is shown to everyone when a vote fails due to lack of votes
 	"VoteFailed"
 	{
-		"ControlName"		"EditablePanel"
-		"fieldName"			"VoteFailed"
-		"xpos"				"10"
-		"ypos"				"r315"
-		"wide"				"150"
-		"tall"				"67"
-		"visible"			"0"
-		"enabled"			"1"
-		"paintborder"		"1"
-		"border"			"CyanBorderThick"
-		"bgcolor_override"	"DarkGrey"
+		"ControlName"			"EditablePanel"
+		"fieldName"				"VoteFailed"
+		"xpos"					"10"
+		"ypos"					"r315"
+		"wide"					"150"
+		"tall"					"67"
+		"visible"				"0"
+		"enabled"				"1"
+		"paintborder"			"1"
+		"border"				"CyanBorderThick"
+		"bgcolor_override"		"DarkGrey"
 		"PaintBackgroundType"	"2"
 
 		"FailedIcon"
@@ -539,17 +541,17 @@
 
 	"VoteSetupDialog"
 	{
-		"ControlName"		"CVoteSetupDialog"
-		"fieldName"			"VoteSetupDialog"
-		"xpos"				"c-200"
-		"ypos"				"c-150"
-		"wide"				"400"
-		"tall"				"310"
-		"autoResize"		"0"
-		"pinCorner"			"0"
-		"visible"			"1"
-		"enabled"			"1"
-		"tabPosition"		"0"
+		"ControlName"			"CVoteSetupDialog"
+		"fieldName"				"VoteSetupDialog"
+		"xpos"					"c-200"
+		"ypos"					"c-150"
+		"wide"					"400"
+		"tall"					"310"
+		"autoResize"			"0"
+		"pinCorner"				"0"
+		"visible"				"1"
+		"enabled"				"1"
+		"tabPosition"			"0"
 		"settitlebarvisible"	"0"
 		"paintborder"			"1"
 		"border"				"CyanBorderThick"
diff --git a/resource/ui/wavestatuspanel.res b/resource/ui/wavestatuspanel.res
index 0997b4a..dae1e35 100644
--- a/resource/ui/wavestatuspanel.res
+++ b/resource/ui/wavestatuspanel.res
@@ -2,18 +2,18 @@
 {
 	"Background"
 	{
-		"ControlName"		"ScalableImagePanel"
-		"fieldName"			"Background"
-		"xpos"				"9999"
-		"ypos"				"9999"
-		"zpos"				"-1"
-		"wide"				"200"
-		"tall"				"35"
-		"autoResize"		"0"
-		"pinCorner"			"0"
-		"visible"			"0"
-		"enabled"			"0"
-		"image"				"../HUD/tournament_panel_brown"
+		"ControlName"			"ScalableImagePanel"
+		"fieldName"				"Background"
+		"xpos"					"9999"
+		"ypos"					"9999"
+		"zpos"					"-1"
+		"wide"					"200"
+		"tall"					"35"
+		"autoResize"			"0"
+		"pinCorner"				"0"
+		"visible"				"0"
+		"enabled"				"0"
+		"image"					"../HUD/tournament_panel_brown"
 
 		"src_corner_height"		"22"
 		"src_corner_width"		"22"
@@ -23,99 +23,96 @@
 
 	"WaveCountLabel"
 	{
-		"ControlName"		"CExLabel"
-		"fieldName"			"WaveCountLabel"
-		"font"				"Cerbetica14"
-		"fgcolor"			"TanLight"
-		"xpos"				"140"
-		"ypos"				"15"
-		"ypos_minmode"		"5"
-		"zpos"				"3"
-		"wide"				"200"
-		"tall"				"15"
-		"visible"			"1"
-		"enabled"			"1"
-		"textAlignment"		"center"
-		"labelText"			"%wave_count%"
+		"ControlName"			"CExLabel"
+		"fieldName"				"WaveCountLabel"
+		"font"					"Cerbetica14"
+		"fgcolor"				"TanLight"
+		"xpos"					"140"
+		"ypos"					"15"
+		"ypos_minmode"			"5"
+		"zpos"					"3"
+		"wide"					"200"
+		"tall"					"15"
+		"visible"				"1"
+		"enabled"				"1"
+		"textAlignment"			"center"
+		"labelText"				"%wave_count%"
 	}
 
 	"WaveCountLabelShadow"
 	{
-		"ControlName"		"CExLabel"
-		"fieldName"			"WaveCountLabelShadow"
-		"font"				"Cerbetica14"
-		"fgcolor"			"TransparentBlack"
-		"xpos"				"-1"
-		"ypos"				"-1"
-		"zpos"				"3"
-		"wide"				"200"
-		"tall"				"15"
-		"visible"			"1"
-		"enabled"			"1"
-		"textAlignment"		"center"
-		"labelText"			"%wave_count%"
-
+		"ControlName"			"CExLabel"
+		"fieldName"				"WaveCountLabelShadow"
+		"font"					"Cerbetica14"
+		"fgcolor"				"TransparentBlack"
+		"xpos"					"-1"
+		"ypos"					"-1"
+		"zpos"					"3"
+		"wide"					"200"
+		"tall"					"15"
+		"visible"				"1"
+		"enabled"				"1"
+		"textAlignment"			"center"
+		"labelText"				"%wave_count%"
 		"pin_to_sibling"		"WaveCountLabel"
-		"pin_corner_to_sibling"	"PIN_TOPLEFT"
-		"pin_to_sibling_corner"	"PIN_TOPLEFT"
 	}
 
 	"SeparatorBar"
 	{
-		"ControlName"		"Panel"
-		"fieldName"			"SeparatorBar"
-		"xpos"				"0"
-		"ypos"				"0"
-		"zpos"				"3"
-		"wide"				"1"
-		"tall"				"30"
-		"visible"			"0"
-		"enabled"			"1"
-		"scaleImage"		"1"
+		"ControlName"			"Panel"
+		"fieldName"				"SeparatorBar"
+		"xpos"					"0"
+		"ypos"					"0"
+		"zpos"					"3"
+		"wide"					"1"
+		"tall"					"30"
+		"visible"				"0"
+		"enabled"				"1"
+		"scaleImage"			"1"
 		"PaintBackgroundType"	"2"
 		"bgcolor_override"		"TanLight"
 
 		if_verbose
 		{
-			"visible"		"1"
+			"visible"			"1"
 		}
 	}
 
 	"SupportLabel"
 	{
-		"ControlName"		"CExLabel"
-		"fieldName"			"SupportLabel"
-		"font"				"Cerbetica14"
-		"fgcolor"			"TanLight"
-		"xpos"				"55"
-		"ypos"				"6"
-		"zpos"				"3"
-		"wide"				"60"
-		"tall"				"15"
-		"visible"			"0"
-		"enabled"			"1"
-		"textAlignment"		"west"
-		"labelText"			"#TF_MVM_Support"
+		"ControlName"			"CExLabel"
+		"fieldName"				"SupportLabel"
+		"font"					"Cerbetica14"
+		"fgcolor"				"TanLight"
+		"xpos"					"55"
+		"ypos"					"6"
+		"zpos"					"3"
+		"wide"					"60"
+		"tall"					"15"
+		"visible"				"0"
+		"enabled"				"1"
+		"textAlignment"			"west"
+		"labelText"				"#TF_MVM_Support"
 
 		if_verbose
 		{
-			"visible"		"1"
+			"visible"			"1"
 		}
 	}
 
 	"ProgressBar"
 	{
-		"ControlName"		"ScalableImagePanel"
-		"fieldName"			"ProgressBar"
-		"xpos"				"276"
-		"ypos"				"19"
-		"ypos_minmode"		"9"
-		"zpos"				"3"
-		"wide"				"118"
-		"tall"				"6"
-		"visible"			"1"
-		"enabled"			"1"
-		"fillcolor"			"../HUD/tournament_panel_tan"
+		"ControlName"			"ScalableImagePanel"
+		"fieldName"				"ProgressBar"
+		"xpos"					"276"
+		"ypos"					"19"
+		"ypos_minmode"			"9"
+		"zpos"					"3"
+		"wide"					"118"
+		"tall"					"6"
+		"visible"				"1"
+		"enabled"				"1"
+		"fillcolor"				"../HUD/tournament_panel_tan"
 
 		"src_corner_height"		"22"
 		"src_corner_width"		"22"
@@ -125,33 +122,33 @@
 
 	"NewProgressBarBG"
 	{
-		"ControlName"		"ImagePanel"
-		"fieldName"			"NewProgressBarBG"
-		"xpos"				"276"
-		"ypos"				"19"
-		"ypos_minmode"		"9"
-		"zpos"				"-1"
-		"wide"				"118"
-		"tall"				"6"
-		"autoResize"		"0"
-		"pinCorner"			"0"
-		"visible"			"1"
-		"enabled"			"1"
-		"fillcolor"			"ColorCyan"
+		"ControlName"			"ImagePanel"
+		"fieldName"				"NewProgressBarBG"
+		"xpos"					"276"
+		"ypos"					"19"
+		"ypos_minmode"			"9"
+		"zpos"					"-1"
+		"wide"					"118"
+		"tall"					"6"
+		"autoResize"			"0"
+		"pinCorner"				"0"
+		"visible"				"1"
+		"enabled"				"1"
+		"fillcolor"				"ColorCyan"
 	}
 
 	"ProgressBarBG"
 	{
-		"ControlName"		"ScalableImagePanel"
-		"fieldName"			"ProgressBarBG"
-		"xpos"				"210"
-		"ypos"				"19"
-		"zpos"				"3"
-		"wide"				"180"
-		"tall"				"12"
-		"visible"			"0"
-		"enabled"			"0"
-		"image"				"../HUD/tournament_panel_tan"
+		"ControlName"			"ScalableImagePanel"
+		"fieldName"				"ProgressBarBG"
+		"xpos"					"210"
+		"ypos"					"19"
+		"zpos"					"3"
+		"wide"					"180"
+		"tall"					"12"
+		"visible"				"0"
+		"enabled"				"0"
+		"image"					"../HUD/tournament_panel_tan"
 
 		"src_corner_height"		"22"
 		"src_corner_width"		"22"
diff --git a/resource/ui/winpanel.res b/resource/ui/winpanel.res
index 3eb76e8..9ed4eb8 100644
--- a/resource/ui/winpanel.res
+++ b/resource/ui/winpanel.res
@@ -77,10 +77,10 @@
 			"visible"			"1"
 			"enabled"			"1"
 		}
-		"BlueTeamScoreDropshadow"
+		"BlueTeamScoreShadow"
 		{
 			"ControlName"		"CExLabel"
-			"fieldName"			"BlueTeamScoreDropshadow"
+			"fieldName"			"BlueTeamScoreShadow"
 			"font"				"Cerbetica40"
 			"fgcolor"			"TransparentBlack"
 			"labelText"			"%blueteamscore%"
@@ -94,10 +94,7 @@
 			"pinCorner"			"0"
 			"visible"			"1"
 			"enabled"			"1"
-
-			"pin_to_sibling"		"BlueTeamScore"
-			"pin_corner_to_sibling"	"PIN_TOPLEFT"
-			"pin_to_sibling_corner"	"PIN_TOPLEFT"
+			"pin_to_sibling"	"BlueTeamScore"
 		}
 
 		"BlueLeaderAvatar"
@@ -151,10 +148,10 @@
 			"visible"			"1"
 			"enabled"			"1"
 		}
-		"RedTeamScoreDropshadow"
+		"RedTeamScoreShadow"
 		{
 			"ControlName"		"CExLabel"
-			"fieldName"			"RedTeamScoreDropshadow"
+			"fieldName"			"RedTeamScoreShadow"
 			"font"				"Cerbetica40"
 			"fgcolor"			"TransparentBlack"
 			"labelText"			"%redteamscore%"
@@ -168,10 +165,7 @@
 			"pinCorner"			"0"
 			"visible"			"1"
 			"enabled"			"1"
-
-			"pin_to_sibling"		"RedTeamScore"
-			"pin_corner_to_sibling"	"PIN_TOPLEFT"
-			"pin_to_sibling_corner"	"PIN_TOPLEFT"
+			"pin_to_sibling"	"RedTeamScore"
 		}
 
 		"RedLeaderAvatar"
@@ -213,7 +207,7 @@
 		"xpos"			"0"
 		"ypos"			"55"
 		"zpos"			"-3"
-		"wide"			"300"
+		"wide"			"200"
 		"tall"			"152"
 		"visible"		"1"
 		"enabled"		"1"
@@ -240,30 +234,6 @@
 		"dulltext"		"0"
 		"brighttext"	"0"
 	}
-	"WinningTeamLabelDropshadow"
-	{
-		"ControlName"	"CExLabel"
-		"fieldName"		"WinningTeamLabelDropshadow"
-		"font"			"Cerbetica20"
-		"fgcolor"		"TransparentBlack"
-		"xpos"			"-1"
-		"ypos"			"-1"
-		"zpos"			"1"
-		"wide"			"180"
-		"tall"			"40"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"0"
-		"enabled"		"0"
-		"labelText"		"%WinningTeamLabel%"
-		"textAlignment"	"Center"
-		"dulltext"		"0"
-		"brighttext"	"0"
-
-		"pin_to_sibling"		"WinningTeamLabel"
-		"pin_corner_to_sibling"	"PIN_TOPLEFT"
-		"pin_to_sibling_corner"	"PIN_TOPLEFT"
-	}
 	"AdvancingTeamLabel"
 	{
 		"ControlName"	"CExLabel"
@@ -283,35 +253,10 @@
 		"dulltext"		"0"
 		"brighttext"	"0"
 	}
-	"AdvancingTeamLabelDropshadow"
-	{
-		"ControlName"	"CExLabel"
-		"fieldName"		"AdvancingTeamLabelDropshadow"
-		"font"			"Cerbetica20"
-		"fgcolor"		"TransparentBlack"
-		"xpos"			"-1"
-		"ypos"			"-1"
-		"zpos"			"1"
-		"wide"			"180"
-		"tall"			"20"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"1"
-		"enabled"		"1"
-		"labelText"		"%AdvancingTeamLabel%"
-		"textAlignment"	"Center"
-		"dulltext"		"0"
-		"brighttext"	"0"
-
-		"pin_to_sibling"		"AdvancingTeamLabel"
-		"pin_corner_to_sibling"	"PIN_TOPLEFT"
-		"pin_to_sibling_corner"	"PIN_TOPLEFT"
-	}
 	"WinReasonLabel"
 	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"WinReasonLabel"
-		"font"			"ScoreboardVerySmall"
 		"xpos"			"9999"
 	}
 	"DetailsLabel"