Formatting

37 files changed, 237 insertions, 243 deletions

diff --git a/resource/ui/ClassSelection.res b/resource/ui/ClassSelection.res
index 27851af..2d09774 100644
--- a/resource/ui/ClassSelection.res
+++ b/resource/ui/ClassSelection.res
@@ -1383,7 +1383,6 @@
 		"model"
 		{
 			"force_pos"	"1"
-
 			"angles_x" "0"
 			"angles_y" "180"
 			"angles_z" "0"
@@ -1428,7 +1427,6 @@
 		"PaintBackgroundType"	"2"
 		"paintbackground" "0"
 		"border"		"MainMenuHighlightBorder"
-		
 		"start_x"		"c-238"
 		"start_y"		"100"
 		"start_wide"	"1"
diff --git a/resource/ui/DisguiseStatusPanel.res b/resource/ui/DisguiseStatusPanel.res
index 31230d5..15592d8 100644
--- a/resource/ui/DisguiseStatusPanel.res
+++ b/resource/ui/DisguiseStatusPanel.res
@@ -25,6 +25,7 @@
 			"angles_z"		"0"

 		}

 	}

+

 	"DisguiseStatusBG"

 	{

 		"ControlName"	"CTFImagePanel"

@@ -46,12 +47,12 @@
 		"teambg_3"		"../hud/color_panel_blu"

 		"teambg_3_lodef"	"../hud/color_panel_blu"

 		

-		"src_corner_height"		"23"			// pixels inside the image

+		"src_corner_height"		"23"

 		"src_corner_width"		"23"

-	

-		"draw_corner_width"		"0"				// screen size of the corners ( and sides ), proportional

+		"draw_corner_width"		"0"

 		"draw_corner_height" 	"0"	

 	}

+

 	"DisguiseNameLabel"

 	{	

 		"ControlName"	"Label"

@@ -71,6 +72,7 @@
 		"dulltext"		"0"

 		"brighttext"	"0"

 	}

+

 	"WeaponNameLabel"

 	{

 		"ControlName"	"Label"

@@ -105,6 +107,7 @@
 		"enabled"		"1"

 		"fillcolor"		"0 0 0 64"

 	}

+

 	"SpectatorGUIHealth"

 	{

 		"ControlName"	"EditablePanel"

diff --git a/resource/ui/HudArenaNotification.res b/resource/ui/HudArenaNotification.res
index 9f8e0e6..859b6c9 100644
--- a/resource/ui/HudArenaNotification.res
+++ b/resource/ui/HudArenaNotification.res
@@ -53,6 +53,7 @@
 		"labelText"		""
 		"textAlignment"	"west"
 	}
+
 	"BalanceLabelTip"
 	{	
 		"ControlName"	"Label"
diff --git a/resource/ui/HudArenaWinPanel.res b/resource/ui/HudArenaWinPanel.res
index 1545256..1d82b57 100644
--- a/resource/ui/HudArenaWinPanel.res
+++ b/resource/ui/HudArenaWinPanel.res
@@ -74,7 +74,7 @@
 		}
 		"BlueTeamLabel"
 		{
-			"ControlName"		"CExLabel"
+			"ControlName"	"CExLabel"
 			"fieldName"		"BlueTeamLabel"
 			"font"			"Cerbetica24"
 			"labelText"		"%blueteamname%"
@@ -90,11 +90,11 @@
 		}
 		"BlueTeamScore"
 		{
-			"ControlName"		"CExLabel"
+			"ControlName"	"CExLabel"
 			"fieldName"		"BlueTeamScore"
 			"font"			"Cerbetica48"
 			"labelText"		"%blueteamscore%"
-			"textAlignment"		"east"
+			"textAlignment"	"east"
 			"xpos"			"138"
 			"ypos"			"1"
 			"zpos"			"3"
@@ -107,12 +107,12 @@
 		}
 		"BlueTeamScoreDropshadow"
 		{
-			"ControlName"		"CExLabel"
+			"ControlName"	"CExLabel"
 			"fieldName"		"BlueTeamScoreDropshadow"
 			"font"			"Cerbetica48"
 			"fgcolor"		"TransparentBlack"
 			"labelText"		"%blueteamscore%"
-			"textAlignment"		"east"
+			"textAlignment"	"east"
 			"xpos"			"140"
 			"ypos"			"3"
 			"zpos"			"3"
@@ -125,7 +125,7 @@
 		}
 		"RedTeamLabel"
 		{
-			"ControlName"		"CExLabel"
+			"ControlName"	"CExLabel"
 			"fieldName"		"RedTeamLabel"
 			"font"			"Cerbetica24"
 			"labelText"		"%redteamname%"
@@ -141,11 +141,11 @@
 		}
 		"RedTeamScore"
 		{
-			"ControlName"		"CExLabel"
+			"ControlName"	"CExLabel"
 			"fieldName"		"RedTeamScore"
 			"font"			"Cerbetica48"
 			"labelText"		"%redteamscore%"
-			"textAlignment"		"west"
+			"textAlignment"	"west"
 			"xpos"			"230"
 			"ypos"			"1"
 			"zpos"			"3"
@@ -158,12 +158,12 @@
 		}
 		"RedTeamScoreDropshadow"
 		{
-			"ControlName"		"CExLabel"
+			"ControlName"	"CExLabel"
 			"fieldName"		"RedTeamScoreDropshadow"
 			"font"			"Cerbetica48"
 			"fgcolor"		"TransparentBlack"
 			"labelText"		"%redteamscore%"
-			"textAlignment"		"west"
+			"textAlignment"	"west"
 			"xpos"			"232"
 			"ypos"			"3"
 			"zpos"			"3"
@@ -177,7 +177,7 @@
 		
 		"ArenaStreaksBG"
 		{
-			"ControlName"		"ScalableImagePanel"
+			"ControlName"	"ScalableImagePanel"
 			"fieldName"		"ArenaStreaksBG"
 			"xpos"			"9999"
 			"ypos"			"9999"
@@ -191,16 +191,15 @@
 			"image"			"../HUD/tournament_panel_black"
 			"scaleImage"		"1"
 			
-			"src_corner_height"	"23"				// pixels inside the image
+			"src_corner_height"	"23"
 			"src_corner_width"	"23"
-		
-			"draw_corner_width"	"6"				// screen size of the corners ( and sides ), proportional
+			"draw_corner_width"	"6"
 			"draw_corner_height" 	"6"	
 		}	
 
 		"ArenaStreakLabel"
 		{	
-			"ControlName"		"CExLabel"
+			"ControlName"	"CExLabel"
 			"fieldName"		"ArenaStreakLabel"
 			"font"			"CerbeticaBold14"
 			"fgcolor"		"TanLight"
@@ -209,20 +208,20 @@
 			"zpos"			"3"
 			"wide"			"380"
 			"tall"			"40"
-			"autoResize"		"0"
+			"autoResize"	"0"
 			"pinCorner"		"0"
 			"visible"		"1"
 			"enabled"		"1"
 			"labelText"		"%arenastreaktext%"
-			"textAlignment"		"Center"
+			"textAlignment"	"Center"
 			"dulltext"		"0"
-			"brighttext"		"0"
+			"brighttext"	"0"
 		}
 	}
 
 	"WinPanelBG"
 	{
-		"ControlName"		"ImagePanel"
+		"ControlName"	"ImagePanel"
 		"fieldName"		"WinPanelBG"
 		"xpos"			"9999"
 		"ypos"			"9999"
@@ -231,7 +230,7 @@
 		"tall"			"174"
 		"visible"		"1"
 		"enabled"		"1"
-		"scaleImage"		"1"	
+		"scaleImage"	"1"	
 	}
 	"WinPanelBackground2"
 	{
@@ -253,7 +252,7 @@
 	}
 	"LosingTeamLabel"
 	{	
-		"ControlName"		"CExLabel"
+		"ControlName"	"CExLabel"
 		"fieldName"		"LosingTeamLabel"
 		"font"			"CerbeticaBold20"
 		"xpos"			"35"
@@ -261,18 +260,18 @@
 		"zpos"			"1"
 		"wide"			"380"
 		"tall"			"40"
-		"autoResize"		"0"
+		"autoResize"	"0"
 		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
 		"labelText"		"%LosingTeamLabel%"
-		"textAlignment"		"Center"
+		"textAlignment"	"Center"
 		"dulltext"		"0"
-		"brighttext"		"0"
+		"brighttext"	"0"
 	}
 	"LosingTeamLabelDropshadow"
 	{	
-		"ControlName"		"CExLabel"
+		"ControlName"	"CExLabel"
 		"fieldName"		"LosingTeamLabelDropshadow"
 		"font"			"CerbeticaBold20"
 		"fgcolor"		"TransparentBlack"
@@ -281,19 +280,19 @@
 		"zpos"			"1"
 		"wide"			"380"
 		"tall"			"40"
-		"autoResize"		"0"
+		"autoResize"	"0"
 		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
 		"labelText"		"%LosingTeamLabel%"
-		"textAlignment"		"Center"
+		"textAlignment"	"Center"
 		"dulltext"		"0"
-		"brighttext"		"0"
+		"brighttext"	"0"
 	}
 	
 	"WinningTeamLabel"
 	{	
-		"ControlName"		"CExLabel"
+		"ControlName"	"CExLabel"
 		"fieldName"		"WinningTeamLabel"
 		"font"			"CerbeticaBold20"
 		"xpos"			"35"
@@ -301,18 +300,18 @@
 		"zpos"			"1"
 		"wide"			"380"
 		"tall"			"40"
-		"autoResize"		"0"
+		"autoResize"	"0"
 		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
 		"labelText"		"%WinningTeamLabel%"
-		"textAlignment"		"Center"
+		"textAlignment"	"Center"
 		"dulltext"		"0"
-		"brighttext"		"0"
+		"brighttext"	"0"
 	}
 	"WinningTeamLabelDropshadow"
 	{	
-		"ControlName"		"CExLabel"
+		"ControlName"	"CExLabel"
 		"fieldName"		"WinningTeamLabelDropshadow"
 		"font"			"CerbeticaBold20"
 		"fgcolor"		"TransparentBlack"
@@ -321,14 +320,14 @@
 		"zpos"			"1"
 		"wide"			"380"
 		"tall"			"40"
-		"autoResize"		"0"
+		"autoResize"	"0"
 		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
 		"labelText"		"%WinningTeamLabel%"
-		"textAlignment"		"Center"
+		"textAlignment"	"Center"
 		"dulltext"		"0"
-		"brighttext"		"0"
+		"brighttext"	"0"
 	}
 	"WinReasonLabel"
 	{	
diff --git a/resource/ui/HudDamageAccount.res b/resource/ui/HudDamageAccount.res
index d7e1042..bc04292 100644
--- a/resource/ui/HudDamageAccount.res
+++ b/resource/ui/HudDamageAccount.res
@@ -5,10 +5,10 @@
 		"fieldName"				"CDamageAccountPanel"
 		"text_x"				"0"
 		"text_y"				"0"
-		"PositiveColor"			"Heal Numbers"
-		"NegativeColor"			"Damage Numbers"
 		"delta_item_x"			"0"
 		"delta_item_end_y"		"0"
+		"PositiveColor"			"Heal Numbers"
+		"NegativeColor"			"Damage Numbers"
 		"delta_lifetime"		"2"
 		"delta_item_font"		"CerbeticaBoldOutline24" 
 		"delta_item_font_big"	"CerbeticaBoldOutline24"
@@ -56,4 +56,4 @@
 		"pin_corner_to_sibling"	"PIN_TOPLEFT"
 		"pin_to_sibling_corner"	"PIN_TOPLEFT"
 	}
-}
+}
\ No newline at end of file
diff --git a/resource/ui/HudHealthAccount.res b/resource/ui/HudHealthAccount.res
index 4e49fff..bf825ff 100644
--- a/resource/ui/HudHealthAccount.res
+++ b/resource/ui/HudHealthAccount.res
@@ -6,9 +6,9 @@
 		"delta_item_x"				"128"

 		"delta_item_start_y"		"65"

 		"delta_item_end_y"			"90"

-		"delta_item_x_minmode"			"0"

+		"delta_item_x_minmode"		"0"

 		"delta_item_start_y_minmode"	"60"

-		"delta_item_end_y_minmode"		"75"

+		"delta_item_end_y_minmode"	"75"

 		"PositiveColor"				"0 255 0 255"

 		"NegativeColor"				"255 0 0 255"

 		"delta_lifetime"			"1.5"

diff --git a/resource/ui/HudMannVsMachineStatus.res b/resource/ui/HudMannVsMachineStatus.res
index 8b2dd6a..7748897 100644
--- a/resource/ui/HudMannVsMachineStatus.res
+++ b/resource/ui/HudMannVsMachineStatus.res
@@ -29,7 +29,7 @@
 	"BossStatusPanel"

 	{

 		"ControlName"		"CMvMBossStatusPanel"

-		"fieldName"			"MvMBossStatusPanel"

+		"fieldName"			"BossStatusPanel"

 		"xpos"				"0"

 		"ypos"				"0"

 		"zpos"				"0"

@@ -179,7 +179,6 @@
 		"fieldName"			"VictorySplash"

 		"xpos"				"0"

 		"ypos"				"0"

-		//"zpos"				"102"

 		"wide"				"f0"

 		"tall"				"480"

 		"visible"			"0"

@@ -220,7 +219,7 @@
 		

 		"Background"

 		{

-			"ControlName"		"ScalableImagePanel"

+			"ControlName"	"ScalableImagePanel"

 			"fieldName"		"Background"

 			"xpos"			"c-150"

 			"ypos"			"400"

diff --git a/resource/ui/HudObjectiveKothTimePanel.res b/resource/ui/HudObjectiveKothTimePanel.res
index 7568b96..b074071 100644
--- a/resource/ui/HudObjectiveKothTimePanel.res
+++ b/resource/ui/HudObjectiveKothTimePanel.res
@@ -2,7 +2,8 @@
 {	
 	"HudKothTimeStatus"
 	{
-		if_match {
+		if_match
+		{
 			"zpos"		"5"
 		}
 	}
@@ -120,7 +121,6 @@
 			if_match
 			{
 				"proportionaltoparent"	"1"
-
 				"xpos"			"rs1-15"
 				"ypos"			"9"
 				"wide"			"35"
@@ -128,7 +128,6 @@
 				"font"			"HudFontSmall"
 				"font_minmode"	"HudFontSmall"
 				"font_lodef"	"HudFontSmall"
-			
 			}			
 		}	
 	}
diff --git a/resource/ui/HudTeamGoal.res b/resource/ui/HudTeamGoal.res
index e4db160..b4720c7 100644
--- a/resource/ui/HudTeamGoal.res
+++ b/resource/ui/HudTeamGoal.res
@@ -26,8 +26,7 @@
 		"xpos"			"9999"

 		"ypos"			"9999"

 		"zpos"			"1"

-		"wide"			"220"	[$WIN32]

-		"wide"			"180"	[$X360]

+		"wide"			"220"

 		"tall"			"15"

 		"autoResize"	"0"

 		"pinCorner"		"0"

@@ -42,14 +41,11 @@
 		"ControlName"	"Label"

 		"fieldName"		"GoalLabel"

 		"font"			"HudFontSmall"

-		"xpos"			"99999"

+		"xpos"			"9999"

 		"ypos"			"9999"

 		"zpos"			"1"

 		"wide"			"220"

-		"wide_hidef"	"200"

-		"wide_lodef"	"230"

 		"tall"			"55"

-		"tall_lodef"	"60"

 		"autoResize"	"0"

 		"pinCorner"		"0"

 		"visible"		"1"

@@ -62,7 +58,7 @@
 	{

 		"ControlName"	"CTFImagePanel"

 		"fieldName"		"GoalImage"

-		"xpos"			"99999"

+		"xpos"			"9999"

 		"ypos"			"9999"

 		"zpos"			"1"

 		"wide"			"45"

diff --git a/resource/ui/HudTeamGoalTournament.res b/resource/ui/HudTeamGoalTournament.res
index 7a241f5..94eae6b 100644
--- a/resource/ui/HudTeamGoalTournament.res
+++ b/resource/ui/HudTeamGoalTournament.res
@@ -14,29 +14,27 @@
 

 		"HudStopWatchObjectiveBG"

 		{

-			"ControlName"		"ScalableImagePanel"

+			"ControlName"	"ScalableImagePanel"

 			"fieldName"		"HudStopWatchObjectiveBG"

 			"xpos"			"0"

 			"ypos"			"0"

 			"zpos"			"-1"

 			"wide"			"275"

 			"tall"			"170"

-			"autoResize"		"0"

+			"autoResize"	"0"

 			"pinCorner"		"0"

 			"visible"		"1"

 			"enabled"		"1"

 			"image"			"../HUD/color_panel_browner"

 	

-	

 			"src_corner_height"	"23"				// pixels inside the image

 			"src_corner_width"	"23"

-		

 			"draw_corner_width"	"7"				// screen size of the corners ( and sides ), proportional

 			"draw_corner_height" 	"7"	

 		}

 		"HudStopWatchObjectiveBGSmall"

 		{

-			"ControlName"		"ScalableImagePanel"

+			"ControlName"	"ScalableImagePanel"

 			"fieldName"		"HudStopWatchObjectiveBGSmall"

 			"xpos"			"0"

 			"ypos"			"0"

@@ -48,17 +46,15 @@
 			"visible"		"0"

 			"enabled"		"1"

 			"image"			"../HUD/color_panel_browner"

-	

-	

+

 			"src_corner_height"	"23"				// pixels inside the image

 			"src_corner_width"	"23"

-		

 			"draw_corner_width"	"7"				// screen size of the corners ( and sides ), proportional

 			"draw_corner_height" 	"7"	

 		}

 		"HudStopWatchObjectiveLabel"

 		{	

-			"ControlName"		"Label"

+			"ControlName"	"Label"

 			"fieldName"		"HudStopWatchObjectiveLabel"

 			"font"			"HudFontSmallBoldShadow"

 			"xpos"			"25"

@@ -66,36 +62,36 @@
 			"zpos"			"1"

 			"wide"			"275"

 			"tall"			"15"

-			"autoResize"		"0"

+			"autoResize"	"0"

 			"pinCorner"		"0"

 			"visible"		"1"

 			"enabled"		"1"

 			"wrap"			"1"

 			"labelText"		"%objectivelabel%"

-			"textAlignment"		"west"

+			"textAlignment"	"west"

 		}

 		"HudStopWatchObjectiveText1"

 		{

-			"ControlName"		"CExRichText"

+			"ControlName"	"CExRichText"

 			"fieldName"		"HudStopWatchObjectiveText1"

 			"xpos"			"25"	[$WIN32]

 			"ypos"			"35"	[$WIN32]

 			"wide"			"225"

 			"tall"			"150"

 			"wrap"			"1"

-			"autoResize"		"1"

+			"autoResize"	"1"

 			"pinCorner"		"1"

 			"visible"		"1"

 			"enabled"		"1"

 			"labelText"		""

-			"textAlignment"		"west"

+			"textAlignment"	"west"

 			"font"			"HudFontSmallestShadow"

 			"maxchars"		"-1"

 		}

 

 		"HudStopWatchObjectiveShadedBar"

 		{

-			"ControlName"		"ImagePanel"

+			"ControlName"	"ImagePanel"

 			"fieldName"		"HudStopWatchObjectiveShadedBar"

 			"xpos"			"25"

 			"ypos"			"65"

@@ -113,19 +109,19 @@
 

 		"HudStopWatchObjectiveText2"

 		{

-			"ControlName"		"CExRichText"

+			"ControlName"	"CExRichText"

 			"fieldName"		"HudStopWatchObjectiveText2"

 			"xpos"			"25"	[$WIN32]

 			"ypos"			"75"	[$WIN32]

 			"wide"			"225"

 			"tall"			"165"

 			"wrap"			"1"

-			"autoResize"		"1"

+			"autoResize"	"1"

 			"pinCorner"		"1"

 			"visible"		"1"

 			"enabled"		"1"

 			"labelText"		""

-			"textAlignment"		"west"

+			"textAlignment"	"west"

 			"font"			"HudFontSmallestShadow"

 			"maxchars"		"-1"

 		}

@@ -133,14 +129,14 @@
 

 	"HudStopWatchObjectiveArrow"

 	{

-		"ControlName"		"ScalableImagePanel"

+		"ControlName"	"ScalableImagePanel"

 		"fieldName"		"HudStopWatchObjectiveArrow"

 		"xpos"			"9999"

 		"ypos"			"9999"

 		"zpos"			"-1"

 		"wide"			"80"

 		"tall"			"80"

-		"autoResize"		"0"

+		"autoResize"	"0"

 		"pinCorner"		"0"

 		"visible"		"0"

 		"enabled"		"1"

diff --git a/resource/ui/HudTournament.res b/resource/ui/HudTournament.res
index ad2ab00..08a6fd2 100644
--- a/resource/ui/HudTournament.res
+++ b/resource/ui/HudTournament.res
@@ -1,5 +1,3 @@
-//tick 52000
-
 "Resource/UI/HudTournament.res"
 {
 	HudTournament
@@ -43,7 +41,8 @@
 			"scaleImage"	"1"
 			"proportionaltoparent"	"1"
 
-			if_competitive {
+			if_competitive
+			{
 				"visible"		"1"
 			}
 		}		
@@ -175,15 +174,18 @@
 				"bgcolor_override"		"0 0 0 100"
 				"PaintBackgroundType"	"0"
 				
-				if_mvm {
+				if_mvm 
+				{
 					"visible"		"1"
 				}
 				
-				if_competitive {
+				if_competitive
+				{
 					"visible"		"1"
 				}
 
-				if_readymode {
+				if_readymode
+				{
 					"visible"		"1"
 				}
 			}
@@ -227,17 +229,20 @@
 				"draw_corner_width"	"0"				// screen size of the corners ( and sides ), proportional
 				"draw_corner_height" 	"0"
 				
-				if_mvm {
+				if_mvm
+				{
 					"visible"		"1"
 					"zpos"			"-2"
 				}
 
-				if_competitive {
+				if_competitive
+				{
 					"visible"		"1"
 					"zpos"			"-2"					
 				}
 				
-				if_readymode {
+				if_readymode
+				{
 					"visible"		"1"
 					"zpos"			"-2"	
 				}					
@@ -260,15 +265,18 @@
 				"fillcolor"	"15 165 165 255"
 				"scaleImage"		"1"
 
-				if_mvm {
+				if_mvm
+				{
 					"visible"		"1"
 				}
 				
-				if_competitive {
+				if_competitive
+				{
 					"visible"		"1"
 				}
 
-				if_readymode {
+				if_readymode
+				{
 					"visible"		"1"
 				}
 			}
@@ -308,7 +316,8 @@
 				"textAlignment"	"north"
 				"fgcolor"		"0 255 0 255"
 				
-				if_mvm {	
+				if_mvm
+				{
 					"visible"		"0"
 				}
 			}
@@ -444,9 +453,11 @@
 		"labelText"		"%tournamentstatelabel%"
 		"textAlignment"		"center"
 		
-		if_mvm {
+		if_mvm
+				{
 			"visible"		"0"
 		}
+
 		if_competitive
 		{
 			"xpos"			"200"
@@ -481,7 +492,8 @@
 		"draw_corner_width"	"0"				// screen size of the corners ( and sides ), proportional
 		"draw_corner_height" 	"0"	
 		
-		if_mvm {
+		if_mvm
+				{
 			"visible"		"0"
 		}
 		
@@ -496,8 +508,8 @@
 			"xpos"			"200"
 			"visible"		"0"
 		}
-		
 	}
+
 	"TournamentBLUELabel"
 	{	
 		"ControlName"		"Label"
@@ -516,7 +528,8 @@
 		"labelText"		"%bluenamelabel%"
 		"textAlignment"		"west"
 		
-		if_mvm {
+		if_mvm
+		{
 			"visible"		"0"
 		}
 		
@@ -532,9 +545,10 @@
 			"visible"		"0"
 		}
 	}
+
 	"TournamentBLUEStateLabel"
 	{	
-		"ControlName"		"Label"
+		"ControlName"	"Label"
 		"fieldName"		"TournamentBLUEStateLabel"
 		"font"			"Cerbetica16"
 		"xpos"			"c-69"
@@ -542,15 +556,16 @@
 		"zpos"			"1"
 		"wide"			"65"
 		"tall"			"15"
-		"autoResize"		"0"
+		"autoResize"	"0"
 		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
 		"wrap"			"0"
 		"labelText"		"%bluestate%"
-		"textAlignment"		"east"
+		"textAlignment"	"east"
 		
-		if_mvm {
+		if_mvm
+		{
 			"visible"		"0"
 		}
 		
@@ -569,7 +584,7 @@
 
 	"HudTournamentREDBG"
 	{
-		"ControlName"		"ScalableImagePanel"
+		"ControlName"	"ScalableImagePanel"
 		"fieldName"		"HudTournamentREDBG"
 		"xpos"			"c0"
 		"ypos"			"10"
@@ -588,25 +603,25 @@
 		"draw_corner_width"	"0"				// screen size of the corners ( and sides ), proportional
 		"draw_corner_height" 	"0"	
 		
-		if_mvm {
+		if_mvm
+		{
 			"visible"		"0"
 		}
-		
 		if_competitive
 		{
 			"xpos"			"320"
 			"visible"		"0"
 		}
-
 		if_readymode
 		{
 			"xpos"			"320"
 			"visible"		"0"
 		}
 	}
+
 	"TournamentREDLabel"
 	{	
-		"ControlName"		"Label"
+		"ControlName"	"Label"
 		"fieldName"		"TournamentREDLabel"
 		"font"			"Cerbetica16"
 		"xpos"			"c55"
@@ -614,15 +629,16 @@
 		"zpos"			"1"
 		"wide"			"65"
 		"tall"			"15"
-		"autoResize"		"0"
+		"autoResize"	"0"
 		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
 		"wrap"			"0"
 		"labelText"		"%rednamelabel%"
-		"textAlignment"		"east"
+		"textAlignment"	"east"
 		
-		if_mvm {
+		if_mvm
+		{
 			"visible"		"0"
 		}
 		
@@ -638,9 +654,10 @@
 			"visible"		"0"
 		}
 	}
+
 	"TournamentREDStateLabel"
 	{	
-		"ControlName"		"Label"
+		"ControlName"	"Label"
 		"fieldName"		"TournamentREDStateLabel"
 		"font"			"Cerbetica16"
 		"xpos"			"c5"
@@ -648,7 +665,7 @@
 		"zpos"			"1"
 		"wide"			"65"
 		"tall"			"15"
-		"autoResize"		"0"
+		"autoResize"	"0"
 		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
@@ -671,8 +688,8 @@
 			"xpos"			"325"
 			"visible"		"0"
 		}
-	
 	}
+
 	"TournamentConditionLabel"
 	{	
 		"ControlName"		"CExLabel"
@@ -692,7 +709,8 @@
 		"labelText"		"%winconditions%"
 		"textAlignment"		"center"
 		
-		if_mvm {
+		if_mvm
+		{
 			"visible"		"0"
 		}
 		
@@ -710,9 +728,7 @@
 			"ypos"			"24"
 		}
 	}
-	
-	//used for matchmaking to eliminate the need for a blank bg
-	
+
 	"TournamentConditionLabelShadow"
 	{	
 		"ControlName"		"CExLabel"
@@ -732,7 +748,8 @@
 		"labelText"		"%winconditions%"
 		"textAlignment"		"center"
 		
-		if_mvm {
+		if_mvm
+		{
 			"visible"		"0"
 		}
 		
diff --git a/resource/ui/HudTournamentSetup.res b/resource/ui/HudTournamentSetup.res
index 8807b0c..a85c294 100644
--- a/resource/ui/HudTournamentSetup.res
+++ b/resource/ui/HudTournamentSetup.res
@@ -9,7 +9,7 @@
 		"zpos"			"-1"

 		"wide"			"180"

 		"tall"			"65"

-		"autoResize"		"0"

+		"autoResize"	"0"

 		"pinCorner"		"0"

 		"visible"		"1"

 		"enabled"		"1"

@@ -24,7 +24,7 @@
 

 	"TournamentSetupLabel"

 	{	

-		"ControlName"		"Label"

+		"ControlName"	"Label"

 		"fieldName"		"TournamentLabel"

 		"font"			"Cerbetica16"

 		"xpos"			"0"

@@ -32,18 +32,18 @@
 		"zpos"			"1"

 		"wide"			"180"

 		"tall"			"35"

-		"autoResize"		"0"

+		"autoResize"	"0"

 		"pinCorner"		"0"

 		"visible"		"1"

 		"enabled"		"1"

 		"wrap"			"0"

 		"labelText"		"%tournamentstatelabel%"

-		"textAlignment"		"center"

+		"textAlignment"	"center"

 	}

 

 	"TournamentTeamNameLabel"

 	{	

-		"ControlName"		"Label"

+		"ControlName"	"Label"

 		"fieldName"		"TournamentTeamNameLabel"

 		"font"			"Cerbetica12"

 		"xpos"			"87"

@@ -51,13 +51,13 @@
 		"zpos"			"1"

 		"wide"			"74"

 		"tall"			"15"

-		"autoResize"		"0"

+		"autoResize"	"0"

 		"pinCorner"		"0"

 		"visible"		"1"

 		"enabled"		"1"

 		"wrap"			"0"

 		"labelText"		"#Tournament_TeamNamePanel"

-		"textAlignment"		"center"

+		"textAlignment"	"center"

 	}

 

 	"TournamentNameEdit"

@@ -88,7 +88,7 @@
 

 	"HudTournamentNameBG"

 	{

-		"ControlName"		"ImagePanel"

+		"ControlName"	"ImagePanel"

 		"fieldName"		"HudTournamentNameBG"

 		"xpos"		"30"

 		"ypos"		"28"

diff --git a/resource/ui/MvMCreditSubPanel.res b/resource/ui/MvMCreditSubPanel.res
index 93ddf07..6759e38 100644
--- a/resource/ui/MvMCreditSubPanel.res
+++ b/resource/ui/MvMCreditSubPanel.res
@@ -110,20 +110,6 @@
 		"tall"			"12"
 		"fgcolor"		"CreditsGreen"
 	}
-		
-	"CreditRatingLabelShadow"
-	{
-		"ControlName"	"CExLabel"
-		"fieldName"		"CreditRatingLabelShadow"
-		"font"			"HudFontMediumBold"
-		"labelText"		"%ratingshadow%"
-		"textAlignment" "center"
-		"xpos"			"126"
-		"ypos"			"26"
-		"wide"			"70"
-		"tall"			"20"
-		"fgcolor"		"Black"
-	}
 	
 	"CreditRatingLabel"
 	{
@@ -138,4 +124,18 @@
 		"tall"			"20"
 		"fgcolor"		"tanlight"
 	}
+		
+	"CreditRatingLabelShadow"
+	{
+		"ControlName"	"CExLabel"
+		"fieldName"		"CreditRatingLabelShadow"
+		"font"			"HudFontMediumBold"
+		"labelText"		"%ratingshadow%"
+		"textAlignment" "center"
+		"xpos"			"126"
+		"ypos"			"26"
+		"wide"			"70"
+		"tall"			"20"
+		"fgcolor"		"Black"
+	}
 }
\ No newline at end of file
diff --git a/resource/ui/MvMScoreboard.res b/resource/ui/MvMScoreboard.res
index c04da19..866249b 100644
--- a/resource/ui/MvMScoreboard.res
+++ b/resource/ui/MvMScoreboard.res
@@ -16,7 +16,7 @@
 	
 	"ScoreboardBackground"
 	{
-		"ControlName"		"ImagePanel"
+		"ControlName"	"ImagePanel"
 		"fieldName"		"ScoreboardBackground"
 		"xpos"			"c-270"
 		"ypos"			"244"
diff --git a/resource/ui/SpectatorTournament.res b/resource/ui/SpectatorTournament.res
index 341dace..895d4aa 100644
--- a/resource/ui/SpectatorTournament.res
+++ b/resource/ui/SpectatorTournament.res
@@ -415,10 +415,12 @@
 		"wrap"			"1"
 		"centerwrap"	"1"
 	
-		if_mvm {
+		if_mvm 
+		{
 			"visible"		"1"
 		}	
 	}
+
 	"MapLabel"
 	{
 		"ControlName"	"CExLabel"
diff --git a/resource/ui/TFAdvancedOptionsDialog.res b/resource/ui/TFAdvancedOptionsDialog.res
index 0da898f..aa9952d 100644
--- a/resource/ui/TFAdvancedOptionsDialog.res
+++ b/resource/ui/TFAdvancedOptionsDialog.res
@@ -25,6 +25,7 @@
 		"slider_w"			"500"

 		"slider_h"			"25"

 	}

+

 	"TitleLabel"

 	{

 		"ControlName"	"CExLabel"

@@ -43,6 +44,7 @@
 		"enabled"		"1"

 		"fgcolor_override" "TanLight"

 	}

+

 	"CancelButton"

 	{

 		"ControlName"	"CExButton"

@@ -77,6 +79,7 @@
 		"border_default"			"ButtonHover"

 		"border_armed"				"ButtonHover"

 	}

+

 	"OkButton"

 	{

 		"ControlName"	"CExButton"

diff --git a/resource/ui/TargetID.res b/resource/ui/TargetID.res
index 54eb140..0875ae3 100644
--- a/resource/ui/TargetID.res
+++ b/resource/ui/TargetID.res
@@ -58,6 +58,7 @@
 		"draw_corner_width"		"0"				// screen size of the corners ( and sides ), proportional

 		"draw_corner_height" 	"0"	

 	}

+

 	"TargetIDBG_Spec_Blue"

 	{

 		"ControlName"		"ScalableImagePanel"

@@ -80,6 +81,7 @@
 		"draw_corner_width"		"0"				// screen size of the corners ( and sides ), proportional

 		"draw_corner_height" 	"0"

 	}

+

 	"TargetIDBG_Spec_Red"

 	{

 		"ControlName"		"ScalableImagePanel"

@@ -122,6 +124,7 @@
 		"dulltext"		"0"

 		"brighttext"		"0"

 	}

+

 	"TargetDataLabel"

 	{	

 		"ControlName"		"Label"

@@ -232,6 +235,7 @@
 			"iconColor"		"HudBlack"

 			"scaleImage"	"1"

 		}

+

 		"MoveableIcon"

 		{

 			"ControlName"	"CIconPanel"

@@ -262,6 +266,7 @@
 			"drawcolor"		"ProgressOffWhite"

 			"scaleImage"	"1"

 		}

+

 		"MoveableKeyText"

 		{	

 			"ControlName"	"CExLabel"

@@ -281,6 +286,7 @@
 			"dulltext"		"0"

 			"brighttext"	"0"

 		}

+

 		"MoveableKeyLabel"

 		{	

 			"ControlName"	"Label"

diff --git a/resource/ui/WaveStatusPanel.res b/resource/ui/WaveStatusPanel.res
index 2a3452c..4f4b234 100644
--- a/resource/ui/WaveStatusPanel.res
+++ b/resource/ui/WaveStatusPanel.res
@@ -17,7 +17,6 @@
 

 		"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_height" 	"0"	

 	}

diff --git a/resource/ui/basechat.res b/resource/ui/basechat.res
index 51db330..9946bf1 100644
--- a/resource/ui/basechat.res
+++ b/resource/ui/basechat.res
@@ -64,4 +64,4 @@
 		"font"			  	"ChatFont"
 		"maxchars"		 	"-1"
 	}
-}
+}
\ No newline at end of file
diff --git a/resource/ui/charinfopanel.res b/resource/ui/charinfopanel.res
index 95c587b..1397368 100644
--- a/resource/ui/charinfopanel.res
+++ b/resource/ui/charinfopanel.res
@@ -59,6 +59,7 @@
 		"fillcolor"		"15 15 15 175"
 		"tileImage"		"1"
 	}		
+
 	"BackgroundFooter"
 	{
 		"ControlName"	"ImagePanel"
diff --git a/resource/ui/econ/ItemModelPanel.res b/resource/ui/econ/ItemModelPanel.res
index c11f4e5..ed6f4e3 100644
--- a/resource/ui/econ/ItemModelPanel.res
+++ b/resource/ui/econ/ItemModelPanel.res
@@ -49,7 +49,6 @@
 		{
 			"ControlName"		"CEmbeddedItemModelPanel"
 			"fieldName"		"itemmodelpanel"
-		
 			"xpos"			"0"
 			"ypos"			"0"
 			"zpos"			"1"		
@@ -60,13 +59,10 @@
 			"visible"		"1"
 			"enabled"		"1"
 			"useparentbg"		"1"
-			
 			"inset_eq_x"	"2"
 			"inset_eq_y"	"2"
-
 			"fov"			"54"
 			"start_framed"		"1"
-
 			"disable_manipulation"	"1"
 
 			"model"
@@ -97,6 +93,7 @@
 			"fgcolor"		"235 226 202 255"
 			"centerwrap"	"1"
 		}
+
 		"attriblabel"
 		{
 			"ControlName"	"CExLabel"
@@ -149,7 +146,6 @@
 			"tall"			"16"
 			"visible"		"0"
 			"enabled"		"1"
-
 		}
 
 		"quantitylabel"
@@ -246,6 +242,7 @@
 			"enabled"		"1"
 			"scaleImage"	"1"
 		}
+
 		"is_unusual_icon"
 		{
 			"ControlName"	"ImagePanel"
@@ -261,6 +258,7 @@
 			"enabled"		"1"
 			"scaleImage"	"1"
 		}
+
 		"is_loaner_icon"
 		{
 			"ControlName"	"ImagePanel"
@@ -291,9 +289,7 @@
 			"PaintBackgroundType"	"2"
 			"paintborder"	"0"
 			"useparentbg"	"0"
-			
 			"enabled"		"1"
-			
 			"model_xpos"	"1"
 			"model_ypos"	"1"
 			"model_wide"	"16"
@@ -301,7 +297,6 @@
 			"text_ypos"		"60"
 			"text_center"	"1"
 			"model_only"	"1"
-			
 			"inset_eq_x"	"2"
 			"inset_eq_y"	"2"
 			
@@ -314,4 +309,4 @@
 			"use_item_sounds"	"1"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/resource/ui/flagstatus.res b/resource/ui/flagstatus.res
index fd82618..c78aefd 100644
--- a/resource/ui/flagstatus.res
+++ b/resource/ui/flagstatus.res
@@ -13,6 +13,7 @@
 		"enabled"		"1"
 		"scaleImage"	"1"	
 	}
+
 	"Briefcase"
 	{
 		"ControlName"	"CTFImagePanel"
@@ -33,6 +34,7 @@
 			"tall"		"24"
 		}
 	}
+
 	"StatusIcon"
 	{
 		"ControlName"	"CTFImagePanel"
@@ -47,7 +49,8 @@
 		"image"			"../hud/objectives_flagpanel_ico_flag_home"
 		"scaleImage"	"1"
 		
-		"if_mvm" {
+		"if_mvm"
+		{
 			"visible"	"0"
 		}
 	}
diff --git a/resource/ui/healthiconpanel.res b/resource/ui/healthiconpanel.res
index 756382d..780d807 100644
--- a/resource/ui/healthiconpanel.res
+++ b/resource/ui/healthiconpanel.res
@@ -16,6 +16,7 @@
 		"TextColor"		"HudOffWhite"
 		"autoResize"	"1"
 	}
+
 	"SpectatorGUIHealth"
 	{
 		"ControlName"	"EditablePanel"
diff --git a/resource/ui/hudmatchstatus.res b/resource/ui/hudmatchstatus.res
index 1d66acb..0f55082 100644
--- a/resource/ui/hudmatchstatus.res
+++ b/resource/ui/hudmatchstatus.res
@@ -204,7 +204,6 @@
 		"tall"			"100"
 		"visible"		"1"
 		"enabled"		"1"
-		
 	}
 
 	"BGFrame"
@@ -346,7 +345,6 @@
 		"visible"		"1"
 		"enabled"		"1"
 		"max_size"		"19"
-
 		"6v6_gap"		"1"
 		"12v12_gap"		"1"
 
@@ -457,7 +455,7 @@
 				"textAlignment"			"Left"
 				"dulltext"				"0"
 				"brighttext"			"0"
-				"bgcolor_override"	   "0 0 0 0"
+				"bgcolor_override"	   "Transparent"
 				"fgcolor_override"	   "255 255 255 160"
 				"proportionaltoparent"	"1"
 			}
@@ -492,9 +490,10 @@
 				"visible"		"0"
 				"enabled"		"1"
 				"image"			"../HUD/tournament_panel_brown"
-				"src_corner_height"	"22"				// pixels inside the image
+
+				"src_corner_height"	"22"
 				"src_corner_width"	"22"
-				"draw_corner_width"	"3"				// screen size of the corners ( and sides ), proportional
+				"draw_corner_width"	"3"
 				"draw_corner_height" 	"3"
 			}
 			"ReadyImage"
@@ -727,7 +726,8 @@
 			"enabled"		"1"
 			"border"		"TFFatLineBorderClearBG"
 			
-			if_large {
+			if_large
+			{
 				"tall"		"325"
 			}			
 		}
@@ -844,7 +844,8 @@
 			"linegap"		"4"
 			//"show_columns"	"1"
 			
-			if_large {
+			if_large
+			{
 				"tall"		"315"
 			}			
 		}
@@ -863,7 +864,8 @@
 			"enabled"		"1"
 			"border"		"TFFatLineBorderClearBG"
 			
-			if_large {
+			if_large
+			{
 				"tall"		"325"
 			}			
 		}
diff --git a/resource/ui/hudroundcounter.res b/resource/ui/hudroundcounter.res
index f97cbe8..d68513d 100644
--- a/resource/ui/hudroundcounter.res
+++ b/resource/ui/hudroundcounter.res
@@ -67,7 +67,7 @@
 	
 	"BlueScoreBG"
 	{
-		"ControlName"		"ImagePanel"
+		"ControlName"	"ImagePanel"
 		"fieldName"		"BlueScoreBG"
 		"xpos"			"c-36"
 		"ypos"			"0"
@@ -95,7 +95,7 @@
 	
 	"TimerBG"
 	{
-		"ControlName"		"ImagePanel"
+		"ControlName"	"ImagePanel"
 		"fieldName"		"TimerBG"
 		"xpos"			"c-36"
 		"ypos"			"12"
@@ -105,6 +105,5 @@
 		"visible"		"1"
 		"enabled"		"1"
 		"fillcolor"		"0 0 0 100"
-
 	}
 }
\ No newline at end of file
diff --git a/resource/ui/itemoptionspanel.res b/resource/ui/itemoptionspanel.res
index 371d231..fe2741d 100644
--- a/resource/ui/itemoptionspanel.res
+++ b/resource/ui/itemoptionspanel.res
@@ -4,18 +4,18 @@
 	{
 		"ControlName"	"CPanelListPanel"
 		"fieldName"		"PanelListPanel"
-		"xpos"		"0"
-		"ypos"		"0"
-		"wide"		"f-19"
-		"tall"		"f0"
-		"autoResize"		"0"
+		"xpos"			"0"
+		"ypos"			"0"
+		"wide"			"f-19"
+		"tall"			"f0"
+		"autoResize"	"0"
 		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
-		"tabPosition"		"0"
+		"tabPosition"	"0"
 		"proportionalToParent"	"1"
 		"autohide_scrollbar"	"1"
-		"bgcolor_override"		"0 0 0 0"
+		"bgcolor_override"		"Transparent"
 
 		"HatUseHeadCheckButton"
 		{
@@ -23,43 +23,43 @@
 			"fieldName"		"HatUseHeadCheckButton"
 			"xpos"			"-45"
 			"ypos"			"20"
-			"wide"		"140"
-			"tall"		"20"
-			"autoResize"		"0"
+			"wide"			"140"
+			"tall"			"20"
+			"autoResize"	"0"
 			"pinCorner"		"0"
-			"RoundedCorners"		"15"
+			"RoundedCorners"			"15"
 			"pin_corner_to_sibling"		"0"
 			"pin_to_sibling_corner"		"0"
 			"visible"		"0"
 			"enabled"		"1"
-			"tabPosition"		"0"
+			"tabPosition"	"0"
 			"labelText"		"#GameUI_ParticleHatUseHead"
-			"textAlignment"		"west"
+			"textAlignment"	"west"
 			"dulltext"		"0"
-			"brighttext"		"1"
-			"wrap"		"0"
-			"centerwrap"		"0"
-			"textinsetx"		"6"
-			"textinsety"		"0"
+			"brighttext"	"1"
+			"wrap"			"0"
+			"centerwrap"	"0"
+			"textinsetx"	"6"
+			"textinsety"	"0"
 			"auto_wide_tocontents"		"0"
-			"use_proportional_insets"		"0"
+			"use_proportional_insets"	"0"
 			"Default"		"0"
 			"Command"		"particle_use_head_clicked"
 		}
 	
 		"HatParticleSlider"
 		{
-			"ControlName"		"CCvarSlider"
+			"ControlName"	"CCvarSlider"
 			"fieldName"		"HatParticleSlider"
 			"xpos"			"0"
 			"ypos"			"40"
-			"wide"		"140"
-			"tall"		"14"
-			"autoResize"		"0"
-			"RoundedCorners"		"0"
+			"wide"			"140"
+			"tall"			"14"
+			"autoResize"	"0"
+			"RoundedCorners""0"
 			"visible"		"0"
 			"enabled"		"1"
-			"tabPosition"		"0"
+			"tabPosition"	"0"
 			"fgcolor_override" "Base Color"
 		}
 
diff --git a/resource/ui/itemquickswitch.res b/resource/ui/itemquickswitch.res
index c63f241..dd79c27 100644
--- a/resource/ui/itemquickswitch.res
+++ b/resource/ui/itemquickswitch.res
@@ -47,7 +47,7 @@
 	
 	"CaratLabel"
 	{
-		"ControlName"		"CExLabel"
+		"ControlName"	"CExLabel"
 		"fieldName"		"CaratLabel"
 		"font"			"CerbeticaBold12"
 		"labelText"		">>"
@@ -63,6 +63,7 @@
 		"enabled"		"1"
 		"fgcolor_override" "200 128 255 255"
 	}
+
 	"ClassLabel"
 	{
 		"ControlName"	"CExLabel"
@@ -83,7 +84,7 @@
 
 	"ItemSlotLabel"
 	{
-		"ControlName"		"CExLabel"
+		"ControlName"	"CExLabel"
 		"fieldName"		"ItemSlotLabel"
 		"font"			"HudFontSmallestBold"
 		"labelText"		"#PrimaryWeapon"
diff --git a/resource/ui/itemrenameconfirmationdialog.res b/resource/ui/itemrenameconfirmationdialog.res
index cd36671..52b3e13 100644
--- a/resource/ui/itemrenameconfirmationdialog.res
+++ b/resource/ui/itemrenameconfirmationdialog.res
@@ -91,6 +91,7 @@
 		"text_ypos"		"100"		// Hide it off the bottom
 		"text_center"	"1"
 		"name_only"		"1"
+
 		"itemmodelpanel"
 		{
 			"use_item_rendertarget" "0"
@@ -153,6 +154,7 @@
 		"text_ypos"		"100"		// Hide it off the bottom
 		"text_center"	"1"
 		"name_only"		"1"
+
 		"itemmodelpanel"
 		{
 			"use_item_rendertarget" "0"
diff --git a/resource/ui/itemrenamedialog.res b/resource/ui/itemrenamedialog.res
index 7d7aa04..fe96501 100644
--- a/resource/ui/itemrenamedialog.res
+++ b/resource/ui/itemrenamedialog.res
@@ -149,13 +149,14 @@
 		"model_ypos"	"5"
 		"model_wide"	"80"
 		"model_tall"	"54"
-		"text_ypos"		"100"		// Hide it off the bottom
+		"text_ypos"		"100"
 		"text_center"	"1"
 		"name_only"		"1"
 		
 		"itemmodelpanel"
 		{
 			"use_item_rendertarget" "0"
+			"inventory_image_type"	"1"
 			"allow_rot"				"0"
 		}
 	}	
@@ -205,7 +206,7 @@
 		"wide"			"84"
 		"tall"			"64"
 		"visible"		"1"
-		"bgcolor_override"		"0 0 0 0"
+		"bgcolor_override"		"Transparent"
 		"noitem_textcolor"		"117 107 94 255"
 		"PaintBackgroundType"	"2"
 		"paintborder"	"0"
@@ -214,13 +215,14 @@
 		"model_ypos"	"5"
 		"model_wide"	"80"
 		"model_tall"	"54"
-		"text_ypos"		"100"		// Hide it off the bottom
+		"text_ypos"		"100"
 		"text_center"	"1"
 		"name_only"		"1"
 		
 		"itemmodelpanel"
 		{
 			"use_item_rendertarget" "0"
+			"inventory_image_type"	"1"
 			"allow_rot"				"0"
 		}
 	}	
@@ -244,6 +246,7 @@
 		"bgcolor_override" "0 0 0 255"
 		"paintbackgroundtype" "2"
 	}
+
 	"OldItemNameDescLabel"
 	{
 		"ControlName"	"CExLabel"
@@ -263,6 +266,7 @@
 		"fgcolor_override" "117 107 94 255"
 		"paintbackground" "0"
 	}
+
 	"OldItemNameLabel"
 	{
 		"ControlName"	"CExLabel"
@@ -301,6 +305,7 @@
 		"bgcolor_override" "0 0 0 255"
 		"paintbackgroundtype" "2"
 	}
+
 	"NewItemNameDescLabel"
 	{
 		"ControlName"	"CExLabel"
@@ -320,6 +325,7 @@
 		"fgcolor_override" "117 107 94 255"
 		"paintbackground" "0"
 	}
+
 	"CustomNameEntry"
 	{
 		"ControlName"		"TextEntry"
diff --git a/resource/ui/itemrenameinvaliddialog.res b/resource/ui/itemrenameinvaliddialog.res
index 6d95948..ab9a468 100644
--- a/resource/ui/itemrenameinvaliddialog.res
+++ b/resource/ui/itemrenameinvaliddialog.res
@@ -1,6 +1,5 @@
 "Resource/UI/ItemRenameInvalidDialog.res"
 {
-	// Need to be named ItemRenameConfirmationDialog, because it uses the same base confirmation dialog in code
 	"ItemRenameConfirmationDialog"
 	{
 		"fieldName"				"ItemRenameConfirmationDialog"
@@ -92,12 +91,15 @@
 		"text_ypos"		"100"		// Hide it off the bottom
 		"text_center"	"1"
 		"name_only"		"1"
+
 		"itemmodelpanel"
 		{
 			"use_item_rendertarget" "0"
+			"inventory_image_type"	"1"
 			"allow_rot"				"0"
 		}
 	}
+
 	"SubjectBG"
 	{
 		"ControlName"	"CExLabel"
@@ -151,12 +153,14 @@
 		"model_ypos"	"5"
 		"model_wide"	"80"
 		"model_tall"	"54"
-		"text_ypos"		"100"		// Hide it off the bottom
+		"text_ypos"		"100"
 		"text_center"	"1"
 		"name_only"		"1"
+
 		"itemmodelpanel"
 		{
 			"use_item_rendertarget" "0"
+			"inventory_image_type"	"1"
 			"allow_rot"				"0"
 		}
 	}	
diff --git a/resource/ui/matchmakingcasualcriteria.res b/resource/ui/matchmakingcasualcriteria.res
index 15c4715..b724aa2 100644
--- a/resource/ui/matchmakingcasualcriteria.res
+++ b/resource/ui/matchmakingcasualcriteria.res
@@ -12,11 +12,9 @@
 		"visible"		"1"
 		"PaintBackgroundType"	"2"
 		"proportionaltoparent"	"1"
-
 		"pinCorner"		"2"
 		"autoResize"	"1"
 
-
 		"RankImage"
 		{
 			"ControlName"	"CTFLocalPlayerBadgePanel"
@@ -30,7 +28,6 @@
 			"enabled"		"1"
 			"proportionaltoparent"	"1"
 			"mouseinputenabled"	"0"
-
 			"matchgroup"	"MatchGroup_Casual_12v12"
 		}
 	
@@ -46,9 +43,7 @@
 			"visible"		"1"
 			"proportionaltoparent"	"1"
 			"mouseinputenabled"	"0"
-
 			"matchgroup"	"MatchGroup_Casual_12v12"
-
 			"show_model"	"0"
 			"show_name"		"0"
 		}
@@ -80,6 +75,7 @@
 			"proportionaltoparent"	"1"
 			"image_drawcolor"	"242 242 242 255"
 			"image_armedcolor"	"169 123 53 255"
+
 			"SubImage"
 			{
 				"ControlName"	"ImagePanel"
@@ -123,6 +119,7 @@
 			"proportionaltoparent"	"1"
 			"image_drawcolor"	"242 242 242 255"
 			"image_armedcolor"	"169 123 53 255"
+
 			"SubImage"
 			{
 				"ControlName"	"ImagePanel"
@@ -179,7 +176,6 @@
 			"labeltext"		"#TF_Casual_MapSelection"
 			"textAlignment"	"west"
 			"font"			"CerbeticaBold15"
-		
 			"mouseinputenabled"	"0"
 		}
 
@@ -197,7 +193,6 @@
 			"textAlignment"	"west"
 			"font"			"HudFontSmallest"
 			"fgcolor_override"	"TanDark"
-		
 			"mouseinputenabled"	"1"
 		}
 
@@ -217,7 +212,6 @@
 			"fgcolor_override"	"TanLight"
 			"textinsetx"	"5"
 			"visible"	"0"
-		
 			"mouseinputenabled"	"0"
 		}
 
@@ -248,7 +242,6 @@
 			"visible"		"1"
 			"proportionaltoparent"	"1"
 			"restrict_width" "0"
-
 			"border"		"MainMenuBGBorder"
 
 			"ScrollBar"
diff --git a/resource/ui/matchmakingcategorypanel.res b/resource/ui/matchmakingcategorypanel.res
index 0e5892b..832cad7 100644
--- a/resource/ui/matchmakingcategorypanel.res
+++ b/resource/ui/matchmakingcategorypanel.res
@@ -8,7 +8,6 @@
 		"wide"					"f0"
 		"tall"					"50"
 		"proportionaltoparent"	"1"
-
 		"collapsed_height"	"57"
 		"resize_time"	"0.2"
 	
@@ -39,7 +38,6 @@
 			"visible"		"1"
 			"enabled"		"1"
 			"mouseinputenabled"	"0"
-		
 			"proportionaltoparent"	"1"
 			"bgcolor_override"	"0 0 0 255"
 		}
@@ -69,29 +67,22 @@
 			"wide"			"f0"
 			"tall"			"9"
 			"proportionaltoparent"	"1"
-
 			"actionsignallevel"	"2"
 			"command"		"toggle_collapse"
 			"labeltext"		"#TF_Casual_ViewMaps"
 			"textAlignment"	"west"
 			"font"	"MMenuPlayListDesc"
 			"textinsetx"	"40"
-
 			"stay_armed_on_click"	"1"
-
 			"border_default"	"NoBorder"
 			"defaultBgColor_override"	"235 226 202 20"
-
 			"border_armed"		"NoBorder"
 			"armedBgColor_override"	"LightOrange"
 			"selectedBGColor_override" "Orange"
-
 			"sound_armed"		"ui/item_info_mouseover.wav"
 			"sound_depressed"	"UI/buttonclick.wav"
 			"sound_released"	"UI/buttonclickrelease.wav"
-
 			"image_default"	"glyph_expand"
-
 			"button_activation_type"	"1"
 
 			"SubImage"
@@ -106,7 +97,6 @@
 				"visible"		"1"
 				"enabled"		"1"
 				"scaleImage"	"1"
-
 				"proportionaltoparent"	"1"
 			}	
 		}
@@ -121,9 +111,8 @@
 			"wide"				"f0"
 			"tall"				"57"
 			"mouseinputenabled"	"0"
-
 			"proportionaltoparent"	"1"
-			"bgcolor_override"	"0 0 0 0"
+			"bgcolor_override"	"Transparent"
 		}
 
 		"Checkbutton"
@@ -138,7 +127,6 @@
 			"proportionaltoparent"	"1"
 			"labeltext"		""
 			"smallcheckimage"	"1"
-
 			"sound_depressed"	"UI/buttonclickrelease.wav"	
 			"button_activation_type"	"1"
 		}
@@ -164,7 +152,6 @@
 			"default"		"1"
 			"proportionaltoparent" "1"
 			"mouseinputenabled"	"0"
-
 			"fgcolor"		"TanLight"
 		}	
 
@@ -209,7 +196,6 @@
 			"pinCorner"		"0"
 			"visible"		"1"
 			"enabled"		"1"
-
 			"wrap"			"1"
 			"fgcolor_override" "TanLight"
 			"proportionaltoparent" "1"
@@ -232,7 +218,6 @@
 			"pinCorner"		"0"
 			"visible"		"1"
 			"enabled"		"1"
-
 			"wrap"			"1"
 			"fgcolor_override" "7 7 7 255"
 			"proportionaltoparent" "1"
@@ -268,14 +253,10 @@
 		"visible"		"1"
 		"enabled"		"1"
 		"proportionaltoparent"	"1"
-
 		"border"		"InnerShadowBorder"
-
 		"pinCorner"		"2"
 		"autoResize"	"1"
-
 		"skip_autoresize"	"1"
-
 		"bgcolor_override"	"0 0 0 150"
 	}
 }
\ No newline at end of file
diff --git a/resource/ui/matchmakingdashboardmvmmodeselect.res b/resource/ui/matchmakingdashboardmvmmodeselect.res
index fcc1b84..1c4a663 100644
--- a/resource/ui/matchmakingdashboardmvmmodeselect.res
+++ b/resource/ui/matchmakingdashboardmvmmodeselect.res
@@ -91,7 +91,6 @@
 			"scaleimage"	"1"
 			"mouseinputenabled"	"0"
 			"alpha"		"255"
-
 			"image"		"gradient_pure_black"
 		}
 
@@ -212,7 +211,6 @@
 			"scaleimage"	"1"
 			"mouseinputenabled"	"0"
 			"alpha"		"255"
-
 			"image"		"gradient_pure_black"
 		}
 
diff --git a/resource/ui/matchmakingdashboardsidepanel.res b/resource/ui/matchmakingdashboardsidepanel.res
index 98729fb..55e2122 100644
--- a/resource/ui/matchmakingdashboardsidepanel.res
+++ b/resource/ui/matchmakingdashboardsidepanel.res
@@ -12,7 +12,6 @@
 		"visible"		"1"
 		"proportionaltoparent"	"1"
 		"mouseinputenabled"	"0"
-
 		"bgcolor_override"	"0 0 0 255"
 	}
 
@@ -32,7 +31,6 @@
 		"scaleimage"	"1"
 		"mouseinputenabled"	"0"
 		"alpha"		"180"
-
 		"image"		"gradient_pure_black"
 	}
 	
@@ -55,11 +53,9 @@
 		"zpos"	"1000"
 		"visible"		"0"
 		"enabled"		"0"
-
 		"proportionaltoparent"	"1"
 		"scaleimage"	"1"
 		"mouseinputenabled"	"0"
-
 		"image"		"gradient_pure_black"
 	}
 
@@ -82,13 +78,10 @@
 		"zpos"	"1000"
 		"visible"		"0"
 		"enabled"		"0"
-
-
 		"proportionaltoparent"	"1"
 		"scaleimage"	"1"
 		"mouseinputenabled"	"0"
 		"alpha"		"255"
-
 		"image"		"gradient_pure_black"
 	}
 
@@ -112,13 +105,11 @@
 		"visible"		"1"
 		"proportionaltoparent"	"1"
 		"command"		"nav_close"
-
 		"textAlignment"	"east"
 		"font"			"Cerbetica14"
 
 		"armedBgColor_override"	"0 0 0 0"
 		"defaultBgColor_override"	"0 0 0 0"
-
 		"defaultFgColor_override"	"242 242 242 255"
 		"armedFgColor_override"	"169 123 53 255"
 	}
@@ -144,13 +135,11 @@
 		"proportionaltoparent"	"1"
 		"command"		"nav_to"
 		"labelText"		"<"
-
 		"textAlignment"	"west"
 		"font"			"Cerbetica14"
 
 		"armedBgColor_override"	"0 0 0 0"
 		"defaultBgColor_override"	"0 0 0 0"
-
 		"defaultFgColor_override"	"242 242 242 255"
 		"armedFgColor_override"	"169 123 53 255"
 	}
@@ -166,8 +155,7 @@
 		"tall"			"f-20"
 		"visible"		"1"
 		"proportionaltoparent"	"1"
-
 		"border"		"TeamMenuBorder"
 		"bgcolor_override"	"27 27 27 255"
 	}
-}
+}
\ No newline at end of file
diff --git a/resource/ui/statsummary_embedded.res b/resource/ui/statsummary_embedded.res
index cbef0ff..8b9a9fd 100644
--- a/resource/ui/statsummary_embedded.res
+++ b/resource/ui/statsummary_embedded.res
@@ -12,6 +12,7 @@
 		"enabled"	"1"
 		"bgcolor_override"	"25 25 25 255"
 	}
+
 	"MainBackground"
 	{
 		"ControlName"		"ImagePanel"
@@ -25,6 +26,7 @@
 		"image"			""
 		"scaleImage"		"1"
 	}
+
 	"OnYourWayLabel" [$WIN32]
 	{
 		"ControlName"		"CExLabel"
@@ -42,6 +44,7 @@
 		"visible"		"0"
 		"enabled"		"0"
 	}					
+
 	"MapLabel"
 	{
 		"ControlName"		"CExLabel"
@@ -65,6 +68,7 @@
 		"visible"		"0"
 		"enabled"		"1"
 	}
+
 	"MapType" [$WIN32]
 	{
 		"ControlName"	"CExLabel"
@@ -82,6 +86,7 @@
 		"visible"		"0"
 		"enabled"		"1"
 	}
+
 	"StatData"
 	{
 		"ControlName"	"EditablePanel"
diff --git a/resource/ui/streamlistpanel.res b/resource/ui/streamlistpanel.res
index dab8828..cb3c86b 100644
--- a/resource/ui/streamlistpanel.res
+++ b/resource/ui/streamlistpanel.res
@@ -199,6 +199,7 @@
 		"brighttext"	"0"
 		"default"		"1"
 		"command"		"view_more"
+
 		"sound_depressed"	"UI/buttonclick.wav"
 		"sound_released"	"UI/buttonclickrelease.wav"
 
diff --git a/resource/ui/streampanel.res b/resource/ui/streampanel.res
index da5ddcd..f160700 100644
--- a/resource/ui/streampanel.res
+++ b/resource/ui/streampanel.res
@@ -15,7 +15,6 @@
 		"bgcolor_override"	"0 0 0 50"
 	}
 
-
 	"LoadingPanel"
 	{
 		"ControlName"	"EditablePanel"
@@ -41,7 +40,6 @@
 			"enable"		"1"
 			"scaleImage"	"1"
 			"image"			"animated/tf2_logo_hourglass"
-
 			"proportionaltoparent"	"1"
 		}
 
@@ -61,12 +59,10 @@
 			"visible"		"1"
 			"enabled"		"1"
 			"fgcolor"		"56 53 49 255"
-
 			"proportionaltoparent"	"1"
 		}
 	}
 
-
 	"PreviewImage"
 	{
 		"ControlName"	"ImagePanel"