Main menu tweaks

- Consolidated the Cerbetica font.
- Added back the rayshud-styled TF2 logo.
- Moved the version number to the HUD Options panel.
- Updated files to use schema color names.

14 files changed, 191 insertions, 209 deletions

diff --git a/resource/ui/classselection-base.res b/resource/ui/classselection-base.res
index fc413d4..9275cb4 100644
--- a/resource/ui/classselection-base.res
+++ b/resource/ui/classselection-base.res
@@ -84,11 +84,11 @@
 		"scaleImage"		"1"
 		"paintbackground"	"0"
 
-		"fgcolor"					"235 226 202 255"
-		"defaultFgColor_override"	"235 226 202 255"
-		"armedFgColor_override"		"72 255 255 255"
-		"depressedFgColor_override"	"235 226 202 255"
-		"selectedFgColor_override"	"72 255 255 255"
+		"fgcolor"					"TanLight"
+		"defaultFgColor_override"	"TanLight"
+		"armedFgColor_override"		"ColorCyan"
+		"depressedFgColor_override"	"TanLight"
+		"selectedFgColor_override"	"ColorCyan"
 
 		"sound_depressed"	"UI/buttonclick.wav"
 		"sound_released"	"UI/buttonclickrelease.wav"
@@ -121,11 +121,11 @@
 		"scaleImage"		"1"
 		"paintbackground"	"0"
 
-		"fgcolor"					"235 226 202 255"
-		"defaultFgColor_override"	"235 226 202 255"
-		"armedFgColor_override"		"72 255 255 255"
-		"depressedFgColor_override"	"235 226 202 255"
-		"selectedFgColor_override"	"72 255 255 255"
+		"fgcolor"					"TanLight"
+		"defaultFgColor_override"	"TanLight"
+		"armedFgColor_override"		"ColorCyan"
+		"depressedFgColor_override"	"TanLight"
+		"selectedFgColor_override"	"ColorCyan"
 
 		"sound_depressed"	"UI/buttonclick.wav"
 		"sound_released"	"UI/buttonclickrelease.wav"
@@ -158,11 +158,11 @@
 		"scaleImage"		"1"
 		"paintbackground"	"0"
 
-		"fgcolor"					"235 226 202 255"
-		"defaultFgColor_override"	"235 226 202 255"
-		"armedFgColor_override"		"72 255 255 255"
-		"depressedFgColor_override" "235 226 202 255"
-		"selectedFgColor_override" 	"72 255 255 255"
+		"fgcolor"					"TanLight"
+		"defaultFgColor_override"	"TanLight"
+		"armedFgColor_override"		"ColorCyan"
+		"depressedFgColor_override" "TanLight"
+		"selectedFgColor_override" 	"ColorCyan"
 
 		"sound_depressed"	"UI/buttonclick.wav"
 		"sound_released"	"UI/buttonclickrelease.wav"
@@ -195,11 +195,11 @@
 		"scaleImage"		"1"
 		"paintbackground"	"0"
 
-		"fgcolor"					"235 226 202 255"
-		"defaultFgColor_override"	"235 226 202 255"
-		"armedFgColor_override"		"72 255 255 255"
-		"depressedFgColor_override" "235 226 202 255"
-		"selectedFgColor_override" 	"72 255 255 255"
+		"fgcolor"					"TanLight"
+		"defaultFgColor_override"	"TanLight"
+		"armedFgColor_override"		"ColorCyan"
+		"depressedFgColor_override" "TanLight"
+		"selectedFgColor_override" 	"ColorCyan"
 
 		"sound_depressed"	"UI/buttonclick.wav"
 		"sound_released"	"UI/buttonclickrelease.wav"
@@ -232,11 +232,11 @@
 		"scaleImage"		"1"
 		"paintbackground"	"0"
 
-		"fgcolor"					"235 226 202 255"
-		"defaultFgColor_override"	"235 226 202 255"
-		"armedFgColor_override"		"72 255 255 255"
-		"depressedFgColor_override" "235 226 202 255"
-		"selectedFgColor_override" 	"72 255 255 255"
+		"fgcolor"					"TanLight"
+		"defaultFgColor_override"	"TanLight"
+		"armedFgColor_override"		"ColorCyan"
+		"depressedFgColor_override" "TanLight"
+		"selectedFgColor_override" 	"ColorCyan"
 
 		"sound_depressed"	"UI/buttonclick.wav"
 		"sound_released"	"UI/buttonclickrelease.wav"
@@ -269,11 +269,11 @@
 		"scaleImage"		"1"
 		"paintbackground"	"0"
 
-		"fgcolor"					"235 226 202 255"
-		"defaultFgColor_override"	"235 226 202 255"
-		"armedFgColor_override"		"72 255 255 255"
-		"depressedFgColor_override" "235 226 202 255"
-		"selectedFgColor_override" 	"72 255 255 255"
+		"fgcolor"					"TanLight"
+		"defaultFgColor_override"	"TanLight"
+		"armedFgColor_override"		"ColorCyan"
+		"depressedFgColor_override" "TanLight"
+		"selectedFgColor_override" 	"ColorCyan"
 
 		"sound_depressed"	"UI/buttonclick.wav"
 		"sound_released"	"UI/buttonclickrelease.wav"
@@ -306,11 +306,11 @@
 		"scaleImage"		"1"
 		"paintbackground"	"0"
 
-		"fgcolor"					"235 226 202 255"
-		"defaultFgColor_override"	"235 226 202 255"
-		"armedFgColor_override"		"72 255 255 255"
-		"depressedFgColor_override" "235 226 202 255"
-		"selectedFgColor_override" 	"72 255 255 255"
+		"fgcolor"					"TanLight"
+		"defaultFgColor_override"	"TanLight"
+		"armedFgColor_override"		"ColorCyan"
+		"depressedFgColor_override" "TanLight"
+		"selectedFgColor_override" 	"ColorCyan"
 
 		"sound_depressed"	"UI/buttonclick.wav"
 		"sound_released"	"UI/buttonclickrelease.wav"
@@ -343,11 +343,11 @@
 		"scaleImage"		"1"
 		"paintbackground"	"0"
 
-		"fgcolor"					"235 226 202 255"
-		"defaultFgColor_override"	"235 226 202 255"
-		"armedFgColor_override"		"72 255 255 255"
-		"depressedFgColor_override" "235 226 202 255"
-		"selectedFgColor_override" 	"72 255 255 255"
+		"fgcolor"					"TanLight"
+		"defaultFgColor_override"	"TanLight"
+		"armedFgColor_override"		"ColorCyan"
+		"depressedFgColor_override" "TanLight"
+		"selectedFgColor_override" 	"ColorCyan"
 
 		"sound_depressed"	"UI/buttonclick.wav"
 		"sound_released"	"UI/buttonclickrelease.wav"
@@ -380,11 +380,11 @@
 		"scaleImage"		"1"
 		"paintbackground"	"0"
 
-		"fgcolor"					"235 226 202 255"
-		"defaultFgColor_override"	"235 226 202 255"
-		"armedFgColor_override"		"72 255 255 255"
-		"depressedFgColor_override" "235 226 202 255"
-		"selectedFgColor_override" 	"72 255 255 255"
+		"fgcolor"					"TanLight"
+		"defaultFgColor_override"	"TanLight"
+		"armedFgColor_override"		"ColorCyan"
+		"depressedFgColor_override" "TanLight"
+		"selectedFgColor_override" 	"ColorCyan"
 
 		"sound_depressed"	"UI/buttonclick.wav"
 		"sound_released"	"UI/buttonclickrelease.wav"
@@ -415,11 +415,11 @@
 		"font"				"Cerbetica16"
 		"paintbackground"	"0"
 
-		"fgcolor"					"235 226 202 255"
-		"defaultFgColor_override"	"235 226 202 255"
-		"armedFgColor_override"		"72 255 255 255"
-		"depressedFgColor_override" "235 226 202 255"
-		"selectedFgColor_override" 	"72 255 255 255"
+		"fgcolor"					"TanLight"
+		"defaultFgColor_override"	"TanLight"
+		"armedFgColor_override"		"ColorCyan"
+		"depressedFgColor_override" "TanLight"
+		"selectedFgColor_override" 	"ColorCyan"
 
 		"sound_depressed"	"UI/buttonclick.wav"
 		"sound_released"	"UI/buttonclickrelease.wav"
@@ -450,11 +450,11 @@
 		"font"			"Cerbetica16"
 		"paintbackground" "0"
 
-		"fgcolor"					"235 226 202 255"
-		"defaultFgColor_override"	"235 226 202 255"
-		"armedFgColor_override"		"72 255 255 255"
-		"depressedFgColor_override" "235 226 202 255"
-		"selectedFgColor_override" 	"72 255 255 255"
+		"fgcolor"					"TanLight"
+		"defaultFgColor_override"	"TanLight"
+		"armedFgColor_override"		"ColorCyan"
+		"depressedFgColor_override" "TanLight"
+		"selectedFgColor_override" 	"ColorCyan"
 
 		"sound_depressed"	"UI/buttonclick.wav"
 		"sound_released"	"UI/buttonclickrelease.wav"
@@ -481,11 +481,11 @@
 		"Command"		"openloadout"
 		"font"			"Cerbetica16"
 
-		"fgcolor"					"235 226 202 255"
-		"defaultFgColor_override"	"235 226 202 255"
-		"armedFgColor_override"		"72 255 255 255"
-		"depressedFgColor_override" "235 226 202 255"
-		"selectedFgColor_override" 	"72 255 255 255"
+		"fgcolor"					"TanLight"
+		"defaultFgColor_override"	"TanLight"
+		"armedFgColor_override"		"ColorCyan"
+		"depressedFgColor_override" "TanLight"
+		"selectedFgColor_override" 	"ColorCyan"
 
 		"sound_depressed"	"UI/buttonclick.wav"
 		"sound_released"	"UI/buttonclickrelease.wav"
@@ -746,7 +746,7 @@
 		"labelText"		"%numScout%"
 		"textAlignment"	"west"
 		"font"			"Cerbetica16"
-		"fgcolor"		"235 226 202 255"
+		"fgcolor"		"TanLight"
 	}
 
 	"numSoldier"
@@ -766,7 +766,7 @@
 		"labelText"		"%numSoldier%"
 		"textAlignment"	"west"
 		"font"			"Cerbetica16"
-		"fgcolor"		"235 226 202 255"
+		"fgcolor"		"TanLight"
 	}
 
 	"numPyro"
@@ -786,7 +786,7 @@
 		"labelText"		"%numPyro%"
 		"textAlignment"	"west"
 		"font"			"Cerbetica16"
-		"fgcolor"		"235 226 202 255"
+		"fgcolor"		"TanLight"
 	}
 
 	"numDemoman"
@@ -806,7 +806,7 @@
 		"labelText"		"%numDemoman%"
 		"textAlignment"	"west"
 		"font"			"Cerbetica16"
-		"fgcolor"		"235 226 202 255"
+		"fgcolor"		"TanLight"
 	}
 
 	"numHeavy"
@@ -826,7 +826,7 @@
 		"labelText"		"%numHeavy%"
 		"textAlignment"	"west"
 		"font"			"Cerbetica16"
-		"fgcolor"		"235 226 202 255"
+		"fgcolor"		"TanLight"
 	}
 
 	"numEngineer"
@@ -846,7 +846,7 @@
 		"labelText"		"%numEngineer%"
 		"textAlignment"	"west"
 		"font"			"Cerbetica16"
-		"fgcolor"		"235 226 202 255"
+		"fgcolor"		"TanLight"
 	}
 
 	"numMedic"
@@ -866,7 +866,7 @@
 		"labelText"		"%numMedic%"
 		"textAlignment"	"west"
 		"font"			"Cerbetica16"
-		"fgcolor"		"235 226 202 255"
+		"fgcolor"		"TanLight"
 	}
 
 	"numSniper"
@@ -886,7 +886,7 @@
 		"labelText"		"%numSniper%"
 		"textAlignment"	"west"
 		"font"			"Cerbetica16"
-		"fgcolor"		"235 226 202 255"
+		"fgcolor"		"TanLight"
 	}
 
 	"numSpy"
@@ -906,7 +906,7 @@
 		"labelText"		"%numSpy%"
 		"textAlignment"	"west"
 		"font"			"Cerbetica16"
-		"fgcolor"		"235 226 202 255"
+		"fgcolor"		"TanLight"
 	}
 
 	"MvMUpgradeImageScout"
@@ -1142,7 +1142,7 @@
 			"visible"		"1"
 			"enabled"		"1"
 			"wrap"			"1"
-			"fgcolor_override" "46 43 42 255"
+			"fgcolor_override" "TanDarker"
 		}
 
 		"ClassHighlightText"
@@ -1161,7 +1161,7 @@
 			"visible"		"1"
 			"enabled"		"1"
 			"wrap"			"1"
-			"fgcolor_override" "46 43 42 255"
+			"fgcolor_override" "TanDarker"
 		}
 
 		"CloseButton"
@@ -1189,11 +1189,11 @@
 			"Command"		"close"
 			"paintbackground"	"0"
 
-			"defaultFgColor_override" "46 43 42 255"
-			"armedFgColor_override" "235 226 202 255"
-			"depressedFgColor_override" "46 43 42 255"
+			"defaultFgColor_override" "TanDarker"
+			"armedFgColor_override" "TanLight"
+			"depressedFgColor_override" "TanDarker"
 
-			"image_drawcolor"	"117 107 94 255"
+			"image_drawcolor"	"TanDark"
 			"image_armedcolor"	"200 80 60 255"
 			"SubImage"
 			{
diff --git a/resource/ui/econ/confirmcustomizetexturedialog.res b/resource/ui/econ/confirmcustomizetexturedialog.res
index 69d2783..3857c25 100644
--- a/resource/ui/econ/confirmcustomizetexturedialog.res
+++ b/resource/ui/econ/confirmcustomizetexturedialog.res
@@ -201,7 +201,7 @@
 		"tall"			"160"
 		"visible"		"1"
 		"bgcolor_override"		"0 0 0 0"
-		"noitem_textcolor"		"117 107 94 255"
+		"noitem_textcolor"		"TanDark"
 		//"PaintBackgroundType"	"2"
 		"paintborder"	"0"
 		"model_xpos"	"00"
@@ -353,12 +353,12 @@
 				"editable"			"0"
 				"font"				"HudFontSmall"
 
-				//"fgcolor_override"				"235 226 202 255"
+				//"fgcolor_override"				"TanLight"
 				"bgcolor_override"					"0 0 0 255"
-				//"disabledFgColor_override" 		"235 226 202 255"
+				//"disabledFgColor_override" 		"TanLight"
 				"disabledBgColor_override" 			"0 0 0 255"
 				"selectionColor_override" 			"0 0 0 255"
-				"selectionTextColor_override" 		"235 226 202 255"
+				"selectionTextColor_override" 		"TanLight"
 				"defaultSelectionBG2Color_override" "0 0 0 0"
 			}
 		}
@@ -464,12 +464,12 @@
 				"font"			"HudFontSmall"
 				"visible"		"0"
 
-				//"fgcolor_override"				"235 226 202 255"
+				//"fgcolor_override"				"TanLight"
 				"bgcolor_override"					"0 0 0 255"
-				//"disabledFgColor_override" 		"235 226 202 255"
+				//"disabledFgColor_override" 		"TanLight"
 				"disabledBgColor_override" 			"0 0 0 255"
 				"selectionColor_override" 			"0 0 0 255"
-				"selectionTextColor_override" 		"235 226 202 255"
+				"selectionTextColor_override" 		"TanLight"
 				"defaultSelectionBG2Color_override" "0 0 0 0"
 			}
 
@@ -593,12 +593,12 @@
 					"editable"		"0"
 					"font"			"HudFontSmall"
 
-					//"fgcolor_override"				"235 226 202 255"
+					//"fgcolor_override"				"TanLight"
 					"bgcolor_override"					"0 0 0 255"
-					//"disabledFgColor_override" 		"235 226 202 255"
+					//"disabledFgColor_override" 		"TanLight"
 					"disabledBgColor_override" 			"0 0 0 255"
 					"selectionColor_override" 			"0 0 0 255"
-					"selectionTextColor_override" 		"235 226 202 255"
+					"selectionTextColor_override" 		"TanLight"
 					"defaultSelectionBG2Color_override" "0 0 0 0"
 				}
 			}
diff --git a/resource/ui/freezepanelkillerhealth.res b/resource/ui/freezepanelkillerhealth.res
index 796aa7b..9f35900 100644
--- a/resource/ui/freezepanelkillerhealth.res
+++ b/resource/ui/freezepanelkillerhealth.res
@@ -40,10 +40,10 @@
 		"enabled"		"0"
 	}
 
-	"GuiPlayerHealth"
+	"SpecHealthValue"
 	{
 		"ControlName"	"CExLabel"
-		"fieldName"		"GuiPlayerHealth"
+		"fieldName"		"SpecHealthValue"
 		"xpos"			"3"
 		"ypos"			"3"
 		"zpos"			"5"
@@ -56,10 +56,10 @@
 		"labeltext"		"%Health%"
 	}
 
-	"GuiPlayerHealthShadow"
+	"SpecHealthValueShadow"
 	{
 		"ControlName"	"CExLabel"
-		"fieldName"		"GuiPlayerHealthShadow"
+		"fieldName"		"SpecHealthValueShadow"
 		"xpos"			"4"
 		"ypos"			"4"
 		"zpos"			"5"
diff --git a/resource/ui/huddamageaccount.res b/resource/ui/huddamageaccount.res
index 2e8ee7c..3bf30b4 100644
--- a/resource/ui/huddamageaccount.res
+++ b/resource/ui/huddamageaccount.res
@@ -7,7 +7,7 @@
 		"text_y"				"0"
 		"delta_item_end_y"		"0"
 		"PositiveColor"			"Heal Numbers"
-		"NegativeColor"			""	// Unused
+		"NegativeColor"			"Damage Numbers"
 		"delta_lifetime"		"2"
 		"delta_item_font"		"Cerbetica24Outline"
 		"delta_item_font_big"	"Cerbetica24Outline"
@@ -30,7 +30,7 @@
 		"textAlignment"			"center"
 		"font"					"Cerbetica28"
 		"font_minmode"			"Cerbetica20"
-		"fgcolor"				"Last DamageHeal Info"
+		"fgcolor"				"Damage Numbers"
 	}
 
 	"DamageAccountValueShadow"
diff --git a/resource/ui/hudplayerhealth-base.res b/resource/ui/hudplayerhealth-base.res
index 7b6daf6..2e6572d 100644
--- a/resource/ui/hudplayerhealth-base.res
+++ b/resource/ui/hudplayerhealth-base.res
@@ -141,7 +141,7 @@
 		"enabled"		"1"
 		"scaleImage"	"1"
 		"image"			"../vgui/bleed_drop"
-		"fgcolor"		"117 107 94 255"
+		"fgcolor"		"TanDark"
 		"pin_to_sibling"		"PlayerStatusAnchor"
 		"pin_corner_to_sibling"	"1"
 		"pin_to_sibling_corner"	"1"
@@ -160,7 +160,7 @@
 		"enabled"		"1"
 		"scaleImage"	"1"
 		"image"			"../vgui/bleed_drop"
-		"fgcolor"		"117 107 94 255"
+		"fgcolor"		"TanDark"
 		"pin_to_sibling"		"PlayerStatusAnchor"
 		"pin_corner_to_sibling"	"1"
 		"pin_to_sibling_corner"	"1"
@@ -179,7 +179,7 @@
 		"enabled"		"1"
 		"scaleImage"	"1"
 		"image"			"../vgui/covered_in_gas"
-		"fgcolor"		"117 107 94 255"
+		"fgcolor"		"TanDark"
 		"pin_to_sibling"		"PlayerStatusAnchor"
 		"pin_corner_to_sibling"	"1"
 		"pin_to_sibling_corner"	"1"
@@ -198,7 +198,7 @@
 		"enabled"		"1"
 		"scaleImage"	"1"
 		"image"			"../vgui/marked_for_death"
-		"fgcolor"		"117 107 94 255"
+		"fgcolor"		"TanDark"
 		"pin_to_sibling"		"PlayerStatusAnchor"
 		"pin_corner_to_sibling"	"1"
 		"pin_to_sibling_corner"	"1"
@@ -217,7 +217,7 @@
 		"enabled"		"1"
 		"scaleImage"	"1"
 		"image"			"../vgui/marked_for_death"
-		"fgcolor"		"117 107 94 255"
+		"fgcolor"		"TanDark"
 		"pin_to_sibling"		"PlayerStatusAnchor"
 		"pin_corner_to_sibling"	"1"
 		"pin_to_sibling_corner"	"1"
@@ -236,7 +236,7 @@
 		"enabled"		"1"
 		"scaleImage"	"1"
 		"image"			"../HUD/defense_buff_bullet_blue"
-		"fgcolor"		"117 107 94 255"
+		"fgcolor"		"TanDark"
 		"pin_to_sibling"		"PlayerStatusAnchor"
 		"pin_corner_to_sibling"	"1"
 		"pin_to_sibling_corner"	"1"
@@ -255,7 +255,7 @@
 		"enabled"		"1"
 		"scaleImage"	"1"
 		"image"			"../HUD/defense_buff_explosion_blue"
-		"fgcolor"		"117 107 94 255"
+		"fgcolor"		"TanDark"
 		"pin_to_sibling"		"PlayerStatusAnchor"
 		"pin_corner_to_sibling"	"1"
 		"pin_to_sibling_corner"	"1"
@@ -274,7 +274,7 @@
 		"enabled"		"1"
 		"scaleImage"	"1"
 		"image"			"../HUD/defense_buff_fire_blue"
-		"fgcolor"		"117 107 94 255"
+		"fgcolor"		"TanDark"
 		"pin_to_sibling"		"PlayerStatusAnchor"
 		"pin_corner_to_sibling"	"1"
 		"pin_to_sibling_corner"	"1"
@@ -293,7 +293,7 @@
 		"enabled"		"1"
 		"scaleImage"	"1"
 		"image"			"../HUD/defense_buff_bullet_blue"
-		"fgcolor"		"117 107 94 255"
+		"fgcolor"		"TanDark"
 		"pin_to_sibling"		"PlayerStatusAnchor"
 		"pin_corner_to_sibling"	"1"
 		"pin_to_sibling_corner"	"1"
@@ -312,7 +312,7 @@
 		"enabled"		"1"
 		"scaleImage"	"1"
 		"image"			"../HUD/defense_buff_explosion_blue"
-		"fgcolor"		"117 107 94 255"
+		"fgcolor"		"TanDark"
 		"pin_to_sibling"		"PlayerStatusAnchor"
 		"pin_corner_to_sibling"	"1"
 		"pin_to_sibling_corner"	"1"
@@ -331,7 +331,7 @@
 		"enabled"		"1"
 		"scaleImage"	"1"
 		"image"			"../HUD/defense_buff_fire_blue"
-		"fgcolor"		"117 107 94 255"
+		"fgcolor"		"TanDark"
 		"pin_to_sibling"		"PlayerStatusAnchor"
 		"pin_corner_to_sibling"	"1"
 		"pin_to_sibling_corner"	"1"
@@ -350,7 +350,7 @@
 		"enabled"		"1"
 		"scaleImage"	"1"
 		"image"			"../signs/death_wheel_whammy"
-		"fgcolor"		"117 107 94 255"
+		"fgcolor"		"TanDark"
 		"pin_to_sibling"		"PlayerStatusAnchor"
 		"pin_corner_to_sibling"	"1"
 		"pin_to_sibling_corner"	"1"
@@ -369,7 +369,7 @@
 		"enabled"		"1"
 		"scaleImage"	"1"
 		"image"			"../HUD/defense_buff_bullet_blue"
-		"fgcolor"		"117 107 94 255"
+		"fgcolor"		"TanDark"
 		"pin_to_sibling"		"PlayerStatusAnchor"
 		"pin_corner_to_sibling"	"1"
 		"pin_to_sibling_corner"	"1"
@@ -388,7 +388,7 @@
 		"enabled"		"1"
 		"scaleImage"	"1"
 		"image"			"../HUD/defense_buff_bullet_blue"
-		"fgcolor"		"117 107 94 255"
+		"fgcolor"		"TanDark"
 		"pin_to_sibling"		"PlayerStatusAnchor"
 		"pin_corner_to_sibling"	"1"
 		"pin_to_sibling_corner"	"1"
@@ -407,7 +407,7 @@
 		"enabled"		"1"
 		"scaleImage"	"1"
 		"image"			"../HUD/defense_buff_bullet_blue"
-		"fgcolor"		"117 107 94 255"
+		"fgcolor"		"TanDark"
 		"pin_to_sibling"		"PlayerStatusAnchor"
 		"pin_corner_to_sibling"	"1"
 		"pin_to_sibling_corner"	"1"
@@ -425,7 +425,7 @@
 		"visible"		"1"
 		"enabled"		"1"
 		"scaleImage"	"1"
-		"fgcolor"		"117 107 94 255"
+		"fgcolor"		"TanDark"
 		"pin_to_sibling"		"PlayerStatusAnchor"
 		"pin_corner_to_sibling"	"1"
 		"pin_to_sibling_corner"	"1"
@@ -444,7 +444,7 @@
 		"enabled"		"1"
 		"scaleImage"	"1"
 		"image"			""
-		"fgcolor"		"117 107 94 255"
+		"fgcolor"		"TanDark"
 		"pin_to_sibling"		"PlayerStatusAnchor"
 		"pin_corner_to_sibling"	"1"
 		"pin_to_sibling_corner"	"1"
@@ -463,7 +463,7 @@
 		"enabled"		"1"
 		"scaleImage"	"1"
 		"image"			"../Effects/powerup_strength_hud"
-		"fgcolor"		"117 107 94 255"
+		"fgcolor"		"TanDark"
 		"pin_to_sibling"		"PlayerStatusAnchor"
 		"pin_corner_to_sibling"	"1"
 		"pin_to_sibling_corner"	"1"
@@ -482,7 +482,7 @@
 		"enabled"		"1"
 		"scaleImage"	"1"
 		"image"			"../Effects/powerup_haste_hud"
-		"fgcolor"		"117 107 94 255"
+		"fgcolor"		"TanDark"
 		"pin_to_sibling"		"PlayerStatusAnchor"
 		"pin_corner_to_sibling"	"1"
 		"pin_to_sibling_corner"	"1"
@@ -501,7 +501,7 @@
 		"enabled"		"1"
 		"scaleImage"	"1"
 		"image"			"../Effects/powerup_regen_hud"
-		"fgcolor"		"117 107 94 255"
+		"fgcolor"		"TanDark"
 		"pin_to_sibling"		"PlayerStatusAnchor"
 		"pin_corner_to_sibling"	"1"
 		"pin_to_sibling_corner"	"1"
@@ -520,7 +520,7 @@
 		"enabled"		"1"
 		"scaleImage"	"1"
 		"image"			"../Effects/powerup_resist_hud"
-		"fgcolor"		"117 107 94 255"
+		"fgcolor"		"TanDark"
 		"pin_to_sibling"		"PlayerStatusAnchor"
 		"pin_corner_to_sibling"	"1"
 		"pin_to_sibling_corner"	"1"
@@ -539,7 +539,7 @@
 		"enabled"		"1"
 		"scaleImage"	"1"
 		"image"			"../Effects/powerup_vampire_hud"
-		"fgcolor"		"117 107 94 255"
+		"fgcolor"		"TanDark"
 		"pin_to_sibling"		"PlayerStatusAnchor"
 		"pin_corner_to_sibling"	"1"
 		"pin_to_sibling_corner"	"1"
@@ -558,7 +558,7 @@
 		"enabled"		"1"
 		"scaleImage"	"1"
 		"image"			"../Effects/powerup_reflect_hud"
-		"fgcolor"		"117 107 94 255"
+		"fgcolor"		"TanDark"
 		"pin_to_sibling"		"PlayerStatusAnchor"
 		"pin_corner_to_sibling"	"1"
 		"pin_to_sibling_corner"	"1"
@@ -577,7 +577,7 @@
 		"enabled"		"1"
 		"scaleImage"	"1"
 		"image"			"../Effects/powerup_precision_hud"
-		"fgcolor"		"117 107 94 255"
+		"fgcolor"		"TanDark"
 		"pin_to_sibling"		"PlayerStatusAnchor"
 		"pin_corner_to_sibling"	"1"
 		"pin_to_sibling_corner"	"1"
@@ -596,7 +596,7 @@
 		"enabled"		"1"
 		"scaleImage"	"1"
 		"image"			"../Effects/powerup_agility_hud"
-		"fgcolor"		"117 107 94 255"
+		"fgcolor"		"TanDark"
 		"pin_to_sibling"		"PlayerStatusAnchor"
 		"pin_corner_to_sibling"	"1"
 		"pin_to_sibling_corner"	"1"
@@ -615,7 +615,7 @@
 		"enabled"		"1"
 		"scaleImage"	"1"
 		"image"			"../Effects/powerup_knockout_hud"
-		"fgcolor"		"117 107 94 255"
+		"fgcolor"		"TanDark"
 		"pin_to_sibling"		"PlayerStatusAnchor"
 		"pin_corner_to_sibling"	"1"
 		"pin_to_sibling_corner"	"1"
@@ -634,7 +634,7 @@
 		"enabled"		"1"
 		"scaleImage"	"1"
 		"image"			"../Effects/powerup_king_hud"
-		"fgcolor"		"117 107 94 255"
+		"fgcolor"		"TanDark"
 		"pin_to_sibling"		"PlayerStatusAnchor"
 		"pin_corner_to_sibling"	"1"
 		"pin_to_sibling_corner"	"1"
@@ -653,7 +653,7 @@
 		"enabled"		"1"
 		"scaleImage"	"1"
 		"image"			"../Effects/powerup_plague_hud"
-		"fgcolor"		"117 107 94 255"
+		"fgcolor"		"TanDark"
 		"pin_to_sibling"		"PlayerStatusAnchor"
 		"pin_corner_to_sibling"	"1"
 		"pin_to_sibling_corner"	"1"
@@ -672,7 +672,7 @@
 		"enabled"		"1"
 		"scaleImage"	"1"
 		"image"			"../Effects/powerup_supernova_hud"
-		"fgcolor"		"117 107 94 255"
+		"fgcolor"		"TanDark"
 		"pin_to_sibling"		"PlayerStatusAnchor"
 		"pin_corner_to_sibling"	"1"
 		"pin_to_sibling_corner"	"1"
@@ -691,7 +691,7 @@
 		"enabled"		"1"
 		"scaleImage"	"1"
 		"image"			"../vgui/slowed"
-		"fgcolor"		"117 107 94 255"
+		"fgcolor"		"TanDark"
 		"pin_to_sibling"		"PlayerStatusAnchor"
 		"pin_corner_to_sibling"	"1"
 		"pin_to_sibling_corner"	"1"
@@ -710,7 +710,7 @@
 		"enabled"		"1"
 		"scaleImage"	"1"
 		"image"			"../vgui/bleed_drop_grapple"
-		"fgcolor"		"117 107 94 255"
+		"fgcolor"		"TanDark"
 		"pin_to_sibling"		"PlayerStatusAnchor"
 		"pin_corner_to_sibling"	"1"
 		"pin_to_sibling_corner"	"1"
diff --git a/resource/ui/importfiledialog.res b/resource/ui/importfiledialog.res
index 22f7638..a4d1997 100644
--- a/resource/ui/importfiledialog.res
+++ b/resource/ui/importfiledialog.res
@@ -767,7 +767,7 @@
 			"enabled"		"0"
 			"dulltext"		"0"
 			"brighttext"	"0"
-			"disabledfgcolor2_override"	"117 107 94 255"
+			"disabledfgcolor2_override"	"TanDark"
 			"command"		"UpdateBodygroup"
 			"border"		"NoBorder"
 		}
@@ -789,7 +789,7 @@
 			"enabled"		"0"
 			"dulltext"		"0"
 			"brighttext"	"0"
-			"disabledfgcolor2_override"	"117 107 94 255"
+			"disabledfgcolor2_override"	"TanDark"
 			"command"		"UpdateBodygroup"
 			"border"		"NoBorder"
 		}
@@ -811,7 +811,7 @@
 			"enabled"		"0"
 			"dulltext"		"0"
 			"brighttext"	"0"
-			"disabledfgcolor2_override"	"117 107 94 255"
+			"disabledfgcolor2_override"	"TanDark"
 			"command"		"UpdateBodygroup"
 			"border"		"NoBorder"
 		}
@@ -833,7 +833,7 @@
 			"enabled"		"0"
 			"dulltext"		"0"
 			"brighttext"	"0"
-			"disabledfgcolor2_override"	"117 107 94 255"
+			"disabledfgcolor2_override"	"TanDark"
 			"command"		"UpdateBodygroup"
 			"border"		"NoBorder"
 		}
@@ -855,7 +855,7 @@
 			"enabled"		"0"
 			"dulltext"		"0"
 			"brighttext"	"0"
-			"disabledfgcolor2_override"	"117 107 94 255"
+			"disabledfgcolor2_override"	"TanDark"
 			"command"		"UpdateBodygroup"
 			"border"		"NoBorder"
 		}
@@ -877,7 +877,7 @@
 			"enabled"		"0"
 			"dulltext"		"0"
 			"brighttext"	"0"
-			"disabledfgcolor2_override"	"117 107 94 255"
+			"disabledfgcolor2_override"	"TanDark"
 			"command"		"UpdateBodygroup"
 			"border"		"NoBorder"
 		}
@@ -899,7 +899,7 @@
 			"enabled"		"0"
 			"dulltext"		"0"
 			"brighttext"	"0"
-			"disabledfgcolor2_override"	"117 107 94 255"
+			"disabledfgcolor2_override"	"TanDark"
 			"command"		"UpdateBodygroup"
 			"border"		"NoBorder"
 		}
@@ -921,7 +921,7 @@
 			"enabled"		"0"
 			"dulltext"		"0"
 			"brighttext"	"0"
-			"disabledfgcolor2_override"	"117 107 94 255"
+			"disabledfgcolor2_override"	"TanDark"
 			"command"		"UpdateBodygroup"
 			"border"		"NoBorder"
 		}
@@ -943,7 +943,7 @@
 			"enabled"		"0"
 			"dulltext"		"0"
 			"brighttext"	"0"
-			"disabledfgcolor2_override"	"117 107 94 255"
+			"disabledfgcolor2_override"	"TanDark"
 			"command"		"UpdateBodygroup"
 			"border"		"NoBorder"
 		}
@@ -1723,7 +1723,7 @@
 			"enabled"		"1"
 			"dulltext"		"0"
 			"brighttext"	"0"
-			"disabledfgcolor2_override"	"117 107 94 255"
+			"disabledfgcolor2_override"	"TanDark"
 			"command"		"UpdatePaintable0"
 			"border"				"NoBorder"
 		}
@@ -1745,7 +1745,7 @@
 			"enabled"		"1"
 			"dulltext"		"0"
 			"brighttext"	"0"
-			"disabledfgcolor2_override"	"117 107 94 255"
+			"disabledfgcolor2_override"	"TanDark"
 			"command"		"UpdatePaintable1"
 			"border"				"NoBorder"
 		}
diff --git a/resource/ui/mainmenuoverride-base.res b/resource/ui/mainmenuoverride-base.res
index b6b14ee..6f09bd7 100644
--- a/resource/ui/mainmenuoverride-base.res
+++ b/resource/ui/mainmenuoverride-base.res
@@ -53,9 +53,9 @@
 				"border_armed"		""
 				"paintbackground"	"0"
 
-				"defaultFgColor_override"	"235 226 202 255"
-				"armedFgColor_override"		"72 255 255 255"
-				"depressedFgColor_override" "72 255 255 255"
+				"defaultFgColor_override"	"TanLight"
+				"armedFgColor_override"		"ColorCyan"
+				"depressedFgColor_override" "ColorCyan"
 			}
 		}
 
@@ -114,7 +114,7 @@
 		"tall"			"300"
 		"visible"		"0"
 		"bgcolor_override"		"Transparent"
-		"noitem_textcolor"		"117 107 94 255"
+		"noitem_textcolor"		"TanDark"
 		"PaintBackgroundType"	"2"
 		"paintborder"	"1"
 		"border"		"MainMenuBGBorder"
@@ -139,7 +139,7 @@
 			"enabled"		"1"
 			"labelText"		"%attriblist%"
 			"textAlignment"	"center"
-			"fgcolor"		"117 107 94 255"
+			"fgcolor"		"TanDark"
 			"centerwrap"	"1"
 		}
 	}
@@ -198,25 +198,25 @@
 		"sound_depressed"	""
 		"sound_released"	"UI/wooo_tree.wav"
 
-		"defaultFgColor_override" "235 226 202 255"
-		"armedFgColor_override" "72 255 255 255"
-		"depressedFgColor_override" "72 255 255 255"
+		"defaultFgColor_override" "TanLight"
+		"armedFgColor_override" "ColorCyan"
+		"depressedFgColor_override" "ColorCyan"
 
-		"image_drawcolor"	"235 226 202 255"
-		"image_armedcolor"	"72 255 255 255"
+		"image_drawcolor"	"TanLight"
+		"image_armedcolor"	"ColorCyan"
 	}
 
 	"TFLogoImage"
 	{
 		"ControlName"	"ImagePanel"
 		"fieldName"		"TFLogoImage"
-		"xpos"			"30"
-		"ypos"			"35"
+		"xpos"			"r180"
+		"ypos"			"r45"
 		"wide"			"179"
 		"tall"			"45"
-		"visible"		"0"
-		"enabled"		"0"
-		"image"			"../logo/tf2_logo_black"
+		"visible"		"1"
+		"enabled"		"1"
+		"image"			"../logo/tf2_logo_lt-blu"
 		"scaleImage"	"1"
 		"command"		"engine play vo/heavy_battlecry02.mp3"
 	}
@@ -263,9 +263,9 @@
 		"sound_depressed"	"UI/buttonclick.wav"
 		"sound_released"	"UI/buttonclickrelease.wav"
 
-		"defaultFgColor_override" 	"235 226 202 255"
-		"armedFgColor_override" 	"72 255 255 255"
-		"depressedFgColor_override" "235 226 202 255"
+		"defaultFgColor_override" 	"TanLight"
+		"armedFgColor_override" 	"ColorCyan"
+		"depressedFgColor_override" "TanLight"
 	}
 
 	"RankTooltipPanel"
@@ -452,8 +452,8 @@
 			"sound_depressed"	"UI/buttonclick.wav"
 			"sound_released"	"UI/buttonclickrelease.wav"
 
-			"defaultFgColor_override"	"235 226 202 255"
-			"armedFgColor_override"		"72 255 255 255"
+			"defaultFgColor_override"	"TanLight"
+			"armedFgColor_override"		"ColorCyan"
 		}
 	}
 
diff --git a/resource/ui/mainmenuoverride.res b/resource/ui/mainmenuoverride.res
index ce6889c..fdb6afa 100644
--- a/resource/ui/mainmenuoverride.res
+++ b/resource/ui/mainmenuoverride.res
@@ -5,24 +5,6 @@
 
 "Resource/UI/MainMenuOverride.res"
 {
-	"VersionLabel"
-	{
-		"ControlName"		"CExLabel"
-		"fieldName"			"VersionLabel"
-		"font"				"HudFontSmall"
-		"labelText"			"v2021.0415"
-		"xpos"				"r135"
-		"ypos"				"r15"
-		"wide"				"130"
-		"tall"				"10"
-		"autoResize"		"0"
-		"pinCorner"			"0"
-		"visible"			"1"
-		"enabled"			"1"
-		"textAlignment"		"east"
-		"fgcolor_override"	"TanLight"
-	}
-
 	"TFCharacterImage"
 	{
 		"ControlName"		"ImagePanel"
@@ -71,8 +53,8 @@
 			"paintborder"		"0"
 			"sound_depressed"	"UI/buttonclick.wav"
 			"sound_released"	"UI/buttonclickrelease.wav"
-			"defaultFgColor_override"	"235 226 202 255"
-			"armedFgColor_override"		"72 255 255 255"
+			"defaultFgColor_override"	"TanLight"
+			"armedFgColor_override"		"ColorCyan"
 		}
 	}
 
@@ -115,8 +97,8 @@
 			"sound_depressed"	"UI/buttonclick.wav"
 			"sound_released"	"UI/buttonclickrelease.wav"
 			
-			"defaultFgColor_override"	"235 226 202 255"
-			"armedFgColor_override"		"72 255 255 255"
+			"defaultFgColor_override"	"TanLight"
+			"armedFgColor_override"		"ColorCyan"
 		}
 	}
 
@@ -157,8 +139,8 @@
 			"sound_depressed"	"UI/buttonclick.wav"
 			"sound_released"	"UI/buttonclickrelease.wav"
 			
-			"defaultFgColor_override"	"235 226 202 255"
-			"armedFgColor_override"		"72 255 255 255"
+			"defaultFgColor_override"	"TanLight"
+			"armedFgColor_override"		"ColorCyan"
 		}
 	}
 }
\ No newline at end of file
diff --git a/resource/ui/matchmakingdashboardpopup_nextmapvoting.res b/resource/ui/matchmakingdashboardpopup_nextmapvoting.res
index 0cd4cc1..4e23a44 100644
--- a/resource/ui/matchmakingdashboardpopup_nextmapvoting.res
+++ b/resource/ui/matchmakingdashboardpopup_nextmapvoting.res
@@ -83,7 +83,7 @@
 
 				"image_default"		"glyph_collapse"
 
-				"image_drawcolor"	"235 226 202 255"
+				"image_drawcolor"	"TanLight"
 				"image_armedcolor"	"200 80 60 255"
 
 				"SubImage"
@@ -133,7 +133,7 @@
 
 				"image_default"		"glyph_expand"
 
-				"image_drawcolor"	"235 226 202 255"
+				"image_drawcolor"	"TanLight"
 				"image_armedcolor"	"200 80 60 255"
 
 				"SubImage"
diff --git a/resource/ui/scoreboard-base.res b/resource/ui/scoreboard-base.res
index ad97352..e142a55 100644
--- a/resource/ui/scoreboard-base.res
+++ b/resource/ui/scoreboard-base.res
@@ -712,7 +712,7 @@
 				"tall"			"36"
 				"visible"		"1"
 				"PaintBackgroundType"	"2"
-				"bgcolor_override"	"117 107 94 255"
+				"bgcolor_override"	"TanDark"
 			}
 			"AvatarImage"
 			{
@@ -733,7 +733,7 @@
 			{
 				"ControlName"	"CExLabel"
 				"fieldName"		"AvatarTextLabel"
-				"fgcolor"		"235 226 202 255"
+				"fgcolor"		"TanLight"
 				"xpos"			"50"
 				"ypos"			"7"
 				"zpos"			"2"
@@ -791,7 +791,7 @@
 				"tall"			"36"
 				"visible"		"1"
 				"PaintBackgroundType"	"2"
-				"bgcolor_override"	"117 107 94 255"
+				"bgcolor_override"	"TanDark"
 			}
 			"AvatarImage"
 			{
@@ -812,7 +812,7 @@
 			{
 				"ControlName"	"CExLabel"
 				"fieldName"		"AvatarTextLabel"
-				"fgcolor"		"235 226 202 255"
+				"fgcolor"		"TanLight"
 				"xpos"			"50"
 				"ypos"			"7"
 				"zpos"			"2"
@@ -916,7 +916,7 @@
 			"pinCorner"		"0"
 			"visible"		"1"
 			"enabled"		"1"
-			"fgcolor_override" "235 226 202 255"
+			"fgcolor_override" "TanLight"
 		}
 
 		"DeathsLabel"
@@ -969,7 +969,7 @@
 			"pinCorner"		"0"
 			"visible"		"1"
 			"enabled"		"1"
-			"fgcolor_override" "235 226 202 255"
+			"fgcolor_override" "TanLight"
 		}
 		"GameType"
 		{
@@ -1039,7 +1039,7 @@
 			"pinCorner"		"0"
 			"visible"		"1"
 			"enabled"		"1"
-			"fgcolor_override" "235 226 202 255"
+			"fgcolor_override" "TanLight"
 		}
 
 		"DestructionLabel"
@@ -1092,7 +1092,7 @@
 			"pinCorner"		"0"
 			"visible"		"1"
 			"enabled"		"1"
-			"fgcolor_override" "235 226 202 255"
+			"fgcolor_override" "TanLight"
 		}
 
 		"RevengeLabel"
@@ -1163,7 +1163,7 @@
 			"pinCorner"		"0"
 			"visible"		"1"
 			"enabled"		"1"
-			"fgcolor_override" "235 226 202 255"
+			"fgcolor_override" "TanLight"
 		}
 
 		"DefensesLabel"
@@ -1216,7 +1216,7 @@
 			"pinCorner"		"0"
 			"visible"		"1"
 			"enabled"		"1"
-			"fgcolor_override" "235 226 202 255"
+			"fgcolor_override" "TanLight"
 		}
 		"DominationLabel"
 		{
@@ -1268,7 +1268,7 @@
 			"pinCorner"		"0"
 			"visible"		"1"
 			"enabled"		"1"
-			"fgcolor_override" "235 226 202 255"
+			"fgcolor_override" "TanLight"
 		}
 		"Revenge"
 		{
@@ -1303,7 +1303,7 @@
 			"pinCorner"		"0"
 			"visible"		"1"
 			"enabled"		"1"
-			"fgcolor_override" "235 226 202 255"
+			"fgcolor_override" "TanLight"
 		}
 		"HealingLabel"
 		{
@@ -1355,7 +1355,7 @@
 			"pinCorner"		"0"
 			"visible"		"1"
 			"enabled"		"1"
-			"fgcolor_override" "235 226 202 255"
+			"fgcolor_override" "TanLight"
 		}
 		"InvulnLabel"
 		{
@@ -1407,7 +1407,7 @@
 			"pinCorner"		"0"
 			"visible"		"1"
 			"enabled"		"1"
-			"fgcolor_override" "235 226 202 255"
+			"fgcolor_override" "TanLight"
 		}
 		"TeleportsLabel"
 		{
@@ -1663,7 +1663,7 @@
 			"pinCorner"		"0"
 			"visible"		"1"
 			"enabled"		"1"
-			"fgcolor_override"	"235 226 202 255"
+			"fgcolor_override"	"TanLight"
 		}
 		"DamageLabel"
 		{
diff --git a/resource/ui/spectatorguihealth.res b/resource/ui/spectatorguihealth.res
index 4a12c68..bdca9a2 100644
--- a/resource/ui/spectatorguihealth.res
+++ b/resource/ui/spectatorguihealth.res
@@ -42,7 +42,7 @@
 		"scaleImage"	"1"
 	}
 
-	"GuiPlayerHealth"
+	"SpecHealthValue"
 	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"GuiPlayerHealth"
@@ -59,10 +59,10 @@
 		"fgcolor"		"Health Normal"
 	}
 
-	"GuiPlayerHealthShadow"
+	"SpecHealthValueShadow"
 	{
 		"ControlName"	"CExLabel"
-		"fieldName"		"GuiPlayerHealthShadow"
+		"fieldName"		"SpecHealthValueShadow"
 		"xpos"			"-1"
 		"ypos"			"-2"
 		"zpos"			"5"
@@ -75,7 +75,7 @@
 		"font"			"Cerbetica18"
 		"fgcolor"		"TransparentBlack"
 
-		"pin_to_sibling"		"GuiPlayerHealth"
+		"pin_to_sibling"		"SpecHealthValue"
 		"pin_corner_to_sibling"	"PIN_TOPLEFT"
 		"pin_to_sibling_corner"	"PIN_TOPLEFT"
 	}
diff --git a/resource/ui/spectatortournamentguihealth.res b/resource/ui/spectatortournamentguihealth.res
index 0a58663..802031d 100644
--- a/resource/ui/spectatortournamentguihealth.res
+++ b/resource/ui/spectatortournamentguihealth.res
@@ -38,10 +38,10 @@
 		"image"			""
 	}
 
-	"GuiPlayerHealth"
+	"SpecHealthValue"
 	{
 		"ControlName"	"CExLabel"
-		"fieldName"		"GuiPlayerHealth"
+		"fieldName"		"SpecHealthValue"
 		"xpos"			"0"
 		"ypos"			"0"
 		"zpos"			"5"
@@ -55,10 +55,10 @@
 		"fgcolor"		"Spec Health Normal"
 	}
 
-	"GuiPlayerHealthShadow"
+	"SpecHealthValueShadow"
 	{
 		"ControlName"	"CExLabel"
-		"fieldName"		"GuiPlayerHealthShadow"
+		"fieldName"		"SpecHealthValueShadow"
 		"xpos"			"-1"
 		"ypos"			"-2"
 		"zpos"			"4"
@@ -71,7 +71,7 @@
 		"font"			"Cerbetica16"
 		"fgcolor"		"TransparentBlack"
 
-		"pin_to_sibling"		"GuiPlayerHealth"
+		"pin_to_sibling"		"SpecHealthValue"
 		"pin_corner_to_sibling"	"PIN_TOPLEFT"
 		"pin_to_sibling_corner"	"PIN_TOPLEFT"
 	}
diff --git a/resource/ui/testitemroot.res b/resource/ui/testitemroot.res
index 56ee3ba..85bf9d7 100644
--- a/resource/ui/testitemroot.res
+++ b/resource/ui/testitemroot.res
@@ -753,12 +753,12 @@
 			"NumericInputOnly"	"0"
 			"unicode"			"0"
 
-			"fgcolor_override"	"235 226 202 255"
+			"fgcolor_override"	"TanLight"
 			"bgcolor_override"	"251 235 202 0"
 			"disabledFgColor_override" "117 107 94 0"
 			"disabledBgColor_override" "251 235 202 0"
 			"selectionColor_override" "Transparent"
-			"selectionTextColor_override" "235 226 202 255"
+			"selectionTextColor_override" "TanLight"
 			"defaultSelectionBG2Color_override" "251 235 202 255"
 		}
 
@@ -964,9 +964,9 @@
 			"sound_depressed"		"UI/buttonclick.wav"
 			"sound_released"		"UI/buttonclickrelease.wav"
 
-			"image_armedcolor"		"235 226 202 255"
-			"image_drawcolor"		"235 226 202 255"
-			"image_selectedcolor"	"46 43 42 255"
+			"image_armedcolor"		"TanLight"
+			"image_drawcolor"		"TanLight"
+			"image_selectedcolor"	"TanDarker"
 
 			"SubImage"
 			{
diff --git a/resource/ui/tfadvancedoptionsdialog.res b/resource/ui/tfadvancedoptionsdialog.res
index 4abe61e..d0c130a 100644
--- a/resource/ui/tfadvancedoptionsdialog.res
+++ b/resource/ui/tfadvancedoptionsdialog.res
@@ -42,7 +42,7 @@
 		"pinCorner"			"0"
 		"visible"			"1"
 		"enabled"			"1"
-		"fgcolor_override"	"TanLight"
+		"fgcolor_override"	"ColorCyan"
 		"allcaps"			"1"
 	}