93 files changed, 1728 insertions, 2951 deletions
diff --git a/resource/GameMenu.res b/resource/GameMenu.res
index 2138d67..53b97c9 100644
--- a/resource/GameMenu.res
+++ b/resource/GameMenu.res
@@ -11,7 +11,7 @@
 		"label" 		"Mann Co. Store"
 		"command" 		"engine open_store"
 	}
-	"ReplayBrowserButton"
+	"ReplayButton"
 	{
 		"label" 		"Replay"
 		"command" 		"engine replay_reloadbrowser"
diff --git a/resource/ui/CharInfoLoadoutSubPanel.res b/resource/ui/CharInfoLoadoutSubPanel.res
index 9c7e1d4..2422281 100644
--- a/resource/ui/CharInfoLoadoutSubPanel.res
+++ b/resource/ui/CharInfoLoadoutSubPanel.res
@@ -15,9 +15,9 @@
 		"tabPosition"	"0"
 		"settitlebarvisible"	"0"
 		"PaintBackgroundType"	"0"
-		"bgcolor_override"				"25 25 25 255"
-		"infocus_bgcolor_override" 		"25 25 25 255"
-		"outoffocus_bgcolor_override" 	"25 25 25 255"
+		"bgcolor_override"				"DarkGrey"
+		"infocus_bgcolor_override" 		"DarkGrey"
+		"outoffocus_bgcolor_override" 	"DarkGrey"
 		"selectlabely_default"		"25"
 		"selectlabely_onchanges"	"15"
 		"class_ypos"				"40"
@@ -28,8 +28,8 @@
 		"class_tall_max"			"200"
 		"class_distance_min"		"7"
 		"class_distance_max"		"100"
-		"itemcountcolor"			"Base Color"
-		"itemcountcolor_noitems"	"117 107 94 255"
+		"itemcountcolor"			"ColorCyan"
+		"itemcountcolor_noitems"	"TextColor"
 	}
 	
 	"scout"
@@ -290,7 +290,7 @@
 		"ControlName"	"CExLabel"
 		"fieldName"		"ShowBackpackLabel"
 		"font"			"CerbeticaBold16"
-		"labelText"		"#BackpackTitle"
+		"labelText"		"BACKPACK"
 		"textAlignment"	"north"
 		"xpos"			"0"
 		"ypos"			"5"
@@ -386,7 +386,7 @@
 		"ControlName"	"CExLabel"
 		"fieldName"		"ShowArmoryLabel"
 		"font"			"CerbeticaBold16"
-		"labelText"		"#Armory"
+		"labelText"		"CATALOG"
 		"textAlignment"	"north"
 		"xpos"			"0"
 		"ypos"			"5"
@@ -535,7 +535,7 @@
 		"pinCorner"		"0"
 		"visible"		"0"
 		"enabled"		"1"
-		"fgcolor"		"117 107 94 255"
+		"fgcolor"		"TextColor"
 		"centerwrap"	"1"
 	}
 	
@@ -593,7 +593,7 @@
 		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
-		"fgcolor_override" "117 107 94 255"
+		"fgcolor_override" "TextColor"
 	}
 
 	"LoadoutChangesLabel"
@@ -702,7 +702,7 @@
 			"visible"		"1"
 			"enabled"		"1"
 			"wrap"			"1"
-			"fgcolor_override" "46 43 42 255"
+			"fgcolor_override" "TanDarker"
 		}
 		
 		"TextLabel"
@@ -721,7 +721,7 @@
 			"visible"		"1"
 			"enabled"		"1"
 			"wrap"			"1"
-			"fgcolor_override" "46 43 42 255"
+			"fgcolor_override" "TanDarker"
 		}
 		
 		"CloseButton"
@@ -749,10 +749,10 @@
 			"Command"		"close"
 			"paintbackground"	"0"
 			
-			"defaultFgColor_override" "46 43 42 255"
+			"defaultFgColor_override" "TanDarker"
 			"armedFgColor_override" "TanLight"
-			"depressedFgColor_override" "46 43 42 255"
-			"image_drawcolor"	"117 107 94 255"
+			"depressedFgColor_override" "TanDarker"
+			"image_drawcolor"	"TextColor"
 			"image_armedcolor"	"TanLight"
 
 			"SubImage"
@@ -766,7 +766,7 @@
 				"tall"			"14"
 				"visible"		"1"
 				"enabled"		"1"
-				"image"			"close_button"
+				"image"			"replay/thumbnails/close"
 				"scaleImage"	"1"
 			}				
 		}		
@@ -813,11 +813,11 @@
 			"Command"		"nextexplanation"
 			"paintbackground"	"0"
 			
-			"defaultFgColor_override" "46 43 42 255"
+			"defaultFgColor_override" "TanDarker"
 			"armedFgColor_override" "TanLight"
-			"depressedFgColor_override" "46 43 42 255"
-			"image_drawcolor"	"235 226 202 255"
-			"image_armedcolor"	"255 255 255 255"
+			"depressedFgColor_override" "TanDarker"
+			"image_drawcolor"	"NeutralWhite"
+			"image_armedcolor"	"White"
 
 			"SubImage"
 			{
@@ -875,7 +875,7 @@
 			"visible"		"1"
 			"enabled"		"1"
 			"wrap"			"1"
-			"fgcolor_override" "46 43 42 255"
+			"fgcolor_override" "TanDarker"
 		}
 		
 		"TextLabel"
@@ -894,7 +894,7 @@
 			"visible"		"1"
 			"enabled"		"1"
 			"wrap"			"1"
-			"fgcolor_override" "46 43 42 255"
+			"fgcolor_override" "TanDarker"
 		}
 		
 		"CloseButton"
@@ -922,10 +922,10 @@
 			"Command"		"close"
 			"paintbackground"	"0"
 			
-			"defaultFgColor_override" "46 43 42 255"
+			"defaultFgColor_override" "TanDarker"
 			"armedFgColor_override" "TanLight"
-			"depressedFgColor_override" "46 43 42 255"
-			"image_drawcolor"	"117 107 94 255"
+			"depressedFgColor_override" "TanDarker"
+			"image_drawcolor"	"TextColor"
 			"image_armedcolor"	"TanLight"
 
 			"SubImage"
@@ -939,7 +939,7 @@
 				"tall"			"14"
 				"visible"		"1"
 				"enabled"		"1"
-				"image"			"close_button"
+				"image"			"replay/thumbnails/close"
 				"scaleImage"	"1"
 			}				
 		}		
@@ -969,11 +969,11 @@
 			"Command"		"prevexplanation"
 			"paintbackground"	"0"
 			
-			"defaultFgColor_override" "46 43 42 255"
+			"defaultFgColor_override" "TanDarker"
 			"armedFgColor_override" "TanLight"
-			"depressedFgColor_override" "46 43 42 255"
-			"image_drawcolor"	"235 226 202 255"
-			"image_armedcolor"	"255 255 255 255"
+			"depressedFgColor_override" "TanDarker"
+			"image_drawcolor"	"NeutralWhite"
+			"image_armedcolor"	"White"
 
 			"SubImage"
 			{
@@ -1035,11 +1035,11 @@
 			"Command"		"nextexplanation"
 			"paintbackground"	"0"
 			
-			"defaultFgColor_override" "46 43 42 255"
+			"defaultFgColor_override" "TanDarker"
 			"armedFgColor_override" "TanLight"
-			"depressedFgColor_override" "46 43 42 255"
-			"image_drawcolor"	"235 226 202 255"
-			"image_armedcolor"	"255 255 255 255"
+			"depressedFgColor_override" "TanDarker"	
+			"image_drawcolor"	"NeutralWhite"
+			"image_armedcolor"	"White"
 
 			"SubImage"
 			{
@@ -1096,7 +1096,7 @@
 			"visible"		"1"
 			"enabled"		"1"
 			"wrap"			"1"
-			"fgcolor_override" "46 43 42 255"
+			"fgcolor_override" "TanDarker"
 		}
 		
 		"TextLabel"
@@ -1115,7 +1115,7 @@
 			"visible"		"1"
 			"enabled"		"1"
 			"wrap"			"1"
-			"fgcolor_override" "46 43 42 255"
+			"fgcolor_override" "TanDarker"
 		}
 		
 		"CloseButton"
@@ -1143,10 +1143,10 @@
 			"Command"		"close"
 			"paintbackground"	"0"
 			
-			"defaultFgColor_override" "46 43 42 255"
-			"armedFgColor_override" "235 226 202 255"
-			"depressedFgColor_override" "46 43 42 255"
-			"image_drawcolor"	"117 107 94 255"
+			"defaultFgColor_override" "TanDarker"
+			"armedFgColor_override" "NeutralWhite"
+			"depressedFgColor_override" "TanDarker"
+			"image_drawcolor"	"TextColor"
 			"image_armedcolor"	"TanLight"
 
 			"SubImage"
@@ -1160,7 +1160,7 @@
 				"tall"			"14"
 				"visible"		"1"
 				"enabled"		"1"
-				"image"			"close_button"
+				"image"			"replay/thumbnails/close"
 				"scaleImage"	"1"
 			}				
 		}		
@@ -1190,11 +1190,11 @@
 			"Command"		"prevexplanation"
 			"paintbackground"	"0"
 			
-			"defaultFgColor_override" "46 43 42 255"
+			"defaultFgColor_override" "TanDarker"
 			"armedFgColor_override" "TanLight"
-			"depressedFgColor_override" "46 43 42 255"
-			"image_drawcolor"	"235 226 202 255"
-			"image_armedcolor"	"255 255 255 255"
+			"depressedFgColor_override" "TanDarker"
+			"image_drawcolor"	"NeutralWhite"
+			"image_armedcolor"	"White"
 
 			"SubImage"
 			{
@@ -1256,11 +1256,11 @@
 			"Command"		"nextexplanation"
 			"paintbackground"	"0"
 			
-			"defaultFgColor_override" "46 43 42 255"
+			"defaultFgColor_override" "TanDarker"
 			"armedFgColor_override" "TanLight"
-			"depressedFgColor_override" "46 43 42 255"
-			"image_drawcolor"	"235 226 202 255"
-			"image_armedcolor"	"255 255 255 255"
+			"depressedFgColor_override" "TanDarker"
+			"image_drawcolor"	"NeutralWhite"
+			"image_armedcolor"	"White"
 
 			"SubImage"
 			{
@@ -1318,7 +1318,7 @@
 			"visible"		"1"
 			"enabled"		"1"
 			"wrap"			"1"
-			"fgcolor_override" "46 43 42 255"
+			"fgcolor_override" "TanDarker"
 		}
 		
 		"TextLabel"
@@ -1337,7 +1337,7 @@
 			"visible"		"1"
 			"enabled"		"1"
 			"wrap"			"1"
-			"fgcolor_override" "46 43 42 255"
+			"fgcolor_override" "TanDarker"
 		}
 		
 		"CloseButton"
@@ -1366,10 +1366,10 @@
 			
 			"paintbackground"	"0"
 			
-			"defaultFgColor_override" "46 43 42 255"
-			"armedFgColor_override" "235 226 202 255"
-			"depressedFgColor_override" "46 43 42 255"
-			"image_drawcolor"	"117 107 94 255"
+			"defaultFgColor_override" "TanDarker"
+			"armedFgColor_override" "NeutralWhite"
+			"depressedFgColor_override" "TanDarker"
+			"image_drawcolor"	"TextColor"
 			"image_armedcolor"	"TanLight"
 
 			"SubImage"
@@ -1383,7 +1383,7 @@
 				"tall"			"14"
 				"visible"		"1"
 				"enabled"		"1"
-				"image"			"close_button"
+				"image"			"replay/thumbnails/close"
 				"scaleImage"	"1"
 			}				
 		}		
@@ -1413,11 +1413,11 @@
 			"Command"		"prevexplanation"
 			"paintbackground"	"0"
 			
-			"defaultFgColor_override" "46 43 42 255"
+			"defaultFgColor_override" "TanDarker"
 			"armedFgColor_override" "TanLight"
-			"depressedFgColor_override" "46 43 42 255"
-			"image_drawcolor"	"235 226 202 255"
-			"image_armedcolor"	"255 255 255 255"
+			"depressedFgColor_override" "TanDarker"
+			"image_drawcolor"	"NeutralWhite"
+			"image_armedcolor"	"White"
 
 			"SubImage"
 			{
@@ -1479,11 +1479,11 @@
 			"Command"		"nextexplanation"
 			"paintbackground"	"0"
 			
-			"defaultFgColor_override" "46 43 42 255"
+			"defaultFgColor_override" "TanDarker"
 			"armedFgColor_override" "TanLight"
-			"depressedFgColor_override" "46 43 42 255"
-			"image_drawcolor"	"235 226 202 255"
-			"image_armedcolor"	"255 255 255 255"
+			"depressedFgColor_override" "TanDarker"
+			"image_drawcolor"	"NeutralWhite"
+			"image_armedcolor"	"White"
 
 			"SubImage"
 			{
@@ -1541,7 +1541,7 @@
 			"visible"		"1"
 			"enabled"		"1"
 			"wrap"			"1"
-			"fgcolor_override" "46 43 42 255"
+			"fgcolor_override" "TanDarker"
 		}
 		
 		"TextLabel"
@@ -1560,7 +1560,7 @@
 			"visible"		"1"
 			"enabled"		"1"
 			"wrap"			"1"
-			"fgcolor_override" "46 43 42 255"
+			"fgcolor_override" "TanDarker"
 		}
 		
 		"CloseButton"
@@ -1588,10 +1588,10 @@
 			"Command"		"close"
 			"paintbackground"	"0"
 			
-			"defaultFgColor_override" "46 43 42 255"
-			"armedFgColor_override" "235 226 202 255"
-			"depressedFgColor_override" "46 43 42 255"
-			"image_drawcolor"	"117 107 94 255"
+			"defaultFgColor_override" "TanDarker"
+			"armedFgColor_override" "NeutralWhite"
+			"depressedFgColor_override" "TanDarker"
+			"image_drawcolor"	"TextColor"
 			"image_armedcolor"	"TanLight"
 
 			"SubImage"
@@ -1605,7 +1605,7 @@
 				"tall"			"14"
 				"visible"		"1"
 				"enabled"		"1"
-				"image"			"close_button"
+				"image"			"replay/thumbnails/close"
 				"scaleImage"	"1"
 			}				
 		}
@@ -1635,11 +1635,11 @@
 			"Command"		"prevexplanation"
 			"paintbackground"	"0"
 			
-			"defaultFgColor_override" "46 43 42 255"
-			"armedFgColor_override" "200 80 60 255"
-			"depressedFgColor_override" "46 43 42 255"
-			"image_drawcolor"	"235 226 202 255"
-			"image_armedcolor"	"255 255 255 255"
+			"defaultFgColor_override" "TanDarker"
+			"armedFgColor_override" "LightRed"
+			"depressedFgColor_override" "TanDarker"
+			"image_drawcolor"	"NeutralWhite"
+			"image_armedcolor"	"White"
 
 			"SubImage"
 			{
@@ -1673,7 +1673,7 @@
 			"pinCorner"		"0"
 			"visible"		"1"
 			"enabled"		"1"
-			"fgcolor_override" "200 80 60 255"
+			"fgcolor_override" "LightRed"
 		}
 
 		"NextButton"
@@ -1701,11 +1701,11 @@
 			"Command"		"nextexplanation"
 			"paintbackground"	"0"
 			
-			"defaultFgColor_override" "46 43 42 255"
-			"armedFgColor_override" "200 80 60 255"
-			"depressedFgColor_override" "46 43 42 255"
-			"image_drawcolor"	"235 226 202 255"
-			"image_armedcolor"	"255 255 255 255"
+			"defaultFgColor_override" "TanDarker"
+			"armedFgColor_override" "LightRed"
+			"depressedFgColor_override" "TanDarker"
+			"image_drawcolor"	"NeutralWhite"
+			"image_armedcolor"	"White"
 
 			"SubImage"
 			{
@@ -1763,7 +1763,7 @@
 			"visible"		"1"
 			"enabled"		"1"
 			"wrap"			"1"
-			"fgcolor_override" "46 43 42 255"
+			"fgcolor_override" "TanDarker"
 		}
 		
 		"TextLabel"
@@ -1782,7 +1782,7 @@
 			"visible"		"1"
 			"enabled"		"1"
 			"wrap"			"1"
-			"fgcolor_override" "46 43 42 255"
+			"fgcolor_override" "TanDarker"
 		}
 		
 		"CloseButton"
@@ -1810,11 +1810,11 @@
 			"Command"		"close"
 			"paintbackground"	"0"
 			
-			"defaultFgColor_override" "46 43 42 255"
-			"armedFgColor_override" "235 226 202 255"
-			"depressedFgColor_override" "46 43 42 255"
-			"image_drawcolor"	"117 107 94 255"
-			"image_armedcolor"	"200 80 60 255"
+			"defaultFgColor_override" "TanDarker"
+			"armedFgColor_override" "NeutralWhite"
+			"depressedFgColor_override" "TanDarker"
+			"image_drawcolor"	"TextColor"
+			"image_armedcolor"	"LightRed"
 
 			"SubImage"
 			{
@@ -1827,7 +1827,7 @@
 				"tall"			"14"
 				"visible"		"1"
 				"enabled"		"1"
-				"image"			"close_button"
+				"image"			"replay/thumbnails/close"
 				"scaleImage"	"1"
 			}				
 		}	
@@ -1857,11 +1857,11 @@
 			"Command"		"prevexplanation"
 			"paintbackground"	"0"
 			
-			"defaultFgColor_override" "46 43 42 255"
+			"defaultFgColor_override" "TanDarker"
 			"armedFgColor_override" "TanLight"
-			"depressedFgColor_override" "46 43 42 255"
-			"image_drawcolor"	"235 226 202 255"
-			"image_armedcolor"	"255 255 255 255"
+			"depressedFgColor_override" "TanDarker"
+			"image_drawcolor"	"NeutralWhite"
+			"image_armedcolor"	"White"
 
 			"SubImage"
 			{
@@ -1923,11 +1923,11 @@
 			"Command"		"nextexplanation"
 			"paintbackground"	"0"
 			
-			"defaultFgColor_override" "46 43 42 255"
+			"defaultFgColor_override" "TanDarker"
 			"armedFgColor_override" "TanLight"
-			"depressedFgColor_override" "46 43 42 255"
-			"image_drawcolor"	"235 226 202 255"
-			"image_armedcolor"	"255 255 255 255"
+			"depressedFgColor_override" "TanDarker"
+			"image_drawcolor"	"NeutralWhite"
+			"image_armedcolor"	"White"
 
 			"SubImage"
 			{
@@ -1983,7 +1983,7 @@
 			"visible"		"1"
 			"enabled"		"1"
 			"wrap"			"1"
-			"fgcolor_override" "46 43 42 255"
+			"fgcolor_override" "TanDarker"
 		}
 		
 		"TextLabel"
@@ -2002,7 +2002,7 @@
 			"visible"		"1"
 			"enabled"		"1"
 			"wrap"			"1"
-			"fgcolor_override" "46 43 42 255"
+			"fgcolor_override" "TanDarker"
 		}
 		
 		"CloseButton"
@@ -2030,10 +2030,10 @@
 			"Command"		"close"
 			"paintbackground"	"0"
 			
-			"defaultFgColor_override" "46 43 42 255"
-			"armedFgColor_override" "235 226 202 255"
-			"depressedFgColor_override" "46 43 42 255"
-			"image_drawcolor"	"117 107 94 255"
+			"defaultFgColor_override" "TanDarker"
+			"armedFgColor_override" "NeutralWhite"
+			"depressedFgColor_override" "TanDarker"
+			"image_drawcolor"	"TextColor"
 			"image_armedcolor"	"TanLight"
 
 			"SubImage"
@@ -2047,7 +2047,7 @@
 				"tall"			"14"
 				"visible"		"1"
 				"enabled"		"1"
-				"image"			"close_button"
+				"image"			"replay/thumbnails/close"
 				"scaleImage"	"1"
 			}				
 		}		
@@ -2076,11 +2076,11 @@
 			"Command"		"prevexplanation"
 			"paintbackground"	"0"
 			
-			"defaultFgColor_override" "46 43 42 255"
+			"defaultFgColor_override" "TanDarker"
 			"armedFgColor_override" "TanLight"
-			"depressedFgColor_override" "46 43 42 255"
-			"image_drawcolor"	"235 226 202 255"
-			"image_armedcolor"	"255 255 255 255"
+			"depressedFgColor_override" "TanDarker"
+			"image_drawcolor"	"NeutralWhite"
+			"image_armedcolor"	"White"
 
 			"SubImage"
 			{
@@ -2139,6 +2139,6 @@
 		"tall"			"f100"
 		"visible"		"0"
 		"proportionaltoparent"	"1"
-		"bgcolor_override"	"27 27 27 255"
+		"bgcolor_override"	"DarkGrey"
 	}
 }
 \ No newline at end of file
diff --git a/resource/ui/ControlPointCountdown.res b/resource/ui/ControlPointCountdown.res
index f79cec7..fb28d66 100644
--- a/resource/ui/ControlPointCountdown.res
+++ b/resource/ui/ControlPointCountdown.res
@@ -17,7 +17,7 @@
 		"wrap"			"0"
 		"labelText"		"%capturetime%"
 		"textAlignment"	"center"
-		"fgcolor"		"235 226 202 255"
-		"bgcolor"		"235 226 202 255"
+		"fgcolor"		"NeutralWhite"
+		"bgcolor"		"NeutralWhite"
 	}
 }
 \ No newline at end of file
diff --git a/resource/ui/DisguiseStatusPanel.res b/resource/ui/DisguiseStatusPanel.res
index 9ad0a5a..a45c94f 100644
--- a/resource/ui/DisguiseStatusPanel.res
+++ b/resource/ui/DisguiseStatusPanel.res
@@ -72,6 +72,31 @@
 		"dulltext"		"0"
 		"brighttext"	"0"
 	}
+	
+	"DisguiseNameLabelShadow"
+	{
+		"ControlName"		"Label"
+		"fieldName"			"DisguiseNameLabelShadow"
+		"font"				"Cerbetica14"
+		"xpos"				"-1"
+		"ypos"				"-1"
+		"zpos"				"1"
+		"wide"				"110"
+		"tall"				"24"
+		"autoResize"		"0"
+		"pinCorner"			"0"
+		"visible"			"1"
+		"enabled"			"1"
+		"labelText"			"%disguisename%"
+		"textAlignment"		"west"
+		"dulltext"			"0"
+		"brighttext"		"0"
+		"fgcolor_override"	"TransparentBlack"
+		
+		"pin_to_sibling"		"DisguiseNameLabel"
+		"pin_corner_to_sibling"	"PIN_TOPLEFT"
+		"pin_to_sibling_corner"	"PIN_TOPLEFT"
+	}
 
 	"WeaponNameLabel"
 	{
@@ -92,6 +117,31 @@
 		"dulltext"		"0"
 		"brighttext"	"0"
 	}
+	
+	"WeaponNameLabelShadow"
+	{
+		"ControlName"		"Label"
+		"fieldName"			"WeaponNameLabelShadow"
+		"font"				"Cerbetica12"
+		"xpos"				"-1"
+		"ypos"				"-1"
+		"zpos"				"1"
+		"wide"				"110"
+		"tall"				"24"
+		"autoResize"		"0"
+		"pinCorner"			"0"
+		"visible"			"1"
+		"enabled"			"1"
+		"labelText"			"%weaponname%"
+		"textAlignment"		"west"
+		"dulltext"			"0"
+		"brighttext"		"0"
+		"fgcolor_override"	"TransparentBlack"
+		
+		"pin_to_sibling"		"WeaponNameLabel"
+		"pin_corner_to_sibling"	"PIN_TOPLEFT"
+		"pin_to_sibling_corner"	"PIN_TOPLEFT"
+	}
 	"WeaponBackground"
 	{
 		"ControlName"	"ImagePanel"
diff --git a/resource/ui/FreezePanelKillerHealth.res b/resource/ui/FreezePanelKillerHealth.res
index 5767ce7..84c553a 100644
--- a/resource/ui/FreezePanelKillerHealth.res
+++ b/resource/ui/FreezePanelKillerHealth.res
@@ -61,10 +61,10 @@
 		"textAlignment"	"center"		
 	}
 
-	"PlayerStatusHealthValueFreezeBackground"
+	"PlayerStatusHealthValueFreezePanelShadow"
 	{
 		"ControlName"	"CExLabel"
-		"fieldName"		"PlayerStatusHealthValueFreezeBackground"
+		"fieldName"		"PlayerStatusHealthValueFreezePanelShadow"
 		"xpos"			"4"
 		"ypos"			"4"
 		"zpos"			"5"
diff --git a/resource/ui/FreezePanel_Basic.res b/resource/ui/FreezePanel_Basic.res
index 9b52678..dc89f40 100644
--- a/resource/ui/FreezePanel_Basic.res
+++ b/resource/ui/FreezePanel_Basic.res
@@ -1,162 +1,5 @@
 "Resource/UI/FreezePanel_Basic.res"
 {
-	"FreezePanelBase"	[$X360]
-	{
-		"ControlName"	"EditablePanel"
-		"fieldName"		"FreezePanelBase"
-		"xpos"			"0"
-		"ypos"			"0"
-		"wide"			"640"
-		"tall"			"480"
-		"visible"		"1"
-		
-		"NemesisSubPanel"
-		{
-			"ControlName"	"EditablePanel"
-			"fieldName"		"NemesisSubPanel"
-			"xpos"			"c46"
-			"xpos_hidef"	"c109"
-			"ypos"			"223"
-			"ypos_hidef"	"223"
-			"ypos_lodef"	"193"
-			"zpos"			"4"
-			"wide"			"166"
-			"tall"			"38"
-			"visible"		"1"
-			
-			"NemesisPanelBG"
-			{
-				"ControlName"	"ImagePanel"
-				"fieldName"		"NemesisPanelBG"
-				"xpos"			"0"
-				"ypos"			"0"
-				"zpos"			"5"
-				"wide"			"166"
-				"tall"			"38"
-				"visible"		"1"
-				"enabled"		"1"
-				"image"			"../hud/freezecam_black_bg"
-				"scaleImage"	"1"	
-			}
-			"NemesisIcon"
-			{
-				"ControlName"	"ImagePanel"
-				"fieldName"		"NemesisIcon"
-				"xpos"			"5"
-				"ypos"			"-1"
-				"zpos"			"6"
-				"wide"			"36"
-				"tall"			"36"
-				"visible"		"1"
-				"enabled"		"1"
-				"image"			"../hud/leaderboard_nemesis_freezecam"
-				"scaleImage"	"1"	
-			}
-			"NemesisLabel"
-			{	
-				"ControlName"	"Label"
-				"fieldName"		"NemesisLabel"
-				"font"			"HudFontMediumSmall"
-				"xpos"			"44"
-				"ypos"			"10"
-				"ypos_hidef"	"11"
-				"ypos_lodef"	"13"
-				"zpos"			"6"
-				"wide"			"112"
-				"tall"			"18"
-				"tall_hidef"	"24"
-				"autoResize"	"0"
-				"pinCorner"		"0"
-				"visible"		"1"
-				"enabled"		"1"
-				"labelText"		"%nemesisname%"
-				"textAlignment"	"west"
-			}
-		}
-		"FreezePanelBG"
-		{
-			"ControlName"	"CTFImagePanel"
-			"fieldName"		"FreezePanelBG"
-			"xpos"			"c-38"
-			"xpos_hidef"	"c25"
-			"ypos"			"245"
-			"ypos_hidef"	"245"
-			"ypos_lodef"	"215"
-			"zpos"			"0"
-			"wide"			"266"
-			"tall"			"48"
-			"visible"		"1"
-			"enabled"		"1"
-			"image"			"../hud/color_panel_blu"
-			"scaleImage"	"1"	
-		}
-		
-		"FreezeLabel"
-		{	
-			"ControlName"	"Label"
-			"fieldName"		"FreezeLabel"
-			"font"			"DefaultSmall"
-			"xpos"			"c2"
-			"xpos_hidef"	"c65"
-			"ypos"			"255"
-			"ypos_hidef"	"256"
-			"ypos_lodef"	"225"
-			"zpos"			"1"
-			"wide"			"252"
-			"tall"			"9"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"labelText"		"#FreezePanel_Killer"
-			"textAlignment"	"Left"
-			"dulltext"		"0"
-			"brighttext"	"0"
-		}
-		
-		"FreezeLabelKiller"
-		{	
-			"ControlName"	"Label"
-			"fieldName"		"FreezeLabelKiller"
-			"font"			"HudFontSmall"
-			"xpos"			"c6"			// No avatar image on X360
-			"xpos_hidef"	"c69"
-			"ypos"			"266"
-			"ypos_hidef"	"266"
-			"ypos_lodef"	"236"
-			"zpos"			"1"
-			"wide"			"252"
-			"tall"			"18"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"labelText"		"%killername%"
-			"textAlignment"	"Left"
-		}
-		
-		"FreezePanelHealth"
-		{
-			"ControlName"	"EditablePanel"
-			"fieldName"		"FreezePanelHealth"
-			"xpos"			"c-30"
-			"xpos_hidef"	"c35"
-			"ypos"			"253"
-			"ypos_hidef"	"253"
-			"ypos_lodef"	"223"
-			"zpos"			"1"
-			"wide"			"31"
-			"tall"			"31"
-			"visible"		"1"
-			"enabled"		"1"	
-			"HealthBonusPosAdj"	"9"
-			"HealthDeathWarning"	"0.49"
-			"TFFont"		"HudFontSmall"
-			"HealthDeathWarningColor"	"HUDDeathWarning"
-			"TextColor"		"HudOffWhite"
-		}
-	}
-	
 	"itempanel"
 	{
 		"ControlName"	"CItemModelPanel"
@@ -334,23 +177,6 @@
 			"ControlName"	"CExLabel"
 			"fieldName"		"FreezeLabelKiller"
 			"font"			"Cerbetica12"
-			"xpos"			"9999"
-			"ypos"			"9999"
-			"zpos"			"1"
-			"wide"			"550"
-			"tall"			"15"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"labelText"		"%killername%"
-			"textAlignment"	"Left"
-		}
-		"FreezeLabelKiller2"
-		{	
-			"ControlName"	"CExLabel"
-			"fieldName"		"FreezeLabelKiller2"
-			"font"			"Cerbetica13"
 			"xpos"			"42"
 			"ypos"			"28"
 			"zpos"			"1"
@@ -377,7 +203,7 @@
 			"enabled"		"1"
 			"image"			""
 			"scaleImage"	"1"	
-			"color_outline"	"52 48 45 255"
+			"color_outline"	"HudTimerProgressInActive"
 		}	
 
 		"NemesisSubPanel"
diff --git a/resource/ui/HudAccountPanel.res b/resource/ui/HudAccountPanel.res
index 389c326..185f0e1 100644
--- a/resource/ui/HudAccountPanel.res
+++ b/resource/ui/HudAccountPanel.res
@@ -66,9 +66,8 @@
 	{
 		"ControlName"	"CIconPanel"
 		"fieldName"		"MetalIconBackground"
-		"xpos"			"1"
-		"ypos"			"121"
-		"ypos_minmode"	"71"
+		"xpos"			"-1"
+		"ypos"			"-1"
 		"zpos"			"1"
 		"wide"			"10"
 		"tall"			"10"
@@ -77,6 +76,10 @@
 		"scaleImage"	"1"	
 		"icon"			"ico_metal"
 		"iconColor"		"TransparentBlack"
+
+		"pin_to_sibling"		"MetalIcon"
+		"pin_corner_to_sibling" "PIN_TOPLEFT"
+		"pin_to_sibling_corner" "PIN_TOPLEFT"
 	}
 	
 	"AccountValue"
diff --git a/resource/ui/HudArenaPlayerCount.res b/resource/ui/HudArenaPlayerCount.res
index 2b5b397..7f8979f 100644
--- a/resource/ui/HudArenaPlayerCount.res
+++ b/resource/ui/HudArenaPlayerCount.res
@@ -67,7 +67,7 @@
 			"font"			"Cerbetica24"
 			"labelText"		"%blue_alive%"
 			"textAlignment"	"center"
-			"fgcolor"		"Black"
+			"fgcolor"		"TransparentBlack"
 			
 			"pin_to_sibling"		"count"
 			"pin_corner_to_sibling"	"PIN_TOPLEFT"
@@ -157,7 +157,7 @@
 			"font"			"Cerbetica24"
 			"labelText"		"%red_alive%"
 			"textAlignment"	"center"
-			"fgcolor"		"Black"
+			"fgcolor"		"TransparentBlack"
 			
 			"pin_to_sibling"		"count"
 			"pin_corner_to_sibling"	"PIN_TOPLEFT"
diff --git a/resource/ui/HudArenaTeamMenu.res b/resource/ui/HudArenaTeamMenu.res
index 53bb8d4..d205939 100644
--- a/resource/ui/HudArenaTeamMenu.res
+++ b/resource/ui/HudArenaTeamMenu.res
@@ -139,7 +139,6 @@
 		"brighttext"	"0"
 		"paintborder"	"0"
 		"command"		"jointeam spectate"
-		"associated_model"	"autodoor"
 		"font"				"CerbeticaBold20"
 		
 		"defaultFgColor_override"	"255 255 255 128"
@@ -175,7 +174,6 @@
 		"brighttext"	"0"
 		"paintborder"	"0"
 		"command"		"jointeam spectatearena"
-		"associated_model"	"spectate"	
 		"font"				"CerbeticaBold20"
 		
 		"defaultFgColor_override"	"255 255 255 128"
@@ -191,54 +189,11 @@
 		"selectedBgColor_override"	"TanDarker"
 	}
 	
-	"CancelButton" [$WIN32] 
-	{
-		"ControlName"	"CExButton"
-		"fieldName"		"CancelButton"
-		"xpos"			"0"
-		"ypos"			"r40"
-		"zpos"			"6"
-		"wide"			"255"
-		"tall"			"30"
-		"autoResize"	"0"
-		"pinCorner"		"2"
-		"visible"		"0"
-		"enabled"		"1"
-		"tabPosition"	"0"
-		"labelText"		"#TF_Cancel"
-		"textAlignment"	"center"
-		"dulltext"		"0"
-		"brighttext"	"0"
-		"paintbackground""0"
-		"command"		"cancelmenu"
-		"font"			"CerbeticaBold16"
-		"defaultFgColor_override" 	"255 255 255 128"
-		"armedFgColor_override"		"TanLight"
-		"depressedFgColor_override" "255 255 255 128"
-		"selectedFgColor_override" 	"TanLight"
-	}
-	
 	"TeamMenuAuto"
 	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"TeamMenuAuto"
-		"xpos"			"9999" [$WIN32] 
-		"ypos"			"9999"
-		"zpos"			"1"
-		"wide"			"102" [$WIN32] 
-		"wide"			"94" [$X360]
-		"tall"			"24"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"1"
-		"enabled"		"1"
-		"labelText"		"#TF_Arena_Menu_Fight"
-		"textAlignment"	"center"
-		"dulltext"		"0"
-		"brighttext"	"0"
-		"wrap"			"0"
-		"font"			"MenuSmallFont"
-		"fgcolor"		"black"
+		"xpos"			"9999"
 	}
 	
 	"TeamMenuSpectate"
@@ -246,23 +201,6 @@
 		"ControlName"	"CExLabel"
 		"fieldName"		"TeamMenuSpectate"
 		"xpos"			"9999"
-		"ypos"			"9999"
-		"zpos"			"1"
-		"wide"			"44"
-		"wide_lodef"	"70"
-		"tall"			"20"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"1"
-		"enabled"		"1"
-		"labelText"		"#TF_Spectate"
-		"textAlignment"	"north"
-		"dulltext"		"0"
-		"brighttext"	"0"
-		"wrap"			"0"
-		"font"			"MenuSmallestFont"
-		"font_lodef"	"MenuSmallFont"
-		"fgcolor"		"white"
 	}
 
 	"MenuBG"
@@ -300,19 +238,6 @@
 		"ControlName"	"ImagePanel"
 		"fieldName"		"ShadedBar"
 		"xpos"			"9999"
-		"ypos"			"99999"
-		"zpos"			"5"
-		"wide"			"f0"
-		"tall"			"50"
-		"tall_lodef"	"74"
-		"tall_hidef"	"65"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"1"
-		"enabled"		"1"
-		"tabPosition"	"0"	
-		"fillcolor"		"0 0 0 180"
-		"PaintBackgroundType"	"0"
 	}
 	
 	"autodoor"
@@ -320,140 +245,39 @@
 		"ControlName"	"CModelPanel"
 		"fieldName"		"autodoor"
 		"xpos"			"9999"
-		"ypos"			"9999"
-		"zpos"			"2"		
-		"wide"			"f0"
-		"tall"			"480"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"1"
-		"enabled"		"1"
-		"fov"			"20"
-		
-		"model"
-		{
-			"modelname"	"models/vgui/ui_arenadoor01.mdl"
-			"skin"		"0"
-			"angles_x" "0"
-			"angles_y" "180"
-			"angles_z" "0"
-			"origin_x" "290"
-			"origin_x_lodef" "320"
-			"origin_x_hidef" "305"
-			"origin_y" "0"
-			"origin_z" "-34"
-			
-			"animation"
-			{
-				"name"			"idle_enabled"
-				"sequence"		"idle"
-				"default"		"1"
-			}
-
-			"animation"
-			{
-				"name"			"enter_enabled"
-				"sequence"		"hoveropen"
-			}
-			
-			"animation"
-			{
-				"name"			"exit_enabled"
-				"sequence"		"hoverclose"
-			}
-		}
 	}
 	
 	"spectate"
 	{
 		"ControlName"	"CModelPanel"
 		"fieldName"		"spectate"
+		"xpos"			"9999"
+	}
+
+	"CancelButton" [$WIN32] 
+	{
+		"ControlName"	"CExButton"
+		"fieldName"		"CancelButton"
 		"xpos"			"0"
-		"ypos"			"0"
-		"zpos"			"0"		
-		"wide"			"f0"
-		"tall"			"480"
+		"ypos"			"r40"
+		"zpos"			"6"
+		"wide"			"255"
+		"tall"			"30"
 		"autoResize"	"0"
-		"pinCorner"		"0"
+		"pinCorner"		"2"
 		"visible"		"0"
-		"enabled"		"0"
-		"fov"			"20"
-		
-		"model"
-		{
-			"modelname"	"models/vgui/UI_team01_spectate.mdl"
-			"skin"		"0"
-			"angles_x" "0"
-			"angles_y" "180"
-			"angles_z" "0"
-			"origin_x" "290"
-			"origin_x_lodef" "320"
-			"origin_x_hidef" "305"
-			"origin_y" "0"
-			"origin_z" "-34"
-			
-			"animation"
-			{
-				"name"			"idle_enabled"
-				"sequence"		"idle"
-				"default"		"1"
-			}
-			
-			"animation"
-			{
-				"name"			"enter_enabled"
-				"sequence"		"hover"
-			}
-			
-			"animation"
-			{
-				"name"			"exit_enabled"
-				"sequence"		"idle"
-			}
-		}
-	}
-	
-	"Footer" [$X360]
-	{
-		"ControlName"				"CTFFooter"
-		"fieldName"					"Footer"
-		"zpos"						"6"
-		"tall"						"80"
-		"button_separator"			"10"
-		"button_separator_lodef"	"5"
-		"buttongap"					"50"
-		"buttongap_hidef"			"35"
-		"buttongap_lodef"			"18"
-		"textadjust"				"3"
-		"textadjust_lodef"			"0"
-		"buttonoffsety"				"20"
-		"buttonoffsety_hidef"		"0"
-		"buttonoffsety_lodef"		"18"
-		"center"					"0"
-		"button_pin_right_lodef"	"55"
-		"fonttext"					"MatchmakingDialogMenuLarge"
-		"fonttext_lodef"			"MatchmakingDialogMenuSmall"
-		"fgcolor"					"HudOffWhite" 	
-		
-		"button"
-		{
-			"name"		"cancel"
-			"text"		"#GameUI_Cancel"
-			"icon"		"#GameUI_Icons_B_BUTTON"
-		}
-		
-		"button"
-		{
-			"name"		"nextprev"
-			"text"		"#TF_NextPrev"
-			"icon"		"#GameUI_Icons_DPAD"
-		}
-		
-		"button"
-		{
-			"name"		"select"
-			"text"		"#GameUI_Select"
-			"icon"		"#GameUI_Icons_A_BUTTON"
-		}
+		"enabled"		"1"
+		"tabPosition"	"0"
+		"labelText"		"#TF_Cancel"
+		"textAlignment"	"center"
+		"dulltext"		"0"
+		"brighttext"	"0"
+		"paintbackground""0"
+		"command"		"cancelmenu"
+		"font"			"CerbeticaBold16"
+		"defaultFgColor_override" 	"255 255 255 128"
+		"armedFgColor_override"		"TanLight"
+		"depressedFgColor_override" "255 255 255 128"
+		"selectedFgColor_override" 	"TanLight"
 	}
 }
 \ No newline at end of file
diff --git a/resource/ui/HudArenaWinPanel.res b/resource/ui/HudArenaWinPanel.res
index 96df576..a2893c0 100644
--- a/resource/ui/HudArenaWinPanel.res
+++ b/resource/ui/HudArenaWinPanel.res
@@ -14,21 +14,6 @@
 		{
 			"ControlName"	"ImagePanel"
 			"fieldName"		"BlueScoreBG"
-			"xpos"			"9999"
-			"ypos"			"9999"
-			"wide"			"200"
-			"tall"			"25"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"fillcolor"		"70 130 180 153"
-			"scaleImage"		"1"
-		}
-		"BlueScoreBG2"
-		{
-			"ControlName"	"ImagePanel"
-			"fieldName"		"BlueScoreBG2"
 			"xpos"			"25"
 			"ypos"			"35"
 			"zpos"			"-1"
@@ -45,21 +30,6 @@
 		{
 			"ControlName"	"ImagePanel"
 			"fieldName"		"RedScoreBG"
-			"xpos"			"9999"
-			"ypos"			"9999"
-			"wide"			"200"
-			"tall"			"25"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"PaintBackgroundType"	"2"
-			"fillcolor"		"205 50 50 153"
-		}
-		"RedScoreBG2"
-		{
-			"ControlName"	"ImagePanel"
-			"fieldName"		"RedScoreBG2"
 			"xpos"			"225"
 			"ypos"			"35"
 			"zpos"			"-1"
@@ -113,8 +83,8 @@
 			"fgcolor"		"TransparentBlack"
 			"labelText"		"%blueteamscore%"
 			"textAlignment"	"east"
-			"xpos"			"140"
-			"ypos"			"3"
+			"xpos"			"-2"
+			"ypos"			"-2"
 			"zpos"			"3"
 			"wide"			"80"
 			"tall"			"70"
@@ -122,6 +92,10 @@
 			"pinCorner"		"0"
 			"visible"		"1"
 			"enabled"		"1"
+
+			"pin_to_sibling"		"BlueTeamScore"
+			"pin_corner_to_sibling"	"PIN_TOPLEFT"
+			"pin_to_sibling_corner"	"PIN_TOPLEFT"
 		}
 		"RedTeamLabel"
 		{
@@ -164,8 +138,8 @@
 			"fgcolor"		"TransparentBlack"
 			"labelText"		"%redteamscore%"
 			"textAlignment"	"west"
-			"xpos"			"232"
-			"ypos"			"3"
+			"xpos"			"-2"
+			"ypos"			"-2"
 			"zpos"			"3"
 			"wide"			"80"
 			"tall"			"70"
@@ -173,6 +147,10 @@
 			"pinCorner"		"0"
 			"visible"		"1"
 			"enabled"		"1"
+
+			"pin_to_sibling"		"RedTeamScore"
+			"pin_corner_to_sibling"	"PIN_TOPLEFT"
+			"pin_to_sibling_corner"	"PIN_TOPLEFT"
 		}
 		
 		"ArenaStreaksBG"
@@ -251,10 +229,10 @@
 		"draw_corner_height" "0"
 	}
 
-	"LosingTeamLabel"
+	"WinningTeamLabel"
 	{	
 		"ControlName"	"CExLabel"
-		"fieldName"		"LosingTeamLabel"
+		"fieldName"		"WinningTeamLabel"
 		"font"			"CerbeticaBold20"
 		"xpos"			"35"
 		"ypos"			"94"
@@ -265,15 +243,15 @@
 		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
-		"labelText"		"%LosingTeamLabel%"
+		"labelText"		"%WinningTeamLabel%"
 		"textAlignment"	"Center"
 		"dulltext"		"0"
 		"brighttext"	"0"
 	}
-	"LosingTeamLabelDropshadow"
+	"WinningTeamLabelDropshadow"
 	{	
 		"ControlName"	"CExLabel"
-		"fieldName"		"LosingTeamLabelDropshadow"
+		"fieldName"		"WinningTeamLabelDropshadow"
 		"font"			"CerbeticaBold20"
 		"fgcolor"		"TransparentBlack"
 		"xpos"			"36"
@@ -285,16 +263,16 @@
 		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
-		"labelText"		"%LosingTeamLabel%"
+		"labelText"		"%WinningTeamLabel%"
 		"textAlignment"	"Center"
 		"dulltext"		"0"
 		"brighttext"	"0"
 	}
-	
-	"WinningTeamLabel"
+
+	"LosingTeamLabel"
 	{	
 		"ControlName"	"CExLabel"
-		"fieldName"		"WinningTeamLabel"
+		"fieldName"		"LosingTeamLabel"
 		"font"			"CerbeticaBold20"
 		"xpos"			"35"
 		"ypos"			"94"
@@ -305,15 +283,15 @@
 		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
-		"labelText"		"%WinningTeamLabel%"
+		"labelText"		"%LosingTeamLabel%"
 		"textAlignment"	"Center"
 		"dulltext"		"0"
 		"brighttext"	"0"
 	}
-	"WinningTeamLabelDropshadow"
+	"LosingTeamLabelDropshadow"
 	{	
 		"ControlName"	"CExLabel"
-		"fieldName"		"WinningTeamLabelDropshadow"
+		"fieldName"		"LosingTeamLabelDropshadow"
 		"font"			"CerbeticaBold20"
 		"fgcolor"		"TransparentBlack"
 		"xpos"			"36"
@@ -325,7 +303,7 @@
 		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
-		"labelText"		"%WinningTeamLabel%"
+		"labelText"		"%LosingTeamLabel%"
 		"textAlignment"	"Center"
 		"dulltext"		"0"
 		"brighttext"	"0"
diff --git a/resource/ui/HudCurrencyAccount.res b/resource/ui/HudCurrencyAccount.res
index 1cd9a27..e38fe0e 100644
--- a/resource/ui/HudCurrencyAccount.res
+++ b/resource/ui/HudCurrencyAccount.res
@@ -38,7 +38,7 @@
 		"ControlName"	"CExLabel"
 		"fieldName"		"Currency"
 		"font"			"Cerbetica14"
-		"fgcolor"		"OmpText"
+		"fgcolor"		"CreditsGreen"
 		"xpos"			"45"
 		"ypos"			"0"
 		"zpos"			"3"
@@ -49,25 +49,4 @@
 		"textAlignment"	"east"	
 		"labelText"		"%currency%"
 	}
-	
-	"CurrencyShadow"
-	{
-		"ControlName"	"CExLabel"
-		"fieldName"		"CurrencyShadow"
-		"xpos"			"9999"
-	}
-	
-	"WhiteBG"
-	{
-		"ControlName"	"EditablePanel"
-		"fieldName"		"WhiteBG"
-		"xpos"			"9999"
-	}	
-	
-	"GreenBG"
-	{
-		"ControlName"	"EditablePanel"
-		"fieldName"		"WhiteBG"
-		"xpos"			"9999"
-	}
 }
 \ No newline at end of file
diff --git a/resource/ui/HudMannVsMachineStatus.res b/resource/ui/HudMannVsMachineStatus.res
index 40c1ba8..4dd8778 100644
--- a/resource/ui/HudMannVsMachineStatus.res
+++ b/resource/ui/HudMannVsMachineStatus.res
@@ -251,7 +251,7 @@
 			"tall"			"20"
 			"visible"		"1"
 			"enabled"		"1"
-			"fgcolor"		"tanlight"		
+			"fgcolor"		"TanLight"		
 		}
 	}
 }
 \ No newline at end of file
diff --git a/resource/ui/HudObjectiveFlagPanel.res b/resource/ui/HudObjectiveFlagPanel.res
index 9871e81..246d6c6 100644
--- a/resource/ui/HudObjectiveFlagPanel.res
+++ b/resource/ui/HudObjectiveFlagPanel.res
@@ -135,8 +135,8 @@
 	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"BlueScoreShadow"
-		"xpos"			"c-56"
-		"ypos"			"r32"
+		"xpos"			"-1"
+		"ypos"			"-1"
 		"zpos"			"8"
 		"wide"			"50"
 		"tall"			"35"
@@ -145,7 +145,11 @@
 		"textAlignment"	"east"	
 		"labelText"		"%bluescore%"
 		"font"			"Cerbetica40"
-		"fgcolor"		"Black"
+		"fgcolor"		"TransparentBlack"
+		
+		"pin_to_sibling"		"BlueScore"
+		"pin_corner_to_sibling"	"PIN_TOPLEFT"
+		"pin_to_sibling_corner"	"PIN_TOPLEFT"
 		
 		"if_hybrid"
 		{
@@ -199,8 +203,8 @@
 	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"RedScoreShadow"
-		"xpos"			"c8"
-		"ypos"			"r32"
+		"xpos"			"-1"
+		"ypos"			"-1"
 		"zpos"			"8"
 		"wide"			"50"
 		"tall"			"35"
@@ -209,7 +213,11 @@
 		"textAlignment"	"west"	
 		"labelText"		"%redscore%"
 		"font"			"Cerbetica40"
-		"fgcolor"		"Black"		
+		"fgcolor"		"TransparentBlack"
+		
+		"pin_to_sibling"		"RedScore"
+		"pin_corner_to_sibling"	"PIN_TOPLEFT"
+		"pin_to_sibling_corner"	"PIN_TOPLEFT"
 		
 		"if_hybrid"
 		{
@@ -294,7 +302,7 @@
 		"tall"			"20"	[$WIN32]
 		"visible"		"1"
 		"enabled"		"1"
-		"fillcolor"		"0 0 0 0"
+		"fillcolor"		"Transparent"
 		"scaleImage"	"1"	
 		
 		"if_hybrid"
diff --git a/resource/ui/HudObjectiveTimePanel.res b/resource/ui/HudObjectiveTimePanel.res
index f0292fe..06b353b 100644
--- a/resource/ui/HudObjectiveTimePanel.res
+++ b/resource/ui/HudObjectiveTimePanel.res
@@ -34,7 +34,6 @@
 		"tall"				"20"
 		"tall_lodef"		"25"	
 		"visible"			"0"
-		"visible_minmode"	"0"
 		"enabled"			"1"
 		"scaleImage"		"1"
 		"image"				"../hud/objectives_timepanel_progressbar"
diff --git a/resource/ui/HudPlayerClass.res b/resource/ui/HudPlayerClass.res
index f1667fb..3a97f66 100644
--- a/resource/ui/HudPlayerClass.res
+++ b/resource/ui/HudPlayerClass.res
@@ -17,16 +17,15 @@
 	{
 		"ControlName"	"CTFClassImage"
 		"fieldName"		"PlayerStatusClassImage"
-		"xpos"			"165"	[$WIN32]
-		"ypos"			"r95"	[$WIN32]
+		"xpos"			"c210"	[$WIN32]
+		"ypos"			"r60"	[$WIN32]
 		"zpos"			"2"
-		"wide"			"35"
-		"tall"			"35"
+		"wide"			"60"
+		"tall"			"60"
 		"visible"		"1"
 		"enabled"		"1"
 		"image"			"../hud/class_scoutred"
 		"scaleImage"	"1"	
-		"alpha"			"0"
 	}
 	"PlayerStatusSpyImage"
 	{
@@ -39,8 +38,8 @@
 		"ControlName"	"CTFImagePanel"
 		"fieldName"		"PlayerStatusSpyOutlineImage"
 		"xpos"			"3"		[$WIN32]
-		"xpos_minmode"	"-5"	[$WIN32]
 		"ypos"			"r67"	[$WIN32]
+		"xpos_minmode"	"-5"	[$WIN32]
 		"ypos_minmode"	"r44"	[$WIN32]
 		"xpos"			"35"	[$X360]
 		"ypos"			"r89"	[$X360]
diff --git a/resource/ui/HudPlayerHealth.res b/resource/ui/HudPlayerHealth.res
index d0f62fd..f5abbce 100644
--- a/resource/ui/HudPlayerHealth.res
+++ b/resource/ui/HudPlayerHealth.res
@@ -86,8 +86,8 @@
 	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"PlayerStatusHealthValueShadow"
-		"xpos"			"2"
-		"ypos"			"2"
+		"xpos"			"-2"
+		"ypos"			"-2"
 		"zpos"			"5"
 		"wide"			"300"
 		"tall"			"100"
@@ -98,6 +98,10 @@
 		"font"			"CerbeticaBold56"
 		"font_minmode"	"CerbeticaBold32"
 		"fgcolor"		"TransparentBlack"
+		
+		"pin_to_sibling"		"PlayerStatusHealthValue"
+		"pin_corner_to_sibling"	"PIN_TOPLEFT"
+		"pin_to_sibling_corner"	"PIN_TOPLEFT"
 	}
 
 	"PlayerStatusMaxHealthValue"
@@ -116,8 +120,8 @@
 		"fieldName"		"PlayerStatusAnchor"
 		"xpos"			"0"
 		"ypos"			"15"
-		"wide"			"24"
-		"tall"			"24"
+		"wide"			"23"
+		"tall"			"23"
 		"visible"		"1"
 		"enabled"		"1"
 	}
@@ -129,8 +133,8 @@
 		"xpos"			"0"
 		"ypos"			"0"
 		"zpos"			"7"
-		"wide"			"24"
-		"tall"			"24"
+		"wide"			"23"
+		"tall"			"23"
 		"visible"		"1"
 		"enabled"		"1"
 		"scaleImage"	"1"	
@@ -148,8 +152,8 @@
 		"xpos"			"0"
 		"ypos"			"0"
 		"zpos"			"7"
-		"wide"			"24"
-		"tall"			"24"
+		"wide"			"23"
+		"tall"			"23"
 		"visible"		"1"
 		"enabled"		"1"
 		"scaleImage"	"1"	
@@ -167,8 +171,8 @@
 		"xpos"			"0"
 		"ypos"			"0"
 		"zpos"			"7"
-		"wide"			"24"
-		"tall"			"24"
+		"wide"			"23"
+		"tall"			"23"
 		"visible"		"1"
 		"enabled"		"1"
 		"scaleImage"	"1"	
@@ -186,8 +190,8 @@
 		"xpos"			"0"
 		"ypos"			"0"
 		"zpos"			"7"
-		"wide"			"24"
-		"tall"			"24"
+		"wide"			"23"
+		"tall"			"23"
 		"visible"		"1"
 		"enabled"		"1"
 		"scaleImage"	"1"	
@@ -205,8 +209,8 @@
 		"xpos"			"0"
 		"ypos"			"0"
 		"zpos"			"7"
-		"wide"			"24"
-		"tall"			"24"
+		"wide"			"23"
+		"tall"			"23"
 		"visible"		"1"
 		"enabled"		"1"
 		"scaleImage"	"1"	
@@ -224,8 +228,8 @@
 		"xpos"			"0"
 		"ypos"			"0"
 		"zpos"			"7"
-		"wide"			"24"
-		"tall"			"24"
+		"wide"			"23"
+		"tall"			"23"
 		"visible"		"1"
 		"enabled"		"1"
 		"scaleImage"	"1"	
@@ -243,8 +247,8 @@
 		"xpos"			"0"
 		"ypos"			"0"
 		"zpos"			"7"
-		"wide"			"24"
-		"tall"			"24"
+		"wide"			"23"
+		"tall"			"23"
 		"visible"		"1"
 		"enabled"		"1"
 		"scaleImage"	"1"	
@@ -262,8 +266,8 @@
 		"xpos"			"0"
 		"ypos"			"0"
 		"zpos"			"7"
-		"wide"			"24"
-		"tall"			"24"
+		"wide"			"23"
+		"tall"			"23"
 		"visible"		"1"
 		"enabled"		"1"
 		"scaleImage"	"1"	
@@ -281,8 +285,8 @@
 		"xpos"			"0"
 		"ypos"			"0"
 		"zpos"			"7"
-		"wide"			"24"
-		"tall"			"24"
+		"wide"			"23"
+		"tall"			"23"
 		"visible"		"1"
 		"enabled"		"1"
 		"scaleImage"	"1"	
@@ -300,8 +304,8 @@
 		"xpos"			"0"
 		"ypos"			"0"
 		"zpos"			"7"
-		"wide"			"24"
-		"tall"			"24"
+		"wide"			"23"
+		"tall"			"23"
 		"visible"		"1"
 		"enabled"		"1"
 		"scaleImage"	"1"	
@@ -319,8 +323,8 @@
 		"xpos"			"0"
 		"ypos"			"0"
 		"zpos"			"7"
-		"wide"			"24"
-		"tall"			"24"
+		"wide"			"23"
+		"tall"			"23"
 		"visible"		"1"
 		"enabled"		"1"
 		"scaleImage"	"1"	
@@ -338,8 +342,8 @@
 		"xpos"			"0"
 		"ypos"			"0"
 		"zpos"			"7"
-		"wide"			"24"
-		"tall"			"24"
+		"wide"			"23"
+		"tall"			"23"
 		"visible"		"1"
 		"enabled"		"1"
 		"scaleImage"	"1"	
@@ -357,8 +361,8 @@
 		"xpos"			"0"
 		"ypos"			"0"
 		"zpos"			"7"
-		"wide"			"24"
-		"tall"			"24"
+		"wide"			"23"
+		"tall"			"23"
 		"visible"		"1"
 		"enabled"		"1"
 		"scaleImage"	"1"	
@@ -376,8 +380,8 @@
 		"xpos"			"0"
 		"ypos"			"0"
 		"zpos"			"7"
-		"wide"			"24"
-		"tall"			"24"
+		"wide"			"23"
+		"tall"			"23"
 		"visible"		"1"
 		"enabled"		"1"
 		"scaleImage"	"1"	
@@ -395,8 +399,8 @@
 		"xpos"			"0"
 		"ypos"			"0"
 		"zpos"			"7"
-		"wide"			"24"
-		"tall"			"24"
+		"wide"			"23"
+		"tall"			"23"
 		"visible"		"1"
 		"enabled"		"1"
 		"scaleImage"	"1"	
@@ -414,8 +418,8 @@
 		"xpos"			"0"
 		"ypos"			"0"
 		"zpos"			"7"
-		"wide"			"24"
-		"tall"			"24"
+		"wide"			"23"
+		"tall"			"23"
 		"visible"		"1"
 		"enabled"		"1"
 		"scaleImage"	"1"	
@@ -432,8 +436,8 @@
 		"xpos"			"0"
 		"ypos"			"0"
 		"zpos"			"7"
-		"wide"			"24"
-		"tall"			"24"
+		"wide"			"23"
+		"tall"			"23"
 		"visible"		"1"
 		"enabled"		"1"
 		"scaleImage"	"1"	
@@ -450,8 +454,8 @@
 		"xpos"			"0"
 		"ypos"			"0"
 		"zpos"			"7"
-		"wide"			"24"
-		"tall"			"24"
+		"wide"			"23"
+		"tall"			"23"
 		"visible"		"1"
 		"enabled"		"1"
 		"scaleImage"	"1"	
@@ -469,8 +473,8 @@
 		"xpos"			"0"
 		"ypos"			"0"
 		"zpos"			"7"
-		"wide"			"24"
-		"tall"			"24"
+		"wide"			"23"
+		"tall"			"23"
 		"visible"		"1"
 		"enabled"		"1"
 		"scaleImage"	"1"	
@@ -488,8 +492,8 @@
 		"xpos"			"0"
 		"ypos"			"0"
 		"zpos"			"7"
-		"wide"			"24"
-		"tall"			"24"
+		"wide"			"23"
+		"tall"			"23"
 		"visible"		"1"
 		"enabled"		"1"
 		"scaleImage"	"1"	
@@ -507,8 +511,8 @@
 		"xpos"			"0"
 		"ypos"			"0"
 		"zpos"			"7"
-		"wide"			"24"
-		"tall"			"24"
+		"wide"			"23"
+		"tall"			"23"
 		"visible"		"1"
 		"enabled"		"1"
 		"scaleImage"	"1"	
@@ -526,8 +530,8 @@
 		"xpos"			"0"
 		"ypos"			"0"
 		"zpos"			"7"
-		"wide"			"24"
-		"tall"			"24"
+		"wide"			"23"
+		"tall"			"23"
 		"visible"		"1"
 		"enabled"		"1"
 		"scaleImage"	"1"	
@@ -545,8 +549,8 @@
 		"xpos"			"0"
 		"ypos"			"0"
 		"zpos"			"7"
-		"wide"			"24"
-		"tall"			"24"
+		"wide"			"23"
+		"tall"			"23"
 		"visible"		"1"
 		"enabled"		"1"
 		"scaleImage"	"1"	
@@ -564,8 +568,8 @@
 		"xpos"			"0"
 		"ypos"			"0"
 		"zpos"			"7"
-		"wide"			"24"
-		"tall"			"24"
+		"wide"			"23"
+		"tall"			"23"
 		"visible"		"1"
 		"enabled"		"1"
 		"scaleImage"	"1"
@@ -583,8 +587,8 @@
 		"xpos"			"0"
 		"ypos"			"0"
 		"zpos"			"7"
-		"wide"			"24"
-		"tall"			"24"
+		"wide"			"23"
+		"tall"			"23"
 		"visible"		"1"
 		"enabled"		"1"
 		"scaleImage"	"1"	
@@ -602,8 +606,8 @@
 		"xpos"			"0"
 		"ypos"			"0"
 		"zpos"			"7"
-		"wide"			"24"
-		"tall"			"24"
+		"wide"			"23"
+		"tall"			"23"
 		"visible"		"1"
 		"enabled"		"1"
 		"scaleImage"	"1"	
@@ -621,8 +625,8 @@
 		"xpos"			"0"
 		"ypos"			"0"
 		"zpos"			"7"
-		"wide"			"24"
-		"tall"			"24"
+		"wide"			"23"
+		"tall"			"23"
 		"visible"		"1"
 		"enabled"		"1"
 		"scaleImage"	"1"	
@@ -640,8 +644,8 @@
 		"xpos"			"0"
 		"ypos"			"0"
 		"zpos"			"7"
-		"wide"			"24"
-		"tall"			"24"
+		"wide"			"23"
+		"tall"			"23"
 		"visible"		"1"
 		"enabled"		"1"
 		"scaleImage"	"1"	
@@ -659,8 +663,8 @@
 		"xpos"			"0"
 		"ypos"			"0"
 		"zpos"			"7"
-		"wide"			"24"
-		"tall"			"24"
+		"wide"			"23"
+		"tall"			"23"
 		"visible"		"1"
 		"enabled"		"1"
 		"scaleImage"	"1"	
@@ -678,8 +682,8 @@
 		"xpos"			"0"
 		"ypos"			"0"
 		"zpos"			"7"
-		"wide"			"24"
-		"tall"			"24"
+		"wide"			"23"
+		"tall"			"23"
 		"visible"		"1"
 		"enabled"		"1"
 		"scaleImage"	"1"	
diff --git a/resource/ui/HudTournament.res b/resource/ui/HudTournament.res
index dafcd73..89e5c4b 100644
--- a/resource/ui/HudTournament.res
+++ b/resource/ui/HudTournament.res
@@ -57,10 +57,10 @@
 			"color_ready"		"0 255 0 220"
 			"color_notready"	"0 0 0 220"
 			
-			"BG"
+			"PanelBG"
 			{
 				"ControlName"	"ImagePanel"
-				"fieldName"		"BG"
+				"fieldName"		"PanelBG"
 				"xpos"			"0"
 				"ypos"			"0"
 				"zpos"			"0"
@@ -400,74 +400,14 @@
 	{
 		"ControlName"	"ScalableImagePanel"
 		"fieldName"		"HudTournamentBG"
-		"xpos"			"0"
-		"ypos"			"26"
-		"zpos"			"-1"
-		"wide"			"250"
-		"tall"			"0"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"0"
-		"enabled"		"0"
-		"image"			"../HUD/tournament_panel_brown"
-
-		"src_corner_height"		"23"			// pixels inside the image
-		"src_corner_width"		"23"
-		
-		"draw_corner_width"		"0"				// screen size of the corners ( and sides ), proportional
-		"draw_corner_height"	"0"	
-		
-		if_mvm {
-			"visible"			"0"
-		}
-
-		if_competitive
-		{
-			"xpos"			"195"
-			"ypos"			"5"
-			"visible"		"0"
-		}
-		
-		if_readymode
-		{
-			"xpos"			"195"
-			"visible"		"0"
-		}		
+		"wide"			"0"		
 	}
+
 	"TournamentLabel"
 	{	
 		"ControlName"	"Label"
 		"fieldName"		"TournamentLabel"
-		"font"			"HudFontSmall"
-		"xpos"			"9999"
-		"ypos"			"9999"
-		"zpos"			"1"
-		"wide"			"240"
-		"tall"			"19"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"1"
-		"enabled"		"1"
-		"wrap"			"0"
-		"labelText"		"%tournamentstatelabel%"
-		"textAlignment"	"center"
-		
-		if_mvm
-				{
-			"visible"		"0"
-		}
-
-		if_competitive
-		{
-			"xpos"			"200"
-			"visible"		"0"
-		}
-
-		if_readymode
-		{
-			"xpos"			"200"
-			"visible"		"0"
-		}
+		"wide"			"0"
 	}
 
 	"HudTournamentBLUEBG"
@@ -479,8 +419,6 @@
 		"zpos"			"-1"
 		"wide"			"125"
 		"tall"			"16"
-		"autoResize"	"0"
-		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
 		"image"			"../HUD/tournament_panel_blu"
@@ -804,36 +742,6 @@
 		}
 	}
 	
-	"HelpBackground"
-	{
-		"ControlName"	"ImagePanel"
-		"fieldName"		"HelpBackground"
-		"xpos"			"c-125"
-		"ypos"			"26"
-		"zpos"			"-1"
-		"wide"			"250"
-		"tall"			"18"
-		"pinCorner"		"0"
-		"visible"		"1"
-		"enabled"		"1"
-		"fillcolor"		"50 50 50 255"
-		
-		if_mvm {
-			"visible"	"0"
-		}
-
-		if_readymode {
-			"xpos"		"c-125"
-		}
-		
-		if_competitive
-		{
-			"xpos"		"c-125"
-			"ypos"		"32"
-			"visible"	"0"
-		}		
-	}
-	
 	"TournamentInstructionsLabel"
 	{	
 		"ControlName"	"CExLabel"
@@ -914,45 +822,7 @@
 	{
 		"ControlName"	"ScalableImagePanel"
 		"fieldName"		"CountdownBG"
-		"xpos"			"230"
-		"ypos"			"r55"
-		"zpos"			"-1"
-		"wide"			"40"
-		"tall"			"40"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"0"
-		"enabled"		"1"
-		"image"			"../HUD/color_panel_red"
-
-		"src_corner_height"		"23"			// pixels inside the image
-		"src_corner_width"		"23"
-		
-		"draw_corner_width"		"5"				// screen size of the corners ( and sides ), proportional
-		"draw_corner_height"	"5"
-		
-		"if_mvm" 
-		{
-			"visible"	"1"
-			"enabled"	"1"
-			"xpos"		"c-20"
-		}
-
-		if_competitive
-		{
-			"visible"	"0"
-			"enabled" 	"0"
-			"wide"		"0"
-			"tall"		"0"
-		}
-		
-		if_readymode
-		{
-			"visible"	"0"
-			"enabled" 	"0"
-			"wide"		"0"
-			"tall"		"0"
-		}
+		"wide"			"0"
 	}
 
 	"CountdownLabel"
diff --git a/resource/ui/HudTournamentSetup.res b/resource/ui/HudTournamentSetup.res
index 151dabb..9ae33e1 100644
--- a/resource/ui/HudTournamentSetup.res
+++ b/resource/ui/HudTournamentSetup.res
@@ -80,7 +80,7 @@
 		"unicode"			"0"
 		"wrap"				"0"
 		"fgcolor_override"	"235 226 202 255"
-		"bgcolor_override"	"0 0 0 0"
+		"bgcolor_override"	"Transparent"
 		"labelText"			"%teamname%"
 		"font" 				"Cerbetica12"
 		"textAlignment"		"west"
@@ -88,18 +88,9 @@
 
 	"HudTournamentNameBG"
 	{
-		"ControlName"	"ImagePanel"
+		"ControlName"	"CTFImagePanel"
 		"fieldName"		"HudTournamentNameBG"
-		"xpos"			"30"
-		"ypos"			"28"
-		"wide"			"0"
-		"tall"			"0"
-		"zpos"			"0"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"0"
-		"enabled"		"1"
-		"fillcolor"		"255 0 0 255"
+		"xpos"			"9999"
 	}
 
 	"TournamentNotReadyButton"
diff --git a/resource/ui/MainMenuOverride.res b/resource/ui/MainMenuOverride.res
index 8bd7880..2a1b2d3 100644
--- a/resource/ui/MainMenuOverride.res
+++ b/resource/ui/MainMenuOverride.res
@@ -130,8 +130,8 @@
 		"wide"			"300"
 		"tall"			"300"
 		"visible"		"0"
-		"bgcolor_override"		"0 0 0 0"
-		"noitem_textcolor"		"117 107 94 255"
+		"bgcolor_override"		"Transparent"
+		"noitem_textcolor"		"TextColor"
 		"PaintBackgroundType"	"2"
 		"paintborder"	"1"
 		"border"		"MainMenuBGBorder"
@@ -156,7 +156,7 @@
 			"enabled"		"1"
 			"labelText"		"%attriblist%"
 			"textAlignment"	"center"
-			"fgcolor"		"117 107 94 255"
+			"fgcolor"		"TextColor"
 			"centerwrap"	"1"
 		}
 	}
@@ -176,10 +176,10 @@
 		"image"			""
 	}
 	
-	"HudNameBG"
+	"MainMenuSideBG"
 	{
 		"ControlName"	"ImagePanel"
-		"fieldName"		"HudNameBG"
+		"fieldName"		"MainMenuSideBG"
 		"xpos"			"30"
 		"ypos"			"57"
 		"zpos"			"-55"
@@ -240,20 +240,6 @@
 			"image"			"glyph_quit"
 		}				
 	}
-	
-	"TFCharacterImage"
-	{
-		//"ControlName"	"ImagePanel"
-		"fieldName"		"TFCharacterImage"
-		"xpos"			"9999"
-		"ypos"			"9999"
-		"zpos"			"-99"
-		"wide"			"600"
-		"tall"			"600"
-		"visible"		"0"
-		"enabled"		"0"
-		"scaleImage"	"1"
-	}
 
 	"RankModelPanel"
 	{
@@ -443,7 +429,7 @@
 			"pinCorner"		"0"
 			"visible"		"1"
 			"enabled"		"1"
-			"fgcolor_override"	"117 107 94 255"
+			"fgcolor_override"	"TextColor"
 			"wrap"			"1"
 		}
 		
@@ -554,6 +540,177 @@
 			}
 		}
 	}
+	
+	"QuestLogButtonNew"
+	{
+		"ControlName"	"EditablePanel"
+		"fieldName"		"QuestLogButtonNew"
+		"xpos"			"105"
+		"ypos"			"62"
+		"zpos"			"1"
+		"wide"			"20"
+		"tall"			"20"
+		"autoResize"	"0"
+		"pinCorner"		"3"
+		"visible"		"1"
+		"enabled"		"1"
+		"tabPosition"	"0"
+		
+		"SubButton"
+		{
+			"ControlName"	"CExImageButton"
+			"fieldName"		"SubButton"
+			"xpos"			"0"
+			"ypos"			"0"
+			"wide"			"20"
+			"tall"			"20"
+			"zpos"			"5"
+			"autoResize"	"0"
+			"pinCorner"		"3"
+			"visible"		"1"
+			"enabled"		"1"
+			"tabPosition"	"0"
+			"labelText"		""
+			"font"			""
+			"command"		"questlog"
+			"textAlignment"	"center"
+			"dulltext"		"0"
+			"brighttext"	"0"
+			"default"		"1"
+
+			"sound_depressed"	"UI/buttonclick.wav"
+			"sound_released"	"UI/buttonclickrelease.wav"
+
+			"actionsignallevel" "2"
+			"proportionaltoparent"	"1"
+
+			"paintbackground"	"0"
+			"paintborder"		"0"
+			
+			"defaultFgColor_override" "TanLight"
+			"armedFgColor_override" "Button Color"
+			"depressedFgColor_override" "Button Color"
+
+			"image_drawcolor"	"235 226 202 255"
+			"image_armedcolor"	"72 255 255 255"
+
+			"SubImage"
+			{
+				"ControlName"	"ImagePanel"
+				"fieldName"		"SubImage"
+				"xpos"			"2"
+				"ypos"			"0"
+				"zpos"			"1"
+				"wide"			"16"
+				"tall"			"16"
+				"visible"		"1"
+				"enabled"		"1"
+				"scaleImage"	"1"
+				"image"			"replay/thumbnails/contracts"
+			}
+		}
+	}
+	
+	"WatchStreamButton"
+	{
+		"ControlName"	"EditablePanel"
+		"fieldName"		"WatchStreamButton"
+		"xpos"			"r28"
+		"ypos"			"62"
+		"zpos"			"1"
+		"wide"			"20"
+		"tall"			"20"
+		"autoResize"	"0"
+		"pinCorner"		"3"
+		"visible"		"1"
+		"enabled"		"1"
+		"tabPosition"	"0"
+
+		"SubButton"
+		{
+			"ControlName"	"CExImageButton"
+			"fieldName"		"SubButton"
+			"xpos"			"0"
+			"ypos"			"0"
+			"wide"			"20"
+			"tall"			"20"
+			"zpos"			"5"
+			"autoResize"	"0"
+			"pinCorner"		"3"
+			"visible"		"1"
+			"enabled"		"1"
+			"tabPosition"	"0"
+			"labelText"		""
+			"font"			""
+			"command"		"watch_stream"
+			"textAlignment"	"center"
+			"dulltext"		"0"
+			"brighttext"	"0"
+			"default"		"1"
+
+			"sound_depressed"	"UI/buttonclick.wav"
+			"sound_released"	"UI/buttonclickrelease.wav"
+
+			"actionsignallevel" "2"
+			"proportionaltoparent"	"1"
+
+			"paintbackground"	"0"
+			"paintborder"		"0"
+			
+			"defaultFgColor_override" "TanLight"
+			"armedFgColor_override" "Button Color"
+			"depressedFgColor_override" "Button Color"
+
+			"image_drawcolor"	"235 226 202 255"
+			"image_armedcolor"	"72 255 255 255"
+
+			"SubImage"
+			{
+				"ControlName"	"ImagePanel"
+				"fieldName"		"SubImage"
+				"xpos"			"0"
+				"ypos"			"-1"
+				"zpos"			"1"
+				"wide"			"20"
+				"tall"			"20"
+				"visible"		"1"
+				"enabled"		"1"
+				"scaleImage"	"1"
+				"image"			"replay/thumbnails/twitch"
+			}
+		}
+	}
+
+	"StreamListPanel"
+	{
+		"ControlName"	"CTFStreamListPanel"
+		"fieldName"		"StreamListPanel"
+		"xpos"			"c100"
+		"ypos"			"90"
+		"zpos"			"1"
+		"wide"			"300"
+		"tall"			"325"
+		"visible"		"0"
+		"PaintBackgroundType"	"0"
+		"paintbackground"	"2"
+		"bgcolor_override"	"25 25 25 230"
+		"border"		"NoBorder"
+	}
+
+	"MOTD_Panel"
+	{
+		"ControlName"	"EditablePanel"
+		"fieldName"		"MOTD_Panel"
+		"xpos"			"0"
+		"ypos"			"0"
+		"zpos"			"0"
+		"wide"			"0"
+		"tall"			"0"
+		"visible"		"0"
+		"PaintBackgroundType"	"2"
+		"paintbackground"		"0"
+		"border"				""
+	}
 
 	"Notifications_Panel"
 	{
@@ -614,7 +771,7 @@
 				"tall"			"14"
 				"visible"		"1"
 				"enabled"		"1"
-				"image"			"close_button"
+				"image"			"replay/thumbnails/close"
 				"scaleImage"	"1"
 			}				
 		}		
@@ -634,7 +791,7 @@
 			"pinCorner"		"0"
 			"visible"		"1"
 			"enabled"		"1"
-			"fgcolor_override"	"46 43 42 255"
+			"fgcolor_override"	"TanDarker"
 			"wrap"			"1"
 		}
 		
@@ -647,7 +804,7 @@
 			"wide"			"210"
 			"tall"			"135"
 			"PaintBackgroundType"	"2"
-			"fgcolor_override"	"117 107 94 255"
+			"fgcolor_override"	"TextColor"
 			
 			"Notifications_Control"
 			{
@@ -662,168 +819,326 @@
 		}
 	}
 
-	"MOTD_ShowButtonPanel"
+	"CompetitiveAccessInfoPanel"
+	{
+		"ControlName"	"CCompetitiveAccessInfoPanel"
+		"fieldName"		"CompetitiveAccessInfoPanel"
+		"xpos"			"cs-0.5"
+		"ypos"			"cs-0.5"
+		"zpos"			"1000"
+		"wide"			"f0"
+		"tall"			"f0"
+		"visible"		"0"
+	}
+
+	"FriendsContainer"
 	{
 		"ControlName"	"EditablePanel"
-		"fieldName"		"MOTD_ShowButtonPanel"
-		"xpos"			"40"
-		"ypos"			"48"
-		"zpos"			"1"
-		"wide"			"20"
-		"tall"			"25"
-		"autoResize"	"0"
-		"pinCorner"		"3"
+		"fieldname"		"FriendsContainer"
+		"xpos"			"30"
+		"ypos"			"255"
+		"zpos"			"5"
+		"wide"			"260"
+		"tall"			"195"
+		"visible"		"1"
+		"border"			"NoBorder"
+		"bgcolor_override"	"TransparentPanelBG"
+
+		"TitleLabel"
+		{
+			"ControlName"	"CExLabel"
+			"fieldName"		"TitleLabel"
+			"font"			"HudFontSmallBold"
+			"labelText"		"#TF_Competitive_Friends"
+			"textAlignment"	"west"
+			"xpos"			"12"
+			"ypos"			"3"
+			"wide"			"f0"
+			"tall"			"20"
+			"autoResize"	"0"
+			"pinCorner"		"0"
+			"visible"		"1"
+			"enabled"		"1"
+			"textinsetx"	"0"
+			"fgcolor_override"	"235 227 203 255"
+		}
+
+		"InnerShadow"
+		{
+			"ControlName"	"EditablePanel"
+			"fieldname"		"InnerShadow"
+			"xpos"			"cs-0.5"
+			"ypos"			"rs1-10"
+			"zpos"			"501"
+			"wide"			"f20"
+			"tall"			"160"
+			"visible"		"1"	
+			"PaintBackgroundType"	"0"
+			"proportionaltoparent"	"1"
+			"mouseinputenabled"	"0"
+
+			"paintborder"	"1"
+			"border"		"InnerShadowBorder"
+		}
+
+		"SteamFriendsList"
+		{
+			"ControlName"	"CSteamFriendsListPanel"
+			"fieldname"		"SteamFriendsList"
+			"xpos"			"cs-0.5"
+			"ypos"			"rs1-10"
+			"zpos"			"500"
+			"wide"			"f20"
+			"tall"			"160"
+			"visible"		"1"
+			"proportionaltoparent"	"1"
+
+			"columns_count"	"2"
+			"inset_x"		"10"
+			"inset_y"		"5"
+			"row_gap"		"5"
+			"column_gap"	"20"
+			"restrict_width"	"0"
+
+			"friendpanel_kv"
+			{
+				"wide"		"100"
+				"tall"		"20"
+			}
+
+			"ScrollBar"
+			{
+				"ControlName"	"ScrollBar"
+				"FieldName"		"ScrollBar"
+				"xpos"			"rs1-1"
+				"ypos"			"0"
+				"tall"			"f0"
+				"wide"			"5" // This gets slammed from client schme.  GG.
+				"zpos"			"1000"
+				"nobuttons"		"1"
+				"proportionaltoparent"	"1"
+
+				"Slider"
+				{
+					"fgcolor_override"	"TanDark"
+				}
+		
+				"UpButton"
+				{
+					"ControlName"	"Button"
+					"FieldName"		"UpButton"
+					"visible"		"0"
+				}
+		
+				"DownButton"
+				{
+					"ControlName"	"Button"
+					"FieldName"		"DownButton"
+					"visible"		"0"
+				}
+			}
+		}
+
+		"BelowDarken"
+		{
+			"ControlName"	"EditablePanel"
+			"fieldname"		"BelowDarken"
+			"xpos"			"cs-0.5"
+			"ypos"			"rs1-10"
+			"zpos"			"499"
+			"wide"			"f20"
+			"tall"			"160"
+			"visible"		"1"	
+			"PaintBackgroundType"	"0"
+			"proportionaltoparent"	"1"
+			"mouseinputenabled"	"0"
+			"bgcolor_override"	"0 0 0 100"
+		}
+	}
+
+	"TFLogoImage"
+	{
+		"ControlName"	"ImagePanel"
+		"fieldName"		"TFLogoImage"
+		"xpos"			"15"
+		"ypos"			"35"
+		"wide"			"179"
+		"tall"			"45"
 		"visible"		"0"
 		"enabled"		"0"
-		
-		"MOTD_ShowButtonPanel_SB"
+		"image"			"../logo/new_tf2_logo"
+		"command"		"engine play vo/heavy_battlecry02.mp3"
+		"scaleImage"	"1"
+	}
+
+	"TFCharacterImage"
+	{
+		//"ControlName"	"ImagePanel"
+		"fieldName"		"TFCharacterImage"
+		"xpos"			"9999"
+		"ypos"			"9999"
+		"zpos"			"-99"
+		"wide"			"600"
+		"tall"			"600"
+		"visible"		"0"
+		"enabled"		"0"
+		"scaleImage"	"1"
+	}
+
+	"VersionLabel"
+	{
+		"ControlName"	"CExLabel"
+		"fieldName"		"VersionLabel"
+		"font"			"Cerbetica14"
+		"labelText"		"v2018.1220"
+		"xpos"			"r55"
+		"ypos"			"r13"
+		"wide"			"80"
+		"tall"			"10"
+		"autoResize"	"0"
+		"pinCorner"		"0"
+		"visible"		"1"
+		"enabled"		"1"
+		"fgcolor_override"	"White"
+	}
+
+	"CharacterSetupButton"
+	{
+		"ControlName"	"EditablePanel"
+		"fieldname"		"CharacterSetupButton"
+		"xpos"			"30"
+		"ypos"			"82"
+		"zpos"			"12"
+		"wide"			"260"
+		"tall"			"18"
+		"visible"		"1"
+		"PaintBackgroundType"	"0"
+		"SubButton"
 		{
 			"ControlName"	"CExImageButton"
-			"fieldName"		"MOTD_ShowButtonPanel_SB"
+			"fieldName"		"SubButton"
 			"xpos"			"0"
-			"ypos"			"-1"
-			"zpos"			"1"
-			"wide"			"18"
+			"ypos"			"0"
+			"wide"			"260"
 			"tall"			"18"
+			"autoResize"	"0"
 			"visible"		"1"
 			"enabled"		"1"
-			"labelText"		""
-			"font"			""
+			"tabPosition"	"0"
+			"font"			"Cerbetica16"
+			"textAlignment"	"west"
+			"textinsetx"	"24"
 			"dulltext"		"0"
 			"brighttext"	"0"
 			"default"		"1"
-			"Command"		"motd_show"
 			"sound_depressed"	"UI/buttonclick.wav"
 			"sound_released"	"UI/buttonclickrelease.wav"
 			
 			"border_default"	""
-			"border_armed"		""
-			"paintbackground"	"0"
-			"actionsignallevel" "2"
-			
+			"border_armed"		"MainMenuTabs"
+			"paintbackground"	"1"
+
 			"defaultFgColor_override" "TanLight"
-			"armedFgColor_override" "Button Color"
-			"depressedFgColor_override" "Button Color"
-			
-			"image_drawcolor"	"235 226 202 255"
-			"image_armedcolor"	"Button Color"
+			"armedFgColor_override" "TanLight"
+			"depressedFgColor_override" "TanLight"
+
+			"defaultBgColor_override" "Transparent"
+			"armedBgColor_override" "TransparentPanelBG"
+			"depressedBgColor_override" "TransparentPanelBG"
+
+			"image_drawcolor"	"TextColor"
+			"image_armedcolor"	"235 226 202 255"
 
 			"SubImage"
 			{
 				"ControlName"	"ImagePanel"
 				"fieldName"		"SubImage"
-				"xpos"			"0"
-				"ypos"			"0"
+				"xpos"			"6"
+				"ypos"			"6"
 				"zpos"			"1"
-				"wide"			"0"
-				"tall"			"0"
-				"visible"		"0"
-				"enabled"		"0"
-				"image"			"replay/thumbnails/motd"
+				"wide"			"14"
+				"tall"			"14"
+				"visible"		"1"
+				"enabled"		"1"
 				"scaleImage"	"1"
 			}
 		}
 	}
 
-	"MOTD_Panel"
-	{
-		"ControlName"	"EditablePanel"
-		"fieldName"		"MOTD_Panel"
-		"xpos"			"0"
-		"ypos"			"0"
-		"zpos"			"0"
-		"wide"			"0"
-		"tall"			"0"
-		"visible"		"0"
-		"PaintBackgroundType"	"2"
-		"paintbackground"		"0"
-		"border"				""
-	}
-	
-	"QuestLogButtonNew"
+	"GeneralStoreButton"
 	{
 		"ControlName"	"EditablePanel"
-		"fieldName"		"QuestLogButtonNew"
-		"xpos"			"105"
-		"ypos"			"62"
-		"zpos"			"1"
-		"wide"			"20"
-		"tall"			"20"
-		"autoResize"	"0"
-		"pinCorner"		"3"
+		"fieldname"		"GeneralStoreButton"
+		"xpos"			"30"
+		"ypos"			"102"
+		"zpos"			"11"
+		"wide"			"260"
+		"tall"			"18"
 		"visible"		"1"
-		"enabled"		"1"
-		"tabPosition"	"0"
-		
+		"PaintBackgroundType"	"0"
 		"SubButton"
 		{
 			"ControlName"	"CExImageButton"
 			"fieldName"		"SubButton"
 			"xpos"			"0"
 			"ypos"			"0"
-			"wide"			"20"
-			"tall"			"20"
-			"zpos"			"5"
+			"wide"			"260"
+			"tall"			"18"
 			"autoResize"	"0"
-			"pinCorner"		"3"
 			"visible"		"1"
 			"enabled"		"1"
 			"tabPosition"	"0"
-			"labelText"		""
-			"font"			""
-			"command"		"questlog"
-			"textAlignment"	"center"
+			"font"			"Cerbetica16"
+			"textAlignment"	"west"
+			"textinsetx"	"24"
 			"dulltext"		"0"
 			"brighttext"	"0"
 			"default"		"1"
-
 			"sound_depressed"	"UI/buttonclick.wav"
 			"sound_released"	"UI/buttonclickrelease.wav"
-
-			"actionsignallevel" "2"
-			"proportionaltoparent"	"1"
-
-			"paintbackground"	"0"
-			"paintborder"		"0"
+			
+			"border_default"	""
+			"border_armed"		"MainMenuTabs"
+			"paintbackground"	"1"
 			
 			"defaultFgColor_override" "TanLight"
-			"armedFgColor_override" "Button Color"
-			"depressedFgColor_override" "Button Color"
-
-			"image_drawcolor"	"235 226 202 255"
-			"image_armedcolor"	"72 255 255 255"
+			"armedFgColor_override" "TanLight"
+			"depressedFgColor_override" "TanLight"
+			
+			"defaultBgColor_override" "Transparent"
+			"armedBgColor_override" "TransparentPanelBG"
+			"depressedBgColor_override" "TransparentPanelBG"
+			
+			"image_drawcolor"	"TextColor"
+			"image_armedcolor"	"235 226 202 255"
 
 			"SubImage"
 			{
 				"ControlName"	"ImagePanel"
 				"fieldName"		"SubImage"
-				"xpos"			"2"
-				"ypos"			"0"
+				"xpos"			"6"
+				"ypos"			"6"
 				"zpos"			"1"
-				"wide"			"16"
-				"tall"			"16"
+				"wide"			"14"
+				"tall"			"14"
 				"visible"		"1"
 				"enabled"		"1"
 				"scaleImage"	"1"
-				"image"			"replay/thumbnails/contracts"
 			}
 		}
 	}
-	
-	"WatchStreamButton"
+
+	"SettingsButton"
 	{
 		"ControlName"	"EditablePanel"
-		"fieldName"		"WatchStreamButton"
-		"xpos"			"r28"
-		"ypos"			"62"
-		"zpos"			"1"
-		"wide"			"20"
-		"tall"			"20"
-		"autoResize"	"0"
-		"pinCorner"		"3"
+		"fieldName"		"SettingsButton"
+		"xpos"			"30"
+		"ypos"			"142"
+		"zpos"			"11"
+		"wide"			"260"
+		"tall"			"18"
 		"visible"		"1"
-		"enabled"		"1"
-		"tabPosition"	"0"
+		"PaintBackgroundType"	"0"
 
 		"SubButton"
 		{
@@ -831,79 +1146,120 @@
 			"fieldName"		"SubButton"
 			"xpos"			"0"
 			"ypos"			"0"
-			"wide"			"20"
-			"tall"			"20"
-			"zpos"			"5"
+			"wide"			"260"
+			"tall"			"18"
 			"autoResize"	"0"
-			"pinCorner"		"3"
 			"visible"		"1"
 			"enabled"		"1"
 			"tabPosition"	"0"
-			"labelText"		""
-			"font"			""
-			"command"		"watch_stream"
-			"textAlignment"	"center"
+			"font"			"Cerbetica16"
+			"textAlignment"	"west"
+			"textinsetx"	"24"
 			"dulltext"		"0"
 			"brighttext"	"0"
 			"default"		"1"
-
 			"sound_depressed"	"UI/buttonclick.wav"
 			"sound_released"	"UI/buttonclickrelease.wav"
-
-			"actionsignallevel" "2"
-			"proportionaltoparent"	"1"
-
-			"paintbackground"	"0"
-			"paintborder"		"0"
+			
+			"border_default"	""
+			"border_armed"		"MainMenuTabs"
+			"paintbackground"	"1"
 			
 			"defaultFgColor_override" "TanLight"
-			"armedFgColor_override" "Button Color"
-			"depressedFgColor_override" "Button Color"
-
-			"image_drawcolor"	"235 226 202 255"
-			"image_armedcolor"	"72 255 255 255"
+			"armedFgColor_override" "TanLight"
+			"depressedFgColor_override" "TanLight"
+			
+			"defaultBgColor_override" "Transparent"
+			"armedBgColor_override" "TransparentPanelBG"
+			"depressedBgColor_override" "TransparentPanelBG"
+			
+			"image_drawcolor"	"TextColor"
+			"image_armedcolor"	"235 226 202 255"
 
 			"SubImage"
 			{
 				"ControlName"	"ImagePanel"
 				"fieldName"		"SubImage"
-				"xpos"			"0"
-				"ypos"			"-1"
+				"xpos"			"6"
+				"ypos"			"6"
 				"zpos"			"1"
-				"wide"			"20"
-				"tall"			"20"
+				"wide"			"14"
+				"tall"			"14"
 				"visible"		"1"
 				"enabled"		"1"
 				"scaleImage"	"1"
-				"image"			"replay/thumbnails/twitch"
 			}
 		}
 	}
 
-	"StreamListPanel"
+	"TF2SettingsButton"
 	{
-		"ControlName"	"CTFStreamListPanel"
-		"fieldName"		"StreamListPanel"
-		"xpos"			"c100"
-		"ypos"			"90"
-		"zpos"			"1"
-		"wide"			"300"
-		"tall"			"325"
-		"visible"		"0"
+		"ControlName"	"EditablePanel"
+		"fieldName"		"TF2SettingsButton"
+		"xpos"			"30"
+		"ypos"			"162"
+		"zpos"			"11"
+		"wide"			"260"
+		"tall"			"18"
+		"visible"		"1"
 		"PaintBackgroundType"	"0"
-		"paintbackground"	"2"
-		"bgcolor_override"	"25 25 25 230"
-		"border"		"NoBorder"
-		
-		"navDown"		"SettingsButton"
-		"navLeft"		"WatchStreamButton"
+		"SubButton"
+		{
+			"ControlName"	"CExImageButton"
+			"fieldName"		"SubButton"
+			"xpos"			"0"
+			"ypos"			"0"
+			"wide"			"260"
+			"tall"			"18"
+			"autoResize"	"0"
+			"visible"		"1"
+			"enabled"		"1"
+			"tabPosition"	"0"
+			"font"			"Cerbetica16"
+			"textAlignment"	"west"
+			"textinsetx"	"24"
+			"dulltext"		"0"
+			"brighttext"	"0"
+			"default"		"1"
+			"sound_depressed"	"UI/buttonclick.wav"
+			"sound_released"	"UI/buttonclickrelease.wav"
+			
+			"border_default"	""
+			"border_armed"		"MainMenuTabs"
+			"paintbackground"	"1"
+			
+			"defaultFgColor_override" "TanLight"
+			"armedFgColor_override" "TanLight"
+			"depressedFgColor_override" "TanLight"
+			
+			"defaultBgColor_override" "Transparent"
+			"armedBgColor_override" "TransparentPanelBG"
+			"depressedBgColor_override" "TransparentPanelBG"
+			
+			"image_drawcolor"	"TextColor"
+			"image_armedcolor"	"235 226 202 255"
+
+			"SubImage"
+			{
+				"ControlName"	"ImagePanel"
+				"fieldName"		"SubImage"
+				"xpos"			"6"
+				"ypos"			"6"
+				"zpos"			"1"
+				"wide"			"14"
+				"tall"			"14"
+				"visible"		"1"
+				"enabled"		"1"
+				"scaleImage"	"1"
+			}
+		}
 	}
 
-	"SteamWorkshopButton"
+	"AchievementsButton"
 	{
 		"ControlName"	"EditablePanel"
-		"fieldname"		"SteamWorkshopButton"
-		"xpos"			"125"
+		"fieldname"		"AchievementsButton"
+		"xpos"			"165"
 		"ypos"			"62"
 		"zpos"			"1"
 		"wide"			"20"
@@ -969,11 +1325,11 @@
 		}
 	}
 	
-	"ReportBugButton"
+	"ConsoleButton"
 	{
 		"ControlName"	"EditablePanel"
-		"fieldname"		"ReportBugButton"
-		"xpos"			"145"
+		"fieldname"		"ConsoleButton"
+		"xpos"			"185"
 		"ypos"			"62"
 		"zpos"			"1"
 		"wide"			"20"
@@ -1021,7 +1377,7 @@
 
 			"image_drawcolor"	"235 226 202 255"
 			"image_armedcolor"	"72 255 255 255"
-			
+
 			"SubImage"
 			{
 				"ControlName"	"ImagePanel"
@@ -1034,86 +1390,79 @@
 				"visible"		"1"
 				"enabled"		"1"
 				"scaleImage"	"1"
-				"image"			"glyph_bug"
+				"image"			"glyph_create"
 			}
 		}
 	}
 
-	"AchievementsButton"
+	"ReplayButton"
 	{
 		"ControlName"	"EditablePanel"
-		"fieldname"		"AchievementsButton"
-		"xpos"			"165"
-		"ypos"			"62"
-		"zpos"			"1"
-		"wide"			"20"
-		"tall"			"20"
-		"autoResize"	"0"
-		"pinCorner"		"3"
+		"fieldname"		"ReplayButton"
+		"xpos"			"30"
+		"ypos"			"122"
+		"zpos"			"11"
+		"wide"			"260"
+		"tall"			"18"
 		"visible"		"1"
-		"enabled"		"1"
-		"tabPosition"	"0"
-
+		"PaintBackgroundType"	"0"
 		"SubButton"
 		{
 			"ControlName"	"CExImageButton"
 			"fieldName"		"SubButton"
 			"xpos"			"0"
 			"ypos"			"0"
-			"wide"			"20"
-			"tall"			"20"
-			"zpos"			"5"
+			"wide"			"260"
+			"tall"			"18"
 			"autoResize"	"0"
-			"pinCorner"		"3"
 			"visible"		"1"
 			"enabled"		"1"
 			"tabPosition"	"0"
-			"labelText"		""
-			"font"			""
-			"Command"		"engine bug"
-			"textAlignment"	"center"
+			"font"			"Cerbetica16"
+			"textAlignment"	"west"
+			"textinsetx"	"24"
 			"dulltext"		"0"
 			"brighttext"	"0"
 			"default"		"1"
-
 			"sound_depressed"	"UI/buttonclick.wav"
 			"sound_released"	"UI/buttonclickrelease.wav"
-
-			"actionsignallevel" "2"
-			"proportionaltoparent"	"1"
-
-			"paintbackground"	"0"
-			"paintborder"		"0"
+			
+			"border_default"	""
+			"border_armed"		"MainMenuTabs"
+			"paintbackground"	"1"
 			
 			"defaultFgColor_override" "TanLight"
-			"armedFgColor_override" "Button Color"
-			"depressedFgColor_override" "Button Color"
-
-			"image_drawcolor"	"235 226 202 255"
-			"image_armedcolor"	"72 255 255 255"
+			"armedFgColor_override" "TanLight"
+			"depressedFgColor_override" "TanLight"
 			
+			"defaultBgColor_override" "Transparent"
+			"armedBgColor_override" "TransparentPanelBG"
+			"depressedBgColor_override" "TransparentPanelBG"
+			
+			"image_drawcolor"	"TextColor"
+			"image_armedcolor"	"235 226 202 255"
+
 			"SubImage"
 			{
 				"ControlName"	"ImagePanel"
 				"fieldName"		"SubImage"
-				"xpos"			"3"
-				"ypos"			"1"
+				"xpos"			"6"
+				"ypos"			"6"
 				"zpos"			"1"
-				"wide"			"15"
-				"tall"			"15"
+				"wide"			"14"
+				"tall"			"14"
 				"visible"		"1"
 				"enabled"		"1"
 				"scaleImage"	"1"
-				"image"			"glyph_bug"
 			}
 		}
 	}
-	
-	"ConsoleButton"
+
+	"ReportBugButton"
 	{
 		"ControlName"	"EditablePanel"
-		"fieldname"		"ConsoleButton"
-		"xpos"			"185"
+		"fieldname"		"ReportBugButton"
+		"xpos"			"145"
 		"ypos"			"62"
 		"zpos"			"1"
 		"wide"			"20"
@@ -1161,7 +1510,7 @@
 
 			"image_drawcolor"	"235 226 202 255"
 			"image_armedcolor"	"72 255 255 255"
-
+			
 			"SubImage"
 			{
 				"ControlName"	"ImagePanel"
@@ -1174,16 +1523,16 @@
 				"visible"		"1"
 				"enabled"		"1"
 				"scaleImage"	"1"
-				"image"			"glyph_create"
+				"image"			"glyph_bug"
 			}
 		}
 	}
-	
-	"ReportPlayerButton"
+
+	"SteamWorkshopButton"
 	{
 		"ControlName"	"EditablePanel"
-		"fieldname"		"ReportPlayerButton"
-		"xpos"			"205"
+		"fieldname"		"SteamWorkshopButton"
+		"xpos"			"125"
 		"ypos"			"62"
 		"zpos"			"1"
 		"wide"			"20"
@@ -1231,7 +1580,7 @@
 
 			"image_drawcolor"	"235 226 202 255"
 			"image_armedcolor"	"72 255 255 255"
-
+			
 			"SubImage"
 			{
 				"ControlName"	"ImagePanel"
@@ -1244,11 +1593,11 @@
 				"visible"		"1"
 				"enabled"		"1"
 				"scaleImage"	"1"
-				"image"			"glyph_create"
+				"image"			"glyph_bug"
 			}
 		}
 	}
-
+	
 	"CallVoteButton"
 	{
 		"ControlName"	"EditablePanel"
@@ -1388,12 +1737,12 @@
 			}
 		}
 	}
-
-	"RequestCoachButton"
+	
+	"ReportPlayerButton"
 	{
 		"ControlName"	"EditablePanel"
-		"fieldname"		"RequestCoachButton"
-		"xpos"			"265"
+		"fieldname"		"ReportPlayerButton"
+		"xpos"			"205"
 		"ypos"			"62"
 		"zpos"			"1"
 		"wide"			"20"
@@ -1420,7 +1769,7 @@
 			"tabPosition"	"0"
 			"labelText"		""
 			"font"			""
-			"Command"		"engine cl_coach_find_coach"
+			"Command"		"engine bug"
 			"textAlignment"	"center"
 			"dulltext"		"0"
 			"brighttext"	"0"
@@ -1449,8 +1798,8 @@
 				"xpos"			"3"
 				"ypos"			"1"
 				"zpos"			"1"
-				"wide"			"14"
-				"tall"			"14"
+				"wide"			"15"
+				"tall"			"15"
 				"visible"		"1"
 				"enabled"		"1"
 				"scaleImage"	"1"
@@ -1459,479 +1808,72 @@
 		}
 	}
 
-	"CompetitiveAccessInfoPanel"
-	{
-		"ControlName"	"CCompetitiveAccessInfoPanel"
-		"fieldName"		"CompetitiveAccessInfoPanel"
-		"xpos"			"cs-0.5"
-		"ypos"			"cs-0.5"
-		"zpos"			"1000"
-		"wide"			"f0"
-		"tall"			"f0"
-		"visible"		"0"
-	}
-
-	"FriendsContainer"
-	{
-		"ControlName"	"EditablePanel"
-		"fieldname"		"FriendsContainer"
-		"xpos"			"30"
-		"ypos"			"255"
-		"zpos"			"5"
-		"wide"			"260"
-		"tall"			"195"
-		"visible"		"1"
-		"border"			"NoBorder"
-		"bgcolor_override"	"TransparentPanelBG"
-
-		"TitleLabel"
-		{
-			"ControlName"	"CExLabel"
-			"fieldName"		"TitleLabel"
-			"font"			"HudFontSmallBold"
-			"labelText"		"#TF_Competitive_Friends"
-			"textAlignment"	"west"
-			"xpos"			"12"
-			"ypos"			"3"
-			"wide"			"f0"
-			"tall"			"20"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"textinsetx"	"0"
-			"fgcolor_override"	"235 227 203 255"
-		}
-
-		"InnerShadow"
-		{
-			"ControlName"	"EditablePanel"
-			"fieldname"		"InnerShadow"
-			"xpos"			"cs-0.5"
-			"ypos"			"rs1-10"
-			"zpos"			"501"
-			"wide"			"f20"
-			"tall"			"160"
-			"visible"		"1"	
-			"PaintBackgroundType"	"0"
-			"proportionaltoparent"	"1"
-			"mouseinputenabled"	"0"
-
-			"paintborder"	"1"
-			"border"		"InnerShadowBorder"
-		}
-
-		"SteamFriendsList"
-		{
-			"ControlName"	"CSteamFriendsListPanel"
-			"fieldname"		"SteamFriendsList"
-			"xpos"			"cs-0.5"
-			"ypos"			"rs1-10"
-			"zpos"			"500"
-			"wide"			"f20"
-			"tall"			"160"
-			"visible"		"1"
-			"proportionaltoparent"	"1"
-
-			"columns_count"	"2"
-			"inset_x"		"10"
-			"inset_y"		"5"
-			"row_gap"		"5"
-			"column_gap"	"20"
-			"restrict_width"	"0"
-
-			"friendpanel_kv"
-			{
-				"wide"		"100"
-				"tall"		"20"
-			}
-
-			"ScrollBar"
-			{
-				"ControlName"	"ScrollBar"
-				"FieldName"		"ScrollBar"
-				"xpos"			"rs1-1"
-				"ypos"			"0"
-				"tall"			"f0"
-				"wide"			"5" // This gets slammed from client schme.  GG.
-				"zpos"			"1000"
-				"nobuttons"		"1"
-				"proportionaltoparent"	"1"
-
-				"Slider"
-				{
-					"fgcolor_override"	"TanDark"
-				}
-		
-				"UpButton"
-				{
-					"ControlName"	"Button"
-					"FieldName"		"UpButton"
-					"visible"		"0"
-				}
-		
-				"DownButton"
-				{
-					"ControlName"	"Button"
-					"FieldName"		"DownButton"
-					"visible"		"0"
-				}
-			}
-		}
-
-		"BelowDarken"
-		{
-			"ControlName"	"EditablePanel"
-			"fieldname"		"BelowDarken"
-			"xpos"			"cs-0.5"
-			"ypos"			"rs1-10"
-			"zpos"			"499"
-			"wide"			"f20"
-			"tall"			"160"
-			"visible"		"1"	
-			"PaintBackgroundType"	"0"
-			"proportionaltoparent"	"1"
-			"mouseinputenabled"	"0"
-			"bgcolor_override"	"0 0 0 100"
-		}
-	}
-
-	"TFLogoImage"
-	{
-		"ControlName"	"ImagePanel"
-		"fieldName"		"TFLogoImage"
-		"xpos"			"15"
-		"ypos"			"35"
-		"wide"			"179"
-		"tall"			"45"
-		"visible"		"0"
-		"enabled"		"0"
-		"image"			"../logo/new_tf2_logo"
-		"command"		"engine play vo/heavy_battlecry02.mp3"
-		"scaleImage"	"1"
-
-		if_operation
-		{
-			"xpos"			"65"
-			"ypos"			"25"
-			"zpos"			"1"
-			"wide"			"o2"
-			"tall"			"105"
-			"image"			"../logo/jungle_inferno_logo"
-		}
-	}
-
-	"CharacterSetupButton"
+	"RequestCoachButton"
 	{
 		"ControlName"	"EditablePanel"
-		"fieldname"		"CharacterSetupButton"
-		"xpos"			"30"
-		"ypos"			"82"
-		"zpos"			"12"
-		"wide"			"260"
-		"tall"			"18"
+		"fieldname"		"RequestCoachButton"
+		"xpos"			"265"
+		"ypos"			"62"
+		"zpos"			"1"
+		"wide"			"20"
+		"tall"			"20"
+		"autoResize"	"0"
+		"pinCorner"		"3"
 		"visible"		"1"
-		"PaintBackgroundType"	"0"
-		"SubButton"
-		{
-			"ControlName"	"CExImageButton"
-			"fieldName"		"SubButton"
-			"xpos"			"0"
-			"ypos"			"0"
-			"wide"			"260"
-			"tall"			"18"
-			"autoResize"	"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"tabPosition"	"0"
-			"font"			"Cerbetica16"
-			"textAlignment"	"west"
-			"textinsetx"	"24"
-			"dulltext"		"0"
-			"brighttext"	"0"
-			"default"		"1"
-			"sound_depressed"	"UI/buttonclick.wav"
-			"sound_released"	"UI/buttonclickrelease.wav"
-			
-			"border_default"	""
-			"border_armed"		"MainMenuTabs"
-			"paintbackground"	"1"
-
-			"defaultFgColor_override" "TanLight"
-			"armedFgColor_override" "TanLight"
-			"depressedFgColor_override" "TanLight"
-
-			"defaultBgColor_override" "0 0 0 0"
-			"armedBgColor_override" "TransparentPanelBG"
-			"depressedBgColor_override" "TransparentPanelBG"
-
-			"image_drawcolor"	"117 107 94 255"
-			"image_armedcolor"	"235 226 202 255"
-
-			"SubImage"
-			{
-				"ControlName"	"ImagePanel"
-				"fieldName"		"SubImage"
-				"xpos"			"6"
-				"ypos"			"6"
-				"zpos"			"1"
-				"wide"			"14"
-				"tall"			"14"
-				"visible"		"1"
-				"enabled"		"1"
-				"scaleImage"	"1"
-			}
-		}
-	}
+		"enabled"		"1"
+		"tabPosition"	"0"
 
-	"GeneralStoreButton"
-	{
-		"ControlName"	"EditablePanel"
-		"fieldname"		"GeneralStoreButton"
-		"xpos"			"30"
-		"ypos"			"102"
-		"zpos"			"11"
-		"wide"			"260"
-		"tall"			"18"
-		"visible"		"1"
-		"PaintBackgroundType"	"0"
 		"SubButton"
 		{
 			"ControlName"	"CExImageButton"
 			"fieldName"		"SubButton"
 			"xpos"			"0"
 			"ypos"			"0"
-			"wide"			"260"
-			"tall"			"18"
+			"wide"			"20"
+			"tall"			"20"
+			"zpos"			"5"
 			"autoResize"	"0"
+			"pinCorner"		"3"
 			"visible"		"1"
 			"enabled"		"1"
 			"tabPosition"	"0"
-			"font"			"Cerbetica16"
-			"textAlignment"	"west"
-			"textinsetx"	"24"
+			"labelText"		""
+			"font"			""
+			"Command"		"engine cl_coach_find_coach"
+			"textAlignment"	"center"
 			"dulltext"		"0"
 			"brighttext"	"0"
 			"default"		"1"
-			"sound_depressed"	"UI/buttonclick.wav"
-			"sound_released"	"UI/buttonclickrelease.wav"
-			
-			"border_default"	""
-			"border_armed"		"MainMenuTabs"
-			"paintbackground"	"1"
-			
-			"defaultFgColor_override" "TanLight"
-			"armedFgColor_override" "TanLight"
-			"depressedFgColor_override" "TanLight"
-			
-			"defaultBgColor_override" "0 0 0 0"
-			"armedBgColor_override" "TransparentPanelBG"
-			"depressedBgColor_override" "TransparentPanelBG"
-			
-			"image_drawcolor"	"117 107 94 255"
-			"image_armedcolor"	"235 226 202 255"
-
-			"SubImage"
-			{
-				"ControlName"	"ImagePanel"
-				"fieldName"		"SubImage"
-				"xpos"			"6"
-				"ypos"			"6"
-				"zpos"			"1"
-				"wide"			"14"
-				"tall"			"14"
-				"visible"		"1"
-				"enabled"		"1"
-				"scaleImage"	"1"
-			}
-		}
-	}
 
-	"ReplayBrowserButton"
-	{
-		"ControlName"	"EditablePanel"
-		"fieldname"		"ReplayBrowserButton"
-		"xpos"			"30"
-		"ypos"			"122"
-		"zpos"			"11"
-		"wide"			"260"
-		"tall"			"18"
-		"visible"		"1"
-		"PaintBackgroundType"	"0"
-		"SubButton"
-		{
-			"ControlName"	"CExImageButton"
-			"fieldName"		"SubButton"
-			"xpos"			"0"
-			"ypos"			"0"
-			"wide"			"260"
-			"tall"			"18"
-			"autoResize"	"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"tabPosition"	"0"
-			"font"			"Cerbetica16"
-			"textAlignment"	"west"
-			"textinsetx"	"24"
-			"dulltext"		"0"
-			"brighttext"	"0"
-			"default"		"1"
 			"sound_depressed"	"UI/buttonclick.wav"
 			"sound_released"	"UI/buttonclickrelease.wav"
-			
-			"border_default"	""
-			"border_armed"		"MainMenuTabs"
-			"paintbackground"	"1"
-			
-			"defaultFgColor_override" "TanLight"
-			"armedFgColor_override" "TanLight"
-			"depressedFgColor_override" "TanLight"
-			
-			"defaultBgColor_override" "0 0 0 0"
-			"armedBgColor_override" "TransparentPanelBG"
-			"depressedBgColor_override" "TransparentPanelBG"
-			
-			"image_drawcolor"	"117 107 94 255"
-			"image_armedcolor"	"235 226 202 255"
 
-			"SubImage"
-			{
-				"ControlName"	"ImagePanel"
-				"fieldName"		"SubImage"
-				"xpos"			"6"
-				"ypos"			"6"
-				"zpos"			"1"
-				"wide"			"14"
-				"tall"			"14"
-				"visible"		"1"
-				"enabled"		"1"
-				"scaleImage"	"1"
-			}
-		}
-	}
+			"actionsignallevel" "2"
+			"proportionaltoparent"	"1"
 
-	"SettingsButton"
-	{
-		"ControlName"	"EditablePanel"
-		"fieldname"		"SettingsButton"
-		"xpos"			"30"
-		"ypos"			"142"
-		"zpos"			"11"
-		"wide"			"260"
-		"tall"			"18"
-		"visible"		"1"
-		"PaintBackgroundType"	"0"
-		"SubButton"
-		{
-			"ControlName"	"CExImageButton"
-			"fieldName"		"SubButton"
-			"xpos"			"0"
-			"ypos"			"0"
-			"wide"			"260"
-			"tall"			"18"
-			"autoResize"	"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"tabPosition"	"0"
-			"font"			"Cerbetica16"
-			"textAlignment"	"west"
-			"textinsetx"	"24"
-			"dulltext"		"0"
-			"brighttext"	"0"
-			"default"		"1"
-			"sound_depressed"	"UI/buttonclick.wav"
-			"sound_released"	"UI/buttonclickrelease.wav"
-			
-			"border_default"	""
-			"border_armed"		"MainMenuTabs"
-			"paintbackground"	"1"
+			"paintbackground"	"0"
+			"paintborder"		"0"
 			
 			"defaultFgColor_override" "TanLight"
-			"armedFgColor_override" "TanLight"
-			"depressedFgColor_override" "TanLight"
-			
-			"defaultBgColor_override" "0 0 0 0"
-			"armedBgColor_override" "TransparentPanelBG"
-			"depressedBgColor_override" "TransparentPanelBG"
-			
-			"image_drawcolor"	"117 107 94 255"
-			"image_armedcolor"	"235 226 202 255"
-
-			"SubImage"
-			{
-				"ControlName"	"ImagePanel"
-				"fieldName"		"SubImage"
-				"xpos"			"6"
-				"ypos"			"6"
-				"zpos"			"1"
-				"wide"			"14"
-				"tall"			"14"
-				"visible"		"1"
-				"enabled"		"1"
-				"scaleImage"	"1"
-			}
-		}
-	}
+			"armedFgColor_override" "Button Color"
+			"depressedFgColor_override" "Button Color"
 
-	"TF2SettingsButton"
-	{
-		"ControlName"	"EditablePanel"
-		"fieldname"		"TF2SettingsButton"
-		"xpos"			"30"
-		"ypos"			"162"
-		"zpos"			"11"
-		"wide"			"260"
-		"tall"			"18"
-		"visible"		"1"
-		"PaintBackgroundType"	"0"
-		"SubButton"
-		{
-			"ControlName"	"CExImageButton"
-			"fieldName"		"SubButton"
-			"xpos"			"0"
-			"ypos"			"0"
-			"wide"			"260"
-			"tall"			"18"
-			"autoResize"	"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"tabPosition"	"0"
-			"font"			"Cerbetica16"
-			"textAlignment"	"west"
-			"textinsetx"	"24"
-			"dulltext"		"0"
-			"brighttext"	"0"
-			"default"		"1"
-			"sound_depressed"	"UI/buttonclick.wav"
-			"sound_released"	"UI/buttonclickrelease.wav"
-			
-			"border_default"	""
-			"border_armed"		"MainMenuTabs"
-			"paintbackground"	"1"
-			
-			"defaultFgColor_override" "TanLight"
-			"armedFgColor_override" "TanLight"
-			"depressedFgColor_override" "TanLight"
-			
-			"defaultBgColor_override" "0 0 0 0"
-			"armedBgColor_override" "TransparentPanelBG"
-			"depressedBgColor_override" "TransparentPanelBG"
-			
-			"image_drawcolor"	"117 107 94 255"
-			"image_armedcolor"	"235 226 202 255"
+			"image_drawcolor"	"235 226 202 255"
+			"image_armedcolor"	"72 255 255 255"
 
 			"SubImage"
 			{
 				"ControlName"	"ImagePanel"
 				"fieldName"		"SubImage"
-				"xpos"			"6"
-				"ypos"			"6"
+				"xpos"			"3"
+				"ypos"			"1"
 				"zpos"			"1"
 				"wide"			"14"
 				"tall"			"14"
 				"visible"		"1"
 				"enabled"		"1"
 				"scaleImage"	"1"
+				"image"			"glyph_create"
 			}
 		}
 	}
@@ -1968,11 +1910,11 @@
 		"armedFgColor_override" "TanLight"
 		"depressedFgColor_override" "TanLight"
 		
-		"defaultBgColor_override" "0 0 0 0"
+		"defaultBgColor_override" "Transparent"
 		"armedBgColor_override" "TransparentPanelBG"
 		"depressedBgColor_override" "TransparentPanelBG"
 		
-		"image_drawcolor"	"117 107 94 255"
+		"image_drawcolor"	"TextColor"
 		"SubImage"
 		{
 			"ControlName"	"ImagePanel"
@@ -1989,23 +1931,6 @@
 		}
 	}
 
-	"VersionNumber"
-	{
-		"ControlName"	"CExLabel"
-		"fieldname"		"VersionNumber"
-		"font"			"Cerbetica14"
-		"labelText"		"v2018.1220"
-		"xpos"			"r55"
-		"ypos"			"r13"
-		"wide"			"80"
-		"tall"			"10"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"1"
-		"enabled"		"1"
-		"fgcolor_override"	"White"
-	}
-
 	"icon_generator"
 	{
 		"ControlName"	"CEmbeddedItemModelPanel"
diff --git a/resource/ui/MvMCreditSubPanel.res b/resource/ui/MvMCreditSubPanel.res
index 4a026af..bc00cc8 100644
--- a/resource/ui/MvMCreditSubPanel.res
+++ b/resource/ui/MvMCreditSubPanel.res
@@ -11,13 +11,13 @@
 		"ypos"				"0"
 		"wide"				"300"
 		"tall"				"15"
-		"fgcolor"			"tanlight"
+		"fgcolor"			"TanLight"
 	}
 	
 	"TableBackground"
 	{
 		"ControlName"		"EditablePanel"
-		"fieldName"			"TestBackground"
+		"fieldName"			"TableBackground"
 		"xpos"				"0"
 		"ypos"				"14"
 		"zpos"				"-1"
@@ -38,7 +38,7 @@
 		"ypos"				"15"
 		"wide"				"70"
 		"tall"				"12"
-		"fgcolor"			"tanlight"
+		"fgcolor"			"TanLight"
 	}
 	
 	"CreditCollectedCountLabel"
@@ -66,7 +66,7 @@
 		"ypos"				"27"
 		"wide"				"70"
 		"tall"				"12"
-		"fgcolor"			"tanlight"
+		"fgcolor"			"TanLight"
 	}
 	
 	"CreditMissedCountLabel"
@@ -86,7 +86,7 @@
 	"CreditBonusTextLabel"
 	{
 		"ControlName"		"CExLabel"
-		"fieldName"			"CreditCollectedTextLabel"
+		"fieldName"			"CreditBonusTextLabel"
 		"font"				"HudFontSmall"
 		"labelText"			"#TF_PVE_Bonus"
 		"textAlignment"		"north-west"
@@ -94,13 +94,13 @@
 		"ypos"				"39"
 		"wide"				"70"
 		"tall"				"12"
-		"fgcolor"			"tanlight"
+		"fgcolor"			"TanLight"
 	}
 	
 	"CreditBonusCountLabel"
 	{
 		"ControlName"		"CExLabel"
-		"fieldName"			"CreditCollectedCountLabel"
+		"fieldName"			"CreditBonusCountLabel"
 		"font"				"HudFontSmall"
 		"labelText"			"%creditbonus%"
 		"textAlignment"		"north-east"
@@ -114,7 +114,7 @@
 	"CreditRatingLabel"
 	{
 		"ControlName"		"CExLabel"
-		"fieldName"			"CreditCollectedTextLabel"
+		"fieldName"			"CreditRatingLabel"
 		"font"				"HudFontMediumBold"
 		"labelText"			"%rating%"
 		"textAlignment"		"center"
@@ -123,21 +123,6 @@
 		"zpos"				"1"
 		"wide"				"70"
 		"tall"				"20"
-		"fgcolor"			"tanlight"
-	}
-		
-	"CreditRatingLabelShadow"
-	{
-		"ControlName"		"CExLabel"
-		"fieldName"			"CreditRatingLabelShadow"
-		"font"				"HudFontMediumBold"
-		"labelText"			"%ratingshadow%"
-		"textAlignment"		"center"
-		"xpos"				"126"
-		"ypos"				"26"
-		"zpos"				"0"
-		"wide"				"70"
-		"tall"				"20"
-		"fgcolor"			"Black"
+		"fgcolor"			"TanLight"
 	}
 }
 \ No newline at end of file
diff --git a/resource/ui/MvMInWorldCurrency.res b/resource/ui/MvMInWorldCurrency.res
index db56cfc..72dc21c 100644
--- a/resource/ui/MvMInWorldCurrency.res
+++ b/resource/ui/MvMInWorldCurrency.res
@@ -1,50 +1,5 @@
 "Resource/UI/MvMInWorldCurrency.res"
 {
-	"BorderBG"
-	{
-		"ControlName"		"EditablePanel"
-		"fieldName"			"BorderBG"
-		"xpos"				"9999"
-		"ypos"				"9999"
-		"zpos"				"1"
-		"wide"				"46"
-		"tall"				"100"
-		"visible"			"1"
-		"enabled"			"1"
-		"bgcolor_override"	"TanLight"
-		"PaintBackgroundType"	"0"
-	}
-	
-	"BackgroundGood"
-	{
-		"ControlName"		"EditablePanel"
-		"fieldName"			"BackgroundGood"
-		"xpos"				"9999"
-		"ypos"				"9999"
-		"zpos"				"2"
-		"wide"				"44"
-		"tall"				"12"
-		"visible"			"1"
-		"enabled"			"1"
-		"bgcolor_override"	"221 182 72 250"
-		"PaintBackgroundType"	"0"
-	}
-	
-	"MoneyImagePanel"
-	{
-		"ControlName"		"ImagePanel"
-		"fieldName"			"MoneyImagePanel"
-		"xpos"				"9999"
-		"ypos"				"9999"
-		"zpos"				"4"
-		"wide"				"14"
-		"tall"				"14"
-		"image"				"../HUD/mvm_cash"
-		"visible"			"1"
-		"enabled"			"1"
-		"scaleImage"		"1"
-	}
-	
 	"CurrencyBG"
 	{
 		"ControlName"		"ImagePanel"
diff --git a/resource/ui/MvMScoreboard.res b/resource/ui/MvMScoreboard.res
index b6a4991..72a28a2 100644
--- a/resource/ui/MvMScoreboard.res
+++ b/resource/ui/MvMScoreboard.res
@@ -104,7 +104,7 @@
 	
 	"MvMPlayerList"
 	{
-		"ControlName"	"SectionedLsistPanel"
+		"ControlName"	"SectionedListPanel"
 		"fieldName"		"MvMPlayerList"
 		"xpos"			"c-260"
 		"ypos"			"248"
@@ -162,7 +162,7 @@
 			"xpos"			"9999"
 			"ypos"			"9999"
 			"wide"			"200"
-			"fgcolor"		"tanlight"
+			"fgcolor"		"TanLight"
 		}
 		
 		"PreviousWaveCreditInfoPanel"
@@ -224,7 +224,7 @@
 			"ypos"			"8"
 			"wide"			"220"
 			"tall"			"40"
-			"fgcolor"		"tanlight"
+			"fgcolor"		"TanLight"
 		}
 	}
 }
 \ No newline at end of file
diff --git a/resource/ui/ObjectiveStatusEscort.res b/resource/ui/ObjectiveStatusEscort.res
index b99627c..6dc0714 100644
--- a/resource/ui/ObjectiveStatusEscort.res
+++ b/resource/ui/ObjectiveStatusEscort.res
@@ -47,7 +47,6 @@
 		"if_single_with_hills"
 		{
 			"ypos"			"120"
-			"ypos_minmode"	"120"
 			"tall"			"12"
 			"image"			"../hud/cart_track_neutral_opaque"
 		}
@@ -479,7 +478,7 @@
 				"enabled"			"1"
 				"scaleImage"		"1"
 				"icon"				"cappoint_progressbar_teardrop"
-				"iconColor"			"255 255 255 255"
+				"iconColor"			"White"
 				
 				"if_multiple_trains"
 				{
@@ -528,7 +527,6 @@
 				"fieldName"			"Blocked"
 				"xpos"				"2"
 				"ypos"				"2"
-				"ypos_minmode"		"2"	
 				"zpos"				"1"
 				"wide"				"50"
 				"wide_minmode"		"31"
@@ -538,7 +536,7 @@
 				"enabled"			"1"
 				"scaleImage"		"1"
 				"icon"				"cappoint_progressbar_blocked"
-				"iconColor"			"255 255 255 255"
+				"iconColor"			"White"
 				
 				"if_multiple_trains"
 				{
diff --git a/resource/ui/ScoreBoard.res b/resource/ui/ScoreBoard.res
index 9d29822..6672a46 100644
--- a/resource/ui/ScoreBoard.res
+++ b/resource/ui/ScoreBoard.res
@@ -577,6 +577,25 @@
 			"visible"	"1"
 		}
 	}							
+
+	"MapName"
+	{
+		"ControlName"	"CExLabel"
+		"fieldName"		"mapname"
+		"font"			"Cerbetica14"
+		"labelText"		"%mapname%"
+		"textAlignment"	"west"
+		"xpos"			"3"
+		"ypos"			"25"	
+		"zpos"			"3"
+		"wide"			"480"
+		"tall"			"20"
+		"autoResize"	"0"
+		"pinCorner"		"0"
+		"visible"		"1"
+		"enabled"		"1"
+		"fgcolor"		"236 227 203 255"
+	}	
 	"HorizontalLine"
 	{
 		"ControlName"	"ImagePanel"
@@ -622,24 +641,6 @@
 			"visible"	"0"
 		}
 	}
-	"MapName"
-	{
-		"ControlName"	"CExLabel"
-		"fieldName"		"mapname"
-		"font"			"Cerbetica14"
-		"labelText"		"%mapname%"
-		"textAlignment"	"west"
-		"xpos"			"3"
-		"ypos"			"25"	
-		"zpos"			"3"
-		"wide"			"480"
-		"tall"			"20"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"1"
-		"enabled"		"1"
-		"fgcolor"		"236 227 203 255"
-	}	
 
 	"LocalPlayerDuelStatsPanel"
 	{
@@ -716,7 +717,7 @@
 				"tall"			"36"
 				"visible"		"1"
 				"PaintBackgroundType"	"2"
-				"bgcolor_override"	"117 107 94 255"
+				"bgcolor_override"	"TextColor"
 			}
 			"AvatarImage"
 			{
@@ -795,7 +796,7 @@
 				"tall"			"36"
 				"visible"		"1"
 				"PaintBackgroundType"	"2"
-				"bgcolor_override"	"117 107 94 255"
+				"bgcolor_override"	"TextColor"
 			}
 			"AvatarImage"
 			{
@@ -885,57 +886,6 @@
 			"pinCorner"		"0"
 			"visible"		"1"
 			"enabled"		"1"
-		}
-		"DeathsLabel"
-		{
-			"ControlName"	"CExLabel"
-			"fieldName"		"DeathsLabel"
-			"font"			"Cerbetica24"
-			"labelText"		"#TF_ScoreBoard_DeathsLabel"
-			"textAlignment"	"east"
-			"xpos"			"9999"
-			"ypos"			"9999"	
-			"zpos"			"3"
-			"wide"			"95"
-			"tall"			"24"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-		}
-		"AssistsLabel"
-		{
-			"ControlName"	"CExLabel"
-			"fieldName"		"AssistsLabel"
-			"font"			"Cerbetica14"
-			"labelText"		"#TF_ScoreBoard_AssistsLabel"
-			"textAlignment"	"west"
-			"xpos"			"4"
-			"ypos"			"2"
-			"zpos"			"3"
-			"wide"			"95"
-			"tall"			"20"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-		}
-		"DestructionLabel"
-		{
-			"ControlName"	"CExLabel"
-			"fieldName"		"DestructionLabel"
-			"font"			"Cerbetica14"
-			"labelText"		"#TF_ScoreBoard_DestructionLabel"
-			"textAlignment"	"west"
-			"xpos"			"4"
-			"ypos"			"16"	[$WIN32]
-			"zpos"			"3"
-			"wide"			"95"
-			"tall"			"20"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
 		}												
 		"Kills"
 		{
@@ -972,6 +922,24 @@
 			"enabled"		"1"
 			"fgcolor_override" "TanLight"
 		}
+
+		"DeathsLabel"
+		{
+			"ControlName"	"CExLabel"
+			"fieldName"		"DeathsLabel"
+			"font"			"Cerbetica24"
+			"labelText"		"#TF_ScoreBoard_DeathsLabel"
+			"textAlignment"	"east"
+			"xpos"			"9999"
+			"ypos"			"9999"	
+			"zpos"			"3"
+			"wide"			"95"
+			"tall"			"24"
+			"autoResize"	"0"
+			"pinCorner"		"0"
+			"visible"		"1"
+			"enabled"		"1"
+		}
 		"Deaths"
 		{
 			"ControlName"	"CExLabel"
@@ -1027,6 +995,24 @@
 			"enabled"		"0"
 			"fgcolor"		"185 177 153 255"
 		}							
+
+		"AssistsLabel"
+		{
+			"ControlName"	"CExLabel"
+			"fieldName"		"AssistsLabel"
+			"font"			"Cerbetica14"
+			"labelText"		"#TF_ScoreBoard_AssistsLabel"
+			"textAlignment"	"west"
+			"xpos"			"4"
+			"ypos"			"2"
+			"zpos"			"3"
+			"wide"			"95"
+			"tall"			"20"
+			"autoResize"	"0"
+			"pinCorner"		"0"
+			"visible"		"1"
+			"enabled"		"1"
+		}
 		"Assists"
 		{
 			"ControlName"	"CExLabel"
@@ -1062,6 +1048,24 @@
 			"enabled"		"1"
 			"fgcolor_override" "TanLight"
 		}		
+
+		"DestructionLabel"
+		{
+			"ControlName"	"CExLabel"
+			"fieldName"		"DestructionLabel"
+			"font"			"Cerbetica14"
+			"labelText"		"#TF_ScoreBoard_DestructionLabel"
+			"textAlignment"	"west"
+			"xpos"			"4"
+			"ypos"			"16"	[$WIN32]
+			"zpos"			"3"
+			"wide"			"95"
+			"tall"			"20"
+			"autoResize"	"0"
+			"pinCorner"		"0"
+			"visible"		"1"
+			"enabled"		"1"
+		}
 		"Destruction"
 		{
 			"ControlName"	"CExLabel"
@@ -1096,50 +1100,16 @@
 			"visible"		"1"
 			"enabled"		"1"
 			"fgcolor_override" "TanLight"		
-		}					
-		"CapturesLabel"
-		{
-			"ControlName"	"CExLabel"
-			"fieldName"		"CapturesLabel"
-			"font"			"Cerbetica14"
-			"labelText"		"#TF_ScoreBoard_CapturesLabel"
-			"textAlignment"	"west"
-			"xpos"			"4"	
-			"ypos"			"30"	
-			"zpos"			"3"
-			"wide"			"100"
-			"tall"			"20"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-		}						
-		"DefensesLabel"
-		{
-			"ControlName"	"CExLabel"
-			"fieldName"		"DefensesLabel"
-			"font"			"Cerbetica14"
-			"labelText"		"#TF_ScoreBoard_DefensesLabel"
-			"textAlignment"	"west"
-			"xpos"			"4"	
-			"ypos"			"44"	
-			"zpos"			"3"
-			"wide"			"100"
-			"tall"			"20"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-		}						
-		"DominationLabel"
+		}								
+		"RevengeLabel"
 		{
 			"ControlName"	"CExLabel"
-			"fieldName"		"DominationLabel"
+			"fieldName"		"RevengeLabel"
 			"font"			"Cerbetica14"
-			"labelText"		"#TF_ScoreBoard_DominationLabel"
+			"labelText"		"#TF_ScoreBoard_RevengeLabel"
 			"textAlignment"	"west"
 			"xpos"			"102"
-			"ypos"			"2"	
+			"ypos"			"16"	
 			"zpos"			"3"
 			"wide"			"100"
 			"tall"			"20"
@@ -1148,15 +1118,15 @@
 			"visible"		"1"
 			"enabled"		"1"
 		}						
-		"RevengeLabel"
+		"CapturesLabel"
 		{
 			"ControlName"	"CExLabel"
-			"fieldName"		"RevengeLabel"
+			"fieldName"		"CapturesLabel"
 			"font"			"Cerbetica14"
-			"labelText"		"#TF_ScoreBoard_RevengeLabel"
+			"labelText"		"#TF_ScoreBoard_CapturesLabel"
 			"textAlignment"	"west"
-			"xpos"			"102"
-			"ypos"			"16"	
+			"xpos"			"4"	
+			"ypos"			"30"	
 			"zpos"			"3"
 			"wide"			"100"
 			"tall"			"20"
@@ -1164,7 +1134,7 @@
 			"pinCorner"		"0"
 			"visible"		"1"
 			"enabled"		"1"
-		}						
+		}				
 		"Captures"
 		{
 			"ControlName"	"CExLabel"
@@ -1200,6 +1170,24 @@
 			"enabled"		"1"
 			"fgcolor_override" "TanLight"	
 		}			
+						
+		"DefensesLabel"
+		{
+			"ControlName"	"CExLabel"
+			"fieldName"		"DefensesLabel"
+			"font"			"Cerbetica14"
+			"labelText"		"#TF_ScoreBoard_DefensesLabel"
+			"textAlignment"	"west"
+			"xpos"			"4"	
+			"ypos"			"44"	
+			"zpos"			"3"
+			"wide"			"100"
+			"tall"			"20"
+			"autoResize"	"0"
+			"pinCorner"		"0"
+			"visible"		"1"
+			"enabled"		"1"
+		}
 		"Defenses"
 		{
 			"ControlName"	"CExLabel"
@@ -1234,7 +1222,24 @@
 			"visible"		"1"
 			"enabled"		"1"
 			"fgcolor_override" "TanLight"	
-		}			
+		}						
+		"DominationLabel"
+		{
+			"ControlName"	"CExLabel"
+			"fieldName"		"DominationLabel"
+			"font"			"Cerbetica14"
+			"labelText"		"#TF_ScoreBoard_DominationLabel"
+			"textAlignment"	"west"
+			"xpos"			"102"
+			"ypos"			"2"	
+			"zpos"			"3"
+			"wide"			"100"
+			"tall"			"20"
+			"autoResize"	"0"
+			"pinCorner"		"0"
+			"visible"		"1"
+			"enabled"		"1"
+		}		
 		"Domination"
 		{
 			"ControlName"	"CExLabel"
@@ -1322,57 +1327,6 @@
 			"visible"		"1"
 			"enabled"		"1"
 		}						
-		"InvulnLabel"
-		{
-			"ControlName"	"CExLabel"
-			"fieldName"		"InvulnLabel"
-			"font"			"Cerbetica14"
-			"labelText"		"#TF_ScoreBoard_InvulnLabel"
-			"textAlignment"	"west"
-			"xpos"			"102"	
-			"ypos"			"44"	
-			"zpos"			"3"
-			"wide"			"95"
-			"tall"			"20"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-		}						
-		"TeleportsLabel"
-		{
-			"ControlName"	"CExLabel"
-			"fieldName"		"TeleportsLabel"
-			"font"			"Cerbetica14"
-			"labelText"		"#TF_ScoreBoard_TeleportsLabel"
-			"textAlignment"	"west"
-			"xpos"			"342"	
-			"ypos"			"2"	
-			"zpos"			"3"
-			"wide"			"95"	
-			"tall"			"20"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-		}						
-		"HeadshotsLabel"
-		{
-			"ControlName"	"CExLabel"
-			"fieldName"		"HeadshotsLabel"
-			"font"			"Cerbetica14"
-			"labelText"		"#TF_ScoreBoard_HeadshotsLabel"
-			"textAlignment"	"west"
-			"xpos"			"342"	
-			"ypos"			"16"	
-			"zpos"			"3"
-			"wide"			"95"	
-			"tall"			"20"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-		}						
 		"Healing"
 		{
 			"ControlName"	"CExLabel"
@@ -1407,6 +1361,23 @@
 			"visible"		"1"
 			"enabled"		"1"
 			"fgcolor_override" "TanLight"							
+		}					
+		"InvulnLabel"
+		{
+			"ControlName"	"CExLabel"
+			"fieldName"		"InvulnLabel"
+			"font"			"Cerbetica14"
+			"labelText"		"#TF_ScoreBoard_InvulnLabel"
+			"textAlignment"	"west"
+			"xpos"			"102"	
+			"ypos"			"44"	
+			"zpos"			"3"
+			"wide"			"95"
+			"tall"			"20"
+			"autoResize"	"0"
+			"pinCorner"		"0"
+			"visible"		"1"
+			"enabled"		"1"
 		}			
 		"Invuln"
 		{
@@ -1443,6 +1414,24 @@
 			"enabled"		"1"
 			"fgcolor_override" "TanLight"							
 		}			
+					
+		"TeleportsLabel"
+		{
+			"ControlName"	"CExLabel"
+			"fieldName"		"TeleportsLabel"
+			"font"			"Cerbetica14"
+			"labelText"		"#TF_ScoreBoard_TeleportsLabel"
+			"textAlignment"	"west"
+			"xpos"			"342"	
+			"ypos"			"2"	
+			"zpos"			"3"
+			"wide"			"95"	
+			"tall"			"20"
+			"autoResize"	"0"
+			"pinCorner"		"0"
+			"visible"		"1"
+			"enabled"		"1"
+		}
 		"Teleports"
 		{
 			"ControlName"	"CExLabel"
@@ -1477,6 +1466,24 @@
 			"visible"		"1"
 			"enabled"		"1"
 		}				
+						
+		"HeadshotsLabel"
+		{
+			"ControlName"	"CExLabel"
+			"fieldName"		"HeadshotsLabel"
+			"font"			"Cerbetica14"
+			"labelText"		"#TF_ScoreBoard_HeadshotsLabel"
+			"textAlignment"	"west"
+			"xpos"			"342"	
+			"ypos"			"16"	
+			"zpos"			"3"
+			"wide"			"95"	
+			"tall"			"20"
+			"autoResize"	"0"
+			"pinCorner"		"0"
+			"visible"		"1"
+			"enabled"		"1"
+		}		
 		"Headshots"
 		{
 			"ControlName"	"CExLabel"
@@ -1718,166 +1725,6 @@
 		}	
 	}
 
-	"ButtonLegendBG"		[$X360]
-	{
-		"ControlName"	"ImagePanel"
-		"fieldName"		"ButtonLegendBG"
-		"xpos"			"10"
-		"xpos_hidef"	"30"
-		"ypos"			"373"
-		"zpos"			"0"
-		"wide"			"539"
-		"wide_hidef"	"559"
-		"tall"			"38"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"1"
-		"enabled"		"1"
-		"tabPosition"	"0"	
-		"fillcolor"		"0 0 0 153"
-		"PaintBackgroundType"	"0"
-	}
-	
-	"ButtonLegend"		[$X360]
-	{
-		"ControlName"	"EditablePanel"
-		"fieldName"		"ButtonLegend"
-		"xpos"			"10"
-		"xpos_hidef"	"35"
-		"ypos"			"373"
-		"zpos"			"1"
-		"wide"			"539"
-		"wide_hidef"	"595"
-		"tall"			"150"
-		"visible"		"1"
-	
-		"SelectHintIcon"
-		{
-			"ControlName"	"CExLabel"
-			"fieldName"		"SelectHintIcon"
-			"font"			"GameUIButtons"
-			"xpos"			"10"
-			"xpos_hidef"	"0"
-			"ypos"			"0"
-			"zpos"			"1"
-			"wide"			"300"
-			"tall"			"38"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"labelText"		"C"
-			"textAlignment"	"Left"
-			"dulltext"		"0"
-			"brighttext"	"0"
-		}
-		
-		"SelectHintLabel"
-		{
-			"ControlName"	"CExLabel"
-			"fieldName"		"SelectHintLabel"
-			"font"			"ScoreboardMedium"
-			"xpos"			"25"
-			"xpos_lodef"	"37"
-			"ypos"			"2"
-			"zpos"			"1"
-			"wide"			"300"
-			"tall"			"39"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"labelText"		"#GameUI_Select"
-			"textAlignment"	"Left"
-			"dulltext"		"0"
-			"brighttext"	"0"
-		}
-		
-		"GamerCardIcon"
-		{
-			"ControlName"	"CExLabel"
-			"fieldName"		"GamerCardIcon"
-			"font"			"GameUIButtons"
-			"xpos"			"150"
-			"xpos_hidef"	"145"
-			"ypos"			"0"
-			"zpos"			"1"
-			"wide"			"300"
-			"tall"			"38"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"labelText"		"A"
-			"textAlignment"	"Left"
-			"dulltext"		"0"
-			"brighttext"	"0"
-		}
-		
-		"GamerCardLabel"
-		{
-			"ControlName"	"CExLabel"
-			"fieldName"		"GamerCardLabel"
-			"font"			"ScoreboardMedium"
-			"xpos"			"170"
-			"xpos_lodef"	"177"
-			"ypos"			"2"
-			"zpos"			"1"
-			"wide"			"300"
-			"tall"			"39"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"labelText"		"#TF_ViewGamercard"
-			"textAlignment"	"Left"
-			"dulltext"		"0"
-			"brighttext"	"0"
-		}
-		
-		"ReputationIcon"
-		{
-			"ControlName"	"CExLabel"
-			"fieldName"		"ReputationIcon"
-			"font"			"GameUIButtons"
-			"xpos"			"350"
-			"xpos_hidef"	"378"
-			"ypos"			"0"
-			"zpos"			"1"
-			"wide"			"300"
-			"tall"			"38"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"labelText"		"X"
-			"textAlignment"	"Left"
-			"dulltext"		"0"
-			"brighttext"	"0"
-		}
-		
-		"ReputationLabel"
-		{
-			"ControlName"	"CExLabel"
-			"fieldName"		"ReputationLabel"
-			"font"			"ScoreboardMedium"
-			"xpos"			"403"
-			"xpos_lodef"	"377"
-			"ypos"			"2"
-			"zpos"			"1"
-			"wide"			"300"
-			"tall"			"39"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"labelText"		"#GameUI_PlayerReview"
-			"textAlignment"	"Left"
-			"dulltext"		"0"
-			"brighttext"	"0"
-		}
-	}
-	
 	"MvMScoreboard"
 	{
 		"ControlName"		"CTFHudMannVsMachineScoreboard"
diff --git a/resource/ui/SpectatorGUIHealth.res b/resource/ui/SpectatorGUIHealth.res
index 0a440cd..0a972f9 100644
--- a/resource/ui/SpectatorGUIHealth.res
+++ b/resource/ui/SpectatorGUIHealth.res
@@ -42,10 +42,10 @@
 		"scaleImage"	"1"
 	}
 	
-	"PlayerStatusHealthValue"
+	"PlayerStatusHealthValueSpec"
 	{
 		"ControlName"	"CExLabel"
-		"fieldName"		"PlayerStatusHealthValue"
+		"fieldName"		"PlayerStatusHealthValueSpec"
 		"xpos"			"2"
 		"ypos"			"19"
 		"zpos"			"5"
@@ -59,12 +59,12 @@
 		"textAlignment"	"center"
 	}
 	
-	"PlayerStatusHealthValueBackground"
+	"PlayerStatusHealthValueSpecShadow"
 	{
 		"ControlName"	"CExLabel"
-		"fieldName"		"PlayerStatusHealthValueBackground"
-		"xpos"			"3"
-		"ypos"			"20"
+		"fieldName"		"PlayerStatusHealthValueSpecShadow"
+		"xpos"			"-1"
+		"ypos"			"-1"
 		"zpos"			"5"
 		"wide"			"40"
 		"tall"			"10"
@@ -72,8 +72,12 @@
 		"enabled"		"1"
 		"labelText"		"%Health%"
 		"font" 			"CerbeticaBold16"
-		"fgcolor"		"0 0 0 255"
 		"textAlignment"	"center"
+		"fgcolor"		"TransparentBlack"
+		
+		"pin_to_sibling"		"PlayerStatusHealthValueSpec"
+		"pin_corner_to_sibling"	"PIN_TOPLEFT"
+		"pin_to_sibling_corner"	"PIN_TOPLEFT"
 	}
 	
 	"PlayerStatusPlayerLevel"
diff --git a/resource/ui/SpectatorTournamentGUIHealth.res b/resource/ui/SpectatorTournamentGUIHealth.res
index 3359cc4..c584867 100644
--- a/resource/ui/SpectatorTournamentGUIHealth.res
+++ b/resource/ui/SpectatorTournamentGUIHealth.res
@@ -29,21 +29,6 @@
 		"scaleImage"	"1"	
 	}
 	
-	"BuildingStatusHealthImageBG"
-	{
-		"ControlName"	"ImagePanel"
-		"fieldName"		"BuildingStatusHealthImageBG"
-		"xpos"			"9999"
-		"ypos"			"9999"
-		"zpos"			"2"
-		"wide"			"22"
-		"tall"			"22"
-		"visible"		"0"
-		"enabled"		"1"
-		"image"			"../hud/health_equip_bg"
-		"scaleImage"	"1"	
-	}
-	
 	"PlayerStatusHealthBonusImage"
 	{
 		"ControlName"	"ImagePanel"
diff --git a/resource/ui/TFAdvancedOptionsDialog.res b/resource/ui/TFAdvancedOptionsDialog.res
index 910cde1..2b56e78 100644
--- a/resource/ui/TFAdvancedOptionsDialog.res
+++ b/resource/ui/TFAdvancedOptionsDialog.res
@@ -13,12 +13,12 @@
 		"visible"			"1"
 		"enabled"			"1"
 		"tabPosition"		"0"
-		"bgcolor_override"	"25 25 25 255"
+		"bgcolor_override"	"DarkGrey"
 		"paintbackgroundtype"	"0"
 		"settitlebarvisible"	"0"
 		"paintborder"		"1"
 		"paintbackground"	"1"
-		"border"			"CyanBorder"
+		"border"			"CyanBorderThick"
 		"control_w"			"500"
 		"control_h"			"25"
 		"slider_w"			"500"
@@ -127,7 +127,7 @@
 		"visible"			"1"
 		"enabled"			"1"
 		"tabPosition"		"0"
-		"bgcolor_override"	"0 0 0 0"
+		"bgcolor_override"	"Transparent"
 	}
 	
 	"TooltipPanel"
@@ -140,10 +140,9 @@
 		"wide"				"240"
 		"tall"				"50"
 		"visible"			"0"
-		"paintborder"		"1"
 		"paintbackground"	"1"
 		"border"			"ButtonHover"
-		"bgcolor_override"	"25 25 25 255"
+		"bgcolor_override"	"DarkerGrey"
 		
 		"TipLabel"
 		{
@@ -161,7 +160,7 @@
 			"pinCorner"			"0"
 			"visible"			"1"
 			"enabled"			"1"
-			"fgcolor_override"	"235 226 202 255"
+			"fgcolor_override"	"TanLight"
 			"wrap"				"1"
 			//"centerwrap"		"1"
 		}
diff --git a/resource/ui/TargetID.res b/resource/ui/TargetID.res
index 0875ae3..c7b99f2 100644
--- a/resource/ui/TargetID.res
+++ b/resource/ui/TargetID.res
@@ -40,8 +40,6 @@
 		"zpos"			"-1"
 		"wide"			"640"
 		"tall"	 		"10"
-		"autoResize"		"0"
-		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
 		"image"			"../hud/color_panel_brown"
@@ -107,7 +105,7 @@
 	
 	"TargetNameLabel"
 	{	
-		"ControlName"		"CExLabel"
+		"ControlName"		"Label"
 		"fieldName"		"TargetNameLabel"
 		"font"			"Cerbetica14"
 		"xpos"			"45"
@@ -115,14 +113,31 @@
 		"zpos"			"7"
 		"wide"			"300"
 		"tall"			"15"
-		"autoResize"	"0"
-		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
 		"labelText"		"%targetname%"
 		"textAlignment"		"west"
-		"dulltext"		"0"
-		"brighttext"		"0"
+	}
+	
+	"TargetNameLabelShadow"
+	{
+		"ControlName"		"Label"
+		"fieldName"			"TargetNameLabelShadow"
+		"font"				"Cerbetica14"
+		"xpos"				"-1"
+		"ypos"				"-1"
+		"zpos"				"1"
+		"wide"				"300"
+		"tall"				"15"
+		"visible"			"1"
+		"enabled"			"1"
+		"labelText"			"%targetname%"
+		"textAlignment"		"west"
+		"fgcolor_override"	"TransparentBlack"
+		
+		"pin_to_sibling"		"TargetNameLabel"
+		"pin_corner_to_sibling" "PIN_TOPLEFT"
+		"pin_to_sibling_corner" "PIN_TOPLEFT"
 	}
 
 	"TargetDataLabel"
@@ -135,16 +150,30 @@
 		"zpos"			"6"
 		"wide"			"300"
 		"tall"			"15"
-		"autoResize"		"0"
-		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
 		"labelText"		"%targetdata%"
 		"textAlignment"		"west"
-		"dulltext"		"0"
-		"brighttext"		"0"
 	}
 	
+	"SpectatorGUIHealth"
+	{
+		"ControlName"		"EditablePanel"
+		"fieldName"			"SpectatorGUIHealth"
+		"xpos"				"-2"
+		"ypos"				"12"
+		"zpos"				"10"
+		"wide"				"38"
+		"tall"				"42"
+		"visible"			"1"
+		"enabled"			"1"	
+		"HealthBonusPosAdj"	"10"
+		"HealthDeathWarning""0.49"
+		"TFFont"			"HudFontSmall"
+		"HealthDeathWarningColor"	"HUDDeathWarning"
+		"TextColor"			"HudOffWhite"
+	}
+
 	"AmmoIcon"
 	{
 		"ControlName"	"ImagePanel"
@@ -160,10 +189,10 @@
 		"scaleImage"	"1"
 	}
 	
-	"KillStreakIconAnchor"
+	"KillStreakAnchor"
 	{
 		"ControlName"		"EditablePanel"
-		"fieldName"			"KillStreakIconAnchor"
+		"fieldName"			"KillStreakAnchor"
 		"xpos"				"2"
 		"ypos"				"18"
 		"wide"				"8"
@@ -185,29 +214,11 @@
 		"enabled"			"1"
 		"image"				"../hud/leaderboard_streak"
 		"scaleImage"		"1"
-		"pin_to_sibling"	"KillStreakIconAnchor"
+		"pin_to_sibling"	"KillStreakAnchor"
 		"pin_corner_to_sibling" "1"
 		"pin_to_sibling_corner" "1"
 	}
 	
-	"SpectatorGUIHealth"
-	{
-		"ControlName"		"EditablePanel"
-		"fieldName"			"SpectatorGUIHealth"
-		"xpos"				"-2"
-		"ypos"				"12"
-		"zpos"				"10"
-		"wide"				"38"
-		"tall"				"42"
-		"visible"			"1"
-		"enabled"			"1"	
-		"HealthBonusPosAdj"	"10"
-		"HealthDeathWarning""0.49"
-		"TFFont"			"HudFontSmall"
-		"HealthDeathWarningColor"	"HUDDeathWarning"
-		"TextColor"			"HudOffWhite"
-	}
-	
 	"MoveableSubPanel"
 	{
 		"ControlName"		"EditablePanel"
@@ -291,7 +302,7 @@
 		{	
 			"ControlName"	"Label"
 			"fieldName"		"MoveableKeyLabel"
-			"font_minmode"	"Cerbetica12"
+			"font"			"Cerbetica12"
 			"xpos"			"0"
 			"ypos"			"29"
 			"zpos"			"6"
diff --git a/resource/ui/Teammenu.res b/resource/ui/Teammenu.res
index ab6ffd5..ea7350c 100644
--- a/resource/ui/Teammenu.res
+++ b/resource/ui/Teammenu.res
@@ -27,7 +27,7 @@
 		"visible"		"1"
 		"enabled"		"1"
 		"scaleImage"	"1"
-		"fillcolor"		"0 0 0 0"
+		"fillcolor"		"Transparent"
 	}
 	"SidePanelBG"
 	{
@@ -43,32 +43,6 @@
 		"scaleImage"	"1"
 		"fillcolor"		"0 0 0 60"
 	}
-	"BlueTeamBG"
-	{
-		"ControlName"	"ImagePanel"
-		"fieldName"		"BlueTeamBG"
-		"xpos"			"0"
-		"ypos"			"c-35"
-		"zpos"			"0"
-		"wide"			"255"
-		"tall"			"30"
-		"visible"		"1"
-		"enabled"		"1"
-		"fillcolor"		"70 130 180 125"
-	}
-	"RedTeamBG"
-	{
-		"ControlName"	"ImagePanel"
-		"fieldName"		"RedTeamBG"
-		"xpos"			"0"
-		"ypos"			"c5"
-		"zpos"			"0"
-		"wide"			"255"
-		"tall"			"30"
-		"visible"		"1"
-		"enabled"		"1"
-		"fillcolor"		"205 50 50 153"
-	}
 	"AutojoinBackground"
 	{
 		"ControlName"	"ImagePanel"
@@ -146,6 +120,27 @@
 		"fgcolor"		"TanLight"
 	}
 	
+	"TeamMenuSelect"
+	{
+		"ControlName"	"CExLabel"
+		"fieldName"		"TeamMenuSelect"
+		"xpos"			"0"
+		"ypos"			"c165"
+		"zpos"			"6"
+		"wide"			"255"
+		"tall"			"30"
+		"autoResize"	"0"
+		"pinCorner"		"0"
+		"visible"		"1"
+		"visible_lodef"	"0"
+		"enabled"		"1"
+		"labelText"		"#TF_SelectATeam"
+		"textAlignment"	"center"
+		"dulltext"		"0"
+		"brighttext"	"0"
+		"font"			"CerbeticaBold32"
+		"fgcolor"		"HudOffWhite"
+	}
 	"teambutton0"
 	{
 		"ControlName"	"CTFTeamButton"
@@ -173,6 +168,19 @@
 		"selectedFgColor_override" 	"TanLight"
 	}
 	
+	"BlueTeamBG"
+	{
+		"ControlName"	"ImagePanel"
+		"fieldName"		"BlueTeamBG"
+		"xpos"			"0"
+		"ypos"			"c-35"
+		"zpos"			"0"
+		"wide"			"255"
+		"tall"			"30"
+		"visible"		"1"
+		"enabled"		"1"
+		"fillcolor"		"70 130 180 125"
+	}
 	"teambutton1"
 	{
 		"ControlName"	"CTFTeamButton"
@@ -200,6 +208,19 @@
 		"selectedFgColor_override" 	"TanLight"
 	}
 	
+	"RedTeamBG"
+	{
+		"ControlName"	"ImagePanel"
+		"fieldName"		"RedTeamBG"
+		"xpos"			"0"
+		"ypos"			"c5"
+		"zpos"			"0"
+		"wide"			"255"
+		"tall"			"30"
+		"visible"		"1"
+		"enabled"		"1"
+		"fillcolor"		"205 50 50 153"
+	}
 	"teambutton2"
 	{
 		"ControlName"	"CTFTeamButton"
@@ -254,55 +275,6 @@
 		"selectedFgColor_override" 	"TanLight"
 	}
 	
-	"CancelButton" [$WIN32] 
-	{
-		"ControlName"	"CExButton"
-		"fieldName"		"CancelButton"
-		"xpos"			"0"
-		"ypos"			"r40"
-		"zpos"			"6"
-		"wide"			"255"
-		"tall"			"30"
-		"autoResize"	"0"
-		"pinCorner"		"2"
-		"visible"		"0"
-		"enabled"		"1"
-		"tabPosition"	"0"
-		"labelText"		"#TF_Cancel"
-		"textAlignment"	"center"
-		"dulltext"		"0"
-		"brighttext"	"0"
-		"paintbackground""0"
-		"command"		"cancelmenu"
-		"font"			"CerbeticaBold16"
-		"defaultFgColor_override" 	"255 255 255 128"
-		"armedFgColor_override"		"TanLight"
-		"depressedFgColor_override" "255 255 255 128"
-		"selectedFgColor_override" 	"TanLight"
-	}
-	
-	"TeamMenuSelect"
-	{
-		"ControlName"	"CExLabel"
-		"fieldName"		"TeamMenuSelect"
-		"xpos"			"0"
-		"ypos"			"c165"
-		"zpos"			"6"
-		"wide"			"255"
-		"tall"			"30"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"1"
-		"visible_lodef"	"0"
-		"enabled"		"1"
-		"labelText"		"#TF_SelectATeam"
-		"textAlignment"	"center"
-		"dulltext"		"0"
-		"brighttext"	"0"
-		"font"			"CerbeticaBold32"
-		"fgcolor"		"HudOffWhite"
-	}
-	
 	"TeamMenuAuto"
 	{
 		"ControlName"	"CExLabel"
@@ -323,7 +295,7 @@
 		"brighttext"	"0"
 		"wrap"			"0"
 		"font"			"MenuSmallFont"
-		"fgcolor"		"black"
+		"fgcolor"		"Black"
 	}
 	
 	"TeamMenuSpectate"
@@ -345,7 +317,7 @@
 		"brighttext"	"0"
 		"wrap"			"0"
 		"font"			"CerbeticaBold16"
-		"fgcolor"		"white"
+		"fgcolor"		"White"
 	}
 	
 	"MenuBG"
@@ -364,27 +336,6 @@
 		"fillcolor"		"255 255 255 7"
 	}
 	
-	"ShadedBar"
-	{
-		"ControlName"	"ImagePanel"
-		"fieldName"		"ShadedBar"
-		"xpos"			"9999"
-		"ypos"			"9999"
-		"zpos"			"5"
-		"wide"			"0"
-		"tall"			"0"
-		"tall_lodef"	"74"
-		"tall_hidef"	"65"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"0"
-		"enabled"		"0"
-		"tabPosition"	"0"	
-		"image"			"loadout_bottom_gradient"
-		"tileImage"		"1"
-		"PaintBackgroundType"	"0"
-	}
-	
 	"BlueCount"
 	{
 		"ControlName"	"CExLabel"
@@ -405,26 +356,6 @@
 		"font"			"CerbeticaBold20"
 		"fgcolor"		"255 255 255 255"
 	}
-	"BlueCountPlayers"
-	{
-		"ControlName"	"CExLabel"
-		"fieldName"		"BlueCountPlayers"
-		"xpos"			"9999"
-		"ypos"			"9999"
-		"zpos"			"1"
-		"wide"			"90"
-		"tall"			"30"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"1"
-		"enabled"		"1"
-		"labelText"		"players"
-		"textAlignment"	"east"
-		"dulltext"		"0"
-		"brighttext"	"1"
-		"font"			"Cerbetica14"
-		"fgcolor"		"255 255 255 175"
-	}
 	
 	"RedCount"
 	{
@@ -446,90 +377,6 @@
 		"font"			"CerbeticaBold20"
 		"fgcolor"		"255 255 255 255"
 	}
-	"RedCountPlayers"
-	{
-		"ControlName"	"CExLabel"
-		"fieldName"		"RedCountPlayers"
-		"xpos"			"9999"
-		"ypos"			"9999"
-		"zpos"			"1"
-		"wide"			"90"
-		"tall"			"30"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"1"
-		"enabled"		"1"
-		"labelText"		"players"
-		"textAlignment"	"east"
-		"dulltext"		"0"
-		"brighttext"	"1"
-		"font"			"Cerbetica14"
-		"fgcolor"		"255 255 255 175"
-	}
-	
-	"bluedoor"
-	{
-		"ControlName"	"CModelPanel"
-		"fieldName"		"bluedoor"
-		"xpos"			"9999"
-		"ypos"			"9999"
-		"zpos"			"2"		
-		"wide"			"f0"
-		"tall"			"480"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"1"
-		"enabled"		"1"
-		"fov"			"20"
-	}
-	
-	"reddoor"
-	{
-		"ControlName"	"CModelPanel"
-		"fieldName"		"reddoor"
-		"xpos"			"9999"
-		"ypos"			"9999"
-		"zpos"			"2"		
-		"wide"			"f0"
-		"tall"			"480"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"1"
-		"enabled"		"1"
-		"fov"			"20"
-	}
-	
-	"autodoor"
-	{
-		"ControlName"	"CModelPanel"
-		"fieldName"		"autodoor"
-		"xpos"			"9999"
-		"ypos"			"9999"
-		"zpos"			"2"		
-		"wide"			"f0"
-		"tall"			"480"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"1"
-		"enabled"		"1"
-		"fov"			"20"
-	}
-	
-	"spectate"
-	{
-		"ControlName"	"CModelPanel"
-		"fieldName"		"spectate"
-		"xpos"			"9999"
-		"ypos"			"9999"
-		"zpos"			"0"		
-		"wide"			"f0"
-		"tall"			"480"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"1"
-		"enabled"		"1"
-		"fov"			"20"
-	}
 	
 	"HighlanderLabel" [$WIN32] 
 	{
@@ -627,18 +474,30 @@
 		"pin_to_sibling_corner"	"PIN_TOPLEFT"
 	}
 	
-	"TeamsFullArrow" [$WIN32]
+	"CancelButton" [$WIN32] 
 	{
-		"ControlName"	"CTFImagePanel"
-		"fieldName"		"TeamsFullArrow"
-		"xpos"			"9999"
-		"ypos"			"9999"
+		"ControlName"	"CExButton"
+		"fieldName"		"CancelButton"
+		"xpos"			"0"
+		"ypos"			"r40"
 		"zpos"			"6"
-		"wide"			"0"
-		"tall"			"0"
+		"wide"			"255"
+		"tall"			"30"
+		"autoResize"	"0"
+		"pinCorner"		"2"
 		"visible"		"0"
-		"enabled"		"0"
-		"image"			"../HUD/arrow_big_down"
-		"scaleImage"	"1"	
+		"enabled"		"1"
+		"tabPosition"	"0"
+		"labelText"		"#TF_Cancel"
+		"textAlignment"	"center"
+		"dulltext"		"0"
+		"brighttext"	"0"
+		"paintbackground""0"
+		"command"		"cancelmenu"
+		"font"			"CerbeticaBold16"
+		"defaultFgColor_override" 	"255 255 255 128"
+		"armedFgColor_override"		"TanLight"
+		"depressedFgColor_override" "255 255 255 128"
+		"selectedFgColor_override" 	"TanLight"
 	}
 }
 \ No newline at end of file
diff --git a/resource/ui/TextWindow.res b/resource/ui/TextWindow.res
index 64659ca..9bf7f9a 100644
--- a/resource/ui/TextWindow.res
+++ b/resource/ui/TextWindow.res
@@ -29,7 +29,7 @@
 		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
-		"fillcolor"		"0 0 0 200"
+		"fillcolor"		"TransparentBlack"
 	}
 	
 	"TFMessageTitle"
@@ -57,8 +57,7 @@
 	{
 		"ControlName"	"TextEntry"
 		"fieldName"		"TextMessage"
-		"visible"		"0"
-		"enabled"		"0"
+		"xpos"			"9999"
 	}
 	
 	"TFTextMessage"
@@ -144,8 +143,6 @@
 		"zpos"			"5"
 		"wide"			"f0"
 		"tall"			"50"
-		"autoResize"	"0"
-		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
 		"tabPosition"	"0"	
@@ -158,7 +155,6 @@
 	{
 		"ControlName"	"Label"
 		"fieldName"		"MessageTitle"
-		"visible"		"0"
-		"enabled"		"0"
+		"xpos"			"9999"
 	}
 }
 \ No newline at end of file
diff --git a/resource/ui/TextWindowCustomServer.res b/resource/ui/TextWindowCustomServer.res
index f1f436a..cf2dc3a 100644
--- a/resource/ui/TextWindowCustomServer.res
+++ b/resource/ui/TextWindowCustomServer.res
@@ -1,4 +1,4 @@
-"Resource/UI/TextWindow.res"
+"Resource/UI/TextWindowCustomServer.res"
 {
 	"info"
 	{
@@ -132,8 +132,8 @@
 	{
 		"ControlName"	"CModelPanel"
 		"fieldName"		"MenuBG"
-		"xpos"			"9999"
-		"ypos"			"9999"
+		"xpos"			"0"
+		"ypos"			"0"
 		"zpos"			"0"		
 		"wide"			"f0"
 		"tall"			"480"
diff --git a/resource/ui/WaveStatusPanel.res b/resource/ui/WaveStatusPanel.res
index f210786..dada9fc 100644
--- a/resource/ui/WaveStatusPanel.res
+++ b/resource/ui/WaveStatusPanel.res
@@ -41,6 +41,29 @@
 		"labelText"			"%wave_count%"
 	}
 	
+	"WaveCountLabelShadow"
+	{
+		"ControlName"		"CExLabel"
+		"fieldName"			"WaveCountLabelShadow"
+		"font"				"CerbeticaBold16"
+		"fgcolor"			"TransparentBlack"
+		"xpos"				"-1"
+		"ypos"				"-1"
+		"zpos"				"5"
+		"wide"				"200"
+		"tall"				"15"
+		"wide_minmode"		"180"
+		"visible"			"1"
+		"enabled"			"1"
+		"textAlignment"		"center"
+		"textAlignment_minmode"	"west"
+		"labelText"			"%wave_count%"
+		
+		"pin_to_sibling"		"WaveCountLabel"
+		"pin_corner_to_sibling"	"PIN_TOPLEFT"
+		"pin_to_sibling_corner"	"PIN_TOPLEFT"
+	}
+	
 	"SeparatorBar"
 	{
 		"ControlName"		"Panel"
@@ -105,6 +128,23 @@
 		"draw_corner_height" 	"0"	
 	}
 	
+	"NewProgressBarBG"
+	{
+		"ControlName"		"ImagePanel"
+		"fieldName"			"NewProgressBarBG"
+		"xpos"				"211"
+		"ypos"				"22"
+		"zpos"				"2"
+		"wide"				"178"
+		"tall"				"7"
+		"ypos_minmode"		"10"
+		"autoResize"		"0"
+		"pinCorner"			"0"
+		"visible"			"1"
+		"enabled"			"1"
+		"fillcolor"			"ColorCyan"
+	}
+	
 	"ProgressBarBG"
 	{
 		"ControlName"		"ScalableImagePanel"
@@ -114,9 +154,7 @@
 		"zpos"				"3"
 		"wide"				"180"
 		"tall"				"12"
-		"xpos_minmode"		"210"
 		"ypos_minmode"		"7"
-		"wide_minmode"		"180"
 		"visible"			"0"
 		"enabled"			"0"
 		"image"				"../HUD/tournament_panel_tan"
@@ -127,23 +165,4 @@
 		"draw_corner_width"		"0"				// screen size of the corners ( and sides ), proportional
 		"draw_corner_height" 	"0"	
 	}
-	
-	"ProgressBarBG2"
-	{
-		"ControlName"		"ImagePanel"
-		"fieldName"			"ProgressBarBG2"
-		"xpos"				"211"
-		"ypos"				"22"
-		"zpos"				"2"
-		"wide"				"178"
-		"tall"				"7"
-		"xpos_minmode"		"211"
-		"ypos_minmode"		"10"
-		"wide_minmode"		"178"
-		"autoResize"		"0"
-		"pinCorner"			"0"
-		"visible"			"1"
-		"enabled"			"1"
-		"fillcolor"			"Base Color"
-	}
 }
 \ No newline at end of file
diff --git a/resource/ui/charinfoarmorysubpanel.res b/resource/ui/charinfoarmorysubpanel.res
index c5924f9..7f198ef 100644
--- a/resource/ui/charinfoarmorysubpanel.res
+++ b/resource/ui/charinfoarmorysubpanel.res
@@ -13,10 +13,10 @@
 		"tabPosition"		"0"
 		"settitlebarvisible"	"0"
 		"PaintBackgroundType"	"0"
-		"bgcolor_override"				"25 25 25 255"
-		"infocus_bgcolor_override" 		"25 25 25 255"
-		"outoffocus_bgcolor_override"	"25 25 25 255"
-		"thumbnail_bgcolor"				"51 47 46 255"
+		"bgcolor_override"				"DarkGrey"
+		"infocus_bgcolor_override" 		"DarkGrey"
+		"outoffocus_bgcolor_override"	"DarkGrey"
+		"thumbnail_bgcolor"				"Grey"
 		"thumbnail_bgcolor_mouseover"	"156 146 128 255"
 		"thumbnail_bgcolor_selected"	"176 166 148 255"
 		"thumbnails_rows"		"4"
@@ -34,7 +34,7 @@
 			"tall"			"49"
 			"visible"		"0"
 			"bgcolor_override"		"0 0 0 255"
-			"noitem_textcolor"		"117 107 94 255"
+			"noitem_textcolor"		"TextColor"
 			"PaintBackgroundType"	"2"
 			"paintborder"	"0"
 			"model_xpos"	"7"
@@ -114,7 +114,7 @@
 	{
 		"ControlName"		"ComboBox"
 		"fieldName"			"FilterComboBox"
-		"Font"				"HudFontSmallestBold"
+		"font"				"HudFontSmallestBold"
 		"xpos"				"c-240"
 		"ypos"				"32"
 		"zpos"				"1"
@@ -131,13 +131,13 @@
 		"NumericInputOnly"	"0"
 		"unicode"			"0"
 		
-		"fgcolor_override"					"235 226 202 255"
-		"bgcolor_override"					"51 47 46 255"
-		"disabledFgColor_override" 			"235 226 202 255"
-		"disabledBgColor_override" 			"51 47 46 255"
-		"selectionColor_override" 			"51 47 46 255"
-		"selectionTextColor_override" 		"235 226 202 255"
-		"defaultSelectionBG2Color_override" "51 47 46 255"
+		"fgcolor_override"					"TanLight"
+		"bgcolor_override"					"Grey"
+		"disabledFgColor_override"			"TanLight"
+		"disabledBgColor_override"			"Grey"
+		"selectionColor_override"			"Grey"
+		"selectionTextColor_override" 		"TanLight"
+		"defaultSelectionBG2Color_override"	"Grey"
 	}
 	
 	"DataPanel"
@@ -171,7 +171,7 @@
 			"enabled"		"1"
 			"fgcolor"		"TanLight"
 			"wrap"			"1"
-			"highlight_color"	"Base Color"
+			"highlight_color"	"ColorCyan"
 			"itemset_color"		"216 244 9 255"
 			"link_color" 		"200 128 255 255"
 			"image_up_arrow"				"scroll_up_off"
@@ -247,7 +247,7 @@
 		"tall"			"180"
 		"visible"		"0"
 		"bgcolor_override"		"0 0 0 255"
-		"noitem_textcolor"		"117 107 94 255"
+		"noitem_textcolor"		"TextColor"
 		"PaintBackgroundType"	"2"
 		"paintborder"	"1"
 		
@@ -296,14 +296,8 @@
 		"Command"		"prevpage"
 		"sound_depressed"	"UI/buttonclick.wav"
 		"sound_released"	"UI/buttonclickrelease.wav"
-		"defaultBgColor_override"	"25 25 25 255"
-		"armedBgColor_override"		"35 35 35 255"
-		"depressedBgColor_override"	"35 35 35 255"
-		"defaultFgColor_override"	"TanLight"
-		"armedFgColor_override" 	"TanLight"
-		"depressedFgColor_override" "TanLight"
-		"border_default"			"NoBorder"
-		"border_armed"				"NoBorder"
+		"border_default"	"CyanBorderThick"
+		"border_armed"		"CyanBorderThick"
 	}
 	
 	"CurPageLabel"
@@ -322,7 +316,7 @@
 		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
-		"fgcolor_override" "Base Color"
+		"fgcolor_override" "ColorCyan"
 	}
 	
 	"NextPageButton"
@@ -347,14 +341,8 @@
 		"Command"		"nextpage"
 		"sound_depressed"	"UI/buttonclick.wav"
 		"sound_released"	"UI/buttonclickrelease.wav"
-		"defaultBgColor_override"	"25 25 25 255"
-		"armedBgColor_override"		"35 35 35 255"
-		"depressedBgColor_override"	"35 35 35 255"
-		"defaultFgColor_override"	"TanLight"
-		"armedFgColor_override" 	"TanLight"
-		"depressedFgColor_override" "TanLight"
-		"border_default"			"NoBorder"
-		"border_armed"				"NoBorder"
+		"border_default"	"CyanBorderThick"
+		"border_armed"		"CyanBorderThick"
 	}
 	
 	"WikiButton"
@@ -380,12 +368,6 @@
 		"Command"		"wiki"
 		"sound_depressed"	"UI/buttonclick.wav"
 		"sound_released"	"UI/buttonclickrelease.wav"
-		"defaultBgColor_override"	"25 25 25 255"
-		"armedBgColor_override"		"35 35 35 255"
-		"depressedBgColor_override"	"35 35 35 255"
-		"defaultFgColor_override"	"TanLight"
-		"armedFgColor_override" 	"TanLight"
-		"depressedFgColor_override" "TanLight"
 		"border_default"			"CyanBorderThick"
 		"border_armed"				"CyanBorderThick"
 	}
@@ -413,12 +395,6 @@
 		"Command"		"viewset"
 		"sound_depressed"	"UI/buttonclick.wav"
 		"sound_released"	"UI/buttonclickrelease.wav"
-		"defaultBgColor_override"	"25 25 25 255"
-		"armedBgColor_override"		"35 35 35 255"
-		"depressedBgColor_override"	"35 35 35 255"
-		"defaultFgColor_override"	"TanLight"
-		"armedFgColor_override" 	"TanLight"
-		"depressedFgColor_override" "TanLight"
 		"border_default"			"CyanBorderThick"
 		"border_armed"				"CyanBorderThick"
 	}
@@ -438,19 +414,13 @@
 		"enabled"		"1"
 		"tabPosition"	"0"
 		"labelText"		"#ArmoryButton_Store"
-		"font"			"HudFontSmallBold"
+		"font"			"HudFontSmallestBold"
 		"textAlignment"	"center"
 		"dulltext"		"0"
 		"brighttext"	"0"
 		"Command"		"openstore"
 		"sound_depressed"	"UI/buttonclick.wav"
 		"sound_released"	"UI/buttonclickrelease.wav"
-		"defaultBgColor_override"	"25 25 25 255"
-		"armedBgColor_override"		"35 35 35 255"
-		"depressedBgColor_override"	"35 35 35 255"
-		"defaultFgColor_override"	"TanLight"
-		"armedFgColor_override" 	"TanLight"
-		"depressedFgColor_override" "TanLight"
 		"border_default"			"CyanBorderThick"
 		"border_armed"				"CyanBorderThick"
 	}
@@ -467,7 +437,7 @@
 		"autoResize"	"0"
 		"pinCorner"		"0"
 		"visible"		"0"
-		"enabled"		"1"
+		"enabled"		"0"
 		"tabPosition"	"0"
 		"labelText"		"RELOADSCHEME"
 		"font"			"HudFontSmallestBold"
@@ -478,12 +448,6 @@
 		"Command"		"reloadscheme"
 		"sound_depressed"	"UI/buttonclick.wav"
 		"sound_released"	"UI/buttonclickrelease.wav"
-		"defaultBgColor_override"	"25 25 25 255"
-		"armedBgColor_override"		"35 35 35 255"
-		"depressedBgColor_override"	"35 35 35 255"
-		"defaultFgColor_override"	"TanLight"
-		"armedFgColor_override" 	"TanLight"
-		"depressedFgColor_override" "TanLight"
 		"border_default"			"CyanBorderThick"
 		"border_armed"				"CyanBorderThick"
 	}
diff --git a/resource/ui/charinfopanel.res b/resource/ui/charinfopanel.res
index 1397368..0c60dbc 100644
--- a/resource/ui/charinfopanel.res
+++ b/resource/ui/charinfopanel.res
@@ -23,9 +23,9 @@
 		"title_font"	"HudFontMediumBold"
 		"titletextinsetX"	"40"
 		"titletextinsetY"	"0"
-		"titlebarfgcolor_override"				"200 187 161 255"
-		"titlebardisabledfgcolor_override"		"200 187 161 255"
-		"titlebarbgcolor_override"				"46 43 42 255"
+		"titlebarfgcolor_override"			"HudOffWhite"
+		"titlebardisabledfgcolor_override"	"HudOffWhite"
+		"titlebarbgcolor_override"			"DarkGrey"
 		
 		"clientinsetx_override"			"0"
 		"sheetinset_bottom"				"40"
@@ -100,10 +100,8 @@
 		"tall"			"2"
 		"visible"		"1"
 		"enabled"		"1"
-		"autoResize"	"0"
 		"PaintBackgroundType"	"2"
-		"border"				"NoBorder"
-		"bgcolor_override"		"Base Color"
+		"bgcolor_override"		"ColorCyan"
 	}
 	
 	"Sheet"
@@ -128,10 +126,8 @@
 			"tall"			"2"
 			"visible"		"1"
 			"enabled"		"1"
-			"autoResize"	"0"
 			"PaintBackgroundType"	"2"
-			"border"				"NoBorder"
-			"bgcolor_override"		"Base Color"
+			"bgcolor_override"		"ColorCyan"
 		}				
 		
 		"tabskv"
@@ -174,13 +170,6 @@
 		"Command"		"back"
 		"sound_depressed"	"UI/buttonclick.wav"
 		"sound_released"	"UI/buttonclickrelease.wav"
-		"paintbackground"	"1"
-		"defaultBgColor_override"	"15 15 15 255"
-		"armedBgColor_override"		"25 25 25 255"
-		"depressedBgColor_override"	"25 25 25 255"
-		"defaultFgColor_override"	"TanLight"
-		"armedFgColor_override" 	"TanLight"
-		"depressedFgColor_override" "TanLight"
 		"border_default"			"ButtonHover"
 		"border_armed"				"ButtonHover"
 	}
diff --git a/resource/ui/classloadoutpanel.res b/resource/ui/classloadoutpanel.res
index ad006ac..9d9d08e 100644
--- a/resource/ui/classloadoutpanel.res
+++ b/resource/ui/classloadoutpanel.res
@@ -14,9 +14,9 @@
 		"tabPosition"	"0"
 		"settitlebarvisible"	"0"
 		"PaintBackgroundType"	"0"
-		"bgcolor_override"	"25 25 25 255"
-		"infocus_bgcolor_override" "25 25 25 255"
-		"outoffocus_bgcolor_override" "25 25 25 255"
+		"bgcolor_override"				"DarkGrey"
+		"infocus_bgcolor_override" 		"DarkGrey"
+		"outoffocus_bgcolor_override" 	"DarkGrey"
 		
 		"item_xpos_offcenter_a"	"-310"
 		"item_xpos_offcenter_b"	"165"
@@ -41,8 +41,8 @@
 			"wide"			"140"
 			"tall"			"70"
 			"visible"		"0"
-			"bgcolor_override"		"0 0 0 0"
-			"noitem_textcolor"		"117 107 94 255"
+			"bgcolor_override"		"Transparent"
+			"noitem_textcolor"		"TextColor"
 			"PaintBackgroundType"	"2"
 			"paintborder"	"1"
 			
@@ -213,8 +213,8 @@
 		"wide"			"300"
 		"tall"			"300"
 		"visible"		"0"
-		"bgcolor_override"		"0 0 0 0"
-		"noitem_textcolor"		"117 107 94 255"
+			"bgcolor_override"		"Transparent"
+			"noitem_textcolor"		"TextColor"
 		"PaintBackgroundType"	"2"
 		"paintborder"		"1"
 		"text_ypos"			"0"
@@ -237,7 +237,7 @@
 			"enabled"		"1"
 			"labelText"		"%attriblist%"
 			"textAlignment"	"center"
-			"fgcolor"		"117 107 94 255"
+			"fgcolor"		"TextColor"
 			"centerwrap"	"1"
 		}
    	}
@@ -331,16 +331,13 @@
 		
 		"fgcolor"					"TanLight"
 		"defaultFgColor_override" "250 68 17 255"
-		"armedFgColor_override" "Base Color"
+		"armedFgColor_override" "ColorCyan"
 		"depressedFgColor_override" "250 68 17 255"
 		
 		"sound_depressed"	"UI/buttonclick.wav"
 		"sound_released"	"UI/buttonclickrelease.wav"
 		"keyboardinputenabled"	"0"
-		"paintbackground"	"1"
-		"border_default"			"NoBorder"
-		"border_armed"				"NoBorder"
-		"border_depressed"			"NoBorder"
+		"paintbackground"		"1"
 	}
 	
 	"BlueButton"
@@ -365,7 +362,7 @@
 		
 		"fgcolor"					"TanLight"
 		"defaultFgColor_override" "0 98 255 255"
-		"armedFgColor_override" "Base Color"
+		"armedFgColor_override" "ColorCyan"
 		"depressedFgColor_override" "0 98 255 255"
 		
 		"sound_depressed"	"UI/buttonclick.wav"
@@ -373,9 +370,6 @@
 		
 		"keyboardinputenabled"	"0"
 		"paintbackground"		"1"
-		"border_default"		"NoBorder"
-		"border_armed"			"NoBorder"
-		"border_depressed"		"NoBorder"
 	}
 	
 	"CharacterLoadoutButton"
@@ -456,7 +450,7 @@
 			"visible"		"1"
 			"enabled"		"1"
 			"scaleImage"	"1"
-			"image"			"../hud/ico_reel"
+			"image"			"../vgui/replay/thumbnails/reel"
 		}
 	}
 
diff --git a/resource/ui/compstats.res b/resource/ui/compstats.res
index c56bc5a..4552806 100644
--- a/resource/ui/compstats.res
+++ b/resource/ui/compstats.res
@@ -195,9 +195,9 @@
 					"armedFgColor_override"		"Orange"
 					"selectedFgColor_override" "TanLight"
 
-					"image_selectedcolor"	"255 255 255 255"
-					"image_armedcolor"		"0 0 0 0"
-					"image_drawcolor"		"0 0 0 0"
+					"image_selectedcolor"	"White"
+					"image_armedcolor"		"Transparent"
+					"image_drawcolor"		"Transparent"
 
 					"command"				"sort0"
 					"actionsignallevel"		"4"
@@ -228,9 +228,9 @@
 					"armedFgColor_override"	"Orange"
 					"selectedFgColor_override" "TanLight"
 
-					"image_selectedcolor"	"255 255 255 255"
-					"image_armedcolor"		"0 0 0 0"
-					"image_drawcolor"		"0 0 0 0"
+					"image_selectedcolor"	"White"
+					"image_armedcolor"		"Transparent"
+					"image_drawcolor"		"Transparent"
 
 					"command"				"sort1"
 					"actionsignallevel"		"4"	
@@ -261,9 +261,9 @@
 					"armedFgColor_override"	"Orange"
 					"selectedFgColor_override" "TanLight"
 
-					"image_selectedcolor"	"255 255 255 255"
-					"image_armedcolor"		"0 0 0 0"
-					"image_drawcolor"		"0 0 0 0"
+					"image_selectedcolor"	"White"
+					"image_armedcolor"		"Transparent"
+					"image_drawcolor"		"Transparent"
 
 					"command"	"sort2"
 					"actionsignallevel"	"4"
@@ -292,9 +292,9 @@
 					"armedFgColor_override"	"Orange"
 					"selectedFgColor_override" "TanLight"
 
-					"image_selectedcolor"	"255 255 255 255"
-					"image_armedcolor"		"0 0 0 0"
-					"image_drawcolor"		"0 0 0 0"
+					"image_selectedcolor"	"White"
+					"image_armedcolor"		"Transparent"
+					"image_drawcolor"		"Transparent"
 
 					"command"	"sort3"
 					"actionsignallevel"	"4"
diff --git a/resource/ui/craftingpanel.res b/resource/ui/craftingpanel.res
index 6be58df..11c19cc 100644
--- a/resource/ui/craftingpanel.res
+++ b/resource/ui/craftingpanel.res
@@ -16,9 +16,9 @@
 		"tabPosition"	"0"
 		"settitlebarvisible"	"0"
 		"PaintBackgroundType"	"0"
-		"bgcolor_override"				"25 25 25 255"
-		"infocus_bgcolor_override" 		"25 25 25 255"
-		"outoffocus_bgcolor_override" 	"25 25 25 255"
+		"bgcolor_override"				"DarkGrey"
+		"infocus_bgcolor_override" 		"DarkGrey"
+		"outoffocus_bgcolor_override" 	"DarkGrey"
 		
 		"item_ypos"						"85"
 		"output_item_ypos"				"255"
@@ -38,7 +38,7 @@
 			"tall"			"45"
 			"visible"		"0"
 			"bgcolor_override"		"Transparent"
-			"noitem_textcolor"		"117 107 94 255"
+			"noitem_textcolor"		"TextColor"
 			"PaintBackgroundType"	"2"
 			"paintborder"	"1"
 			
@@ -85,7 +85,7 @@
 					"enabled"		"1"
 					"labelText"		"%itemname%"
 					"textAlignment"	"south"
-					"fgcolor"		"235 226 202 255"
+					"fgcolor"		"NeutralWhite"
 					"wrap"			"1"
 					"centerwrap"	"1"
 				}
@@ -107,9 +107,9 @@
 			"centerwrap"	"0"
 			"textAlignment" "west"
 			"textinsetx"	"0"
-			"defaultFgColor_override" "117 107 94 255"
+			"defaultFgColor_override" "TextColor"
 			"defaultBgColor_override" "Transparent"
-			"armedFgColor_override" "235 226 202 255"
+			"armedFgColor_override" "NeutralWhite"
 			"armedBgColor_override" "Transparent"
 			"depressedFgColor_override" "178 82 22 255"
 			"depressedBgColor_override" "Transparent"
@@ -228,7 +228,7 @@
 			"pinCorner"		"0"
 			"visible"		"1"
 			"enabled"		"1"
-			"fgcolor"		"117 107 94 255"
+			"fgcolor"		"TextColor"
 		}
 
 		"OutputLabel"
@@ -247,7 +247,7 @@
 			"pinCorner"		"0"
 			"visible"		"1"
 			"enabled"		"1"
-			"fgcolor"		"117 107 94 255"
+			"fgcolor"		"TextColor"
 		}
 		
 		"CraftButton"
@@ -364,8 +364,8 @@
 		"wide"			"300"
 		"tall"			"300"
 		"visible"		"0"
-		"bgcolor_override"		"0 0 0 0"
-		"noitem_textcolor"		"117 107 94 255"
+		"bgcolor_override"	"Transparent"
+		"noitem_textcolor"	"TextColor"
 		"PaintBackgroundType"	"2"
 		"paintborder"	"1"
 		"text_ypos"			"20"
@@ -388,7 +388,7 @@
 			"enabled"		"1"
 			"labelText"		"%attriblist%"
 			"textAlignment"	"center"
-			"fgcolor"		"117 107 94 255"
+			"fgcolor"		"TextColor"
 			"centerwrap"	"1"
 		}
 	}
@@ -404,7 +404,7 @@
 		"tall"			"42"
 		"visible"		"0"
 		"bgcolor_override"		"Transparent"
-		"noitem_textcolor"		"117 107 94 255"
+		"noitem_textcolor"		"TextColor"
 		"PaintBackgroundType"	"2"
 		"paintborder"	"1"
 		"model_ypos"	"5"
diff --git a/resource/ui/craftingstatusdialog.res b/resource/ui/craftingstatusdialog.res
index 36b16b2..84c0e3b 100644
--- a/resource/ui/craftingstatusdialog.res
+++ b/resource/ui/craftingstatusdialog.res
@@ -9,9 +9,8 @@
 		"ypos"				"200"
 		"wide"				"200"
 		"tall"				"110"
-		"paintbackgroundtype" "2"
-		"paintbackground"	"1"
-		"bgcolor_override"	"30 30 30 255"
+		"paintbackgroundtype" "0"
+		"bgcolor_override"	"DarkGrey"
 		"settitlebarvisible" "0"
 		"border"			"CyanBorder"
 	}
@@ -118,13 +117,6 @@
 		"Command"		"close"
 		"sound_depressed"	"UI/buttonclick.wav"
 		"sound_released"	"UI/buttonclickrelease.wav"
-		"paintbackground"	"1"
-		"defaultBgColor_override"	"15 15 15 255k"
-		"armedBgColor_override"		"25 25 25 255"
-		"depressedBgColor_override"	"25 25 25 255"
-		"defaultFgColor_override"	"TanLight"
-		"armedFgColor_override" 	"TanLight"
-		"depressedFgColor_override" "TanLight"
 		"border_default"			"ButtonHover"
 		"border_armed"				"ButtonHover"
 	}
diff --git a/resource/ui/econ/ConfirmApplyCardUpgradeApplicationDialog.res b/resource/ui/econ/ConfirmApplyCardUpgradeApplicationDialog.res
index 77dd2dc..502f8f1 100644
--- a/resource/ui/econ/ConfirmApplyCardUpgradeApplicationDialog.res
+++ b/resource/ui/econ/ConfirmApplyCardUpgradeApplicationDialog.res
@@ -25,8 +25,8 @@
 		"wide"			"300"
 		"tall"			"300"
 		"visible"		"0"
-		"bgcolor_override"		"0 0 0 0"
-		"noitem_textcolor"		"117 107 94 255"
+		"bgcolor_override"	"Transparent"
+		"noitem_textcolor"	"TextColor"
 		"PaintBackgroundType"	"2"
 		"paintborder"	"1"
 		"text_ypos"			"20"
@@ -49,7 +49,7 @@
 			"enabled"		"1"
 			"labelText"		"%attriblist%"
 			"textAlignment"	"center"
-			"fgcolor"		"117 107 94 255"
+			"fgcolor"		"TextColor"
 			"centerwrap"	"1"
 		}
     }
@@ -118,8 +118,8 @@
 		"wide"			"84"
 		"tall"			"64"
 		"visible"		"1"
-		"bgcolor_override"		"0 0 0 0"
-		"noitem_textcolor"		"117 107 94 255"
+		"bgcolor_override"	"Transparent"
+		"noitem_textcolor"	"TextColor"
 		"PaintBackgroundType"	"2"
 		"paintborder"	"0"
 		"model_xpos"	"2"
@@ -182,8 +182,8 @@
 		"wide"			"84"
 		"tall"			"64"
 		"visible"		"1"
-		"bgcolor_override"		"0 0 0 0"
-		"noitem_textcolor"		"117 107 94 255"
+		"bgcolor_override"	"Transparent"
+		"noitem_textcolor"	"TextColor"
 		"PaintBackgroundType"	"2"
 		"paintborder"	"0"
 		"model_xpos"	"2"
@@ -233,7 +233,7 @@
 		"enabled"		"1"
 		"tabPosition"	"0"
 		"labelText"		"#Cancel"
-		"font"			"DfButton"
+		"font"			"HudFontSmall"
 		"textAlignment"	"center"
 		"dulltext"		"0"
 		"brighttext"	"0"
@@ -259,7 +259,7 @@
 		"enabled"		"1"
 		"tabPosition"	"0"
 		"labelText"		"#CraftNameConfirm"
-		"font"			"DfButton"
+		"font"			"HudFontSmall"
 		"textAlignment"	"center"
 		"dulltext"		"0"
 		"brighttext"	"0"
diff --git a/resource/ui/econ/ConfirmApplyDecodeDialog.res b/resource/ui/econ/ConfirmApplyDecodeDialog.res
index 063fd0d..e1f901c 100644
--- a/resource/ui/econ/ConfirmApplyDecodeDialog.res
+++ b/resource/ui/econ/ConfirmApplyDecodeDialog.res
@@ -9,11 +9,10 @@
 		"ypos"					"c-200"
 		"wide"					"400"
 		"tall"					"240"
+		"paintbackgroundtype"	"0"
 		"settitlebarvisible"	"0"
-		"paintborder"			"2"
-		"paintbackground"		"1"
 		"border"				"CyanBorderThick"
-		"bgcolor_override"		"25 25 25 255"
+		"bgcolor_override"		"DarkGrey"
 	}
 
 	"mouseoveritempanel"
@@ -26,8 +25,8 @@
 		"wide"			"300"
 		"tall"			"300"
 		"visible"		"0"
-		"bgcolor_override"		"0 0 0 0"
-		"noitem_textcolor"		"117 107 94 255"
+		"bgcolor_override"	"Transparent"
+		"noitem_textcolor"	"TextColor"
 		"PaintBackgroundType"	"2"
 		"paintborder"		"1"
 		"text_ypos"			"20"
@@ -50,7 +49,7 @@
 			"enabled"		"1"
 			"labelText"		"%attriblist%"
 			"textAlignment"	"center"
-			"fgcolor"		"117 107 94 255"
+			"fgcolor"		"TextColor"
 			"centerwrap"	"1"
 		}
     }
@@ -119,8 +118,8 @@
 		"wide"			"84"
 		"tall"			"64"
 		"visible"		"1"
-		"bgcolor_override"		"0 0 0 0"
-		"noitem_textcolor"		"117 107 94 255"
+		"bgcolor_override"	"Transparent"
+		"noitem_textcolor"	"TextColor"
 		"PaintBackgroundType"	"2"
 		"paintborder"	"0"
 		"model_xpos"	"2"
@@ -184,8 +183,8 @@
 		"wide"			"84"
 		"tall"			"64"
 		"visible"		"1"
-		"bgcolor_override"		"0 0 0 0"
-		"noitem_textcolor"		"117 107 94 255"
+		"bgcolor_override"	"Transparent"
+		"noitem_textcolor"	"TextColor"
 		"PaintBackgroundType"	"2"
 		"paintborder"	"0"
 		"model_xpos"	"2"
@@ -238,7 +237,7 @@
 		"enabled"		"1"
 		"tabPosition"	"0"
 		"labelText"		"#Cancel"
-		"font"			"DfButton"
+		"font"			"HudFontSmall"
 		"textAlignment"	"center"
 		"dulltext"		"0"
 		"brighttext"	"0"
@@ -265,7 +264,7 @@
 		"enabled"		"1"
 		"tabPosition"	"0"
 		"labelText"		"#CraftNameConfirm"
-		"font"			"DfButton"
+		"font"			"HudFontSmall"
 		"textAlignment"	"center"
 		"dulltext"		"0"
 		"brighttext"	"0"
diff --git a/resource/ui/econ/ConfirmApplyGiftWrapDialog.res b/resource/ui/econ/ConfirmApplyGiftWrapDialog.res
index c9b120d..da23244 100644
--- a/resource/ui/econ/ConfirmApplyGiftWrapDialog.res
+++ b/resource/ui/econ/ConfirmApplyGiftWrapDialog.res
@@ -9,11 +9,10 @@
 		"ypos"				"c-200"
 		"wide"				"400"
 		"tall"				"240"
+		"paintbackgroundtype" "0"
 		"settitlebarvisible" "0"
-		"paintborder"		"2"
-		"paintbackground"	"1"
 		"border"			"CyanBorderThick"
-		"bgcolor_override"	"25 25 25 255"
+		"bgcolor_override"	"DarkGrey"
 	}
 
 	"mouseoveritempanel"
@@ -26,8 +25,8 @@
 		"wide"				"300"
 		"tall"				"300"
 		"visible"			"0"
-		"bgcolor_override"	"0 0 0 0"
-		"noitem_textcolor"	"117 107 94 255"
+		"bgcolor_override"	"Transparent"
+		"noitem_textcolor"	"TextColor"
 		"PaintBackgroundType"	"2"
 		"paintborder"		"1"
 		"text_ypos"			"20"
@@ -50,7 +49,7 @@
 			"enabled"		"1"
 			"labelText"		"%attriblist%"
 			"textAlignment"	"center"
-			"fgcolor"		"117 107 94 255"
+			"fgcolor"		"TextColor"
 			"centerwrap"	"1"
 		}
     }
@@ -119,8 +118,8 @@
 		"wide"			"84"
 		"tall"			"64"
 		"visible"		"1"
-		"bgcolor_override"		"0 0 0 0"
-		"noitem_textcolor"		"117 107 94 255"
+		"bgcolor_override"	"Transparent"
+		"noitem_textcolor"	"TextColor"
 		"PaintBackgroundType"	"2"
 		"paintborder"	"0"
 		"model_xpos"	"2"
@@ -184,8 +183,8 @@
 		"wide"			"84"
 		"tall"			"64"
 		"visible"		"1"
-		"bgcolor_override"		"0 0 0 0"
-		"noitem_textcolor"		"117 107 94 255"
+		"bgcolor_override"	"Transparent"
+		"noitem_textcolor"	"TextColor"
 		"PaintBackgroundType"	"2"
 		"paintborder"	"0"
 		"model_xpos"	"2"
@@ -257,7 +256,7 @@
 		"enabled"		"1"
 		"tabPosition"	"0"
 		"labelText"		"#Cancel"
-		"font"			"DfButton"
+		"font"			"HudFontSmall"
 		"textAlignment"	"center"
 		"dulltext"		"0"
 		"brighttext"	"0"
@@ -284,7 +283,7 @@
 		"enabled"		"1"
 		"tabPosition"	"0"
 		"labelText"		"#CraftNameConfirm"
-		"font"			"DfButton"
+		"font"			"HudFontSmall"
 		"textAlignment"	"center"
 		"dulltext"		"0"
 		"brighttext"	"0"
diff --git a/resource/ui/econ/ConfirmApplyPaintCanDialog.res b/resource/ui/econ/ConfirmApplyPaintCanDialog.res
index 92555c9..a3458c8 100644
--- a/resource/ui/econ/ConfirmApplyPaintCanDialog.res
+++ b/resource/ui/econ/ConfirmApplyPaintCanDialog.res
@@ -9,11 +9,10 @@
 		"ypos"					"c-200"
 		"wide"					"400"
 		"tall"					"240"
+		"paintbackgroundtype"	"0"
 		"settitlebarvisible"	"0"
-		"paintborder"			"2"
-		"paintbackground"		"1"
 		"border"				"CyanBorderThick"
-		"bgcolor_override"		"25 25 25 255"
+		"bgcolor_override"		"DarkGrey"
 	}
 	"mouseoveritempanel"
 	{
@@ -25,8 +24,8 @@
 		"wide"			"300"
 		"tall"			"300"
 		"visible"		"0"
-		"bgcolor_override"		"0 0 0 0"
-		"noitem_textcolor"		"117 107 94 255"
+		"bgcolor_override"		"Transparent"
+		"noitem_textcolor"		"TextColor"
 		"PaintBackgroundType"	"2"
 		"paintborder"		"1"
 		"text_ypos"			"20"
@@ -49,7 +48,7 @@
 			"enabled"		"1"
 			"labelText"		"%attriblist%"
 			"textAlignment"	"center"
-			"fgcolor"		"117 107 94 255"
+			"fgcolor"		"TextColor"
 			"centerwrap"	"1"
 		}
     }
@@ -118,8 +117,8 @@
 		"wide"			"84"
 		"tall"			"64"
 		"visible"		"1"
-		"bgcolor_override"		"0 0 0 0"
-		"noitem_textcolor"		"117 107 94 255"
+		"bgcolor_override"		"Transparent"
+		"noitem_textcolor"		"TextColor"
 		"PaintBackgroundType"	"2"
 		"paintborder"	"0"
 		"model_xpos"	"2"
@@ -183,8 +182,8 @@
 		"wide"			"84"
 		"tall"			"64"
 		"visible"		"1"
-		"bgcolor_override"		"0 0 0 0"
-		"noitem_textcolor"		"117 107 94 255"
+		"bgcolor_override"		"Transparent"
+		"noitem_textcolor"		"TextColor"
 		"PaintBackgroundType"	"2"
 		"paintborder"	"0"
 		"model_xpos"	"2"
@@ -199,7 +198,6 @@
 		{
 			"use_item_rendertarget" "0"
 			"allow_rot"				"0"
-			"inventory_image_type"	"1"
 		}
 	}
 
@@ -232,8 +230,8 @@
 		"wide"			"100"
 		"tall"			"100"
 		"visible"		"1"
-		"bgcolor_override"		"0 0 0 0"
-		"noitem_textcolor"		"117 107 94 255"
+		"bgcolor_override"		"Transparent"
+		"noitem_textcolor"		"TextColor"
 		"PaintBackgroundType"	"2"
 		"paintborder"	"0"
 		"model_xpos"	"2"
@@ -286,7 +284,7 @@
 		"enabled"		"1"
 		"tabPosition"	"0"
 		"labelText"		"#Cancel"
-		"font"			"DfButton"
+		"font"			"HudFontSmall"
 		"textAlignment"	"center"
 		"dulltext"		"0"
 		"brighttext"	"0"
@@ -313,7 +311,7 @@
 		"enabled"		"1"
 		"tabPosition"	"0"
 		"labelText"		"#CraftNameConfirm"
-		"font"			"DfButton"
+		"font"			"HudFontSmall"
 		"textAlignment"	"center"
 		"dulltext"		"0"
 		"brighttext"	"0"
diff --git a/resource/ui/econ/ConfirmApplyStrangePartApplicationDialog.res b/resource/ui/econ/ConfirmApplyStrangePartApplicationDialog.res
index 63f5ace..7e755e1 100644
--- a/resource/ui/econ/ConfirmApplyStrangePartApplicationDialog.res
+++ b/resource/ui/econ/ConfirmApplyStrangePartApplicationDialog.res
@@ -9,11 +9,10 @@
 		"ypos"					"c-200"
 		"wide"					"400"
 		"tall"					"240"
+		"paintbackgroundtype"	"0"
 		"settitlebarvisible"	"0"
-		"paintborder"			"2"
-		"paintbackground"		"1"
 		"border"				"CyanBorderThick"
-		"bgcolor_override"		"25 25 25 255"
+		"bgcolor_override"		"DarkGrey"
 	}
 
 	"mouseoveritempanel"
@@ -26,8 +25,8 @@
 		"wide"			"300"
 		"tall"			"300"
 		"visible"		"0"
-		"bgcolor_override"		"0 0 0 0"
-		"noitem_textcolor"		"117 107 94 255"
+		"bgcolor_override"		"Transparent"
+		"noitem_textcolor"		"TextColor"
 		"PaintBackgroundType"	"2"
 		"paintborder"		"1"	
 		"text_ypos"			"20"
@@ -50,7 +49,7 @@
 			"enabled"		"1"
 			"labelText"		"%attriblist%"
 			"textAlignment"	"center"
-			"fgcolor"		"117 107 94 255"
+			"fgcolor"		"TextColor"
 			"centerwrap"	"1"
 		}
     }
@@ -119,8 +118,8 @@
 		"wide"			"84"
 		"tall"			"64"
 		"visible"		"1"
-		"bgcolor_override"		"0 0 0 0"
-		"noitem_textcolor"		"117 107 94 255"
+		"bgcolor_override"		"Transparent"
+		"noitem_textcolor"		"TextColor"
 		"PaintBackgroundType"	"2"
 		"paintborder"	"0"
 		"model_xpos"	"2"
@@ -184,8 +183,8 @@
 		"wide"			"84"
 		"tall"			"64"
 		"visible"		"1"
-		"bgcolor_override"		"0 0 0 0"
-		"noitem_textcolor"		"117 107 94 255"
+		"bgcolor_override"		"Transparent"
+		"noitem_textcolor"		"TextColor"
 		"PaintBackgroundType"	"2"
 		"paintborder"	"0"
 		"model_xpos"	"2"
@@ -200,7 +199,6 @@
 		{
 			"use_item_rendertarget" "0"
 			"allow_rot"				"0"
-			"inventory_image_type"	"1"
 		}
 	}
 
@@ -238,7 +236,7 @@
 		"enabled"		"1"
 		"tabPosition"	"0"
 		"labelText"		"#Cancel"
-		"font"			"DfButton"
+		"font"			"HudFontSmall"
 		"textAlignment"	"center"
 		"dulltext"		"0"
 		"brighttext"	"0"
@@ -265,7 +263,7 @@
 		"enabled"		"1"
 		"tabPosition"	"0"
 		"labelText"		"#CraftNameConfirm"
-		"font"			"DfButton"
+		"font"			"HudFontSmall"
 		"textAlignment"	"center"
 		"dulltext"		"0"
 		"brighttext"	"0"
diff --git a/resource/ui/econ/ConfirmApplyTeamColorPaintCanDialog.res b/resource/ui/econ/ConfirmApplyTeamColorPaintCanDialog.res
index 9035791..3d8f1f1 100644
--- a/resource/ui/econ/ConfirmApplyTeamColorPaintCanDialog.res
+++ b/resource/ui/econ/ConfirmApplyTeamColorPaintCanDialog.res
@@ -9,11 +9,10 @@
 		"ypos"					"c-200"
 		"wide"					"400"
 		"tall"					"240"
+		"paintbackgroundtype"	"0"
 		"settitlebarvisible"	"0"
-		"paintborder"			"2"
-		"paintbackground"		"1"
 		"border"				"CyanBorderThick"
-		"bgcolor_override"		"25 25 25 255"
+		"bgcolor_override"		"DarkGrey"
 	}
 
 	"mouseoveritempanel"
@@ -50,7 +49,7 @@
 			"enabled"		"1"
 			"labelText"		"%attriblist%"
 			"textAlignment"	"center"
-			"fgcolor"		"117 107 94 255"
+			"fgcolor"		"TextColor"
 			"centerwrap"	"1"
 		}
     }
@@ -119,8 +118,8 @@
 		"wide"			"84"
 		"tall"			"64"
 		"visible"		"1"
-		"bgcolor_override"		"0 0 0 0"
-		"noitem_textcolor"		"117 107 94 255"
+		"bgcolor_override"		"Transparent"
+		"noitem_textcolor"		"TextColor"
 		"PaintBackgroundType"	"2"
 		"paintborder"	"0"
 		"model_xpos"	"2"
@@ -184,8 +183,8 @@
 		"wide"			"84"
 		"tall"			"64"
 		"visible"		"1"
-		"bgcolor_override"		"0 0 0 0"
-		"noitem_textcolor"		"117 107 94 255"
+		"bgcolor_override"		"Transparent"
+		"noitem_textcolor"		"TextColor"
 		"PaintBackgroundType"	"2"
 		"paintborder"	"0"
 		"model_xpos"	"2"
@@ -233,8 +232,8 @@
 		"wide"			"100"
 		"tall"			"100"
 		"visible"		"1"
-		"bgcolor_override"		"0 0 0 0"
-		"noitem_textcolor"		"117 107 94 255"
+		"bgcolor_override"		"Transparent"
+		"noitem_textcolor"		"TextColor"
 		"PaintBackgroundType"	"2"
 		"paintborder"	"0"
 		"model_xpos"	"2"
@@ -263,8 +262,8 @@
 		"wide"			"100"
 		"tall"			"100"
 		"visible"		"1"
-		"bgcolor_override"		"0 0 0 0"
-		"noitem_textcolor"		"117 107 94 255"
+		"bgcolor_override"		"Transparent"
+		"noitem_textcolor"		"TextColor"
 		"PaintBackgroundType"	"2"
 		"paintborder"	"0"
 		"model_xpos"	"2"
@@ -299,7 +298,7 @@
 		"pinCorner"		"0"
 		"visible"		"0"
 		"enabled"		"1"
-		"fgcolor_override" "Base Color"
+		"fgcolor_override" "ColorCyan"
 	}
 
 	"CancelButton"
@@ -317,7 +316,7 @@
 		"enabled"		"1"
 		"tabPosition"	"0"
 		"labelText"		"#Cancel"
-		"font"			"DfButton"
+		"font"			"HudFontSmall"
 		"textAlignment"	"center"
 		"dulltext"		"0"
 		"brighttext"	"0"
@@ -325,13 +324,6 @@
 		"Command"		"cancel"
 		"sound_depressed"	"UI/buttonclick.wav"
 		"sound_released"	"UI/buttonclickrelease.wav"
-		"paintbackground"	"1"
-		"defaultBgColor_override"	"15 15 15 255"
-		"armedBgColor_override"		"25 25 25 255"
-		"depressedBgColor_override"	"25 25 25 255"
-		"defaultFgColor_override"	"TanLight"
-		"armedFgColor_override" 	"TanLight"
-		"depressedFgColor_override" "TanLight"
 		"border_default"			"ButtonHover"
 		"border_armed"				"ButtonHover"
 	}
@@ -351,7 +343,7 @@
 		"enabled"		"1"
 		"tabPosition"	"0"
 		"labelText"		"#CraftNameConfirm"
-		"font"			"DfButton"
+		"font"			"HudFontSmall"
 		"textAlignment"	"center"
 		"dulltext"		"0"
 		"brighttext"	"0"
@@ -359,13 +351,6 @@
 		"Command"		"apply"
 		"sound_depressed"	"UI/buttonclick.wav"
 		"sound_released"	"UI/buttonclickrelease.wav"
-		"paintbackground"	"1"
-		"defaultBgColor_override"	"15 15 15 255"
-		"armedBgColor_override"		"25 25 25 255"
-		"depressedBgColor_override"	"25 25 25 255"
-		"defaultFgColor_override"	"TanLight"
-		"armedFgColor_override" 	"TanLight"
-		"depressedFgColor_override" "TanLight"
 		"border_default"			"ButtonHover"
 		"border_armed"				"ButtonHover"
 	}
diff --git a/resource/ui/econ/ConfirmCustomizeTextureDialog.res b/resource/ui/econ/ConfirmCustomizeTextureDialog.res
index 3bbe1be..8e46e0e 100644
--- a/resource/ui/econ/ConfirmCustomizeTextureDialog.res
+++ b/resource/ui/econ/ConfirmCustomizeTextureDialog.res
@@ -25,8 +25,8 @@
 		"wide"			"300"
 		"tall"			"300"
 		"visible"		"0"
-		"bgcolor_override"		"0 0 0 0"
-		"noitem_textcolor"		"117 107 94 255"
+		"bgcolor_override"	"Transparent"
+		"noitem_textcolor"	"TextColor"
 		"PaintBackgroundType"	"0"
 		"paintborder"		"0"
 		"text_ypos"			"20"
@@ -65,7 +65,7 @@
 				"enabled"		"1"
 				"labelText"		"%attriblist%"
 				"textAlignment"	"center"
-				"fgcolor"		"117 107 94 255"
+				"fgcolor"		"TextColor"
 				"centerwrap"	"1"
 			}
     	}
@@ -111,8 +111,8 @@
 		"wide"			"84"
 		"tall"			"64"
 		"visible"		"1"
-		"bgcolor_override"		"0 0 0 0"
-		"noitem_textcolor"		"117 107 94 255"
+		"bgcolor_override"	"Transparent"
+		"noitem_textcolor"	"TextColor"
 		"PaintBackgroundType"	"2"
 		"paintborder"	"0"
 		"model_xpos"	"2"
@@ -184,8 +184,8 @@
 		"wide"			"84"
 		"tall"			"64"
 		"visible"		"1"
-		"bgcolor_override"		"0 0 0 0"
-		"noitem_textcolor"		"117 107 94 255"
+		"bgcolor_override"	"Transparent"
+		"noitem_textcolor"	"TextColor"
 		"PaintBackgroundType"	"2"
 		"paintborder"	"0"
 		"model_xpos"	"2"
@@ -211,8 +211,8 @@
 		"wide"			"160"
 		"tall"			"160"
 		"visible"		"1"
-		"bgcolor_override"		"0 0 0 0"
-		"noitem_textcolor"		"117 107 94 255"
+		"bgcolor_override"	"Transparent"
+		"noitem_textcolor"	"TextColor"
 		"paintborder"	"0"
 		"model_xpos"	"00"
 		"model_ypos"	"00"
@@ -294,7 +294,7 @@
 				"wide"			"300"
 				"tall"			"20"
 				"labelText"		"#ToolCustomizeTextureBrowseButton"
-				"font"			"DfButton"
+				"font"			"HudFontSmall"
 				"Command"		"pick_image"
 		"sound_depressed"	"UI/buttonclick.wav"
 		"sound_released"	"UI/buttonclickrelease.wav"
@@ -357,7 +357,7 @@
 				"disabledBgColor_override" "0 0 0 255"
 				"selectionColor_override" "0 0 0 255"
 				"selectionTextColor_override" "235 226 202 255"
-				"defaultSelectionBG2Color_override" "0 0 0 0"
+				"defaultSelectionBG2Color_override" "Transparent"
 			}
 		}
 		"CancelButton"
@@ -370,7 +370,7 @@
 			"wide"			"130"
 			"tall"			"25"
 			"labelText"		"#Cancel"
-			"font"			"DfButton"
+			"font"			"HudFontSmall"
 			"textAlignment"	"center"
 			"Command"		"cancel"
 		"sound_depressed"	"UI/buttonclick.wav"
@@ -395,7 +395,7 @@
 			"wide"			"130"
 			"tall"			"25"
 			"labelText"		"#TF_NextCarat"
-			"font"			"DfButton"
+			"font"			"HudFontSmall"
 			"textAlignment"	"center"
 			"Command"		"next_page"
 		"sound_depressed"	"UI/buttonclick.wav"
@@ -474,7 +474,7 @@
 				"disabledBgColor_override" "0 0 0 255"
 				"selectionColor_override" "0 0 0 255"
 				"selectionTextColor_override" "235 226 202 255"
-				"defaultSelectionBG2Color_override" "0 0 0 0"
+					"defaultSelectionBG2Color_override" "Transparent"
 			}
 			"PainterlyOptions"
 			{
@@ -544,7 +544,7 @@
 					"wide"			"65"
 					"tall"			"15"
 					"labelText"		"<<"
-					"font"			"DfButton"
+					"font"			"HudFontSmall"
 					"textAlignment"	"center"
 					"Command"		"prev_stencil_palette"
 		"sound_depressed"	"UI/buttonclick.wav"
@@ -569,7 +569,7 @@
 					"wide"			"65"
 					"tall"			"15"
 					"labelText"		">>"
-					"font"			"DfButton"
+					"font"			"HudFontSmall"
 					"textAlignment"	"center"
 					"Command"		"next_stencil_palette"
 		"sound_depressed"	"UI/buttonclick.wav"
@@ -609,7 +609,7 @@
 					"disabledBgColor_override" "0 0 0 255"
 					"selectionColor_override" "0 0 0 255"
 					"selectionTextColor_override" "235 226 202 255"
-					"defaultSelectionBG2Color_override" "0 0 0 0"
+					"defaultSelectionBG2Color_override" "Transparent"
 				}
 			}
 		}
@@ -686,7 +686,7 @@
 			"wide"			"130"
 			"tall"			"25"
 			"labelText"		"#Cancel"
-			"font"			"DfButton"
+			"font"			"HudFontSmall"
 			"textAlignment"	"center"
 			"Command"		"cancel"
 		"sound_depressed"	"UI/buttonclick.wav"
@@ -711,7 +711,7 @@
 			"wide"			"130"
 			"tall"			"25"
 			"labelText"		"#TF_BackCarat"
-			"font"			"DfButton"
+			"font"			"HudFontSmall"
 			"textAlignment"	"center"
 			"Command"		"prev_page"
 		"sound_depressed"	"UI/buttonclick.wav"
@@ -736,7 +736,7 @@
 			"wide"			"130"
 			"tall"			"25"
 			"labelText"		"#TF_NextCarat"
-			"font"			"DfButton"
+			"font"			"HudFontSmall"
 			"textAlignment"	"center"
 			"Command"		"next_page"
 		"sound_depressed"	"UI/buttonclick.wav"
@@ -850,7 +850,7 @@
 			"wide"			"130"
 			"tall"			"25"
 			"labelText"		"#Cancel"
-			"font"			"DfButton"
+			"font"			"HudFontSmall"
 			"textAlignment"	"center"
 			"default"		"0"
 			"Command"		"cancel"
@@ -876,7 +876,7 @@
 			"wide"			"130"
 			"tall"			"25"
 			"labelText"		"#TF_BackCarat"
-			"font"			"DfButton"
+			"font"			"HudFontSmall"
 			"textAlignment"	"center"
 			"Command"		"prev_page"
 		"sound_depressed"	"UI/buttonclick.wav"
@@ -901,7 +901,7 @@
 			"wide"			"130"
 			"tall"			"25"
 			"labelText"		"#ToolCustomizeTextureOKButton"
-			"font"			"DfButton"
+			"font"			"HudFontSmall"
 			"textAlignment"	"center"
 			"default"		"1"
 			"Command"		"apply"
diff --git a/resource/ui/econ/ConfirmDialogAbandonNoPenalty.res b/resource/ui/econ/ConfirmDialogAbandonNoPenalty.res
index a57b29d..1f15e17 100644
--- a/resource/ui/econ/ConfirmDialogAbandonNoPenalty.res
+++ b/resource/ui/econ/ConfirmDialogAbandonNoPenalty.res
@@ -36,7 +36,7 @@
 		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
-		"fgcolor_override" "Base Color"
+		"fgcolor_override" "ColorCyan"
 	}
 
 	"AbandonIcon"
@@ -88,7 +88,7 @@
 		"enabled"		"1"
 		"tabPosition"	"0"
 		"labelText"		"#GameUI_CancelBold"
-		"font"			"DfButton"
+		"font"			"HudFontSmall"
 		"textAlignment"	"center"
 		"textinsetx"	"50"
 		"dulltext"		"0"
@@ -96,13 +96,6 @@
 		"Command"		"cancel"
 		"sound_depressed"	"UI/buttonclick.wav"
 		"sound_released"	"UI/buttonclickrelease.wav"
-		"paintbackground"	"1"
-		"defaultBgColor_override"	"15 15 15 255"
-		"armedBgColor_override"		"25 25 25 255"
-		"depressedBgColor_override"	"25 25 25 255"
-		"defaultFgColor_override"	"TanLight"
-		"armedFgColor_override" 	"TanLight"
-		"depressedFgColor_override" "TanLight"
 		"border_default"			"ButtonHover"
 		"border_armed"				"ButtonHover"
 	}
@@ -123,7 +116,7 @@
 		"enabled"		"1"
 		"tabPosition"	"0"
 		"labelText"		"#ConfirmButtonText"
-		"font"			"DfButton"
+		"font"			"HudFontSmall"
 		"textAlignment"	"center"
 		"textinsetx"	"50"
 		"dulltext"		"0"
@@ -131,13 +124,6 @@
 		"Command"		"confirm"
 		"sound_depressed"	"UI/buttonclick.wav"
 		"sound_released"	"UI/buttonclickrelease.wav"
-		"paintbackground"	"1"
-		"defaultBgColor_override"	"15 15 15 255"
-		"armedBgColor_override"		"25 25 25 255"
-		"depressedBgColor_override"	"25 25 25 255"
-		"defaultFgColor_override"	"TanLight"
-		"armedFgColor_override" 	"TanLight"
-		"depressedFgColor_override" "TanLight"
 		"border_default"			"ButtonHover"
 		"border_armed"				"ButtonHover"
 	}				
diff --git a/resource/ui/econ/ConfirmDialogAbandonPenalty.res b/resource/ui/econ/ConfirmDialogAbandonPenalty.res
index 2386a02..e1e2416 100644
--- a/resource/ui/econ/ConfirmDialogAbandonPenalty.res
+++ b/resource/ui/econ/ConfirmDialogAbandonPenalty.res
@@ -36,7 +36,7 @@
 		"pinCorner"			"0"
 		"visible"			"1"
 		"enabled"			"1"
-		"fgcolor_override" 	"Base Color"
+		"fgcolor_override" 	"ColorCyan"
 	}
 
 	"AbandonIcon"
@@ -70,7 +70,7 @@
 		"visible"		"1"
 		"enabled"		"1"
 		"wrap"			"1"
-		"fgcolor_override" "Base Color"
+		"fgcolor_override" "ColorCyan"
 	}
 	"CancelButton"
 	{
@@ -87,7 +87,7 @@
 		"enabled"		"1"
 		"tabPosition"	"0"
 		"labelText"		"#GameUI_CancelBold"
-		"font"			"DfButton"
+		"font"			"HudFontSmall"
 		"textAlignment"	"center"
 		"textinsetx"	"50"
 		"dulltext"		"0"
@@ -95,13 +95,6 @@
 		"Command"		"cancel"
 		"sound_depressed"	"UI/buttonclick.wav"
 		"sound_released"	"UI/buttonclickrelease.wav"
-		"paintbackground"	"1"
-		"defaultBgColor_override"	"15 15 15 255"
-		"armedBgColor_override"		"25 25 25 255"
-		"depressedBgColor_override"	"25 25 25 255"
-		"defaultFgColor_override"	"TanLight"
-		"armedFgColor_override" 	"TanLight"
-		"depressedFgColor_override" "TanLight"
 		"border_default"			"ButtonHover"
 		"border_armed"				"ButtonHover"
 	}
@@ -122,7 +115,7 @@
 		"enabled"		"1"
 		"tabPosition"	"0"
 		"labelText"		"#ConfirmButtonText"
-		"font"			"DfButton"
+		"font"			"HudFontSmall"
 		"textAlignment"	"center"
 		"textinsetx"	"50"
 		"dulltext"		"0"
@@ -130,13 +123,6 @@
 		"Command"		"confirm"
 		"sound_depressed"	"UI/buttonclick.wav"
 		"sound_released"	"UI/buttonclickrelease.wav"
-		"paintbackground"	"1"
-		"defaultBgColor_override"	"15 15 15 255"
-		"armedBgColor_override"		"25 25 25 255"
-		"depressedBgColor_override"	"25 25 25 255"
-		"defaultFgColor_override"	"TanLight"
-		"armedFgColor_override" 	"TanLight"
-		"depressedFgColor_override" "TanLight"
 		"border_default"			"ButtonHover"
 		"border_armed"				"ButtonHover"
 	}					
diff --git a/resource/ui/econ/ConfirmDialogAbandonSafe.res b/resource/ui/econ/ConfirmDialogAbandonSafe.res
index 83d4ce5..1044c91 100644
--- a/resource/ui/econ/ConfirmDialogAbandonSafe.res
+++ b/resource/ui/econ/ConfirmDialogAbandonSafe.res
@@ -36,7 +36,7 @@
 		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
-		"fgcolor_override" "Base Color"
+		"fgcolor_override" "ColorCyan"
 	}
 
 	"ExplanationLabel"
@@ -74,7 +74,7 @@
 		"enabled"		"1"
 		"tabPosition"	"0"
 		"labelText"		"#GameUI_CancelBold"
-		"font"			"DfButton"
+		"font"			"HudFontSmall"
 		"textAlignment"	"center"
 		"textinsetx"	"50"
 		"dulltext"		"0"
@@ -82,13 +82,6 @@
 		"Command"		"cancel"
 		"sound_depressed"	"UI/buttonclick.wav"
 		"sound_released"	"UI/buttonclickrelease.wav"
-		"paintbackground"	"1"
-		"defaultBgColor_override"	"15 15 15 255"
-		"armedBgColor_override"		"25 25 25 255"
-		"depressedBgColor_override"	"25 25 25 255"
-		"defaultFgColor_override"	"TanLight"
-		"armedFgColor_override" 	"TanLight"
-		"depressedFgColor_override" "TanLight"
 		"border_default"			"ButtonHover"
 		"border_armed"				"ButtonHover"
 	}
@@ -109,7 +102,7 @@
 		"enabled"		"1"
 		"tabPosition"	"0"
 		"labelText"		"#ConfirmButtonText"
-		"font"			"DfButton"
+		"font"			"HudFontSmall"
 		"textAlignment"	"center"
 		"textinsetx"	"50"
 		"dulltext"		"0"
@@ -117,13 +110,6 @@
 		"Command"		"confirm"
 		"sound_depressed"	"UI/buttonclick.wav"
 		"sound_released"	"UI/buttonclickrelease.wav"
-		"paintbackground"	"1"
-		"defaultBgColor_override"	"15 15 15 255"
-		"armedBgColor_override"		"25 25 25 255"
-		"depressedBgColor_override"	"25 25 25 255"
-		"defaultFgColor_override"	"TanLight"
-		"armedFgColor_override" 	"TanLight"
-		"depressedFgColor_override" "TanLight"
 		"border_default"			"ButtonHover"
 		"border_armed"				"ButtonHover"
 	}			
diff --git a/resource/ui/econ/ConfirmItemPreviewDialog.res b/resource/ui/econ/ConfirmItemPreviewDialog.res
index 9c9fd5e..87979a8 100644
--- a/resource/ui/econ/ConfirmItemPreviewDialog.res
+++ b/resource/ui/econ/ConfirmItemPreviewDialog.res
@@ -25,8 +25,8 @@
 		"wide"			"300"
 		"tall"			"300"
 		"visible"		"0"
-		"bgcolor_override"		"0 0 0 0"
-		"noitem_textcolor"		"117 107 94 255"
+		"bgcolor_override"	"Transparent"
+		"noitem_textcolor"	"TextColor"
 		"PaintBackgroundType"	"0"
 		"paintborder"	"0"
 		"text_ypos"			"20"
@@ -65,7 +65,7 @@
 				"enabled"		"1"
 				"labelText"		"%attriblist%"
 				"textAlignment"	"center"
-				"fgcolor"		"117 107 94 255"
+				"fgcolor"		"TextColor"
 				"centerwrap"	"1"
 			}
     	}
@@ -133,8 +133,8 @@
 		"wide"			"84"
 		"tall"			"64"
 		"visible"		"1"
-		"bgcolor_override"		"0 0 0 0"
-		"noitem_textcolor"		"117 107 94 255"
+		"bgcolor_override"	"Transparent"
+		"noitem_textcolor"	"TextColor"
 		"PaintBackgroundType"	"2"
 		"paintborder"	"0"
 		"model_xpos"	"2"
@@ -167,7 +167,7 @@
 		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
-		"fgcolor_override" "Base Color"
+		"fgcolor_override" "ColorCyan"
 	}
 	"CancelButton"
 	{
@@ -184,7 +184,7 @@
 		"enabled"		"1"
 		"tabPosition"	"0"
 		"labelText"		"#Cancel"
-		"font"			"DfButton"
+		"font"			"HudFontSmall"
 		"textAlignment"	"center"
 		"dulltext"		"0"
 		"brighttext"	"0"
@@ -217,7 +217,7 @@
 		"enabled"		"1"
 		"tabPosition"	"0"
 		"labelText"		"#CraftNameConfirm"
-		"font"			"DfButton"
+		"font"			"HudFontSmall"
 		"textAlignment"	"center"
 		"dulltext"		"0"
 		"brighttext"	"0"
diff --git a/resource/ui/econ/ItemModelPanel.res b/resource/ui/econ/ItemModelPanel.res
index ed6f4e3..347904b 100644
--- a/resource/ui/econ/ItemModelPanel.res
+++ b/resource/ui/econ/ItemModelPanel.res
@@ -43,7 +43,7 @@
 		"wide"			"f0"
 		"tall"			"f0"
 		"visible"		"1"
-		"bgcolor_override"		"0 0 0 0"
+		"bgcolor_override"		"Transparent"
 	
 		"itemmodelpanel"
 		{
@@ -110,7 +110,7 @@
 			"enabled"		"1"
 			"labelText"		"%attriblist%"
 			"textAlignment"	"south"
-			"fgcolor"		"117 107 94 255"
+			"fgcolor"		"TextColor"
 			"centerwrap"	"1"
 		}
 		
@@ -130,7 +130,7 @@
 			"enabled"		"1"
 			"labelText"		"#ItemPanelEquipped"
 			"textAlignment"	"center"
-			"fgcolor"		"200 80 60 255"
+			"fgcolor"		"LightRed"
 			"bgcolor_override"		"0 0 0 255"
 			"PaintBackgroundType"	"2"
 		}
@@ -164,7 +164,7 @@
 			"enabled"		"1"
 			"labelText"		""
 			"textAlignment"	"center"
-			"fgcolor"		"200 80 60 255"
+			"fgcolor"		"LightRed"
 			"bgcolor_override"		"0 0 0 255"
 			"PaintBackgroundType"	"2"
 		}
@@ -285,7 +285,7 @@
 			"tall"			"18"
 			"visible"		"0"
 			"bgcolor_override"		"0 0 0 200"
-			"noitem_textcolor"		"117 107 94 255"
+			"noitem_textcolor"		"TextColor"
 			"PaintBackgroundType"	"2"
 			"paintborder"	"0"
 			"useparentbg"	"0"
diff --git a/resource/ui/econ/comboboxbackpackoverlaydialog.res b/resource/ui/econ/comboboxbackpackoverlaydialog.res
index 3ed5528..a5f2954 100644
--- a/resource/ui/econ/comboboxbackpackoverlaydialog.res
+++ b/resource/ui/econ/comboboxbackpackoverlaydialog.res
@@ -9,7 +9,7 @@
 		"ypos"				"105"
 		"wide"				"280"
 		"tall"				"240"
-		"bgcolor_override"		"25 25 25 255"
+		"bgcolor_override"		"DarkGrey"
 		"paintbackgroundtype"	"0"
 		"settitlebarvisible"	"1"
 		"border"				"CyanBorderThick"
@@ -45,8 +45,8 @@
 		"tall"				"120"
 		"visible"			"1"
 		"enabled"			"1"
-		"bgcolor_override"	"0 0 0 0"
-		"noitem_textcolor"	"117 107 94 255"
+		"bgcolor_override"	"Transparent"
+		"noitem_textcolor"	"TextColor"
 		"PaintBackgroundType"	"2"
 		"paintborder"		"1"
 		"model_xpos"		"2"
@@ -120,6 +120,8 @@
 		"Command"			"cancel"
 		"sound_depressed"	"UI/buttonclick.wav"
 		"sound_released"	"UI/buttonclickrelease.wav"
+		"border_default"	"ButtonHover"
+		"border_armed"		"ButtonHover"
 	}
 	
 	"OkButton"
diff --git a/resource/ui/econ/confirmapplystrangifierdialog.res b/resource/ui/econ/confirmapplystrangifierdialog.res
index ae84616..07054ad 100644
--- a/resource/ui/econ/confirmapplystrangifierdialog.res
+++ b/resource/ui/econ/confirmapplystrangifierdialog.res
@@ -9,11 +9,10 @@
 		"ypos"					"c-200"
 		"wide"					"400"
 		"tall"					"240"
+		"paintbackgroundtype"	"0"
 		"settitlebarvisible"	"0"
-		"paintborder"			"2"
-		"paintbackground"		"1"
 		"border"				"CyanBorderThick"
-		"bgcolor_override"		"25 25 25 255"
+		"bgcolor_override"		"DarkGrey"
 	}
 
 	"mouseoveritempanel"
@@ -26,8 +25,8 @@
 		"wide"			"300"
 		"tall"			"300"
 		"visible"		"0"
-		"bgcolor_override"		"0 0 0 0"
-		"noitem_textcolor"		"117 107 94 255"
+		"bgcolor_override"		"Transparent"
+		"noitem_textcolor"		"TextColor"
 		"PaintBackgroundType"	"2"
 		"paintborder"		"1"
 		"text_ypos"			"20"
@@ -50,7 +49,7 @@
 			"enabled"		"1"
 			"labelText"		"%attriblist%"
 			"textAlignment"	"center"
-			"fgcolor"		"117 107 94 255"
+			"fgcolor"		"TextColor"
 			"centerwrap"	"1"
 		}
 	}
@@ -103,8 +102,8 @@
 		"wide"			"84"
 		"tall"			"64"
 		"visible"		"1"
-		"bgcolor_override"		"0 0 0 0"
-		"noitem_textcolor"		"117 107 94 255"
+		"bgcolor_override"		"Transparent"
+		"noitem_textcolor"		"TextColor"
 		"PaintBackgroundType"	"2"
 		"paintborder"	"0"
 		"model_xpos"	"2"
@@ -152,8 +151,8 @@
 		"wide"			"84"
 		"tall"			"64"
 		"visible"		"1"
-		"bgcolor_override"		"0 0 0 0"
-		"noitem_textcolor"		"117 107 94 255"
+		"bgcolor_override"		"Transparent"
+		"noitem_textcolor"		"TextColor"
 		"PaintBackgroundType"	"2"
 		"paintborder"	"0"
 		"model_xpos"	"2"
@@ -168,7 +167,6 @@
 		{
 			"use_item_rendertarget" "0"
 			"allow_rot"				"0"
-			"inventory_image_type"	"1"
 		}
 	}	
 	
@@ -207,7 +205,7 @@
 		"enabled"		"1"
 		"tabPosition"	"0"
 		"labelText"		"#Cancel"
-		"font"			"DfButton"
+		"font"			"HudFontSmall"
 		"textAlignment"	"center"
 		"dulltext"		"0"
 		"brighttext"	"0"
@@ -234,7 +232,7 @@
 		"enabled"		"1"
 		"tabPosition"	"0"
 		"labelText"		"#CraftNameConfirm"
-		"font"			"DfButton"
+		"font"			"HudFontSmall"
 		"textAlignment"	"center"
 		"dulltext"		"0"
 		"brighttext"	"0"
diff --git a/resource/ui/econ/confirmdialog.res b/resource/ui/econ/confirmdialog.res
deleted file mode 100644
index 602d565..0000000
--- a/resource/ui/econ/confirmdialog.res
+++ /dev/null
@@ -1,116 +0,0 @@
-"Resource/UI/ConfirmDialog.res"
-{
-	"ConfirmDialog"
-	{
-		"ControlName"			"Frame"
-		"fieldName"				"ConfirmDialog"
-		"xpos"					"c-150"
-		"ypos"					"140"
-		"wide"					"324"
-		"tall"					"200"
-		"autoResize"			"0"
-		"pinCorner"				"0"
-		"visible"				"1"
-		"enabled"				"1"
-		"tabPosition"			"0"
-		"settitlebarvisible"	"0"
-		"PaintBackgroundType"	"0"
-		"paintbackground"		"1"
-		"paintborder"			"1"
-		"border"				"CyanBorderThick"
-		"bgcolor_override"		"25 25 25 255"
-	}
-	
-	"TitleLabel"
-	{
-		"ControlName"			"CExLabel"
-		"fieldName"				"TitleLabel"
-		"font"					"Cerbetica26"
-		"labelText"				"#ConfirmTitle"
-		"textAlignment"			"north"
-		"xpos"					"0"
-		"ypos"					"15"
-		"zpos"					"1"
-		"wide"					"324"
-		"tall"					"20"
-		"autoResize"			"1"
-		"pinCorner"				"0"
-		"visible"				"1"
-		"enabled"				"1"
-	}
-	
-	"ExplanationLabel"
-	{
-		"ControlName"			"CExLabel"
-		"fieldName"				"ExplanationLabel"
-		"font"					"HudFontSmall"
-		"labelText"				"%text%"
-		"textAlignment"			"center"
-		"xpos"					"40"
-		"ypos"					"50"
-		"zpos"					"1"
-		"wide"					"324"
-		"tall"					"170"
-		"autoResize"			"0"
-		"pinCorner"				"0"
-		"visible"				"1"
-		"enabled"				"1"
-		"centerwrap"			"1"
-		"fgcolor_override"		"Yellow"
-	}
-	
-	"CancelButton"
-	{
-		"ControlName"			"CExButton"
-		"fieldName"				"CancelButton"
-		"xpos"					"190"
-		"ypos"					"165"
-		"zpos"					"20"
-		"wide"					"124"
-		"tall"					"20"
-		"autoResize"			"0"
-		"pinCorner"				"0"
-		"visible"				"1"
-		"enabled"				"1"
-		"tabPosition"			"0"
-		"labelText"				"#GameUI_CancelBold"
-		"font"					"HudFontSmall"
-		"textAlignment"			"center"
-		"textinsetx"			"50"
-		"dulltext"				"0"
-		"brighttext"			"0"
-		"Command"				"cancel"
-		"sound_depressed"		"UI/buttonclick.wav"
-		"sound_released"		"UI/buttonclickrelease.wav"
-		"border_default"		"ButtonHover"
-		"border_armed"			"ButtonHover"
-	}
-	
-	"ConfirmButton"
-	{
-		"ControlName"			"CExButton"
-		"fieldName"				"ConfirmButton"
-		"xpos"					"10"
-		"ypos"					"165"
-		"zpos"					"20"
-		"wide"					"175"
-		"tall"					"20"
-		"default"				"1"
-		"autoResize"			"0"
-		"pinCorner"				"0"
-		"visible"				"1"
-		"enabled"				"1"
-		"tabPosition"			"0"
-		"labelText"				"#ConfirmButtonText"
-		"font"					"HudFontSmall"
-		"textAlignment"			"center"
-		"textinsetx"			"50"
-		"dulltext"				"0"
-		"brighttext"			"0"
-		"Command"				"confirm"
-		"sound_depressed"		"UI/buttonclick.wav"
-		"sound_released"		"UI/buttonclickrelease.wav"
-		"border_default"		"ButtonHover"
-		"border_armed"			"ButtonHover"
-	}
-}
-\ No newline at end of file
diff --git a/resource/ui/econ/confirmdialogoptout.res b/resource/ui/econ/confirmdialogoptout.res
index 380d25a..81b8d1b 100644
--- a/resource/ui/econ/confirmdialogoptout.res
+++ b/resource/ui/econ/confirmdialogoptout.res
@@ -55,7 +55,7 @@
 		"visible"		"1"
 		"enabled"		"1"
 		"centerwrap"	"1"
-		"fgcolor_override" "Base Color"
+		"fgcolor_override" "ColorCyan"
 	}
 		
 	"CancelButton"
diff --git a/resource/ui/econ/itempickuppanel.res b/resource/ui/econ/itempickuppanel.res
index bec9d6f..839cff2 100644
--- a/resource/ui/econ/itempickuppanel.res
+++ b/resource/ui/econ/itempickuppanel.res
@@ -16,9 +16,9 @@
 		"tabPosition"	"0"
 		"settitlebarvisible"	"0"
 		"PaintBackgroundType"	"0"
-		"bgcolor_override"	"25 25 25 255"
-		"infocus_bgcolor_override" "25 25 25 255"
-		"outoffocus_bgcolor_override" "25 25 25 255"
+		"bgcolor_override"				"DarkGrey"
+		"infocus_bgcolor_override"		"DarkGrey"
+		"outoffocus_bgcolor_override"	"DarkGrey"
 		
 		"modelpanels_spacing"		"40"
 		"modelpanels_width"			"500"
@@ -307,9 +307,9 @@
 		"sound_depressed"	"UI/buttonclick.wav"
 		"sound_released"	"UI/buttonclickrelease.wav"
 
-		"defaultBgColor_override" "117 107 94 255"
+		"defaultBgColor_override" "TextColor"
 		"armedBgColor_override" "145 73 59 255"
-		"depressedBgColor_override" "117 107 94 255"
+		"depressedBgColor_override" "TextColor"
 			
 		"image_drawcolor"	"235 226 202 255"		
 		"image_armedcolor"	"235 226 202 255"		
@@ -380,8 +380,8 @@
 		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
-		"fgcolor_override" "200 80 60 255"
-		"bgcolor_override"	"46 43 42 255"
+		"fgcolor_override" "LightRed"
+		"bgcolor_override"	"TanDarker"
 	}
 	
 	"ScoreEntry"
diff --git a/resource/ui/econ/strangecounttransferdialog.res b/resource/ui/econ/strangecounttransferdialog.res
index 30d95a3..c362dd8 100644
--- a/resource/ui/econ/strangecounttransferdialog.res
+++ b/resource/ui/econ/strangecounttransferdialog.res
@@ -24,7 +24,7 @@
 		"zpos"					"0"
 		"wide"					"400"
 		"tall"					"240"
-		"bgcolor_override"		"25 25 25 255"
+		"bgcolor_override"		"DarkGrey"
 		"paintbackgroundtype"	"0"
 		"settitlebarvisible"	"0"
 		"proportionaltoparent"	"1"
@@ -78,8 +78,8 @@
 			"wide"			"84"
 			"tall"			"64"
 			"visible"		"1"
-			"bgcolor_override"		"0 0 0 0"
-			"noitem_textcolor"		"117 107 94 255"
+			"bgcolor_override"		"Transparent"
+			"noitem_textcolor"		"TextColor"
 			"PaintBackgroundType"	"2"
 			"paintborder"	"0"
 			"model_xpos"	"2"
@@ -127,8 +127,8 @@
 			"wide"			"84"
 			"tall"			"64"
 			"visible"		"1"
-			"bgcolor_override"		"0 0 0 0"
-			"noitem_textcolor"		"117 107 94 255"
+			"bgcolor_override"		"Transparent"
+			"noitem_textcolor"		"TextColor"
 			"PaintBackgroundType"	"2"
 			"paintborder"	"0"
 			"model_xpos"	"2"
diff --git a/resource/ui/hud_obj_dispenser.res b/resource/ui/hud_obj_dispenser.res
index c12b93c..57d61c9 100644
--- a/resource/ui/hud_obj_dispenser.res
+++ b/resource/ui/hud_obj_dispenser.res
@@ -37,7 +37,7 @@
 		"enabled"		"1"
 		"scaleImage"	"1"	
 		"icon"			"obj_status_dispenser"
-		"iconColor"		"255 255 255 255"
+		"iconColor"		"White"
 	}
 	
 	"NotBuiltPanel"
@@ -54,7 +54,7 @@
 		{
 			"ControlName"	"CExLabel"
 			"fieldName"		"NotBuiltLabel"
-			"font"			"Cerbetica9"
+			"font"			"Cerbetica10"
 			"xpos"			"60"
 			"ypos"			"0"
 			"wide"			"200"
@@ -93,7 +93,7 @@
 			"enabled"		"1"
 			"scaleImage"	"1"	
 			"icon"			"obj_status_upgrade_1"
-			"iconColor"		"255 255 255 255"
+			"iconColor"		"White"
 		}
 
 		"Icon_Upgrade_2"
@@ -109,7 +109,7 @@
 			"enabled"		"1"
 			"scaleImage"	"1"	
 			"icon"			"obj_status_upgrade_2"
-			"iconColor"		"255 255 255 255"
+			"iconColor"		"White"
 		}
 
 		"Icon_Upgrade_3"
@@ -125,7 +125,7 @@
 			"enabled"		"1"
 			"scaleImage"	"1"	
 			"icon"			"obj_status_upgrade_3"
-			"iconColor"		"255 255 255 255"
+			"iconColor"		"White"
 		}
 
 		"AlertTray"
@@ -154,7 +154,7 @@
 			"enabled"		"1"
 			"scaleImage"	"1"	
 			"icon"			"obj_status_icon_wrench"
-			"iconColor"		"255 255 255 255"
+			"iconColor"		"White"
 		}
 		
 		"SapperIcon"
@@ -170,7 +170,7 @@
 			"enabled"		"1"
 			"scaleImage"	"1"	
 			"icon"			"obj_status_icon_sapper"
-			"iconColor"		"255 255 255 255"
+			"iconColor"		"White"
 		}
 
 		"Health"
diff --git a/resource/ui/hud_obj_sapper.res b/resource/ui/hud_obj_sapper.res
index 42acbb7..8944faf 100644
--- a/resource/ui/hud_obj_sapper.res
+++ b/resource/ui/hud_obj_sapper.res
@@ -37,7 +37,7 @@
 		"enabled"		"1"
 		"scaleImage"	"1"	
 		"icon"			"obj_status_sapper"
-		"iconColor"		"255 255 255 255"
+		"iconColor"		"White"
 	}
 	
 	"NotBuiltPanel"
@@ -54,7 +54,7 @@
 		{
 			"ControlName"	"CExLabel"
 			"fieldName"		"NotBuiltLabel"
-			"font"			"Cerbetica12"
+			"font"			"DefaultSmall"
 			"xpos"			"60"
 			"ypos"			"0"
 			"wide"			"200"
@@ -168,7 +168,7 @@
 				"enabled"		"1"
 				"scaleImage"	"1"	
 				"icon"			"obj_status_sentrygun_1"
-				"iconColor"		"255 255 255 255"
+				"iconColor"		"White"
 			}
 			
 			"TargetHealth"
diff --git a/resource/ui/hud_obj_sentrygun.res b/resource/ui/hud_obj_sentrygun.res
index c124510..e103d7e 100644
--- a/resource/ui/hud_obj_sentrygun.res
+++ b/resource/ui/hud_obj_sentrygun.res
@@ -37,7 +37,7 @@
 		"enabled"		"1"
 		"scaleImage"	"1"	
 		"icon"			"obj_status_sentrygun_1"
-		"iconColor"		"255 255 255 255"
+		"iconColor"		"White"
 	}
 	
 	"Icon_Sentry_2"
@@ -52,7 +52,7 @@
 		"enabled"		"1"
 		"scaleImage"	"1"	
 		"icon"			"obj_status_sentrygun_2"
-		"iconColor"		"255 255 255 255"
+		"iconColor"		"White"
 	}
 	
 	"Icon_Sentry_3"
@@ -67,7 +67,7 @@
 		"enabled"		"1"
 		"scaleImage"	"1"	
 		"icon"			"obj_status_sentrygun_3"
-		"iconColor"		"255 255 255 255"
+		"iconColor"		"White"
 	}
 	
 	"NotBuiltPanel"
@@ -84,7 +84,7 @@
 		{
 			"ControlName"	"CExLabel"
 			"fieldName"		"NotBuiltLabel"
-			"font"			"Cerbetica9"
+			"font"			"Cerbetica10"
 			"xpos"			"60"
 			"ypos"			"0"
 			"wide"			"200"
@@ -122,7 +122,7 @@
 			"enabled"		"1"
 			"scaleImage"	"1"	
 			"icon"			"obj_status_upgrade_1"
-			"iconColor"		"255 255 255 255"
+			"iconColor"		"White"
 		}
 		
 		"Icon_Upgrade_2"
@@ -138,7 +138,7 @@
 			"enabled"		"1"
 			"scaleImage"	"1"	
 			"icon"			"obj_status_upgrade_2"
-			"iconColor"		"255 255 255 255"
+			"iconColor"		"White"
 		}
 		
 		"Icon_Upgrade_3"
@@ -154,7 +154,7 @@
 			"enabled"		"1"
 			"scaleImage"	"1"	
 			"icon"			"obj_status_upgrade_3"
-			"iconColor"		"255 255 255 255"
+			"iconColor"		"White"
 		}
 		
 		"AlertTray"
@@ -185,7 +185,7 @@
 			"enabled"		"1"
 			"scaleImage"	"1"	
 			"icon"			"obj_status_icon_wrench"
-			"iconColor"		"255 255 255 255"
+			"iconColor"		"White"
 		}
 		
 		"SapperIcon"
@@ -201,7 +201,7 @@
 			"enabled"		"1"
 			"scaleImage"	"1"	
 			"icon"			"obj_status_icon_sapper"
-			"iconColor"		"255 255 255 255"
+			"iconColor"		"White"
 		}
 		
 		"Health"
diff --git a/resource/ui/hud_obj_sentrygun_disp.res b/resource/ui/hud_obj_sentrygun_disp.res
index 29cf5dc..6ae1f7d 100644
--- a/resource/ui/hud_obj_sentrygun_disp.res
+++ b/resource/ui/hud_obj_sentrygun_disp.res
@@ -37,7 +37,7 @@
 		"enabled"		"1"
 		"scaleImage"	"1"	
 		"icon"			"obj_status_sentrygun_1"
-		"iconColor"		"255 255 255 255"
+		"iconColor"		"White"
 	}
 	
 	"NotBuiltPanel"
@@ -54,7 +54,7 @@
 		{
 			"ControlName"	"CExLabel"
 			"fieldName"		"NotBuiltLabel"
-			"font"			"Cerbetica9"
+			"font"			"Cerbetica10"
 			"xpos"			"60"
 			"ypos"			"0"
 			"wide"			"200"
@@ -93,7 +93,7 @@
 			"enabled"		"0"
 			"scaleImage"	"1"	
 			"icon"			""
-			"iconColor"		"255 255 255 255"
+			"iconColor"		"White"
 		}
 	
 		"AlertTray"
@@ -102,7 +102,6 @@
 			"fieldName"		"AlertTray"
 			"xpos"			"114"
 			"ypos"			"0"
-			"ypos"			"0"
 			"zpos"			"-2"
 			"wide"			"44"
 			"tall"			"30"
@@ -124,7 +123,7 @@
 			"enabled"		"0"
 			"scaleImage"	"1"	
 			"icon"			"obj_status_icon_wrench"
-			"iconColor"		"255 255 255 255"
+			"iconColor"		"White"
 		}
 		
 		"SapperIcon"
@@ -140,7 +139,7 @@
 			"enabled"		"0"
 			"scaleImage"	"1"	
 			"icon"			"obj_status_icon_sapper"
-			"iconColor"		"255 255 255 255"
+			"iconColor"		"White"
 		}
 		
 		"Health"
diff --git a/resource/ui/hud_obj_tele.res b/resource/ui/hud_obj_tele.res
index fc97d84..02270c7 100644
--- a/resource/ui/hud_obj_tele.res
+++ b/resource/ui/hud_obj_tele.res
@@ -37,7 +37,7 @@
 		"enabled"		"1"
 		"scaleImage"	"1"	
 		"icon"			"obj_status_tele_entrance"
-		"iconColor"		"255 255 255 255"
+		"iconColor"		"White"
 	}
 	
 	"NotBuiltPanel"
@@ -54,7 +54,7 @@
 		{
 			"ControlName"	"CExLabel"
 			"fieldName"		"NotBuiltLabel"
-			"font"			"Cerbetica9"
+			"font"			"Cerbetica10"
 			"xpos"			"60"
 			"ypos"			"0"
 			"wide"			"200"
@@ -93,7 +93,7 @@
 			"enabled"		"1"
 			"scaleImage"	"1"	
 			"icon"			"obj_status_upgrade_1"
-			"iconColor"		"255 255 255 255"
+			"iconColor"		"White"
 		}
 
 		"Icon_Upgrade_2"
@@ -109,7 +109,7 @@
 			"enabled"		"1"
 			"scaleImage"	"1"	
 			"icon"			"obj_status_upgrade_2"
-			"iconColor"		"255 255 255 255"
+			"iconColor"		"White"
 		}
 
 		"Icon_Upgrade_3"
@@ -125,7 +125,7 @@
 			"enabled"		"1"
 			"scaleImage"	"1"	
 			"icon"			"obj_status_upgrade_3"
-			"iconColor"		"255 255 255 255"
+			"iconColor"		"White"
 		}
 		
 		"AlertTray"
@@ -154,7 +154,7 @@
 			"enabled"		"1"
 			"scaleImage"	"1"	
 			"icon"			"obj_status_icon_wrench"
-			"iconColor"		"255 255 255 255"
+			"iconColor"		"White"
 		}
 		
 		"SapperIcon"
@@ -170,7 +170,7 @@
 			"enabled"		"1"
 			"scaleImage"	"1"	
 			"icon"			"obj_status_icon_sapper"
-			"iconColor"		"255 255 255 255"
+			"iconColor"		"White"
 		}
 
 		"Health"
diff --git a/resource/ui/hud_obj_tele_entrance.res b/resource/ui/hud_obj_tele_entrance.res
index 9025303..f195a9c 100644
--- a/resource/ui/hud_obj_tele_entrance.res
+++ b/resource/ui/hud_obj_tele_entrance.res
@@ -37,7 +37,7 @@
 		"enabled"		"1"
 		"scaleImage"	"1"	
 		"icon"			"obj_status_tele_entrance"
-		"iconColor"		"255 255 255 255"
+		"iconColor"		"White"
 	}
 	
 	"NotBuiltPanel"
@@ -54,7 +54,7 @@
 		{
 			"ControlName"	"CExLabel"
 			"fieldName"		"NotBuiltLabel"
-			"font"			"Cerbetica9"
+			"font"			"Cerbetica10"
 			"xpos"			"60"
 			"ypos"			"0"
 			"wide"			"200"
@@ -93,7 +93,7 @@
 			"enabled"		"1"
 			"scaleImage"	"1"	
 			"icon"			"obj_status_upgrade_1"
-			"iconColor"		"255 255 255 255"
+			"iconColor"		"White"
 		}
 
 		"Icon_Upgrade_2"
@@ -109,7 +109,7 @@
 			"enabled"		"1"
 			"scaleImage"	"1"	
 			"icon"			"obj_status_upgrade_2"
-			"iconColor"		"255 255 255 255"
+			"iconColor"		"White"
 		}
 
 		"Icon_Upgrade_3"
@@ -125,7 +125,7 @@
 			"enabled"		"1"
 			"scaleImage"	"1"	
 			"icon"			"obj_status_upgrade_3"
-			"iconColor"		"255 255 255 255"
+			"iconColor"		"White"
 		}
 
 		"AlertTray"
@@ -154,7 +154,7 @@
 			"enabled"		"1"
 			"scaleImage"	"1"	
 			"icon"			"obj_status_icon_wrench"
-			"iconColor"		"255 255 255 255"
+			"iconColor"		"White"
 		}
 		
 		"SapperIcon"
@@ -170,7 +170,7 @@
 			"enabled"		"1"
 			"scaleImage"	"1"	
 			"icon"			"obj_status_icon_sapper"
-			"iconColor"		"255 255 255 255"
+			"iconColor"		"White"
 		}
 
 		"Health"
diff --git a/resource/ui/hud_obj_tele_exit.res b/resource/ui/hud_obj_tele_exit.res
index ebeab4b..304d77e 100644
--- a/resource/ui/hud_obj_tele_exit.res
+++ b/resource/ui/hud_obj_tele_exit.res
@@ -37,7 +37,7 @@
 		"enabled"		"1"
 		"scaleImage"	"1"	
 		"icon"			"obj_status_tele_exit"
-		"iconColor"		"255 255 255 255"
+		"iconColor"		"White"
 	}
 	
 	"NotBuiltPanel"
@@ -54,7 +54,7 @@
 		{
 			"ControlName"	"CExLabel"
 			"fieldName"		"NotBuiltLabel"
-			"font"			"Cerbetica9"
+			"font"			"Cerbetica10"
 			"xpos"			"60"
 			"ypos"			"0"
 			"wide"			"200"
@@ -93,7 +93,7 @@
 			"enabled"		"1"
 			"scaleImage"	"1"	
 			"icon"			"obj_status_upgrade_1"
-			"iconColor"		"255 255 255 255"
+			"iconColor"		"White"
 		}
 
 		"Icon_Upgrade_2"
@@ -109,7 +109,7 @@
 			"enabled"		"1"
 			"scaleImage"	"1"	
 			"icon"			"obj_status_upgrade_2"
-			"iconColor"		"255 255 255 255"
+			"iconColor"		"White"
 		}
 
 		"Icon_Upgrade_3"
@@ -125,7 +125,7 @@
 			"enabled"		"1"
 			"scaleImage"	"1"	
 			"icon"			"obj_status_upgrade_3"
-			"iconColor"		"255 255 255 255"
+			"iconColor"		"White"
 		}
 
 		"AlertTray"
@@ -154,7 +154,7 @@
 			"enabled"		"1"
 			"scaleImage"	"1"	
 			"icon"			"obj_status_icon_wrench"
-			"iconColor"		"255 255 255 255"
+			"iconColor"		"White"
 		}
 		
 		"SapperIcon"
@@ -170,7 +170,7 @@
 			"enabled"		"1"
 			"scaleImage"	"1"	
 			"icon"			"obj_status_icon_sapper"
-			"iconColor"		"255 255 255 255"
+			"iconColor"		"White"
 		}
 		
 		"Health"
diff --git a/resource/ui/hudmatchstatus.res b/resource/ui/hudmatchstatus.res
index 8ae1cb5..c2eef31 100644
--- a/resource/ui/hudmatchstatus.res
+++ b/resource/ui/hudmatchstatus.res
@@ -102,7 +102,7 @@
 		"wrap"			"0"
 		"labelText"		"%countdown%"
 		"textAlignment"	"center"
-		"fgcolor"		"Black"
+		"fgcolor"		"TransparentBlack"
 		"proportionaltoparent"	"1"
 
 		if_readymode
@@ -292,7 +292,6 @@
 
 		if_match
 		{
-			"ypos"					"0"
 			"delta_item_x"			"35"
 			"delta_item_start_y"	"12"
 			"delta_item_end_y"		"50"
@@ -327,7 +326,6 @@
 				"ypos"			"13"
 				"tall"			"10"
 				"font"			"HudFontSmall"
-				"font_minmode"	"HudFontSmall"
 				"font_lodef"	"HudFontSmall"
 			}
 		}	
@@ -373,8 +371,8 @@
 			"percentage_health_med"	"0.6"
 			"color_bar_health_low"	"191 58 58 255"
 			"percentage_health_low"	"0.3"
-			"color_portrait_blend_dead_red"	"255 255 255 255"
-			"color_portrait_blend_dead_blue" "255 255 255 255"
+			"color_portrait_blend_dead_red"	"White"
+			"color_portrait_blend_dead_blue" "White"
 			
 			"playername"
 			{
@@ -687,7 +685,7 @@
 			"tall"			"39"
 			"visible"		"1"
 			"PaintBackgroundType"	"2"
-			"bgcolor_override"	"117 107 94 255"
+			"bgcolor_override"	"TextColor"
 		}
 		"BluePlayerList"
 		{
@@ -825,7 +823,7 @@
 			"tall"			"39"
 			"visible"		"1"
 			"PaintBackgroundType"	"2"
-			"bgcolor_override"	"117 107 94 255"
+			"bgcolor_override"	"TextColor"
 		}
 		"RedPlayerList"
 		{
diff --git a/resource/ui/hudmenutauntselection.res b/resource/ui/hudmenutauntselection.res
index c6be995..ebb060c 100644
--- a/resource/ui/hudmenutauntselection.res
+++ b/resource/ui/hudmenutauntselection.res
@@ -20,28 +20,14 @@
 	{
 		"ControlName"	"ImagePanel"
 		"fieldName"		"Divider"
-		"xpos"			"8"
-		"ypos"			"65"
-		"zpos"			"1"
-		"wide"			"0"
-		"tall"			"0"
-		"fillcolor"		"255 222 208 255"
+		"xpos"			"9999"
 	}
 
 	"IcoReelIcon"
 	{
 		"ControlName"	"CIconPanel"
 		"fieldName"		"IcoReelIcon"
-		"xpos"			"10"
-		"ypos"			"-3"
-		"zpos"			"1"
-		"wide"			"0"
-		"tall"			"0"
-		"visible"		"1"
-		"enabled"		"0"
-		"scaleImage"	"0"	
-		"icon"			"hud_taunt_menu_icon"
-		"iconColor"		"255 255 255 255"
+		"xpos"			"9999"
 	}
 	
 	"TitleLabel"
@@ -70,8 +56,8 @@
 		"fieldName"		"TitleLabelDropshadow"
 		"font"			"CerbeticaBold32"
 		"fgcolor"		"TransparentBlack"
-		"xpos"			"20"			// align me to the left edge of the first selection
-		"ypos"			"2"
+		"xpos"			"-1"
+		"ypos"			"-1"
 		"zpos"			"3"
 		"wide"			"360"
 		"tall"			"38"
@@ -83,6 +69,10 @@
 		"textAlignment"	"Left"
 		"dulltext"		"1"
 		"brighttext"	"0"
+
+		"pin_to_sibling"		"TitleLabel"
+		"pin_corner_to_sibling" "PIN_TOPLEFT"
+		"pin_to_sibling_corner" "PIN_TOPLEFT"
 	}
 
 	"WeaponTauntLabel"
@@ -135,8 +125,8 @@
 		"wide"			"50"
 		"tall"			"40"
 		"visible"		"1"
-		"bgcolor_override"		"0 0 0 0"
-		"noitem_textcolor"		"117 107 94 255"
+		"bgcolor_override"		"Transparent"
+		"noitem_textcolor"		"TextColor"
 		"PaintBackgroundType"	"0"
 		"paintborder"	"1"
 			
@@ -174,7 +164,7 @@
 		"enabled"		"0"
 		"scaleImage"	"1"	
 		"icon"			"ico_key_blank"
-		"iconColor"		"255 255 255 255"
+		"iconColor"		"White"
 	}
 	
 	"NumberLabel1"
@@ -229,8 +219,8 @@
 		"wide"			"50"
 		"tall"			"40"
 		"visible"		"1"
-		"bgcolor_override"		"0 0 0 0"
-		"noitem_textcolor"		"117 107 94 255"
+		"bgcolor_override"		"Transparent"
+		"noitem_textcolor"		"TextColor"
 		"PaintBackgroundType"	"0"
 		"paintborder"	"1"
 
@@ -323,8 +313,8 @@
 		"wide"			"50"
 		"tall"			"40"
 		"visible"		"1"
-		"bgcolor_override"		"0 0 0 0"
-		"noitem_textcolor"		"117 107 94 255"
+		"bgcolor_override"		"Transparent"
+		"noitem_textcolor"		"TextColor"
 		"PaintBackgroundType"	"0"
 		"paintborder"	"1"
 			
@@ -418,8 +408,8 @@
 		"wide"			"50"
 		"tall"			"40"
 		"visible"		"1"
-		"bgcolor_override"		"0 0 0 0"
-		"noitem_textcolor"		"117 107 94 255"
+		"bgcolor_override"		"Transparent"
+		"noitem_textcolor"		"TextColor"
 		"PaintBackgroundType"	"0"
 		"paintborder"	"1"
 			
@@ -456,7 +446,7 @@
 		"enabled"		"0"
 		"scaleImage"	"1"	
 		"icon"			"ico_key_blank"
-		"iconColor"		"255 255 255 255"
+		"iconColor"		"White"
 	}
 	
 	"NumberLabel4"
@@ -511,8 +501,8 @@
 		"wide"			"50"
 		"tall"			"40"
 		"visible"		"1"
-		"bgcolor_override"		"0 0 0 0"
-		"noitem_textcolor"		"117 107 94 255"
+		"bgcolor_override"		"Transparent"
+		"noitem_textcolor"		"TextColor"
 		"PaintBackgroundType"	"0"
 		"paintborder"	"1"
 			
@@ -550,7 +540,7 @@
 		"enabled"		"0"
 		"scaleImage"	"1"	
 		"icon"			"ico_key_blank"
-		"iconColor"		"255 255 255 255"
+		"iconColor"		"White"
 	}
 	
 	"NumberLabel5"
@@ -605,8 +595,8 @@
 		"wide"			"50"
 		"tall"			"40"
 		"visible"		"1"
-		"bgcolor_override"		"0 0 0 0"
-		"noitem_textcolor"		"117 107 94 255"
+		"bgcolor_override"		"Transparent"
+		"noitem_textcolor"		"TextColor"
 		"PaintBackgroundType"	"0"
 		"paintborder"	"1"
 			
@@ -644,7 +634,7 @@
 		"enabled"		"0"
 		"scaleImage"	"1"	
 		"icon"			"ico_key_blank"
-		"iconColor"		"255 255 255 255"
+		"iconColor"		"White"
 	}
 	
 	"NumberLabel6"
@@ -699,8 +689,8 @@
 		"wide"			"50"
 		"tall"			"40"
 		"visible"		"1"
-		"bgcolor_override"		"0 0 0 0"
-		"noitem_textcolor"		"117 107 94 255"
+		"bgcolor_override"		"Transparent"
+		"noitem_textcolor"		"TextColor"
 		"PaintBackgroundType"	"0"
 		"paintborder"	"1"
 			
@@ -738,7 +728,7 @@
 		"enabled"		"0"
 		"scaleImage"	"1"	
 		"icon"			"ico_key_blank"
-		"iconColor"		"255 255 255 255"
+		"iconColor"		"White"
 	}
 	
 	"NumberLabel7"
@@ -793,8 +783,8 @@
 		"wide"			"50"
 		"tall"			"40"
 		"visible"		"1"
-		"bgcolor_override"		"0 0 0 0"
-		"noitem_textcolor"		"117 107 94 255"
+		"bgcolor_override"		"Transparent"
+		"noitem_textcolor"		"TextColor"
 		"PaintBackgroundType"	"0"
 		"paintborder"	"1"
 			
@@ -832,7 +822,7 @@
 		"enabled"		"0"
 		"scaleImage"	"1"	
 		"icon"			"ico_key_blank"
-		"iconColor"		"255 255 255 255"
+		"iconColor"		"White"
 	}
 	
 	"NumberLabel8"
diff --git a/resource/ui/hudminigame_base.res b/resource/ui/hudminigame_base.res
index 71b3990..08d6680 100644
--- a/resource/ui/hudminigame_base.res
+++ b/resource/ui/hudminigame_base.res
@@ -143,7 +143,7 @@
 		"tall"			"20"	[$WIN32]
 		"visible"		"1"
 		"enabled"		"1"
-		"fillcolor"		"0 0 0 0"
+		"fillcolor"		"Transparent"
 		"scaleImage"	"1"	
 	}
 
diff --git a/resource/ui/hudrocketpack.res b/resource/ui/hudrocketpack.res
index 360c9f0..7fde849 100644
--- a/resource/ui/hudrocketpack.res
+++ b/resource/ui/hudrocketpack.res
@@ -3,11 +3,8 @@
 {
 	HudItemEffectMeter
 	{
-		"fieldName"		"HudItemEffectMeter"
-		"visible"		"1"
-		"enabled"		"1"
 		"xpos"			"c-75"
-		"ypos"			"c123"
+		"ypos"			"c103"
 		"ypos_minmode"	"c60"
 		"wide"			"200"
 		"tall"			"500"
@@ -17,19 +14,7 @@
 	{
 		"ControlName"	"CTFImagePanel"
 		"fieldName"		"ItemEffectMeterBG"
-		"xpos"			"4"
-		"ypos"			"0"
-		"zpos"			"1"
-		"wide"			"90"
-		"tall"			"45"
-		"visible"		"0"
-		"enabled"		"0"
-		"scaleImage"	"1"	
-		"image"				"../hud/ammo_blue_bg"
-		"teambg_2"			"../hud/ammo_red_bg"
-		"teambg_2_lodef"	"../hud/ammo_red_bg_lodef"
-		"teambg_3"			"../hud/ammo_blue_bg"
-		"teambg_3_lodef"	"../hud/ammo_blue_bg_lodef"					
+		"xpos"			"9999"				
 	}
 
 	"ItemEffectIcon"
@@ -50,31 +35,19 @@
 
 	"ItemEffectMeterLabel"
 	{
-		"ControlName"	"CExLabel"
-		"fieldName"		"ItemEffectMeterLabel"
 		"xpos"			"32"
 		"ypos"			"12"
-		"zpos"			"2"
 		"wide"			"90"
 		"tall"			"15"
-		"autoResize"	"1"
-		"pinCorner"		"2"
 		"visible"		"0"
-		"enabled"		"0"
-		"tabPosition"	"0"
 		"labelText"		"#TF_RocketPack_Disabled"
-		"textAlignment"	"west"
-		"dulltext"		"0"
-		"brighttext"	"0"
 		"font"			"HudFontSmallest"
-		"fgcolor"		"178 0 0 255"
 	}
 
 	"ItemEffectMeter"
 	{	
 		"ControlName"	"ContinuousProgressBar"
 		"fieldName"		"ItemEffectMeter"
-		"font"			"Default"
 		"xpos"			"0"
 		"xpos_minmode"	"15"
 		"ypos"			"5"
@@ -98,7 +71,6 @@
 	{	
 		"ControlName"	"ContinuousProgressBar"
 		"fieldName"		"ItemEffectMeter2"
-		"font"			"Default"
 		"xpos"			"60"
 		"ypos"			"5"
 		"xpos_minmode"	"75"
diff --git a/resource/ui/hudroundcounter.res b/resource/ui/hudroundcounter.res
index adb78d8..39c2dcd 100644
--- a/resource/ui/hudroundcounter.res
+++ b/resource/ui/hudroundcounter.res
@@ -63,10 +63,10 @@
 		"proportionaltoparent"	"1"
 	}
 	
-	"BlueScoreBG"
+	"BlueTeamBackground"
 	{
 		"ControlName"	"ImagePanel"
-		"fieldName"		"BlueScoreBG"
+		"fieldName"		"BlueTeamBackground"
 		"xpos"			"c-36"
 		"ypos"			"0"
 		"wide"			"36"
@@ -77,10 +77,10 @@
 		"proportionaltoparent"	"1"
 	}
 	
-	"RedScoreBG"
+	"RedTeamBackground"
 	{
 		"ControlName"	"ImagePanel"
-		"fieldName"		"RedScoreBG"
+		"fieldName"		"RedTeamBackground"
 		"xpos"			"c0"
 		"ypos"			"0"
 		"wide"			"36"
diff --git a/resource/ui/hudspellselection.res b/resource/ui/hudspellselection.res
index 38abb43..76ab103 100644
--- a/resource/ui/hudspellselection.res
+++ b/resource/ui/hudspellselection.res
@@ -41,7 +41,7 @@
 		"ypos"			"9999"
 		"wide"			"100"
 		"tall"			"10"
-		"fgcolor"		"tanlight"
+		"fgcolor"		"TanLight"
 		"visible"		"1"
 	}
 	
@@ -75,7 +75,7 @@
 		"ypos_minmode"	"50"
 		"wide"			"20"
 		"tall"			"30"
-		"fgcolor"		"tanlight"
+		"fgcolor"		"TanLight"
 	}
 	
 	"CountTextShadow"
@@ -85,14 +85,16 @@
 		"font"			"CerbeticaBold28"
 		"labelText"		"%counttext%"
 		"textAlignment" "center"
-		"xpos"			"44"
-		"ypos"			"31"
+		"xpos"			"-1"
+		"ypos"			"-1"
 		"zpos"			"0"
 		"font_minmode"	"CerbeticaBold20"
-		"xpos_minmode"	"19"
-		"ypos_minmode"	"51"
 		"wide"			"20"
 		"tall"			"30"
-		"fgcolor"		"0 0 0 255"
+		"fgcolor"		"TransparentBlack"
+
+		"pin_to_sibling"		"CountText"
+		"pin_corner_to_sibling" "PIN_TOPLEFT"
+		"pin_to_sibling_corner" "PIN_TOPLEFT"
 	}
 }
 \ No newline at end of file
diff --git a/resource/ui/hudupgradepanel.res b/resource/ui/hudupgradepanel.res
index 1c1c61a..ef93a24 100644
--- a/resource/ui/hudupgradepanel.res
+++ b/resource/ui/hudupgradepanel.res
@@ -65,7 +65,7 @@
 		"visible"		"1"
 		"enabled"		"1"
 		"tabPosition"	"0"
-		"bgcolor_override"	"0 0 0 230"
+		"bgcolor_override"	"HudBlack"
 	}
 	
 	"SelectWeaponPanel"
diff --git a/resource/ui/itemoptionspanel.res b/resource/ui/itemoptionspanel.res
index 9186c57..a821f3c 100644
--- a/resource/ui/itemoptionspanel.res
+++ b/resource/ui/itemoptionspanel.res
@@ -60,7 +60,7 @@
 			"visible"		"0"
 			"enabled"		"1"
 			"tabPosition"	"0"
-			"fgcolor_override" "Base Color"
+			"fgcolor_override" "ColorCyan"
 		}
 
 		"SetStyleButton"
@@ -85,10 +85,6 @@
 			"sound_depressed"	"UI/buttonclick.wav"
 			"sound_released"	"UI/buttonclickrelease.wav"
 			"Command"			"set_style"
-			
-			"border_default"			"NoBorder"
-			"border_armed"				"NoBorder"
-			"border_depressed"			"NoBorder"
 		}
 	}
 }
 \ No newline at end of file
diff --git a/resource/ui/itemquickswitch.res b/resource/ui/itemquickswitch.res
index 615eea4..ec7c213 100644
--- a/resource/ui/itemquickswitch.res
+++ b/resource/ui/itemquickswitch.res
@@ -15,7 +15,7 @@
 		"tabPosition"	"0"
 		"settitlebarvisible"	"0"
 		"PaintBackgroundType"	"2"
-		"bgcolor_override"		"25 25 25 255"
+		"bgcolor_override"		"DarkGrey"
 		"itempanel_xpos"		"0"
 		"itempanel_ydelta"		"0"
 		"border"				"NoBorder"
@@ -36,7 +36,7 @@
 			"text_xpos"		"60"
 			"text_wide"		"190"
 			"name_only"		"1"
-			"noitem_textcolor"		"117 107 94 255"
+			"noitem_textcolor"		"TextColor"
 		}
 	}
 	
@@ -150,8 +150,8 @@
 			"tall"			"40"
 			"visible"		"1"
 			"PaintBackgroundType"	"2"
-			"fgcolor_override" "200 80 60 255"
-			"bgcolor_override"	"0 0 0 0"
+			"fgcolor_override" "LightRed"
+			"bgcolor_override"	"Transparent"
 		}
 	}
 	
@@ -171,7 +171,7 @@
 		"pinCorner"		"0"
 		"visible"		"0"
 		"enabled"		"1"
-		"fgcolor_override" "200 80 60 255"
+		"fgcolor_override" "LightRed"
 	}
 	
 	"loadout_preset_panel"
diff --git a/resource/ui/itemrenameconfirmationdialog.res b/resource/ui/itemrenameconfirmationdialog.res
index 54837bf..8c1a1ce 100644
--- a/resource/ui/itemrenameconfirmationdialog.res
+++ b/resource/ui/itemrenameconfirmationdialog.res
@@ -11,8 +11,7 @@
 		"tall"					"240"
 		"settitlebarvisible"	"0"
 		"paintbackgroundtype"	"2"
-		"paintbackground"		"1"
-		"bgcolor_override"		"30 30 30 255"
+		"bgcolor_override"		"DarkGrey"
 		"border"				"CyanBorder"
 	}
 
@@ -80,8 +79,8 @@
 		"wide"			"200"
 		"tall"			"70"
 		"visible"		"1"
-		"bgcolor_override"		"0 0 0 0"
-		"noitem_textcolor"		"117 107 94 255"
+		"bgcolor_override"	"Transparent"
+		"noitem_textcolor"	"TextColor"
 		"PaintBackgroundType"	"2"
 		"paintborder"	"0"
 		"model_xpos"	"2"
@@ -143,8 +142,8 @@
 		"wide"			"90"
 		"tall"			"70"
 		"visible"		"1"
-		"bgcolor_override"		"0 0 0 0"
-		"noitem_textcolor"		"117 107 94 255"
+		"bgcolor_override"	"Transparent"
+		"noitem_textcolor"	"TextColor"
 		"PaintBackgroundType"	"2"
 		"paintborder"	"0"
 		"model_xpos"	"2"
@@ -178,13 +177,6 @@
 		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
-		"paintbackground"	"1"
-		"defaultBgColor_override"	"15 15 15 255"
-		"armedBgColor_override"		"25 25 25 255"
-		"depressedBgColor_override"	"25 25 25 255"
-		"defaultFgColor_override"	"TanLight"
-		"armedFgColor_override" 	"TanLight"
-		"depressedFgColor_override" "TanLight"
 		"border_default"			"ButtonHover"
 		"border_armed"				"ButtonHover"
 	}
@@ -206,7 +198,7 @@
 		"visible"		"1"
 		"enabled"		"1"
 		"centerwrap"	"1"
-		"fgcolor_override"	"235 226 202 255"
+		"fgcolor_override"	"NeutralWhite"
 	}
 
 	"WarningLabel"
@@ -251,13 +243,6 @@
 		"Command"		"cancel"
 		"sound_depressed"	"UI/buttonclick.wav"
 		"sound_released"	"UI/buttonclickrelease.wav"
-		"paintbackground"	"1"
-		"defaultBgColor_override"	"15 15 15 255"
-		"armedBgColor_override"		"25 25 25 255"
-		"depressedBgColor_override"	"25 25 25 255"
-		"defaultFgColor_override"	"TanLight"
-		"armedFgColor_override" 	"TanLight"
-		"depressedFgColor_override" "TanLight"
 		"border_default"			"ButtonHover"
 		"border_armed"				"ButtonHover"
 	}
@@ -285,13 +270,6 @@
 		"Command"		"apply"
 		"sound_depressed"	"UI/buttonclick.wav"
 		"sound_released"	"UI/buttonclickrelease.wav"
-		"paintbackground"	"1"
-		"defaultBgColor_override"	"15 15 15 255"
-		"armedBgColor_override"		"25 25 25 255"
-		"depressedBgColor_override"	"25 25 25 255"
-		"defaultFgColor_override"	"TanLight"
-		"armedFgColor_override" 	"TanLight"
-		"depressedFgColor_override" "TanLight"
 		"border_default"			"ButtonHover"
 		"border_armed"				"ButtonHover"
 	}
diff --git a/resource/ui/itemrenamedialog.res b/resource/ui/itemrenamedialog.res
index 83fbd58..4c316d0 100644
--- a/resource/ui/itemrenamedialog.res
+++ b/resource/ui/itemrenamedialog.res
@@ -9,10 +9,9 @@
 		"ypos"					"105"
 		"wide"					"400"
 		"tall"					"240"
-		"bgcolor_override"		"25 25 25 255"
+		"bgcolor_override"		"DarkGrey"
 		"paintbackgroundtype"	"2"
 		"settitlebarvisible"	"0"
-		"paintbackground"		"1"
 		"border"				"CyanBorder"
 	}
 
@@ -26,8 +25,8 @@
 		"wide"			"300"
 		"tall"			"300"
 		"visible"		"0"
-		"bgcolor_override"		"0 0 0 0"
-		"noitem_textcolor"		"117 107 94 255"
+		"bgcolor_override"	"Transparent"
+		"noitem_textcolor"	"TextColor"
 		"PaintBackgroundType"	"2"
 		"paintborder"		"1"
 		
@@ -69,7 +68,7 @@
 			"enabled"		"1"
 			"labelText"		"%attriblist%"
 			"textAlignment"	"center"
-			"fgcolor"		"117 107 94 255"
+			"fgcolor"		"TextColor"
 			"centerwrap"	"1"
 		}
     }
@@ -138,8 +137,8 @@
 		"wide"			"84"
 		"tall"			"64"
 		"visible"		"1"
-		"bgcolor_override"		"0 0 0 0"
-		"noitem_textcolor"		"117 107 94 255"
+		"bgcolor_override"		"Transparent"
+		"noitem_textcolor"		"TextColor"
 		"PaintBackgroundType"	"2"
 		"paintborder"	"0"
 		
@@ -205,7 +204,7 @@
 		"tall"			"64"
 		"visible"		"1"
 		"bgcolor_override"		"Transparent"
-		"noitem_textcolor"		"117 107 94 255"
+		"noitem_textcolor"		"TextColor"
 		"PaintBackgroundType"	"2"
 		"paintborder"	"0"
 		
@@ -261,7 +260,7 @@
 		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
-		"fgcolor_override" "255 255 255 255"
+		"fgcolor_override" "White"
 		"paintbackground" "0"
 	}
 
@@ -280,7 +279,7 @@
 		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
-		"fgcolor_override" "117 107 94 255"
+		"fgcolor_override" "TextColor"
 		"paintbackground" "0"
 	}
 
@@ -320,7 +319,7 @@
 		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
-		"fgcolor_override" "255 255 255 255"
+		"fgcolor_override" "White"
 		"paintbackground" "0"
 	}
 
@@ -393,13 +392,6 @@
 		"Command"		"cancel"
 		"sound_depressed"	"UI/buttonclick.wav"
 		"sound_released"	"UI/buttonclickrelease.wav"
-		"paintbackground"	"1"
-		"defaultBgColor_override"	"15 15 15 255"
-		"armedBgColor_override"		"25 25 25 255"
-		"depressedBgColor_override"	"25 25 25 255"
-		"defaultFgColor_override"	"TanLight"
-		"armedFgColor_override" 	"TanLight"
-		"depressedFgColor_override" "TanLight"
 		"border_default"			"ButtonHover"
 		"border_armed"				"ButtonHover"
 	}
@@ -427,13 +419,6 @@
 		"Command"		"apply"
 		"sound_depressed"	"UI/buttonclick.wav"
 		"sound_released"	"UI/buttonclickrelease.wav"
-		"paintbackground"	"1"
-		"defaultBgColor_override"	"15 15 15 255"
-		"armedBgColor_override"		"25 25 25 255"
-		"depressedBgColor_override"	"25 25 25 255"
-		"defaultFgColor_override"	"TanLight"
-		"armedFgColor_override" 	"TanLight"
-		"depressedFgColor_override" "TanLight"
 		"border_default"			"ButtonHover"
 		"border_armed"				"ButtonHover"
 	}
diff --git a/resource/ui/itemrenameinvaliddialog.res b/resource/ui/itemrenameinvaliddialog.res
index 00fb6af..5f41a73 100644
--- a/resource/ui/itemrenameinvaliddialog.res
+++ b/resource/ui/itemrenameinvaliddialog.res
@@ -9,8 +9,7 @@
 		"ypos"					"105"
 		"wide"					"400"
 		"tall"					"240"
-		"bgcolor_override"		"25 25 25 255"
-		"paintbackground"		"1"
+		"bgcolor_override"		"DarkGrey"
 		"settitlebarvisible"	"0"
 		"PaintBackgroundType"	"2"
 		"border"				"CyanBorder"
@@ -80,8 +79,8 @@
 		"wide"			"200"
 		"tall"			"70"
 		"visible"		"1"
-		"bgcolor_override"		"0 0 0 0"
-		"noitem_textcolor"		"117 107 94 255"
+		"bgcolor_override"	"Transparent"
+		"noitem_textcolor"	"TextColor"
 		"PaintBackgroundType"	"2"
 		"paintborder"	"0"
 		"model_xpos"	"2"
@@ -145,8 +144,8 @@
 		"wide"			"90"
 		"tall"			"70"
 		"visible"		"1"
-		"bgcolor_override"		"0 0 0 0"
-		"noitem_textcolor"		"117 107 94 255"
+		"bgcolor_override"	"Transparent"
+		"noitem_textcolor"	"TextColor"
 		"PaintBackgroundType"	"2"
 		"paintborder"	"0"
 		"model_xpos"	"2"
@@ -181,7 +180,7 @@
 		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
-		"fgcolor_override" "200 80 60 255"
+		"fgcolor_override" "LightRed"
 	}
 	
 	"GivenName"
@@ -219,7 +218,7 @@
 		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
-		"fgcolor_override" "200 80 60 255"
+		"fgcolor_override" "LightRed"
 	}
 
 	"BackFromInvalidButton"
diff --git a/resource/ui/lobbycontainerframe.res b/resource/ui/lobbycontainerframe.res
index 55bf690..35bec20 100644
--- a/resource/ui/lobbycontainerframe.res
+++ b/resource/ui/lobbycontainerframe.res
@@ -25,7 +25,7 @@
 		"titletextinsetY"	"0"
 		"titlebarfgcolor_override"				"200 187 161 255"
 		"titlebardisabledfgcolor_override"		"200 187 161 255"
-		"titlebarbgcolor_override"				"46 43 42 255"
+		"titlebarbgcolor_override"				"TanDarker"
 		
 		"clientinsetx_override"			"0"
 		"sheetinset_bottom"				"40"
@@ -103,7 +103,7 @@
 		"autoResize"	"0"
 		"PaintBackgroundType"	"2"
 		"border"				"NoBorder"
-		"bgcolor_override"		"Base Color"
+		"bgcolor_override"		"ColorCyan"
 	}		
 	
 	"Sheet"
@@ -130,7 +130,7 @@
 			"autoResize"	"0"
 			"PaintBackgroundType"	"2"
 			"border"				"NoBorder"
-			"bgcolor_override"		"Base Color"
+			"bgcolor_override"		"ColorCyan"
 		}				
 		
 		"tabskv"
diff --git a/resource/ui/matchmakingcasualcriteria.res b/resource/ui/matchmakingcasualcriteria.res
index 974ce96..9c4954b 100644
--- a/resource/ui/matchmakingcasualcriteria.res
+++ b/resource/ui/matchmakingcasualcriteria.res
@@ -73,7 +73,7 @@
 			"sound_released"	"UI/buttonclickrelease.wav"
 			"actionsignallevel"	"2"
 			"proportionaltoparent"	"1"
-			"image_drawcolor"	"242 242 242 255"
+			"image_drawcolor"	"White"
 			"image_armedcolor"	"169 123 53 255"
 
 			"SubImage"
@@ -117,7 +117,7 @@
 			"sound_released"	"UI/buttonclickrelease.wav"
 			"actionsignallevel"	"2"
 			"proportionaltoparent"	"1"
-			"image_drawcolor"	"242 242 242 255"
+			"image_drawcolor"	"White"
 			"image_armedcolor"	"169 123 53 255"
 
 			"SubImage"
diff --git a/resource/ui/matchmakingcategorypanel.res b/resource/ui/matchmakingcategorypanel.res
index 832cad7..00892f0 100644
--- a/resource/ui/matchmakingcategorypanel.res
+++ b/resource/ui/matchmakingcategorypanel.res
@@ -159,8 +159,8 @@
 		{
 			"ControlName"	"CExLabel"
 			"fieldName"		"TitleShadow"
-			"xpos"			"rs1-23"
-			"ypos"			"3"
+			"xpos"			"-1"
+			"ypos"			"-1"
 			"zpos"			"2"
 			"wide"			"200"
 			"tall"			"15"
@@ -176,8 +176,11 @@
 			"default"		"1"
 			"proportionaltoparent" "1"
 			"mouseinputenabled"	"0"
-
-			"fgcolor_override"		"7 7 7 255"
+			"fgcolor_override"		"TransparentBlack"
+			
+			"pin_to_sibling"		"Title"
+			"pin_corner_to_sibling"	"PIN_TOPLEFT"
+			"pin_to_sibling_corner"	"PIN_TOPLEFT"
 		}
 
 		"DescLabel"
@@ -209,8 +212,8 @@
 			"font"			"MMenuPlayListDesc"
 			"labelText"		"%desc_token%"
 			"textAlignment"	"north-west"
-			"xpos"			"rs1-4"
-			"ypos"			"19"
+			"xpos"			"-1"
+			"ypos"			"-1"
 			"zpos"			"1"
 			"wide"			"120"
 			"tall"			"40"
@@ -219,9 +222,13 @@
 			"visible"		"1"
 			"enabled"		"1"
 			"wrap"			"1"
-			"fgcolor_override" "7 7 7 255"
 			"proportionaltoparent" "1"
 			"mouseinputenabled"	"0"
+			"fgcolor_override" "TransparentBlack"
+			
+			"pin_to_sibling"		"DescLabel"
+			"pin_corner_to_sibling"	"PIN_TOPLEFT"
+			"pin_to_sibling_corner"	"PIN_TOPLEFT"
 		}
 	}
 
diff --git a/resource/ui/matchmakingdashboardcasualcriteria.res b/resource/ui/matchmakingdashboardcasualcriteria.res
index 62e6fea..a32e170 100644
--- a/resource/ui/matchmakingdashboardcasualcriteria.res
+++ b/resource/ui/matchmakingdashboardcasualcriteria.res
@@ -27,7 +27,7 @@
 		"labeltext"		"#TF_Matchmaking_HeaderCasual"
 		"textAlignment"	"west"
 		"font"			"CerbeticaBold24"
-		"fgcolor_override"	"242 242 242 255"
+		"fgcolor_override"	"White"
 		
 		"mouseinputenabled"	"0"
 	}
diff --git a/resource/ui/matchmakingdashboardcomp.res b/resource/ui/matchmakingdashboardcomp.res
index 249ed51..9f9c030 100644
--- a/resource/ui/matchmakingdashboardcomp.res
+++ b/resource/ui/matchmakingdashboardcomp.res
@@ -27,7 +27,7 @@
 		"labeltext"		"#TF_Matchmaking_HeaderCompetitive"
 		"textAlignment"	"west"
 		"font"			"CerbeticaBold24"
-		"fgcolor_override"	"242 242 242 255"
+		"fgcolor_override"	"White"
 		"mouseinputenabled"	"0"
 	}
 
diff --git a/resource/ui/matchmakingdashboardplaylist.res b/resource/ui/matchmakingdashboardplaylist.res
index af212e8..60f827b 100644
--- a/resource/ui/matchmakingdashboardplaylist.res
+++ b/resource/ui/matchmakingdashboardplaylist.res
@@ -27,7 +27,7 @@
 		"labeltext"		"#TF_Matchmaking_HeaderModeSelect"
 		"textAlignment"	"west"
 		"font"			"CerbeticaBold24"
-		"fgcolor_override"	"242 242 242 255"
+		"fgcolor_override"	"White"
 		
 		"mouseinputenabled"	"0"
 	}
diff --git a/resource/ui/matchmakingdashboardsidepanel.res b/resource/ui/matchmakingdashboardsidepanel.res
index 55e2122..5c0a230 100644
--- a/resource/ui/matchmakingdashboardsidepanel.res
+++ b/resource/ui/matchmakingdashboardsidepanel.res
@@ -108,9 +108,9 @@
 		"textAlignment"	"east"
 		"font"			"Cerbetica14"
 
-		"armedBgColor_override"	"0 0 0 0"
-		"defaultBgColor_override"	"0 0 0 0"
-		"defaultFgColor_override"	"242 242 242 255"
+		"armedBgColor_override"		"Transparent"
+		"defaultBgColor_override"	"Transparent"
+		"defaultFgColor_override"	"White"
 		"armedFgColor_override"	"169 123 53 255"
 	}
 
@@ -138,9 +138,9 @@
 		"textAlignment"	"west"
 		"font"			"Cerbetica14"
 
-		"armedBgColor_override"	"0 0 0 0"
-		"defaultBgColor_override"	"0 0 0 0"
-		"defaultFgColor_override"	"242 242 242 255"
+		"armedBgColor_override"		"Transparent"
+		"defaultBgColor_override"	"Transparent"
+		"defaultFgColor_override"	"White"
 		"armedFgColor_override"	"169 123 53 255"
 	}
 	
@@ -156,6 +156,6 @@
 		"visible"		"1"
 		"proportionaltoparent"	"1"
 		"border"		"TeamMenuBorder"
-		"bgcolor_override"	"27 27 27 255"
+		"bgcolor_override"	"DarkGrey"
 	}
 }
 \ No newline at end of file
diff --git a/resource/ui/mvmcreditspendpanel.res b/resource/ui/mvmcreditspendpanel.res
index 80f3417..47f5a13 100644
--- a/resource/ui/mvmcreditspendpanel.res
+++ b/resource/ui/mvmcreditspendpanel.res
@@ -11,7 +11,7 @@
 		"ypos"				"0"
 		"wide"				"300"
 		"tall"				"15"
-		"fgcolor"			"tanlight"
+		"fgcolor"			"TanLight"
 	}
 
 	"TableBackground"
@@ -38,7 +38,7 @@
 		"ypos"				"15"
 		"wide"				"90"
 		"tall"				"20"
-		"fgcolor"			"tanlight"
+		"fgcolor"			"TanLight"
 	}
 	
 	"UpgradesCountLabel"
@@ -52,7 +52,7 @@
 		"ypos"				"15"
 		"wide"				"30"
 		"tall"				"20"
-		"fgcolor"			"tanlight"
+		"fgcolor"			"TanLight"
 	}
 	
 	"BuyBackLabel"
@@ -66,7 +66,7 @@
 		"ypos"				"27"
 		"wide"				"90"
 		"tall"				"20"
-		"fgcolor"			"tanlight"
+		"fgcolor"			"TanLight"
 	}
 	
 	"BuyBackCountLabel"
@@ -80,7 +80,7 @@
 		"ypos"				"27"
 		"wide"				"30"
 		"tall"				"20"
-		"fgcolor"			"tanlight"
+		"fgcolor"			"TanLight"
 	}
 	
 	"BottleLabel"
@@ -94,7 +94,7 @@
 		"ypos"				"39"
 		"wide"				"90"
 		"tall"				"20"
-		"fgcolor"			"tanlight"
+		"fgcolor"			"TanLight"
 	}
 	
 	"BottleCountLabel"
@@ -108,6 +108,6 @@
 		"ypos"				"39"
 		"wide"				"30"
 		"tall"				"20"
-		"fgcolor"			"tanlight"
+		"fgcolor"			"TanLight"
 	}
 }
 \ No newline at end of file
diff --git a/resource/ui/quickplaydialog.res b/resource/ui/quickplaydialog.res
index 1628f1e..d837ff3 100644
--- a/resource/ui/quickplaydialog.res
+++ b/resource/ui/quickplaydialog.res
@@ -13,7 +13,7 @@
 		"visible"		"1"
 		"enabled"		"1"
 		"tabPosition"	"0"
-		"bgcolor_override"			"0 0 0 0"
+		"bgcolor_override"			"Transparent"
 		"event247_image"			"illustrations/gamemode_halloween2015"
 		"community_update_image"	"illustrations/gamemode_invasion"
 	}
@@ -959,7 +959,7 @@
 				"visible"		"1"
 				"enabled"		"1"
 				"wrap"			"1"
-				"fgcolor_override" "46 43 42 255"
+				"fgcolor_override" "TanDarker"
 			}
 		
 			"TextLabel"
@@ -978,7 +978,7 @@
 				"visible"		"1"
 				"enabled"		"1"
 				"wrap"			"1"
-				"fgcolor_override" "46 43 42 255"
+				"fgcolor_override" "TanDarker"
 				"proportionaltoparent"	"1"
 			}
 		
@@ -1009,12 +1009,12 @@
 			
 				"paintbackground"	"0"
 			
-				"defaultFgColor_override" "46 43 42 255"
+				"defaultFgColor_override" "TanDarker"
 				"armedFgColor_override" "235 226 202 255"
-				"depressedFgColor_override" "46 43 42 255"
+				"depressedFgColor_override" "TanDarker"
 			
-				"image_drawcolor"	"117 107 94 255"
-				"image_armedcolor"	"200 80 60 255"
+				"image_drawcolor"	"TextColor"
+				"image_armedcolor"	"LightRed"
 
 				"SubImage"
 				{
diff --git a/resource/ui/replaybrowser/basepage.res b/resource/ui/replaybrowser/basepage.res
index a775665..bab6724 100644
--- a/resource/ui/replaybrowser/basepage.res
+++ b/resource/ui/replaybrowser/basepage.res
@@ -15,7 +15,7 @@
 		"tabPosition"		"0"
 		"settitlebarvisible"	"0"
 		"PaintBackgroundType"	"0"
-		"bgcolor_override"		"27 27 27 255"
+		"bgcolor_override"		"DarkGrey"
 	}
 	
 	"SearchTextEntry"
@@ -53,7 +53,7 @@
 		"enabled"			"1"
 		"tabPosition"		"0"
 		"paintbackground"	"1"
-		"bgcolor_override"	"0 0 0 0"
+		"bgcolor_override"	"Transparent"
 		"autohide_scrollbar" "1"
 	}
 }
diff --git a/resource/ui/replaybrowser/thumbnailcollection.res b/resource/ui/replaybrowser/thumbnailcollection.res
index 3511fa9..7e0f1f1 100644
--- a/resource/ui/replaybrowser/thumbnailcollection.res
+++ b/resource/ui/replaybrowser/thumbnailcollection.res
@@ -12,7 +12,7 @@
 		"enabled"		"1"
 		"tabPosition"	"0"
 		"settitlebarvisible"	"1"
-		"bgcolor_override"		"27 27 27 255"
+		"bgcolor_override"		"DarkGrey"
 	}
 	
 	"RenderAllButton"
@@ -135,7 +135,7 @@
 		"pinCorner"		"0"
 		"visible"		"0"
 		"enabled"		"1"
-		"bgcolor_override" "22 22 22 255"
+		"bgcolor_override" "DarkerGrey"
 	}
 	
 	"NoReplayItemsLabel"
@@ -151,7 +151,7 @@
 		"visible"		"1"
 		"enabled"		"1"
 		"centerwrap"	"1"
-		"fgcolor_override"	"117 107 94 255"
+		"fgcolor_override"	"TextColor"
 	}
 	
 	"ShowPrevButton"
diff --git a/resource/ui/revivedialog.res b/resource/ui/revivedialog.res
index 21ac7bf..50ebb24 100644
--- a/resource/ui/revivedialog.res
+++ b/resource/ui/revivedialog.res
@@ -70,7 +70,7 @@
 			"visible"		"1"
 			"enabled"		"1"
 			"centerwrap"	"1"
-			"fgcolor_override" "Base Color"
+			"fgcolor_override" "ColorCyan"
 		}
 
 		"ConfirmButton"
diff --git a/resource/ui/stampdonationadd.res b/resource/ui/stampdonationadd.res
index 5cc1d57..9087d0a 100644
--- a/resource/ui/stampdonationadd.res
+++ b/resource/ui/stampdonationadd.res
@@ -52,7 +52,7 @@
 		"visible"			"1"
 		"enabled"			"1"
 		"wrap"				"1"
-		"fgcolor_override"	"200 80 60 255"
+		"fgcolor_override"	"LightRed"
 	}
 	
 	"ExplanationLabel2"
@@ -72,7 +72,7 @@
 		"visible"			"1"
 		"enabled"			"1"
 		"wrap"				"1"
-		"fgcolor_override"	"200 80 60 255"
+		"fgcolor_override"	"LightRed"
 	}
 	
 	"ItemImagePanel"
diff --git a/resource/ui/streamlistpanel.res b/resource/ui/streamlistpanel.res
index af191bb..e2af3e7 100644
--- a/resource/ui/streamlistpanel.res
+++ b/resource/ui/streamlistpanel.res
@@ -61,13 +61,13 @@
 		"paintbackground"	"0"
 		
 		//"defaultFgColor_override" "235 226 202 255"
-		//"armedFgColor_override" "46 43 42 255"
+		//"armedFgColor_override" "TanDarker"
 		"defaultFgColor_override" "TanLight"
-		"armedFgColor_override" "Base Color"
+		"armedFgColor_override" "ColorCyan"
 		"depressedFgColor_override" "TanLight"
 		
 		"image_drawcolor"	"235 226 202 255"
-		"image_armedcolor"	"200 80 60 255"
+		"image_armedcolor"	"LightRed"
 		
 		"SubImage"
 		{
@@ -205,7 +205,7 @@
 		"sound_released"	"UI/buttonclickrelease.wav"
 
 		"defaultFgColor_override" "235 226 202 255"
-		"defaultBgColor_override" "46 43 42 255"
+		"defaultBgColor_override" "TanDarker"
 		"armedFgColor_override" "235 226 202 255"
 		"depressedFgColor_override" "235 226 202 255"
 	}
diff --git a/resource/ui/streampanel.res b/resource/ui/streampanel.res
index ddf573d..26212fc 100644
--- a/resource/ui/streampanel.res
+++ b/resource/ui/streampanel.res
@@ -153,9 +153,9 @@
 		
 		"border_armed"		"TeamMenuBorder"
 		
-		"defaultFgColor_override" "0 0 0 0"
-		"defaultBgColor_override" "0 0 0 0"
-		"armedFgColor_override" "0 0 0 0"
-		"armedBgColor_override"	"0 0 0 0"
+		"defaultFgColor_override" "Transparent"
+		"defaultBgColor_override" "Transparent"
+		"armedFgColor_override" "Transparent"
+		"armedBgColor_override"	"Transparent"
 	}
 }
 \ No newline at end of file
diff --git a/resource/ui/tankprogressbar.res b/resource/ui/tankprogressbar.res
index 41e2838..521e286 100644
--- a/resource/ui/tankprogressbar.res
+++ b/resource/ui/tankprogressbar.res
@@ -81,6 +81,6 @@
 		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
-		"fillcolor"		"Base Color"
+		"fillcolor"		"ColorCyan"
 	}
 }
 \ No newline at end of file
diff --git a/resource/ui/votehud.res b/resource/ui/votehud.res
index 8a2ad98..146f6ec 100644
--- a/resource/ui/votehud.res
+++ b/resource/ui/votehud.res
@@ -11,7 +11,7 @@
 		"visible"		"0"
 		"enabled"		"1"
 		"border"		"CyanBorderThick"
-		"bgcolor_override"	"25 25 25 255"
+		"bgcolor_override"	"DarkGrey"
 		
 		"PassedIcon"
 		{
@@ -43,7 +43,7 @@
 			"brighttext"	"0"
 			"font"			"ScoreboardSmall"
 			"wrap"			"1"
-			"fgcolor_override"	"ColorWhite"
+			"fgcolor_override"	"White"
 		}
 		
 		"PassedResult"
@@ -62,7 +62,7 @@
 			"brighttext"	"0"
 			"font"			"ScoreboardVerySmall"
 			"wrap"			"1"
-			"fgcolor_override"	"ColorWhite"
+			"fgcolor_override"	"White"
 			"noshortcutsyntax"	"1"
 		}
 	}
@@ -78,7 +78,7 @@
 		"visible"		"0"
 		"enabled"		"1"
 		"border"		"CyanBorderThick"
-		"bgcolor_override"	"25 25 25 255"
+		"bgcolor_override"	"DarkGrey"
 		
 		"Header"
 		{
@@ -96,7 +96,7 @@
 			"brighttext"	"0"
 			"font"			"ScoreboardVerySmall"
 			"wrap"			"1"
-			"fgcolor_override"	"128 128 128 255"
+			"fgcolor_override"	"ColorGreyMid"
 		}
 		
 		"Issue"
@@ -114,7 +114,7 @@
 			"dulltext"		"0"
 			"brighttext"	"0"
 			"font"			"ScoreboardSmall"
-			"fgcolor_override"	"ColorWhite"
+			"fgcolor_override"	"White"
 			"wrap"				"1"
 			"noshortcutsyntax"	"1"
 		}
@@ -142,7 +142,7 @@
 			"ypos"			"50"
 			"wide"			"130"
 			"tall"			"1"
-			"fillcolor"		"128 128 128 255"
+			"fillcolor"		"ColorGreyMid"
 			"zpos"			"0"
 		}
 		
@@ -163,7 +163,7 @@
 			"dulltext"		"0"
 			"brighttext"	"0"
 			"font"			"ScoreboardVerySmall"
-			"fgcolor_override"	"ColorWhite"
+			"fgcolor_override"	"White"
 		}
 		
 		"Option1Background_Selected"
@@ -195,7 +195,7 @@
 			"dulltext"		"0"
 			"brighttext"	"0"
 			"font"			"ScoreboardSmall"
-			"fgcolor_override"	"ColorWhite"
+			"fgcolor_override"	"White"
 		}
 		
 		"LabelOption2"
@@ -214,7 +214,7 @@
 			"dulltext"		"0"
 			"brighttext"	"0"
 			"font"			"ScoreboardVerySmall"
-			"fgcolor_override"	"ColorWhite"
+			"fgcolor_override"	"White"
 		}
 		
 		"Option2Background_Selected"
@@ -246,7 +246,7 @@
 			"dulltext"		"0"
 			"brighttext"	"0"
 			"font"			"ScoreboardSmall"
-			"fgcolor_override"	"ColorWhite"
+			"fgcolor_override"	"White"
 		}
 		
 		"LabelOption3"
@@ -265,7 +265,7 @@
 			"dulltext"		"0"
 			"brighttext"	"0"
 			"font"			"ScoreboardVerySmall"
-			"fgcolor_override"	"ColorWhite"
+			"fgcolor_override"	"White"
 		}
 		
 		"Option3Background_Selected"
@@ -297,7 +297,7 @@
 			"dulltext"		"0"
 			"brighttext"	"0"
 			"font"			"ScoreboardVerySmall"
-			"fgcolor_override"	"ColorWhite"
+			"fgcolor_override"	"White"
 		}
 		
 		"Option4Background_Selected"
@@ -329,7 +329,7 @@
 			"dulltext"		"0"
 			"brighttext"	"0"
 			"font"			"ScoreboardVerySmall"
-			"fgcolor_override"	"ColorWhite"
+			"fgcolor_override"	"White"
 		}
 		
 		"Option5Background_Selected"
@@ -353,7 +353,7 @@
 			"ypos"			"100"
 			"wide"			"130"
 			"tall"			"1"
-			"fillcolor"		"128 128 128 255"
+			"fillcolor"		"ColorGreyMid"
 			"zpos"			"0"
 		}
 		
@@ -372,7 +372,7 @@
 			"dulltext"		"0"
 			"brighttext"	"0"
 			"font"			"ScoreboardVerySmall"
-			"fgcolor_override"	"128 128 128 255"
+			"fgcolor_override"	"ColorGreyMid"
 		}
 		
 		// Vote Bar
@@ -407,7 +407,7 @@
 		"visible"		"0"
 		"enabled"		"1"
 		"border"		"CyanBorderThick"
-		"bgcolor_override"	"25 25 25 255"
+		"bgcolor_override"	"DarkGrey"
 		
 		"FailedIcon"
 		{
@@ -458,7 +458,7 @@
 			"brighttext"	"0"
 			"font"			"ScoreboardVerySmall"
 			"wrap"			"1"
-			"fgcolor_override"	"ColorWhite"
+			"fgcolor_override"	"White"
 		}
 	}
 	
@@ -474,7 +474,7 @@
 		"visible"		"0"
 		"enabled"		"1"
 		"border"		"CyanBorderThick"
-		"bgcolor_override"	"25 25 25 255"
+		"bgcolor_override"	"DarkGrey"
 		
 		"FailedIcon"
 		{
@@ -525,7 +525,7 @@
 			"brighttext"	"0"
 			"font"			"ScoreboardVerySmall"
 			"wrap"			"1"
-			"fgcolor_override"	"ColorWhite"
+			"fgcolor_override"	"White"
 		}
 	}
 	
@@ -646,13 +646,13 @@
 			"NumericInputOnly"	"0"
 			"unicode"			"0"
 			
-			"fgcolor_override"					"117 107 94 255"
-			"bgcolor_override"					"251 235 202 255"
-			"disabledFgColor_override" 			"117 107 94 255"
-			"disabledBgColor_override" 			"251 235 202 255"
-			"selectionColor_override"			"251 235 202 255"
-			"selectionTextColor_override" 		"117 107 94 255"
-			"defaultSelectionBG2Color_override" "251 235 202 255"
+			"fgcolor_override"					"TextColor"
+			"bgcolor_override"					"Yellow"
+			"disabledFgColor_override"			"TextColor"
+			"disabledBgColor_override"			"Yellow"
+			"selectionColor_override"			"Yellow"
+			"selectionTextColor_override"		"TextColor"
+			"defaultSelectionBG2Color_override" "Yellow"
 		}
 		
 		"CallVoteButton"
@@ -662,7 +662,7 @@
 			"xpos"			"75"
 			"ypos"			"275"
 			"wide"			"160"
-			"tall"			"24"
+			"tall"			"25"
 			"autoResize"	"0"
 			"pinCorner"		"3"
 			"visible"		"1"
@@ -683,7 +683,7 @@
 			"xpos"			"240"
 			"ypos"			"275"
 			"wide"			"80"
-			"tall"			"24"
+			"tall"			"25"
 			"autoResize"	"0"
 			"pinCorner"		"3"
 			"visible"		"1"
diff --git a/resource/ui/winpanel.res b/resource/ui/winpanel.res
index 6c019b0..924f013 100644
--- a/resource/ui/winpanel.res
+++ b/resource/ui/winpanel.res
@@ -109,7 +109,7 @@
 			"enabled"		"1"
 			"image"			""
 			"scaleImage"	"1"	
-			"color_outline"	"52 48 45 255"
+			"color_outline"	"Grey"
 		}
 		"RedTeamLabel"
 		{
@@ -180,7 +180,7 @@
 			"enabled"		"1"
 			"image"			""
 			"scaleImage"	"1"	
-			"color_outline"	"52 48 45 255"
+			"color_outline"	"Grey"
 		}
 	}
 	"WinPanelBGBorder"
@@ -198,10 +198,10 @@
 		"border"		"TFFatLineBorderBlueBG"
 		"proportionaltoparent"	"1"
 	}
-	"WinPanelBackground2"
+	"WinPanelBG2"
 	{
 		"ControlName"	"ImagePanel"
-		"fieldName"		"WinPanelBackground2"
+		"fieldName"		"WinPanelBG2"
 		"xpos"			"0"
 		"ypos"			"55"
 		"zpos"			"0"
@@ -283,7 +283,7 @@
 		"ControlName"	"CExLabel"
 		"fieldName"		"AdvancingTeamLabelDropshadow"
 		"font"			"CerbeticaBold20"
-		"fgcolor"		"black"
+		"fgcolor"		"TransparentBlack"
 		"xpos"			"-1"
 		"ypos"			"-1"
 		"zpos"			"1"
@@ -306,20 +306,8 @@
 	{	
 		"ControlName"	"CExLabel"
 		"fieldName"		"WinReasonLabel"
-		"font"			"Cerbetica12"
+		"font"			"ScoreboardVerySmall"
 		"xpos"			"9999"
-		"ypos"			"9999"
-		"zpos"			"1"
-		"wide"			"292"
-		"tall"			"20"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"1"
-		"enabled"		"1"
-		"labelText"		"%WinReasonLabel%"
-		"textAlignment"	"Center"
-		"dulltext"		"0"
-		"brighttext"	"0"
 	}
 	"DetailsLabel"
 	{	
@@ -345,17 +333,6 @@
 		"ControlName"	"ImagePanel"
 		"fieldName"		"ShadedBar"
 		"xpos"			"9999"
-		"ypos"			"9999"
-		"zpos"			"2"
-		"wide"			"268"
-		"tall"			"84"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"1"
-		"enabled"		"1"
-		"tabPosition"	"0"	
-		"fillcolor"		"0 0 0 150"
-		"PaintBackgroundType"	"0"
 	}
 	"TopPlayersLabel"
 	{