Updated the client and source schemes

7 files changed, 717 insertions, 1034 deletions

diff --git a/resource/scheme/clientscheme_borders.res b/resource/scheme/clientscheme_borders.res
index c1508f5..10d8015 100644
--- a/resource/scheme/clientscheme_borders.res
+++ b/resource/scheme/clientscheme_borders.res
@@ -2364,8 +2364,8 @@ Scheme
 			"image"					"featured_corner"
 			"src_corner_height"		"32"			// pixels inside the image
 			"src_corner_width"		"32"
-			"draw_corner_width"		"4"				// screen size of the corners ( and sides ), proportional
-			"draw_corner_height"	"4"	
+			"draw_corner_width"		"0"				// screen size of the corners ( and sides ), proportional
+			"draw_corner_height"	"0"	
 		}
 		StoreHighlightedBackgroundBorder
 		{
@@ -2649,8 +2649,8 @@ Scheme
 			"image"					"replay/panel_scalable_transparent"
 			"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"	
+			"draw_corner_width"		"7"				// screen size of the corners ( and sides ), proportional
+			"draw_corner_height" 	"7"	
 		}
 		
 		RedWithThinBorder
@@ -2660,8 +2660,8 @@ Scheme
 			"image"					"../hud/panel_scalable_red"
 			"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"
+			"draw_corner_width"		"7"				// screen size of the corners ( and sides ), proportional
+			"draw_corner_height" 	"7"
 		}
 		
 		BlueWithThinBorder
@@ -2671,8 +2671,8 @@ Scheme
 			"image"					"../hud/panel_scalable_blue"
 			"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"
+			"draw_corner_width"		"7"				// screen size of the corners ( and sides ), proportional
+			"draw_corner_height" 	"7"
 		}
 		
 		InnerShadowBorder
diff --git a/resource/scheme/clientscheme_colors.res b/resource/scheme/clientscheme_colors.res
index e680f7a..14b8ad5 100644
--- a/resource/scheme/clientscheme_colors.res
+++ b/resource/scheme/clientscheme_colors.res
@@ -96,10 +96,10 @@ Scheme
 		"Blue"									"0 28 162 140"
 		"Yellow"								"251 235 202 255"
 		"TransparentYellow"						"251 235 202 140"
-		//"Black"								"0 0 0 255"
+		"BrightYellow"							"251 235 0 255"
 		"GreenSolid"							"76 107 34 255"
 		
-		"Black"									"46 43 42 255"
+		"Black"									"30 30 30 255"
 		"Transparent"							"0 0 0 0"
 		"TransparentBlack"						"0 0 0 196"
 		"TransparentLightBlack"					"0 0 0 90"
@@ -113,15 +113,15 @@ Scheme
 		"HUDDeathWarning"						"255 0 0 255"
 		"HudWhite"								"255 255 255 255"
 		"HudOffWhite"							"200 187 161 255"
-		"HudBlack"								"65 65 65 255"
+		"HudBlack"								"0 0 0 230"
 		"ProgressBarBlue"						"91 122 142 255"
 		"CreditsGreen"							"94 150 49 255"
 		
 		"Gray"									"178 178 178 255"
 		"Blank"									"0 0 0 0"
 		"ForTesting"							"255 0 0 32"
-		"ForTesting_Magenta"					"0 255 0 255"
-		"ForTesting_MagentaDim"					"0 255 0 120"
+		"ForTesting_Magenta"					"255 0 255 255"
+		"ForTesting_MagentaDim"					"255 0 255 120"
 
 		"HudPanelForeground"					"123 110 59 184"
 		"HudPanelBackground"					"123 110 59 184"
@@ -200,6 +200,23 @@ Scheme
 		"QualityColorCollectors"				"170 0 0 255"
 		"QualityColorPaintkitWeapon"			"250 250 250 255"
 
+		"DimmQualityColorNormal"				"178 178 178 100"
+		"DimmQualityColorrarity1"				"77 116 85 100"
+		"DimmQualityColorrarity2"				"141 131 75 100"
+		"DimmQualityColorrarity3"				"204 204 250 100"
+		"DimmQualityColorrarity4"				"134 80 172 100"
+		"DimmQualityColorVintage"				"71 98 145 100"
+		"DimmQualityColorUnique"				"255 215 0 100"
+		"DimmQualityColorCommunity"				"112 176 74 100"
+		"DimmQualityColorDeveloper"				"165 15 121 100"
+		"DimmQualityColorSelfMade"				"112 176 74 100"
+		"DimmQualityColorCustomized"			"71 98 145 100"
+		"DimmQualityColorStrange"				"207 106 50 100"
+		"DimmQualityColorCompleted"				"134 80 172 100"
+		"DimmQualityColorHaunted"				"56 243 171 100"
+		"DimmQualityColorCollectors"			"170 0 0 100"
+		"DimmQualityColorPaintkitWeapon"		"250 250 250 100"
+
 		"ItemRarityDefault"						"131 126 119 255"
 		"ItemRarityCommon"						"176 195 217 255"
 		"ItemRarityUncommon"					"94 152 217 255"
@@ -207,6 +224,14 @@ Scheme
 		"ItemRarityMythical"					"136 71 255 255"
 		"ItemRarityLegendary"					"211 44 230 255"
 		"ItemRarityAncient"						"235 75 75 255"
+
+		"DimmItemRarityDefault"					"131 126 119 100"
+		"DimmItemRarityCommon"					"176 195 217 100"
+		"DimmItemRarityUncommon"				"94 152 217 100"
+		"DimmItemRarityRare"					"75 105 255 100"
+		"DimmItemRarityMythical"				"136 71 255 100"
+		"DimmItemRarityLegendary"				"211 44 230 100"
+		"DimmItemRarityAncient"					"235 75 75 100"
 		
 		"ItemRarityDefault_GreyedOut"			"44 42 40 255"
 		"ItemRarityCommon_GreyedOut"			"59 65 72 255"
@@ -250,4 +275,4 @@ Scheme
 		"UpgradeDisabledFg"						"64 59 52 255"
 		"UpgradeDisabledBg"						"79 77 68 255"
 	}
-}
\ No newline at end of file
+}
diff --git a/resource/scheme/clientscheme_fonts.res b/resource/scheme/clientscheme_fonts.res
index 01c6512..17637fd 100644
--- a/resource/scheme/clientscheme_fonts.res
+++ b/resource/scheme/clientscheme_fonts.res
@@ -33,17 +33,27 @@ Scheme
 				"antialias"		"1"
 			}
 		}
-		"CerbeticaBoldMedic56"
+		"CerbeticaBoldOutline56"
 		{
 			"1"
 			{
 				"name"			"Cerbetica Bold"
-				"tall" 			 "56"
+				"tall" 			"56"
 				"additive"	 	"0"
 				"antialias"	 	"1"
 				"outline"	 	"1"
 			}
 		}
+		"CerbeticaBold50"
+		{
+			"1"
+			{
+				"name"			"Cerbetica Bold"
+				"tall" 		 	"50"
+				"additive"		"0"
+				"antialias"		"1"
+			}
+		}
 		"CerbeticaBold48"
 		{
 			"1"
@@ -84,6 +94,16 @@ Scheme
 				"antialias"		"1"
 			}
 		}
+		"CerbeticaBold37"
+		{
+			"1"
+			{
+				"name"			"Cerbetica Bold"
+				"tall"			"37"
+				"additive"		"0"
+				"antialias"		"1"
+			}
+		}
 		"CerbeticaBold36"
 		{
 			"1"
@@ -125,6 +145,16 @@ Scheme
 				"antialias"		"1"
 			}
 		}
+		"CerbeticaBold27"
+		{
+			"1"
+			{
+				"name"			"Cerbetica Bold"
+				"tall"			"27"
+				"additive"		"0"
+				"antialias"		"1"
+			}
+		}
 		"CerbeticaBold24"
 		{
 			"1"
@@ -146,6 +176,16 @@ Scheme
 				"outline"	 	"1"
 			}
 		}
+		"CerbeticaBold22"
+		{
+			"1"
+			{
+				"name"			"Cerbetica Bold"
+				"tall"			"22"
+				"additive"		"0"
+				"antialias"		"1"
+			}
+		}
 		"CerbeticaBold20"
 		{
 			"1"
@@ -237,6 +277,26 @@ Scheme
 				"antialias"		"1"
 			}
 		}
+		"CerbeticaBold10"
+		{
+			"1"
+			{
+				"name"			"Cerbetica Bold"
+				"tall"			"10"
+				"additive"		"0"
+				"antialias"		"1"
+			}
+		}
+		"CerbeticaBold8"
+		{
+			"1"
+			{
+				"name"			"Cerbetica Bold"
+				"tall"			"8"
+				"additive"		"0"
+				"antialias"		"1"
+			}
+		}
 		"Cerbetica72"
 		{
 			"1"
@@ -384,9 +444,9 @@ Scheme
 			{
 				"name"			"Cerbetica_edited"
 				"tall"			"24"
-				"additive"	 "0"
-				"antialias"	 "1"
-				"outline"	 "1"
+				"additive"	 	"0"
+				"antialias"	 	"1"
+				"outline"	 	"1"
 			}
 		}
 		"Cerbetica22"
@@ -409,6 +469,16 @@ Scheme
 				"antialias"		"1"
 			}
 		}
+		"Cerbetica18"
+		{
+			"1"
+			{
+				"name"			"Cerbetica_edited"
+				"tall"			"18"
+				"additive"		"0"
+				"antialias"		"1"
+			}
+		}
 		"Cerbetica16"
 		{
 			"1"
@@ -419,6 +489,16 @@ Scheme
 				"antialias"		"1"
 			}
 		}
+		"Cerbetica15"
+		{
+			"1"
+			{
+				"name"			"Cerbetica_edited"
+				"tall"			"15"
+				"additive"		"0"
+				"antialias"		"1"
+			}
+		}
 		"Cerbetica14"
 		{
 			"1"
@@ -496,15 +576,16 @@ Scheme
 			"1"
 			{
 				"name"			"Cerbetica_edited"
-				"tall"			"12"
+				"tall"			"10"
+				"additive"		"0"
 				"antialias"		"1"
 			}
 			"2"
 			{
 				"name"			"Cerbetica_bold"
-				"tall"			"72"
+				"tall"			"12"
+				"range"			"0x0000 0x00FF"
 				"weight"		"800"
-				"antialias"		"1"
 			}
 		}
 		"DefaultOutline"
@@ -701,10 +782,11 @@ Scheme
 			"1"
 			{
 				"name"			"Cerbetica_edited"
+				"name"			"Helvetica" [$OSX]
 				"tall"			"18"
 				"weight"		"900"
 				"antialias"		"1"
-				"additive"		"0"
+				"additive"		"1"
 			}
 		}
 		
@@ -725,7 +807,7 @@ Scheme
 			"1"
 			{
 				"name"			"Cerbetica_edited"
-				"tall"			"12"
+				"tall"			"10"
 				"weight"		"0"
 				"additive"		"0"
 				"antialias"		"1"
@@ -765,7 +847,7 @@ Scheme
 			"1"
 			{
 				"name"			"Cerbetica_edited"
-				"tall"			"32"
+				"tall"			"24"
 				"weight"		"500"
 				"additive"		"0"
 				"antialias" 	"1"
@@ -774,7 +856,7 @@ Scheme
 			"2"
 			{
 				"name"			"Cerbetica_edited"
-				"tall"			"44"
+				"tall"			"32"
 				"weight"		"500"
 				"additive"		"0"
 				"antialias"		"1"
@@ -783,7 +865,7 @@ Scheme
 			"3"
 			{
 				"name"			"Cerbetica_edited"
-				"tall"			"48"
+				"tall"			"44"
 				"weight"		"500"
 				"additive"		"0"
 				"antialias"		"1"
@@ -792,7 +874,7 @@ Scheme
 			"4"
 			{
 				"name"			"Cerbetica_edited"
-				"tall"			"52"
+				"tall"			"48"
 				"weight"		"500"
 				"additive"		"0"
 				"antialias" 	"1"
@@ -801,7 +883,7 @@ Scheme
 			"5"
 			{
 				"name"			"Cerbetica_edited"
-				"tall"			"72"
+				"tall"			"52"
 				"weight"		"500"
 				"additive"		"0"
 				"antialias" 	"1"
@@ -813,7 +895,7 @@ Scheme
 			"1"
 			{
 				"name"			"Cerbetica_edited"
-				"tall"			"64"
+				"tall"			"44"
 				"weight"		"500"
 				"additive"		"0"
 				"antialias" 	"1"
@@ -824,7 +906,7 @@ Scheme
 			"1"
 			{
 				"name"			"Cerbetica_edited"
-				"tall"			"48"
+				"tall"			"35"
 				"weight"		"500"
 				"additive"		"0"
 				"antialias"		"1"
@@ -835,7 +917,7 @@ Scheme
 			"1"
 			{
 				"name"			"Cerbetica_edited"
-				"tall"			"44"
+				"tall"			"36"
 				"weight"		"500"
 				"additive"		"0"
 				"antialias" 	"1"
@@ -846,7 +928,7 @@ Scheme
 			"1"
 			{
 				"name"			"Cerbetica_edited"
-				"tall"			"36"
+				"tall"			"30"
 				"weight"		"500"
 				"additive"		"0"
 				"antialias"		"1"
@@ -857,7 +939,7 @@ Scheme
 			"1"
 			{
 				"name"			"Cerbetica_edited"
-				"tall"			"36"
+				"tall"			"30"
 				"weight"		"500"
 				"additive"		"0"
 				"antialias"		"1"
@@ -868,7 +950,7 @@ Scheme
 			"1"
 			{
 				"name"			"Cerbetica_edited"
-				"tall"			"32"
+				"tall"			"24"
 				"weight"		"500"
 				"additive"		"0"
 				"antialias"		"1"
@@ -879,7 +961,7 @@ Scheme
 			"1"
 			{
 				"name"			"Cerbetica_edited"
-				"tall"			"32"
+				"tall"			"24"
 				"weight"		"500"
 				"additive"		"0"
 				"antialias" 	"1"
@@ -890,7 +972,7 @@ Scheme
 			"1"
 			{
 				"name"			"Cerbetica_edited"
-				"tall"			"28"
+				"tall"			"24"
 				"weight"		"500"
 				"additive"		"0"
 				"antialias" 	"1"
@@ -901,7 +983,7 @@ Scheme
 			"1"
 			{
 				"name"			"Cerbetica_edited"
-				"tall"			"24"
+				"tall"			"18"
 				"weight"		"500"
 				"additive"		"0"
 				"antialias" 	"1"
@@ -912,7 +994,7 @@ Scheme
 			"1"
 			{
 				"name"			"Cerbetica_edited"
-				"tall"			"22"
+				"tall"			"18"
 				"weight"		"500"
 				"additive"		"0"
 				"antialias" 	"1"
@@ -923,7 +1005,7 @@ Scheme
 			"1"
 			{
 				"name"			"Cerbetica_edited"
-				"tall"			"22"
+				"tall"			"18"
 				"weight"		"500"
 				"additive"		"0"
 				"antialias" 	"1"
@@ -971,6 +1053,7 @@ Scheme
 				"weight"		"500"
 				"additive"		"0"
 				"antialias" 	"1"
+				"dropshadow"	"1"
 			}
 		}
 		"HudFontSmallest"
@@ -978,7 +1061,7 @@ Scheme
 			"1"
 			{
 				"name"			"Cerbetica_edited"
-				"tall"			"12"
+				"tall"			"11"
 				"weight"		"500"
 				"additive"		"0"
 				"antialias" 	"1"
@@ -989,10 +1072,11 @@ Scheme
 			"1"
 			{
 				"name"			"Cerbetica_edited"
-				"tall"			"12"
+				"tall"			"11"
 				"weight"		"500"
 				"additive"		"0"
 				"antialias" 	"1"
+				"dropshadow"	"1"
 			}
 		}
 		"HudFontSmallestBold"
@@ -1000,7 +1084,7 @@ Scheme
 			"1"
 			{
 				"name"			"Cerbetica_edited"
-				"tall"			"12"
+				"tall"			"11"
 				"weight"		"500"
 				"additive"		"0"
 				"antialias" 	"1"
@@ -1012,7 +1096,7 @@ Scheme
 			"1"
 			{
 				"name"			"Cerbetica_edited"
-				"tall"			"12"
+				"tall"			"4"
 				"weight"		"500"
 				"additive"		"0"
 				"antialias"		"1"
@@ -1046,7 +1130,7 @@ Scheme
 			"1"
 			{
 				"name"			"Cerbetica_edited"
-				"tall"			"12"
+				"tall"			"9"
 				"weight"		"0"
 				"additive"		"0"
 				"antialias" 	"1"
@@ -1057,7 +1141,7 @@ Scheme
 			"1"
 			{
 				"name"			"Cerbetica_edited"
-				"tall"			"10"
+				"tall"			"9"
 				"weight"		"0"
 				"additive"		"0"
 				"antialias" 	"1"
@@ -1068,7 +1152,7 @@ Scheme
 			"1"
 			{
 				"name"			"Cerbetica_edited"
-				"tall"			"8"
+				"tall"			"6"
 				"weight"		"0"
 				"additive"		"0"
 				"antialias" 	"1"
@@ -1186,7 +1270,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"			"Cerbetica_edited"
+				"name"			"Verdana"
 				"tall"			"8"
 				"weight"		"500"
 				"additive"		"0"
@@ -1198,7 +1282,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"			"Cerbetica_edited"
+				"name"			"Verdana"
 				"tall"			"9"
 				"weight"		"500"
 				"additive"		"0"
@@ -1209,7 +1293,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"			"Cerbetica_edited"
+				"name"			"Verdana"
 				"tall"			"8"
 				"weight"		"500"
 				"additive"		"0"
@@ -1220,7 +1304,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"			"Cerbetica_edited"
+				"name"			"Verdana"
 				"tall"			"8"
 				"weight"		"500"
 				"additive"		"0"
@@ -1283,7 +1367,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"			"Cerbetica_edited"
+				"name"			"Courier New"
 				"tall"			"14"
 				"weight"		"400"
 				"outline"		"1"
@@ -1353,7 +1437,8 @@ Scheme
 			"1"
 			{
 				"name"			"Cerbetica Bold"
-				"tall"			"32"
+				"tall"			"24"
+				"antialias" 	"1"
 				"weight"		"500"
 				"range"			"0x0000 0x017F"
 			}
@@ -1363,7 +1448,8 @@ Scheme
 			"1"
 			{
 				"name"			"Cerbetica Bold"
-				"tall"			"32"
+				"tall"			"24"
+				"antialias" 	"1"
 				"weight"		"500"
 				"italic"		"1"
 				"range"			"0x0000 0x017F"
@@ -1374,7 +1460,8 @@ Scheme
 			"1"
 			{
 				"name"			"Cerbetica Bold"
-				"tall"			"32"
+				"tall"			"24"
+				"antialias" 	"1"
 				"weight"		"900"
 				"range"			"0x0000 0x017F"
 			}
@@ -1384,7 +1471,8 @@ Scheme
 			"1"
 			{
 				"name"			"Cerbetica Bold"
-				"tall"			"32"
+				"tall"			"24"
+				"antialias" 	"1"
 				"weight"		"900"
 				"italic"		"1"
 				"range"			"0x0000 0x017F"
@@ -1395,7 +1483,8 @@ Scheme
 			"1"
 			{
 				"name"			"Cerbetica Bold"
-				"tall"			"32"
+				"tall"			"16"
+				"antialias" 	"1"
 				"weight"		"900"
 				"range"			"0x0000 0x017F"
 			}
@@ -1473,8 +1562,8 @@ Scheme
 			{
 				"name"			"Cerbetica_edited"
 				"tall"			"28"
-				"additive"		"0"
 				"antialias"		"1"
+				"custom"		"1" [$OSX]
 				"weight"		"500"
 			}
 		}
@@ -1484,8 +1573,8 @@ Scheme
 			{
 				"name"			"Cerbetica_edited"
 				"tall"			"40"
-				"additive"		"0"
 				"antialias"		"1"
+				"custom"		"1" [$OSX]
 				"weight"		"500"
 			}
 		}
@@ -1495,8 +1584,8 @@ Scheme
 			{
 				"name"			"Cerbetica_edited"
 				"tall"			"24"
-				"additive"		"0"
 				"antialias" 	"1"
+				"custom"		"1" [$OSX]
 				"weight"		"500"
 			}
 		}
@@ -1507,8 +1596,8 @@ Scheme
 				"name"			"Cerbetica_edited"
 				"tall"			"14" [!$OSX]
 				"tall"			"15" [$OSX]
-				"additive"		"0"
 				"antialias"		"1"
+				"custom"		"1" [$OSX]
 				"weight"		"500"
 			}
 		}
@@ -1529,7 +1618,7 @@ Scheme
 			"1"
 			{
 				"name"			"Cerbetica_edited"
-				"tall"			"12"
+				"tall"			"8"
 				"weight"		"400"
 				"additive"		"0"
 				"antialias" 	"1"
@@ -1540,7 +1629,7 @@ Scheme
 			"1"
 			{
 				"name"			"Cerbetica_edited"
-				"tall"			"13"
+				"tall"			"10"
 				"weight"		"400"
 				"additive"		"0"
 				"antialias"		"1"
@@ -1551,7 +1640,7 @@ Scheme
 			"1"
 			{
 				"name"			"Cerbetica_edited"
-				"tall"			"14"
+				"tall"			"10"
 				"weight"		"500"
 				"range"			"0x0000 0x007F"
 				"antialias" 	"1"
@@ -1599,7 +1688,7 @@ Scheme
 			"1"
 			{
 				"name"			"Cerbetica_edited"
-				"tall"			"20"
+				"tall"			"14"
 				"weight"		"500"
 				"range"			"0x0000 0x007F"
 				"antialias"		"1"
@@ -1753,7 +1842,7 @@ Scheme
 			"1"
 			{
 				"name"			"Cerbetica_edited"
-				"tall"			"12"
+				"tall"			"10"
 				"weight"		"400"
 				"additive"		"0"
 				"antialias" 	"1"
@@ -1982,8 +2071,6 @@ Scheme
 				"name"			"Cerbetica_edited"
 				"tall"			"36"
 				"weight"		"500"
-				"additive"		"0"
-				"antialias" 	"1"
 			}
 		}
 		MatchmakingDialogSessionOptionsTitle
@@ -1993,8 +2080,6 @@ Scheme
 				"name"			"Cerbetica_edited"
 				"tall"			"30"
 				"weight"		"500"
-				"additive"		"0"
-				"antialias" 	"1"
 			}
 		}
 		MatchmakingDialogMenuLarge
@@ -2004,8 +2089,6 @@ Scheme
 				"name"			"Cerbetica_edited"
 				"tall"			"28"
 				"weight"		"500"
-				"additive"		"0"
-				"antialias" 	"1"
 			}
 		}
 		MatchmakingDialogMenuBrowserHostname
@@ -2033,8 +2116,6 @@ Scheme
 				"name"			"Cerbetica_edited"
 				"tall"			"22"
 				"weight"		"500"
-				"additive"		"0"
-				"antialias" 	"1"
 			}
 		}
 		MatchmakingDialogMenuMediumSmall
@@ -2044,8 +2125,6 @@ Scheme
 				"name"			"Cerbetica_edited"
 				"tall"			"18"
 				"weight"		"500"
-				"additive"		"0"
-				"antialias" 	"1"
 			}
 		}
 		MatchmakingDialogMenuSmall
@@ -2138,7 +2217,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"			"Cerbetica_edited"
+				"name"			"Verdana"
 				"tall"			"10"
 				"weight"		"500"
 				"additive"		"0"
@@ -2151,10 +2230,9 @@ Scheme
 			"1"
 			{
 				"name"			"Cerbetica_edited"
-				"tall"			"10"
+				"tall"			"8"
 				"weight"		"400"
 				"additive"		"0"
-				"dropshadow"	"1"
 				"antialias"		"1"
 			}
 		}
@@ -2196,7 +2274,7 @@ Scheme
 			"1"
 			{
 				"name"			"Cerbetica_edited"
-				"tall"			"12"
+				"tall"			"8"
 				"weight"		"500"
 				"additive"		"0"
 				"antialias" 	"1"
@@ -2207,7 +2285,7 @@ Scheme
 			"1"
 			{
 				"name"			"Cerbetica_edited"
-				"tall"			"13"
+				"tall"			"10"
 				"weight"		"500"
 				"additive"		"0"
 				"antialias" 	"1"
@@ -2218,7 +2296,7 @@ Scheme
 			"1"
 			{
 				"name"			"Cerbetica_edited"
-				"tall"			"14"
+				"tall"			"12"
 				"weight"		"500"
 				"additive"		"0"
 				"antialias" 	"1"
@@ -2240,7 +2318,7 @@ Scheme
 			"1"
 			{
 				"name"			"Cerbetica_edited"
-				"tall"			"10"
+				"tall"			"8"
 				"weight"		"500"
 				"additive"		"0"
 				"antialias" 	"1"
@@ -2251,7 +2329,7 @@ Scheme
 			"1"
 			{
 				"name"			"Cerbetica_edited"
-				"tall"			"11"
+				"tall"			"8"
 				"antialias"		"1"
 				"weight"		"500"
 			}
@@ -2261,7 +2339,7 @@ Scheme
 			"1"
 			{
 				"name"			"Cerbetica_edited"
-				"tall"			"11"
+				"tall"			"8"
 				"weight"		"500"
 				"additive"		"0"
 				"antialias" 	"1"
@@ -2272,7 +2350,7 @@ Scheme
 			"1"
 			{
 				"name"			"Cerbetica_edited"
-				"tall"			"12"
+				"tall"			"11"
 				"weight"		"500"
 				"additive"		"0"
 				"antialias" 	"1"
@@ -2319,6 +2397,7 @@ Scheme
 				"name"			"Cerbetica_edited"
 				"tall"			"9"
 				"weight"		"500"
+				"blur"			"3"
 				"additive"		"1"
 				"antialias" 	"1"
 			}
@@ -2366,7 +2445,6 @@ Scheme
 				"blur"			"3"
 				"additive"		"1"
 				"antialias" 	"1"
-				"custom"		"1"
 			}
 		}
 		
@@ -2688,9 +2766,9 @@ Scheme
 			"1"
 			{
 				"name"			"Cerbetica_edited"
-				"tall"			"12"
+				"tall"			"11"
 				"weight"		"500"
-				"additive"		"1"
+				"additive"		"0"
 				"antialias" 	"1"
 			}
 		}
@@ -2754,7 +2832,7 @@ Scheme
 				"name"			"Cerbetica_edited"
 				"tall"			"11"
 				"weight"		"500"
-				"additive"		"1"
+				"additive"		"0"
 				"antialias" 	"1"
 			}
 		}
@@ -2765,7 +2843,7 @@ Scheme
 				"name"			"Cerbetica_edited"
 				"tall"			"14"
 				"weight"		"500"
-				"additive"		"1"
+				"additive"		"0"
 				"antialias" 	"1"
 			}
 		}
@@ -2776,7 +2854,7 @@ Scheme
 				"name"			"Cerbetica_edited"
 				"tall"			"18"
 				"weight"		"500"
-				"additive"		"1"
+				"additive"		"0"
 				"antialias"		"1"
 			}
 		}
@@ -2787,7 +2865,7 @@ Scheme
 				"name"			"Cerbetica_edited"
 				"tall"			"24"
 				"weight"		"500"
-				"additive"		"1"
+				"additive"		"0"
 				"antialias" 	"1"
 			}
 		}
@@ -2798,7 +2876,7 @@ Scheme
 				"name"			"Cerbetica_edited"
 				"tall"			"18"
 				"weight"		"500"
-				"additive"		"1"
+				"additive"		"0"
 				"antialias" 	"1"
 			}
 		}
@@ -2973,21 +3051,57 @@ Scheme
 		{
 			"font"	"resource/TF2.ttf"
 			"name"	"TF2"
+			"russian"
+			{
+				"range" "0x0000 0xFFFF"
+			}
+			"polish"
+			{
+				"range" "0x0000 0xFFFF"
+			}
 		}
 		"4" 
 		{
 			"font"	"resource/TF2Secondary.ttf"
 			"name"	"TF2 Secondary"
+			"russian"
+			{
+				"range" "0x0000 0xFFFF"
+			}
+			"polish"
+			{
+				"range" "0x0000 0xFFFF"
+			}
 		}
 		"5" 
 		{
 			"font"	"resource/TF2Professor.ttf"
 			"name"	"TF2 Professor"
+			"russian"
+			{
+				"range" "0x0000 0x00FF"
+			}
+			"polish"
+			{
+				"range" "0x0000 0x00FF"
+			}
 		}	
 		"6" 
 		{
 			"font"	"resource/TF2Build.ttf"
 			"name"	"TF2 Build"
+			"russian"
+			{
+				"range" "0x0000 0xFFFF"
+			}
+			"polish"
+			{
+				"range" "0x0000 0xFFFF"
+			}
+			"turkish"
+			{
+				"range" "0x0000 0xFFFF"
+			}
 		}
 		"7"
 		{
diff --git a/resource/scheme/clientscheme_icons.res b/resource/scheme/clientscheme_icons.res
index 1e7c298..6419748 100644
--- a/resource/scheme/clientscheme_icons.res
+++ b/resource/scheme/clientscheme_icons.res
@@ -26,6 +26,18 @@ Scheme
 			}
 		}
 		
+		"ClassIconsSmall"
+		{
+			"1"
+			{
+				"name"			"FlawHUDIcons"
+				"tall"			"42"
+				"weight"		"0"
+				"additive"		"0"
+				"antialias"		"1"
+			}
+		}
+		
 		"CustomIcons10"
 		{
 			"1"
diff --git a/resource/scheme/clientscheme_settings.res b/resource/scheme/clientscheme_settings.res
index d0cd65e..35b06d9 100644
--- a/resource/scheme/clientscheme_settings.res
+++ b/resource/scheme/clientscheme_settings.res
@@ -26,6 +26,8 @@ Scheme
 		Econ.Button.PresetDefaultColorBg		"25 25 25 255"
 		Econ.Button.PresetArmedColorBg			"50 50 50 255"
 		Econ.Button.PresetDepressedColorBg		"25 25 25 255"
+		Econ.Button.Border.Default				"25 25 25 255"
+		Econ.Button.Border.Armed				"50 50 50 255"
 		
 		Border.Bright							"NoBorder"
 		Border.Dark								"NoBorder"
@@ -92,7 +94,7 @@ Scheme
 		ListPanel.EmptyListInfoTextColor		"Orange"
 		
 		Menu.TextColor							"TanLight"
-		Menu.BgColor							"TransparentBlack"
+		Menu.BgColor							"DarkGrey"
 		Menu.ArmedTextColor						"TanDark"
 		Menu.ArmedBgColor						"TanLight"
 		Menu.TextInset							"6"
@@ -203,8 +205,8 @@ Scheme
 		
 		// CHudMenu
 		"ItemColor"								"255 167 42 200"	// default 255 167 42 255
-		"MenuColor"								"233 208 173 255"
-		"MenuBoxBg"								"0 0 0 100"
+		"MenuColor"								"255 255 255 255"
+		"MenuBoxBg"								"HudBlack"
 		
 		// Weapon Selection Colors
 		"SelectionNumberFg"						"251 235 202 255"
diff --git a/resource/scheme/clientscheme_xhairs.res b/resource/scheme/clientscheme_xhairs.res
index 8cd7d46..7fd2164 100644
--- a/resource/scheme/clientscheme_xhairs.res
+++ b/resource/scheme/clientscheme_xhairs.res
@@ -6,759 +6,542 @@ Scheme
 		{
 			"1"
 			{
-				"name"		"KnucklesCrosses"
-				"tall"		"10"
-				"antialias" "1"
-				"additive"	"0"
-				"outline"	"0"
-			}
-		}
-		"KnucklesCrosses11"
-		{
-			"1"
-			{
-				"name"		"KnucklesCrosses"
-				"tall"		"11"
-				"antialias" "1"
-				"additive"	"0"
-				"outline"	"0"
+				"name"			"KnucklesCrosses"
+				"tall"			"10"
+				"additive"		"0"
+				"antialias"		"1"
+				"outline"		"0"
 			}
 		}
 		"KnucklesCrosses12"
 		{
 			"1"
 			{
-				"name"		"KnucklesCrosses"
-				"tall"		"12"
-				"antialias" "1"
-				"additive"	"0"
-				"outline"	"0"
-			}
-		}
-		"KnucklesCrosses13"
-		{
-			"1"
-			{
-				"name"		"KnucklesCrosses"
-				"tall"		"13"
-				"antialias" "1"
-				"additive"	"0"
-				"outline"	"0"
+				"name"			"KnucklesCrosses"
+				"tall"			"12"
+				"additive"		"0"
+				"antialias"		"1"
+				"outline"		"0"
 			}
 		}
 		"KnucklesCrosses14"
 		{
 			"1"
 			{
-				"name"		"KnucklesCrosses"
-				"tall"		"14"
-				"antialias" "1"
-				"additive"	"0"
-				"outline"	"0"
-			}
-		}
-		"KnucklesCrosses15"
-		{
-			"1"
-			{
-				"name"		"KnucklesCrosses"
-				"tall"		"15"
-				"antialias" "1"
-				"additive"	"0"
-				"outline"	"0"
+				"name"			"KnucklesCrosses"
+				"tall"			"14"
+				"additive"		"0"
+				"antialias"		"1"
+				"outline"		"0"
 			}
 		}
 		"KnucklesCrosses16"
 		{
 			"1"
 			{
-				"name"		"KnucklesCrosses"
-				"tall"		"16"
-				"antialias" "1"
-				"additive"	"0"
-				"outline"	"0"
-			}
-		}
-		"KnucklesCrosses17"
-		{
-			"1"
-			{
-				"name"		"KnucklesCrosses"
-				"tall"		"17"
-				"antialias" "1"
-				"additive"	"0"
-				"outline"	"0"
+				"name"			"KnucklesCrosses"
+				"tall"			"16"
+				"additive"		"0"
+				"antialias"		"1"
+				"outline"		"0"
 			}
 		}
 		"KnucklesCrosses18"
 		{
 			"1"
 			{
-				"name"		"KnucklesCrosses"
-				"tall"		"18"
-				"antialias" "1"
-				"additive"	"0"
-				"outline"	"0"
-			}
-		}
-		"KnucklesCrosses19"
-		{
-			"1"
-			{
-				"name"		"KnucklesCrosses"
-				"tall"		"19"
-				"antialias" "1"
-				"additive"	"0"
-				"outline"	"0"
+				"name"			"KnucklesCrosses"
+				"tall"			"18"
+				"additive"		"0"
+				"antialias"		"1"
+				"outline"		"0"
 			}
 		}
 		"KnucklesCrosses20"
 		{
 			"1"
 			{
-				"name"		"KnucklesCrosses"
-				"tall"		"20"
-				"antialias" "1"
-				"additive"	"0"
-				"outline"	"0"
-			}
-		}
-		"KnucklesCrosses21"
-		{
-			"1"
-			{
-				"name"		"KnucklesCrosses"
-				"tall"		"21"
-				"antialias" "1"
-				"additive"	"0"
-				"outline"	"0"
+				"name"			"KnucklesCrosses"
+				"tall"			"20"
+				"additive"		"0"
+				"antialias"		"1"
+				"outline"		"0"
 			}
 		}
 		"KnucklesCrosses22"
 		{
 			"1"
 			{
-				"name"		"KnucklesCrosses"
-				"tall"		"22"
-				"antialias" "1"
-				"additive"	"0"
-				"outline"	"0"
-			}
-		}
-		"KnucklesCrosses23"
-		{
-			"1"
-			{
-				"name"		"KnucklesCrosses"
-				"tall"		"23"
-				"antialias" "1"
-				"additive"	"0"
-				"outline"	"0"
+				"name"			"KnucklesCrosses"
+				"tall"			"22"
+				"additive"		"0"
+				"antialias"		"1"
+				"outline"		"0"
 			}
 		}
 		"KnucklesCrosses24"
 		{
 			"1"
 			{
-				"name"		"KnucklesCrosses"
-				"tall"		"24"
-				"antialias" "1"
-				"additive"	"0"
-				"outline"	"0"
-			}
-		}
-		"KnucklesCrosses25"
-		{
-			"1"
-			{
-				"name"		"KnucklesCrosses"
-				"tall"		"25"
-				"antialias" "1"
-				"additive"	"0"
-				"outline"	"0"
+				"name"			"KnucklesCrosses"
+				"tall"			"24"
+				"additive"		"0"
+				"antialias"		"1"
+				"outline"		"0"
 			}
 		}
 		"KnucklesCrosses26"
 		{
 			"1"
 			{
-				"name"		"KnucklesCrosses"
-				"tall"		"26"
-				"antialias" "1"
-				"additive"	"0"
-				"outline"	"0"
-			}
-		}
-		"KnucklesCrosses27"
-		{
-			"1"
-			{
-				"name"		"KnucklesCrosses"
-				"tall"		"26"
-				"antialias" "1"
-				"additive"	"0"
-				"outline"	"0"
+				"name"			"KnucklesCrosses"
+				"tall"			"26"
+				"additive"		"0"
+				"antialias"		"1"
+				"outline"		"0"
 			}
 		}
 		"KnucklesCrosses28"
 		{
 			"1"
 			{
-				"name"		"KnucklesCrosses"
-				"tall"		"28"
-				"antialias" "1"
-				"additive"	"0"
-				"outline"	"0"
-			}
-		}
-		"KnucklesCrosses29"
-		{
-			"1"
-			{
-				"name"		"KnucklesCrosses"
-				"tall"		"29"
-				"antialias" "1"
-				"additive"	"0"
-				"outline"	"0"
+				"name"			"KnucklesCrosses"
+				"tall"			"28"
+				"additive"		"0"
+				"antialias"		"1"
+				"outline"		"0"
 			}
 		}
 		"KnucklesCrosses30"
 		{
 			"1"
 			{
-				"name"		"KnucklesCrosses"
-				"tall"		"30"
-				"antialias" "1"
-				"additive"	"0"
-				"outline"	"0"
-			}
-		}
-		"KnucklesCrosses31"
-		{
-			"1"
-			{
-				"name"		"KnucklesCrosses"
-				"tall"		"31"
-				"antialias" "1"
-				"additive"	"0"
-				"outline"	"0"
+				"name"			"KnucklesCrosses"
+				"tall"			"30"
+				"additive"		"0"
+				"antialias"		"1"
+				"outline"		"0"
 			}
 		}
 		"KnucklesCrosses32"
 		{
 			"1"
 			{
-				"name"		"KnucklesCrosses"
-				"tall"		"32"
-				"antialias" "1"
-				"additive"	"0"
-				"outline"	"0"
-			}
-		}
-		"KnucklesCrosses33"
-		{
-			"1"
-			{
-				"name"		"KnucklesCrosses"
-				"tall"		"33"
-				"antialias" "1"
-				"additive"	"0"
-				"outline"	"0"
+				"name"			"KnucklesCrosses"
+				"tall"			"32"
+				"additive"		"0"
+				"antialias"		"1"
+				"outline"		"0"
 			}
 		}
 		"KnucklesCrosses34"
 		{
 			"1"
 			{
-				"name"		"KnucklesCrosses"
-				"tall"		"34"
-				"antialias" "1"
-				"additive"	"0"
-				"outline"	"0"
-			}
-		}
-		"KnucklesCrosses35"
-		{
-			"1"
-			{
-				"name"		"KnucklesCrosses"
-				"tall"		"35"
-				"antialias" "1"
-				"additive"	"0"
-				"outline"	"0"
+				"name"			"KnucklesCrosses"
+				"tall"			"34"
+				"additive"		"0"
+				"antialias"		"1"
+				"outline"		"0"
 			}
 		}
 		"KnucklesCrosses36"
 		{
 			"1"
 			{
-				"name"		"KnucklesCrosses"
-				"tall"		"36"
-				"antialias" "1"
-				"additive"	"0"
-				"outline"	"0"
-			}
-		}
-		"KnucklesCrosses37"
-		{
-			"1"
-			{
-				"name"		"KnucklesCrosses"
-				"tall"		"37"
-				"antialias" "1"
-				"additive"	"0"
-				"outline"	"0"
+				"name"			"KnucklesCrosses"
+				"tall"			"36"
+				"additive"		"0"
+				"antialias"		"1"
+				"outline"		"0"
 			}
 		}
 		"KnucklesCrosses38"
 		{
 			"1"
 			{
-				"name"		"KnucklesCrosses"
-				"tall"		"38"
-				"antialias" "1"
-				"additive"	"0"
-				"outline"	"0"
-			}
-		}
-		"KnucklesCrosses39"
-		{
-			"1"
-			{
-				"name"		"KnucklesCrosses"
-				"tall"		"39"
-				"antialias" "1"
-				"additive"	"0"
-				"outline"	"0"
+				"name"			"KnucklesCrosses"
+				"tall"			"38"
+				"additive"		"0"
+				"antialias"		"1"
+				"outline"		"0"
 			}
 		}
 		"KnucklesCrosses40"
 		{
 			"1"
 			{
-				"name"		"KnucklesCrosses"
-				"tall"		"40"
-				"antialias" "1"
-				"additive"	"0"
-				"outline"	"0"
+				"name"			"KnucklesCrosses"
+				"tall"			"40"
+				"additive"		"0"
+				"antialias"		"1"
+				"outline"		"0"
 			}
 		}
+		
 		"KnucklesCrosses10Outline"
 		{
 			"1"
 			{
-				"name"		"KnucklesCrosses"
-				"tall"		"10"
-				"antialias" "0"
-				"additive"	"0"
-				"outline"	"1"
-			}
-		}
-		"KnucklesCrosses11Outline"
-		{
-			"1"
-			{
-				"name"		"KnucklesCrosses"
-				"tall"		"11"
-				"antialias" "0"
-				"additive"	"0"
-				"outline"	"1"
+				"name"			"KnucklesCrosses"
+				"tall"			"10"
+				"additive"		"0"
+				"antialias"		"1"
+				"outline"		"1"
 			}
 		}
 		"KnucklesCrosses12Outline"
 		{
 			"1"
 			{
-				"name"		"KnucklesCrosses"
-				"tall"		"12"
-				"antialias" "0"
-				"additive"	"0"
-				"outline"	"1"
-			}
-		}
-		"KnucklesCrosses13Outline"
-		{
-			"1"
-			{
-				"name"		"KnucklesCrosses"
-				"tall"		"13"
-				"antialias" "0"
-				"additive"	"0"
-				"outline"	"1"
+				"name"			"KnucklesCrosses"
+				"tall"			"12"
+				"additive"		"0"
+				"antialias"		"1"
+				"outline"		"1"
 			}
 		}
 		"KnucklesCrosses14Outline"
 		{
 			"1"
 			{
-				"name"		"KnucklesCrosses"
-				"tall"		"14"
-				"antialias" "0"
-				"additive"	"0"
-				"outline"	"1"
-			}
-		}
-		"KnucklesCrosses15Outline"
-		{
-			"1"
-			{
-				"name"		"KnucklesCrosses"
-				"tall"		"15"
-				"antialias" "0"
-				"additive"	"0"
-				"outline"	"1"
+				"name"			"KnucklesCrosses"
+				"tall"			"14"
+				"additive"		"0"
+				"antialias"		"1"
+				"outline"		"1"
 			}
 		}
 		"KnucklesCrosses16Outline"
 		{
 			"1"
 			{
-				"name"		"KnucklesCrosses"
-				"tall"		"16"
-				"antialias" "0"
-				"additive"	"0"
-				"outline"	"1"
-			}
-		}
-		"KnucklesCrosses17Outline"
-		{
-			"1"
-			{
-				"name"		"KnucklesCrosses"
-				"tall"		"17"
-				"antialias" "0"
-				"additive"	"0"
-				"outline"	"1"
+				"name"			"KnucklesCrosses"
+				"tall"			"16"
+				"additive"		"0"
+				"antialias"		"1"
+				"outline"		"1"
 			}
 		}
 		"KnucklesCrosses18Outline"
 		{
 			"1"
 			{
-				"name"		"KnucklesCrosses"
-				"tall"		"18"
-				"antialias" "0"
-				"additive"	"0"
-				"outline"	"1"
-			}
-		}
-		"KnucklesCrosses19Outline"
-		{
-			"1"
-			{
-				"name"		"KnucklesCrosses"
-				"tall"		"19"
-				"antialias" "0"
-				"additive"	"0"
-				"outline"	"1"
+				"name"			"KnucklesCrosses"
+				"tall"			"18"
+				"additive"		"0"
+				"antialias"		"1"
+				"outline"		"1"
 			}
 		}
 		"KnucklesCrosses20Outline"
 		{
 			"1"
 			{
-				"name"		"KnucklesCrosses"
-				"tall"		"20"
-				"antialias" "0"
-				"additive"	"0"
-				"outline"	"1"
+				"name"			"KnucklesCrosses"
+				"tall"			"20"
+				"additive"		"0"
+				"antialias"		"1"
+				"outline"		"1"
 			}
 		}
-		"KnucklesCrosses21Outline"
+		"KnucklesCrosses22Outline"
 		{
 			"1"
 			{
-				"name"		"KnucklesCrosses"
-				"tall"		"21"
-				"antialias" "0"
-				"additive"	"0"
-				"outline"	"1"
+				"name"			"KnucklesCrosses"
+				"tall"			"22"
+				"additive"		"0"
+				"antialias"		"1"
+				"outline"		"1"
 			}
 		}
-		"KnucklesCrosses22Outline"
+		"KnucklesCrosses24Outline"
 		{
 			"1"
 			{
-				"name"		"KnucklesCrosses"
-				"tall"		"22"
-				"antialias" "0"
-				"additive"	"0"
-				"outline"	"1"
+				"name"			"KnucklesCrosses"
+				"tall"			"24"
+				"additive"		"0"
+				"antialias"		"1"
+				"outline"		"1"
 			}
 		}
-		"KnucklesCrosses23Outline"
+		"KnucklesCrosses26Outline"
 		{
 			"1"
 			{
-				"name"		"KnucklesCrosses"
-				"tall"		"23"
-				"antialias" "0"
-				"additive"	"0"
-				"outline"	"1"
+				"name"			"KnucklesCrosses"
+				"tall"			"26"
+				"additive"		"0"
+				"antialias"		"1"
+				"outline"		"1"
 			}
 		}
-		"KnucklesCrosses24Outline"
+		"KnucklesCrosses28Outline"
 		{
 			"1"
 			{
-				"name"		"KnucklesCrosses"
-				"tall"		"24"
-				"antialias" "0"
-				"additive"	"0"
-				"outline"	"1"
+				"name"			"KnucklesCrosses"
+				"tall"			"28"
+				"additive"		"0"
+				"antialias"		"1"
+				"outline"		"1"
 			}
 		}
-		"KnucklesCrosses25Outline"
+		"KnucklesCrosses30Outline"
 		{
 			"1"
 			{
-				"name"		"KnucklesCrosses"
-				"tall"		"25"
-				"antialias" "0"
-				"additive"	"0"
-				"outline"	"1"
+				"name"			"KnucklesCrosses"
+				"tall"			"30"
+				"additive"		"0"
+				"antialias"		"1"
+				"outline"		"1"
 			}
 		}
-		"KnucklesCrosses26Outline"
+		"KnucklesCrosses32Outline"
 		{
 			"1"
 			{
-				"name"		"KnucklesCrosses"
-				"tall"		"26"
-				"antialias" "0"
-				"additive"	"0"
-				"outline"	"1"
+				"name"			"KnucklesCrosses"
+				"tall"			"32"
+				"additive"		"0"
+				"antialias"		"1"
+				"outline"		"1"
 			}
 		}
-		"KnucklesCrosses27Outline"
+		"KnucklesCrosses34Outline"
 		{
 			"1"
 			{
-				"name"		"KnucklesCrosses"
-				"tall"		"26"
-				"antialias" "0"
-				"additive"	"0"
-				"outline"	"1"
+				"name"			"KnucklesCrosses"
+				"tall"			"34"
+				"additive"		"0"
+				"antialias"		"1"
+				"outline"		"1"
 			}
 		}
-		"KnucklesCrosses28Outline"
+		"KnucklesCrosses36Outline"
 		{
 			"1"
 			{
-				"name"		"KnucklesCrosses"
-				"tall"		"28"
-				"antialias" "0"
-				"additive"	"0"
-				"outline"	"1"
+				"name"			"KnucklesCrosses"
+				"tall"			"36"
+				"additive"		"0"
+				"antialias"		"1"
+				"outline"		"1"
 			}
 		}
-		"KnucklesCrosses29Outline"
+		"KnucklesCrosses38Outline"
 		{
 			"1"
 			{
-				"name"		"KnucklesCrosses"
-				"tall"		"29"
-				"antialias" "0"
-				"additive"	"0"
-				"outline"	"1"
+				"name"			"KnucklesCrosses"
+				"tall"			"38"
+				"additive"		"0"
+				"antialias"		"1"
+				"outline"		"1"
 			}
 		}
-		"KnucklesCrosses30Outline"
+		"KnucklesCrosses40Outline"
 		{
 			"1"
 			{
-				"name"		"KnucklesCrosses"
-				"tall"		"30"
-				"antialias" "0"
-				"additive"	"0"
-				"outline"	"1"
+				"name"			"KnucklesCrosses"
+				"tall"			"40"
+				"additive"		"0"
+				"antialias"		"1"
+				"outline"		"1"
 			}
 		}
-		"KnucklesCrosses31Outline"
+		
+		"Crosshairs10"
 		{
 			"1"
 			{
-				"name"		"KnucklesCrosses"
-				"tall"		"31"
-				"antialias" "0"
-				"additive"	"0"
-				"outline"	"1"
+				"name"			"Crosshairs"
+				"tall"			"10"
+				"additive"		"0"
+				"antialias"		"1"
+				"outline"		"0"
 			}
 		}
-		"KnucklesCrosses32Outline"
+		"Crosshairs12"
 		{
 			"1"
 			{
-				"name"		"KnucklesCrosses"
-				"tall"		"32"
-				"antialias" "0"
-				"additive"	"0"
-				"outline"	"1"
+				"name"			"Crosshairs"
+				"tall"			"12"
+				"additive"		"0"
+				"antialias"		"1"
+				"outline"		"0"
 			}
 		}
-		"KnucklesCrosses33Outline"
+		"Crosshairs14"
 		{
 			"1"
 			{
-				"name"		"KnucklesCrosses"
-				"tall"		"33"
-				"antialias" "0"
-				"additive"	"0"
-				"outline"	"1"
+				"name"			"Crosshairs"
+				"tall"			"14"
+				"additive"		"0"
+				"antialias"		"1"
+				"outline"		"0"
 			}
 		}
-		"KnucklesCrosses34Outline"
+		"Crosshairs16"
 		{
 			"1"
 			{
-				"name"		"KnucklesCrosses"
-				"tall"		"34"
-				"antialias" "0"
-				"additive"	"0"
-				"outline"	"1"
+				"name"			"Crosshairs"
+				"tall"			"16"
+				"additive"		"0"
+				"antialias"		"1"
+				"outline"		"0"
 			}
 		}
-		"KnucklesCrosses35Outline"
+		"Crosshairs18"
 		{
 			"1"
 			{
-				"name"		"KnucklesCrosses"
-				"tall"		"35"
-				"antialias" "0"
-				"additive"	"0"
-				"outline"	"1"
+				"name"			"Crosshairs"
+				"tall"			"18"
+				"additive"		"0"
+				"antialias"		"1"
+				"outline"		"0"
 			}
 		}
-		"KnucklesCrosses36Outline"
+		"Crosshairs20"
 		{
 			"1"
 			{
-				"name"		"KnucklesCrosses"
-				"tall"		"36"
-				"antialias" "0"
-				"additive"	"0"
-				"outline"	"1"
+				"name"			"Crosshairs"
+				"tall"			"20"
+				"additive"		"0"
+				"antialias"		"1"
+				"outline"		"0"
 			}
 		}
-		"KnucklesCrosses37Outline"
+		"Crosshairs22"
 		{
 			"1"
 			{
-				"name"		"KnucklesCrosses"
-				"tall"		"37"
-				"antialias" "0"
-				"additive"	"0"
-				"outline"	"1"
+				"name"			"Crosshairs"
+				"tall"			"22"
+				"additive"		"0"
+				"antialias"		"1"
+				"outline"		"0"
 			}
 		}
-		"KnucklesCrosses38Outline"
+		"Crosshairs24"
 		{
 			"1"
 			{
-				"name"		"KnucklesCrosses"
-				"tall"		"38"
-				"antialias" "0"
-				"additive"	"0"
-				"outline"	"1"
+				"name"			"Crosshairs"
+				"tall"			"24"
+				"additive"		"0"
+				"antialias"		"1"
+				"outline"		"0"
 			}
 		}
-		"KnucklesCrosses39Outline"
+		"Crosshairs26"
 		{
 			"1"
 			{
-				"name"		"KnucklesCrosses"
-				"tall"		"39"
-				"antialias" "0"
-				"additive"	"0"
-				"outline"	"1"
+				"name"			"Crosshairs"
+				"tall" 			"26"
+				"additive"		"0"
+				"antialias"		"1"
+				"outline"		"0"
 			}
 		}
-		"KnucklesCrosses40Outline"
+		"Crosshairs28"
 		{
 			"1"
 			{
-				"name"		"KnucklesCrosses"
-				"tall"		"40"
-				"antialias" "0"
-				"additive"	"0"
-				"outline"	"1"
+				"name"			"Crosshairs"
+				"tall" 			"28"
+				"additive"		"0"
+				"antialias"		"1"
+				"outline"		"0"
 			}
 		}
-		
-		"xHairCircle"
+		"Crosshairs30"
 		{
 			"1"
 			{
-				"name"		"Courier New"
-				"tall"		"72"
-				"weight"	"0"
-				"antialias"	"1"
+				"name"			"Crosshairs"
+				"tall" 			"30"
+				"additive"		"0"
+				"antialias"		"1"
+				"outline"		"0"
 			}
 		}
-		"xHairCircleOutline"
+		"Crosshairs32"
 		{
 			"1"
 			{
-				"name"		"Courier New"
-				"tall"		"72"
-				"weight"	"0"
-				"antialias"	"1"
-				"outline"	"1"
+				"name"			"Crosshairs"
+				"tall" 			"32"
+				"additive"		"0"
+				"antialias"		"1"
+				"outline"		"0"
 			}
 		}
-
-		"Crosshairs8"
+		"Crosshairs34"
 		{
 			"1"
 			{
 				"name"			"Crosshairs"
-				"tall" 			"8"
-				"weight" 		"0"
-				"antialias" 	"1"
+				"tall" 			"34"
+				"additive"		"0"
+				"antialias"		"1"
+				"outline"		"0"
 			}
 		}
-		"Crosshairs8Outline"
+		"Crosshairs36"
 		{
 			"1"
 			{
 				"name"			"Crosshairs"
-				"tall" 			"8"
-				"weight" 		"0"
-				"antialias" 	"1"
-				"outline"		"1"
+				"tall" 			"36"
+				"additive"		"0"
+				"antialias"		"1"
+				"outline"		"0"
 			}
 		}
-		
-		"Crosshairs10"
+		"Crosshairs38"
 		{
 			"1"
 			{
 				"name"			"Crosshairs"
-				"tall" 			"10"
-				"weight" 		"0"
-				"antialias" 	"1"
+				"tall" 			"38"
+				"additive"		"0"
+				"antialias"		"1"
+				"outline"		"0"
 			}
 		}
-		"Crosshairs10Outline"
+		"Crosshairs40"
 		{
 			"1"
 			{
 				"name"			"Crosshairs"
-				"tall" 			"10"
-				"weight" 		"0"
-				"antialias" 	"1"
-				"outline"		"1"
+				"tall" 			"40"
+				"additive"		"0"
+				"antialias"		"1"
+				"outline"		"0"
 			}
 		}
 		
-		"Crosshairs12"
+		"Crosshairs10Outline"
 		{
 			"1"
 			{
 				"name"			"Crosshairs"
-				"tall" 			"12"
-				"weight" 		"0"
-				"antialias" 	"1"
+				"tall" 			"10"
+				"additive"		"0"
+				"antialias"		"1"
+				"outline"		"1"
 			}
 		}
 		"Crosshairs12Outline"
@@ -767,338 +550,161 @@ Scheme
 			{
 				"name"			"Crosshairs"
 				"tall" 			"12"
-				"weight" 		"0"
-				"antialias" 	"1"
+				"additive"		"0"
+				"antialias"		"1"
 				"outline"		"1"
 			}
 		}
-		
-		"Crosshairs14"
-		{
-			"1"
-			{
-				"name"			"Crosshairs"
-				"tall" 			"14"
-				"weight" 		"0"
-				"antialias" 	"1"
-			}
-		}
 		"Crosshairs14Outline"
 		{
 			"1"
 			{
 				"name"			"Crosshairs"
 				"tall" 			"14"
-				"weight" 		"0"
-				"antialias" 	"1"
+				"additive"		"0"
+				"antialias"		"1"
 				"outline"		"1"
 			}
 		}
-		
-		"Crosshairs16"
-		{
-			"1"
-			{
-				"name"			"Crosshairs"
-				"tall" 			"16"
-				"weight" 		"0"
-				"antialias" 	"1"
-			}
-		}
 		"Crosshairs16Outline"
 		{
 			"1"
 			{
 				"name"			"Crosshairs"
 				"tall" 			"16"
-				"weight" 		"0"
-				"antialias" 	"1"
+				"additive"		"0"
+				"antialias"		"1"
 				"outline"		"1"
 			}
 		}
-		
-		"Crosshairs18"
-		{
-			"1"
-			{
-				"name"			"Crosshairs"
-				"tall" 			"18"
-				"weight" 		"0"
-				"antialias" 	"1"
-			}
-		}
 		"Crosshairs18Outline"
 		{
 			"1"
 			{
 				"name"			"Crosshairs"
 				"tall" 			"18"
-				"weight" 		"0"
-				"antialias" 	"1"
+				"additive"		"0"
+				"antialias"		"1"
 				"outline"		"1"
 			}
 		}
-		
-		"Crosshairs20"
-		{
-			"1"
-			{
-				"name"			"Crosshairs"
-				"tall" 			"20"
-				"weight" 		"0"
-				"antialias" 	"1"
-			}
-		}
 		"Crosshairs20Outline"
 		{
 			"1"
 			{
 				"name"			"Crosshairs"
 				"tall" 			"20"
-				"weight" 		"0"
-				"antialias" 	"1"
+				"additive"		"0"
+				"antialias"		"1"
 				"outline"		"1"
 			}
 		}
-		
-		"Crosshairs22"
-		{
-			"1"
-			{
-				"name"			"Crosshairs"
-				"tall" 			"22"
-				"weight" 		"0"
-				"antialias" 	"1"
-			}
-		}
 		"Crosshairs22Outline"
 		{
 			"1"
 			{
 				"name"			"Crosshairs"
 				"tall" 			"22"
-				"weight" 		"0"
-				"antialias" 	"1"
+				"additive"		"0"
+				"antialias"		"1"
 				"outline"		"1"
 			}
 		}
-		
-		"Crosshairs24"
-		{
-			"1"
-			{
-				"name"			"Crosshairs"
-				"tall" 			"24"
-				"weight" 		"0"
-				"antialias" 	"1"
-			}
-		}
 		"Crosshairs24Outline"
 		{
 			"1"
 			{
 				"name"			"Crosshairs"
 				"tall" 			"24"
-				"weight" 		"0"
-				"antialias" 	"1"
+				"additive"		"0"
+				"antialias"		"1"
 				"outline"		"1"
 			}
 		}
-		
-		"Crosshairs26"
-		{
-			"1"
-			{
-				"name"			"Crosshairs"
-				"tall" 			"26"
-				"weight" 		"0"
-				"antialias" 	"1"
-			}
-		}
 		"Crosshairs26Outline"
 		{
 			"1"
 			{
 				"name"			"Crosshairs"
 				"tall" 			"26"
-				"weight" 		"0"
-				"antialias" 	"1"
+				"additive"		"0"
+				"antialias"		"1"
 				"outline"		"1"
 			}
 		}
-		
-		"Crosshairs28"
-		{
-			"1"
-			{
-				"name"			"Crosshairs"
-				"tall" 			"28"
-				"weight" 		"0"
-				"antialias" 	"1"
-			}
-		}
 		"Crosshairs28Outline"
 		{
 			"1"
 			{
 				"name"			"Crosshairs"
 				"tall" 			"28"
-				"weight" 		"0"
-				"antialias" 	"1"
+				"additive"		"0"
+				"antialias"		"1"
 				"outline"		"1"
 			}
 		}
-		
-		"Crosshairs30"
-		{
-			"1"
-			{
-				"name"			"Crosshairs"
-				"tall" 			"30"
-				"weight" 		"0"
-				"antialias" 	"1"
-			}
-		}
 		"Crosshairs30Outline"
 		{
 			"1"
 			{
 				"name"			"Crosshairs"
 				"tall" 			"30"
-				"weight" 		"0"
-				"antialias" 	"1"
+				"additive"		"0"
+				"antialias"		"1"
 				"outline"		"1"
 			}
 		}
-		
-		"Crosshairs32"
-		{
-			"1"
-			{
-				"name"			"Crosshairs"
-				"tall" 			"32"
-				"weight" 		"0"
-				"antialias" 	"1"
-			}
-		}
 		"Crosshairs32Outline"
 		{
 			"1"
 			{
 				"name"			"Crosshairs"
 				"tall" 			"32"
-				"weight" 		"0"
-				"antialias" 	"1"
+				"additive"		"0"
+				"antialias"		"1"
 				"outline"		"1"
 			}
 		}
-		
-		"Crosshairs34"
-		{
-			"1"
-			{
-				"name"			"Crosshairs"
-				"tall" 			"34"
-				"weight" 		"0"
-				"antialias" 	"1"
-			}
-		}
 		"Crosshairs34Outline"
 		{
 			"1"
 			{
 				"name"			"Crosshairs"
 				"tall" 			"34"
-				"weight" 		"0"
-				"antialias" 	"1"
+				"additive"		"0"
+				"antialias"		"1"
 				"outline"		"1"
 			}
 		}
-		
-		"Crosshairs36"
-		{
-			"1"
-			{
-				"name"			"Crosshairs"
-				"tall" 			"36"
-				"weight" 		"0"
-				"antialias" 	"1"
-			}
-		}
 		"Crosshairs36Outline"
 		{
 			"1"
 			{
 				"name"			"Crosshairs"
 				"tall" 			"36"
-				"weight" 		"0"
-				"antialias" 	"1"
+				"additive"		"0"
+				"antialias"		"1"
 				"outline"		"1"
 			}
 		}
-		
-		"Crosshairs38"
-		{
-			"1"
-			{
-				"name"			"Crosshairs"
-				"tall" 			"38"
-				"weight" 		"0"
-				"antialias" 	"1"
-			}
-		}
 		"Crosshairs38Outline"
 		{
 			"1"
 			{
 				"name"			"Crosshairs"
 				"tall" 			"38"
-				"weight" 		"0"
-				"antialias" 	"1"
+				"additive"		"0"
+				"antialias"		"1"
 				"outline"		"1"
 			}
 		}
-		
-		"Crosshairs40"
-		{
-			"1"
-			{
-				"name"			"Crosshairs"
-				"tall" 			"40"
-				"weight" 		"0"
-				"antialias" 	"1"
-			}
-		}
 		"Crosshairs40Outline"
 		{
 			"1"
 			{
 				"name"			"Crosshairs"
 				"tall" 			"40"
-				"weight" 		"0"
-				"antialias" 	"1"
-				"outline"		"1"
-			}
-		}
-		
-		"KonrWings8"
-		{
-			"1"
-			{
-				"name"			"Garm3nFont"
-				"tall"			"8"
-				"weight"		"0"
-				"antialias"		"1"
-			}
-		}
-		
-		"KonrWings8Outline"
-		{
-			"1"
-			{
-				"name"			"Garm3nFont"
-				"tall"			"8"
-				"weight"		"0"
+				"additive"		"0"
 				"antialias"		"1"
 				"outline"		"1"
 			}
@@ -1110,417 +716,351 @@ Scheme
 			{
 				"name"			"Garm3nFont"
 				"tall"			"10"
-				"weight"		"0"
+				"additive"		"0"
 				"antialias"		"1"
+				"outline"		"0"
 			}
 		}
-		
-		"KonrWings10Outline"
-		{
-			"1"
-			{
-				"name"			"Garm3nFont"
-				"tall"			"10"
-				"weight"		"0"
-				"antialias"		"1"
-				"outline"		"1"
-			}
-		}
-		
 		"KonrWings12"
 		{
 			"1"
 			{
 				"name"			"Garm3nFont"
 				"tall"			"12"
-				"weight"		"0"
-				"antialias"		"1"
-			}
-		}
-		
-		"KonrWings12Outline"
-		{
-			"1"
-			{
-				"name"			"Garm3nFont"
-				"tall"			"12"
-				"weight"		"0"
+				"additive"		"0"
 				"antialias"		"1"
-				"outline"		"1"
+				"outline"		"0"
 			}
 		}
-		
 		"KonrWings14"
 		{
 			"1"
 			{
 				"name"			"Garm3nFont"
 				"tall"			"14"
-				"weight"		"0"
+				"additive"		"0"
 				"antialias"		"1"
+				"outline"		"0"
 			}
 		}
-		
-		"KonrWings14Outline"
-		{
-			"1"
-			{
-				"name"			"Garm3nFont"
-				"tall"			"14"
-				"weight"		"0"
-				"antialias"		"1"
-				"outline"		"1"
-			}
-		}
-		
 		"KonrWings16"
 		{
 			"1"
 			{
 				"name"			"Garm3nFont"
 				"tall"			"16"
-				"weight"		"0"
+				"additive"		"0"
 				"antialias"		"1"
+				"outline"		"0"
 			}
 		}
-		
-		"KonrWings16Outline"
-		{
-			"1"
-			{
-				"name"			"Garm3nFont"
-				"tall"			"16"
-				"weight"		"0"
-				"antialias"		"1"
-				"outline"		"1"
-			}
-		}
-		
 		"KonrWings18"
 		{
 			"1"
 			{
 				"name"			"Garm3nFont"
 				"tall"			"18"
-				"weight"		"0"
-				"antialias"		"1"
-			}
-		}
-		
-		"KonrWings18Outline"
-		{
-			"1"
-			{
-				"name"			"Garm3nFont"
-				"tall"			"18"
-				"weight"		"0"
+				"additive"		"0"
 				"antialias"		"1"
-				"outline"		"1"
+				"outline"		"0"
 			}
 		}
-		
 		"KonrWings20"
 		{
 			"1"
 			{
 				"name"			"Garm3nFont"
 				"tall"			"20"
-				"weight"		"0"
+				"additive"		"0"
 				"antialias"		"1"
+				"outline"		"0"
 			}
 		}
-		
-		"KonrWings20Outline"
+		"KonrWings22"
 		{
 			"1"
 			{
 				"name"			"Garm3nFont"
-				"tall"			"20"
-				"weight"		"0"
+				"tall"			"22"
+				"additive"		"0"
 				"antialias"		"1"
-				"outline"		"1"
+				"outline"		"0"
 			}
 		}
-		
-		"KonrWings22"
+		"KonrWings24"
 		{
 			"1"
 			{
 				"name"			"Garm3nFont"
-				"tall"			"22"
-				"weight"		"0"
+				"tall"			"24"
+				"additive"		"0"
 				"antialias"		"1"
+				"outline"		"0"
 			}
 		}
-		
-		"KonrWings22Outline"
+		"KonrWings26"
 		{
 			"1"
 			{
 				"name"			"Garm3nFont"
-				"tall"			"22"
-				"weight"		"0"
+				"tall"			"26"
+				"additive"		"0"
 				"antialias"		"1"
-				"outline"		"1"
+				"outline"		"0"
 			}
 		}
-		
-		"KonrWings24"
+		"KonrWings28"
 		{
 			"1"
 			{
 				"name"			"Garm3nFont"
-				"tall"			"24"
-				"weight"		"0"
+				"tall"			"28"
+				"additive"		"0"
 				"antialias"		"1"
+				"outline"		"0"
 			}
 		}
-		
-		"KonrWings24Outline"
+		"KonrWings30"
 		{
 			"1"
 			{
 				"name"			"Garm3nFont"
-				"tall"			"24"
-				"weight"		"0"
+				"tall"			"30"
+				"additive"		"0"
 				"antialias"		"1"
-				"outline"		"1"
+				"outline"		"0"
 			}
 		}
-		
-		"KonrWings26"
+		"KonrWings32"
 		{
 			"1"
 			{
 				"name"			"Garm3nFont"
-				"tall"			"26"
-				"weight"		"0"
+				"tall"			"32"
+				"additive"		"0"
 				"antialias"		"1"
+				"outline"		"0"
 			}
 		}
-		
-		"KonrWings26Outline"
+		"KonrWings34"
 		{
 			"1"
 			{
 				"name"			"Garm3nFont"
-				"tall"			"26"
-				"weight"		"0"
+				"tall"			"34"
+				"additive"		"0"
 				"antialias"		"1"
-				"outline"		"1"
+				"outline"		"0"
 			}
 		}
-		
-		"KonrWings28"
+		"KonrWings36"
 		{
 			"1"
 			{
 				"name"			"Garm3nFont"
-				"tall"			"28"
-				"weight"		"0"
+				"tall"			"36"
+				"additive"		"0"
 				"antialias"		"1"
+				"outline"		"0"
 			}
 		}
-		
-		"KonrWings28Outline"
+		"KonrWings38"
 		{
 			"1"
 			{
 				"name"			"Garm3nFont"
-				"tall"			"28"
-				"weight"		"0"
+				"tall"			"38"
+				"additive"		"0"
 				"antialias"		"1"
-				"outline"		"1"
+				"outline"		"0"
 			}
 		}
-		
-		"KonrWings30"
+		"KonrWings40"
 		{
 			"1"
 			{
 				"name"			"Garm3nFont"
-				"tall"			"30"
-				"weight"		"0"
+				"tall"			"40"
+				"additive"		"0"
 				"antialias"		"1"
+				"outline"		"0"
 			}
 		}
 		
-		"KonrWings30Outline"
+		"KonrWings10Outline"
 		{
 			"1"
 			{
 				"name"			"Garm3nFont"
-				"tall"			"30"
-				"weight"		"0"
+				"tall"			"10"
+				"additive"		"0"
 				"antialias"		"1"
 				"outline"		"1"
 			}
 		}
-		
-		"KonrWings32"
+		"KonrWings12Outline"
 		{
 			"1"
 			{
 				"name"			"Garm3nFont"
-				"tall"			"32"
-				"weight"		"0"
+				"tall"			"12"
+				"additive"		"0"
 				"antialias"		"1"
+				"outline"		"1"
 			}
 		}
-		
-		"KonrWings32Outline"
+		"KonrWings14Outline"
 		{
 			"1"
 			{
 				"name"			"Garm3nFont"
-				"tall"			"32"
-				"weight"		"0"
+				"tall"			"14"
+				"additive"		"0"
 				"antialias"		"1"
 				"outline"		"1"
 			}
 		}
-		
-		"KonrWings34"
+		"KonrWings16Outline"
 		{
 			"1"
 			{
 				"name"			"Garm3nFont"
-				"tall"			"34"
-				"weight"		"0"
+				"tall"			"16"
+				"additive"		"0"
 				"antialias"		"1"
+				"outline"		"1"
 			}
 		}
-		
-		"KonrWings34Outline"
+		"KonrWings18Outline"
 		{
 			"1"
 			{
 				"name"			"Garm3nFont"
-				"tall"			"34"
-				"weight"		"0"
+				"tall"			"18"
+				"additive"		"0"
 				"antialias"		"1"
 				"outline"		"1"
 			}
 		}
-		
-		"KonrWings36"
+		"KonrWings20Outline"
 		{
 			"1"
 			{
 				"name"			"Garm3nFont"
-				"tall"			"36"
-				"weight"		"0"
+				"tall"			"20"
+				"additive"		"0"
 				"antialias"		"1"
+				"outline"		"1"
 			}
 		}
-		
-		"KonrWings36Outline"
+		"KonrWings22Outline"
 		{
 			"1"
 			{
 				"name"			"Garm3nFont"
-				"tall"			"36"
-				"weight"		"0"
+				"tall"			"22"
+				"additive"		"0"
 				"antialias"		"1"
 				"outline"		"1"
 			}
 		}
-		
-		"KonrWings38"
+		"KonrWings24Outline"
 		{
 			"1"
 			{
 				"name"			"Garm3nFont"
-				"tall"			"38"
-				"weight"		"0"
+				"tall"			"24"
+				"additive"		"0"
 				"antialias"		"1"
+				"outline"		"1"
 			}
 		}
-		
-		"KonrWings38Outline"
+		"KonrWings26Outline"
 		{
 			"1"
 			{
 				"name"			"Garm3nFont"
-				"tall"			"38"
-				"weight"		"0"
+				"tall"			"26"
+				"additive"		"0"
 				"antialias"		"1"
 				"outline"		"1"
 			}
 		}
-		
-		"KonrWings40"
+		"KonrWings28Outline"
 		{
 			"1"
 			{
 				"name"			"Garm3nFont"
-				"tall"			"40"
-				"weight"		"0"
+				"tall"			"28"
+				"additive"		"0"
 				"antialias"		"1"
+				"outline"		"1"
 			}
 		}
-		
-		"KonrWings40Outline"
+		"KonrWings30Outline"
 		{
 			"1"
 			{
 				"name"			"Garm3nFont"
-				"tall"			"40"
-				"weight"		"0"
+				"tall"			"30"
+				"additive"		"0"
 				"antialias"		"1"
 				"outline"		"1"
 			}
 		}
-		
-		"Symbol16"
+		"KonrWings32Outline"
 		{
 			"1"
 			{
-				"name"			"Symbol"
-				"tall"			"16"
-				"weight"		"0"
+				"name"			"Garm3nFont"
+				"tall"			"32"
+				"additive"		"0"
 				"antialias"		"1"
+				"outline"		"1"
 			}
 		}
-		"Symbol24"
+		"KonrWings34Outline"
 		{
 			"1"
 			{
-				"name"			"Symbol"
-				"tall"			"24"
-				"weight"		"0"
+				"name"			"Garm3nFont"
+				"tall"			"34"
+				"additive"		"0"
 				"antialias"		"1"
+				"outline"		"1"
 			}
 		}
-		"SymbolOutline24"
+		"KonrWings36Outline"
 		{
 			"1"
 			{
-				"name"			"Symbol"
-				"tall"			"24"
-				"weight"		"0"
+				"name"			"Garm3nFont"
+				"tall"			"36"
+				"additive"		"0"
 				"antialias"		"1"
 				"outline"		"1"
 			}
 		}
-		"Symbol32"
+		"KonrWings38Outline"
 		{
 			"1"
 			{
-				"name"			"Symbol"
-				"tall"			"32"
-				"weight"		"0"
+				"name"			"Garm3nFont"
+				"tall"			"38"
+				"additive"		"0"
 				"antialias"		"1"
+				"outline"		"1"
 			}
 		}
-		"Symbol40"
+		"KonrWings40Outline"
 		{
 			"1"
 			{
-				"name"			"Symbol"
+				"name"			"Garm3nFont"
 				"tall"			"40"
-				"weight"		"0"
+				"additive"		"0"
 				"antialias"		"1"
+				"outline"		"1"
 			}
 		}
 	}
@@ -1537,12 +1077,7 @@ Scheme
 			"font"	"resource/fonts/crosshairs.ttf"
 			"name"	"Crosshairs"
 		}
-		"112" // Thin Cross
-		{
-			"font"	"resource/fonts/Symbol.ttf"
-			"name"	"Symbol"
-		}
-		"113" // Konr Wings
+		"112" // Konr Wings
 		{
 			"font"	"resource/fonts/Garm3nFont.ttf"
 			"name"	"Garm3nFont"
diff --git a/resource/sourcescheme.res b/resource/sourcescheme.res
index aaa121b..2e1f172 100644
--- a/resource/sourcescheme.res
+++ b/resource/sourcescheme.res
@@ -6,18 +6,13 @@ Scheme
 	{
 		// HUD COLORS
 		//---------------------------------------------
-		"White"						"255 255 255 255"
-		"OffWhite"					"200 200 200 255"
+		"HudBlack"					"0 0 0 200"
+		"Cyan"						"15 255 255 255"
+		"Yellow"					"169 123 53 255"
+		"White"						"242 242 242 255"
 		"DullWhite"					"142 142 142 255"
-		"TransparentBlack"			"0 0 0 128"
-		"Black"						"10 10 10 255"
-		"Blank"						"0 0 0 0"
-		"RaysPrimary"				"15 255 255 255"
-		"RaysPrimaryLight"			"0 255 255 255"
-		"RaysPrimaryDark"			"65 255 255 255"
-		"RaysBlack"					"15 15 15 255"
-		"RaysBlackTrans"			"15 15 15 190"
-		"RaysButtonHover"			"12 52 85 128"
+		"DarkGrey"					"27 27 27 255"
+		"Black"						"15 15 15 255"
 		
 		// BASE COLORS
 		//---------------------------------------------
@@ -41,8 +36,8 @@ Scheme
 		
 	    "TFMediumBrown"				"69 64 58 255"
 		
-	    "QuickListBGDeselected"		"69 64 58 255"
-	    "QuickListBGSelected"		"131 121 104 150"
+	    "QuickListBGDeselected"		"0 0 0 0"
+	    "QuickListBGSelected"		"169 123 53 255"
 		
 	    "Blank"						"0 0 0 0"
 		
@@ -57,30 +52,30 @@ Scheme
 	BaseSettings
 	{
 		// scheme-specific colors
-		Border.Bright					"200 200 200 196"
-		Border.Dark						"40 40 40 196"
-		Border.Selection				"0 0 0 196"
+		Border.Bright					"Blank"
+		Border.Dark						"Blank"
+		Border.Selection				"Blank"
 		
-		Button.TextColor				"196 196 196 255"
-		Button.BgColor					"120 120 120 128"
+		Button.TextColor				"White"
+		Button.BgColor					"Black"
 		Button.ArmedTextColor			"White"
-		Button.ArmedBgColor				"RaysButtonHover"
+		Button.ArmedBgColor				"Yellow"
 		Button.DepressedTextColor		"White"
-		Button.DepressedBgColor			"Blank"
+		Button.DepressedBgColor			"Yellow"
 		Button.FocusBorderColor			"Blank"
 		
-		CheckButton.TextColor			"OffWhite"
+		CheckButton.TextColor			"DullWhite"
 		CheckButton.SelectedTextColor	"White"
-		CheckButton.BgColor				"TransparentBlack"
-		CheckButton.HighlightFgColor	"RaysPrimary"
+		CheckButton.BgColor				"Black"
+		CheckButton.HighlightFgColor	"Yellow"
 		CheckButton.ArmedBgColor		"Blank"
 		CheckButton.DepressedBgColor	"Blank"
-		CheckButton.Border1  			"Black"
-		CheckButton.Border2  			"Black"
+		CheckButton.Border1  			"Border.Dark"
+		CheckButton.Border2  			"Border.Bright"
 		CheckButton.Check				"White"
 		CheckButton.DisabledBgColor		"Blank"
 		
-		ToggleButton.SelectedTextColor	"TFTextBright"
+		ToggleButton.SelectedTextColor	"White"
 		
 		ComboBoxButton.ArrowColor		"DullWhite"
 		ComboBoxButton.ArmedArrowColor	"White"
@@ -91,58 +86,58 @@ Scheme
 		RadioButton.SelectedTextColor	"White"
 		RadioButton.ArmedTextColor		"TFTextMedium"
 		
-		Frame.BgColor					"40 40 40 245"
-		Frame.OutOfFocusBgColor			"40 40 40 245"
-		FrameGrip.Color1				"200 200 200 196"
-		FrameGrip.Color2				"0 0 0 196"
-		FrameTitleButton.FgColor		"200 200 200 196"
+		Frame.BgColor					"DarkGrey"
+		Frame.OutOfFocusBgColor			"DarkGrey"
+		FrameGrip.Color1				"TFTanMedium"
+		FrameGrip.Color2				"White"
+		FrameTitleButton.FgColor		"White"
 		FrameTitleBar.Font				"UiBold"
-		FrameTitleBar.TextColor			"RaysPrimary"
-		FrameTitleBar.DisabledTextColor	"255 255 255 192"
+		FrameTitleBar.TextColor			"White"
+		FrameTitleBar.DisabledTextColor	"DullWhite"
 		
 		Label.TextDullColor				"DullWhite"
-		Label.TextColor					"OffWhite"
+		Label.TextColor					"White"
 		Label.TextBrightColor			"White"
 		Label.SelectedTextColor			"White"
 		Label.BgColor					"Blank"
-		Label.DisabledFgColor1			"117 117 117 255"
-		Label.DisabledFgColor2			"30 30 30 255"
+		Label.DisabledFgColor1			"DullWhite"
+		Label.DisabledFgColor2			"Blank"	
 		
-		ListPanel.TextColor					"OffWhite"
-		ListPanel.BgColor					"TransparentBlack"
-		ListPanel.SelectedBgColor			"RaysPrimary"
-		ListPanel.SelectedOutOfFocusBgColor	"100 100 100 128"
+		ListPanel.TextColor					"White"
+		ListPanel.BgColor					"HudBlack"
+		ListPanel.SelectedBgColor			"White"
+		ListPanel.SelectedOutOfFocusBgColor	"DullWhite"
 		
-		MainMenu.TextColor					"White"
-		MainMenu.ArmedTextColor				"RaysPrimary"
+		MainMenu.TextColor					"DullWhite"
+		MainMenu.ArmedTextColor				"Cyan"
 		MainMenu.Inset						"32"
 		
 		Menu.TextInset						"6"
 		Menu.FgColor						"White"
-		Menu.BgColor						"160 160 160 64"
-		Menu.ArmedFgColor					"RaysPrimary"
-		Menu.ArmedBgColor					"RaysPrimary"
-		Menu.DividerColor					"BorderDark"
+		Menu.BgColor						"HudBlack"
+		Menu.ArmedFgColor					"Cyan"
+		Menu.ArmedBgColor					"Cyan"
+		Menu.DividerColor					"Border.Dark"
 		
 		ScrollBarButton.FgColor				"White"
-		ScrollBarButton.BgColor				"Blank"
-		ScrollBarButton.ArmedFgColor		"White"
-		ScrollBarButton.ArmedBgColor		"Blank"
-		ScrollBarButton.DepressedFgColor	"White"
-		ScrollBarButton.DepressedBgColor	"Blank"
+		ScrollBarButton.BgColor				"Black"
+		ScrollBarButton.ArmedFgColor		"Black"
+		ScrollBarButton.ArmedBgColor		"White"
+		ScrollBarButton.DepressedFgColor	"Black"
+		ScrollBarButton.DepressedBgColor	"White"
 		
-		ScrollBarSlider.BgColor				"70 70 70 96"
-		ScrollBarSlider.FgColor				"100 100 100 150"
+		ScrollBarSlider.BgColor				"Black"
+		ScrollBarSlider.FgColor				"White"
 		
-		Slider.NobColor						"108 108 108 255"
-		Slider.TextColor					"180 180 180 255"
-		Slider.TrackColor					"31 31 31 255"
-		Slider.DisabledTextColor1			"117 117 117 255"
-		Slider.DisabledTextColor2			"30 30 30 255"
+		Slider.NobColor						"TFTanLight"
+		Slider.TextColor					"White"
+		Slider.TrackColor					"HudBlack"
+		Slider.DisabledTextColor1			"TFTextMediumDark"
+		Slider.DisabledTextColor2			"Blank"
 		
-		TextEntry.TextColor					"OffWhite"
+		TextEntry.TextColor					"White"
 		TextEntry.DisabledTextColor	        "DullWhite"
-		TextEntry.SelectedBgColor			"RaysPrimary"
+		TextEntry.SelectedBgColor			"Cyan"
 	}
 	
 	Fonts