diff --git a/.gitignore b/.gitignore
index af52496b9..1857d78de 100644
--- a/.gitignore
+++ b/.gitignore
@@ -190,3 +190,4 @@ mp/game/neo/cfg/sourcemod
 # Excludes
 !makefile_base_posix.mak
 !sourcesdk_def.mak
+/mp/src/lib/public/fgdlib.pdb
diff --git a/mp/game/neo/resource/neo_ui/Neo_ClassMenu.res b/mp/game/neo/resource/neo_ui/Neo_ClassMenu.res
index 4a29df5af..73698cb75 100644
--- a/mp/game/neo/resource/neo_ui/Neo_ClassMenu.res
+++ b/mp/game/neo/resource/neo_ui/Neo_ClassMenu.res
@@ -4,11 +4,11 @@
 	{
 		"ControlName"		"CNeoClassMenu"
 		"fieldName"		"classmenu"
-		"xpos"		"325"
-		"ypos"		"176"
+		"xpos" 		"cs-0.5"
+		"ypos" 		"cs-0.5"
 		"wide"		"430"
 		"tall"		"432"
-		"autoResize"		"1"
+		"autoResize"		"0"
 		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
@@ -16,19 +16,68 @@
 		"settitlebarvisible"		"0"
 		"title"		"#Frame_Untitled"
 	}
+	"ngui_corner"
+	{
+		"ControlName"		"ImagePanel"
+		"fieldName"		"ngui_corner"
+		"xpos"		"0"
+		"ypos"		"0"
+		"wide"		"16"
+		"tall"		"16"
+		"autoResize"		"0"
+		"pinCorner"		"0"
+		"visible"		"1"
+		"enabled"		"1"
+		"tabPosition"		"0"
+		"image"		"ngui_corner"
+		"scaleImage"		"0"
+	}
+	"title_bar"
+	{
+		"ControlName"		"ImagePanel"
+		"fieldName"		"title_bar"
+		"xpos"		"16"
+		"ypos"		"0"
+		"wide"		"414"
+		"tall"		"16"
+		"autoResize"		"0"
+		"pinCorner"		"0"
+		"visible"		"1"
+		"enabled"		"1"
+		"tabPosition"		"0"
+		"image"		"ngui_titlebar"
+		"fillcolor"		"black"
+		"scaleImage"		"1"
+	}
+	"background"
+	{
+		"ControlName"		"ImagePanel"
+		"fieldName"		"background"
+		"xpos"		"0"
+		"ypos"		"16"
+		"wide"		"f"
+		"tall"		"418"
+		"autoResize"		"0"
+		"pinCorner"		"0"
+		"visible"		"1"
+		"enabled"		"1"
+		"tabPosition"		"0"
+		"image"		"ngui_body"
+		"scaleImage"		"1"
+	}
 	"TitleLabel"
 	{
 		"ControlName"		"Label"
 		"fieldName"		"TitleLabel"
-		"xpos"		"165"
+		"xpos" 		"0"
 		"ypos"		"0"
-		"wide"		"100"
+		"wide"		"430"
 		"tall"		"16"
-		"autoResize"		"1"
+		"autoResize"		"0"
 		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
-		"tabPosition"		"0"
+		"tabPosition"		"1"
 		"labelText"		"CLASS MENU"
 		"textAlignment"		"center"
 		"dulltext"		"0"
@@ -37,34 +86,34 @@
 	}
 	"IconPanel1"
 	{
-		"ControlName"		"IconPanel"
+		"ControlName"		"ImagePanel"
 		"fieldName"		"IconPanel1"
 		"xpos"		"87"
 		"ypos"		"20"
 		"wide"		"256"
 		"tall"		"32"
-		"autoResize"		"1"
+		"autoResize"		"0"
 		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
 		"tabPosition"		"0"
-		"image"		"vgui/choose_class"
+		"image"		"choose_class"
 		"scaleImage"		"0"
 	}	
 	"IconPanel2"
 	{
-		"ControlName"		"IconPanel"
+		"ControlName"		"ImagePanel"
 		"fieldName"		"IconPanel2"
 		"xpos"		"87"
 		"ypos"		"90"
 		"wide"		"256"
 		"tall"		"32"
-		"autoResize"		"1"
+		"autoResize"		"0"
 		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
 		"tabPosition"		"0"
-		"image"		"vgui/choose_playermodel"
+		"image"		"choose_playermodel"
 		"scaleImage"		"0"
 	}	
 	"Scout_Button"
@@ -75,7 +124,7 @@
 		"ypos"		"55"
 		"wide"		"128"
 		"tall"		"30"
-		"autoResize"		"1"
+		"autoResize"		"0"
 		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
@@ -97,7 +146,7 @@
 		"ypos"		"55"
 		"wide"		"128"
 		"tall"		"30"
-		"autoResize"		"1"
+		"autoResize"		"0"
 		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
@@ -118,7 +167,7 @@
 		"ypos"		"55"
 		"wide"		"128"
 		"tall"		"30"
-		"autoResize"		"1"
+		"autoResize"		"0"
 		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
@@ -131,10 +180,10 @@
 		"Command"		"setclass 3"
 		"Default"		"0"
 	}
-	"Model_ImagePanel"
+	"Model1_ImagePanel"
 	{
-		"ControlName"		"NImageButton"
-		"fieldName"		"Model_ImagePanel"
+		"ControlName"		"ImagePanel"
+		"fieldName"		"Model1_ImagePanel"
 		"xpos"		"10"
 		"ypos"		"130"
 		"wide"		"128"
@@ -143,18 +192,30 @@
 		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
+		"Default"		"0"
+		"image"			"cm/jinrai_assault01"
+	}
+	"Skin1_Button"
+	{
+		"ControlName"		"Button"
+		"fieldName"		"Skin1_Button"
+		"xpos"		"10"
+		"ypos"		"130"
+		"wide"		"128"
+		"tall"		"256"
+		"autoResize"		"0"
+		"pinCorner"		"0"
+		"visible"		"1"
+		"enabled"		"1"
 		"tabPosition"		"0"
-		"textAlignment"		"west"
-		"dulltext"		"0"
-		"brighttext"		"0"
-		"wrap"		"0"
+		"labelText"		""
 		"Command"		"SetVariant 0"
 		"Default"		"0"
 	}
-	"Model_ImagePanel2"
+	"Model2_ImagePanel"
 	{
-		"ControlName"		"NImageButton"
-		"fieldName"		"Model_ImagePanel2"
+		"ControlName"		"ImagePanel"
+		"fieldName"		"Model2_ImagePanel"
 		"xpos"		"150"
 		"ypos"		"130"
 		"wide"		"128"
@@ -163,18 +224,30 @@
 		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
+		"Default"		"0"
+		"image"			"cm/jinrai_assault02"
+	}
+	"Skin2_Button"
+	{
+		"ControlName"		"Button"
+		"fieldName"		"Skin2_Button"
+		"xpos"		"150"
+		"ypos"		"130"
+		"wide"		"128"
+		"tall"		"256"
+		"autoResize"		"0"
+		"pinCorner"		"0"
+		"visible"		"1"
+		"enabled"		"1"
 		"tabPosition"		"0"
-		"textAlignment"		"west"
-		"dulltext"		"0"
-		"brighttext"		"0"
-		"wrap"		"0"
+		"labelText"		""
 		"Command"		"SetVariant 1"
 		"Default"		"0"
 	}
-	"Model_ImagePanel3"
+	"Model3_ImagePanel"
 	{
-		"ControlName"		"NImageButton"
-		"fieldName"		"Model_ImagePanel3"
+		"ControlName"		"ImagePanel"
+		"fieldName"		"Model3_ImagePanel"
 		"xpos"		"290"
 		"ypos"		"130"
 		"wide"		"128"
@@ -183,11 +256,23 @@
 		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
+		"Default"		"0"
+		"image"			"cm/jinrai_assault03"
+	}
+	"Skin3_Button"
+	{
+		"ControlName"		"Button"
+		"fieldName"		"Skin3_Button"
+		"xpos"		"290"
+		"ypos"		"130"
+		"wide"		"128"
+		"tall"		"256"
+		"autoResize"		"0"
+		"pinCorner"		"0"
+		"visible"		"1"
+		"enabled"		"1"
 		"tabPosition"		"0"
-		"textAlignment"		"west"
-		"dulltext"		"0"
-		"brighttext"		"0"
-		"wrap"		"0"
+		"labelText"		""
 		"Command"		"SetVariant 2"
 		"Default"		"0"
 	}
@@ -196,10 +281,10 @@
 		"ControlName"		"Button"
 		"fieldName"		"Back_Button"
 		"xpos"		"8"
-		"ypos"		"150"
+		"ypos"		"394"
 		"wide"		"207"
 		"tall"		"30"
-		"autoResize"		"1"
+		"autoResize"		"0"
 		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
diff --git a/mp/game/neo/resource/neo_ui/Neo_LoadoutMenu_Dev.res b/mp/game/neo/resource/neo_ui/Neo_LoadoutMenu_Dev.res
index 54ae3805c..e35c5f9e3 100644
--- a/mp/game/neo/resource/neo_ui/Neo_LoadoutMenu_Dev.res
+++ b/mp/game/neo/resource/neo_ui/Neo_LoadoutMenu_Dev.res
@@ -1,683 +1,497 @@
 "resource/neo_ui/Neo_LoadoutMenu_Dev.res"
 {
-	"loadout_dev"
-	{
-		"ControlName"		"CNeoLoadoutMenu_Dev"
-		"fieldName"		"loadout_dev"
-		"xpos"		"415"
-		"ypos"		"159"
-		"wide"		"850"
-		"tall"		"450"
-		"autoResize"		"1"
-		"pinCorner"		"0"
-		"visible"		"1"
-		"enabled"		"1"
-		"tabPosition"		"0"
-		"settitlebarvisible"		"0"
-		"title"		"#Frame_Untitled"
-	}
-	"Weapon_ImagePanel"
+	"neo_loadoutmenu"
+	{
+		"ControlName"			"CNeoLoadoutMenu"
+		"fieldName"				"neo_loadoutmenu"
+		"xpos" 					"cs-0.5"
+		"ypos" 					"cs-0.5"
+		"wide"					"800"
+		"tall"					"646"
+		"autoResize"			"0"
+		"pinCorner"				"0"
+		"RoundedCorners"		"15"
+		"pin_corner_to_sibling"	"0"
+		"pin_to_sibling_corner"	"0"
+		"visible"				"1"
+		"enabled"				"1"
+		"tabPosition"			"0"
+		"settitlebarvisible"	"0"
+		"title"					"#Frame_Untitled"
+		"BgColor"				"0 0 0 0"
+	}
+	"ngui_corner"
 	{
 		"ControlName"		"ImagePanel"
-		"fieldName"		"Weapon_ImagePanel"
-		"xpos"		"220"
-		"ypos"		"25"
-		"wide"		"620"
-		"tall"		"385"
-		"autoResize"		"1"
-		"pinCorner"		"0"
-		"visible"		"1"
-		"enabled"		"1"
-		"tabPosition"		"0"
-		"image"		"loadout/none"
-		"scaleImage"		"0"
-	}	
-	"frame_topGrip"
-	{
-		"ControlName"		"Panel"
-		"fieldName"		"frame_topGrip"
-		"xpos"		"8"
-		"ypos"		"0"
-		"wide"		"834"
-		"tall"		"5"
-		"autoResize"		"1"
-		"pinCorner"		"0"
-		"visible"		"1"
-		"enabled"		"1"
-		"tabPosition"		"0"
-	}
-	"frame_bottomGrip"
-	{
-		"ControlName"		"Panel"
-		"fieldName"		"frame_bottomGrip"
-		"xpos"		"8"
-		"ypos"		"445"
-		"wide"		"824"
-		"tall"		"5"
-		"autoResize"		"1"
-		"pinCorner"		"0"
-		"visible"		"1"
-		"enabled"		"1"
-		"tabPosition"		"0"
-	}
-	"frame_leftGrip"
-	{
-		"ControlName"		"Panel"
-		"fieldName"		"frame_leftGrip"
-		"xpos"		"0"
-		"ypos"		"8"
-		"wide"		"5"
-		"tall"		"434"
-		"autoResize"		"1"
-		"pinCorner"		"0"
-		"visible"		"1"
-		"enabled"		"1"
-		"tabPosition"		"0"
-	}
-	"frame_rightGrip"
-	{
-		"ControlName"		"Panel"
-		"fieldName"		"frame_rightGrip"
-		"xpos"		"845"
-		"ypos"		"8"
-		"wide"		"5"
-		"tall"		"424"
-		"autoResize"		"1"
-		"pinCorner"		"0"
-		"visible"		"1"
-		"enabled"		"1"
-		"tabPosition"		"0"
-	}
-	"frame_tlGrip"
-	{
-		"ControlName"		"Panel"
-		"fieldName"		"frame_tlGrip"
+		"fieldName"		"ngui_corner"
 		"xpos"		"0"
 		"ypos"		"0"
-		"wide"		"8"
-		"tall"		"8"
-		"autoResize"		"1"
+		"wide"		"16"
+		"tall"		"16"
+		"autoResize"		"0"
 		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
 		"tabPosition"		"0"
+		"image"		"ngui_corner"
+		"scaleImage"		"0"
 	}
-	"frame_trGrip"
+	"title_bar"
 	{
-		"ControlName"		"Panel"
-		"fieldName"		"frame_trGrip"
-		"xpos"		"842"
+		"ControlName"		"ImagePanel"
+		"fieldName"		"title_bar"
+		"xpos"		"16"
 		"ypos"		"0"
-		"wide"		"8"
-		"tall"		"8"
-		"autoResize"		"1"
-		"pinCorner"		"0"
-		"visible"		"1"
-		"enabled"		"1"
-		"tabPosition"		"0"
-	}
-	"frame_blGrip"
-	{
-		"ControlName"		"Panel"
-		"fieldName"		"frame_blGrip"
-		"xpos"		"0"
-		"ypos"		"442"
-		"wide"		"8"
-		"tall"		"8"
-		"autoResize"		"1"
-		"pinCorner"		"0"
-		"visible"		"1"
-		"enabled"		"1"
-		"tabPosition"		"0"
-	}
-	"frame_brGrip"
-	{
-		"ControlName"		"Panel"
-		"fieldName"		"frame_brGrip"
-		"xpos"		"832"
-		"ypos"		"432"
-		"wide"		"18"
-		"tall"		"18"
-		"autoResize"		"1"
+		"wide"		"784"
+		"tall"		"16"
+		"autoResize"		"0"
 		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
 		"tabPosition"		"0"
+		"image"		"ngui_titlebar"
+		"fillcolor"		"black"
+		"scaleImage"		"1"
 	}
-	"frame_caption"
+	"background"
 	{
-		"ControlName"		"Panel"
-		"fieldName"		"frame_caption"
+		"ControlName"		"ImagePanel"
+		"fieldName"		"background"
 		"xpos"		"0"
-		"ypos"		"0"
-		"wide"		"840"
-		"tall"		"23"
-		"autoResize"		"1"
+		"ypos"		"16"
+		"wide"		"f"
+		"tall"		"630"
+		"autoResize"		"0"
 		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
 		"tabPosition"		"0"
-	}
-	"frame_minimize"
-	{
-		"ControlName"		"Button"
-		"fieldName"		"frame_minimize"
-		"xpos"		"0"
-		"ypos"		"0"
-		"wide"		"18"
-		"tall"		"18"
-		"autoResize"		"1"
-		"pinCorner"		"0"
-		"visible"		"0"
-		"enabled"		"1"
-		"tabPosition"		"0"
-		"labelText"		"0"
-		"textAlignment"		"north-west"
-		"dulltext"		"0"
-		"brighttext"		"0"
-		"wrap"		"0"
-		"Default"		"0"
-	}
-	"frame_maximize"
-	{
-		"ControlName"		"Button"
-		"fieldName"		"frame_maximize"
-		"xpos"		"0"
-		"ypos"		"0"
-		"wide"		"18"
-		"tall"		"18"
-		"autoResize"		"1"
-		"pinCorner"		"0"
-		"visible"		"0"
-		"enabled"		"1"
-		"tabPosition"		"0"
-		"labelText"		"1"
-		"textAlignment"		"north-west"
-		"dulltext"		"0"
-		"brighttext"		"0"
-		"wrap"		"0"
-		"Default"		"0"
-	}
-	"frame_mintosystray"
-	{
-		"ControlName"		"Button"
-		"fieldName"		"frame_mintosystray"
-		"xpos"		"0"
-		"ypos"		"0"
-		"wide"		"18"
-		"tall"		"18"
-		"autoResize"		"1"
-		"pinCorner"		"0"
-		"visible"		"0"
-		"enabled"		"1"
-		"tabPosition"		"0"
-		"labelText"		"o"
-		"textAlignment"		"north-west"
-		"dulltext"		"0"
-		"brighttext"		"0"
-		"wrap"		"0"
-		"Command"		"MinimizeToSysTray"
-		"Default"		"0"
-	}
-	"frame_close"
-	{
-		"ControlName"		"Button"
-		"fieldName"		"frame_close"
-		"xpos"		"0"
-		"ypos"		"0"
-		"wide"		"18"
-		"tall"		"18"
-		"autoResize"		"1"
-		"pinCorner"		"0"
-		"visible"		"0"
-		"enabled"		"1"
-		"tabPosition"		"0"
-		"labelText"		"r"
-		"textAlignment"		"north-west"
-		"dulltext"		"0"
-		"brighttext"		"0"
-		"wrap"		"0"
-		"Default"		"0"
-	}
-	"frame_menu"
-	{
-		"ControlName"		"FrameSystemButton"
-		"fieldName"		"frame_menu"
-		"xpos"		"7"
-		"ypos"		"8"
-		"wide"		"18"
-		"tall"		"18"
-		"autoResize"		"1"
-		"pinCorner"		"0"
-		"visible"		"0"
-		"enabled"		"1"
-		"tabPosition"		"0"
-		"textAlignment"		"west"
-		"dulltext"		"0"
-		"brighttext"		"0"
-		"wrap"		"0"
-		"Default"		"0"
+		"image"		"ngui_body"
+		"scaleImage"		"1"
 	}
 	"TitleLabel"
 	{
 		"ControlName"		"Label"
 		"fieldName"		"TitleLabel"
-		"xpos"		"250"
+		"xpos"		"0"
 		"ypos"		"0"
-		"wide"		"200"
+		"wide"		"800"
 		"tall"		"16"
 		"autoResize"		"1"
 		"pinCorner"		"0"
+		"RoundedCorners"		"15"
+		"pin_corner_to_sibling"		"0"
+		"pin_to_sibling_corner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
 		"tabPosition"		"0"
 		"labelText"		"LOADOUT MENU"
-		"textAlignment"		"east"
-		"dulltext"		"0"
-		"brighttext"		"0"
-		"wrap"		"0"
-	}
-	"Scout_Button"
-	{
-		"ControlName"		"Button"
-		"fieldName"		"Scout_Button"
-		"xpos"		"616"
-		"ypos"		"291"
-		"wide"		"128"
-		"tall"		"25"
-		"autoResize"		"1"
-		"pinCorner"		"0"
-		"visible"		"0"
-		"enabled"		"0"
-		"tabPosition"		"0"
-		"labelText"		"Misc1"
 		"textAlignment"		"center"
 		"dulltext"		"0"
 		"brighttext"		"0"
-		"Font"		"Default"
 		"wrap"		"0"
-		"Command"		"setclass 1"
-		"Default"		"0"
+		"centerwrap"		"0"
+		"textinsetx"		"0"
+		"textinsety"		"0"
+		"auto_wide_tocontents"		"0"
+		"use_proportional_insets"		"0"
 	}
-	"Misc2"
+	"IconPanel1"
 	{
-		"ControlName"		"Button"
-		"fieldName"		"Misc2"
-		"xpos"		"615"
-		"ypos"		"322"
-		"wide"		"128"
-		"tall"		"25"
-		"autoResize"		"1"
-		"pinCorner"		"0"
-		"visible"		"0"
-		"enabled"		"0"
-		"tabPosition"		"0"
-		"labelText"		"Misc2"
-		"textAlignment"		"center"
-		"dulltext"		"0"
-		"brighttext"		"0"
-		"wrap"		"0"
-		"Command"		"setclass 2"
-		"Default"		"0"
-	}
-	"Done_Button"
-	{
-		"ControlName"		"Button"
-		"fieldName"		"Done_Button"
-		"xpos"		"776"
-		"ypos"		"418"
-		"wide"		"64"
-		"tall"		"25"
-		"autoResize"		"1"
+		"ControlName"		"ImagePanel"
+		"fieldName"		"IconPanel1"
+		"xpos"		"272"
+		"ypos"		"20"
+		"wide"		"256"
+		"tall"		"32"
+		"autoResize"		"0"
 		"pinCorner"		"0"
 		"visible"		"1"
-		"enabled"		"0"
+		"enabled"		"1"
 		"tabPosition"		"0"
-		"labelText"		"GO!"
-		"textAlignment"		"center"
-		"dulltext"		"0"
-		"brighttext"		"0"
-		"wrap"		"0"
-		"Command"		"playerready"
-		"Default"		"0"
+		"image"		"choose_primary"
+		"scaleImage"		"0"
+	}	
+	"Button1Image"
+	{
+		"ControlName"		"ImagePanel"
+		"fieldName"		"Button1Image"
+		"xpos"		"8"
+		"ypos"		"64"
+		"wide"		"256"
+		"tall"		"128"
+		"image"		"loadout/loadout_none"
 	}
 	"Button1"
 	{
 		"ControlName"		"Button"
 		"fieldName"		"Button1"
-		"xpos"		"10"
-		"ypos"		"25"
-		"wide"		"200"
-		"tall"		"25"
-		"autoResize"		"1"
-		"pinCorner"		"0"
+		"xpos"		"8"
+		"ypos"		"64"
+		"wide"		"256"
+		"tall"		"128"
+		"autoResize"		"0"
+		"pinCorner"		"0"
+		"RoundedCorners"		"15"
+		"pin_corner_to_sibling"		"0"
+		"pin_to_sibling_corner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
 		"tabPosition"		"0"
-		"labelText"		"MPN45"
-		"textAlignment"		"center"
-		"dulltext"		"0"
-		"brighttext"		"0"
-		"Font"		"Default"
-		"wrap"		"0"
-		"Command"		"loadout 0"
+		"labelText"		""
+		"command"		"loadout 0"
 		"Default"		"0"
 	}
+	"Button2Image"
+	{
+		"ControlName"		"ImagePanel"
+		"fieldName"		"Button2Image"
+		"xpos"		"272"
+		"ypos"		"64"
+		"wide"		"256"
+		"tall"		"128"
+		"image"		"loadout/loadout_none"
+	}
 	"Button2"
 	{
 		"ControlName"		"Button"
 		"fieldName"		"Button2"
-		"xpos"		"10"
-		"ypos"		"55"
-		"wide"		"200"
-		"tall"		"25"
-		"autoResize"		"1"
-		"pinCorner"		"0"
+		"xpos"		"272"
+		"ypos"		"64"
+		"wide"		"256"
+		"tall"		"128"
+		"autoResize"		"0"
+		"pinCorner"		"0"
+		"RoundedCorners"		"15"
+		"pin_corner_to_sibling"		"0"
+		"pin_to_sibling_corner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
 		"tabPosition"		"0"
-		"labelText"		"SRM"
-		"textAlignment"		"center"
-		"dulltext"		"0"
-		"brighttext"		"0"
-		"Font"		"Default"
-		"wrap"		"0"
-		"Command"		"loadout 1"
+		"labelText"		""
+		"command"		"loadout 1"
 		"Default"		"0"
 	}
+	"Button3Image"
+	{
+		"ControlName"		"ImagePanel"
+		"fieldName"		"Button3Image"
+		"xpos"		"536"
+		"ypos"		"64"
+		"wide"		"256"
+		"tall"		"128"
+		"image"		"loadout/loadout_none"
+	}
 	"Button3"
 	{
 		"ControlName"		"Button"
 		"fieldName"		"Button3"
-		"xpos"		"10"
-		"ypos"		"85"
-		"wide"		"200"
-		"tall"		"25"
-		"autoResize"		"1"
-		"pinCorner"		"0"
+		"xpos"		"536"
+		"ypos"		"64"
+		"wide"		"256"
+		"tall"		"128"
+		"autoResize"		"0"
+		"pinCorner"		"0"
+		"RoundedCorners"		"15"
+		"pin_corner_to_sibling"		"0"
+		"pin_to_sibling_corner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
 		"tabPosition"		"0"
-		"labelText"		"SRM (silenced)"
-		"textAlignment"		"center"
-		"dulltext"		"0"
-		"brighttext"		"0"
-		"Font"		"Default"
-		"wrap"		"0"
-		"Command"		"loadout 2"
+		"labelText"		""
+		"command"		"loadout 2"
 		"Default"		"0"
 	}
+	"Button4Image"
+	{
+		"ControlName"		"ImagePanel"
+		"fieldName"		"Button4Image"
+		"xpos"		"8"
+		"ypos"		"200"
+		"wide"		"256"
+		"tall"		"128"
+		"image"		"loadout/loadout_none"
+	}
 	"Button4"
 	{
 		"ControlName"		"Button"
 		"fieldName"		"Button4"
-		"xpos"		"10"
-		"ypos"		"115"
-		"wide"		"200"
-		"tall"		"25"
-		"autoResize"		"1"
-		"pinCorner"		"0"
+		"xpos"		"8"
+		"ypos"		"200"
+		"wide"		"256"
+		"tall"		"128"
+		"autoResize"		"0"
+		"pinCorner"		"0"
+		"RoundedCorners"		"15"
+		"pin_corner_to_sibling"		"0"
+		"pin_to_sibling_corner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
 		"tabPosition"		"0"
-		"labelText"		"Jitte"
-		"textAlignment"		"center"
-		"dulltext"		"0"
-		"brighttext"		"0"
-		"Font"		"Default"
-		"wrap"		"0"
-		"Command"		"loadout 3"
+		"labelText"		""
+		"command"		"loadout 3"
 		"Default"		"0"
 	}
+	"Button5Image"
+	{
+		"ControlName"		"ImagePanel"
+		"fieldName"		"Button5Image"
+		"xpos"		"272"
+		"ypos"		"200"
+		"wide"		"256"
+		"tall"		"128"
+		"image"		"loadout/loadout_none"
+	}
 	"Button5"
 	{
 		"ControlName"		"Button"
 		"fieldName"		"Button5"
-		"xpos"		"10"
-		"ypos"		"145"
-		"wide"		"200"
-		"tall"		"25"
-		"autoResize"		"1"
-		"pinCorner"		"0"
+		"xpos"		"272"
+		"ypos"		"200"
+		"wide"		"256"
+		"tall"		"128"
+		"autoResize"		"0"
+		"pinCorner"		"0"
+		"RoundedCorners"		"15"
+		"pin_corner_to_sibling"		"0"
+		"pin_to_sibling_corner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
 		"tabPosition"		"0"
-		"labelText"		"Jitte (with scope)"
-		"textAlignment"		"center"
-		"dulltext"		"0"
-		"brighttext"		"0"
-		"Font"		"Default"
-		"wrap"		"0"
-		"Command"		"loadout 4"
+		"labelText"		""
+		"command"		"loadout 4"
 		"Default"		"0"
 	}
+	"Button6Image"
+	{
+		"ControlName"		"ImagePanel"
+		"fieldName"		"Button6Image"
+		"xpos"		"536"
+		"ypos"		"200"
+		"wide"		"256"
+		"tall"		"128"
+		"image"		"loadout/loadout_none"
+	}
 	"Button6"
 	{
 		"ControlName"		"Button"
 		"fieldName"		"Button6"
-		"xpos"		"10"
-		"ypos"		"175"
-		"wide"		"200"
-		"tall"		"25"
-		"autoResize"		"1"
-		"pinCorner"		"0"
+		"xpos"		"536"
+		"ypos"		"200"
+		"wide"		"256"
+		"tall"		"128"
+		"autoResize"		"0"
+		"pinCorner"		"0"
+		"RoundedCorners"		"15"
+		"pin_corner_to_sibling"		"0"
+		"pin_to_sibling_corner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
 		"tabPosition"		"0"
-		"labelText"		"ZR68-C (compact)"
-		"textAlignment"		"center"
-		"dulltext"		"0"
-		"brighttext"		"0"
-		"Font"		"Default"
-		"wrap"		"0"
-		"Command"		"loadout 5"
+		"labelText"		""
+		"command"		"loadout 5"
 		"Default"		"0"
 	}
+	"Button7Image"
+	{
+		"ControlName"		"ImagePanel"
+		"fieldName"		"Button7Image"
+		"xpos"		"8"
+		"ypos"		"336"
+		"wide"		"256"
+		"tall"		"128"
+		"image"		"loadout/loadout_none"
+	}
 	"Button7"
 	{
 		"ControlName"		"Button"
 		"fieldName"		"Button7"
-		"xpos"		"10"
-		"ypos"		"205"
-		"wide"		"200"
-		"tall"		"25"
-		"autoResize"		"1"
-		"pinCorner"		"0"
+		"xpos"		"8"
+		"ypos"		"336"
+		"wide"		"256"
+		"tall"		"128"
+		"autoResize"		"0"
+		"pinCorner"		"0"
+		"RoundedCorners"		"15"
+		"pin_corner_to_sibling"		"0"
+		"pin_to_sibling_corner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
 		"tabPosition"		"0"
-		"labelText"		"ZR68-S (silenced)"
-		"textAlignment"		"center"
-		"dulltext"		"0"
-		"brighttext"		"0"
-		"Font"		"Default"
-		"wrap"		"0"
-		"Command"		"loadout 6"
+		"labelText"		""
+		"command"		"loadout 6"
 		"Default"		"0"
 	}
+	"Button8Image"
+	{
+		"ControlName"		"ImagePanel"
+		"fieldName"		"Button8Image"
+		"xpos"		"272"
+		"ypos"		"336"
+		"wide"		"256"
+		"tall"		"128"
+		"image"		"loadout/loadout_none"
+	}
 	"Button8"
 	{
 		"ControlName"		"Button"
 		"fieldName"		"Button8"
-		"xpos"		"10"
-		"ypos"		"235"
-		"wide"		"200"
-		"tall"		"25"
-		"autoResize"		"1"
-		"pinCorner"		"0"
+		"xpos"		"272"
+		"ypos"		"336"
+		"wide"		"256"
+		"tall"		"128"
+		"autoResize"		"0"
+		"pinCorner"		"0"
+		"RoundedCorners"		"15"
+		"pin_corner_to_sibling"		"0"
+		"pin_to_sibling_corner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
 		"tabPosition"		"0"
-		"labelText"		"ZR68-L (accurized)"
-		"textAlignment"		"center"
-		"dulltext"		"0"
-		"brighttext"		"0"
-		"Font"		"Default"
-		"wrap"		"0"
-		"Command"		"loadout 7"
+		"labelText"		""
+		"command"		"loadout 7"
 		"Default"		"0"
 	}
+	"Button9Image"
+	{
+		"ControlName"		"ImagePanel"
+		"fieldName"		"Button9Image"
+		"xpos"		"536"
+		"ypos"		"336"
+		"wide"		"256"
+		"tall"		"128"
+		"image"		"loadout/loadout_none"
+	}
 	"Button9"
 	{
 		"ControlName"		"Button"
 		"fieldName"		"Button9"
-		"xpos"		"10"
-		"ypos"		"265"
-		"wide"		"200"
-		"tall"		"25"
-		"autoResize"		"1"
-		"pinCorner"		"0"
+		"xpos"		"536"
+		"ypos"		"336"
+		"wide"		"256"
+		"tall"		"128"
+		"autoResize"		"0"
+		"pinCorner"		"0"
+		"RoundedCorners"		"15"
+		"pin_corner_to_sibling"		"0"
+		"pin_to_sibling_corner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
 		"tabPosition"		"0"
-		"labelText"		"MX"
-		"textAlignment"		"center"
-		"dulltext"		"0"
-		"brighttext"		"0"
-		"Font"		"Default"
-		"wrap"		"0"
-		"Command"		"loadout 8"
+		"labelText"		""
+		"command"		"loadout 8"
 		"Default"		"0"
 	}
+	"Button10Image"
+	{
+		"ControlName"		"ImagePanel"
+		"fieldName"		"Button10Image"
+		"xpos"		"8"
+		"ypos"		"472"
+		"wide"		"256"
+		"tall"		"128"
+		"image"		"loadout/loadout_none"
+	}
 	"Button10"
 	{
 		"ControlName"		"Button"
 		"fieldName"		"Button10"
-		"xpos"		"10"
-		"ypos"		"295"
-		"wide"		"200"
-		"tall"		"25"
-		"autoResize"		"1"
-		"pinCorner"		"0"
+		"xpos"		"8"
+		"ypos"		"472"
+		"wide"		"256"
+		"tall"		"128"
+		"autoResize"		"0"
+		"pinCorner"		"0"
+		"RoundedCorners"		"15"
+		"pin_corner_to_sibling"		"0"
+		"pin_to_sibling_corner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
 		"tabPosition"		"0"
-		"labelText"		"PZ252"
-		"textAlignment"		"center"
-		"dulltext"		"0"
-		"brighttext"		"0"
-		"Font"		"Default"
-		"wrap"		"0"
-		"Command"		"loadout 9"
+		"labelText"		""
+		"command"		"loadout 9"
 		"Default"		"0"
 	}
+	"Button11Image"
+	{
+		"ControlName"		"ImagePanel"
+		"fieldName"		"Button11Image"
+		"xpos"		"272"
+		"ypos"		"472"
+		"wide"		"256"
+		"tall"		"128"
+		"image"		"loadout/loadout_none"
+	}
 	"Button11"
 	{
 		"ControlName"		"Button"
 		"fieldName"		"Button11"
-		"xpos"		"10"
-		"ypos"		"325"
-		"wide"		"200"
-		"tall"		"25"
-		"autoResize"		"1"
-		"pinCorner"		"0"
+		"xpos"		"272"
+		"ypos"		"472"
+		"wide"		"256"
+		"tall"		"128"
+		"autoResize"		"0"
+		"pinCorner"		"0"
+		"RoundedCorners"		"15"
+		"pin_corner_to_sibling"		"0"
+		"pin_to_sibling_corner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
 		"tabPosition"		"0"
-		"labelText"		"Murata Supa-7"
-		"textAlignment"		"center"
-		"dulltext"		"0"
-		"brighttext"		"0"
-		"Font"		"Default"
-		"wrap"		"0"
-		"Command"		"loadout 10"
+		"labelText"		""
+		"command"		"loadout 10"
 		"Default"		"0"
 	}
+	"Button12Image"
+	{
+		"ControlName"		"ImagePanel"
+		"fieldName"		"Button12Image"
+		"xpos"		"536"
+		"ypos"		"472"
+		"wide"		"256"
+		"tall"		"128"
+		"image"		"loadout/loadout_none"
+	}
 	"Button12"
 	{
 		"ControlName"		"Button"
 		"fieldName"		"Button12"
-		"xpos"		"10"
-		"ypos"		"355"
-		"wide"		"200"
-		"tall"		"25"
-		"autoResize"		"1"
-		"pinCorner"		"0"
+		"xpos"		"536"
+		"ypos"		"472"
+		"wide"		"256"
+		"tall"		"128"
+		"autoResize"		"0"
+		"pinCorner"		"0"
+		"RoundedCorners"		"15"
+		"pin_corner_to_sibling"		"0"
+		"pin_to_sibling_corner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
 		"tabPosition"		"0"
-		"labelText"		"Mosok"
-		"textAlignment"		"center"
-		"dulltext"		"0"
-		"brighttext"		"0"
-		"Font"		"Default"
-		"wrap"		"0"
-		"Command"		"loadout 11"
+		"labelText"		""
+		"command"		"loadout 11"
 		"Default"		"0"
 	}
-	"Button13"
+	"ReturnButton"
 	{
 		"ControlName"		"Button"
-		"fieldName"		"Button13"
-		"xpos"		"10"
-		"ypos"		"385"
-		"wide"		"200"
-		"tall"		"25"
-		"autoResize"		"1"
+		"fieldName"		"ReturnButton"
+		"xpos"		"8"
+		"ypos"		"608"
+		"wide"		"256"
+		"tall"		"24"
+		"autoResize"		"0"
 		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
 		"tabPosition"		"0"
-		"labelText"		"Mosok (with scope)"
+		"labelText"		"<< CHANGE CLASS"
 		"textAlignment"		"center"
 		"dulltext"		"0"
-		"brighttext"		"0"
+		"brighttext"		"1"
 		"Font"		"Default"
 		"wrap"		"0"
-		"Command"		"loadout 12"
-		"Default"		"1"
-	}
-	"Button14"
-	{
-		"ControlName"		"Button"
-		"fieldName"		"Button14"
-		"xpos"		"10"
-		"ypos"		"415"
-		"wide"		"200"
-		"tall"		"25"
-		"autoResize"		"1"
-		"pinCorner"		"0"
-		"visible"		"0"
-		"enabled"		"0"
-		"tabPosition"		"0"
-		"textAlignment"		"center"
-		"dulltext"		"0"
-		"brighttext"		"0"
-		"Font"		"Default"
-		"wrap"		"0"
-		"Command"		"loadout 13"
+		"Command"		"classmenu"
 		"Default"		"0"
 	}
-//	"Weapon_ImagePanel"
-//	{
-//		"ControlName"		"ImagePanel"
-//		"fieldName"		"Weapon_ImagePanel"
-//		"xpos"		"220"
-//		"ypos"		"25"
-//		"wide"		"620"
-//		"tall"		"385"
-//		"autoResize"		"1"
-//		"pinCorner"		"0"
-//		"visible"		"1"
-//		"enabled"		"1"
-//		"tabPosition"		"0"
-//		"image"		"vgui/loadout/none"
-//		"scaleImage"		"0"
-//	}	
-	"BuildModeDialog"
-	{
-		"ControlName"		"BuildModeDialog"
-		"fieldName"		"BuildModeDialog"
-		"xpos"		"33"
-		"ypos"		"60"
-		"wide"		"300"
-		"tall"		"420"
-		"autoResize"		"1"
-		"pinCorner"		"0"
-		"visible"		"1"
-		"enabled"		"1"
-		"tabPosition"		"0"
-		"settitlebarvisible"		"1"
-		"title"		"#Frame_Untitled"
-	}
 }
diff --git a/mp/game/neo/resource/neo_ui/Neo_TeamMenu.res b/mp/game/neo/resource/neo_ui/Neo_TeamMenu.res
index e60aa0c25..ec78ba21c 100644
--- a/mp/game/neo/resource/neo_ui/Neo_TeamMenu.res
+++ b/mp/game/neo/resource/neo_ui/Neo_TeamMenu.res
@@ -1,27 +1,76 @@
-"Resource/UI/TeamMenu.res"
+"resource/neo_ui/Neo_TeamMenu.res"
 {
 	"team"
 	{
-		"ControlName"		"CNeoTeamMenu"
-		"fieldName"		"team"
-		"xpos"		"332"
-		"ypos"		"276"
-		"wide"		"360"
-		"tall"		"215"
+		"ControlName"			"CNeoTeamMenu"
+		"fieldName"				"team"
+		"xpos"					"cs-0.5"
+		"ypos"					"cs-0.5"
+		"wide"					"360"
+		"tall"					"215"
+		"autoResize"			"0"
+		"pinCorner"				"0"
+		"visible"				"1"
+		"enabled"				"1"
+		"tabPosition"			"0"
+		"settitlebarvisible"	"0"
+		"BgColor"				"0 0 0 0"
+	}
+	"ngui_corner"
+	{
+		"ControlName"		"ImagePanel"
+		"fieldName"		"ngui_corner"
+		"xpos"		"0"
+		"ypos"		"0"
+		"wide"		"16"
+		"tall"		"16"
+		"autoResize"		"0"
+		"pinCorner"		"0"
+		"visible"		"1"
+		"enabled"		"1"
+		"tabPosition"		"0"
+		"image"		"ngui_corner"
+		"scaleImage"		"0"
+	}
+	"title_bar"
+	{
+		"ControlName"		"ImagePanel"
+		"fieldName"		"title_bar"
+		"xpos"		"16"
+		"ypos"		"0"
+		"wide"		"344"
+		"tall"		"16"
 		"autoResize"		"0"
 		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
 		"tabPosition"		"0"
-		"settitlebarvisible"		"0"
-		"title"		"#Frame_Untitled"
+		"image"		"ngui_titlebar"
+		"fillcolor"		"black"
+		"scaleImage"		"1"
+	}
+	"background"
+	{
+		"ControlName"		"ImagePanel"
+		"fieldName"		"background"
+		"xpos"		"0"
+		"ypos"		"16"
+		"wide"		"f"
+		"tall"		"199"
+		"autoResize"		"0"
+		"pinCorner"		"0"
+		"visible"		"1"
+		"enabled"		"1"
+		"tabPosition"		"0"
+		"image"		"ngui_body"
+		"scaleImage"		"1"
 	}
 	"neo_IconPanel1"
 	{
-		"ControlName"		"IconPanel"
+		"ControlName"		"ImagePanel"
 		"fieldName"		"neo_IconPanel1"
 		"xpos"		"10"
-		"ypos"		"17"
+		"ypos"		"18"
 		"wide"		"110"
 		"tall"		"110"
 		"autoResize"		"0"
@@ -29,12 +78,12 @@
 		"visible"		"1"
 		"enabled"		"1"
 		"tabPosition"		"0"
-		"image"		"vgui/jinrai_128tm"
+		"image"		"jinrai_128tm"
 		"scaleImage"		"1"
 	}
 	"neo_IconPanel2"
 	{
-		"ControlName"		"IconPanel"
+		"ControlName"		"ImagePanel"
 		"fieldName"		"neo_IconPanel2"
 		"xpos"		"125"
 		"ypos"		"18"
@@ -45,7 +94,7 @@
 		"visible"		"1"
 		"enabled"		"1"
 		"tabPosition"		"0"
-		"image"		"vgui/nsf_128tm"
+		"image"		"nsf_128tm"
 		"scaleImage"		"1"
 	}
 	"neo_Label1"
@@ -65,13 +114,13 @@
 		"textAlignment"		"east"
 		"dulltext"		"0"
 		"brighttext"		"0"
-		"font"		"NHudOCRSmall"
+		"font"		"DefaultBold"
 		"wrap"		"0"
 	}
-	"neo_IconPanel3"
+	"neo_IconPanel4"
 	{
-		"ControlName"		"IconPanel"
-		"fieldName"		"neo_IconPanel3"
+		"ControlName"		"ImagePanel"
+		"fieldName"		"neo_IconPanel4"
 		"xpos"		"10"
 		"ypos"		"166"
 		"wide"		"340"
@@ -81,8 +130,8 @@
 		"visible"		"1"
 		"enabled"		"1"
 		"tabPosition"		"0"
+		"image"		"darkgrey_background"
 		"fillcolor"		"black"
-		"image"			"vgui/darkgrey_background"
 		"scaleImage"		"1"
 	}
 	"neo_jplayercountlabel"
@@ -102,6 +151,7 @@
 		"textAlignment"		"west"
 		"dulltext"		"0"
 		"brighttext"		"0"
+		"font"		"DefaultBold"
 		"wrap"		"0"
 	}
 	"neo_jscorelabel"
@@ -117,10 +167,11 @@
 		"visible"		"1"
 		"enabled"		"1"
 		"tabPosition"		"0"
-		"labelText"		"SCORE:"
+		"labelText"		"SCORE:0"
 		"textAlignment"		"west"
 		"dulltext"		"0"
 		"brighttext"		"0"
+		"font"		"DefaultBold"
 		"wrap"		"0"
 	}
 	"neo_Divider1"
@@ -150,10 +201,11 @@
 		"visible"		"1"
 		"enabled"		"1"
 		"tabPosition"		"0"
-		"labelText"		"PLAYERS: 1"
+		"labelText"		"PLAYERS:0"
 		"textAlignment"		"west"
 		"dulltext"		"0"
 		"brighttext"		"0"
+		"font"		"DefaultBold"
 		"wrap"		"0"
 	}
 	"neo_nscorelabel"
@@ -169,10 +221,11 @@
 		"visible"		"1"
 		"enabled"		"1"
 		"tabPosition"		"0"
-		"labelText"		"SCORE:"
+		"labelText"		"SCORE:0"
 		"textAlignment"		"west"
 		"dulltext"		"0"
 		"brighttext"		"0"
+		"font"		"DefaultBold"
 		"wrap"		"0"
 	}
 	"neo_jinraibutton"
@@ -192,9 +245,9 @@
 		"textAlignment"		"center"
 		"dulltext"		"0"
 		"brighttext"		"0"
-		"font"		"NHudOCRSmall"
+		"font"		"DefaultBold"
 		"wrap"		"0"
-		"Command"		"jointeam 2"
+		"command"		"jointeam 2"
 		"Default"		"0"
 	}
 	"neo_nsfbutton"
@@ -214,9 +267,9 @@
 		"textAlignment"		"center"
 		"dulltext"		"0"
 		"brighttext"		"0"
-		"font"		"NHudOCRSmall"
+		"font"		"DefaultBold"
 		"wrap"		"0"
-		"Command"		"jointeam 3"
+		"command"		"jointeam 3"
 		"Default"		"0"
 	}
 	"neo_autobutton"
@@ -232,14 +285,14 @@
 		"visible"		"1"
 		"enabled"		"1"
 		"tabPosition"		"1"
-		"labelText"		"AUTO ASSIGN   "
+		"labelText"		"AUTO ASSIGN"
 		"textAlignment"		"center"
 		"dulltext"		"0"
 		"brighttext"		"0"
-		"font"		"NHudOCRSmall"
+		"font"		"DefaultBold"
 		"wrap"		"0"
-		"Command"		"jointeam 0"
-		"Default"		"1"
+		"command"		"jointeam a"
+		"Default"		"0"
 	}
 	"neo_specbutton"
 	{
@@ -254,13 +307,13 @@
 		"visible"		"1"
 		"enabled"		"1"
 		"tabPosition"		"2"
-		"labelText"		"SPECTATE  "
+		"labelText"		"SPECTATE"
 		"textAlignment"		"center"
 		"dulltext"		"0"
 		"brighttext"		"0"
-		"font"		"NHudOCRSmall"
+		"font"		"DefaultBold"
 		"wrap"		"0"
-		"Command"		"jointeam 1"
+		"command"		"jointeam 1"
 		"Default"		"0"
 	}
 	"neo_CancelButton"
@@ -276,13 +329,13 @@
 		"visible"		"1"
 		"enabled"		"1"
 		"tabPosition"		"0"
-		"labelText"		"CANCEL   "
+		"labelText"		"CANCEL"
 		"textAlignment"		"center"
 		"dulltext"		"0"
 		"brighttext"		"0"
-		"font"		"NHudOCRSmall"
+		"font"		"DefaultBold"
 		"wrap"		"0"
-		"Command"		"vguicancel"
-		"Default"		"0"
-	}	
+		"command"		"vguicancel"
+		"Default"		"1"
+	}
 }
diff --git a/mp/src/game/client/neo/c_neo_player.cpp b/mp/src/game/client/neo/c_neo_player.cpp
index 57c6b616c..64dc73195 100644
--- a/mp/src/game/client/neo/c_neo_player.cpp
+++ b/mp/src/game/client/neo/c_neo_player.cpp
@@ -75,6 +75,7 @@ IMPLEMENT_CLIENTCLASS_DT(C_NEO_Player, DT_NEO_Player, CNEO_Player)
 	RecvPropBool(RECVINFO(m_bInVision)),
 	RecvPropBool(RECVINFO(m_bHasBeenAirborneForTooLongToSuperJump)),
 	RecvPropBool(RECVINFO(m_bInAim)),
+	RecvPropBool(RECVINFO(m_bDroppedAnything)),
 
 	RecvPropTime(RECVINFO(m_flCamoAuxLastTime)),
 	RecvPropInt(RECVINFO(m_nVisionLastTick)),
@@ -122,22 +123,13 @@ class NeoLoadoutMenu_Cb : public ICommandCallback
 			return;
 		}
 
+		panel->SetProportional(false); // Fixes wrong menu size when in windowed mode, regardless of whether proportional is set to false in the res file (NEOWTF)
 		panel->ApplySchemeSettings(vgui::scheme()->GetIScheme(panel->GetScheme()));
 
-		int panelWide = 960, panelTall = 700, screenWide, screenTall;
-		surface()->GetScreenSize(screenWide, screenTall);
-		// Resize panel, but make sure it fits the resolution.
-		panel->SetSize(Min(screenWide, panelWide), Min(screenTall, panelTall));
-		panel->SetPos((screenWide / 2) - (panelWide / 2),
-			(screenTall / 2) - (panelTall / 2));
-
 		panel->SetMouseInputEnabled(true);
-		panel->SetKeyBoardInputEnabled(true);
+		//panel->SetKeyBoardInputEnabled(true);
 		panel->SetCursorAlwaysVisible(true);
 
-		panel->SetControlEnabled("Scout_Button", true);
-		panel->SetControlEnabled("Misc2", true);
-		panel->SetControlEnabled("Done_Button", true);
 		panel->SetControlEnabled("Button1", true);
 		panel->SetControlEnabled("Button2", true);
 		panel->SetControlEnabled("Button3", true);
@@ -150,8 +142,7 @@ class NeoLoadoutMenu_Cb : public ICommandCallback
 		panel->SetControlEnabled("Button10", true);
 		panel->SetControlEnabled("Button11", true);
 		panel->SetControlEnabled("Button12", true);
-		panel->SetControlEnabled("Button13", true);
-		panel->SetControlEnabled("Button14", true);
+		panel->SetControlEnabled("ReturnButton", true);
 
 		panel->MoveToFront();
 
@@ -193,18 +184,11 @@ class NeoClassMenu_Cb : public ICommandCallback
 			Warning("Couldn't find class panel\n");
 			return;
 		}
-
+		panel->SetProportional(false);
 		panel->ApplySchemeSettings(vgui::scheme()->GetIScheme(panel->GetScheme()));
 
-		int panelWide = 650, panelTall = 280, screenWide, screenTall;
-		surface()->GetScreenSize(screenWide, screenTall);
-		// Resize panel, but make sure it fits the resolution.
-		panel->SetSize(Min(screenWide, panelWide), Min(screenTall, panelTall));
-		panel->SetPos((screenWide / 2) - (panelWide / 2),
-			(screenTall / 2) - (panelTall / 2));
-
 		panel->SetMouseInputEnabled(true);
-		panel->SetKeyBoardInputEnabled(true);
+		//panel->SetKeyBoardInputEnabled(true);
 		panel->SetCursorAlwaysVisible(true);
 
 		panel->SetControlEnabled("Scout_Button", true);
@@ -248,18 +232,11 @@ class NeoTeamMenu_Cb : public ICommandCallback
 			return;
 		}
 
+		panel->SetProportional(false);
 		panel->ApplySchemeSettings(vgui::scheme()->GetIScheme(panel->GetScheme()));
 
-		int panelWide = 360, panelTall = 215, screenWide, screenTall;
-		panelWide *= 1.5; panelTall *= 1.5;
-		surface()->GetScreenSize(screenWide, screenTall);
-		// Resize panel, but make sure it fits the resolution.
-		panel->SetSize(Min(screenWide, panelWide), Min(screenTall, panelTall));
-		panel->SetPos((screenWide / 2) - (panelWide / 2),
-			(screenTall / 2) - (panelTall / 2));
-
 		panel->SetMouseInputEnabled(true);
-		panel->SetKeyBoardInputEnabled(true);
+		//panel->SetKeyBoardInputEnabled(true);
 		panel->SetCursorAlwaysVisible(true);
 
 		panel->SetControlEnabled("jinraibutton", true);
@@ -326,6 +303,7 @@ C_NEO_Player::C_NEO_Player()
 	m_bInThermOpticCamo = m_bInVision = false;
 	m_bHasBeenAirborneForTooLongToSuperJump = false;
 	m_bInAim = false;
+	m_bDroppedAnything = false;
 
 	m_pNeoPanel = NULL;
 
@@ -1033,6 +1011,7 @@ bool C_NEO_Player::ShouldDrawHL2StyleQuickHud(void)
 
 void C_NEO_Player::Weapon_Drop(C_NEOBaseCombatWeapon *pWeapon)
 {
+	m_bDroppedAnything = true;
 	Weapon_SetZoom(false);
 
 	if (pWeapon->IsGhost())
diff --git a/mp/src/game/client/neo/c_neo_player.h b/mp/src/game/client/neo/c_neo_player.h
index 10b6ebaee..c1136af58 100644
--- a/mp/src/game/client/neo/c_neo_player.h
+++ b/mp/src/game/client/neo/c_neo_player.h
@@ -193,6 +193,7 @@ class C_NEO_Player : public C_HL2MP_Player
 	CNetworkVar(bool, m_bLastTickInThermOpticCamo);
 	CNetworkVar(bool, m_bInVision);
 	CNetworkVar(bool, m_bInAim);
+	CNetworkVar(bool, m_bDroppedAnything);
 
 	CNetworkVar(int, m_iNeoClass);
 	CNetworkVar(int, m_iNeoSkin);
diff --git a/mp/src/game/client/neo/game_controls/neo_classmenu.cpp b/mp/src/game/client/neo/game_controls/neo_classmenu.cpp
index 7a1e89e23..b1f26e743 100644
--- a/mp/src/game/client/neo/game_controls/neo_classmenu.cpp
+++ b/mp/src/game/client/neo/game_controls/neo_classmenu.cpp
@@ -58,64 +58,81 @@ CNeoClassMenu *g_pNeoClassMenu = NULL;
 
 using namespace vgui;
 
+const char* playerModels[]{
+	"cm/jinrai_scout01",
+	"cm/jinrai_scout02",
+	"cm/jinrai_scout03",
+	"cm/jinrai_assault01",
+	"cm/jinrai_assault02",
+	"cm/jinrai_assault03",
+	"cm/jinrai_heavy01",
+	"cm/jinrai_heavy02",
+	"cm/jinrai_heavy03",
+	"cm/nsf_scout02",
+	"cm/nsf_scout03",
+	"cm/nsf_scout01",
+	"cm/nsf_assault01",
+	"cm/nsf_assault02",
+	"cm/nsf_assault03",
+	"cm/nsf_heavy01",
+	"cm/nsf_heavy02",
+	"cm/nsf_heavy03",
+};
+
 CNeoClassMenu::CNeoClassMenu(IViewPort *pViewPort)
 	: vgui::Frame(NULL, PANEL_CLASS)
 {
+	Assert(pViewPort);
 	// Quiet "parent not sized yet" spew
 	SetSize(10, 10);
 
-	m_pViewPort = pViewPort;
 	g_pNeoClassMenu = this;
 
 	m_bClassMenu = false;
 
-	// NEO TODO (Rain): It appears that original Neotokyo
-	// hardcodes its scheme. We probably need to make our
-	// own res definition file to mimic it.
-	SetScheme("ClientScheme");
+	LoadControlSettings(GetResFile());
+
+	SetPaintBorderEnabled(false);
+	SetPaintBackgroundEnabled(false);
+	SetBorder(NULL);
 
 	SetVisible(false);
-	SetProportional(true);
+	SetProportional(false);
 	SetMouseInputEnabled(true);
-	SetKeyBoardInputEnabled(true);
-
+	//SetKeyBoardInputEnabled(true); // Leaving here to highlight menu navigation with keyboard is possible atm
 	SetTitleBarVisible(false);
 
-	m_pImage_Jinrai_Recon_Skin1 = surface()->GetIconImageForFullPath("vgui/cm/jinrai_scout01");
-	m_pImage_Jinrai_Recon_Skin2 = surface()->GetIconImageForFullPath("vgui/cm/jinrai_scout02");
-	m_pImage_Jinrai_Recon_Skin3 = surface()->GetIconImageForFullPath("vgui/cm/jinrai_scout03");
-
-	m_pSkinPanel1 = new ImagePanel(this, "Model_ImagePanel");
-	m_pSkinPanel2 = new ImagePanel(this, "Model_ImagePanel2");
-	m_pSkinPanel3 = new ImagePanel(this, "Model_ImagePanel3");
-	m_pSkinPanel1->SetImage(m_pImage_Jinrai_Recon_Skin1);
-	m_pSkinPanel2->SetImage(m_pImage_Jinrai_Recon_Skin2);
-	m_pSkinPanel3->SetImage(m_pImage_Jinrai_Recon_Skin3);
-
-	m_pClassMenuLabel = new Label(this, "TitleLabel", "labelText");
-
-	m_pDivider = new Divider(this, "Divider1");
-
-	m_pRecon_Button = new Button(this, "Scout_Button", "labelText");
-	m_pAssault_Button = new Button(this, "Assault_Button", "labelText");
-	m_pSupport_Button = new Button(this, "Heavy_Button", "labelText");
-	m_pBack_Button = new Button(this, "Back_Button", "labelText");
-
-	m_pRecon_Button->AddActionSignalTarget(this);
-	m_pAssault_Button->AddActionSignalTarget(this);
-	m_pSupport_Button->AddActionSignalTarget(this);
-	m_pBack_Button->AddActionSignalTarget(this);
+	FindButtons();
+}
 
-	InvalidateLayout();
+CNeoClassMenu::~CNeoClassMenu()
+{
+	m_pSkinPanel1->SetAutoDelete(true);
+	m_pSkinPanel2->SetAutoDelete(true);
+	m_pSkinPanel3->SetAutoDelete(true);
+	m_pSkin1_Button->SetAutoDelete(true);
+	m_pSkin2_Button->SetAutoDelete(true);
+	m_pSkin3_Button->SetAutoDelete(true);
+	m_pRecon_Button->SetAutoDelete(true);
+	m_pAssault_Button->SetAutoDelete(true);
+	m_pSupport_Button->SetAutoDelete(true);
+	m_pBack_Button->SetAutoDelete(true);
 }
 
-inline Button *CNeoClassMenu::GetPressedButton()
+void CNeoClassMenu::FindButtons()
 {
-	if (m_pRecon_Button->IsCursorOver()) { return m_pRecon_Button; }
-	if (m_pAssault_Button->IsCursorOver()) { return m_pAssault_Button; }
-	if (m_pSupport_Button->IsCursorOver()) { return m_pSupport_Button; }
-	if (m_pBack_Button->IsCursorOver()) { return m_pBack_Button; }
-	return NULL;
+	m_pSkinPanel1 = FindControl<ImagePanel>("Model1_ImagePanel");
+	m_pSkinPanel2 = FindControl<ImagePanel>("Model2_ImagePanel");
+	m_pSkinPanel3 = FindControl<ImagePanel>("Model3_ImagePanel");
+	m_pSkin1_Button = FindControl<Button>("Skin1_Button");
+	m_pSkin2_Button = FindControl<Button>("Skin2_Button");
+	m_pSkin3_Button = FindControl<Button>("Skin3_Button");
+	m_pRecon_Button = FindControl<Button>("Scout_Button");
+	m_pAssault_Button = FindControl<Button>("Assault_Button");
+	m_pSupport_Button = FindControl<Button>("Heavy_Button");
+	m_pBack_Button = FindControl<Button>("Back_Button");
+
+	UpdateSkinImages(-1);
 }
 
 void CNeoClassMenu::CommandCompletion()
@@ -123,13 +140,16 @@ void CNeoClassMenu::CommandCompletion()
 	SetControlEnabled("Scout_Button", false);
 	SetControlEnabled("Assault_Button", false);
 	SetControlEnabled("Heavy_Button", false);
+	SetControlEnabled("Skin1_Button", false);
+	SetControlEnabled("Skin2_Button", false);
+	SetControlEnabled("Skin3_Button", false);
 	SetControlEnabled("Back_Button", false);
 
 	SetVisible(false);
 	SetEnabled(false);
 
 	SetMouseInputEnabled(false);
-	SetKeyBoardInputEnabled(false);
+	//SetKeyBoardInputEnabled(false);
 	SetCursorAlwaysVisible(false);
 }
 
@@ -137,81 +157,115 @@ void CNeoClassMenu::OnCommand(const char *command)
 {
 	BaseClass::OnCommand(command);
 
-	bool hasCompletedClassSelection = false;
+	if (*command == NULL)
+	{ // No command
+		return;
+	}
 
-	if (Q_stricmp(command, "PressButton"))
-	{
-		Button *pressedButton = GetPressedButton();
-		if (pressedButton)
-		{
-			hasCompletedClassSelection = true;
-
-			ShowPanel(false);
-
-			char buttonCmd[29];
-			COMPILE_TIME_ASSERT(sizeof(buttonCmd) == sizeof("playerstate_reverse;teammenu"));
-
-			if (pressedButton == m_pRecon_Button)
-			{
-				sprintf(buttonCmd, "setclass %i", 1);
-			}
-			else if (pressedButton == m_pAssault_Button)
-			{
-				sprintf(buttonCmd, "setclass %i", 2);
-			}
-			else if (pressedButton == m_pSupport_Button)
-			{
-				sprintf(buttonCmd, "setclass %i", 3);
-			}
-			else
-			{
-				Assert(pressedButton == m_pBack_Button);
-				V_strcpy_safe(buttonCmd, "playerstate_reverse");
-				hasCompletedClassSelection = false;
-			}
-
-			engine->ExecuteClientCmd(buttonCmd);
-
-			if (hasCompletedClassSelection)
-			{
-				C_NEO_Player* player = C_NEO_Player::GetLocalNEOPlayer();
-				if (player)
-				{
-					player->m_bShowClassMenu = false;
-				}
-				else
-				{
-					Assert(false);
-				}
-				engine->ClientCmd("loadoutmenu");
-			}
-		}
+	char commandBuffer[20]; // Needs to be large enough to hold longest command sent from this menu
+	V_strcpy_safe(commandBuffer, command);
+
+	if (Q_stristr(commandBuffer, "setclass") != 0)
+	{ // Picking class, stay on this screen
+		int classNumber = commandBuffer[9] - '1'; // Needed for skin images, 0 indexed, recon class is 1
+		UpdateSkinImages(classNumber);
+		engine->ClientCmd(commandBuffer);
+		return;
 	}
 
-	CommandCompletion();
+	if (Q_stristr(commandBuffer, "SetVariant") != 0)
+	{ // Picking variant, move onto loadout selection screen
+		engine->ClientCmd(command);
+		ChangeMenu("loadoutmenu");
+		engine->ClientCmd("loadoutmenu");
+		return;
+	}
+
+	if (Q_stristr(commandBuffer, "playerstate_reverse") != 0)
+	{ // Going back
+		engine->ClientCmd(command);
+		ChangeMenu("teammenu");
+		engine->ClientCmd("teammenu");
+		return;
+	}
+}
 
-	if (!hasCompletedClassSelection)
+void CNeoClassMenu::ChangeMenu(const char* menuName = NULL)
+{
+	CommandCompletion();
+	ShowPanel(false);
+	C_NEO_Player* player = C_NEO_Player::GetLocalNEOPlayer();
+	if (player)
 	{
-		C_NEO_Player* player = C_NEO_Player::GetLocalNEOPlayer();
-		if (player)
+		player->m_bShowClassMenu = false;
+		if (menuName == NULL)
 		{
-			player->m_bShowTeamMenu = true;
+			return;
 		}
-		else
+		if (Q_stricmp(menuName, "teammenu") == 0)
 		{
-			Assert(false);
+			player->m_bShowTeamMenu = true;
 		}
 	}
+	else
+	{
+		Assert(false);
+	}
 }
 
-void CNeoClassMenu::OnButtonPressed(KeyValues *data)
+void CNeoClassMenu::OnKeyCodeReleased(vgui::KeyCode code)
 {
-	Msg("Class button pressed\n");
-	KeyValuesDumpAsDevMsg(data);
+	switch (code) {
+	case 93: // F2 - Close the menu
+		ChangeMenu(NULL);
+		break;
+	case 2: // 1 - Pick Recon and go straight to loadout
+		UpdateSkinImages(0);
+		engine->ClientCmd("setclass 1");
+		/*engine->ClientCmd("loadoutmenu");		NEO FIXME If player picking loadout with keyboard probably doesn't care about skin should go straight to loadout menu but loadout menu opens before player class and even player wanted class updates resulting in missmatch of showed loadout. Should edit loadoutmenu command to take class parameter? Can't think of case where player picked class isn't accepted unless using max players per class plugin
+		ChangeMenu("loadoutmenu");*/
+		break;
+	case 3: // 2 - Pick Assault and go straight to loadout
+		UpdateSkinImages(1);
+		engine->ClientCmd("setclass 2");
+		/*engine->ClientCmd("loadoutmenu");		NEO FIXME ==
+		ChangeMenu("loadoutmenu");*/
+		break;
+	case 4: // 3 - Pick Support and go straight to loadout
+		UpdateSkinImages(2);
+		engine->ClientCmd("setclass 3");
+		/*engine->ClientCmd("loadoutmenu");		NEO FIXME ==
+		ChangeMenu("loadoutmenu");*/
+		break;
+	case 65: // Spacebar - Continue with currently selected class and skin (player is initialised with a default class and skin. If not need to set one here)
+		engine->ClientCmd("loadoutmenu");
+		ChangeMenu("loadoutmenu");
+		break;
+	}
+	// Ignore other Key presses
+	//BaseClass::OnKeyCodeReleased(code);
 }
 
-CNeoClassMenu::~CNeoClassMenu()
+void CNeoClassMenu::UpdateSkinImages(int classNumber = -1)
 {
+	C_NEO_Player* player = C_NEO_Player::GetLocalNEOPlayer();
+	if (!player)
+	{
+		return;
+	}
+	int teamNumber = player->GetTeamNumber() - 2;
+	if (teamNumber < 0 || teamNumber>1)
+	{ // player hasn't joined jinrai or nsf yet, do not update images
+		return;
+	}
+	if (classNumber == -1)
+	{ // player hasn't picked a class yet, work out what class he is by default
+		classNumber = player->m_iNeoClass.Get();
+	}
+
+	m_pSkinPanel1->SetImage(playerModels[teamNumber * 9 + (classNumber * 3) + 0]);
+	m_pSkinPanel2->SetImage(playerModels[teamNumber * 9 + (classNumber * 3) + 1]);
+	m_pSkinPanel3->SetImage(playerModels[teamNumber * 9 + (classNumber * 3) + 2]);
 }
 
 void CNeoClassMenu::OnMessage(const KeyValues *params, VPANEL fromPanel)
@@ -227,47 +281,43 @@ void CNeoClassMenu::OnMousePressed(vgui::MouseCode code)
 void CNeoClassMenu::ApplySchemeSettings(vgui::IScheme *pScheme)
 {
     BaseClass::ApplySchemeSettings(pScheme);
-
     LoadControlSettings(GetResFile());
+	SetPaintBorderEnabled(false);
+	SetPaintBackgroundEnabled(false);
+	SetBorder(NULL);
 
-	SetBgColor(Color(0, 0, 0, 196));
-
-    const char *font = "Default";
-
-    m_pRecon_Button->SetFont(pScheme->GetFont(font, IsProportional()));
-    m_pAssault_Button->SetFont(pScheme->GetFont(font, IsProportional()));
-    m_pSupport_Button->SetFont(pScheme->GetFont(font, IsProportional()));
-    m_pBack_Button->SetFont(pScheme->GetFont(font, IsProportional()));
+	FindButtons();
 
     m_pRecon_Button->SetUseCaptureMouse(true);
-    m_pRecon_Button->SetSelectedColor(Color(255, 0, 0), Color(0, 0, 0));
-    m_pRecon_Button->SetArmedColor(Color(0, 255, 0), Color(0, 0, 0));
     m_pRecon_Button->SetMouseInputEnabled(true);
     m_pRecon_Button->InstallMouseHandler(this);
 
     m_pAssault_Button->SetUseCaptureMouse(true);
-    m_pAssault_Button->SetSelectedColor(Color(255, 0, 0), Color(0, 0, 0));
-    m_pAssault_Button->SetArmedColor(Color(0, 255, 0), Color(0, 0, 0));
     m_pAssault_Button->SetMouseInputEnabled(true);
     m_pAssault_Button->InstallMouseHandler(this);
 
     m_pSupport_Button->SetUseCaptureMouse(true);
-    m_pSupport_Button->SetSelectedColor(Color(255, 0, 0), Color(0, 0, 0));
-    m_pSupport_Button->SetArmedColor(Color(0, 255, 0), Color(0, 0, 0));
     m_pSupport_Button->SetMouseInputEnabled(true);
     m_pSupport_Button->InstallMouseHandler(this);
 
+	m_pSkin1_Button->SetUseCaptureMouse(true);
+	m_pSkin1_Button->SetMouseInputEnabled(true);
+	m_pSkin1_Button->InstallMouseHandler(this);
+
+	m_pSkin2_Button->SetUseCaptureMouse(true);
+	m_pSkin2_Button->SetMouseInputEnabled(true);
+	m_pSkin2_Button->InstallMouseHandler(this);
+
+	m_pSkin3_Button->SetUseCaptureMouse(true);
+	m_pSkin3_Button->SetMouseInputEnabled(true);
+	m_pSkin3_Button->InstallMouseHandler(this);
+
     m_pBack_Button->SetUseCaptureMouse(true);
-    m_pBack_Button->SetSelectedColor(Color(255, 0, 0), Color(0, 0, 0));
-    m_pBack_Button->SetArmedColor(Color(0, 255, 0), Color(0, 0, 0));
     m_pBack_Button->SetMouseInputEnabled(true);
     m_pBack_Button->InstallMouseHandler(this);
 
-    SetPaintBorderEnabled(false);
-
-    SetBorder( NULL );
-
-	SetMinimumSize(950, 450);
+	UpdateSkinImages();
+	InvalidateLayout();
 }
 
 void CNeoClassMenu::MoveLabelToFront(const char *textEntryName)
diff --git a/mp/src/game/client/neo/game_controls/neo_classmenu.h b/mp/src/game/client/neo/game_controls/neo_classmenu.h
index 22d842976..021f1f9b2 100644
--- a/mp/src/game/client/neo/game_controls/neo_classmenu.h
+++ b/mp/src/game/client/neo/game_controls/neo_classmenu.h
@@ -33,8 +33,6 @@ class CNeoClassMenu : public vgui::Frame,
 {
     DECLARE_CLASS_SIMPLE( CNeoClassMenu, vgui::Frame );
 
-    MESSAGE_FUNC_PARAMS(OnButtonPressed, "PressButton", data);
-
 public:
     CNeoClassMenu(IViewPort *pViewPort);
     virtual ~CNeoClassMenu();
@@ -66,10 +64,14 @@ class CNeoClassMenu : public vgui::Frame,
 
 protected:
     void OnCommand(const char *command);
+    void ChangeMenu(const char *menuName);
+    void OnKeyCodeReleased(vgui::KeyCode code);
 
     void SetLabelText(const char *textEntryName, const char *text);
 	void SetLabelText(const char *textEntryName, wchar_t *text);
 	void MoveLabelToFront(const char *textEntryName);
+	void FindButtons();
+	void UpdateSkinImages(int classNumber);
 	void UpdateTimer() { }
 
     // vgui overrides
@@ -80,57 +82,26 @@ class CNeoClassMenu : public vgui::Frame,
     // Menu pieces. These are defined in the GetResFile() file.
     // --------------------------------------------------------
 
-	vgui::IImage *m_pImage_Jinrai_Recon_Skin1;
-	vgui::IImage *m_pImage_Jinrai_Recon_Skin2;
-	vgui::IImage *m_pImage_Jinrai_Recon_Skin3;
-	vgui::IImage *m_pImage_Jinrai_Assault_Skin1;
-	vgui::IImage *m_pImage_Jinrai_Assault_Skin2;
-	vgui::IImage *m_pImage_Jinrai_Assault_Skin3;
-	vgui::IImage *m_pImage_Jinrai_Support_Skin1;
-	vgui::IImage *m_pImage_Jinrai_Support_Skin2;
-	vgui::IImage *m_pImage_Jinrai_Support_Skin3;
-	vgui::IImage *m_pImage_NSF_Recon_Skin1;
-	vgui::IImage *m_pImage_NSF_Recon_Skin2;
-	vgui::IImage *m_pImage_NSF_Recon_Skin3;
-	vgui::IImage *m_pImage_NSF_Assault_Skin1;
-	vgui::IImage *m_pImage_NSF_Assault_Skin2;
-	vgui::IImage *m_pImage_NSF_Assault_Skin3;
-	vgui::IImage *m_pImage_NSF_Support_Skin1;
-	vgui::IImage *m_pImage_NSF_Support_Skin2;
-	vgui::IImage *m_pImage_NSF_Support_Skin3;
-
     // Image panels
     vgui::ImagePanel *m_pSkinPanel1;
     vgui::ImagePanel *m_pSkinPanel2;
     vgui::ImagePanel *m_pSkinPanel3;
-	vgui::ImagePanel *m_pChooseClassIcon;
-	vgui::ImagePanel *m_pChooseChooseSkinIcon;
-
-    // Class menu label
-    vgui::Label *m_pClassMenuLabel;
-
-    // Divider
-    vgui::Divider *m_pDivider;
 
     // Buttons
     vgui::Button *m_pRecon_Button;
     vgui::Button *m_pAssault_Button;
     vgui::Button *m_pSupport_Button;
+	vgui::Button *m_pSkin1_Button;
+	vgui::Button *m_pSkin2_Button;
+	vgui::Button *m_pSkin3_Button;
     vgui::Button *m_pBack_Button;
 
-    // Our viewport interface accessor
-    IViewPort *m_pViewPort;
-
     // Which class to highlight for auto selection
     int m_iDefaultClass;
-
     bool m_bClassMenu;
 
 protected:
 	void CommandCompletion();
-
-private:
-    inline vgui::Button *GetPressedButton();
 };
 
 extern CNeoClassMenu *g_pNeoClassMenu;
diff --git a/mp/src/game/client/neo/game_controls/neo_loadoutmenu.cpp b/mp/src/game/client/neo/game_controls/neo_loadoutmenu.cpp
index ce99a3ae8..627ad96ac 100644
--- a/mp/src/game/client/neo/game_controls/neo_loadoutmenu.cpp
+++ b/mp/src/game/client/neo/game_controls/neo_loadoutmenu.cpp
@@ -12,6 +12,7 @@
 
 #include "c_neo_player.h"
 #include "weapon_neobasecombatweapon.h"
+#include "neo_weapon_loadout.h"
 
 // memdbgon must be the last include file in a .cpp file!!!
 #include "tier0/memdbgon.h"
@@ -19,9 +20,6 @@
 using namespace vgui;
 
 // These are defined in the .res file
-#define CONTROL_SCOUT_BUTTON "Scout_Button"
-#define CONTROL_MISC2_BUTTON "Misc2"
-#define CONTROL_DONE_BUTTON "Done_Button"
 #define CONTROL_BUTTON1 "Button1"
 #define CONTROL_BUTTON2 "Button2"
 #define CONTROL_BUTTON3 "Button3"
@@ -34,13 +32,23 @@ using namespace vgui;
 #define CONTROL_BUTTON10 "Button10"
 #define CONTROL_BUTTON11 "Button11"
 #define CONTROL_BUTTON12 "Button12"
-#define CONTROL_BUTTON13 "Button13"
-#define CONTROL_BUTTON14 "Button14"
+
+#define IMAGE_BUTTON1 "Button1Image"
+#define IMAGE_BUTTON2 "Button2Image"
+#define IMAGE_BUTTON3 "Button3Image"
+#define IMAGE_BUTTON4 "Button4Image"
+#define IMAGE_BUTTON5 "Button5Image"
+#define IMAGE_BUTTON6 "Button6Image"
+#define IMAGE_BUTTON7 "Button7Image"
+#define IMAGE_BUTTON8 "Button8Image"
+#define IMAGE_BUTTON9 "Button9Image"
+#define IMAGE_BUTTON10 "Button10Image"
+#define IMAGE_BUTTON11 "Button11Image"
+#define IMAGE_BUTTON12 "Button12Image"
+
+#define concat(first, second) first second
 
 static const char *szButtons[] = {
-    CONTROL_SCOUT_BUTTON,
-    CONTROL_MISC2_BUTTON,
-    CONTROL_DONE_BUTTON,
     CONTROL_BUTTON1,
     CONTROL_BUTTON2,
     CONTROL_BUTTON3,
@@ -53,8 +61,20 @@ static const char *szButtons[] = {
     CONTROL_BUTTON10,
     CONTROL_BUTTON11,
     CONTROL_BUTTON12,
-    CONTROL_BUTTON13,
-    CONTROL_BUTTON14,
+};
+static const char* szButtonImages[] = {
+	IMAGE_BUTTON1,
+	IMAGE_BUTTON2,
+	IMAGE_BUTTON3,
+	IMAGE_BUTTON4,
+	IMAGE_BUTTON5,
+	IMAGE_BUTTON6,
+	IMAGE_BUTTON7,
+	IMAGE_BUTTON8,
+	IMAGE_BUTTON9,
+	IMAGE_BUTTON10,
+	IMAGE_BUTTON11,
+	IMAGE_BUTTON12,
 };
 
 const int iNumButtonStrings = ARRAYSIZE(szButtons);
@@ -66,13 +86,10 @@ Panel *NeoLoadout_Factory()
 
 DECLARE_BUILD_FACTORY_CUSTOM(CNeoLoadoutMenu, NeoLoadout_Factory);
 
-CNeoLoadoutMenu *g_pNeoLoadoutMenu = NULL;
-
 CNeoLoadoutMenu::CNeoLoadoutMenu(IViewPort *pViewPort)
 	: BaseClass(NULL, PANEL_NEO_LOADOUT)
 {
 	Assert(pViewPort);
-
 	// Quiet "parent not sized yet" spew
 	SetSize(10, 10);
 
@@ -80,34 +97,40 @@ CNeoLoadoutMenu::CNeoLoadoutMenu(IViewPort *pViewPort)
 
 	m_bLoadoutMenu = false;
 
-	// NEO TODO (Rain): It appears that original Neotokyo
-	// hardcodes its scheme. We probably need to make our
-	// own res definition file to mimic it.
-	const char *schemeName = "ClientScheme";
-
-	vgui::HScheme neoscheme = vgui::scheme()->LoadSchemeFromFileEx(
-		enginevgui->GetPanel(VGuiPanel_t::PANEL_CLIENTDLL), GetResFile(), schemeName);
-
-	vgui::IScheme *pScheme = vgui::scheme()->GetIScheme(neoscheme);
-
 	LoadControlSettings(GetResFile());
 
+	SetPaintBorderEnabled(false);
+	SetPaintBackgroundEnabled(false);
+	SetBorder(NULL);
+
 	SetVisible(false);
-	SetProportional(true);
+	SetProportional(false);
 	SetMouseInputEnabled(true);
-	SetKeyBoardInputEnabled(true);
-
+	//SetKeyBoardInputEnabled(true); // Leaving here to highlight menu navigation with keyboard is possible atm
 	SetTitleBarVisible(false);
+	
+	FindButtons();
+}
 
-	m_pWeapon_ImagePanel = new ImagePanel(this, "Weapon_ImagePanel");
-	m_pWeapon_ImagePanel->SetAutoDelete(true);
-
-	m_pTitleLabel = new Label(this, "TitleLabel", "labelText");
-	m_pTitleLabel->SetAutoDelete(true);
+CNeoLoadoutMenu::~CNeoLoadoutMenu()
+{
+	m_pButton1->SetAutoDelete(true);
+	m_pButton2->SetAutoDelete(true);
+	m_pButton3->SetAutoDelete(true);
+	m_pButton4->SetAutoDelete(true);
+	m_pButton5->SetAutoDelete(true);
+	m_pButton6->SetAutoDelete(true);
+	m_pButton7->SetAutoDelete(true);
+	m_pButton8->SetAutoDelete(true);
+	m_pButton9->SetAutoDelete(true);
+	m_pButton10->SetAutoDelete(true);
+	m_pButton11->SetAutoDelete(true);
+	m_pButton12->SetAutoDelete(true);
+	returnButton->SetAutoDelete(true);
+}
 
-	m_pScout_Button = FindControl<Button>(CONTROL_SCOUT_BUTTON);
-	m_pMisc2 = FindControl<Button>(CONTROL_MISC2_BUTTON);
-	m_pDone_Button = FindControl<Button>(CONTROL_DONE_BUTTON);
+void CNeoLoadoutMenu::FindButtons()
+{
 	m_pButton1 = FindControl<Button>(CONTROL_BUTTON1);
 	m_pButton2 = FindControl<Button>(CONTROL_BUTTON2);
 	m_pButton3 = FindControl<Button>(CONTROL_BUTTON3);
@@ -120,18 +143,11 @@ CNeoLoadoutMenu::CNeoLoadoutMenu(IViewPort *pViewPort)
 	m_pButton10 = FindControl<Button>(CONTROL_BUTTON10);
 	m_pButton11 = FindControl<Button>(CONTROL_BUTTON11);
 	m_pButton12 = FindControl<Button>(CONTROL_BUTTON12);
-	m_pButton13 = FindControl<Button>(CONTROL_BUTTON13);
-	m_pButton14 = FindControl<Button>(CONTROL_BUTTON14);
-
-	const char *fontName = "Default";
-	auto fontHandle = pScheme->GetFont(fontName, IsProportional());
-
-	const Color selectedBgColor(0, 0, 0), selectedFgColor(255, 0, 0),
-		armedBgColor(0, 0, 0), armedFgColor(0, 255, 0);
+	returnButton = FindControl<Button>("ReturnButton");
 
-    for (int i = 0; i < iNumButtonStrings; i++)
+	for (int i = 0; i < iNumButtonStrings; i++)
 	{
-        auto button = FindControl<Button>(szButtons[i]);
+		auto button = FindControl<Button>(szButtons[i]); // Duplicate FindControl NEO FIXME
 
 		if (!button)
 		{
@@ -140,25 +156,16 @@ CNeoLoadoutMenu::CNeoLoadoutMenu(IViewPort *pViewPort)
 			continue;
 		}
 
-		button->AddActionSignalTarget(this);
-		button->SetAutoDelete(true);
-
-		button->SetFont(fontHandle);
-
 		button->SetUseCaptureMouse(true);
-		button->SetSelectedColor(selectedFgColor, selectedBgColor);
-		button->SetArmedColor(armedFgColor, armedBgColor);
 		button->SetMouseInputEnabled(true);
-		button->InstallMouseHandler(this);
 	}
 
-	InvalidateLayout();
-
-	g_pNeoLoadoutMenu = this;
-}
-
-CNeoLoadoutMenu::~CNeoLoadoutMenu()
-{
+	returnButton->SetUseCaptureMouse(true);
+	returnButton->SetMouseInputEnabled(true);
+	if (!returnButton)
+	{
+		Assert(false);
+	}
 }
 
 void CNeoLoadoutMenu::CommandCompletion()
@@ -176,6 +183,8 @@ void CNeoLoadoutMenu::CommandCompletion()
 
 		button->SetEnabled(false);
 	}
+	
+	returnButton->SetEnabled(false);
 
 	SetVisible(false);
 	SetEnabled(false);
@@ -220,44 +229,6 @@ extern ConCommand loadoutmenu;
 
 extern ConVar neo_sv_ignore_wep_xp_limit;
 
-static bool IsAllowedGun(const int loadoutId, const int currentXP)
-{
-	if (neo_sv_ignore_wep_xp_limit.GetBool())
-	{
-		return true;
-	}
-
-	// NEO TODO (Rain): set reasonably
-	const int xpLimits[] = {
-		-255,	// MPN
-		0,		// SRM
-		0,		// SRM-S
-		0,		// Jitte
-		0,		// Jittescoped
-		0,		// ZR68C
-		0,		// ZR68S
-		0,		// ZR68L
-		10,		// MX
-		20,		// PZ
-		10,		// Supa7
-		0,		// M41
-		0,		// M41L
-	};
-
-	bool allowedThisGun = false;
-
-	if (loadoutId < 0 || loadoutId > ARRAYSIZE(xpLimits))
-	{
-		DevWarning("Weapon choice out of XP check range: %i\n", loadoutId);
-	}
-	else
-	{
-		allowedThisGun = (currentXP >= xpLimits[loadoutId]);
-	}
-
-	return allowedThisGun;
-}
-
 void CNeoLoadoutMenu::OnCommand(const char* command)
 {
 	BaseClass::OnCommand(command);
@@ -267,152 +238,134 @@ void CNeoLoadoutMenu::OnCommand(const char* command)
 		return;
 	}
 
-	bool allowedThisGun = false;
-	CUtlStringList loadoutArgs;
-	V_SplitString(command, " ", loadoutArgs);
+	if (Q_stristr(command, "classmenu"))
+	{ // return to class selection 
+		CommandCompletion();
+		ChangeMenu("classmenu");
+		engine->ClientCmd(command);
+		return;
+	}
+
+	if (Q_stristr(command, "loadout "))
+	{ // set player loadout
+		CUtlStringList loadoutArgs;
+		V_SplitString(command, " ", loadoutArgs);
+
+		if (loadoutArgs.Size() != 2) {return;}
 
-	if (loadoutArgs.Size() == 2)
-	{
 		Q_StripPrecedingAndTrailingWhitespace(loadoutArgs[1]);
 		const int choiceNum = atoi(loadoutArgs[1]);
 
-		auto localplayer = C_NEO_Player::GetLocalNEOPlayer();
-		Assert(localplayer);
-		if (localplayer)
-		{
-			const int myXp = localplayer->m_iXP;
-			allowedThisGun = IsAllowedGun(choiceNum, myXp);
+		bool isDev = false;
+		auto localPlayer = C_NEO_Player::GetLocalNEOPlayer();
+		if (!localPlayer) { return; }
 
-			if (!allowedThisGun)
-			{
+		int currentXP = localPlayer->m_iXP.Get();
+		int currentClass = localPlayer->m_iNextSpawnClassChoice.Get() != -1 ? localPlayer->m_iNextSpawnClassChoice.Get() : localPlayer->m_iNeoClass.Get();
+		int numWeapons = CNEOWeaponLoadout::GetNumberOfLoadoutWeapons(currentXP, currentClass, isDev);
+			
+		if (choiceNum+1 > numWeapons)
+		{
 #define INSUFFICIENT_LOADOUT_XP_MSG "Insufficient XP for equipping this loadout!\n"
-				Msg(INSUFFICIENT_LOADOUT_XP_MSG);
-				engine->Con_NPrintf(0, INSUFFICIENT_LOADOUT_XP_MSG);
-			}
+			Msg(INSUFFICIENT_LOADOUT_XP_MSG);
+			engine->Con_NPrintf(0, INSUFFICIENT_LOADOUT_XP_MSG);
+			engine->ClientCmd(loadoutmenu.GetName());
+		}else
+		{
+			engine->ClientCmd(command);
 		}
+
 	}
+	CommandCompletion();
+}
+
 
-	if (allowedThisGun)
+void CNeoLoadoutMenu::ChangeMenu(const char* menuName = NULL)
+{
+	CommandCompletion();
+	ShowPanel(false);
+	C_NEO_Player* player = C_NEO_Player::GetLocalNEOPlayer();
+	if (player)
 	{
-		engine->ClientCmd(command);
+		m_bLoadoutMenu = false;
+		if (menuName == NULL)
+		{
+			return;
+		}
+		if (Q_stricmp(menuName, "classmenu") == 0)
+		{
+			player->m_bShowClassMenu = true;
+		}
 	}
 	else
 	{
-		engine->ClientCmd(loadoutmenu.GetName());
+		Assert(false);
 	}
+}
 
-	CommandCompletion();
+void CNeoLoadoutMenu::OnKeyCodeReleased(vgui::KeyCode code)
+{
+	switch (code) {
+	case 94: // F3 - Close the menu
+		ChangeMenu(NULL);
+	case 65: // Spacebar - Try to equip weapon in the second slot like in the base game
+		OnCommand("loadout 1");
+	}
+
+	// Ignore other Key presses
+	//BaseClass::OnKeyCodeReleased(code);
 }
 
 void CNeoLoadoutMenu::OnButtonPressed(KeyValues *data)
 {
-#if(0)
-	DevMsg("Loadout button pressed\n");
-	KeyValuesDumpAsDevMsg(data);
-#endif
 }
 
 void CNeoLoadoutMenu::ApplySchemeSettings(vgui::IScheme *pScheme)
 {
 	BaseClass::ApplySchemeSettings(pScheme);
-
-	if (!pScheme)
-	{
-		Assert(false);
-		Warning("Failed to ApplySchemeSettings for CNeoLoadoutMenu\n");
-		return;
-	}
-
-    const char *schemeName = "ClientScheme";
-
-    vgui::HScheme neoscheme = vgui::scheme()->LoadSchemeFromFileEx(
-        enginevgui->GetPanel(VGuiPanel_t::PANEL_CLIENTDLL), GetResFile(), schemeName);
-    if (!neoscheme)
-    {
-        Assert(false);
-        Warning("Failed to ApplySchemeSettings for CNeoLoadoutMenu\n");
-        return;
-    }
-
-    vgui::IScheme *scheme = vgui::scheme()->GetIScheme(neoscheme);
-    if (!scheme)
-    {
-        Assert(false);
-        Warning("Failed to ApplySchemeSettings for CNeoLoadoutMenu\n");
-        return;
-    }
-
 	LoadControlSettings(GetResFile());
+	SetPaintBorderEnabled(false);
+	SetPaintBackgroundEnabled(false);
+	SetBorder(NULL);
+	
+	// FindButtons(); Doing this further down for all enabled buttons
 
-	SetBgColor(Color(0, 0, 0, 196));
-
-	const Color selectedBgColor(75, 75, 75), selectedFgColor(255, 0, 0, 128),
-		armedBgColor(50, 50, 50, 128), armedFgColor(0, 255, 0, 128);
+	bool isDev = false;
+	auto localPlayer = C_NEO_Player::GetLocalNEOPlayer();
+	if (!localPlayer) { return; }
 
-	const char *font = "Default";
+	int currentXP = localPlayer->m_iXP.Get();
+	int currentClass = localPlayer->m_iNextSpawnClassChoice.Get() != -1 ? localPlayer->m_iNextSpawnClassChoice.Get() : localPlayer->m_iNeoClass.Get();
 
-    for (int i = 0; i < iNumButtonStrings; i++)
-	{
-        auto button = FindControl<Button>(szButtons[i]);
-
-		if (!button)
-		{
-			Assert(false);
-			continue;
-		}
-
-		auto str = button->GetCommand()->GetString("Command");
-		if (V_stristr(str, "loadout") > 0)
-		{
-			CUtlStringList loadoutArgs;
-			V_SplitString(str, " ", loadoutArgs);
-			if (loadoutArgs.Size() == 2)
-			{
-				Q_StripPrecedingAndTrailingWhitespace(loadoutArgs[1]);
-				const int loadoutId = atoi(loadoutArgs[1]);
-				if (loadoutId < NEO_WEP_LOADOUT_ID_COUNT)
-				{
-					auto localPlayer = C_NEO_Player::GetLocalNEOPlayer();
-					if (localPlayer)
-					{
-						if (!IsAllowedGun(loadoutId, localPlayer->m_iXP))
-						{
-							const char noxp[] = " -- [insufficient XP!]";
-							char wepname[48 + sizeof(noxp)];
-							button->GetText(wepname, sizeof(wepname));
-							V_strcat_safe(wepname, noxp);
-							button->SetText(wepname);
-
-							button->SetTextColorState(Label::EColorState::CS_DULL);
-							button->SetBgColor(COLOR_RED);
-						}
-						else
-						{
-							button->SetTextColorState(Label::EColorState::CS_NORMAL);
-							button->SetBgColor(COLOR_GREEN);
-						}
-					}
-
-					button->SetPaintBackgroundEnabled(true);
-				}
-			}
-			else
-			{
-				Assert(false);
-			}
-		}
-
-        button->SetFont(scheme->GetFont(font, IsProportional()));
+	int numWeapons = CNEOWeaponLoadout::GetNumberOfLoadoutWeapons(currentXP, currentClass, isDev);
+	int i = 0;
+	for (i; i < MIN(iNumButtonStrings,numWeapons); i++)
+	{ // update all available weapons
+		auto button = FindControl<Button>(szButtons[i]);
 		button->SetUseCaptureMouse(true);
-		button->SetSelectedColor(selectedFgColor, selectedBgColor);
-		button->SetArmedColor(armedFgColor, armedBgColor);
 		button->SetMouseInputEnabled(true);
-		button->InstallMouseHandler(this);
+
+		auto image = FindControl<ImagePanel>(szButtonImages[i]);
+		image->SetImage(CNEOWeaponLoadout::GetLoadoutVguiWeaponName(currentClass, i, isDev));
 	}
 
-	SetPaintBorderEnabled(false);
+	for (i; i < MIN(iNumButtonStrings, CNEOWeaponLoadout::GetTotalLoadoutSize(currentClass, isDev)); i++)
+	{ // update all locked weapons
+		auto button = FindControl<Button>(szButtons[i]);
+		const char* command = ("");
+		button->SetCommand(command);
 
-	SetBorder(NULL);
+		auto image = FindControl<ImagePanel>(szButtonImages[i]);
+		image->SetImage(CNEOWeaponLoadout::GetLoadoutVguiWeaponNameNo(currentClass, i, isDev));
+	}
+	for (i; i < iNumButtonStrings; i++)
+	{ // fill rest with dummy locked weapon
+		auto image = FindControl<ImagePanel>(szButtonImages[i]);
+		image->SetImage("loadout/loadout_none");
+	}
 
-	SetMinimumSize(1280, 1280);
+	returnButton = FindControl<Button>("ReturnButton");
+	returnButton->SetUseCaptureMouse(true);
+	returnButton->SetMouseInputEnabled(true);
+	InvalidateLayout();
 }
diff --git a/mp/src/game/client/neo/game_controls/neo_loadoutmenu.h b/mp/src/game/client/neo/game_controls/neo_loadoutmenu.h
index 4ada4ee36..6997a33af 100644
--- a/mp/src/game/client/neo/game_controls/neo_loadoutmenu.h
+++ b/mp/src/game/client/neo/game_controls/neo_loadoutmenu.h
@@ -46,10 +46,13 @@ class CNeoLoadoutMenu : public vgui::Frame, public IViewPortPanel
 
 protected:
 	void OnCommand(const char *command);
+	void ChangeMenu(const char* menuName);
+	void OnKeyCodeReleased(vgui::KeyCode code);
 
 	void SetLabelText(const char *textEntryName, const char *text);
 	void SetLabelText(const char *textEntryName, wchar_t *text);
 	void MoveLabelToFront(const char *textEntryName);
+	void FindButtons();
 	void UpdateTimer() { }
 
 	// vgui overrides
@@ -59,14 +62,6 @@ class CNeoLoadoutMenu : public vgui::Frame, public IViewPortPanel
 	// --------------------------------------------------------
 	// Menu pieces. These are defined in the GetResFile() file.
 	// --------------------------------------------------------
-
-	vgui::ImagePanel *m_pWeapon_ImagePanel;
-
-	vgui::Label *m_pTitleLabel;
-
-	vgui::Button *m_pScout_Button;
-	vgui::Button *m_pMisc2;
-	vgui::Button *m_pDone_Button;
 	vgui::Button *m_pButton1;
 	vgui::Button *m_pButton2;
 	vgui::Button *m_pButton3;
@@ -79,13 +74,11 @@ class CNeoLoadoutMenu : public vgui::Frame, public IViewPortPanel
 	vgui::Button *m_pButton10;
 	vgui::Button *m_pButton11;
 	vgui::Button *m_pButton12;
-	vgui::Button *m_pButton13;
-	vgui::Button *m_pButton14;
+	vgui::Button *returnButton;
 
 	// Our viewport interface accessor
 	IViewPort *m_pViewPort;
 
 	bool m_bLoadoutMenu;
 };
-
-#endif // NEO_LOADOUT_MENU_H
\ No newline at end of file
+#endif // NEO_LOADOUT_MENU_H
diff --git a/mp/src/game/client/neo/game_controls/neo_teammenu.cpp b/mp/src/game/client/neo/game_controls/neo_teammenu.cpp
index 657bf9cf8..29b0110c1 100644
--- a/mp/src/game/client/neo/game_controls/neo_teammenu.cpp
+++ b/mp/src/game/client/neo/game_controls/neo_teammenu.cpp
@@ -66,16 +66,12 @@ using namespace vgui;
 #define CONTROL_CANCEL_BUTTON "neo_CancelButton"
 #define CONTROL_JINRAI_IMAGE "neo_IconPanel1"
 #define CONTROL_NSF_IMAGE "neo_IconPanel2"
-#define CONTROL_BG_IMAGE "neo_IconPanel3"
 
-#define CONTROL_TEAM_MENU_LABEL "neo_Label1"
 #define CONTROL_JINRAI_PLAYERCOUNT_LABEL "neo_jplayercountlabel"
 #define CONTROL_NSF_PLAYERCOUNT_LABEL "neo_nplayercountlabel"
 #define CONTROL_JINRAI_SCORE_LABEL "neo_jscorelabel"
 #define CONTROL_NSF_SCORE_LABEL "neo_nscorelabel"
 
-#define CONTROL_DIVIDER "neo_Divider1"
-
 Panel *NeoTeam_Factory()
 {
 	return new CNeoTeamMenu(gViewPortInterface);
@@ -93,146 +89,27 @@ CNeoTeamMenu::CNeoTeamMenu(IViewPort *pViewPort)
 	: BaseClass(NULL, PANEL_TEAM)
 {
 	Assert(pViewPort);
-
 	// Quiet "parent not sized yet" spew
 	SetSize(10, 10);
 
-	m_pViewPort = pViewPort;
+	g_pNeoTeamMenu = this;
 
+	m_pViewPort = pViewPort;
 	m_bTeamMenu = false;
 
-	// NEO TODO (Rain): It appears that original Neotokyo
-	// hardcodes its scheme. We probably need to make our
-	// own res definition file to mimic it.
-	SetScheme("ClientScheme");
-
 	LoadControlSettings(GetResFile());
 
+	SetPaintBorderEnabled(false);
+	SetPaintBackgroundEnabled(false);
+	SetBorder(NULL);
+
 	SetVisible(false);
-	SetProportional(true);
+	SetProportional(false);
 	SetMouseInputEnabled(true);
-	SetKeyBoardInputEnabled(true);
-
+	//SetKeyBoardInputEnabled(true); // Leaving here to highlight menu navigation with keyboard is possible atm
 	SetTitleBarVisible(false);
 
-	m_pTeamMenuLabel = FindControl<Label>(CONTROL_TEAM_MENU_LABEL);
-	m_pJinrai_PlayercountLabel = FindControl<Label>(CONTROL_JINRAI_PLAYERCOUNT_LABEL);
-	m_pNSF_PlayercountLabel = FindControl<Label>(CONTROL_NSF_PLAYERCOUNT_LABEL);
-	m_pJinrai_ScoreLabel = FindControl<Label>(CONTROL_JINRAI_SCORE_LABEL);
-	m_pNSF_ScoreLabel = FindControl<Label>(CONTROL_NSF_SCORE_LABEL);
-
-	m_pJinrai_Button = FindControl<Button>(CONTROL_JINRAI_BUTTON);
-	m_pNSF_Button = FindControl<Button>(CONTROL_NSF_BUTTON);
-	m_pSpectator_Button = FindControl<Button>(CONTROL_SPEC_BUTTON);
-	m_pAutoAssign_Button = FindControl<Button>(CONTROL_AUTO_BUTTON);
-	m_pCancel_Button = FindControl<Button>(CONTROL_CANCEL_BUTTON);
-
-	// We probably failed to mount original NT VGUI assets if this triggers.
-#ifdef DEBUG
-	Assert(m_pTeamMenuLabel);
-	Assert(m_pJinrai_PlayercountLabel);
-	Assert(m_pNSF_PlayercountLabel);
-	Assert(m_pJinrai_ScoreLabel);
-	Assert(m_pNSF_ScoreLabel);
-
-	Assert(m_pJinrai_Button);
-	Assert(m_pNSF_Button);
-	Assert(m_pSpectator_Button);
-	Assert(m_pAutoAssign_Button);
-	Assert(m_pCancel_Button);
-#else
-	if (!(m_pTeamMenuLabel && m_pJinrai_PlayercountLabel && m_pNSF_PlayercountLabel &&
-		m_pJinrai_ScoreLabel && m_pNSF_ScoreLabel && m_pJinrai_Button && m_pNSF_Button &&
-		m_pSpectator_Button && m_pAutoAssign_Button && m_pCancel_Button))
-	{
-		// We should never be able to hit this line.
-		Error("Failed to load original Neotokyo VGUI elements! This is a bug, please report it.\n");
-	}
-#endif
-
-	m_pJinrai_PlayercountLabel->SetAutoResize(vgui::Panel::PinCorner_e::PIN_CENTER_LEFT, vgui::Panel::AutoResize_e::AUTORESIZE_RIGHT, 0, 0, 0, 0);
-	m_pJinrai_ScoreLabel->SetAutoResize(vgui::Panel::PinCorner_e::PIN_CENTER_LEFT, vgui::Panel::AutoResize_e::AUTORESIZE_RIGHT, 0, 0, 0, 0);
-	m_pNSF_PlayercountLabel->SetAutoResize(vgui::Panel::PinCorner_e::PIN_CENTER_RIGHT, vgui::Panel::AutoResize_e::AUTORESIZE_RIGHT, 0, 0, 0, 0);
-	m_pNSF_ScoreLabel->SetAutoResize(vgui::Panel::PinCorner_e::PIN_CENTER_RIGHT, vgui::Panel::AutoResize_e::AUTORESIZE_RIGHT, 0, 0, 0, 0);
-
-	m_pJinrai_TeamImage = FindControl<IconPanel>(CONTROL_JINRAI_IMAGE, true);
-	m_pNSF_TeamImage = FindControl<IconPanel>(CONTROL_NSF_IMAGE, true);
-	m_pBgDarkGrey = FindControl<IconPanel>(CONTROL_BG_IMAGE, true);
-
-	m_pDivider = FindControl<Divider>(CONTROL_DIVIDER);
-
-	if (!m_pJinrai_TeamImage)
-	{
-		m_pJinrai_TeamImage = new IconPanel(this, CONTROL_JINRAI_IMAGE);
-		Assert(m_pJinrai_TeamImage);
-
-		m_pJinrai_TeamImage->SetPos(10, 17);
-		m_pJinrai_TeamImage->SetSize(110, 110);
-		m_pJinrai_TeamImage->SetAutoResize(
-			vgui::Panel::PinCorner_e::PIN_TOPLEFT,
-			vgui::Panel::AutoResize_e::AUTORESIZE_NO,
-			0, 0, 0, 0);
-		m_pJinrai_TeamImage->SetEnabled(true);
-		m_pJinrai_TeamImage->SetTabPosition(0);
-		m_pJinrai_TeamImage->SetIcon("vgui/jinrai_128tm");
-	}
-
-	if (!m_pNSF_TeamImage)
-	{
-		m_pNSF_TeamImage = new IconPanel(this, CONTROL_NSF_IMAGE);
-		Assert(m_pNSF_TeamImage);
-
-		m_pNSF_TeamImage->SetPos(125, 18);
-		m_pNSF_TeamImage->SetSize(110, 110);
-		m_pNSF_TeamImage->SetAutoResize(
-			vgui::Panel::PinCorner_e::PIN_TOPLEFT,
-			vgui::Panel::AutoResize_e::AUTORESIZE_NO,
-			0, 0, 0, 0);
-		m_pNSF_TeamImage->SetEnabled(true);
-		m_pNSF_TeamImage->SetTabPosition(0);
-		m_pNSF_TeamImage->SetIcon("vgui/nsf_128tm");
-	}
-
-	if (!m_pBgDarkGrey)
-	{
-		m_pBgDarkGrey = new IconPanel(this, CONTROL_BG_IMAGE);
-		Assert(m_pBgDarkGrey);
-
-		m_pBgDarkGrey->SetPos(10, 166);
-		m_pBgDarkGrey->SetSize(340, 40);
-		m_pBgDarkGrey->SetAutoResize(
-			vgui::Panel::PinCorner_e::PIN_TOPLEFT,
-			vgui::Panel::AutoResize_e::AUTORESIZE_NO,
-			0, 0, 0, 0);
-		m_pBgDarkGrey->SetEnabled(true);
-		m_pBgDarkGrey->SetTabPosition(0);
-		m_pBgDarkGrey->SetIconColor(COLOR_BLACK);
-		m_pBgDarkGrey->SetIcon("vgui/darkgrey_background");
-	}
-
-#ifdef DEBUG
-	Assert(m_pJinrai_TeamImage);
-	Assert(m_pNSF_TeamImage);
-	Assert(m_pBgDarkGrey);
-
-	Assert(m_pDivider);
-#else
-	if (!(m_pJinrai_TeamImage && m_pNSF_TeamImage && m_pBgDarkGrey && m_pDivider))
-	{
-		// We should never be able to hit this line.
-		Error("Failed to load original Neotokyo VGUI elements! This is a bug, please report it.\n");
-	}
-#endif
-
-	m_pJinrai_Button->AddActionSignalTarget(this);
-	m_pNSF_Button->AddActionSignalTarget(this);
-	m_pSpectator_Button->AddActionSignalTarget(this);
-	m_pAutoAssign_Button->AddActionSignalTarget(this);
-	m_pCancel_Button->AddActionSignalTarget(this);
-
-	InvalidateLayout();
-
-	g_pNeoTeamMenu = this;
+	FindButtons();
 }
 
 CNeoTeamMenu::~CNeoTeamMenu()
@@ -241,12 +118,7 @@ CNeoTeamMenu::~CNeoTeamMenu()
 	m_pNSF_Button->RemoveActionSignalTarget(this);
 	m_pSpectator_Button->RemoveActionSignalTarget(this);
 	m_pAutoAssign_Button->RemoveActionSignalTarget(this);
-	m_pCancel_Button->RemoveActionSignalTarget(this);
-
-	// Make sure we deallocate all child elements
-	m_pJinrai_TeamImage->SetAutoDelete(true);
-	m_pNSF_TeamImage->SetAutoDelete(true);
-	m_pBgDarkGrey->SetAutoDelete(true);
+	m_pCancel_Button->RemoveActionSignalTarget(this); 
 
 	m_pJinrai_Button->SetAutoDelete(true);
 	m_pNSF_Button->SetAutoDelete(true);
@@ -257,52 +129,17 @@ CNeoTeamMenu::~CNeoTeamMenu()
 	g_pNeoTeamMenu = NULL;
 }
 
-void CNeoTeamMenu::Update()
+void CNeoTeamMenu::FindButtons()
 {
-#if(0)
-	int numPlayersJinrai = 0, numPlayersNSF = 0;
-
-	for (int i = 1; i <= gpGlobals->maxClients; i++)
-	{
-		auto player = UTIL_PlayerByIndex(i);
-
-		if (player)
-		{
-			int team = player->GetTeamNumber();
-
-			if (team == TEAM_JINRAI)
-			{
-				numPlayersJinrai++;
-			}
-			else if (team == TEAM_NSF)
-			{
-				numPlayersNSF++;
-			}
-		}
-	}
-
-	char textAscii[3]; // Support 2 chars + terminator
-	wchar_t textUnicode_Jinrai[sizeof(wchar_t) * sizeof(textAscii)];
-	wchar_t textUnicode_NSF[sizeof(wchar_t) * sizeof(textAscii)];
-
-	itoa(numPlayersJinrai, textAscii, sizeof(numPlayersJinrai));
-	g_pVGuiLocalize->ConvertANSIToUnicode(textAscii, textUnicode_Jinrai, sizeof(textUnicode_Jinrai));
-	m_pJinrai_PlayercountLabel->SetText(textUnicode_Jinrai);
-
-	itoa(numPlayersNSF, textAscii, sizeof(numPlayersNSF));
-	g_pVGuiLocalize->ConvertANSIToUnicode(textAscii, textUnicode_NSF, sizeof(textUnicode_NSF));
-	m_pNSF_PlayercountLabel->SetText(textUnicode_NSF);
-#endif
-}
-
-inline Button *CNeoTeamMenu::GetPressedButton()
-{
-	if (m_pJinrai_Button->IsCursorOver()) { return m_pJinrai_Button; }
-	if (m_pNSF_Button->IsCursorOver()) { return m_pNSF_Button; }
-	if (m_pSpectator_Button->IsCursorOver()) { return m_pSpectator_Button; }
-	if (m_pAutoAssign_Button->IsCursorOver()) { return m_pAutoAssign_Button; }
-	if (m_pCancel_Button->IsCursorOver()) { return m_pCancel_Button; }
-	return NULL;
+	m_pJinrai_PlayercountLabel = FindControl<Label>(CONTROL_JINRAI_PLAYERCOUNT_LABEL);
+	m_pNSF_PlayercountLabel = FindControl<Label>(CONTROL_NSF_PLAYERCOUNT_LABEL);
+	m_pJinrai_ScoreLabel = FindControl<Label>(CONTROL_JINRAI_SCORE_LABEL);
+	m_pNSF_ScoreLabel = FindControl<Label>(CONTROL_NSF_SCORE_LABEL);
+	m_pJinrai_Button = FindControl<Button>(CONTROL_JINRAI_BUTTON);
+	m_pNSF_Button = FindControl<Button>(CONTROL_NSF_BUTTON);
+	m_pSpectator_Button = FindControl<Button>(CONTROL_SPEC_BUTTON);
+	m_pAutoAssign_Button = FindControl<Button>(CONTROL_AUTO_BUTTON);
+	m_pCancel_Button = FindControl<Button>(CONTROL_CANCEL_BUTTON);
 }
 
 void CNeoTeamMenu::CommandCompletion()
@@ -332,104 +169,96 @@ void CNeoTeamMenu::OnCommand(const char *command)
 	char commandBuffer[11];
 	V_strcpy_safe(commandBuffer, command);
 
-	// As a bit of a hack, we assume "jointeam 0" means autoassign in this context,
-	// because that's how Neotokyo's .res file treats it.
-	if (Q_strcmp(commandBuffer, "jointeam 0") == 0)
-	{
-		int randomTeam = RandomInt(TEAM_JINRAI, TEAM_NSF);
+	if (Q_strcmp(commandBuffer, "jointeam a") == 0)
+	{ // pick a team automatically
+		auto pJinrai = GetGlobalTeam(TEAM_JINRAI);
+		auto pNsf = GetGlobalTeam(TEAM_NSF);
+		const int jinNumPlayers = (pJinrai != NULL ? pJinrai->Get_Number_Players() : 0);
+		const int nsfNumPlayers = (pNsf != NULL ? pNsf->Get_Number_Players() : 0);
+		int randomTeam = jinNumPlayers > nsfNumPlayers ? TEAM_NSF : (nsfNumPlayers > jinNumPlayers ? TEAM_JINRAI : RandomInt(TEAM_JINRAI, TEAM_NSF));
 		V_sprintf_safe(commandBuffer, "jointeam %i", randomTeam);
+		ChangeMenu("classmenu");
+		engine->ClientCmd(commandBuffer);
+		return;
+	}
+
+	if (Q_strcmp(commandBuffer, "jointeam 1") == 0)
+	{ // joining spectators
+		ChangeMenu(NULL);
+		engine->ClientCmd(commandBuffer);
+		return;
 	}
 
-	engine->ClientCmd(commandBuffer);
+	if (Q_strcmp(commandBuffer, "jointeam 0") == 0)
+	{ // joining unnasigned
+		ChangeMenu(NULL);
+		engine->ClientCmd(commandBuffer);
+		return;
+	}
 
-	bool proceedToClassSelection = (Q_stristr(commandBuffer, "jointeam") != 0);
+	if (Q_stristr(commandBuffer, "jointeam") != 0) // Note using stristr, not strcmp. Equates to true when jointeam in commandBuffer
+	{ // joining jinrai or nsf
+		ChangeMenu("classmenu");
+		engine->ClientCmd(commandBuffer);
+		return;
+	}
 
-	if (proceedToClassSelection)
+	if (Q_stricmp(commandBuffer, "vguicancel") == 0)
+	{ // cancel, close menu
+		ChangeMenu(NULL);
+	}
+	
+	// new command, should we sanitize and return without executing? (Players can edit button commands with ctrl-alt-shift-b) NEO FIXME
+	engine->ClientCmd(command);
+}
+
+void CNeoTeamMenu::ChangeMenu(const char* menuName = NULL)
+{
+	CommandCompletion();
+	ShowPanel(false);
+	C_NEO_Player* player = C_NEO_Player::GetLocalNEOPlayer();
+	if (player)
 	{
-		C_NEO_Player *player = C_NEO_Player::GetLocalNEOPlayer();
-		if (player)
+		player->m_bShowTeamMenu = false;
+		if (menuName == NULL)
 		{
-			player->m_bShowTeamMenu = false;
-			player->m_bShowClassMenu = true;
+			return;
 		}
-		else
+		if (Q_stricmp(menuName, "classmenu") == 0)
 		{
-			Assert(false);
+			player->m_bShowClassMenu = true;
 		}
 	}
-
-	CommandCompletion();
+	else
+	{
+		Assert(false);
+	}
 }
 
-void CNeoTeamMenu::OnButtonPressed(KeyValues *data)
-{
-#if(0)
-	KeyValuesDumpAsDevMsg(data);
-#endif
+void CNeoTeamMenu::OnKeyCodeReleased(vgui::KeyCode code)
+{ // Navigating using the keyboard hack
+	switch (code) {
+	case 92: // F1 - Close the menu
+		ChangeMenu(NULL);
+	}
+	// Leaving this here, useful to check what key is being pressed
+	/*char buffer[8] = "";
+	Q_snprintf(buffer, sizeof(buffer), "%i\n", code);
+	Msg(buffer);*/
+
+	// Ignore other Key presses
+	//BaseClass::OnKeyCodeReleased(code);
 }
 
 void CNeoTeamMenu::ApplySchemeSettings(vgui::IScheme *pScheme)
 {
     BaseClass::ApplySchemeSettings(pScheme);
+	LoadControlSettings(GetResFile());
+	SetPaintBorderEnabled(false);
+	SetPaintBackgroundEnabled(false);
+	SetBorder(NULL);
 
-	if (!pScheme)
-	{
-		Assert(false);
-		Warning("Failed to ApplySchemeSettings for CNeoTeamMenu\n");
-		return;
-	}
-
-    LoadControlSettings(GetResFile());
-
-	SetBgColor(Color(0, 0, 0, 196));
-
-	this->SetPos(332, 276);
-	this->SetSize(360, 215);
-
-	//vgui::HScheme neoScheme = vgui::scheme()->LoadSchemeFromFileEx(
-	//	enginevgui->GetPanel(PANEL_CLIENTDLL), "resource/ClientScheme_Neo.res", "ClientScheme_Neo");
-	//vgui::IScheme* neoIScheme = vgui::scheme()->GetIScheme(neoScheme);
-	//Assert(neoIScheme);
-	//
-	//const vgui::HFont font = neoIScheme->GetFont("BOOT", false);// IsProportional());
-	//Assert(font > 0);
-
-	Assert(m_pJinrai_Button);
-	Assert(m_pNSF_Button);
-	Assert(m_pSpectator_Button);
-	Assert(m_pAutoAssign_Button);
-	Assert(m_pCancel_Button);
-
-	//m_pJinrai_Button->SetFont(font);
-	//m_pNSF_Button->SetFont(font);
-	//m_pSpectator_Button->SetFont(font);
-	//m_pAutoAssign_Button->SetFont(font);
-	//// NEO FIXME (Rain): this line rarely throws; I have no idea why.
-	//// The assertions above are not hit when it occurs.
-	//m_pCancel_Button->SetFont(font);
-
-	//if (g_hFontJoinMenus == vgui::INVALID_FONT)
-	//{
-	//	auto pNeoKillfeedOverrideScheme = vgui::scheme()->GetIScheme(vgui::scheme()->
-	//		LoadSchemeFromFile("resource/ClientScheme_JoinMenus.res", "JoinMenus"));
-	//	Assert(pNeoKillfeedOverrideScheme);
-	//	if (pNeoKillfeedOverrideScheme)
-	//	{
-	//		g_hFontKillfeed = pNeoKillfeedOverrideScheme->GetFont("joinmenus");
-	//		Assert(g_hFontKillfeed != vgui::INVALID_FONT);
-	//	}
-	//}
-	//
-	//m_pJinrai_Button->SetFont(g_hFontKillfeed);
-
-	m_pJinrai_Button->SizeToContents();
-	m_pNSF_Button->SizeToContents();
-	m_pSpectator_Button->SizeToContents();
-	m_pAutoAssign_Button->SizeToContents();
-	m_pCancel_Button->SizeToContents();
-
-	const Color selectedBgColor(0, 0, 0), selectedFgColor(255, 0, 0),
-		armedBgColor(0, 0, 0), armedFgColor(0, 255, 0);
+	FindButtons();
 
 	const bool bUseCaptureMouse = true, bMouseInputEnabled = true;
 
@@ -451,24 +280,6 @@ void CNeoTeamMenu::ApplySchemeSettings(vgui::IScheme *pScheme)
 	m_pAutoAssign_Button	->InstallMouseHandler(this);
 	m_pCancel_Button		->InstallMouseHandler(this);
 
-	m_pJinrai_Button		->SetSelectedColor(selectedFgColor, selectedBgColor);
-	m_pNSF_Button			->SetSelectedColor(selectedFgColor, selectedBgColor);
-	m_pSpectator_Button		->SetSelectedColor(selectedFgColor, selectedBgColor);
-	m_pAutoAssign_Button	->SetSelectedColor(selectedFgColor, selectedBgColor);
-	m_pCancel_Button		->SetSelectedColor(selectedFgColor, selectedBgColor);
-
-	m_pJinrai_Button		->SetArmedColor(armedFgColor, armedBgColor);
-	m_pNSF_Button			->SetArmedColor(armedFgColor, armedBgColor);
-	m_pSpectator_Button		->SetArmedColor(armedFgColor, armedBgColor);
-	m_pAutoAssign_Button	->SetArmedColor(armedFgColor, armedBgColor);
-	m_pCancel_Button		->SetArmedColor(armedFgColor, armedBgColor);
-
-    SetPaintBorderEnabled(false);
-
-    SetBorder( NULL );
-
-	SetMinimumSize(900, 900);
-
 	auto pJinrai = GetGlobalTeam(TEAM_JINRAI);
 	auto pNsf = GetGlobalTeam(TEAM_NSF);
 
@@ -500,6 +311,7 @@ void CNeoTeamMenu::ApplySchemeSettings(vgui::IScheme *pScheme)
 	m_pNSF_ScoreLabel->SizeToContents();
 	m_pJinrai_PlayercountLabel->SizeToContents();
 	m_pNSF_PlayercountLabel->SizeToContents();
+	InvalidateLayout();
 }
 
 void CNeoTeamMenu::MoveLabelToFront(const char *textEntryName)
diff --git a/mp/src/game/client/neo/game_controls/neo_teammenu.h b/mp/src/game/client/neo/game_controls/neo_teammenu.h
index 19607d038..831d18215 100644
--- a/mp/src/game/client/neo/game_controls/neo_teammenu.h
+++ b/mp/src/game/client/neo/game_controls/neo_teammenu.h
@@ -10,6 +10,7 @@
 #include <vgui_controls/EditablePanel.h>
 #include <vgui_controls/Button.h>
 #include <vgui_controls/ComboBox.h>
+#include <vgui_controls/ImagePanel.h>
 #include <igameevents.h>
 #include "GameEventListener.h"
 
@@ -34,8 +35,6 @@ class CNeoTeamMenu : public vgui::Frame,
 {
     DECLARE_CLASS_SIMPLE( CNeoTeamMenu, vgui::Frame );
 
-    MESSAGE_FUNC_PARAMS(OnButtonPressed, "PressButton", data);
-
 public:
     CNeoTeamMenu(IViewPort *pViewPort);
     virtual ~CNeoTeamMenu();
@@ -43,7 +42,7 @@ class CNeoTeamMenu : public vgui::Frame,
     virtual const char *GetName( void ) { return PANEL_TEAM; }
 	virtual void SetData(KeyValues *data) { }
 	virtual void Reset() { }
-	virtual void Update();
+    virtual void Update() { /* Do things! */ }
 	virtual bool NeedsUpdate( void ) { return false; }
 	virtual bool HasInputElements( void ) { return true; }
 	virtual void ShowPanel( bool bShow );
@@ -61,7 +60,10 @@ class CNeoTeamMenu : public vgui::Frame,
     }
 
 protected:
+    void FindButtons();
     void OnCommand(const char *command);
+    void ChangeMenu(const char* menuName);
+    void OnKeyCodeReleased(vgui::KeyCode code);
 
     void SetLabelText(const char *textEntryName, const char *text);
 	void SetLabelText(const char *textEntryName, wchar_t *text);
@@ -75,29 +77,15 @@ class CNeoTeamMenu : public vgui::Frame,
     // --------------------------------------------------------
     // Menu pieces. These are defined in the GetResFile() file.
     // --------------------------------------------------------
-
-    // Image textures
-	//vgui::ImagePanel *m_pJinrai_TeamImage;
-	//vgui::ImagePanel *m_pNSF_TeamImage;
-
-   IconPanel* m_pJinrai_TeamImage;
-   IconPanel* m_pNSF_TeamImage;
-   IconPanel* m_pBgDarkGrey;
 #if(1)
-	//vgui::ImagePanel *m_pBackgroundImage;
-
     // Team menu label
     vgui::Label *m_pTeamMenuLabel;
-
     // Jinrai playercount & score labels
     vgui::Label *m_pJinrai_PlayercountLabel;
     vgui::Label *m_pJinrai_ScoreLabel;
     // NSF playercount & score labels
     vgui::Label *m_pNSF_PlayercountLabel;
     vgui::Label *m_pNSF_ScoreLabel;
-
-    // Divider
-    vgui::Divider *m_pDivider;
 #endif
 
     // Buttons
diff --git a/mp/src/game/client/particlemgr.h b/mp/src/game/client/particlemgr.h
index d4537f354..db7984f49 100644
--- a/mp/src/game/client/particlemgr.h
+++ b/mp/src/game/client/particlemgr.h
@@ -120,7 +120,7 @@ entities. Each one is useful under different conditions.
 #include "utllinkedlist.h"
 #include "utldict.h"
 #ifdef WIN32
-#include <typeinfo.h>
+#include <typeinfo>
 #else
 #include <typeinfo>
 #endif
diff --git a/mp/src/game/server/neo/neo_player.cpp b/mp/src/game/server/neo/neo_player.cpp
index 6f6644f5a..cad181462 100644
--- a/mp/src/game/server/neo/neo_player.cpp
+++ b/mp/src/game/server/neo/neo_player.cpp
@@ -33,6 +33,8 @@
 
 #include "viewport_panel_names.h"
 
+#include "neo_weapon_loadout.h"
+
 // memdbgon must be the last include file in a .cpp file!!!
 #include "tier0/memdbgon.h"
 
@@ -58,6 +60,7 @@ SendPropBool(SENDINFO(m_bInVision)),
 SendPropBool(SENDINFO(m_bHasBeenAirborneForTooLongToSuperJump)),
 SendPropBool(SENDINFO(m_bShowTestMessage)),
 SendPropBool(SENDINFO(m_bInAim)),
+SendPropBool(SENDINFO(m_bDroppedAnything)),
 
 SendPropTime(SENDINFO(m_flCamoAuxLastTime)),
 SendPropInt(SENDINFO(m_nVisionLastTick)),
@@ -79,6 +82,7 @@ DEFINE_FIELD(m_iXP, FIELD_INTEGER),
 DEFINE_FIELD(m_iCapTeam, FIELD_INTEGER),
 DEFINE_FIELD(m_iGhosterTeam, FIELD_INTEGER),
 DEFINE_FIELD(m_iLoadoutWepChoice, FIELD_INTEGER),
+DEFINE_FIELD(m_bDroppedAnything, FIELD_BOOLEAN),
 DEFINE_FIELD(m_iNextSpawnClassChoice, FIELD_INTEGER),
 
 DEFINE_FIELD(m_bGhostExists, FIELD_BOOLEAN),
@@ -102,6 +106,7 @@ DEFINE_FIELD(m_NeoFlags, FIELD_CHARACTER),
 END_DATADESC()
 
 CBaseEntity *g_pLastJinraiSpawn, *g_pLastNSFSpawn;
+CNEOGameRulesProxy* neoGameRules;
 extern CBaseEntity *g_pLastSpawn;
 
 extern ConVar neo_sv_ignore_wep_xp_limit;
@@ -117,7 +122,7 @@ void CNEO_Player::RequestSetClass(int newClass)
 		return;
 	}
 
-	if (IsDead() || sv_neo_can_change_classes_anytime.GetBool())
+	if (IsDead() || sv_neo_can_change_classes_anytime.GetBool() || (!m_bDroppedAnything && NEORules()->GetRemainingPreRoundFreezeTime(false) > 0))
 	{
 		m_iNeoClass = newClass;
 		m_iNextSpawnClassChoice = -1;
@@ -125,6 +130,8 @@ void CNEO_Player::RequestSetClass(int newClass)
 		SetPlayerTeamModel();
 		SetViewOffset(VEC_VIEW_NEOSCALE(this));
 		InitSprinting();
+		RemoveAllItems(false);
+		GiveDefaultItems();
 	}
 	else
 	{
@@ -192,7 +199,8 @@ void CNEO_Player::RequestSetStar(int newStar)
 
 bool CNEO_Player::RequestSetLoadout(int loadoutNumber)
 {
-	const char *pszWepName = GetWeaponByLoadoutId(loadoutNumber);
+	int classChosen = m_iNextSpawnClassChoice.Get() != -1 ? m_iNextSpawnClassChoice.Get() : m_iNeoClass.Get();
+	const char *pszWepName = CNEOWeaponLoadout::GetLoadoutWeaponEntityName(classChosen, loadoutNumber, false);
 
 	if (FStrEq(pszWepName, ""))
 	{
@@ -235,7 +243,7 @@ bool CNEO_Player::RequestSetLoadout(int loadoutNumber)
 		result = false;
 	}
 
-	if (!neo_sv_ignore_wep_xp_limit.GetBool() && m_iXP < pNeoWeapon->GetNeoWepXPCost(GetClass()))
+	if (!neo_sv_ignore_wep_xp_limit.GetBool() && loadoutNumber+1 > CNEOWeaponLoadout::GetNumberOfLoadoutWeapons(m_iXP, classChosen, false))
 	{
 		DevMsg("Insufficient XP for %s\n", pszWepName);
 		result = false;
@@ -244,6 +252,7 @@ bool CNEO_Player::RequestSetLoadout(int loadoutNumber)
 	if (result)
 	{
 		m_iLoadoutWepChoice = loadoutNumber;
+		GiveLoadoutWeapon();
 	}
 	
 	if (pEnt != NULL && !(pEnt->IsMarkedForDeletion()))
@@ -1611,6 +1620,7 @@ bool CNEO_Player::IsAllowedToDrop(CBaseCombatWeapon *pWep)
 void CNEO_Player::Weapon_Drop( CBaseCombatWeapon *pWeapon,
 	const Vector *pvecTarget, const Vector *pVelocity )
 {
+	m_bDroppedAnything = true;
 	if (!IsDead() && pWeapon)
 	{
 		if (!IsAllowedToDrop(pWeapon))
@@ -2028,7 +2038,7 @@ void CNEO_Player::GiveDefaultItems(void)
 	case NEO_CLASS_RECON:
 		GiveNamedItem("weapon_knife");
 		GiveNamedItem("weapon_milso");
-		GiveDet(this);
+		if (this->m_iXP >= 4) { GiveDet(this); }
 		Weapon_Switch(Weapon_OwnsThisType("weapon_milso"));
 		break;
 	case NEO_CLASS_ASSAULT:
@@ -2051,12 +2061,12 @@ void CNEO_Player::GiveDefaultItems(void)
 
 void CNEO_Player::GiveLoadoutWeapon(void)
 {
-	if (IsObserver() || IsDead())
+	if (IsObserver() || IsDead() || m_bDroppedAnything || ((NEORules()->GetRemainingPreRoundFreezeTime(false)) < 0))
 	{
 		return;
 	}
 
-	const char *szWep = GetWeaponByLoadoutId(m_iLoadoutWepChoice);
+	const char* szWep = CNEOWeaponLoadout::GetLoadoutWeaponEntityName(m_iNeoClass.Get(), m_iLoadoutWepChoice, false);
 #if DEBUG
 	DevMsg("Loadout slot: %i (\"%s\")\n", m_iLoadoutWepChoice, szWep);
 #endif
@@ -2084,7 +2094,7 @@ void CNEO_Player::GiveLoadoutWeapon(void)
 	CNEOBaseCombatWeapon *pNeoWeapon = dynamic_cast<CNEOBaseCombatWeapon*>((CBaseEntity*)pEnt);
 	if (pNeoWeapon)
 	{
-		if (neo_sv_ignore_wep_xp_limit.GetBool() || (m_iXP >= pNeoWeapon->GetNeoWepXPCost(GetClass())))
+		if (neo_sv_ignore_wep_xp_limit.GetBool() || m_iLoadoutWepChoice+1 <= CNEOWeaponLoadout::GetNumberOfLoadoutWeapons(m_iXP, m_iNeoClass.Get(), false))
 		{
 			pNeoWeapon->SetSubType(wepSubType);
 
@@ -2092,6 +2102,8 @@ void CNEO_Player::GiveLoadoutWeapon(void)
 
 			if (pEnt != NULL && !(pEnt->IsMarkedForDeletion()))
 			{
+				RemoveAllItems(false);
+				GiveDefaultItems();
 				pEnt->Touch(this);
 				Weapon_Switch(Weapon_OwnsThisType(szWep));
 			}
diff --git a/mp/src/game/server/neo/neo_player.h b/mp/src/game/server/neo/neo_player.h
index c520ca7dd..88df9d355 100644
--- a/mp/src/game/server/neo/neo_player.h
+++ b/mp/src/game/server/neo/neo_player.h
@@ -197,6 +197,7 @@ class CNEO_Player : public CHL2MP_Player
 	CNetworkVar(bool, m_bInVision);
 	CNetworkVar(bool, m_bHasBeenAirborneForTooLongToSuperJump);
 	CNetworkVar(bool, m_bInAim);
+	CNetworkVar(bool, m_bDroppedAnything);
 
 	CNetworkVar(float, m_flCamoAuxLastTime);
 	CNetworkVar(int, m_nVisionLastTick);
diff --git a/mp/src/game/shared/neo/neo_gamerules.cpp b/mp/src/game/shared/neo/neo_gamerules.cpp
index 9fac860b1..46ef5e277 100644
--- a/mp/src/game/shared/neo/neo_gamerules.cpp
+++ b/mp/src/game/shared/neo/neo_gamerules.cpp
@@ -590,6 +590,9 @@ void CNEORules::FireGameEvent(IGameEvent* event)
 
 	if (Q_strcmp(type, "round_start") == 0)
 	{
+#ifdef CLIENT_DLL
+		engine->ClientCmd("classmenu");
+#endif
 		m_flNeoRoundStartTime = gpGlobals->curtime;
 		m_flNeoNextRoundStartTime = 0;
 	}
@@ -785,6 +788,7 @@ void CNEORules::StartNextRound()
 		pPlayer->m_bInAim = false;
 		pPlayer->m_bInThermOpticCamo = false;
 		pPlayer->m_bInVision = false;
+		pPlayer->m_bDroppedAnything = false;
 
 		pPlayer->SetTestMessageVisible(false);
 	}
diff --git a/mp/src/game/shared/neo/neo_weapon_loadout.h b/mp/src/game/shared/neo/neo_weapon_loadout.h
new file mode 100644
index 000000000..3a77520bd
--- /dev/null
+++ b/mp/src/game/shared/neo/neo_weapon_loadout.h
@@ -0,0 +1,208 @@
+#ifndef NEO_WEAPON_LOADOUT_H
+#define NEO_WEAPON_LOADOUT_H
+#ifdef _WIN32
+#pragma once
+#endif
+
+
+class CLoadoutWeaponClass
+{
+public:
+	const char* m_szWeaponName;
+	int m_iWeaponPrice;
+	const char* m_szVguiImage;
+	const char* m_szVguiImageNo; // I don't know how to concatenate char * to const char * please don't bully
+	const char* m_szWeaponEntityName;
+	const char* m_szAmmoType;
+	
+	CLoadoutWeaponClass(const char* weaponName, int weaponPrice, const char* vguiImage, const char* vguiImageNo, const char* weaponEntityName, const char* ammoType)
+	{
+		m_szWeaponName = weaponName;
+		m_iWeaponPrice = weaponPrice;
+		m_szVguiImage = vguiImage;
+		m_szVguiImageNo = vguiImageNo;
+		m_szWeaponEntityName = weaponEntityName;
+		m_szAmmoType = ammoType;
+	}
+};
+
+class CNEOWeaponLoadout
+{
+public:
+	static CLoadoutWeaponClass s_DevLoadoutWeapons[12];
+	static CLoadoutWeaponClass s_ReconLoadoutWeapons[9];
+	static CLoadoutWeaponClass s_AssaultLoadoutWeapons[12];
+	static CLoadoutWeaponClass s_SupportLoadoutWeapons[9];
+
+	static const int m_iDevLoadoutSize = 12;
+	static const int m_iReconLoadoutSize = 9;
+	static const int m_iAssaultLoadoutSize = 12;
+	static const int m_iSupportLoadoutSize = 9;
+
+	static int GetNumberOfLoadoutWeapons(int rank, int classType, int isDev)
+	{
+		if (classType < 0 || classType > 2)
+		{ // We don't have a loadout for this class
+			return 0;
+		}
+
+		if (isDev)
+		{ // Dev
+			return iterateThroughLoadout(rank, s_DevLoadoutWeapons, 12);
+		}
+		switch (classType) {
+		case 0: // Recon
+			return iterateThroughLoadout(rank, s_ReconLoadoutWeapons, 9);
+		case 1: // Assault
+			return iterateThroughLoadout(rank, s_AssaultLoadoutWeapons, 12);
+		case 2: // Support
+			return iterateThroughLoadout(rank, s_SupportLoadoutWeapons, 9);
+		default: // Shouldn't trigger this ever
+			return 0;
+		}
+	}
+
+	static int GetTotalLoadoutSize(int classType, int isDev) {
+		if (isDev) { return m_iDevLoadoutSize; }
+		switch (classType) {
+		case 0:
+			return m_iReconLoadoutSize;
+		case 1:
+			return m_iAssaultLoadoutSize;
+		case 2:
+			return m_iSupportLoadoutSize;
+		default:
+			return 0;
+		}
+	}
+
+	static const char* GetLoadoutVguiWeaponName(int classType, int weaponPositionInLoadout, bool isDev)
+	{
+		if (isDev)
+		{ // Dev
+			if (weaponPositionInLoadout < 12) { return s_DevLoadoutWeapons[weaponPositionInLoadout].m_szVguiImage; }
+		}
+		switch (classType) {
+		case 0: // Recon
+			if (weaponPositionInLoadout < 9) { return s_ReconLoadoutWeapons[weaponPositionInLoadout].m_szVguiImage; }
+		case 1: // Assault
+			if (weaponPositionInLoadout < 12) { return s_AssaultLoadoutWeapons[weaponPositionInLoadout].m_szVguiImage; }
+		case 2: // Support
+			if (weaponPositionInLoadout < 9) { return s_SupportLoadoutWeapons[weaponPositionInLoadout].m_szVguiImage; }
+		default: // Shouldn't trigger this ever
+			return "";
+		}
+	}
+
+	static const char* GetLoadoutVguiWeaponNameNo(int classType, int weaponPositionInLoadout, bool isDev)
+	{
+		if (isDev)
+		{ // Dev
+			if (weaponPositionInLoadout < 12) { return s_DevLoadoutWeapons[weaponPositionInLoadout].m_szVguiImageNo; }
+		}
+		switch (classType) {
+		case 0: // Recon
+			if (weaponPositionInLoadout < 9) { return s_ReconLoadoutWeapons[weaponPositionInLoadout].m_szVguiImageNo; }
+		case 1: // Assault
+			if (weaponPositionInLoadout < 12) { return s_AssaultLoadoutWeapons[weaponPositionInLoadout].m_szVguiImageNo; }
+		case 2: // Support
+			if (weaponPositionInLoadout < 9) { return s_SupportLoadoutWeapons[weaponPositionInLoadout].m_szVguiImageNo; }
+		default: // Shouldn't trigger this ever
+			return "";
+		}
+	}
+
+
+	static const char* GetLoadoutWeaponEntityName(int classType, int weaponPositionInLoadout, bool isDev)
+	{
+		if (isDev)
+		{ // Dev
+			if (weaponPositionInLoadout < 12) { return s_DevLoadoutWeapons[weaponPositionInLoadout].m_szWeaponEntityName; }
+		}
+		switch (classType) {
+		case 0: // Recon
+			if (weaponPositionInLoadout < 9) { return s_ReconLoadoutWeapons[weaponPositionInLoadout].m_szWeaponEntityName; }
+		case 1: // Assault
+			if (weaponPositionInLoadout < 12) { return s_AssaultLoadoutWeapons[weaponPositionInLoadout].m_szWeaponEntityName; }
+		case 2: // Support
+			if (weaponPositionInLoadout < 9) { return s_SupportLoadoutWeapons[weaponPositionInLoadout].m_szWeaponEntityName; }
+		default: // Shouldn't trigger this ever
+			return "";
+		}
+	}
+
+private:
+	static int iterateThroughLoadout(int rank, CLoadoutWeaponClass* loadout, int loadOutSize)
+	{
+		int ammount = 0;
+
+		for (int i = 0; i < loadOutSize; i++)
+		{
+			if (loadout[i].m_iWeaponPrice > rank)
+			{
+				return ammount;
+			}
+			ammount++;
+		}
+		return ammount;
+	}
+};
+
+CLoadoutWeaponClass CNEOWeaponLoadout::s_DevLoadoutWeapons[12] =
+{
+	{ "MPN45", -255, "loadout/loadout_mpn", "loadout/loadout_mpn_no", "weapon_mpn", "AMMO_PRI" },
+	{ "SRM", -255, "/loadout/loadout_srm", "loadout/loadout_srm_no", "weapon_srm", "AMMO_PRI" },
+	{ "SRM (silenced)", -255, "loadout/loadout_srms", "loadout/loadout_srms_no", "weapon_srm_s", "AMMO_PRI" },
+	{ "Jitte", -255, "/loadout/loadout_jitte", "loadout/loadout_jitte_no", "weapon_jitte", "AMMO_PRI" },
+	{ "Jitte (with scope)", -255, "/loadout/loadout_jittes", "loadout/loadout_jittes_no", "weapon_jittescoped", "AMMO_PRI" },
+	{ "ZR68C", -255, "/loadout/loadout_zr68c", "loadout/loadout_zr68c_no", "weapon_zr68c", "AMMO_PRI" },
+	{ "ZR68-S (silenced)", -255, "loadout/loadout_zr68s", "loadout/loadout_zr68s_no", "weapon_zr68s", "AMMO_PRI" },
+	{ "ZR68-L (accurized)", -255, "/loadout/loadout_zr68l", "loadout/loadout_zr68l_no", "weapon_zr68l", "AMMO_PRI" },
+	{ "MX", -255, "loadout/loadout_mx", "loadout/loadout_mx_no", "weapon_mx", "AMMO_PRI" },
+	{ "PZ252", -255, "loadout/loadout_pz", "loadout/loadout_pz_no", "weapon_pz", "AMMO_PRI" },
+	{ "Murata Supa-7", -255, "loadout/loadout_supa7", "loadout/loadout_supa7_no", "weapon_supa7", "AMMO_PRI" },
+	{ "Mosok", -255, "loadout/loadout_mosok", "loadout/loadout_mosok_no", "weapon_m41", "AMMO_PRI" }
+};
+
+CLoadoutWeaponClass CNEOWeaponLoadout::s_ReconLoadoutWeapons[9] =
+{
+	{ "MPN45", -255, "loadout/loadout_mpn", "loadout/loadout_mpn_no", "weapon_mpn", "AMMO_PRI" },
+	{ "SRM", 0, "/loadout/loadout_srm", "loadout/loadout_srm_no", "weapon_srm", "AMMO_PRI" },
+	{ "Jitte", 0, "/loadout/loadout_jitte", "loadout/loadout_jitte_no", "weapon_jitte", "AMMO_PRI" },
+	{ "SRM (silenced)", 4, "/loadout/loadout_srms", "loadout/loadout_srms_no", "weapon_srm_s", "AMMO_PRI" },
+	{ "Jitte (with scope)", 4, "/loadout/loadout_jittes", "loadout/loadout_jittes_no", "weapon_jittescoped", "AMMO_PRI" },
+	{ "ZR68-L (accurized)", 4, "/loadout/loadout_zr68l", "loadout/loadout_zr68l_no", "weapon_zr68l", "AMMO_PRI" },
+	{ "ZR68C", 10, "/loadout/loadout_zr68c", "loadout/loadout_zr68c_no", "weapon_zr68c", "AMMO_PRI" },
+	{ "Murata Supa-7", 20, "/loadout/loadout_supa7", "loadout/loadout_supa7_no", "weapon_supa7", "AMMO_10G_SHELL" },
+	{ "Mosok Silenced", 20, "/loadout/loadout_mosokl", "loadout/loadout_mosokl_no", "weapon_m41s", "AMMO_PRI" }
+};
+
+CLoadoutWeaponClass CNEOWeaponLoadout::s_AssaultLoadoutWeapons[12] =
+{
+	{ "MPN45", -255, "loadout/loadout_mpn", "loadout/loadout_mpn_no", "weapon_mpn", "AMMO_PRI" },
+	{ "SRM", 0, "/loadout/loadout_srm", "loadout/loadout_srm_no", "weapon_srm", "AMMO_PRI" },
+	{ "Jitte", 0, "/loadout/loadout_jitte", "loadout/loadout_jitte_no", "weapon_jitte", "AMMO_PRI" },
+	{ "ZR68C", 0, "/loadout/loadout_zr68c", "loadout/loadout_zr68c_no", "weapon_zr68c", "AMMO_PRI" },
+	{ "ZR68-S (silenced)", 0, "loadout/loadout_zr68s", "loadout/loadout_zr68s_no", "weapon_zr68s", "AMMO_PRI" },
+	{ "Murata Supa-7", 4, "/loadout/loadout_supa7", "loadout/loadout_supa7_no", "weapon_supa7", "AMMO_10G_SHELL" },
+	{ "Mosok", 4, "/loadout/loadout_mosok", "/loadout/loadout_mosok_no", "weapon_m41", "AMMO_PRI" },
+	{ "Mosok Silenced", 10, "/loadout/loadout_mosokl", "loadout/loadout_mosokl_no", "weapon_m41s", "AMMO_PRI" },
+	{ "MX", 10, "loadout/loadout_mx", "loadout/loadout_mx_no", "weapon_mx", "AMMO_PRI" },
+	{ "MX Silenced", 10, "/loadout/loadout_mxs", "/loadout/loadout_mxs_no", "weapon_mx_silenced", "AMMO_PRI" },
+	{ "AA13", 20, "/loadout/loadout_aa13", "/loadout/loadout_aa13_no", "weapon_aa13", "AMMO_10G_SHELL" },
+	{ "SRS", 20, "/loadout/loadout_srs", "/loadout/loadout_srs_no", "weapon_srs", "AMMO_PRI" }
+};
+
+CLoadoutWeaponClass CNEOWeaponLoadout::s_SupportLoadoutWeapons[9] =
+{
+	{ "MPN45", -255, "loadout/loadout_mpn", "loadout/loadout_mpn_no", "weapon_mpn", "AMMO_PRI" },
+	{ "SRM", 0, "/loadout/loadout_srm", "loadout/loadout_srm_no", "weapon_srm", "AMMO_PRI" },
+	{ "ZR68C", 0, "/loadout/loadout_zr68c", "loadout/loadout_zr68c_no", "weapon_zr68c", "AMMO_PRI" },
+	{ "Mosok", 0, "/loadout/loadout_mosok", "/loadout/loadout_mosok_no", "weapon_m41", "AMMO_PRI" },
+	{ "Murata Supa-7", 0, "/loadout/loadout_supa7", "loadout/loadout_supa7_no", "weapon_supa7", "AMMO_10G_SHELL" },
+	{ "MX", 4, "loadout/loadout_mx", "loadout/loadout_mx_no", "weapon_mx", "AMMO_PRI" },
+	{ "Mosok Silenced", 4, "/loadout/loadout_mosokl", "loadout/loadout_mosokl_no", "weapon_m41s", "AMMO_PRI" },
+	{ "MX Silenced", 10, "/loadout/loadout_mxs", "/loadout/loadout_mxs_no", "weapon_mx_silenced", "AMMO_PRI" },
+	{ "PZ252", 20, "loadout/loadout_pz", "loadout/loadout_pz_no", "weapon_pz", "AMMO_PRI" }
+};
+#endif // NEO_WEAPON_LOADOUT_H
\ No newline at end of file
diff --git a/mp/src/lib/public/mathlib.pdb b/mp/src/lib/public/mathlib.pdb
new file mode 100644
index 000000000..a605ae9da
Binary files /dev/null and b/mp/src/lib/public/mathlib.pdb differ
diff --git a/mp/src/lib/public/raytrace.pdb b/mp/src/lib/public/raytrace.pdb
new file mode 100644
index 000000000..9773b6ae6
Binary files /dev/null and b/mp/src/lib/public/raytrace.pdb differ
diff --git a/mp/src/lib/public/tier1.pdb b/mp/src/lib/public/tier1.pdb
new file mode 100644
index 000000000..f00418486
Binary files /dev/null and b/mp/src/lib/public/tier1.pdb differ
diff --git a/mp/src/lib/public/vgui_controls.pdb b/mp/src/lib/public/vgui_controls.pdb
new file mode 100644
index 000000000..1f7c1c0d5
Binary files /dev/null and b/mp/src/lib/public/vgui_controls.pdb differ
diff --git a/mp/src/public/tier0/memalloc.h b/mp/src/public/tier0/memalloc.h
index e0f9c16ab..75bb6bfaf 100644
--- a/mp/src/public/tier0/memalloc.h
+++ b/mp/src/public/tier0/memalloc.h
@@ -382,7 +382,7 @@ class CMemAllocAttributeAlloction
 
 	#pragma warning(disable:4290)
 	#pragma warning(push)
-	#include <typeinfo.h>
+	#include <typeinfo>
 
 	// MEM_DEBUG_CLASSNAME is opt-in.
 	// Note: typeid().name() is not threadsafe, so if the project needs to access it in multiple threads