Merge pull request #126 from raysfire/dev

v2019.0406

1 files changed, 237 insertions, 837 deletions

diff --git a/resource/ui/statsummary_embedded.res b/resource/ui/statsummary_embedded.res
index 9ccb51b..de8f051 100644
--- a/resource/ui/statsummary_embedded.res
+++ b/resource/ui/statsummary_embedded.res
@@ -10,9 +10,9 @@
 		"tall"			"480"
 		"visible"		"0"
 		"enabled"		"1"
-		"bgcolor_override"	"25 25 25 255"
+		"bgcolor_override"	"DarkGrey"
 	}
-
+	
 	"MainBackground"
 	{
 		"ControlName"	"ImagePanel"
@@ -27,7 +27,7 @@
 		"scaleImage"	"1"
 	}
 
-	"OnYourWayLabel" [$WIN32]
+	"OnYourWayLabel"
 	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"OnYourWayLabel"
@@ -43,25 +43,19 @@
 		"pinCorner"		"0"
 		"visible"		"0"
 		"enabled"		"0"
-	}					
+	}
 
 	"MapLabel"
 	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"MapLabel"
-		"font"			"HudFontMediumBigBold" [$WIN32]
-		"font"			"HudFontMediumBold" [$X360]
+		"font"			"HudFontMediumBigBold"
 		"labelText"		"%maplabel%"
-		"textAlignment"	"center" [$WIN32]
-		"textAlignment"	"west" [$X360]
-		"xpos"			"5" [$WIN32]
-		"xpos"			"60" [$X360]
+		"textAlignment"	"center"
+		"xpos"			"5"
 		"ypos"			"92"
-		"ypos_hidef"	"425"
-		"ypos_lodef"	"425"
 		"zpos"			"50"
-		"wide"			"350" [$WIN32]
-		"wide"			"600" [$X360]
+		"wide"			"350"
 		"tall"			"35"
 		"autoResize"	"0"
 		"pinCorner"		"0"
@@ -69,7 +63,7 @@
 		"enabled"		"1"
 	}
 
-	"MapType" [$WIN32]
+	"MapType"
 	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"MapType"
@@ -113,71 +107,53 @@
 	
 			"BarChartLabelA"
 			{
-				"ControlName"	"Label"
-				"fieldName"		"BarChartLabelA"
-				"font"			"CerbeticaBold12"
-				"font_hidef"	"Default"
-				"labelText"		"#StatSummary_StatTitle_MostPoints"
-				"textAlignment"	"east"
-				"xpos"			"c-282"
-				"xpos_hidef"	"c-210"
-				"xpos_lodef"	"c-210"
-				"ypos"			"212"
-				"ypos_hidef"	"49"
-				"ypos_lodef"	"49"
-				"zpos"			"5"
-				"wide"			"150" [!$X360]
-				"wide"			"170" [$X360]
-				"tall"			"20"
-				"autoResize"	"0"
-				"pinCorner"		"0"
-				"visible"		"1"
-				"enabled"		"1"
+				"ControlName"		"Label"
+				"fieldName"			"BarChartLabelA"
+				"font"				"CerbeticaBold12"
+				"labelText"			"#StatSummary_StatTitle_MostPoints"
+				"textAlignment"		"east"
+				"xpos"				"c-282"
+				"ypos"				"212"
+				"zpos"				"5"
+				"tall"				"20"
+				"autoResize"		"0"
+				"pinCorner"			"0"
+				"visible"			"1"
+				"enabled"			"1"
 			}
 			"BarChartLabelB"
 			{
-				"ControlName"	"Label"
-				"fieldName"		"BarChartLabelB"
-				"font"			"CerbeticaBold12"
-				"font_hidef"	"Default"
-				"labelText"		"#StatSummary_StatTitle_TotalPlaytime"
-				"textAlignment"	"west"
-				"xpos"			"c-127"
-				"xpos_hidef"	"c-35"
-				"xpos_lodef"	"c-35"
-				"ypos"			"212"
-				"ypos_hidef"	"49"
-				"ypos_lodef"	"49"
-				"zpos"			"5"
-				"wide"			"150"
-				"tall"			"20"
-				"autoResize"	"0"
-				"pinCorner"		"0"
-				"visible"		"1"
-				"enabled"		"1"
+				"ControlName"		"Label"
+				"fieldName"			"BarChartLabelB"
+				"font"				"CerbeticaBold12"
+				"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"			"CerbeticaBold12"
-				"labelText"		"#StatSummary_Label_AsAnyClass"
-				"textAlignment"	"west"
-				"xpos"			"c+130"
-				"xpos_hidef"	"c+110"
-				"ypos"			"200"
-				"ypos_hidef"	"150"
-				"zpos"			"5"
-				"wide"			"200"
-				"tall"			"20"
-				"autoResize"	"0"
-				"pinCorner"		"0"
-				"visible"		"1"
-				"visible_hidef"	"0"
-				"visible_lodef"	"0"
-				"enabled"		"1"
-				"enabled_hidef"	"0"
-				"enabled_lodef"	"0"
+				"ControlName"		"Label"
+				"fieldName"			"OverallRecordLabel"
+				"font"				"CerbeticaBold12"
+				"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"
 			}
 		}
 		"InteractiveHeaders"
@@ -237,7 +213,7 @@
 				"ControlName"	"ComboBox"
 				"fieldName"		"ClassCombo"
 				"xpos"			"c+124"
-				"ypos"			"200"
+				"ypos"			"212"
 				"zpos"			"10"
 				"wide"			"167"
 				"tall"			"14"
@@ -258,20 +234,13 @@
 			"ControlName"	"EditablePanel"
 			"fieldName"		"AveragesBG"
 			"xpos"			"c-295"
-			"xpos_hidef"	"c-283"
-			"xpos_lodef"	"c-283"
 			"ypos"			"165"
-			"ypos_hidef"	"22"
-			"ypos_lodef"	"22"
 			"wide"			"600"
 			"tall"			"300"
-			"tall_hidef"	"633"
-			"tall_lodef"	"633"
 			"autoResize"	"0"
 			"pinCorner"		"0"
 			"visible"		"1"
 			"enabled"		"1"
-			"border"		"NoBorder"
 			"bgcolor_override"	"15 15 15 255"
 		}
 		"AveragesLabel"
@@ -281,15 +250,8 @@
 			"font"			"ScoreboardMedium"
 			"labelText"		"#StatSummary_Label_PerformanceReport"
 			"textAlignment"	"west"
-			"textAlignment_hidef"	"center"
-			"textAlignment_lodef"	"center"
 			"xpos"			"c-285"
-			"xpos_hidef"	"c-193"
-			"xpos_lodef"	"c-193"
-			"ypos"			"170" [!$OSX]
-			"ypos"			"185" [$OSX]
-			"ypos_hidef"	"32"
-			"ypos_lodef"	"32"
+			"ypos"			"185"
 			"wide"			"300"
 			"tall"			"20"
 			"autoResize"	"0"
@@ -302,11 +264,7 @@
 			"ControlName"	"ImagePanel"
 			"fieldName"		"ClassBarBG1A"
 			"xpos"			"c-285"
-			"xpos_hidef"	"c-193"
-			"xpos_lodef"	"c-193"
 			"ypos"			"230"
-			"ypos_hidef"	"67"
-			"ypos_lodef"	"67"
 			"zpos"			"2"
 			"wide"			"312"
 			"tall"			"16"
@@ -323,11 +281,7 @@
 			"ControlName"	"ImagePanel"
 			"fieldName"		"ClassBarBG1B"
 			"xpos"			"c+30"
-			"xpos_hidef"	"c+122"
-			"xpos_lodef"	"c+122"
 			"ypos"			"230"
-			"ypos_hidef"	"67"
-			"ypos_lodef"	"67"
 			"zpos"			"2"
 			"wide"			"70"
 			"tall"			"16"
@@ -344,11 +298,7 @@
 			"ControlName"	"ImagePanel"
 			"fieldName"		"ClassBar1A"
 			"xpos"			"c-282"
-			"xpos_hidef"	"c-190"
-			"xpos_lodef"	"c-190"
 			"ypos"			"232"
-			"ypos_hidef"	"69"
-			"ypos_lodef"	"69"
 			"zpos"			"3"
 			"wide"			"151"
 			"tall"			"12"
@@ -365,11 +315,7 @@
 			"ControlName"	"ImagePanel"
 			"fieldName"		"ClassBar1B"
 			"xpos"			"c-127"
-			"xpos_hidef"	"c-35"
-			"xpos_lodef"	"c-35"
 			"ypos"			"232"
-			"ypos_hidef"	"69"
-			"ypos_lodef"	"69"
 			"zpos"			"3"
 			"wide"			"151"
 			"tall"			"12"
@@ -389,11 +335,7 @@
 			"labelText"		"%classbarlabel1A%"
 			"textAlignment"	"west"
 			"xpos"			"c-282"
-			"xpos_hidef"	"c-190"
-			"xpos_lodef"	"c-190"
 			"ypos"			"228"
-			"ypos_hidef"	"65"
-			"ypos_lodef"	"65"
 			"zpos"			"6"
 			"wide"			"100"
 			"tall"			"20"
@@ -425,16 +367,10 @@
 			"ControlName"	"Label"
 			"fieldName"		"ClassLabel1"
 			"font"			"CerbeticaBold12"
-			"font_hidef"	"Default"
-			"font_lodef"	"CerbeticaBold12"
 			"labelText"		"%class1%"
 			"textAlignment"	"west"
 			"xpos"			"c+34"
-			"xpos_hidef"	"c+126"
-			"xpos_lodef"	"c+126"
 			"ypos"			"228"
-			"ypos_hidef"	"65"
-			"ypos_lodef"	"65"
 			"zpos"			"5"
 			"wide"			"300"
 			"tall"			"20"
@@ -448,11 +384,7 @@
 			"ControlName"	"ImagePanel"
 			"fieldName"		"ClassBarBG2A"
 			"xpos"			"c-285"
-			"xpos_hidef"	"c-193"
-			"xpos_lodef"	"c-193"
 			"ypos"			"248"
-			"ypos_hidef"	"85"
-			"ypos_lodef"	"85"
 			"zpos"			"2"
 			"wide"			"312"
 			"tall"			"16"
@@ -469,11 +401,7 @@
 			"ControlName"	"ImagePanel"
 			"fieldName"		"ClassBarBG2B"
 			"xpos"			"c+30"
-			"xpos_hidef"	"c+122"
-			"xpos_lodef"	"c+122"
 			"ypos"			"248"
-			"ypos_hidef"	"85"
-			"ypos_lodef"	"85"
 			"zpos"			"2"
 			"wide"			"70"
 			"tall"			"16"
@@ -490,11 +418,7 @@
 			"ControlName"	"ImagePanel"
 			"fieldName"		"ClassBar2A"
 			"xpos"			"c-282"
-			"xpos_hidef"	"c-190"
-			"xpos_lodef"	"c-190"
 			"ypos"			"250"
-			"ypos_hidef"	"87"
-			"ypos_lodef"	"87"
 			"zpos"			"3"
 			"wide"			"151"
 			"tall"			"12"
@@ -511,11 +435,7 @@
 			"ControlName"	"ImagePanel"
 			"fieldName"		"ClassBar2B"
 			"xpos"			"c-127"
-			"xpos_hidef"	"c-35"
-			"xpos_lodef"	"c-35"
 			"ypos"			"250"
-			"ypos_hidef"	"87"
-			"ypos_lodef"	"87"
 			"zpos"			"3"
 			"wide"			"151"
 			"tall"			"12"
@@ -535,11 +455,7 @@
 			"labelText"		"%classbarlabel2A%"
 			"textAlignment"	"west"
 			"xpos"			"c-282"
-			"xpos_hidef"	"c-190"
-			"xpos_lodef"	"c-190"
 			"ypos"			"246"
-			"ypos_hidef"	"83"
-			"ypos_lodef"	"83"
 			"zpos"			"6"
 			"wide"			"100"
 			"tall"			"20"
@@ -556,11 +472,7 @@
 			"labelText"		"%classbarlabel2B%"
 			"textAlignment"	"west"
 			"xpos"			"c-127"
-			"xpos_hidef"	"c-35"
-			"xpos_lodef"	"c-35"
 			"ypos"			"246"
-			"ypos_hidef"	"83"
-			"ypos_lodef"	"83"
 			"zpos"			"6"
 			"wide"			"100"
 			"tall"			"20"
@@ -574,16 +486,10 @@
 			"ControlName"	"Label"
 			"fieldName"		"ClassLabel2"
 			"font"			"CerbeticaBold12"
-			"font_hidef"	"Default"
-			"font_lodef"	"CerbeticaBold12"
 			"labelText"		"%class2%"
 			"textAlignment"	"west"
 			"xpos"			"c+34"
-			"xpos_hidef"	"c+126"
-			"xpos_lodef"	"c+126"
 			"ypos"			"246"
-			"ypos_hidef"	"83"
-			"ypos_lodef"	"83"
 			"zpos"			"5"
 			"wide"			"300"
 			"tall"			"20"
@@ -597,11 +503,7 @@
 			"ControlName"	"ImagePanel"
 			"fieldName"		"ClassBarBG3A"
 			"xpos"			"c-285"
-			"xpos_hidef"	"c-193"
-			"xpos_lodef"	"c-193"
 			"ypos"			"266"
-			"ypos_hidef"	"103"
-			"ypos_lodef"	"103"
 			"zpos"			"2"
 			"wide"			"312"
 			"tall"			"16"
@@ -618,11 +520,7 @@
 			"ControlName"	"ImagePanel"
 			"fieldName"		"ClassBarBG3B"
 			"xpos"			"c+30"
-			"xpos_hidef"	"c+122"
-			"xpos_lodef"	"c+122"
 			"ypos"			"266"
-			"ypos_hidef"	"103"
-			"ypos_lodef"	"103"
 			"zpos"			"2"
 			"wide"			"70"
 			"tall"			"16"
@@ -639,11 +537,7 @@
 			"ControlName"	"ImagePanel"
 			"fieldName"		"ClassBar3A"
 			"xpos"			"c-282"
-			"xpos_hidef"	"c-190"
-			"xpos_lodef"	"c-190"
 			"ypos"			"268"
-			"ypos_hidef"	"105"
-			"ypos_lodef"	"105"
 			"zpos"			"3"
 			"wide"			"151"
 			"tall"			"12"
@@ -660,11 +554,7 @@
 			"ControlName"	"ImagePanel"
 			"fieldName"		"ClassBar3B"
 			"xpos"			"c-127"
-			"xpos_hidef"	"c-35"
-			"xpos_lodef"	"c-35"
 			"ypos"			"268"
-			"ypos_hidef"	"105"
-			"ypos_lodef"	"105"
 			"zpos"			"3"
 			"wide"			"151"
 			"tall"			"12"
@@ -678,17 +568,13 @@
 		}	
 		"ClassBarLabel3A"
 		{
-			"ControlName"		"Label"
+			"ControlName"	"Label"
 			"fieldName"		"ClassBarLabel3A"
 			"font"			"CerbeticaBold12"
 			"labelText"		"%classbarlabel3A%"
-			"textAlignment"		"west"
+			"textAlignment"	"west"
 			"xpos"			"c-282"
-			"xpos_hidef"			"c-190"
-			"xpos_lodef"			"c-190"
 			"ypos"			"264"
-			"ypos_hidef"			"101"
-			"ypos_lodef"			"101"
 			"zpos"			"6"
 			"wide"			"100"
 			"tall"			"20"
@@ -699,17 +585,13 @@
 		}				
 		"ClassBarLabel3B"
 		{
-			"ControlName"		"Label"
+			"ControlName"	"Label"
 			"fieldName"		"ClassBarLabel3B"
 			"font"			"CerbeticaBold12"
 			"labelText"		"%classbarlabel3B%"
-			"textAlignment"		"west"
+			"textAlignment"	"west"
 			"xpos"			"c-127"
-			"xpos_hidef"			"c-35"
-			"xpos_lodef"			"c-35"
 			"ypos"			"264"
-			"ypos_hidef"			"101"
-			"ypos_lodef"			"101"
 			"zpos"			"6"
 			"wide"			"100"
 			"tall"			"20"
@@ -720,19 +602,13 @@
 		}
 		"ClassLabel3"
 		{
-			"ControlName"		"Label"
+			"ControlName"	"Label"
 			"fieldName"		"ClassLabel3"
 			"font"			"CerbeticaBold12"
-			"font_hidef"	"Default"
-			"font_lodef"			"CerbeticaBold12"
 			"labelText"		"%class3%"
-			"textAlignment"		"west"
+			"textAlignment"	"west"
 			"xpos"			"c+34"
-			"xpos_hidef"			"c+126"
-			"xpos_lodef"			"c+126"
 			"ypos"			"264"
-			"ypos_hidef"			"101"
-			"ypos_lodef"			"101"
 			"zpos"			"5"
 			"wide"			"300"
 			"tall"			"20"
@@ -740,17 +616,13 @@
 			"pinCorner"		"0"
 			"visible"		"1"
 			"enabled"		"1"
-		}				
+		}
 		"ClassBarBG4A"
 		{
-			"ControlName"		"ImagePanel"
+			"ControlName"	"ImagePanel"
 			"fieldName"		"ClassBarBG4A"
 			"xpos"			"c-285"
-			"xpos_hidef"			"c-193"
-			"xpos_lodef"			"c-193"
 			"ypos"			"284"
-			"ypos_hidef"			"121"
-			"ypos_lodef"			"121"
 			"zpos"			"2"
 			"wide"			"312"
 			"tall"			"16"
@@ -764,14 +636,10 @@
 		}
 		"ClassBarBG4B"
 		{
-			"ControlName"		"ImagePanel"
+			"ControlName"	"ImagePanel"
 			"fieldName"		"ClassBarBG4B"
 			"xpos"			"c+30"
-			"xpos_hidef"			"c+122"
-			"xpos_lodef"			"c+122"
 			"ypos"			"284"
-			"ypos_hidef"			"121"
-			"ypos_lodef"			"121"
 			"zpos"			"2"
 			"wide"			"70"
 			"tall"			"16"
@@ -785,14 +653,10 @@
 		}
 		"ClassBar4A"
 		{
-			"ControlName"		"ImagePanel"
+			"ControlName"	"ImagePanel"
 			"fieldName"		"ClassBar4A"
 			"xpos"			"c-282"
-			"xpos_hidef"			"c-190"
-			"xpos_lodef"			"c-190"
 			"ypos"			"286"
-			"ypos_hidef"			"123"
-			"ypos_lodef"			"123"
 			"zpos"			"3"
 			"wide"			"151"
 			"tall"			"12"
@@ -806,14 +670,10 @@
 		}
 		"ClassBar4B"
 		{
-			"ControlName"		"ImagePanel"
+			"ControlName"	"ImagePanel"
 			"fieldName"		"ClassBar4B"
 			"xpos"			"c-127"
-			"xpos_hidef"			"c-35"
-			"xpos_lodef"			"c-35"
 			"ypos"			"286"
-			"ypos_hidef"			"123"
-			"ypos_lodef"			"123"
 			"zpos"			"3"
 			"wide"			"151"
 			"tall"			"12"
@@ -827,17 +687,13 @@
 		}
 		"ClassBarLabel4A"
 		{
-			"ControlName"		"Label"
+			"ControlName"	"Label"
 			"fieldName"		"ClassBarLabel4A"
 			"font"			"CerbeticaBold12"
 			"labelText"		"%classbarlabel4A%"
-			"textAlignment"		"west"
+			"textAlignment"	"west"
 			"xpos"			"c-282"
-			"xpos_hidef"			"c-190"
-			"xpos_lodef"			"c-190"
 			"ypos"			"282"
-			"ypos_hidef"			"119"
-			"ypos_lodef"			"119"
 			"zpos"			"6"
 			"wide"			"100"
 			"tall"			"20"
@@ -848,17 +704,13 @@
 		}
 		"ClassBarLabel4B"
 		{
-			"ControlName"		"Label"
+			"ControlName"	"Label"
 			"fieldName"		"ClassBarLabel4B"
 			"font"			"CerbeticaBold12"
 			"labelText"		"%classbarlabel4B%"
-			"textAlignment"		"west"
+			"textAlignment"	"west"
 			"xpos"			"c-127"
-			"xpos_hidef"			"c-35"
-			"xpos_lodef"			"c-35"
 			"ypos"			"282"
-			"ypos_hidef"			"119"
-			"ypos_lodef"			"119"
 			"zpos"			"6"
 			"wide"			"100"
 			"tall"			"20"
@@ -869,19 +721,13 @@
 		}
 		"ClassLabel4"
 		{
-			"ControlName"		"Label"
+			"ControlName"	"Label"
 			"fieldName"		"ClassLabel4"
 			"font"			"CerbeticaBold12"
-			"font_hidef"	"Default"
-			"font_lodef"			"CerbeticaBold12"
 			"labelText"		"%class4%"
-			"textAlignment"		"west"
+			"textAlignment"	"west"
 			"xpos"			"c+34"
-			"xpos_hidef"			"c+126"
-			"xpos_lodef"			"c+126"
 			"ypos"			"282"
-			"ypos_hidef"			"119"
-			"ypos_lodef"			"119"
 			"zpos"			"5"
 			"wide"			"300"
 			"tall"			"20"
@@ -892,14 +738,10 @@
 		}
 		"ClassBarBG5A"
 		{
-			"ControlName"		"ImagePanel"
+			"ControlName"	"ImagePanel"
 			"fieldName"		"ClassBarBG5A"
 			"xpos"			"c-285"
-			"xpos_hidef"			"c-193"
-			"xpos_lodef"			"c-193"
 			"ypos"			"302"
-			"ypos_hidef"			"139"
-			"ypos_lodef"			"139"
 			"zpos"			"2"
 			"wide"			"312"
 			"tall"			"16"
@@ -913,14 +755,10 @@
 		}
 		"ClassBarBG5B"
 		{
-			"ControlName"		"ImagePanel"
+			"ControlName"	"ImagePanel"
 			"fieldName"		"ClassBarBG5B"
 			"xpos"			"c+30"
-			"xpos_hidef"			"c+122"
-			"xpos_lodef"			"c+122"
 			"ypos"			"302"
-			"ypos_hidef"			"139"
-			"ypos_lodef"			"139"
 			"zpos"			"2"
 			"wide"			"70"
 			"tall"			"16"
@@ -934,14 +772,10 @@
 		}
 		"ClassBar5A"
 		{
-			"ControlName"		"ImagePanel"
+			"ControlName"	"ImagePanel"
 			"fieldName"		"ClassBar5A"
 			"xpos"			"c-282"
-			"xpos_hidef"			"c-190"
-			"xpos_lodef"			"c-190"
 			"ypos"			"304"
-			"ypos_hidef"			"141"
-			"ypos_lodef"			"141"
 			"zpos"			"3"
 			"wide"			"151"
 			"tall"			"12"
@@ -955,14 +789,10 @@
 		}	
 		"ClassBar5B"
 		{
-			"ControlName"		"ImagePanel"
+			"ControlName"	"ImagePanel"
 			"fieldName"		"ClassBar5B"
 			"xpos"			"c-127"
-			"xpos_hidef"			"c-35"
-			"xpos_lodef"			"c-35"
 			"ypos"			"304"
-			"ypos_hidef"			"141"
-			"ypos_lodef"			"141"
 			"zpos"			"3"
 			"wide"			"151"
 			"tall"			"12"
@@ -976,17 +806,13 @@
 		}	
 		"ClassBarLabel5A"
 		{
-			"ControlName"		"Label"
+			"ControlName"	"Label"
 			"fieldName"		"ClassBarLabel5A"
 			"font"			"CerbeticaBold12"
 			"labelText"		"%classbarlabel5A%"
-			"textAlignment"		"west"
+			"textAlignment"	"west"
 			"xpos"			"c-282"
-			"xpos_hidef"			"c-190"
-			"xpos_lodef"			"c-190"
 			"ypos"			"300"
-			"ypos_hidef"			"137"
-			"ypos_lodef"			"137"
 			"zpos"			"6"
 			"wide"			"100"
 			"tall"			"20"
@@ -997,17 +823,13 @@
 		}
 		"ClassBarLabel5B"
 		{
-			"ControlName"		"Label"
+			"ControlName"	"Label"
 			"fieldName"		"ClassBarLabel5B"
 			"font"			"CerbeticaBold12"
 			"labelText"		"%classbarlabel5B%"
-			"textAlignment"		"west"
+			"textAlignment"	"west"
 			"xpos"			"c-127"
-			"xpos_hidef"			"c-35"
-			"xpos_lodef"			"c-35"
 			"ypos"			"300"
-			"ypos_hidef"			"137"
-			"ypos_lodef"			"137"
 			"zpos"			"6"
 			"wide"			"100"
 			"tall"			"20"
@@ -1018,19 +840,13 @@
 		}
 		"ClassLabel5"
 		{
-			"ControlName"		"Label"
+			"ControlName"	"Label"
 			"fieldName"		"ClassLabel5"
 			"font"			"CerbeticaBold12"
-			"font_hidef"	"Default"
-			"font_lodef"			"CerbeticaBold12"
 			"labelText"		"%class5%"
-			"textAlignment"		"west"
+			"textAlignment"	"west"
 			"xpos"			"c+34"
-			"xpos_hidef"			"c+126"
-			"xpos_lodef"			"c+126"
 			"ypos"			"300"
-			"ypos_hidef"			"137"
-			"ypos_lodef"			"137"
 			"zpos"			"5"
 			"wide"			"282"
 			"tall"			"20"
@@ -1041,14 +857,10 @@
 		}
 		"ClassBarBG6A"
 		{
-			"ControlName"		"ImagePanel"
+			"ControlName"	"ImagePanel"
 			"fieldName"		"ClassBarBG6A"
 			"xpos"			"c-285"
-			"xpos_hidef"			"c-193"
-			"xpos_lodef"			"c-193"
 			"ypos"			"320"
-			"ypos_hidef"			"157"
-			"ypos_lodef"			"157"
 			"zpos"			"2"
 			"wide"			"312"
 			"tall"			"16"
@@ -1062,14 +874,10 @@
 		}
 		"ClassBarBG6B"
 		{
-			"ControlName"		"ImagePanel"
+			"ControlName"	"ImagePanel"
 			"fieldName"		"ClassBarBG6B"
 			"xpos"			"c+30"
-			"xpos_hidef"			"c+122"
-			"xpos_lodef"			"c+122"
 			"ypos"			"320"
-			"ypos_hidef"			"157"
-			"ypos_lodef"			"157"
 			"zpos"			"2"
 			"wide"			"70"
 			"tall"			"16"
@@ -1083,14 +891,10 @@
 		}
 		"ClassBar6A"
 		{
-			"ControlName"		"ImagePanel"
+			"ControlName"	"ImagePanel"
 			"fieldName"		"ClassBar6A"
 			"xpos"			"c-282"
-			"xpos_hidef"			"c-190"
-			"xpos_lodef"			"c-190"
 			"ypos"			"322"
-			"ypos_hidef"			"159"
-			"ypos_lodef"			"159"
 			"zpos"			"3"
 			"wide"			"151"
 			"tall"			"12"
@@ -1104,14 +908,10 @@
 		}	
 		"ClassBar6B"
 		{
-			"ControlName"		"ImagePanel"
+			"ControlName"	"ImagePanel"
 			"fieldName"		"ClassBar6B"
 			"xpos"			"c-127"
-			"xpos_hidef"			"c-35"
-			"xpos_lodef"			"c-35"
 			"ypos"			"322"
-			"ypos_hidef"			"159"
-			"ypos_lodef"			"159"
 			"zpos"			"3"
 			"wide"			"151"
 			"tall"			"12"
@@ -1125,17 +925,13 @@
 		}	
 		"ClassBarLabel6A"
 		{
-			"ControlName"		"Label"
+			"ControlName"	"Label"
 			"fieldName"		"ClassBarLabel6A"
 			"font"			"CerbeticaBold12"
 			"labelText"		"%classbarlabel6A%"
-			"textAlignment"		"west"
+			"textAlignment"	"west"
 			"xpos"			"c-282"
-			"xpos_hidef"			"c-190"
-			"xpos_lodef"			"c-190"
 			"ypos"			"318"
-			"ypos_hidef"			"155"
-			"ypos_lodef"			"155"
 			"zpos"			"6"
 			"wide"			"100"
 			"tall"			"20"
@@ -1146,17 +942,13 @@
 		}				
 		"ClassBarLabel6B"
 		{
-			"ControlName"		"Label"
+			"ControlName"	"Label"
 			"fieldName"		"ClassBarLabel6B"
 			"font"			"CerbeticaBold12"
 			"labelText"		"%classbarlabel6B%"
-			"textAlignment"		"west"
+			"textAlignment"	"west"
 			"xpos"			"c-127"
-			"xpos_hidef"			"c-35"
-			"xpos_lodef"			"c-35"
 			"ypos"			"318"
-			"ypos_hidef"			"155"
-			"ypos_lodef"			"155"
 			"zpos"			"6"
 			"wide"			"100"
 			"tall"			"20"
@@ -1167,19 +959,13 @@
 		}				
 		"ClassLabel6"
 		{
-			"ControlName"		"Label"
+			"ControlName"	"Label"
 			"fieldName"		"ClassLabel6"
 			"font"			"CerbeticaBold12"
-			"font_hidef"	"Default"
-			"font_lodef"			"CerbeticaBold12"
 			"labelText"		"%class6%"
-			"textAlignment"		"west"
+			"textAlignment"	"west"
 			"xpos"			"c+34"
-			"xpos_hidef"			"c+126"
-			"xpos_lodef"			"c+126"
 			"ypos"			"318"
-			"ypos_hidef"			"155"
-			"ypos_lodef"			"155"
 			"zpos"			"5"
 			"wide"			"300"
 			"tall"			"20"
@@ -1190,14 +976,10 @@
 		}				
 		"ClassBarBG7A"
 		{
-			"ControlName"		"ImagePanel"
+			"ControlName"	"ImagePanel"
 			"fieldName"		"ClassBarBG7A"
 			"xpos"			"c-285"
-			"xpos_hidef"			"c-193"
-			"xpos_lodef"			"c-193"
 			"ypos"			"338"
-			"ypos_hidef"			"175"
-			"ypos_lodef"			"175"
 			"zpos"			"2"
 			"wide"			"312"
 			"tall"			"16"
@@ -1211,14 +993,10 @@
 		}
 		"ClassBarBG7B"
 		{
-			"ControlName"		"ImagePanel"
+			"ControlName"	"ImagePanel"
 			"fieldName"		"ClassBarBG7B"
 			"xpos"			"c+30"
-			"xpos_hidef"			"c+122"
-			"xpos_lodef"			"c+122"
 			"ypos"			"338"
-			"ypos_hidef"			"175"
-			"ypos_lodef"			"175"
 			"zpos"			"2"
 			"wide"			"70"
 			"tall"			"16"
@@ -1232,14 +1010,10 @@
 		}
 		"ClassBar7A"
 		{
-			"ControlName"		"ImagePanel"
+			"ControlName"	"ImagePanel"
 			"fieldName"		"ClassBar7A"
 			"xpos"			"c-282"
-			"xpos_hidef"			"c-190"
-			"xpos_lodef"			"c-190"
 			"ypos"			"340"
-			"ypos_hidef"			"177"
-			"ypos_lodef"			"177"
 			"zpos"			"3"
 			"wide"			"151"
 			"tall"			"12"
@@ -1253,14 +1027,10 @@
 		}	
 		"ClassBar7B"
 		{
-			"ControlName"		"ImagePanel"
+			"ControlName"	"ImagePanel"
 			"fieldName"		"ClassBar7B"
 			"xpos"			"c-127"
-			"xpos_hidef"			"c-35"
-			"xpos_lodef"			"c-35"
 			"ypos"			"340"
-			"ypos_hidef"			"177"
-			"ypos_lodef"			"177"
 			"zpos"			"3"
 			"wide"			"151"
 			"tall"			"12"
@@ -1274,17 +1044,13 @@
 		}	
 		"ClassBarLabel7A"
 		{
-			"ControlName"		"Label"
+			"ControlName"	"Label"
 			"fieldName"		"ClassBarLabel7A"
 			"font"			"CerbeticaBold12"
 			"labelText"		"%classbarlabel7A%"
-			"textAlignment"		"west"
+			"textAlignment"	"west"
 			"xpos"			"c-282"
-			"xpos_hidef"			"c-190"
-			"xpos_lodef"			"c-190"
 			"ypos"			"336"
-			"ypos_hidef"			"173"
-			"ypos_lodef"			"173"
 			"zpos"			"6"
 			"wide"			"100"
 			"tall"			"20"
@@ -1295,17 +1061,13 @@
 		}				
 		"ClassBarLabel7B"
 		{
-			"ControlName"		"Label"
+			"ControlName"	"Label"
 			"fieldName"		"ClassBarLabel7B"
 			"font"			"CerbeticaBold12"
 			"labelText"		"%classbarlabel7B%"
-			"textAlignment"		"west"
+			"textAlignment"	"west"
 			"xpos"			"c-127"
-			"xpos_hidef"			"c-35"
-			"xpos_lodef"			"c-35"
 			"ypos"			"336"
-			"ypos_hidef"			"173"
-			"ypos_lodef"			"173"
 			"zpos"			"6"
 			"wide"			"100"
 			"tall"			"20"
@@ -1316,19 +1078,13 @@
 		}				
 		"ClassLabel7"
 		{
-			"ControlName"		"Label"
+			"ControlName"	"Label"
 			"fieldName"		"ClassLabel7"
 			"font"			"CerbeticaBold12"
-			"font_hidef"	"Default"
-			"font_lodef"			"CerbeticaBold12"
 			"labelText"		"%class7%"
-			"textAlignment"		"west"
+			"textAlignment"	"west"
 			"xpos"			"c+34"
-			"xpos_hidef"			"c+126"
-			"xpos_lodef"			"c+126"
 			"ypos"			"336"
-			"ypos_hidef"			"173"
-			"ypos_lodef"			"173"
 			"zpos"			"5"
 			"wide"			"300"
 			"tall"			"20"
@@ -1339,14 +1095,10 @@
 		}
 		"ClassBarBG8A"
 		{
-			"ControlName"		"ImagePanel"
+			"ControlName"	"ImagePanel"
 			"fieldName"		"ClassBarBG8A"
 			"xpos"			"c-285"
-			"xpos_hidef"			"c-193"
-			"xpos_lodef"			"c-193"
 			"ypos"			"356"
-			"ypos_hidef"			"193"
-			"ypos_lodef"			"193"
 			"zpos"			"2"
 			"wide"			"312"
 			"tall"			"16"
@@ -1360,14 +1112,10 @@
 		}
 		"ClassBarBG8B"
 		{
-			"ControlName"		"ImagePanel"
+			"ControlName"	"ImagePanel"
 			"fieldName"		"ClassBarBG8B"
 			"xpos"			"c+30"
-			"xpos_hidef"			"c+122"
-			"xpos_lodef"			"c+122"
 			"ypos"			"356"
-			"ypos_hidef"			"193"
-			"ypos_lodef"			"193"
 			"zpos"			"2"
 			"wide"			"70"
 			"tall"			"16"
@@ -1381,14 +1129,10 @@
 		}
 		"ClassBar8A"
 		{
-			"ControlName"		"ImagePanel"
+			"ControlName"	"ImagePanel"
 			"fieldName"		"ClassBar8A"
 			"xpos"			"c-282"
-			"xpos_hidef"			"c-190"
-			"xpos_lodef"			"c-190"
 			"ypos"			"358"
-			"ypos_hidef"			"195"
-			"ypos_lodef"			"195"
 			"zpos"			"3"
 			"wide"			"151"
 			"tall"			"12"
@@ -1402,14 +1146,10 @@
 		}	
 		"ClassBar8B"
 		{
-			"ControlName"		"ImagePanel"
+			"ControlName"	"ImagePanel"
 			"fieldName"		"ClassBar8B"
 			"xpos"			"c-127"
-			"xpos_hidef"			"c-35"
-			"xpos_lodef"			"c-35"
 			"ypos"			"358"
-			"ypos_hidef"			"195"
-			"ypos_lodef"			"195"
 			"zpos"			"3"
 			"wide"			"151"
 			"tall"			"12"
@@ -1423,17 +1163,13 @@
 		}	
 		"ClassBarLabel8A"
 		{
-			"ControlName"		"Label"
+			"ControlName"	"Label"
 			"fieldName"		"ClassBarLabel8A"
 			"font"			"CerbeticaBold12"
 			"labelText"		"%classbarlabel8A%"
-			"textAlignment"		"west"
+			"textAlignment"	"west"
 			"xpos"			"c-282"
-			"xpos_hidef"			"c-190"
-			"xpos_lodef"			"c-190"
 			"ypos"			"354"
-			"ypos_hidef"			"191"
-			"ypos_lodef"			"191"
 			"zpos"			"6"
 			"wide"			"100"
 			"tall"			"20"
@@ -1444,17 +1180,13 @@
 		}
 		"ClassBarLabel8B"
 		{
-			"ControlName"		"Label"
+			"ControlName"	"Label"
 			"fieldName"		"ClassBarLabel8B"
 			"font"			"CerbeticaBold12"
 			"labelText"		"%classbarlabel8B%"
-			"textAlignment"		"west"
+			"textAlignment"	"west"
 			"xpos"			"c-127"
-			"xpos_hidef"			"c-35"
-			"xpos_lodef"			"c-35"
 			"ypos"			"354"
-			"ypos_hidef"			"191"
-			"ypos_lodef"			"191"
 			"zpos"			"6"
 			"wide"			"100"
 			"tall"			"20"
@@ -1465,19 +1197,13 @@
 		}
 		"ClassLabel8"
 		{
-			"ControlName"		"Label"
+			"ControlName"	"Label"
 			"fieldName"		"ClassLabel8"
 			"font"			"CerbeticaBold12"
-			"font_hidef"	"Default"
-			"font_lodef"			"CerbeticaBold12"
 			"labelText"		"%class8%"
-			"textAlignment"		"west"
+			"textAlignment"	"west"
 			"xpos"			"c+34"
-			"xpos_hidef"			"c+126"
-			"xpos_lodef"			"c+126"
 			"ypos"			"354"
-			"ypos_hidef"			"191"
-			"ypos_lodef"			"191"
 			"zpos"			"5"
 			"wide"			"300"
 			"tall"			"20"
@@ -1488,14 +1214,10 @@
 		}
 		"ClassBarBG9A"
 		{
-			"ControlName"		"ImagePanel"
+			"ControlName"	"ImagePanel"
 			"fieldName"		"ClassBarBG9A"
 			"xpos"			"c-285"
-			"xpos_hidef"			"c-193"
-			"xpos_lodef"			"c-193"
 			"ypos"			"374"
-			"ypos_hidef"			"211"
-			"ypos_lodef"			"211"
 			"zpos"			"2"
 			"wide"			"312"
 			"tall"			"16"
@@ -1509,14 +1231,10 @@
 		}
 		"ClassBarBG9B"
 		{
-			"ControlName"		"ImagePanel"
+			"ControlName"	"ImagePanel"
 			"fieldName"		"ClassBarBG9B"
 			"xpos"			"c+30"
-			"xpos_hidef"			"c+122"
-			"xpos_lodef"			"c+122"
 			"ypos"			"374"
-			"ypos_hidef"			"211"
-			"ypos_lodef"			"211"
 			"zpos"			"2"
 			"wide"			"70"
 			"tall"			"16"
@@ -1530,14 +1248,10 @@
 		}
 		"ClassBar9A"
 		{
-			"ControlName"		"ImagePanel"
+			"ControlName"	"ImagePanel"
 			"fieldName"		"ClassBar9A"
 			"xpos"			"c-282"
-			"xpos_hidef"			"c-190"
-			"xpos_lodef"			"c-190"
 			"ypos"			"376"
-			"ypos_hidef"			"213"
-			"ypos_lodef"			"213"
 			"zpos"			"3"
 			"wide"			"151"
 			"tall"			"12"
@@ -1551,14 +1265,10 @@
 		}	
 		"ClassBar9B"
 		{
-			"ControlName"		"ImagePanel"
+			"ControlName"	"ImagePanel"
 			"fieldName"		"ClassBar9B"
 			"xpos"			"c-127"
-			"xpos_hidef"			"c-35"
-			"xpos_lodef"			"c-35"
 			"ypos"			"376"
-			"ypos_hidef"			"213"
-			"ypos_lodef"			"213"
 			"zpos"			"3"
 			"wide"			"151"
 			"tall"			"12"
@@ -1572,17 +1282,13 @@
 		}
 		"ClassBarLabel9A"
 		{
-			"ControlName"		"Label"
+			"ControlName"	"Label"
 			"fieldName"		"ClassBarLabel9A"
 			"font"			"CerbeticaBold12"
 			"labelText"		"%classbarlabel9A%"
-			"textAlignment"		"west"
+			"textAlignment"	"west"
 			"xpos"			"c-282"
-			"xpos_hidef"			"c-190"
-			"xpos_lodef"			"c-190"
 			"ypos"			"372"
-			"ypos_hidef"			"209"
-			"ypos_lodef"			"209"
 			"zpos"			"6"
 			"wide"			"100"
 			"tall"			"20"
@@ -1593,17 +1299,13 @@
 		}
 		"ClassBarLabel9B"
 		{
-			"ControlName"		"Label"
+			"ControlName"	"Label"
 			"fieldName"		"ClassBarLabel9B"
 			"font"			"CerbeticaBold12"
 			"labelText"		"%classbarlabel9B%"
-			"textAlignment"		"west"
+			"textAlignment"	"west"
 			"xpos"			"c-127"
-			"xpos_hidef"			"c-35"
-			"xpos_lodef"			"c-35"
 			"ypos"			"372"
-			"ypos_hidef"			"209"
-			"ypos_lodef"			"209"
 			"zpos"			"6"
 			"wide"			"100"
 			"tall"			"20"
@@ -1614,19 +1316,13 @@
 		}
 		"ClassLabel9"
 		{
-			"ControlName"		"Label"
+			"ControlName"	"Label"
 			"fieldName"		"ClassLabel9"
 			"font"			"CerbeticaBold12"
-			"font_hidef"	"Default"
-			"font_lodef"			"CerbeticaBold12"
 			"labelText"		"%class9%"
-			"textAlignment"		"west"
+			"textAlignment"	"west"
 			"xpos"			"c+34"
-			"xpos_hidef"			"c+126"
-			"xpos_lodef"			"c+126"
 			"ypos"			"372"
-			"ypos_hidef"			"209"
-			"ypos_lodef"			"209"
 			"zpos"			"5"
 			"wide"			"300"
 			"tall"			"20"
@@ -1637,61 +1333,43 @@
 		}
 		"RecordsBG"
 		{
-			"ControlName"		"EditablePanel"
+			"ControlName"	"EditablePanel"
 			"fieldName"		"RecordsBG"
 			"xpos"			"9999"
-			"xpos_hidef"			"c+95"
 			"ypos"			"9999"
-			"ypos_hidef"			"115"
 			"wide"			"200"
-			"wide_hidef"			"225"
 			"tall"			"260"
 			"autoResize"	"0"
 			"pinCorner"		"0"
 			"visible"		"1"
-			"visible_hidef"		"0"
-			"visible_lodef"		"0"
 			"enabled"		"1"
-			"enabled_hidef"		"0"
-			"enabled_lodef"		"0"
-			"border"		"NoBorder"
 			"bgcolor_override"	"15 15 15 255"
 		}
 		"RecordsLabel1"
 		{
-			"ControlName"		"Label"
+			"ControlName"	"Label"
 			"fieldName"		"RecordsLabel1"
 			"font"			"ScoreboardMediumSmall"
 			"labelText"		"#StatSummary_Label_BestMoments"
-			"textAlignment"		"west"
+			"textAlignment"	"west"
 			"xpos"			"c+124"
-			"ypos"			"170" [!$OSX]
-			"ypos"			"180" [$OSX]
+			"ypos"			"185"
 			"wide"			"300"
 			"tall"			"20"
 			"autoResize"	"0"
 			"pinCorner"		"0"
-			"visible"		"1"	[$WIN32]
-			"visible"		"0"	[$X360]
+			"visible"		"1"
 			"enabled"		"1"
 		}							
 		"RecordsSubBG1"
 		{
-			"ControlName"		"ImagePanel"
+			"ControlName"	"ImagePanel"
 			"fieldName"		"RecordsSubBG1"
 			"xpos"			"c+124"
-			"xpos_hidef"			"c-270"
-			"xpos_lodef"			"c-270"
-			"ypos"			"217"
-			"ypos_hidef"			"229"
-			"ypos_lodef"			"229"
+			"ypos"			"230"
 			"zpos"			"2"
 			"wide"			"167"
-			"wide_hidef"			"540"
-			"wide_lodef"			"540"
-			"tall"			"157"
-			"tall_hidef"			"183"
-			"tall_lodef"			"183"
+			"tall"			"160"
 			"autoResize"	"0"
 			"pinCorner"		"0"
 			"visible"		"1"
@@ -1702,11 +1380,11 @@
 		}
 		"RecordsLabel"
 		{
-			"ControlName"		"Label"
+			"ControlName"	"Label"
 			"fieldName"		"RecordsLabel"
 			"font"			"ScoreboardMedium"
 			"labelText"		"#StatSummary_Records"
-			"textAlignment"		"west"
+			"textAlignment"	"west"
 			"xpos"			"c-265"
 			"ypos"			"232"
 			"zpos"			"5"
@@ -1714,28 +1392,20 @@
 			"tall"			"20"
 			"autoResize"	"0"
 			"pinCorner"		"0"
-			"visible"		"0"	[$WIN32]
-			"visible"		"1"	[$X360]
+			"visible"		"0"
 			"enabled"		"1"
 		}	
 		"OverallRecord1Label"
 		{
-			"ControlName"		"Label"
+			"ControlName"	"Label"
 			"fieldName"		"OverallRecord1Label"
 			"font"			"ScoreboardVerySmall"
-			"font_hidef"	"Default"
 			"labelText"		"%classrecord1label%"
-			"textAlignment"		"west"
+			"textAlignment"	"west"
 			"xpos"			"c+128"
-			"xpos_hidef"			"c-265"
-			"xpos_lodef"			"c-265"
-			"ypos"			"214"
-			"ypos_hidef"			"246"
-			"ypos_lodef"			"246"
+			"ypos"			"229"
 			"zpos"			"5"
 			"wide"			"200"
-			"wide_hidef"			"220"
-			"wide_lodef"			"220"
 			"tall"			"20"
 			"autoResize"	"0"
 			"pinCorner"		"0"
@@ -1744,22 +1414,15 @@
 		}
 		"OverallRecord1Value"
 		{
-			"ControlName"		"Label"
+			"ControlName"	"Label"
 			"fieldName"		"OverallRecord1Value"
 			"font"			"ScoreboardVerySmall"
-			"font_hidef"	"Default"
 			"labelText"		"%classrecord1value%"
-			"textAlignment"		"west"
+			"textAlignment"	"west"
 			"xpos"			"c+210"
-			"xpos_hidef"			"c-155"
-			"xpos_lodef"			"c-155"
-			"ypos"			"214"
-			"ypos_hidef"			"246"
-			"ypos_lodef"			"246"
+			"ypos"			"229"
 			"zpos"			"5"
 			"wide"			"200"
-			"wide_hidef"			"220"
-			"wide_lodef"			"220"
 			"tall"			"20"
 			"autoResize"	"0"
 			"pinCorner"		"0"
@@ -1768,22 +1431,15 @@
 		}
 		"OverallRecord2Label"
 		{
-			"ControlName"		"Label"
+			"ControlName"	"Label"
 			"fieldName"		"OverallRecord2Label"
 			"font"			"ScoreboardVerySmall"
-			"font_hidef"	"Default"
 			"labelText"		"%classrecord2label%"
-			"textAlignment"		"west"
+			"textAlignment"	"west"
 			"xpos"			"c+128"
-			"xpos_hidef"			"c-265"
-			"xpos_lodef"			"c-265"
-			"ypos"			"224"
-			"ypos_hidef"			"258"
-			"ypos_lodef"			"258"
+			"ypos"			"239"
 			"zpos"			"5"
 			"wide"			"200"
-			"wide_hidef"			"220"
-			"wide_lodef"			"220"
 			"tall"			"20"
 			"autoResize"	"0"
 			"pinCorner"		"0"
@@ -1792,22 +1448,15 @@
 		}
 		"OverallRecord2Value"
 		{
-			"ControlName"		"Label"
+			"ControlName"	"Label"
 			"fieldName"		"OverallRecord2Value"
 			"font"			"ScoreboardVerySmall"
-			"font_hidef"	"Default"
 			"labelText"		"%classrecord2value%"
-			"textAlignment"		"west"
+			"textAlignment"	"west"
 			"xpos"			"c+210"
-			"xpos_hidef"			"c-155"
-			"xpos_lodef"			"c-155"
-			"ypos"			"224"
-			"ypos_hidef"			"258"
-			"ypos_lodef"			"258"
+			"ypos"			"239"
 			"zpos"			"5"
 			"wide"			"200"
-			"wide_hidef"			"220"
-			"wide_lodef"			"220"
 			"tall"			"20"
 			"autoResize"	"0"
 			"pinCorner"		"0"
@@ -1816,22 +1465,15 @@
 		}
 		"OverallRecord3Label"
 		{
-			"ControlName"		"Label"
+			"ControlName"	"Label"
 			"fieldName"		"OverallRecord3Label"
 			"font"			"ScoreboardVerySmall"
-			"font_hidef"	"Default"
 			"labelText"		"%classrecord3label%"
-			"textAlignment"		"west"
+			"textAlignment"	"west"
 			"xpos"			"c+128"
-			"xpos_hidef"			"c-265"
-			"xpos_lodef"			"c-265"
-			"ypos"			"234"
-			"ypos_hidef"			"270"
-			"ypos_lodef"			"270"
+			"ypos"			"249"
 			"zpos"			"5"
 			"wide"			"200"
-			"wide_hidef"			"220"
-			"wide_lodef"			"220"
 			"tall"			"20"
 			"autoResize"	"0"
 			"pinCorner"		"0"
@@ -1840,22 +1482,15 @@
 		}
 		"OverallRecord3Value"
 		{
-			"ControlName"		"Label"
+			"ControlName"	"Label"
 			"fieldName"		"OverallRecord3Value"
 			"font"			"ScoreboardVerySmall"
-			"font_hidef"	"Default"
 			"labelText"		"%classrecord3value%"
-			"textAlignment"		"west"
+			"textAlignment"	"west"
 			"xpos"			"c+210"
-			"xpos_hidef"			"c-155"
-			"xpos_lodef"			"c-155"
-			"ypos"			"234"
-			"ypos_hidef"			"270"
-			"ypos_lodef"			"270"
+			"ypos"			"249"
 			"zpos"			"5"
 			"wide"			"200"
-			"wide_hidef"			"220"
-			"wide_lodef"			"220"
 			"tall"			"20"
 			"autoResize"	"0"
 			"pinCorner"		"0"
@@ -1864,22 +1499,15 @@
 		}
 		"OverallRecord4Label"
 		{
-			"ControlName"		"Label"
+			"ControlName"	"Label"
 			"fieldName"		"OverallRecord4Label"
 			"font"			"ScoreboardVerySmall"
-			"font_hidef"	"Default"
 			"labelText"		"%classrecord4label%"
-			"textAlignment"		"west"
+			"textAlignment"	"west"
 			"xpos"			"c+128"
-			"xpos_hidef"			"c-265"
-			"xpos_lodef"			"c-265"
-			"ypos"			"244"
-			"ypos_hidef"			"282"
-			"ypos_lodef"			"282"
+			"ypos"			"259"
 			"zpos"			"5"
 			"wide"			"200"
-			"wide_hidef"			"220"
-			"wide_lodef"			"220"
 			"tall"			"20"
 			"autoResize"	"0"
 			"pinCorner"		"0"
@@ -1888,22 +1516,15 @@
 		}
 		"OverallRecord4Value"
 		{
-			"ControlName"		"Label"
+			"ControlName"	"Label"
 			"fieldName"		"OverallRecord4Value"
 			"font"			"ScoreboardVerySmall"
-			"font_hidef"	"Default"
 			"labelText"		"%classrecord4value%"
-			"textAlignment"		"west"
+			"textAlignment"	"west"
 			"xpos"			"c+210"
-			"xpos_hidef"			"c-155"
-			"xpos_lodef"			"c-155"
-			"ypos"			"244"
-			"ypos_hidef"			"282"
-			"ypos_lodef"			"282"
+			"ypos"			"259"
 			"zpos"			"5"
 			"wide"			"200"
-			"wide_hidef"			"220"
-			"wide_lodef"			"220"
 			"tall"			"20"
 			"autoResize"	"0"
 			"pinCorner"		"0"
@@ -1912,22 +1533,15 @@
 		}
 		"OverallRecord5Label"
 		{
-			"ControlName"		"Label"
+			"ControlName"	"Label"
 			"fieldName"		"OverallRecord5Label"
 			"font"			"ScoreboardVerySmall"
-			"font_hidef"	"Default"
 			"labelText"		"%classrecord5label%"
-			"textAlignment"		"west"
+			"textAlignment"	"west"
 			"xpos"			"c+128"
-			"xpos_hidef"			"c-265"
-			"xpos_lodef"			"c-265"
-			"ypos"			"254"
-			"ypos_hidef"			"294"
-			"ypos_lodef"			"294"
+			"ypos"			"269"
 			"zpos"			"5"
 			"wide"			"200"
-			"wide_hidef"			"220"
-			"wide_lodef"			"220"
 			"tall"			"20"
 			"autoResize"	"0"
 			"pinCorner"		"0"
@@ -1936,22 +1550,15 @@
 		}
 		"OverallRecord5Value"
 		{
-			"ControlName"		"Label"
+			"ControlName"	"Label"
 			"fieldName"		"OverallRecord5Value"
 			"font"			"ScoreboardVerySmall"
-			"font_hidef"	"Default"
 			"labelText"		"%classrecord5value%"
-			"textAlignment"		"west"
+			"textAlignment"	"west"
 			"xpos"			"c+210"
-			"xpos_hidef"			"c-155"
-			"xpos_lodef"			"c-155"
-			"ypos"			"254"
-			"ypos_hidef"			"294"
-			"ypos_lodef"			"294"
+			"ypos"			"269"
 			"zpos"			"5"
 			"wide"			"200"
-			"wide_hidef"			"220"
-			"wide_lodef"			"220"
 			"tall"			"20"
 			"autoResize"	"0"
 			"pinCorner"		"0"
@@ -1960,22 +1567,15 @@
 		}
 		"OverallRecord6Label"
 		{
-			"ControlName"		"Label"
+			"ControlName"	"Label"
 			"fieldName"		"OverallRecord6Label"
 			"font"			"ScoreboardVerySmall"
-			"font_hidef"	"Default"
 			"labelText"		"%classrecord6label%"
-			"textAlignment"		"west"
+			"textAlignment"	"west"
 			"xpos"			"c+128"
-			"xpos_hidef"			"c-265"
-			"xpos_lodef"			"c-265"
-			"ypos"			"264"
-			"ypos_hidef"			"306"
-			"ypos_lodef"			"306"
+			"ypos"			"279"
 			"zpos"			"5"
 			"wide"			"200"
-			"wide_hidef"			"220"
-			"wide_lodef"			"220"
 			"tall"			"20"
 			"autoResize"	"0"
 			"pinCorner"		"0"
@@ -1984,22 +1584,15 @@
 		}
 		"OverallRecord6Value"
 		{
-			"ControlName"		"Label"
+			"ControlName"	"Label"
 			"fieldName"		"OverallRecord6Value"
 			"font"			"ScoreboardVerySmall"
-			"font_hidef"	"Default"
 			"labelText"		"%classrecord6value%"
-			"textAlignment"		"west"
+			"textAlignment"	"west"
 			"xpos"			"c+210"
-			"xpos_hidef"			"c-155"
-			"xpos_lodef"			"c-155"
-			"ypos"			"264"
-			"ypos_hidef"			"306"
-			"ypos_lodef"			"306"
+			"ypos"			"279"
 			"zpos"			"5"
 			"wide"			"200"
-			"wide_hidef"			"220"
-			"wide_lodef"			"220"
 			"tall"			"20"
 			"autoResize"	"0"
 			"pinCorner"		"0"
@@ -2008,22 +1601,15 @@
 		}
 		"OverallRecord7Label"
 		{
-			"ControlName"		"Label"
+			"ControlName"	"Label"
 			"fieldName"		"OverallRecord7Label"
 			"font"			"ScoreboardVerySmall"
-			"font_hidef"	"Default"
 			"labelText"		"%classrecord7label%"
-			"textAlignment"		"west"
+			"textAlignment"	"west"
 			"xpos"			"c+128"
-			"xpos_hidef"			"c-265"
-			"xpos_lodef"			"c-265"
-			"ypos"			"274"
-			"ypos_hidef"			"318"
-			"ypos_lodef"			"318"
+			"ypos"			"289"
 			"zpos"			"5"
 			"wide"			"200"
-			"wide_hidef"			"220"
-			"wide_lodef"			"220"
 			"tall"			"20"
 			"autoResize"	"0"
 			"pinCorner"		"0"
@@ -2032,22 +1618,15 @@
 		}
 		"OverallRecord7Value"
 		{
-			"ControlName"		"Label"
+			"ControlName"	"Label"
 			"fieldName"		"OverallRecord7Value"
 			"font"			"ScoreboardVerySmall"
-			"font_hidef"	"Default"
 			"labelText"		"%classrecord7value%"
-			"textAlignment"		"west"
+			"textAlignment"	"west"
 			"xpos"			"c+210"
-			"xpos_hidef"			"c-155"
-			"xpos_lodef"			"c-155"
-			"ypos"			"274"
-			"ypos_hidef"			"318"
-			"ypos_lodef"			"318"
+			"ypos"			"289"
 			"zpos"			"5"
 			"wide"			"200"
-			"wide_hidef"			"220"
-			"wide_lodef"			"220"
 			"tall"			"20"
 			"autoResize"	"0"
 			"pinCorner"		"0"
@@ -2056,22 +1635,15 @@
 		}
 		"OverallRecord8Label"
 		{
-			"ControlName"		"Label"
+			"ControlName"	"Label"
 			"fieldName"		"OverallRecord8Label"
 			"font"			"ScoreboardVerySmall"
-			"font_hidef"	"Default"
 			"labelText"		"%classrecord8label%"
-			"textAlignment"		"west"
+			"textAlignment"	"west"
 			"xpos"			"c+128"
-			"xpos_hidef"			"c-265"
-			"xpos_lodef"			"c-265"
-			"ypos"			"284"
-			"ypos_hidef"			"330"
-			"ypos_lodef"			"330"
+			"ypos"			"299"
 			"zpos"			"5"
 			"wide"			"200"
-			"wide_hidef"			"220"
-			"wide_lodef"			"220"
 			"tall"			"20"
 			"autoResize"	"0"
 			"pinCorner"		"0"
@@ -2080,22 +1652,15 @@
 		}
 		"OverallRecord8Value"
 		{
-			"ControlName"		"Label"
+			"ControlName"	"Label"
 			"fieldName"		"OverallRecord8Value"
 			"font"			"ScoreboardVerySmall"
-			"font_hidef"	"Default"
 			"labelText"		"%classrecord8value%"
-			"textAlignment"		"west"
+			"textAlignment"	"west"
 			"xpos"			"c+210"
-			"xpos_hidef"			"c-155"
-			"xpos_lodef"			"c-155"
-			"ypos"			"284"
-			"ypos_hidef"			"330"
-			"ypos_lodef"			"330"
+			"ypos"			"299"
 			"zpos"			"5"
 			"wide"			"200"
-			"wide_hidef"			"220"
-			"wide_lodef"			"220"
 			"tall"			"20"
 			"autoResize"	"0"
 			"pinCorner"		"0"
@@ -2104,22 +1669,15 @@
 		}
 		"OverallRecord9Label"
 		{
-			"ControlName"		"Label"
+			"ControlName"	"Label"
 			"fieldName"		"OverallRecord9Label"
 			"font"			"ScoreboardVerySmall"
-			"font_hidef"	"Default"
 			"labelText"		"%classrecord9label%"
-			"textAlignment"		"west"
+			"textAlignment"	"west"
 			"xpos"			"c+128"
-			"xpos_hidef"			"c-25"
-			"xpos_lodef"			"c-25"
-			"ypos"			"294"
-			"ypos_hidef"			"246"
-			"ypos_lodef"			"246"
+			"ypos"			"309"
 			"zpos"			"5"
 			"wide"			"200"
-			"wide_hidef"			"220"
-			"wide_lodef"			"220"
 			"tall"			"20"
 			"autoResize"	"0"
 			"pinCorner"		"0"
@@ -2128,22 +1686,15 @@
 		}
 		"OverallRecord9Value"
 		{
-			"ControlName"		"Label"
+			"ControlName"	"Label"
 			"fieldName"		"OverallRecord9Value"
 			"font"			"ScoreboardVerySmall"
-			"font_hidef"	"Default"
 			"labelText"		"%classrecord9value%"
-			"textAlignment"		"west"
+			"textAlignment"	"west"
 			"xpos"			"c+210"
-			"xpos_hidef"			"c+148"
-			"xpos_lodef"			"c+148"
-			"ypos"			"294"
-			"ypos_hidef"			"246"
-			"ypos_lodef"			"246"
+			"ypos"			"309"
 			"zpos"			"5"
 			"wide"			"200"
-			"wide_hidef"			"220"
-			"wide_lodef"			"220"
 			"tall"			"20"
 			"autoResize"	"0"
 			"pinCorner"		"0"
@@ -2152,22 +1703,15 @@
 		}
 		"OverallRecord10Label"
 		{
-			"ControlName"		"Label"
+			"ControlName"	"Label"
 			"fieldName"		"OverallRecord10Label"
 			"font"			"ScoreboardVerySmall"
-			"font_hidef"	"Default"
 			"labelText"		"%classrecord10label%"
-			"textAlignment"		"west"
+			"textAlignment"	"west"
 			"xpos"			"c+128"
-			"xpos_hidef"			"c-25"
-			"xpos_lodef"			"c-25"
-			"ypos"			"304"
-			"ypos_hidef"			"258"
-			"ypos_lodef"			"258"
+			"ypos"			"319"
 			"zpos"			"5"
 			"wide"			"200"
-			"wide_hidef"			"220"
-			"wide_lodef"			"220"
 			"tall"			"20"
 			"autoResize"	"0"
 			"pinCorner"		"0"
@@ -2176,22 +1720,15 @@
 		}
 		"OverallRecord10Value"
 		{
-			"ControlName"		"Label"
+			"ControlName"	"Label"
 			"fieldName"		"OverallRecord10Value"
 			"font"			"ScoreboardVerySmall"
-			"font_hidef"	"Default"
 			"labelText"		"%classrecord10value%"
-			"textAlignment"		"west"
+			"textAlignment"	"west"
 			"xpos"			"c+210"
-			"xpos_hidef"			"c+160"
-			"xpos_lodef"			"c+160"
-			"ypos"			"304"
-			"ypos_hidef"			"258"
-			"ypos_lodef"			"258"
+			"ypos"			"319"
 			"zpos"			"5"
 			"wide"			"200"
-			"wide_hidef"			"220"
-			"wide_lodef"			"220"
 			"tall"			"20"
 			"autoResize"	"0"
 			"pinCorner"		"0"
@@ -2200,22 +1737,15 @@
 		}
 		"OverallRecord11Label"
 		{
-			"ControlName"		"Label"
+			"ControlName"	"Label"
 			"fieldName"		"OverallRecord11Label"
 			"font"			"ScoreboardVerySmall"
-			"font_hidef"	"Default"
 			"labelText"		"%classrecord11label%"
-			"textAlignment"		"west"
+			"textAlignment"	"west"
 			"xpos"			"c+128"
-			"xpos_hidef"			"c-25"
-			"xpos_lodef"			"c-25"
-			"ypos"			"314"
-			"ypos_hidef"			"270"
-			"ypos_lodef"			"270"
+			"ypos"			"329"
 			"zpos"			"5"
 			"wide"			"200"
-			"wide_hidef"			"220"
-			"wide_lodef"			"220"
 			"tall"			"20"
 			"autoResize"	"0"
 			"pinCorner"		"0"
@@ -2224,22 +1754,15 @@
 		}
 		"OverallRecord11Value"
 		{
-			"ControlName"		"Label"
+			"ControlName"	"Label"
 			"fieldName"		"OverallRecord11Value"
 			"font"			"ScoreboardVerySmall"
-			"font_hidef"	"Default"
 			"labelText"		"%classrecord11value%"
-			"textAlignment"		"west"
+			"textAlignment"	"west"
 			"xpos"			"c+210"
-			"xpos_hidef"			"c+160"
-			"xpos_lodef"			"c+160"
-			"ypos"			"314"
-			"ypos_hidef"			"270"
-			"ypos_lodef"			"270"
+			"ypos"			"329"
 			"zpos"			"5"
 			"wide"			"200"
-			"wide_hidef"			"220"
-			"wide_lodef"			"220"
 			"tall"			"20"
 			"autoResize"	"0"
 			"pinCorner"		"0"
@@ -2248,22 +1771,15 @@
 		}
 		"OverallRecord12Label"
 		{
-			"ControlName"		"Label"
+			"ControlName"	"Label"
 			"fieldName"		"OverallRecord12Label"
 			"font"			"ScoreboardVerySmall"
-			"font_hidef"	"Default"
 			"labelText"		"%classrecord12label%"
-			"textAlignment"		"west"
+			"textAlignment"	"west"
 			"xpos"			"c+128"
-			"xpos_hidef"			"c-25"
-			"xpos_lodef"			"c-25"
-			"ypos"			"324"
-			"ypos_hidef"			"282"
-			"ypos_lodef"			"282"
+			"ypos"			"339"
 			"zpos"			"5"
 			"wide"			"200"
-			"wide_hidef"			"220"
-			"wide_lodef"			"220"
 			"tall"			"20"
 			"autoResize"	"0"
 			"pinCorner"		"0"
@@ -2272,22 +1788,15 @@
 		}
 		"OverallRecord12Value"
 		{
-			"ControlName"		"Label"
+			"ControlName"	"Label"
 			"fieldName"		"OverallRecord12Value"
 			"font"			"ScoreboardVerySmall"
-			"font_hidef"	"Default"
 			"labelText"		"%classrecord12value%"
-			"textAlignment"		"west"
+			"textAlignment"	"west"
 			"xpos"			"c+210"
-			"xpos_hidef"			"c+160"
-			"xpos_lodef"			"c+160"
-			"ypos"			"324"
-			"ypos_hidef"			"282"
-			"ypos_lodef"			"282"
+			"ypos"			"339"
 			"zpos"			"5"
 			"wide"			"200"
-			"wide_hidef"			"220"
-			"wide_lodef"			"220"
 			"tall"			"20"
 			"autoResize"	"0"
 			"pinCorner"		"0"
@@ -2296,22 +1805,15 @@
 		}
 		"OverallRecord13Label"
 		{
-			"ControlName"		"Label"
+			"ControlName"	"Label"
 			"fieldName"		"OverallRecord13Label"
 			"font"			"ScoreboardVerySmall"
-			"font_hidef"	"Default"
 			"labelText"		"%classrecord13label%"
-			"textAlignment"		"west"
+			"textAlignment"	"west"
 			"xpos"			"c+128"
-			"xpos_hidef"			"c-25"
-			"xpos_lodef"			"c-25"
-			"ypos"			"334"
-			"ypos_hidef"			"294"
-			"ypos_lodef"			"294"
+			"ypos"			"349"
 			"zpos"			"5"
 			"wide"			"200"
-			"wide_hidef"			"220"
-			"wide_lodef"			"220"
 			"tall"			"20"
 			"autoResize"	"0"
 			"pinCorner"		"0"
@@ -2320,22 +1822,15 @@
 		}
 		"OverallRecord13Value"
 		{
-			"ControlName"		"Label"
+			"ControlName"	"Label"
 			"fieldName"		"OverallRecord13Value"
 			"font"			"ScoreboardVerySmall"
-			"font_hidef"	"Default"
 			"labelText"		"%classrecord13value%"
-			"textAlignment"		"west"
+			"textAlignment"	"west"
 			"xpos"			"c+210"
-			"xpos_hidef"			"c+160"
-			"xpos_lodef"			"c+160"
-			"ypos"			"334"
-			"ypos_hidef"			"294"
-			"ypos_lodef"			"294"
+			"ypos"			"349"
 			"zpos"			"5"
 			"wide"			"200"
-			"wide_hidef"			"220"
-			"wide_lodef"			"220"
 			"tall"			"20"
 			"autoResize"	"0"
 			"pinCorner"		"0"
@@ -2344,22 +1839,15 @@
 		}
 		"OverallRecord14Label"
 		{
-			"ControlName"		"Label"
+			"ControlName"	"Label"
 			"fieldName"		"OverallRecord14Label"
 			"font"			"ScoreboardVerySmall"
-			"font_hidef"	"Default"
 			"labelText"		"%classrecord14label%"
-			"textAlignment"		"west"
+			"textAlignment"	"west"
 			"xpos"			"c+128"
-			"xpos_hidef"			"c-25"
-			"xpos_lodef"			"c-25"
-			"ypos"			"344"
-			"ypos_hidef"			"306"
-			"ypos_lodef"			"306"
+			"ypos"			"359"
 			"zpos"			"5"
 			"wide"			"200"
-			"wide_hidef"			"220"
-			"wide_lodef"			"220"
 			"tall"			"20"
 			"autoResize"	"0"
 			"pinCorner"		"0"
@@ -2368,22 +1856,15 @@
 		}
 		"OverallRecord14Value"
 		{
-			"ControlName"		"Label"
+			"ControlName"	"Label"
 			"fieldName"		"OverallRecord14Value"
 			"font"			"ScoreboardVerySmall"
-			"font_hidef"	"Default"
 			"labelText"		"%classrecord14value%"
-			"textAlignment"		"west"
+			"textAlignment"	"west"
 			"xpos"			"c+210"
-			"xpos_hidef"			"c+160"
-			"xpos_lodef"			"c+160"
-			"ypos"			"344"
-			"ypos_hidef"			"306"
-			"ypos_lodef"			"306"
+			"ypos"			"359"
 			"zpos"			"5"
 			"wide"			"200"
-			"wide_hidef"			"220"
-			"wide_lodef"			"220"
 			"tall"			"20"
 			"autoResize"	"0"
 			"pinCorner"		"0"
@@ -2392,22 +1873,15 @@
 		}
 		"OverallRecord15Label"
 		{
-			"ControlName"		"Label"
+			"ControlName"	"Label"
 			"fieldName"		"OverallRecord15Label"
 			"font"			"ScoreboardVerySmall"
-			"font_hidef"	"Default"
 			"labelText"		"%classrecord15label%"
-			"textAlignment"		"west"
+			"textAlignment"	"west"
 			"xpos"			"c+128"
-			"xpos_hidef"			"c-25"
-			"xpos_lodef"			"c-25"
-			"ypos"			"354"
-			"ypos_hidef"			"318"
-			"ypos_lodef"			"318"
+			"ypos"			"369"
 			"zpos"			"5"
 			"wide"			"200"
-			"wide_hidef"			"220"
-			"wide_lodef"			"220"
 			"tall"			"20"
 			"autoResize"	"0"
 			"pinCorner"		"0"
@@ -2416,22 +1890,15 @@
 		}
 		"OverallRecord15Value"
 		{
-			"ControlName"		"Label"
+			"ControlName"	"Label"
 			"fieldName"		"OverallRecord15Value"
 			"font"			"ScoreboardVerySmall"
-			"font_hidef"	"Default"
 			"labelText"		"%classrecord15value%"
-			"textAlignment"		"west"
+			"textAlignment"	"west"
 			"xpos"			"c+210"
-			"xpos_hidef"			"c+160"
-			"xpos_lodef"			"c+160"
-			"ypos"			"354"
-			"ypos_hidef"			"318"
-			"ypos_lodef"			"318"
+			"ypos"			"369"
 			"zpos"			"5"
 			"wide"			"200"
-			"wide_hidef"			"220"
-			"wide_lodef"			"220"
 			"tall"			"20"
 			"autoResize"	"0"
 			"pinCorner"		"0"
@@ -2439,6 +1906,7 @@
 			"enabled"		"1"
 		}
 	}
+
 	"TipImage"
 	{
 		"ControlName"	"CTFImagePanel"
@@ -2455,36 +1923,26 @@
 	}
 	"TipText"
 	{
-		"ControlName"		"Label"
+		"ControlName"	"Label"
 		"fieldName"		"TipText"
 		"font"			"Cerbetica12"
-		"font_hidef"	"Default"
 		"labelText"		"%tiptext%"
-		"textAlignment"			"west"
-		"textAlignment_hidef"		"north-west"
-		"textAlignment_lodef"		"north-west"
-		"xpos"			"c-245"
-		"xpos_lodef"			"c-180"
-		"xpos_hidef"			"c-180"
+		"textAlignment"	"west"
+		"xpos"			"c-285"
 		"ypos"			"263"
-		"ypos_hidef"			"262"
-		"ypos_lodef"			"262"
 		"zpos"			"12"
 		"wide"			"350"
-		"wide_hidef"		"360"
-		"wide_lodef"		"360"
 		"tall"			"48"
-		"tall_hidef"	"60"
-		"tall_lodef"	"60"
 		"autoResize"	"0"
 		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
 		"wrap"			"1"
 	}
-	"NextTipButton" [$WIN32]
+	
+	"NextTipButton"
 	{
-		"ControlName"		"Button"
+		"ControlName"	"Button"
 		"fieldName"		"NextTipButton"
 		"xpos"			"c-248"
 		"ypos"			"310"
@@ -2507,12 +1965,11 @@
 		"defaultFgColor_override"	"TanLight"
 		"armedFgColor_override" 	"TanLight"
 		"depressedFgColor_override" "TanLight"
-		"border_default"			"NoBorder"
-		"border_armed"				"NoBorder"
 	}
-	"ResetStatsButton" [$WIN32]
+	
+	"ResetStatsButton"
 	{
-		"ControlName"		"Button"
+		"ControlName"	"Button"
 		"fieldName"		"ResetStatsButton"
 		"xpos"			"c130"
 		"ypos"			"270"
@@ -2529,18 +1986,13 @@
 		"dulltext"		"0"
 		"brighttext"	"0"
 		"Command"		"resetstatsbutton"
-		"defaultBgColor_override"	"15 15 15 255"
-		"armedBgColor_override"		"25 25 25 255"
-		"depressedBgColor_override"	"25 25 25 255"
-		"defaultFgColor_override"	"TanLight"
-		"armedFgColor_override" 	"TanLight"
-		"depressedFgColor_override" "TanLight"
-		"border_default"			"NoBorder"
-		"border_armed"				"NoBorder"
+		"border_default"	"ButtonHover"
+		"border_armed"		"ButtonHover"
 	}
-	"CloseButton" [$WIN32]
+	
+	"CloseButton"
 	{
-		"ControlName"		"Button"
+		"ControlName"	"Button"
 		"fieldName"		"CloseButton"
 		"xpos"			"r190"
 		"ypos"			"r50"
@@ -2557,59 +2009,7 @@
 		"dulltext"		"0"
 		"brighttext"	"0"
 		"Command"		"vguicancel"
-		"defaultBgColor_override"	"15 15 15 255"
-		"armedBgColor_override"		"25 25 25 255"
-		"depressedBgColor_override"	"25 25 25 255"
-		"defaultFgColor_override"	"TanLight"
-		"armedFgColor_override" 	"TanLight"
-		"depressedFgColor_override" "TanLight"
-		"border_default"			"NoBorder"
-		"border_armed"				"NoBorder"
-	}
-	"Footer" [$X360]
-	{
-		"ControlName"		"CTFFooter"
-		"fieldName"			"Footer"
-		"bgcolor"			"TanDarker"
-		"paintbackground"	"1"
-		"tall"				"100"
-		"tall_lodef"				"60"
-		"center"			"1"
-		"buttonoffsety"		"20"
-		"buttonoffsety_lodef"		"5"
-		"button_separator"	"10"
-		"button_separator_lodef"	"2"
-		"fonttext"			"MatchmakingDialogMenuLarge"
-		"fonttext_lodef"			"MatchmakingDialogMenuSmall"
-		"buttongap"			"50"
-		"textadjust"		"3"
-		"textadjust_lodef"		"0"
-		"zpos"				"6"
-		"fgcolor"			"HudOffWhite" 
-		
-		"button"
-		{
-			"name"		"back"
-			"text"		"#GameUI_Back"
-			"icon"		"#GameUI_Icons_B_BUTTON"
-		}
-		
-		"button"
-		{
-			"name"		"nexttip"
-			"text"		"#TF_NextTip_360"
-			"icon"		"#GameUI_Icons_A_BUTTON"
-		}
-	}		
-	"TitleBanner" [$X360]
-	{
-		"ControlName"	"ImagePanel"
-		"xpos"			"0"
-		"ypos"			"0"
-		"wide"			"f0"
-		"tall"			"128"
-		"image"			"menu_header"
-		"visible_lodef"	"0"
-		"enabled_lodef"	"0"
+		"border_default"	"ButtonHover"
+		"border_armed"		"ButtonHover"
 	}
 }
\ No newline at end of file