Updated Schema Files

- Segregated icons to their own scheme file
- Removed unused scheme files and fonts
- Converted primary Cerbetica fonts from TTF to OTF
- Added additional borders
- Removed unused colors and xhairs
- Reorganized the font schema
- Enabled the xhair hitmarker layout
- Updated the source schema to work better on non-Windows OS

6 files changed, 709 insertions, 807 deletions

diff --git a/resource/scheme/clientscheme_borders.res b/resource/scheme/clientscheme_borders.res
index 8a65505..a5f0b58 100644
--- a/resource/scheme/clientscheme_borders.res
+++ b/resource/scheme/clientscheme_borders.res
@@ -10,7 +10,7 @@ Scheme
 			{
 				"1"
 				{
-					"color" "Base Color"
+					"color" "ColorCyan"
 					"offset" "0 0"
 				}
 			}
@@ -18,7 +18,7 @@ Scheme
 			{
 				"1"
 				{
-					"color" "Base Color"
+					"color" "ColorCyan"
 					"offset" "0 0"
 				}
 			}
@@ -26,7 +26,7 @@ Scheme
 			{
 				"1"
 				{
-					"color" "Base Color"
+					"color" "ColorCyan"
 					"offset" "0 0"
 				}
 			}
@@ -34,7 +34,40 @@ Scheme
 			{
 				"1"
 				{
-					"color" "Base Color"
+					"color" "ColorCyan"
+					"offset" "0 0"
+				}
+			}
+		}
+		
+		MenuBorder
+		{
+			"inset" "0 0 0 0"
+			Left
+			{
+				"1"
+				{
+					"color" "Yellow"
+					"offset" "0 0"
+				}
+				"2"
+				{
+					"color" "Yellow"
+					"offset" "0 0"
+				}
+				"3"
+				{
+					"color" "Yellow"
+					"offset" "0 0"
+				}
+				"4"
+				{
+					"color" "Yellow"
+					"offset" "0 0"
+				}
+				"5"
+				{
+					"color" "Yellow"
 					"offset" "0 0"
 				}
 			}
@@ -47,17 +80,17 @@ Scheme
 			{
 				"1"
 				{
-					"color" "Base Color"
+					"color" "ColorCyan"
 					"offset" "0 0"
 				}
 				"2"
 				{
-					"color" "Base Color"
+					"color" "ColorCyan"
 					"offset" "0 1"
 				}
 				"3"
 				{
-					"color" "Base Color"
+					"color" "ColorCyan"
 					"offset" "1 1"
 				}
 			}
@@ -2905,6 +2938,28 @@ Scheme
 			"draw_corner_height" 	"4"	
 		}
 		
+		OuterShadowBorder
+		{
+			"bordertype"			"scalable_image"
+			"backgroundtype"		"2"
+			"image"					"outer_shadow_border"
+			"src_corner_height"		"8"				// pixels inside the image
+			"src_corner_width"		"8"
+			"draw_corner_width"		"8"				// screen size of the corners ( and sides ), proportional
+			"draw_corner_height" 	"8"	
+		}
+		
+		OuterShadowBorderThin
+		{
+			"bordertype"			"scalable_image"
+			"backgroundtype"		"2"
+			"image"					"outer_shadow_border"
+			"src_corner_height"		"8"				// pixels inside the image
+			"src_corner_width"		"8"
+			"draw_corner_width"		"4"				// screen size of the corners ( and sides ), proportional
+			"draw_corner_height" 	"4"	
+		}
+		
 		CYOAScreenBorder
 		{
 			"bordertype"			"scalable_image"
diff --git a/resource/scheme/clientscheme_colors.res b/resource/scheme/clientscheme_colors.res
index aa200d6..6309983 100644
--- a/resource/scheme/clientscheme_colors.res
+++ b/resource/scheme/clientscheme_colors.res
@@ -2,8 +2,34 @@ Scheme
 {
 	Colors
 	{	
-		//rayshud colors
+		// HUD COLORS
+		//---------------------------------------------
+		"ColorRed"						"255 0 0 255"
+		"ColorVermillion"				"255 64 0 255"
+		"ColorOrange"					"255 128 0 255"
+		"ColorYellow"					"255 255 0 255"
+		"ColorLime"						"128 255 0 255"
+		"ColorGreen"					"0 255 0 255"
+		"ColorTeal"						"0 255 128 255"
+		"ColorCyan"						"0 255 255 255"
+		"ColorAqua"						"0 128 255 255"
+		"ColorBlue"						"0 0 255 255"
+		"ColorPurple"					"128 0 255 255"
+		"ColorMagenta"					"255 0 255 255"
+		"ColorRuby"						"255 0 128 255"
+		"ColorBlack"					"0 0 0 255"
+		"ColorGreyDark"					"64 64 64 255"
+		"ColorGreyMid"					"128 128 128 255"
+		"ColorGreyLight"				"192 192 192 255"
+		"ColorWhite"					"255 255 255 255"
 		"Tutorial Color"				"0 255 0 128"
+		"TextColor"						"117 107 94 255"
+		"DarkGrey"						"27 27 27 255"
+		"DarkerGrey"					"22 22 22 255"
+		"Grey"							"51 47 46 255"
+		"DullWhite"						"132 132 132 255"
+		//---------------------------------------------
+		// Gameplay
 		"Ammo In Clip"					"48 255 48 255"
 		"Ammo In Reserve"				"72 255 255 255"
 		"Ammo In Clip Low"				"255 42 130 255"
@@ -11,40 +37,25 @@ Scheme
 		"Health Normal"					"235 226 202 255"
 		"Health Buff"					"48 255 48 255"
 		"Health Hurt"					"255 153 0 255"
-		"Uber Bar Color"				"235 226 202 255"
-		"Solid Color Uber"				"255 50 25 255"
-		"Flashing Uber Color1"			"255 165 0 255"
-		"Flashing Uber Color2"			"255 69 0 255"
 		"Heal Numbers"					"48 255 48 255"
 		"Damage Numbers"				"72 255 255 255"
-		"Crosshair"						"242 242 242 255"
-		"CrosshairDamage"				"255 0 0 255"
-		
-		//refers to watching stvs/killcam shots
-		"Spec Health Normal"			"235 226 202 255"
-		"Spec Health Buff"				"48 255 48 255"			
-		"Spec Health Hurt"				"255 153 0 255"
-		
-		//alternate colors for flashing values
-		"Alternate Spec Health Normal"	"235 226 202 255"
-		"Alternate Spec Health Buff"	"48 255 48 255"			
-		"Alternate Spec Health Hurt"	"255 153 0 255"
-		
-		//alternate colors for flashing values
-		"Alternate Health Normal"		"235 226 202 255"
-		"Alternate Health Buff"			"48 255 48 255"			
-		"Alternate Health Hurt"			"255 153 0 255"
-		
-		//'Last DamageHeal Info' refers to the number that appears above hp
 		"Last DamageHeal Info"			"72 255 255 255"
-		
-		//Menu/Color scheme colors
 		"TransparentPanelBG"			"25 25 25 128"
 		"Base Color"					"15 255 255 255"
 		"Button Color"					"72 255 255 255"	
-		
-		"Inactive Tab"					"15 100 100 255"	
-		
+		//---------------------------------------------
+		// Crosshair Colors
+		"Crosshair"						"242 242 242 255"
+		"CrosshairDamage"				"255 0 0 255"
+		"Inactive Tab"					"15 100 100 255"
+		//---------------------------------------------
+		// Ubercharge
+		"Uber Bar Color"				"235 226 202 255"
+		"Solid Color Uber"				"255 50 25 255"
+		"Flashing Uber Color1"			"255 165 0 255"
+		"Flashing Uber Color2"			"255 69 0 255"
+		//---------------------------------------------
+		// Player Stats
 		"StatBar1"						"15 255 255 128"
 		"StatBar2"						"15 225 225 128"
 		"StatBar3"						"15 195 195 128"
@@ -54,43 +65,15 @@ Scheme
 		"StatBar7"						"15 85 85 128"
 		"StatBar8"						"15 65 65 128"
 		"StatBar9"						"15 45 45 128"
-		
-		//item backdrop color, refers to background color when mousing over items
 		"ItemPanelBG"					"50 50 50 255"
-		
-		//Rainbow Uber Colors
-		"ColorRed"						"255 0 0 255"
-		"ColorVermillion"				"255 64 0 255"
-		"ColorOrange"					"255 128 0 255"
-		"ColorYellow"					"255 255 0 255"
-		"ColorLime"						"128 255 0 255"
-		"ColorGreen"					"0 255 0 255"
-		"ColorTeal"						"0 255 128 255"
-		"ColorCyan"						"0 255 255 255"
-		"ColorAqua"						"0 128 255 255"
-		"ColorBlue"						"0 0 255 255"
-		"ColorPurple"					"128 0 255 255"
-		"ColorMagenta"					"255 0 255 255"
-		"ColorRuby"						"255 0 128 255"
-		"ColorBlack"					"0 0 0 255"
-		"ColorGreyDark"					"64 64 64 255"
-		"ColorGreyMid"					"128 128 128 255"
-		"ColorGreyLight"				"192 192 192 255"
-		"ColorWhite"					"255 255 255 255"
-		
 		"Transparent"					"0 0 0 0"
-		"TextColor"						"117 107 94 255"
-		"DarkGrey"						"27 27 27 255"
-		"DarkerGrey"					"22 22 22 255"
-		
-		"Grey"							"51 47 46 255"
-		//end rayshud colors
-		
-		// base colors
-		"Orange"						"Base Color"
-		"OrangeDim"						"Base Color"
+		//---------------------------------------------
+		// DEFAULT COLORS
+		//---------------------------------------------
+		"Orange"						"ColorCyan"
+		"OrangeDim"						"ColorCyan"
 		"LightOrange"					"188 112 0 128"
-		"GoalOrange"					"255 133 0"
+		"GoalOrange"					"255 133 0 255"
 		"TFOrange"						"145 73 59 255"
 		"Purple"						"137 69 99 255"
 		
@@ -211,7 +194,7 @@ Scheme
 		"QualityColorNormal"					"178 178 178 255"
 		"QualityColorrarity1"					"77 116 85 255"
 		"QualityColorrarity2"					"141 131 75 255"
-		"QualityColorrarity3"					"112 85 15 255"
+		"QualityColorrarity3"					"204 204 250 255"
 		"QualityColorrarity4"					"134 80 172 255"
 		"QualityColorVintage"					"71 98 145 255"
 		"QualityColorUnique"					"255 215 0 255"
diff --git a/resource/scheme/clientscheme_fonts.res b/resource/scheme/clientscheme_fonts.res
index 5f15572..8109edd 100644
--- a/resource/scheme/clientscheme_fonts.res
+++ b/resource/scheme/clientscheme_fonts.res
@@ -2,9 +2,495 @@ Scheme
 {
 	Fonts
 	{
-		// fonts are used in order that they are listed
-		// fonts listed later in the order will only be used if they fulfill a range not already filled
-		// if a font fails to load then the subsequent fonts will replace
+		// CUSTOM
+		"CerbeticaBold72"
+		{
+			"1"
+			{
+				"name"			"Cerbetica Bold"
+				"tall"			"72"
+				"additive"		"0"
+				"antialias"		"1"
+			}
+		}
+		"CerbeticaBold64"
+		{
+			"1"
+			{
+				"name"			"Cerbetica Bold"
+				"tall" 		 	"64"
+				"additive"		"0"
+				"antialias"		"1"
+			}
+		}
+		"CerbeticaBold56"
+		{
+			"1"
+			{
+				"name"			"Cerbetica Bold"
+				"tall" 		 	"56"
+				"additive"		"0"
+				"antialias"		"1"
+			}
+		}
+		"CerbeticaBoldMedic56"
+		{
+			"1"
+			{
+				"name"			"Cerbetica Bold"
+				"tall" 			 "56"
+				"additive"	 	"0"
+				"antialias"	 	"1"
+				"outline"	 	"1"
+			}
+		}
+		"CerbeticaBold48"
+		{
+			"1"
+			{
+				"name"			"Cerbetica Bold"
+				"tall" 		 	"48"
+				"additive"		"0"
+				"antialias"		"1"
+			}
+		}
+		"CerbeticaBold46"
+		{
+			"1"
+			{
+				"name"			"Cerbetica Bold"
+				"tall" 		 	"46"
+				"additive"		"0"
+				"antialias"		"1"
+			}
+		}
+		"CerbeticaBold44"
+		{
+			"1"
+			{
+				"name"			"Cerbetica Bold"
+				"tall" 		 	"44"
+				"additive"		"0"
+				"antialias"		"1"
+			}
+		}
+		"CerbeticaBold42"
+		{
+			"1"
+			{
+				"name"			"Cerbetica Bold"
+				"tall"			"42"
+				"additive"		"0"
+				"antialias"		"1"
+			}
+		}
+		"CerbeticaBold36"
+		{
+			"1"
+			{
+				"name"			"Cerbetica Bold"
+				"tall"			"36"
+				"additive"		"0"
+				"antialias"		"1"
+			}
+		}
+		"CerbeticaBold32"
+		{
+			"1"
+			{
+				"name"			"Cerbetica Bold"
+				"tall"			"32"
+				"additive"		"0"
+				"antialias"		"1"
+			}
+		}
+		"CerbeticaBoldOutline32"
+		{
+			"1"
+			{
+				"name"			"Cerbetica Bold"
+				"tall"			"32"
+				"additive"	 	"0"
+				"antialias"	 	"1"
+				"outline"		"1"
+			}
+		}
+		"CerbeticaBold28"
+		{
+			"1"
+			{
+				"name"			"Cerbetica Bold"
+				"tall"			"28"
+				"additive"		"0"
+				"antialias"		"1"
+			}
+		}
+		"CerbeticaBold24"
+		{
+			"1"
+			{
+				"name"			"Cerbetica Bold"
+				"tall"			"24"
+				"additive"		"0"
+				"antialias"		"1"
+			}
+		}
+		"CerbeticaBoldOutline24"
+		{
+			"1"
+			{
+				"name"			"Cerbetica Bold"
+				"tall" 		 	"24"
+				"additive"	 	"0"
+				"antialias"	 	"1"
+				"outline"	 	"1"
+			}
+		}
+		"CerbeticaBold20"
+		{
+			"1"
+			{
+				"name"			"Cerbetica Bold"
+				"tall"			"20"
+				"additive"		"0"
+				"antialias"		"1"
+			}
+		}
+		"CerbeticaBold18"
+		{
+			"1"
+			{
+				"name"			"Cerbetica Bold"
+				"tall"			"18"
+				"additive"		"0"
+				"antialias"		"1"
+			}
+		}
+		"CerbeticaBold17"
+		{
+			"1"
+			{
+				"name"			"Cerbetica Bold"
+				"tall"			"17"
+				"additive"		"0"
+				"antialias"		"1"
+			}
+		}
+		"CerbeticaBold16"
+		{
+			"1"
+			{
+				"name"			"Cerbetica Bold"
+				"tall"			"16"
+				"additive"		"0"
+				"antialias"		"1"
+			}
+		}
+		"CerbeticaBoldOutline16"
+		{
+			"1"
+			{
+				"name"			"Cerbetica Bold"
+				"tall"			"16"
+				"additive"	 	"0"
+				"antialias"	 	"1"
+				"outline"	 	"1"
+			}
+		}
+		"CerbeticaBold15"
+		{
+			"1"
+			{
+				"name"			"Cerbetica Bold"
+				"tall"			"15"
+				"additive"		"0"
+				"antialias"		"1"
+			}
+		}
+		"CerbeticaBold14"
+		{
+			"1"
+			{
+				"name"			"Cerbetica Bold"
+				"tall"			"14"
+				"additive"		"0"
+				"antialias"		"1"
+			}
+		}
+		"CerbeticaBold13"
+		{
+			"1"
+			{
+				"name"			"Cerbetica Bold"
+				"tall"			"13"
+				"additive"		"0"
+				"antialias"		"1"
+			}
+		}
+		"CerbeticaBold12"
+		{
+			"1"
+			{
+				"name"			"Cerbetica Bold"
+				"tall"			"12"
+				"additive"		"0"
+				"antialias"		"1"
+			}
+		}
+		"Cerbetica72"
+		{
+			"1"
+			{
+				"name"			"Cerbetica_edited"
+				"tall"			"72"
+				"additive"		"0"
+				"antialias"		"1"
+			}
+		}
+		"Cerbetica60"
+		{
+			"1"
+			{
+				"name"			"Cerbetica_edited"
+				"tall"			"60"
+				"additive"		"0"
+				"antialias"		"1"
+			}
+		}
+		"Cerbetica56"
+		{
+			"1"
+			{
+				"name"			"Cerbetica_edited"
+				"tall"			"56"
+				"additive"		"0"
+				"antialias"		"1"
+			}
+		}
+		"Cerbetica55"
+		{
+			"1"
+			{
+				"name"			"Cerbetica_edited"
+				"tall"			"55"
+				"additive"		"0"
+				"antialias"		"1"
+			}
+		}
+		
+		"Cerbetica54"
+		{
+			"1"
+			{
+				"name"			"Cerbetica_edited"
+				"tall"			"54"
+				"additive"		"0"
+				"antialias"		"1"
+			}
+		}
+		"Cerbetica52"
+		{
+			"1"
+			{
+				"name"			"Cerbetica_edited"
+				"tall"			"52"
+				"additive"		"0"
+				"antialias"		"1"
+			}
+		}
+		"Cerbetica48"
+		{
+			"1"
+			{
+				"name"			"Cerbetica_edited"
+				"tall"			"48"
+				"additive"		"0"
+				"antialias"		"1"
+			}
+		}
+		"Cerbetica44"
+		{
+			"1"
+			{
+				"name"			"Cerbetica_edited"
+				"tall"			"44"
+				"additive"		"0"
+				"antialias"		"1"
+			}
+		}
+		"Cerbetica40"
+		{
+			"1"
+			{
+				"name"			"Cerbetica_edited"
+				"tall"			"40"
+				"additive"		"0"
+				"antialias"		"1"
+			}
+		}
+		"Cerbetica36"
+		{
+			"1"
+			{
+				"name"			"Cerbetica_edited"
+				"tall"			"36"
+				"additive"		"0"
+				"antialias"		"1"
+			}
+		}
+		"Cerbetica32"
+		{
+			"1"
+			{
+				"name"			"Cerbetica_edited"
+				"tall"			"32"
+				"additive"		"0"
+				"antialias"		"1"
+			}
+		}
+		"Cerbetica28"
+		{
+			"1"
+			{
+				"name"			"Cerbetica_edited"
+				"tall"			"26"
+				"additive"		"0"
+				"antialias"		"1"
+			}
+		}
+		"Cerbetica26"
+		{
+			"1"
+			{
+				"name"			"Cerbetica_edited"
+				"tall"			"26"
+				"additive"		"0"
+				"antialias"		"1"
+			}
+		}
+		"Cerbetica24"
+		{
+			"1"
+			{
+				"name"			"Cerbetica_edited"
+				"tall"			"24"
+				"additive"		"0"
+				"antialias"		"1"
+			}
+		}
+		"CerbeticaOutline24"
+		{
+			"1"
+			{
+				"name"			"Cerbetica_edited"
+				"tall"			"24"
+				"additive"	 "0"
+				"antialias"	 "1"
+				"outline"	 "1"
+			}
+		}
+		"Cerbetica22"
+		{
+			"1"
+			{
+				"name"			"Cerbetica_edited"
+				"tall"			"22"
+				"additive"		"0"
+				"antialias"		"1"
+			}
+		}
+		"Cerbetica20"
+		{
+			"1"
+			{
+				"name"			"Cerbetica_edited"
+				"tall"			"20"
+				"additive"		"0"
+				"antialias"		"1"
+			}
+		}
+		"Cerbetica16"
+		{
+			"1"
+			{
+				"name"			"Cerbetica_edited"
+				"tall"			"16"
+				"additive"		"0"
+				"antialias"		"1"
+			}
+		}
+		"Cerbetica14"
+		{
+			"1"
+			{
+				"name"			"Cerbetica_edited"
+				"tall"			"14"
+				"additive"		"0"
+				"antialias"		"1"
+			}
+		}
+		"Cerbetica12"
+		{
+			"1"
+			{
+				"name"			"Cerbetica_edited"
+				"tall"			"12"
+				"additive"		"0"
+				"antialias"		"1"
+			}
+		}
+		"Cerbetica11"
+		{
+			"1"
+			{
+				"name"			"Cerbetica_edited"
+				"tall"			"11"
+				"additive"		"0"
+				"antialias"		"1"
+			}
+		}
+		"Cerbetica10"
+		{
+			"1"
+			{
+				"name"			"Cerbetica_edited"
+				"tall"			"10"
+				"additive"		"0"
+				"antialias"		"1"
+			}
+		}
+		"Cerbetica9"
+		{
+			"1"
+			{
+				"name"			"Cerbetica_edited"
+				"tall"			"9"
+				"additive"		"0"
+				"antialias"		"1"
+			}
+		}
+		"Cerbetica8"
+		{
+			"1"
+			{
+				"name"			"Cerbetica_edited"
+				"tall"			"8"
+				"additive"		"0"
+				"antialias"		"1"
+			}
+		}
+		"Cerbetica7"
+		{
+			"1"
+			{
+				"name"			"Cerbetica_edited"
+				"tall"			"7"
+				"additive"		"0"
+				"antialias" 	"1"
+			}
+		}
+
+		// DEFAULT
 		"Default"
 		{
 			"1"
@@ -2226,502 +2712,6 @@ Scheme
 				"antialias" 	"1"
 			}
 		}
-
-		"Cerbetica7"
-		{
-			"1"
-			{
-				"name"		 "Cerbetica_edited"
-				"tall" 		 "7"
-				"additive"	 "0"
-				"antialias"	 "1"
-			}
-		}
-		"Cerbetica8"
-		{
-			"1"
-			{
-				"name"		 "Cerbetica_edited"
-				"tall" 		 "8"
-				"additive"	 "0"
-				"antialias"	 "1"
-			}
-		}
-		"Cerbetica9"
-		{
-			"1"
-			{
-				"name"		 "Cerbetica_edited"
-				"tall" 		 "9"
-				"additive"	 "0"
-				"antialias"	 "1"
-			}
-		}
-		"Cerbetica10"
-		{
-			"1"
-			{
-				"name"		 "Cerbetica_edited"
-				"tall" 		 "10"
-				"additive"	 "0"
-				"antialias"	 "1"
-			}
-		}
-		"Cerbetica11"
-		{
-			"1"
-			{
-				"name"		 "Cerbetica_edited"
-				"tall" 		 "11"
-				"additive"	 "0"
-				"antialias"	 "1"
-			}
-		}
-		"Cerbetica12"
-		{
-			"1"
-			{
-				"name"		 "Cerbetica_edited"
-				"tall" 		 "12"
-				"additive"	 "0"
-				"antialias"	 "1"
-			}
-		}
-		"Cerbetica14"
-		{
-			"1"
-			{
-				"name"		 "Cerbetica_edited"
-				"tall" 		 "14"
-				"additive"	 "0"
-				"antialias"	 "1"
-			}
-		}
-		"Cerbetica16"
-		{
-			"1"
-			{
-				"name"		 "Cerbetica_edited"
-				"tall" 		 "16"
-				"additive"	 "0"
-				"antialias"	 "1"
-			}
-		}
-		"Cerbetica20"
-		{
-			"1"
-			{
-				"name"		 "Cerbetica_edited"
-				"tall" 		 "20"
-				"additive"	 "0"
-				"antialias"	 "1"
-			}
-		}
-		"Cerbetica22"
-		{
-			"1"
-			{
-				"name"		 "Cerbetica_edited"
-				"tall" 		 "22"
-				"additive"	 "0"
-				"antialias"	 "1"
-			}
-		}
-		"Cerbetica24"
-		{
-			"1"
-			{
-				"name"		 "Cerbetica_edited"
-				"tall" 		 "24"
-				"additive"	 "0"
-				"antialias"	 "1"
-			}
-		}
-		"CerbeticaOutline24"
-		{
-			"1"
-			{
-				"name"		 "Cerbetica_edited"
-				"tall" 		 "24"
-				"additive"	 "0"
-				"antialias"	 "1"
-				"outline"	 "1"
-			}
-		}
-		"Cerbetica26"
-		{
-			"1"
-			{
-				"name"		 "Cerbetica_edited"
-				"tall" 		 "26"
-				"additive"	 "0"
-				"antialias"	 "1"
-			}
-		}
-		"Cerbetica28"
-		{
-			"1"
-			{
-				"name"		 "Cerbetica_edited"
-				"tall" 		 "26"
-				"additive"	 "0"
-				"antialias"	 "1"
-			}
-		}
-		"Cerbetica32"
-		{
-			"1"
-			{
-				"name"		 "Cerbetica_edited"
-				"tall" 		 "32"
-				"additive"	 "0"
-				"antialias"	 "1"
-			}
-		}
-		"Cerbetica36"
-		{
-			"1"
-			{
-				"name"		 "Cerbetica_edited"
-				"tall" 		 "36"
-				"additive"	 "0"
-				"antialias"	 "1"
-			}
-		}
-		"Cerbetica40"
-		{
-			"1"
-			{
-				"name"		 "Cerbetica_edited"
-				"tall" 		 "40"
-				"additive"	 "0"
-				"antialias"	 "1"
-			}
-		}
-		"Cerbetica44"
-		{
-			"1"
-			{
-				"name"		 "Cerbetica_edited"
-				"tall" 		 "44"
-				"additive"	 "0"
-				"antialias"	 "1"
-			}
-		}
-		"Cerbetica48"
-		{
-			"1"
-			{
-				"name"		 "Cerbetica_edited"
-				"tall" 		 "48"
-				"additive"	 "0"
-				"antialias"	 "1"
-			}
-		}
-		"Cerbetica52"
-		{
-			"1"
-			{
-				"name"		 "Cerbetica_edited"
-				"tall" 		 "52"
-				"additive"	 "0"
-				"antialias"	 "1"
-			}
-		}
-		"Cerbetica54"
-		{
-			"1"
-			{
-				"name"		 "Cerbetica_edited"
-				"tall" 		 "54"
-				"additive"	 "0"
-				"antialias"	 "1"
-			}
-		}
-		"Cerbetica55"
-		{
-			"1"
-			{
-				"name"		 "Cerbetica_edited"
-				"tall" 		 "55"
-				"additive"	 "0"
-				"antialias"	 "1"
-			}
-		}
-		"Cerbetica56"
-		{
-			"1"
-			{
-				"name"		 "Cerbetica_edited"
-				"tall" 		 "56"
-				"additive"	 "0"
-				"antialias"	 "1"
-			}
-		}
-		"Cerbetica60"
-		{
-			"1"
-			{
-				"name"		 "Cerbetica_edited"
-				"tall" 		 "60"
-				"additive"	 "0"
-				"antialias"	 "1"
-			}
-		}
-		"Cerbetica72"
-		{
-			"1"
-			{
-				"name"		 "Cerbetica_edited"
-				"tall" 		 "72"
-				"additive"	 "0"
-				"antialias"	 "1"
-			}
-		}
-		"CerbeticaBold12"
-		{
-			"1"
-			{
-				"name"		 "Cerbetica Bold"
-				"tall" 		 "12"
-				"additive"	 "0"
-				"antialias"	 "1"
-			}
-		}
-		"CerbeticaBold13"
-		{
-			"1"
-			{
-				"name"		 "Cerbetica Bold"
-				"tall" 		 "13"
-				"additive"	 "0"
-				"antialias"	 "1"
-			}
-		}
-		"CerbeticaBold14"
-		{
-			"1"
-			{
-				"name"		 "Cerbetica Bold"
-				"tall" 		 "14"
-				"additive"	 "0"
-				"antialias"	 "1"
-			}
-		}
-		"CerbeticaBold15"
-		{
-			"1"
-			{
-				"name"		 "Cerbetica Bold"
-				"tall" 		 "15"
-				"additive"	 "0"
-				"antialias"	 "1"
-			}
-		}
-		"CerbeticaBold16"
-		{
-			"1"
-			{
-				"name"		 "Cerbetica Bold"
-				"tall" 		 "16"
-				"additive"	 "0"
-				"antialias"	 "1"
-			}
-		}
-		"CerbeticaBold17"
-		{
-			"1"
-			{
-				"name"		 "Cerbetica Bold"
-				"tall" 		 "17"
-				"additive"	 "0"
-				"antialias"	 "1"
-			}
-		}
-		"CerbeticaBold18"
-		{
-			"1"
-			{
-				"name"		 "Cerbetica Bold"
-				"tall" 		 "18"
-				"additive"	 "0"
-				"antialias"	 "1"
-			}
-		}
-		"CerbeticaBold20"
-		{
-			"1"
-			{
-				"name"		 "Cerbetica Bold"
-				"tall" 		 "20"
-				"additive"	 "0"
-				"antialias"	 "1"
-			}
-		}
-		"CerbeticaBold24"
-		{
-			"1"
-			{
-				"name"		 "Cerbetica Bold"
-				"tall" 		 "24"
-				"additive"	 "0"
-				"antialias"	 "1"
-			}
-		}
-		"CerbeticaBoldOutline24"
-		{
-			"1"
-			{
-				"name"		 "Cerbetica Bold"
-				"tall" 		 "24"
-				"additive"	 "0"
-				"antialias"	 "1"
-				"outline"	 "1"
-			}
-		}
-		"CerbeticaBoldOutline16"
-		{
-			"1"
-			{
-				"name"		 "Cerbetica Bold"
-				"tall" 		 "16"
-				"additive"	 "0"
-				"antialias"	 "1"
-				"outline"	 "1"
-			}
-		}
-		"CerbeticaBoldOutline32"
-		{
-			"1"
-			{
-				"name"		 "Cerbetica Bold"
-				"tall" 		 "32"
-				"additive"	 "0"
-				"antialias"	 "1"
-				"outline"	 "1"
-			}
-		}
-		"CerbeticaBold28"
-		{
-			"1"
-			{
-				"name"		 "Cerbetica Bold"
-				"tall" 		 "28"
-				"additive"	 "0"
-				"antialias"	 "1"
-			}
-		}
-		"CerbeticaBold32"
-		{
-			"1"
-			{
-				"name"		 "Cerbetica Bold"
-				"tall" 		 "32"
-				"additive"	 "0"
-				"antialias"	 "1"
-			}
-		}
-		"CerbeticaBold36"
-		{
-			"1"
-			{
-				"name"		 "Cerbetica Bold"
-				"tall" 		 "36"
-				"additive"	 "0"
-				"antialias"	 "1"
-			}
-		}
-		"CerbeticaBold42"
-		{
-			"1"
-			{
-				"name"		 "Cerbetica Bold"
-				"tall" 		 "42"
-				"additive"	 "0"
-				"antialias"	 "1"
-			}
-		}
-		"CerbeticaBold44"
-		{
-			"1"
-			{
-				"name"		 "Cerbetica Bold"
-				"tall" 		 "44"
-				"additive"	 "0"
-				"antialias"	 "1"
-			}
-		}
-		"CerbeticaBold46"
-		{
-			"1"
-			{
-				"name"		 "Cerbetica Bold"
-				"tall" 		 "46"
-				"additive"	 "0"
-				"antialias"	 "1"
-			}
-		}
-		"CerbeticaBold48"
-		{
-			"1"
-			{
-				"name"		 "Cerbetica Bold"
-				"tall" 		 "48"
-				"additive"	 "0"
-				"antialias"	 "1"
-			}
-		}
-		"CerbeticaBold56"
-		{
-			"1"
-			{
-				"name"		 "Cerbetica Bold"
-				"tall" 		 "56"
-				"additive"	 "0"
-				"antialias"	 "1"
-			}
-		}
-		"CerbeticaBoldMedic56"
-		{
-			"1"
-			{
-				"name"		 "Cerbetica Bold"
-				"tall" 		 "56"
-				"additive"	 "0"
-				"antialias"	 "1"
-				"outline"	 "1"
-			}
-		}
-		"CerbeticaBold64"
-		{
-			"1"
-			{
-				"name"		 "Cerbetica Bold"
-				"tall" 		 "64"
-				"additive"	 "0"
-				"antialias"	 "1"
-			}
-		}
-		"CerbeticaBold72"
-		{
-			"1"
-			{
-				"name"		 "Cerbetica Bold"
-				"tall" 		 "72"
-				"additive"	 "0"
-				"antialias"	 "1"
-			}
-		}
-		"CerbeticaBold124"
-		{
-			"1"
-			{
-				"name"		 "Cerbetica Bold"
-				"tall" 		 "124"
-				"additive"	 "0"
-				"antialias"	 "1"
-			}
-		}
 		
 		"TF2ComboBox"
 		{
@@ -2791,17 +2781,6 @@ Scheme
 				"antialias" 	"1"
 			}
 		}
-		"MenuArrows"
-		{
-			"1"
-			{
-				"name"			"FlawHUDIcons"
-				"tall"			"15"
-				"weight"		"400"
-				"additive"		"0"
-				"antialias" 	"1"
-			}
-		}
 	}
 	
 	BitmapFontFiles
@@ -2836,23 +2815,13 @@ Scheme
 		}
 		"7"
 		{
-			"font" "resource/fonts/Cerbetica.ttf"
-			"name" "Cerbetica"
-		}
-		"8"
-		{
-			"font" "resource/fonts/Cerbetica_edited.ttf"
-			"name" "Cerbetica_edited"
-		}
-		"9"
-		{
-			"font" "resource/fonts/Cerbetica_bold.ttf"
+			"font" "resource/fonts/Cerbetica_bold.otf"
 			"name" "Cerbetica Bold"
 		}
-		"10"
+		"8"
 		{
-			"font"	"resource/fonts/FlawHUDIcons.otf"
-			"name"	"FlawHUDIcons"
+			"font" "resource/fonts/Cerbetica.otf"
+			"name" "Cerbetica"
 		}
 	}
 }
\ No newline at end of file
diff --git a/resource/scheme/clientscheme_icons.res b/resource/scheme/clientscheme_icons.res
new file mode 100644
index 0000000..1e7c298
--- /dev/null
+++ b/resource/scheme/clientscheme_icons.res
@@ -0,0 +1,93 @@
+Scheme
+{
+	Fonts
+	{
+		"MenuArrows"
+		{
+			"1"
+			{
+				"name"			"FlawHUDIcons"
+				"tall"			"15"
+				"weight"		"400"
+				"additive"		"0"
+				"antialias" 	"1"
+			}
+		}
+		
+		"ClassIcons"
+		{
+			"1"
+			{
+				"name"			"FlawHUDIcons"
+				"tall"			"62"
+				"weight"		"0"
+				"additive"		"0"
+				"antialias"		"1"
+			}
+		}
+		
+		"CustomIcons10"
+		{
+			"1"
+			{
+				"name"			"FlawHUDIcons"
+				"tall"			"10"
+				"additive"		"0"
+				"antialias"		"1"
+			}
+		}
+		
+		"CustomIcons12"
+		{
+			"1"
+			{
+				"name"			"FlawHUDIcons"
+				"tall"			"12"
+				"additive"		"0"
+				"antialias"		"1"
+			}
+		}
+		
+		"CustomIcons14"
+		{
+			"1"
+			{
+				"name"			"FlawHUDIcons"
+				"tall"			"14"
+				"additive"		"0"
+				"antialias"		"1"
+			}
+		}
+		
+		"CustomIcons18"
+		{
+			"1"
+			{
+				"name"			"FlawHUDIcons"
+				"tall"			"18"
+				"additive"		"0"
+				"antialias"		"1"
+			}
+		}
+		
+		"CustomIcons20"
+		{
+			"1"
+			{
+				"name"			"FlawHUDIcons"
+				"tall"			"20"
+				"additive"		"0"
+				"antialias"		"1"
+			}
+		}
+	}
+	
+	CustomFontFiles
+	{
+		"121"
+		{
+			"font"	"resource/fonts/FlawHUDIcons.otf"
+			"name"	"FlawHUDIcons"
+		}
+	}
+}
\ No newline at end of file
diff --git a/resource/scheme/clientscheme_settings.res b/resource/scheme/clientscheme_settings.res
index 45194eb..61656ce 100644
--- a/resource/scheme/clientscheme_settings.res
+++ b/resource/scheme/clientscheme_settings.res
@@ -121,7 +121,7 @@ Scheme
 		PropertySheet.SelectedTextColor		"White"
 		PropertySheet.TransitionEffectTime	"0.25"	// time to change from one tab to another
 
-		RadioButton.TextColor				"Base Color"
+		RadioButton.TextColor				"ColorCyan"
 		RadioButton.SelectedTextColor		"Orange"
 
 		RichText.TextColor					"Gray"
diff --git a/resource/scheme/clientscheme_xhairs.res b/resource/scheme/clientscheme_xhairs.res
index 7c8419d..b45c80b 100644
--- a/resource/scheme/clientscheme_xhairs.res
+++ b/resource/scheme/clientscheme_xhairs.res
@@ -343,114 +343,26 @@ Scheme
 				"outline"	"0"
 			}
 		}
-		"size:41,outline:off"
+		"size:10,outline:on"
 		{
 			"1"
 			{
 				"name"		"KnucklesCrosses"
-				"tall"		"41"
-				"antialias" "1"
-				"additive"	"0"
-				"outline"	"0"
-			}
-		}
-		"size:42,outline:off"
-		{
-			"1"
-			{
-				"name"		"KnucklesCrosses"
-				"tall"		"42"
-				"antialias" "1"
-				"additive"	"0"
-				"outline"	"0"
-			}
-		}
-		"size:43,outline:off"
-		{
-			"1"
-			{
-				"name"		"KnucklesCrosses"
-				"tall"		"43"
-				"antialias" "1"
-				"additive"	"0"
-				"outline"	"0"
-			}
-		}
-		"size:44,outline:off"
-		{
-			"1"
-			{
-				"name"		"KnucklesCrosses"
-				"tall"		"44"
-				"antialias" "1"
-				"additive"	"0"
-				"outline"	"0"
-			}
-		}
-		"size:45,outline:off"
-		{
-			"1"
-			{
-				"name"		"KnucklesCrosses"
-				"tall"		"45"
-				"antialias" "1"
-				"additive"	"0"
-				"outline"	"0"
-			}
-		}
-		"size:46,outline:off"
-		{
-			"1"
-			{
-				"name"		"KnucklesCrosses"
-				"tall"		"46"
-				"antialias" "1"
-				"additive"	"0"
-				"outline"	"0"
-			}
-		}
-		"size:47,outline:off"
-		{
-			"1"
-			{
-				"name"		"KnucklesCrosses"
-				"tall"		"47"
-				"antialias" "1"
-				"additive"	"0"
-				"outline"	"0"
-			}
-		}
-		"size:48,outline:off"
-		{
-			"1"
-			{
-				"name"		"KnucklesCrosses"
-				"tall"		"48"
-				"antialias" "1"
-				"additive"	"0"
-				"outline"	"0"
-			}
-		}
-		"size:49,outline:off"
-		{
-			"1"
-			{
-				"name"		"KnucklesCrosses"
-				"tall"		"49"
-				"antialias" "1"
+				"tall"		"10"
+				"antialias" "0"
 				"additive"	"0"
-				"outline"	"0"
+				"outline"	"1"
 			}
 		}
-		"size:50,outline:off"
+		"size:11,outline:on"
 		{
 			"1"
 			{
 				"name"		"KnucklesCrosses"
-				"tall"		"50"
-				"antialias" "1"
+				"tall"		"11"
+				"antialias" "0"
 				"additive"	"0"
-				"outline"	"0"
+				"outline"	"1"
 			}
 		}
 		"size:12,outline:on"
@@ -756,7 +668,7 @@ Scheme
 			{
 				"name"		"KnucklesCrosses"
 				"tall"		"39"
-				"antiaias" "0"
+				"antialias" "0"
 				"additive"	"0"
 				"outline"	"1"
 			}
@@ -772,116 +684,6 @@ Scheme
 				"outline"	"1"
 			}
 		}
-		"size:41,outline:on"
-		{
-			"1"
-			{
-				"name"		"KnucklesCrosses"
-				"tall"		"41"
-				"antialias" "0"
-				"additive"	"0"
-				"outline"	"1"
-			}
-		}
-		"size:42,outline:on"
-		{
-			"1"
-			{
-				"name"		"KnucklesCrosses"
-				"tall"		"42"
-				"antialias" "0"
-				"additive"	"0"
-				"outline"	"1"
-			}
-		}
-		"size:43,outline:on"
-		{
-			"1"
-			{
-				"name"		"KnucklesCrosses"
-				"tall"		"43"
-				"antialias" "0"
-				"additive"	"0"
-				"outline"	"1"
-			}
-		}
-		"size:44,outline:on"
-		{
-			"1"
-			{
-				"name"		"KnucklesCrosses"
-				"tall"		"44"
-				"antialias" "0"
-				"additive"	"0"
-				"outline"	"1"
-			}
-		}
-		"size:45,outline:on"
-		{
-			"1"
-			{
-				"name"		"KnucklesCrosses"
-				"tall"		"45"
-				"antialias" "0"
-				"additive"	"0"
-				"outline"	"1"
-			}
-		}
-		"size:46,outline:on"
-		{
-			"1"
-			{
-				"name"		"KnucklesCrosses"
-				"tall"		"46"
-				"antialias" "0"
-				"additive"	"0"
-				"outline"	"1"
-			}
-		}
-		"size:47,outline:on"
-		{
-			"1"
-			{
-				"name"		"KnucklesCrosses"
-				"tall"		"47"
-				"antialias" "0"
-				"additive"	"0"
-				"outline"	"1"
-			}
-		}
-		"size:48,outline:on"
-		{
-			"1"
-			{
-				"name"		"KnucklesCrosses"
-				"tall"		"48"
-				"antialias" "0"
-				"additive"	"0"
-				"outline"	"1"
-			}
-		}
-		"size:49,outline:on"
-		{
-			"1"
-			{
-				"name"		"KnucklesCrosses"
-				"tall"		"49"
-				"antialias" "0"
-				"additive"	"0"
-				"outline"	"1"
-			}
-		}
-		"size:50,outline:on"
-		{
-			"1"
-			{
-				"name"	"KnucklesCrosses"
-				"tall"	"50"
-				"antialias" "0"
-				"additive"	"0"
-				"outline"	"1"
-			}
-		}
 		
 		"xHairCircle"
 		{
@@ -1725,22 +1527,22 @@ Scheme
 	
 	CustomFontFiles
 	{
-		"100" // Fog's xHairs
+		"110" // Fog's xHairs
 		{
 			"font" "resource/fonts/crosshairs.ttf"
 			"name" "Crosshairs"
 		}
-		"101" // Thin Cross
+		"111" // Thin Cross
 		{
 			"font" "resource/fonts/Symbol.ttf"
 			"name" "Symbol"
 		}
-		"102" // Konr Wings
+		"112" // Konr Wings
 		{
 			"font" "resource/fonts/Garm3nFont.ttf"
 			"name" "Garm3nFont"
 		}
-		"103"
+		"113"
 		{
 			"font" "resource/fonts/KnucklesCrosses.ttf"
 			"name" "KnucklesCrosses"