diff --git a/config_personal/cfg/binds.cfg b/config_personal/cfg/binds.cfg
index 81c5331..a7587cf 100644
--- a/config_personal/cfg/binds.cfg
+++ b/config_personal/cfg/binds.cfg
@@ -1,22 +1,32 @@
 //https://wiki.teamfortress.com/wiki/List_of_default_keys
 
-// viewmodel binds
-bindtoggle kp_minus r_drawviewmodel
-bindtoggle kp_multiply cl_first_person_uses_world_model
-bindtoggle kp_slash tf_taunt_first_person 0 1
+// unbindall before re-doing bindings
+unbindall
 
 // tab graph
 alias +tabgraph "+showscores; net_graph 1"
 alias -tabgraph "-showscores; net_graph 0"
-bind tab +tabgraph
 
-alias "+ctap" "+duck 1; -duck 1; +jump 1"
-alias "-ctap" "-jump 1"
+// 1 tick ctap script
+//alias "+ctap" "+duck 1; -duck 1; +jump 1"
+//alias "-ctap" "-jump 1"
+
+// 2 tick ctap script
+// +attack only calls spec_next when directly bound to a key
+alias +ctap_attack "+attack; spec_next"
+alias -ctap_attack  -attack
+
+alias +ctap_rj "-duck; +jump; +ctap_attack"
+alias -ctap_rj "-jump; -ctap_attack; bind mouse1 +ctap_attack"
+
+alias +ctap "+duck; bind mouse1 +ctap_rj; spec_prev"
+alias -ctap -duck
 
 //medic radar
 alias "+radar" "hud_medicautocallersthreshold 500"
 alias "-radar" "hud_medicautocallersthreshold 59"
 
+// crouch jump script
 alias +rj "spec_mode;-duck;+cr;alias checkrj +cr"
 alias -rj "-cr;checkduck;alias checkrj none"
 alias +crouch "-cr;+duck;alias checkduck +duck"
@@ -33,55 +43,108 @@ alias sentry "destroy 2; build 2"
 // bind for showing some info
 alias +showinfo "cl_showfps 1; net_graph 1; cl_showpos 1"
 alias -showinfo "cl_showfps 0; net_graph 0; cl_showpos 0"
-bind ralt +showinfo
+
+
+// default binds
+// slots
+bind 1 "slot1"
+bind 2 "slot2"
+bind 3 "slot3"
+bind 4 "slot4"
+bind 5 "slot5"
+bind 6 "slot6"
+bind 7 "slot7"
+bind 8 "slot8"
+bind 9 "slot9"
+bind 0 "slot10"
+
+// notification interaction
+bind j "cl_trigger_first_notification"
+bind k "cl_decline_first_notification"
+
+// voice menu
+bind z "voice_menu_1"
+bind x "voice_menu_2"
+bind c "voice_menu_3"
+
+
+// class/team binds
+bind n "+quickswitch"
+bind m "open_charinfo_direct"
+bind , "changeclass"
+bind . "changeteam"
+
+// interaction
+bind r "+reload"
+bind b "lastdisguise"
+bind g "+taunt"
+bind h "+context_action"
+bind \ "dropitem"
+bind ralt "+showinfo"
+bind ` "toggleconsole"
+bind enter "show_quest_log"
+bind escape "cancelselect"
+bind pause "pause"
+//call medic
+bind e "voicemenu 0 0"
+bind tab "+tabgraph"
+//cancel taunt
+bind q "lastinv"
+bind f "+inspect"
+//call spy
+bind h "voicemenu 1 1"
+bind mouse5 "+use_action_slot_item"
+bind mouse3 "+attack3"
+
+// scroll weapons
+bind mwheelup "invprev"
+bind mwheeldown "invnext"
+
+// chat binds
+bind t "say"
+bind y "say_team"
+bind u "say_party"
+bind v +voicerecord
+//spray
+bind p "impulse 201"
+//show logs.tf logs
+bind l "cl_disablehtmlmotd 0; say !log"
 
 // killbinds
 bind - "kill"
 bind = "explode"
 
 //bind for map vote when it breaks
-bind kp_end "next_map_vote 0"
-bind kp_downarrow "next_map_vote 1"
-bind kp_pgdn "next_map_vote 2"
-// easier bind
 bind f1 "next_map_vote 0"
 bind f2 "next_map_vote 1"
 bind f3 "next_map_vote 2"
 
-//fix all button
-bind kp_ins "snd_restart;hud_reloadscheme"
-
-//toggle html motd
-bindtoggle kp_del cl_disablehtmlmotd
-
 // loadouts
-//bind f1 loadouts.A
-//bind f2 loadouts.B
-//bind f3 loadouts.C
-//bind f5 loadouts.D
-//bind q loadouts.resup
-bind q "load_itempreset 0"
+bind f5 "loadouts.A"
+bind f6 "loadouts.B"
+bind f7 "loadouts.C"
+bind f8 "loadouts.D"
+bind alt "loadouts.resup"
 
-bind f4 player_ready_toggle
+// ready toggle
+bind f4 "player_ready_toggle"
 
 //bind to use mconfig null movement binds
-bind w +mf
-bind a +ml
-bind s +mb
-bind d +mr
+bind w "+mf"
+bind a "+ml"
+bind s "+mb"
+bind d "+mr"
+
+// movement
+bind space "+jump"
+bind shift "+duck"
+bind ctrl "+rj"
+
+//use hud buttons instead
+//bind <key> "snd_restart;hud_reloadscheme"
+//bind <key> "incrementvar r_drawviewmodel 0 1 1"
+//bind <key> "incrementvar cl_first_person_uses_world_model 0 1 1"
+//bind <key> "incrementvartf_use_min_viewmodel 0 1 1"
 
-bind space +jump
-bind shift +duck
 //disabled as banned in rgl now for some reason
-//bind ctrl +ctap
-bind ctrl "voicemenu 1 1"
-bindtoggle alt r_drawviewmodel
-
-bind e "voicemenu 0 0"
-bind h lastinv
-bind f +inspect
-bind v +use
-bind l "cl_disablehtmlmotd 0; say !log"
-bind mouse3 +attack3
-bind mouse4 +voicerecord
-bind mouse5 +use_action_slot_item
\ No newline at end of file
+//bind ctrl "+ctap"
\ No newline at end of file
diff --git a/config_personal/cfg/overrides/autoexec.cfg b/config_personal/cfg/overrides/autoexec.cfg
index 7e95949..8f8202b 100644
--- a/config_personal/cfg/overrides/autoexec.cfg
+++ b/config_personal/cfg/overrides/autoexec.cfg
@@ -4,7 +4,8 @@
 no_texture_stream
 
 con_enable 1
-con_logfile "console.log"
+//Set the default confile location
+//con_logfile "console.log"
 developer 0
 
 fov_desired 90
@@ -73,7 +74,7 @@ sv_cheats 1
 exec preloader.cfg
 
 // Disabled due to changing con_logfile, replace with simple resup bind
-// exec loadouts/init.cfg
+exec loadouts/init.cfg
 exec training.cfg
 exec binds.cfg
 // Sets hitsound settings
diff --git a/config_personal/cfg/overrides/game_overrides.cfg b/config_personal/cfg/overrides/game_overrides.cfg
index e537f44..a151cdc 100644
--- a/config_personal/cfg/overrides/game_overrides.cfg
+++ b/config_personal/cfg/overrides/game_overrides.cfg
@@ -1,4 +1,8 @@
-// Commands here will run before every class config
-
-// Key for class specific binds
-unbind n
\ No newline at end of file
+// Commands here will run before every class config
+
+// Key for class specific binds
+unbind n
+
+// rebind for classes other than soldier
+bind mouse1 +attack
+bind mouse2 +attack2
\ No newline at end of file
diff --git a/config_personal/cfg/overrides/soldier.cfg b/config_personal/cfg/overrides/soldier.cfg
index bdc5233..383c8ad 100644
--- a/config_personal/cfg/overrides/soldier.cfg
+++ b/config_personal/cfg/overrides/soldier.cfg
@@ -1 +1,5 @@
-loadouts.soldier
\ No newline at end of file
+loadouts.soldier
+
+// ctap script
+bind mouse2 +ctap
+bind mouse1 +ctap_attack
diff --git a/hud_toonhud/materials/hud/health_bg.vtf b/hud_toonhud/materials/hud/health_bg.vtf
deleted file mode 100644
index 5345b33..0000000
Binary files a/hud_toonhud/materials/hud/health_bg.vtf and /dev/null differ
diff --git a/hud_toonhud/materials/hud/health_color.vtf b/hud_toonhud/materials/hud/health_color.vtf
deleted file mode 100644
index 16265ac..0000000
Binary files a/hud_toonhud/materials/hud/health_color.vtf and /dev/null differ
diff --git a/hud_toonhud/materials/vgui/replay/thumbnails/mainmenu/mmbutton.vtf b/hud_toonhud/materials/vgui/replay/thumbnails/mainmenu/mmbutton.vtf
index b08f862..7376657 100644
Binary files a/hud_toonhud/materials/vgui/replay/thumbnails/mainmenu/mmbutton.vtf and b/hud_toonhud/materials/vgui/replay/thumbnails/mainmenu/mmbutton.vtf differ
diff --git a/hud_toonhud/resource/clientscheme_colors.res b/hud_toonhud/resource/clientscheme_colors.res
index bfb7deb..1775f69 100644
--- a/hud_toonhud/resource/clientscheme_colors.res
+++ b/hud_toonhud/resource/clientscheme_colors.res
@@ -43,13 +43,13 @@ Scheme
 		"G_StickyColor"					"255 255 255 255" // Stickybomb color
 		"G_StickyIconColor"				"255 255 255 255" // Stickybomb icon color
 		"G_CustomTargetID" 				"0 0 0 100" // Custom target id bg color
-		"G_CustomBuildingStatusBg" 		"0 0 0 100" // Custom building status bg color
+		"G_CustomBuildingStatusBg" 		"60 60 60 120" // Custom building status bg color
 		"G_TargetHealthValue" 			"0 255 0 255" // Target ID health value color
 		"G_TargetHealthValueShadow" 	"0 0 0 220" // Target ID health value shadow color
 		"G_Killfeed_Base"			"0 0 0 120" // Killfeed Base color
 		"G_Killfeed_Local"			"235 235 235 240" // Killfeed Local color
 		"G_CenteredMetalBg"			"50 50 50 120" // Centered metal background color
-		"G_CenteredUberchargeBg"	 "0 0 0 100" // Centered ubercharge meter background color
+		"G_CenteredUberchargeBg"	 "60 60 60 120" // Centered ubercharge meter background color
 		"G_BrownBg"					"46 43 42 220"
 		"G_DestroyBg"				"120 0 0 150"
 		"G_ScoreboardBlue"			"55 73 85 100"
diff --git a/hud_toonhud/resource/clientscheme_fonts.res b/hud_toonhud/resource/clientscheme_fonts.res
index 13703e4..410dae5 100644
--- a/hud_toonhud/resource/clientscheme_fonts.res
+++ b/hud_toonhud/resource/clientscheme_fonts.res
@@ -831,7 +831,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"		"Lato"
+				"name"		"TF2"
 				"tall"		"24"
 				"tall_lodef"	"80"
 				"weight"	"500"
@@ -841,7 +841,7 @@ Scheme
 			}
 			"2"
 			{
-				"name"		"Lato"
+				"name"		"TF2"
 				"tall"		"32"
 				"tall_hidef"	"120"
 				"weight"	"500"
@@ -851,7 +851,7 @@ Scheme
 			}
 			"3"
 			{
-				"name"		"Lato"
+				"name"		"TF2"
 				"tall"		"44"
 				"weight"	"500"
 				"additive"	"0"
@@ -860,7 +860,7 @@ Scheme
 			}
 			"4"
 			{
-				"name"		"Lato"
+				"name"		"TF2"
 				"tall"		"48"
 				"weight"	"500"
 				"additive"	"0"
@@ -869,7 +869,7 @@ Scheme
 			}
 			"5" // Misyl: Proportional
 			{
-				"name"		"Lato"
+				"name"		"TF2"
 				"tall"		"24"
 				"weight"	"500"
 				"additive"	"0"
@@ -880,7 +880,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"		"Gobold"
+				"name"		"TF2 Build"
 				"tall"		"44"
 				"tall_lodef"	"52"
 				"weight"	"500"
@@ -893,7 +893,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"		"Gobold"
+				"name"		"TF2 Build"
 				"tall"		"35"
 				"tall_lodef"	"40"
 				"weight"	"500"
@@ -906,7 +906,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"		"Lato"
+				"name"		"TF2"
 				"tall"		"36"
 				"tall_hidef"	"48"
 				"weight"	"500"
@@ -918,7 +918,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"		"Lato"
+				"name"		"TF2"
 				"tall"		"30"
 				"weight"	"500"
 				"additive"	"0"
@@ -929,7 +929,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"		"Gobold"
+				"name"		"TF2 Build"
 				"tall"		"30"
 				"weight"	"500"
 				"additive"	"0"
@@ -940,7 +940,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"		"Lato"
+				"name"		"TF2"
 				"tall"		"24"
 				"tall_lodef"		"28"
 				"weight"	"500"
@@ -952,7 +952,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"		"Lato"
+				"name"		"TF2 Secondary"
 				"tall"		"24"
 				"weight"	"500"
 				"yres"		"1 1199"
@@ -961,7 +961,7 @@ Scheme
 			}
 			"2" // Misyl: Proportional
 			{
-				"name"		"Lato"
+				"name"		"TF2 Secondary"
 				"tall"		"10"
 				"weight"	"500"
 				"additive"	"0"
@@ -972,7 +972,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"		"Gobold"
+				"name"		"TF2 Build"
 				"tall"		"24"
 				"weight"	"500"
 				"additive"	"0"
@@ -983,7 +983,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"		"Gobold"
+				"name"		"TF2 Build"
 				"tall"		"18"
 				"weight"	"500"
 				"additive"	"0"
@@ -994,7 +994,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"		"Lato"
+				"name"		"TF2"
 				"tall"		"18"
 				"tall_hidef"	"24"
 				"tall_lodef"	"18"
@@ -1007,7 +1007,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"		"Lato"
+				"name"		"TF2 Secondary"
 				"tall"		"18"
 				"tall_hidef"	"24"
 				"tall_lodef"	"20"
@@ -1020,7 +1020,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"		"Lato"
+				"name"		"TF2 Secondary"
 				"tall"		"14"
 				"tall_lodef"	"16"
 				"weight"	"500"
@@ -1032,7 +1032,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"		"Gobold"
+				"name"		"TF2 Build"
 				"tall"		"16"
 				"weight"	"500"
 				"additive"	"0"
@@ -1043,7 +1043,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"		"Gobold"
+				"name"		"TF2 Build"
 				"tall"		"14"
 				"weight"	"500"
 				"additive"	"0"
@@ -1054,7 +1054,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"		"Gobold"
+				"name"		"TF2 Build"
 				"tall"		"14"
 				"weight"	"500"
 				"additive"	"0"
@@ -1066,7 +1066,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"		"Lato"
+				"name"		"TF2 Secondary"
 				"tall"		"11"
 				"weight"	"500"
 				"additive"	"0"
@@ -1077,7 +1077,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"		"Lato"
+				"name"		"TF2 Secondary"
 				"tall"		"11"
 				"weight"	"500"
 				"additive"	"0"
@@ -1089,7 +1089,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"		"Gobold"
+				"name"		"TF2 Build"
 				"tall"		"10"
 				"weight"	"400"
 				"additive"	"0"
@@ -1100,7 +1100,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"		"Gobold"
+				"name"		"TF2 Build"
 				"tall"		"4"
 				"weight"	"500"
 				"additive"	"0"
@@ -1111,7 +1111,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"		"Gobold"
+				"name"		"TF2 Build"
 				"tall"		"10"
 				"weight"	"500"
 				"additive"	"0"
@@ -1122,7 +1122,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"		"Gobold"
+				"name"		"TF2 Build"
 				"tall"		"16"
 				"weight"	"500"
 				"additive"	"0"
@@ -1133,7 +1133,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"		"Gobold"
+				"name"		"TF2 Build"
 				"tall"		"9"
 				"weight"	"0"
 				"additive"	"0"
@@ -1144,7 +1144,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"		"Lato"
+				"name"		"TF2 Secondary"
 				"tall"		"9"
 				"weight"	"0"
 				"additive"	"0"
@@ -1155,7 +1155,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"		"Gobold"
+				"name"		"TF2 Build"
 				"tall"		"6"
 				"weight"	"0"
 				"additive"	"0"
@@ -1166,7 +1166,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"		"Lato"
+				"name"		"TF2 Secondary"
 				"tall"		"12"
 				"tall_hidef"	"14"
 				"tall_lodef"	"16"
@@ -1179,7 +1179,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"		"Lato"
+				"name"		"TF2 Secondary"
 				"tall"		"11"
 				"weight"	"500"
 				"additive"	"0"
@@ -1254,7 +1254,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"		"Lato"
+				"name"		"TF2 Secondary"
 				"tall"		"18"
 				"tall_hidef"	"24"
 				"tall_lodef"	"18"
@@ -1267,7 +1267,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"		"Lato"
+				"name"		"TF2"
 				"tall"		"16"
 				"tall_hidef"	"22"
 				"tall_lodef"	"22"
@@ -1327,7 +1327,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"		"Lato"
+				"name"		"TF2"
 				"tall"		"15"
 				"weight"	"700"
 				"antialias" 	"1"
@@ -1337,7 +1337,7 @@ Scheme
 			}
 			"2"
 			{
-				"name"		"Lato"
+				"name"		"TF2"
 				"tall"		"15"	[$WIN32]
 				"tall"		"21"	[$X360]
 				"weight"	"700"
@@ -1348,7 +1348,7 @@ Scheme
 			}
 			"3"
 			{
-				"name"		"Lato"
+				"name"		"TF2"
 				"tall"		"18"
 				"weight"	"900"
 				"antialias" 	"1"
@@ -1357,7 +1357,7 @@ Scheme
 			}
 			"4"
 			{
-				"name"		"Lato"
+				"name"		"TF2"
 				"tall"		"21"
 				"weight"	"900"
 				"antialias" 	"1"
@@ -1366,7 +1366,7 @@ Scheme
 			}
 			"5"
 			{
-				"name"		"Lato"
+				"name"		"TF2"
 				"tall"		"24"
 				"weight"	"1000"
 				"antialias" 	"1"
@@ -1541,7 +1541,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"		"Lato"
+				"name"		"TF2"
 				"tall"		"24"
 				"antialias" "1"
 				"weight"	"500"
@@ -1551,7 +1551,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"		"Lato"
+				"name"		"TF2 Secondary"
 				"tall"		"11"
 				"tall_lodef"	"14"
 				"antialias" "1"
@@ -1562,7 +1562,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"		"Lato"
+				"name"		"TF2"
 				"tall"		"12"
 				"antialias" "1"
 				"weight"	"500"
@@ -1668,7 +1668,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"		"Lato"
+				"name"		"TF2 Secondary"
 				"tall"		"10"
 				"tall_hidef"	"12"
 				"tall_lodef"	"14"
@@ -1681,7 +1681,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"		"Lato"
+				"name"		"TF2"
 				"tall"		"14"
 				"weight"	"500"
 				"range"		"0x0000 0x007F"	//	Basic Latin
@@ -1693,7 +1693,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"		"Lato"
+				"name"		"TF2 Secondary"
 				"tall"		"20"
 				"weight"	"500"
 				"range"		"0x0000 0x007F"	//	Basic Latin
@@ -1705,7 +1705,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"		"Lato"
+				"name"		"TF2 Secondary"
 				"tall"		"20"
 				"tall_hidef"	"24"
 				"tall_lodef"	"24"
@@ -1719,7 +1719,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"		"Lato"
+				"name"		"TF2 Secondary"
 				"tall"		"14"
 				"weight"	"500"
 				"range"		"0x0000 0x007F"	//	Basic Latin
@@ -1731,7 +1731,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"		"Lato"
+				"name"		"TF2 Secondary"
 				"tall"		"20"
 				"weight"	"500"
 				"range"		"0x0000 0x007F"	//	Basic Latin
@@ -1743,7 +1743,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"		"Lato"
+				"name"		"TF2 Secondary"
 				"tall"		"34"
 				"tall_hidef"	"38"
 				"tall_lodef"	"38"
@@ -1758,7 +1758,7 @@ Scheme
  		{
 			"1"
 			{
-				"name"		"Lato"
+				"name"		"TF2"
 				"tall"		"36"
 				"tall_hidef"	"48"
 				"weight"	"500"
@@ -1770,7 +1770,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"		"Lato"
+				"name"		"TF2"
 				"tall"		"52"
 				"tall_lodef"		"80"
 				"range" 	"0x0000 0x00FF"
@@ -1780,7 +1780,7 @@ Scheme
 			}
 			"2"
 			{
-				"name"		"Lato"
+				"name"		"TF2"
 				"tall"		"72"
 				"tall_hidef"	"120"
 				"range" 	"0x0000 0x00FF"
@@ -1790,7 +1790,7 @@ Scheme
 			}
 			"3"
 			{
-				"name"		"Lato"
+				"name"		"TF2"
 				"tall"		"100"
 				"range" 	"0x0000 0x00FF"
 				"weight"	"400"
@@ -1799,7 +1799,7 @@ Scheme
 			}
 			"4"
 			{
-				"name"		"Lato"
+				"name"		"TF2"
 				"tall"		"140"
 				"range" 	"0x0000 0x00FF"
 				"weight"	"400"
@@ -1808,7 +1808,7 @@ Scheme
 			}
 			"5"
 			{
-				"name"		"Lato"
+				"name"		"TF2"
 				"tall"		"180"
 				"range" 	"0x0000 0x00FF"
 				"weight"	"400"
@@ -1821,7 +1821,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"		"Lato"
+				"name"		"TF2"
 				"tall"		"36"
 				"weight"	"500"
 				"range"		"0x0000 0x007F"	//	Basic Latin
@@ -1833,7 +1833,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"		"Lato"
+				"name"		"TF2 Secondary"
 				"tall"		"14"
 				"weight"	"400"
 				"additive"	"0"
@@ -1844,7 +1844,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"		"Lato"
+				"name"		"TF2 Secondary"
 				"tall"		"10"
 				"weight"	"400"
 				"additive"	"0"
@@ -1855,7 +1855,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"		"Lato"
+				"name"		"TF2 Secondary"
 				"tall"		"7"
 				"weight"	"400"
 				"additive"	"0"
@@ -1867,7 +1867,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"		"Lato"
+				"name"		"TF2 Secondary"
 				"tall"		"10"
 				"tall_hidef"	"12"
 				"tall_lodef"	"14"
@@ -1986,7 +1986,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"		"Lato"
+				"name"		"TF2"
 				"tall"		"12"
 				"weight"	"700"
 				"yres"		"480 599"
@@ -2086,7 +2086,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"		"Lato"
+				"name"		"TF2"
 				"tall"		"14"
 				"tall_lodef"	"18"
 				"range" 		"0x0000 0x00FF"
@@ -2099,7 +2099,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"		"Lato"
+				"name"		"TF2"
 				"tall"		"10"
 				"weight"	"500"
 				"range"		"0x0000 0x017F" //	Basic Latin, Latin-1 Supplement, Latin Extended-A
@@ -2111,7 +2111,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"		"Lato"
+				"name"		"TF2"
 				"tall"		"8"
 				"weight"	"500"
 				"range"		"0x0000 0x017F" //	Basic Latin, Latin-1 Supplement, Latin Extended-A
@@ -2164,7 +2164,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"		"Gobold"
+				"name"		"TF2 Build"
 				"tall"		"36"
 				"tall_lodef"		"28"
 				"weight"	"500"
@@ -2174,7 +2174,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"		"Gobold"
+				"name"		"TF2 Build"
 				"tall"		"30"
 				"tall_lodef"		"22"
 				"weight"	"500"
@@ -2184,7 +2184,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"		"Lato"
+				"name"		"TF2 Secondary"
 				"tall"		"28"
 				"tall_lodef"	"24"
 				"weight"	"500"
@@ -2212,7 +2212,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"		"Lato"
+				"name"		"TF2 Secondary"
 				"tall"		"22"
 				"weight"	"500"
 			}
@@ -2221,7 +2221,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"		"Lato"
+				"name"		"TF2 Secondary"
 				"tall"		"18"
 				"weight"	"500"
 			}
@@ -2260,7 +2260,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"		"Gobold"
+				"name"		"TF2 Build"
 				"tall"		"36"
 				"weight"	"500"
 				"additive"	"0"
@@ -2271,7 +2271,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"		"Lato"
+				"name"		"TF2 Secondary"
 				"tall"		"11"
 				"weight"	"600"
 				"additive"	"0"
@@ -2282,7 +2282,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"		"Lato"
+				"name"		"TF2 Secondary"
 				"tall"		"18"
 				"weight"	"400"
 				"additive"	"0"
@@ -2370,7 +2370,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"		"Gobold"
+				"name"		"TF2 Build"
 				"tall"		"8"
 				"weight"	"500"
 				"additive"	"0"
@@ -2381,7 +2381,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"		"Gobold"
+				"name"		"TF2 Build"
 				"tall"		"9"
 				"weight"	"500"
 				"additive"	"0"
@@ -2392,7 +2392,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"		"Gobold"
+				"name"		"TF2 Build"
 				"tall"		"12"
 				"weight"	"500"
 				"additive"	"0"
@@ -2403,7 +2403,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"		"Gobold"
+				"name"		"TF2 Build"
 				"tall"		"18"
 				"weight"	"500"
 				"additive"	"0"
@@ -2414,7 +2414,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"		"Lato"
+				"name"		"TF2 Secondary"
 				"tall"		"7"
 				"weight"	"500"
 				"additive"	"0"
@@ -2435,7 +2435,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"		"Lato"
+				"name"		"TF2 Secondary"
 				"tall"		"8"
 				"weight"	"500"
 				"additive"	"0"
@@ -2446,7 +2446,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"		"Lato"
+				"name"		"TF2 Secondary"
 				"tall"		"11"
 				"weight"	"500"
 				"additive"	"0"
@@ -2457,7 +2457,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"		"Lato"
+				"name"		"TF2 Secondary"
 				"tall"		"14"
 				"weight"	"500"
 				"additive"	"0"
@@ -2469,7 +2469,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"		"Gobold"
+				"name"		"TF2 Build"
 				"tall"		"9"
 				"weight"	"500"
 				"additive"	"0"
@@ -2480,7 +2480,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"			"Gobold"
+				"name"			"TF2 Build"
 				"tall"			"9"
 				"weight"		"500"
 				"blur"			"3"
@@ -2642,7 +2642,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"		"Lato"
+				"name"		"TF2 Secondary"
 				"tall"		"10"
 				"weight"	"400"
 				"yres"		"480 599"
@@ -2651,7 +2651,7 @@ Scheme
 			}
 			"2"
 			{
-				"name"		"Lato"
+				"name"		"TF2 Secondary"
 				"tall"		"14"
 				"weight"	"400"
 				"additive"	"0"
@@ -2660,7 +2660,7 @@ Scheme
 			}
 			"3"
 			{
-				"name"		"Lato"
+				"name"		"TF2 Secondary"
 				"tall"		"22"
 				"weight"	"400"
 				"additive"	"0"
@@ -2673,7 +2673,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"		"Lato"
+				"name"		"TF2 Secondary"
 				"tall"		"10"
 				"weight"	"400"
 				"yres"		"480 599"
@@ -2683,7 +2683,7 @@ Scheme
 			}
 			"2"
 			{
-				"name"		"Lato"
+				"name"		"TF2 Secondary"
 				"tall"		"14"
 				"weight"	"400"
 				"additive"	"0"
@@ -2693,7 +2693,7 @@ Scheme
 			}
 			"3"
 			{
-				"name"		"Lato"
+				"name"		"TF2 Secondary"
 				"tall"		"22"
 				"weight"	"400"
 				"additive"	"0"
@@ -2707,7 +2707,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"		"Lato"
+				"name"		"TF2 Secondary"
 				"tall"		"10"
 				"weight"	"800"
 				"yres"		"480 599"
@@ -2716,7 +2716,7 @@ Scheme
 			}
 			"2"
 			{
-				"name"		"Lato"
+				"name"		"TF2 Secondary"
 				"tall"		"14"
 				"weight"	"800"
 				"additive"	"0"
@@ -2725,7 +2725,7 @@ Scheme
 			}
 			"3"
 			{
-				"name"		"Lato"
+				"name"		"TF2 Secondary"
 				"tall"		"18"
 				"weight"	"800"
 				"additive"	"0"
@@ -2738,7 +2738,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"		"Lato"
+				"name"		"TF2 Secondary"
 				"tall"		"13"
 				"weight"	"400"
 				"additive"	"0"
@@ -2750,7 +2750,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"		"Lato"
+				"name"		"TF2 Secondary"
 				"tall"		"16"
 				"weight"	"400"
 				"additive"	"0"
@@ -2761,7 +2761,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"		"Lato"
+				"name"		"TF2 Secondary"
 				"tall"		"12"
 				"weight"	"400"
 				"additive"	"0"
@@ -2869,7 +2869,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"		"Lato"
+				"name"		"TF2 Secondary"
 				"tall"		"11"
 				"weight"	"500"
 				"additive"	"0"
@@ -2933,7 +2933,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"		"Gobold"
+				"name"		"TF2 Build"
 				"tall"		"11"
 				"weight"	"500"
 				"additive"	"0"
@@ -2944,7 +2944,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"		"Gobold"
+				"name"		"TF2 Build"
 				"tall"		"14"
 				"weight"	"500"
 				"additive"	"0"
@@ -2955,7 +2955,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"		"Lato"
+				"name"		"TF2"
 				"tall"		"18"
 				"tall_hidef"	"24"
 				"tall_lodef"	"18"
@@ -2968,7 +2968,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"		"Gobold"
+				"name"		"TF2 Build"
 				"tall"		"24"
 				"weight"	"500"
 				"additive"	"0"
@@ -2979,7 +2979,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"		"Lato"
+				"name"		"TF2 Secondary"
 				"tall"		"18"
 				"tall_hidef"	"24"
 				"tall_lodef"	"20"
@@ -2996,7 +2996,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"		"Gobold"
+				"name"		"TF2 Build"
 				"tall"		"14"
 				"weight"	"500"
 				"additive"	"0"
@@ -3007,7 +3007,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"		"Gobold"
+				"name"		"TF2 Build"
 				"tall"		"24"
 				"weight"	"500"
 				"additive"	"0"
@@ -3019,7 +3019,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"		"Lato"
+				"name"		"TF2 Secondary"
 				"tall"		"15"
 				"weight"	"500"
 				"range"		"0x0000 0x007F"	//	Basic Latin
@@ -3032,7 +3032,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"		"Lato"
+				"name"		"TF2 Secondary"
 				"tall"		"9"
 				"weight"	"400"
 				"additive"	"0"
@@ -3045,7 +3045,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"		"Gobold"
+				"name"		"TF2 Build"
 				"tall"		"11"
 				"weight"	"500"
 				"antialias" 	"1"
@@ -3057,7 +3057,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"		"Gobold"
+				"name"		"TF2 Build"
 				"tall"		"11"
 				"weight"	"500"
 				"blur"		"3"
@@ -3071,7 +3071,7 @@ Scheme
 		{
 			"1"
 			{
-				"name"		"Gobold"
+				"name"		"TF2 Build"
 				"tall"		"12"
 				"weight"	"500"
 				"additive"	"0"
@@ -3158,7 +3158,7 @@ Scheme
 		"3"
 		{
 			"font" "resource/TF2.ttf"
-			"name" "Lato"
+			"name" "TF2"
 			"russian"
 			{
 				"range" "0x0000 0xFFFF"
@@ -3171,7 +3171,7 @@ Scheme
 		"4" 
 		{
 			"font" "resource/TF2Secondary.ttf"
-			"name" "Lato"
+			"name" "TF2 Secondary"
 			"russian"
 			{
 				"range" "0x0000 0xFFFF"
@@ -3197,7 +3197,7 @@ Scheme
 		"6" 
 		{
 			"font" "resource/TF2Build.ttf"
-			"name" "Gobold"
+			"name" "TF2 Build"
 			"russian"
 			{
 				"range" "0x0000 0xFFFF"
@@ -3300,6 +3300,3 @@ Scheme
 
 
 
-
-
-
diff --git a/hud_toonhud/resource/ui/hudaccountpanel.res b/hud_toonhud/resource/ui/hudaccountpanel.res
index 09d424f..0ff7116 100644
--- a/hud_toonhud/resource/ui/hudaccountpanel.res
+++ b/hud_toonhud/resource/ui/hudaccountpanel.res
@@ -2,41 +2,68 @@
 {
 	"CHudAccountPanel"
 	{
-		"delta_item_x"			"42"
+		"delta_item_x"			"30"
 		"delta_item_start_y"	"0"
 		"delta_item_end_y"		"0"
+		"delta_item_x_minmode"			"83"
+		"delta_item_start_y_minmode"	"0"
+		"delta_item_end_y_minmode"		"30"
 		"PositiveColor"			"0 255 0 255"
 		"NegativeColor"			"255 0 0 255"
-		"delta_lifetime"		"0.8"
-		"delta_item_font"		"G_FontSmall"
-		"textAlignment"			"center"
-		"zpos"					"0"
+		"delta_lifetime"		"1.2"
+		"delta_item_font"		"G_FontMedium"
+		"textAlignment"			"east"
+		"textAlignment_minmode"	"east"
+		"zpos"					"20"
 	}
 	
-	"Background"
+	"MetalIcon"
 	{
-		"ControlName"			"EditablePanel"
-		"fieldName"				"Background"
-		"xpos"					"0"
+		"ControlName"			"CExLabel"
+		"fieldName"				"MetalIcon"
+		"xpos"					"124"
 		"ypos"					"0"
-		"zpos"					"0"
-		"wide"					"40"
-		"tall"					"15"
+		"zpos"					"2"
+		"wide"					"16"
+		"tall"					"25"
+		"textinsetx"			"0"
+		"textinsety"			"0"
 		"visible"				"1"
 		"enabled"				"1"
-		"bgcolor_override"		"G_CenteredMetalBg"
-		"paintbackgroundtype"	"2"
+		"labelText"				"M"
+		"textAlignment"			"west"
+		"font"					"G_HeadsIcon"
+		"fgcolor_override"		"G_MetalIcon"
+	}
+	
+	"MetalIconShadow"
+	{
+		"ControlName"			"CExLabel"
+		"fieldName"				"MetalIconShadow"
+		"xpos"					"125"
+		"ypos"					"1"
+		"zpos"					"2"
+		"wide"					"16"
+		"tall"					"25"
+		"textinsetx"			"0"
+		"textinsety"			"0"
+		"visible"				"1"
+		"enabled"				"1"
+		"labelText"				"M"
+		"textAlignment"			"west"
+		"font"					"G_HeadsIcon"
+		"fgcolor_override"		"G_Shadow"
 	}
 	
 	"AccountValue"
 	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"AccountValue"
-		"xpos"			"0"
+		"xpos"			"50"
 		"ypos"			"0"
 		"zpos"			"2"
-		"wide"			"40"
-		"tall"			"15"
+		"wide"			"74"
+		"tall"			"25"
 		"textinsetx"	"5"
 		"autoResize"	"1"
 		"pinCorner"		"2"
@@ -44,10 +71,10 @@
 		"enabled"		"1"
 		"tabPosition"	"0"
 		"labelText"		"%metal%"
-		"textAlignment"	"center"
+		"textAlignment"	"east"
 		"dulltext"		"0"
 		"brighttext"	"0"
-		"font"			"G_FontSmall"
+		"font"			"G_FontMedium"
 		"fgcolor"		"G_MetalValue"
 	}
 	
@@ -55,11 +82,11 @@
 	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"AccountValueShadow"
-		"xpos"			"1"
+		"xpos"			"51"
 		"ypos"			"1"
 		"zpos"			"2"
-		"wide"			"40"
-		"tall"			"15"
+		"wide"			"74"
+		"tall"			"25"
 		"textinsetx"	"5"
 		"autoResize"	"1"
 		"pinCorner"		"2"
@@ -67,10 +94,10 @@
 		"enabled"		"1"
 		"tabPosition"	"0"
 		"labelText"		"%metal%"
-		"textAlignment"	"center"
+		"textAlignment"	"east"
 		"dulltext"		"0"
 		"brighttext"	"0"
-		"font"			"G_FontSmall"
+		"font"			"G_FontMedium"
 		"fgcolor"		"G_Shadow"
 	}
 }
\ No newline at end of file
diff --git a/hud_toonhud/resource/ui/hudplayerhealth.res b/hud_toonhud/resource/ui/hudplayerhealth.res
index c165290..eb0e281 100644
--- a/hud_toonhud/resource/ui/hudplayerhealth.res
+++ b/hud_toonhud/resource/ui/hudplayerhealth.res
@@ -118,8 +118,8 @@
 		"zpos"			"4"
 		"wide"			"50" // HB size
 		"tall"			"50" // HB size
-		"visible"		"0" // HB enabled
-		"enabled"		"0" // HB enabled
+		"visible"		"1" // HB enabled
+		"enabled"		"1" // HB enabled
 		"scaleImage"	"1"	
 	}
 	
@@ -134,9 +134,9 @@
 		"zpos"			"3"
 		"wide"			"54" // HB bg size
 		"tall"			"54"// HB bg size
-		"visible"		"0" // HB enabled
-		"enabled"		"0" // HB enabled
-		"Alpha"			"0" // HB enabled
+		"visible"		"1" // HB enabled
+		"enabled"		"1" // HB enabled
+		"Alpha"			"255" // HB enabled
 		"image"			"../hud/health_bg"
 		"scaleImage"	"1"
 	}	
@@ -758,4 +758,3 @@
 
 
 
-
diff --git a/hud_toonhud/resource/ui/mainmenuoverride.res b/hud_toonhud/resource/ui/mainmenuoverride.res
index 964e216..36a4f88 100644
--- a/hud_toonhud/resource/ui/mainmenuoverride.res
+++ b/hud_toonhud/resource/ui/mainmenuoverride.res
@@ -461,7 +461,7 @@
 		"xpos"			"0"
 		"ypos"			"10" // BMPY (10)
 		"wide"			"160"
-		"tall"			"80" // BMPH (0, 30, 55, 80)
+		"tall"			"55" // BMPH (0, 30, 55, 80)
 		"zpos"			"5"
 		"visible"		"1"
 		"bgcolor_override"	"G_MainMenuPanel"
@@ -1695,7 +1695,7 @@
 		"xpos"			"0"
 		"ypos"			"10"
 		"wide"			"160"
-		"tall"			"105" // FLPH (195, 155, 130, 105)
+		"tall"			"130" // FLPH (195, 155, 130, 105)
 		"zpos"			"5"
 		"visible"		"1"	// HFLFMM
 		"bgcolor_override"	"G_MainMenuPanel"
@@ -1713,7 +1713,7 @@
 		"ypos"			"0"
 		"zpos"			"6"
 		"wide"			"160"
-		"tall"			"105" // FLPH (195, 155, 130, 105)
+		"tall"			"130" // FLPH (195, 155, 130, 105)
 		"visible"		"1"	// HFLFMM
 		"enabled"		"1"	// HFLFMM
 		"border"		"NoBorder"
@@ -1766,7 +1766,7 @@
 			"ypos"			"0"
 			"zpos"			"500"
 			"wide"			"160"
-			"tall"			"105" // FLPH (195, 155, 130, 105)
+			"tall"			"130" // FLPH (195, 155, 130, 105)
 			"visible"		"1"
 			"proportionaltoparent"	"1"
 
@@ -2039,7 +2039,7 @@
 		"tall"			"20"
 		"zpos"			"11"
 		"visible"		"1" // 1 BM1
-		"Command"		"engine connect games.shoebottom.ca; password 'letmegetayellow'; rcon_password 'aphidgang'" // 3 BM1
+		"Command"		"engine snd_restart; hud_reloadscheme" // 3 BM1
 		"PaintBackgroundType"	"2"
 		"paintborder"	"1"
 		"border"		"NoBorder"
@@ -2047,7 +2047,7 @@
 		"navDown"		"Bookmark_2"
 		"navRight"		"Notifications_ShowButtonPanel"
 		"navToRelay"	"SubButton"
-		"labelText"		"My Scrim Server" // 2 BM1
+		"labelText"		"Reload" // 2 BM1
 		"textinsetx"	"10"
 		"pin_to_sibling"			"G_BookmarkPanel"
 		"pin_corner_to_sibling"		"0"
@@ -2077,7 +2077,7 @@
 		"tall"			"20"
 		"zpos"			"11"
 		"visible"		"1" // 1 BM2
-		"Command"		"engine pug.fluffycat.gay; password 'girlpound'" // 3 BM2
+		"Command"		"engine incrementvar r_drawviewmodel 0 1 1" // 3 BM2
 		"PaintBackgroundType"	"2"
 		"paintborder"	"1"
 		"border"		"NoBorder"
@@ -2085,7 +2085,7 @@
 		"navDown"		"Bookmark_3"
 		"navRight"		"Notifications_ShowButtonPanel"
 		"navToRelay"	"SubButton"
-		"labelText"		"TKGP Pug Server" // 2 BM2
+		"labelText"		"Viewmodel" // 2 BM2
 		"textinsetx"	"10"
 		"pin_to_sibling"			"G_BookmarkPanel"
 		"pin_corner_to_sibling"		"0"
@@ -2115,14 +2115,14 @@
 		"tall"			"20"
 		"zpos"			"11"
 		"visible"		"1" // 1 BM3
-		"Command"		"engine 'snd_restart; hud_reloadscheme'" // 3 BM3
+		"Command"		"engine incrementvar cl_first_person_uses_world_model 0 1 1" // 3 BM3
 		"PaintBackgroundType"	"2"
 		"paintborder"	"1"
 		"border"		"NoBorder"
 		"navUp"			"Bookmark_2"
 		"navRight"		"Notifications_ShowButtonPanel"
 		"navToRelay"	"SubButton"
-		"labelText"		"Reload HUD/Sound" // 2 BM3
+		"labelText"		"VR" // 2 BM3
 		"textinsetx"	"10"
 		"pin_to_sibling"			"G_BookmarkPanel"
 		"pin_corner_to_sibling"		"0"
@@ -2154,7 +2154,7 @@
  		"tall"			"20"
  		"zpos"			"11"
  		"visible"		"1" // 1 BM1
- 		"Command"		"engine connect games.shoebottom.ca; password 'letmegetayellow'; rcon_password 'aphidgang'" // 3 BM1
+ 		"Command"		"engine snd_restart; hud_reloadscheme" // 3 BM1
  		"PaintBackgroundType"	"2"
  		"paintborder"	"1"
  		"border"		"NoBorder"
@@ -2162,7 +2162,7 @@
 		"navDown"		"Bookmark_3"
 		"navRight"		"Bookmark_2"
 		"navToRelay"	"SubButton"
- 		"labelText"		"My Scrim Server" // 2 BM1
+ 		"labelText"		"Reload" // 2 BM1
  		"textinsetx"	"10"
 		"pin_to_sibling"			"G_BookmarkPanel"
 		"pin_corner_to_sibling"		"0"
@@ -2192,7 +2192,7 @@
  		"tall"			"20"
  		"zpos"			"11"
  		"visible"		"1" // 1 BM2
- 		"Command"		"engine pug.fluffycat.gay; password 'girlpound'" // 3 BM2
+ 		"Command"		"engine incrementvar r_drawviewmodel 0 1 1" // 3 BM2
  		"PaintBackgroundType"	"2"
  		"paintborder"	"1"
  		"border"		"NoBorder"
@@ -2201,7 +2201,7 @@
 		"navLeft"		"Bookmark_1"
 		"navRight"		"Notifications_ShowButtonPanel"
 		"navToRelay"	"SubButton"
- 		"labelText"		"TKGP Pug Server" // 2 BM2
+ 		"labelText"		"Viewmodel" // 2 BM2
  		"textinsetx"	"10"
 		"pin_to_sibling"			"G_BookmarkPanel"
 		"pin_corner_to_sibling"		"0"
@@ -2231,7 +2231,7 @@
  		"tall"			"20"
  		"zpos"			"11"
  		"visible"		"1" // 1 BM3
- 		"Command"		"engine 'snd_restart; hud_reloadscheme'" // 3 BM3
+ 		"Command"		"engine incrementvar cl_first_person_uses_world_model 0 1 1" // 3 BM3
  		"PaintBackgroundType"	"2"
  		"paintborder"	"1"
  		"border"		"NoBorder"
@@ -2239,7 +2239,7 @@
 		"navDown"		"Bookmark_5"
 		"navRight"		"Bookmark_4"
 		"navToRelay"	"SubButton"
- 		"labelText"		"Reload HUD/Sound" // 2 BM3
+ 		"labelText"		"VR" // 2 BM3
  		"textinsetx"	"10"
 		"pin_to_sibling"			"G_BookmarkPanel"
 		"pin_corner_to_sibling"		"0"
@@ -2269,7 +2269,7 @@
 		"tall"			"20"
 		"zpos"			"11"
 		"visible"		"1" // 1 BM4
-		"Command"		"engine connect tf2.fluffycat.gay" // 3 BM4
+		"Command"		"engine incrementvartf_use_min_viewmodel 0 1 1" // 3 BM4
 		"PaintBackgroundType"	"2"
 		"paintborder"	"1"
 		"border"		"NoBorder"
@@ -2278,7 +2278,7 @@
 		"navLeft"		"Bookmark_3"
 		"navRight"		"Notifications_ShowButtonPanel"
 		"navToRelay"	"SubButton"
-		"labelText"		"TKGP Main Server" // 2 BM4
+		"labelText"		"Minmode" // 2 BM4
 		"textinsetx"	"10"
 		"pin_to_sibling"			"G_BookmarkPanel"
 		"pin_corner_to_sibling"		"0"
@@ -2307,15 +2307,15 @@
 		"wide"			"72.5"
 		"tall"			"20"
 		"zpos"			"11"
-		"visible"		"1" // 1 BM5
-		"Command"		"engine connect 192.99.19.228:27016" // 3 BM5
+		"visible"		"0" // 1 BM5
+		"Command"		"" // 3 BM5
 		"PaintBackgroundType"	"2"
 		"paintborder"	"1"
 		"border"		"NoBorder"
 		"navUp"			"Bookmark_3"
 		"navRight"		"Bookmark_6"
 		"navToRelay"	"SubButton"
-		"labelText"		"The Furry Pound" // 2 BM5
+		"labelText"		"Bookmark 5" // 2 BM5
 		"textinsetx"	"10"
 		"pin_to_sibling"			"G_BookmarkPanel"
 		"pin_corner_to_sibling"		"0"
@@ -2344,8 +2344,8 @@
 		"wide"			"72.5"
 		"tall"			"20"
 		"zpos"			"11"
-		"visible"		"1" // 1 BM6
-		"Command"		"engine connect nyc-1.us.uncletopia.com" // 3 BM6
+		"visible"		"0" // 1 BM6
+		"Command"		"" // 3 BM6
 		"PaintBackgroundType"	"2"
 		"paintborder"	"1"
 		"border"		"NoBorder"
@@ -2353,7 +2353,7 @@
 		"navLeft"		"Bookmark_5"
 		"navRight"		"Notifications_ShowButtonPanel"
 		"navToRelay"	"SubButton"
-		"labelText"		"Uncletopia" // 2 BM6
+		"labelText"		"Bookmark 6" // 2 BM6
 		"textinsetx"	"10"
 		"pin_to_sibling"			"G_BookmarkPanel"
 		"pin_corner_to_sibling"		"0"
@@ -4586,22 +4586,6 @@
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 
 
 
diff --git a/hud_toonhud/resource/ui/scoreboard.res b/hud_toonhud/resource/ui/scoreboard.res
index c7faa8d..1b9aa10 100644
--- a/hud_toonhud/resource/ui/scoreboard.res
+++ b/hud_toonhud/resource/ui/scoreboard.res
@@ -32,7 +32,7 @@
 		"ControlName"		"EditablePanel"
 		"fieldName"			"Borders"
 		"xpos"				"0"
-		"ypos"				"89"
+		"ypos"				"43"
 		"zpos"				"19"
 		"wide"				"600"
 		"tall"				"20"
@@ -52,7 +52,7 @@
 		"ControlName"		"CTFImagePanel"
 		"fieldName"			"Gradient"
 		"xpos"				"0"
-		"ypos"				"89"
+		"ypos"				"43"
 		"zpos"				"5"
 		"wide"				"600"
 		"tall"				"20"
@@ -94,7 +94,7 @@
 		"ControlName"	"EditablePanel"
 		"fieldName"		"G_BlueScoreBG"
 		"xpos"			"0"
-		"ypos"			"89"
+		"ypos"			"43"
 		"wide"			"290"
 		"tall"			"20"
 		"zpos"			"2"
@@ -133,7 +133,7 @@
 		"ControlName"	"CAvatarImagePanel"
 		"fieldName"		"BlueLeaderAvatar"
 		"xpos"			"0"
-		"ypos"			"63"
+		"ypos"			"17"
 		"zpos"			"25"
 		"wide"			"24"
 		"tall"			"24"
@@ -187,7 +187,7 @@
 		"ControlName"	"EditablePanel"
 		"fieldName"		"G_RedScoreBG"
 		"xpos"			"0"
-		"ypos"			"89"
+		"ypos"			"43"
 		"wide"			"600"
 		"tall"			"20"
 		"zpos"			"1"
@@ -226,7 +226,7 @@
 		"ControlName"	"CAvatarImagePanel"
 		"fieldName"		"RedLeaderAvatar"
 		"xpos"			"576"
-		"ypos"			"63"
+		"ypos"			"17"
 		"zpos"			"25"
 		"wide"			"24"
 		"tall"			"24"
@@ -260,7 +260,7 @@
 		"textAlignment"	"west"
 		"xpos"			"290" [$WINDOWS]
 		"xpos"			"289" [!$WINDOWS]
-		"ypos"			"89"
+		"ypos"			"43"
 		"wide"			"20"
 		"tall"			"20" [$WINDOWS]
 		"tall"			"21" [!$WINDOWS]
@@ -285,10 +285,10 @@
 		"ControlName"	"EditablePanel"
 		"fieldName"		"PlayersBg"
 		"xpos"			"0"
-		"ypos"			"110"
+		"ypos"			"64"
 		"zpos"			"0"
 		"wide"			"600"
-		"tall"			"302"
+		"tall"			"374"
 		"autoResize"	"0"
 		"pinCorner"		"0"
 		"visible"		"1"
@@ -332,7 +332,7 @@
 		"labelText"		"%blueteamname%"
 		"textAlignment"	"west"
 		"xpos"			"10"
-		"ypos"			"89"
+		"ypos"			"43"
 		"zpos"			"4"
 		"wide"			"140"
 		"tall"			"20"
@@ -356,7 +356,7 @@
 		"labelText"			"%blueteamscore%"
 		"textAlignment"		"east"
 		"xpos"				"190"
-		"ypos"				"89"
+		"ypos"				"43"
 		"zpos"				"4"
 		"wide"				"100"
 		"tall"				"20"
@@ -399,7 +399,7 @@
 		"labelText"			"%blueteamplayercount%"
 		"textAlignment"		"west"
 		"xpos"				"150"
-		"ypos"				"89"
+		"ypos"				"43"
 		"zpos"				"4"
 		"wide"				"100"
 		"tall"				"20"
@@ -423,7 +423,7 @@
 		"labelText"		"%redteamname%"
 		"textAlignment"	"east"
 		"xpos"			"450"
-		"ypos"			"89"
+		"ypos"			"43"
 		"zpos"			"4"
 		"wide"			"140"
 		"tall"			"20"
@@ -448,7 +448,7 @@
 		"labelText"		"%redteamscore%"
 		"textAlignment"	"west"
 		"xpos"			"310"
-		"ypos"			"89"
+		"ypos"			"43"
 		"zpos"			"4"
 		"wide"			"100"
 		"tall"			"20"
@@ -491,7 +491,7 @@
 		"labelText"		"%redteamplayercount%"
 		"textAlignment"	"east"
 		"xpos"			"350"
-		"ypos"			"89"
+		"ypos"			"43"
 		"zpos"			"4"
 		"wide"			"100"
 		"tall"			"20"
@@ -514,7 +514,7 @@
 		"labelText"		"%server%"
 		"textAlignment"	"east"
 		"xpos"			"296"
-		"ypos"			"399"
+		"ypos"			"425"
 		"zpos"			"22"
 		"wide"			"300"
 		"tall"			"12"
@@ -537,7 +537,7 @@
 		"labelText"		"%servertime%"
 		"textAlignment"	"east"
 		"xpos"			"366"
-		"ypos"			"348"
+		"ypos"			"374"
 		"zpos"			"22"
 		"wide"			"230"
 		"tall"			"12"
@@ -558,10 +558,10 @@
 		"ControlName"	"SectionedListPanel"
 		"fieldName"		"BluePlayerList"
 		"xpos"			"5"
-		"ypos"			"111"
+		"ypos"			"65"
 		"zpos"			"20"
 		"wide"			"290"
-		"tall"			"225"
+		"tall"			"300"
 		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
@@ -580,10 +580,10 @@
 		"ControlName"	"SectionedListPanel"
 		"fieldName"		"RedPlayerList"
 		"xpos"			"305"
-		"ypos"			"111"
+		"ypos"			"65"
 		"zpos"			"20"
 		"wide"			"290"
-		"tall"			"225"
+		"tall"			"300"
 		"pinCorner"		"0"
 		"visible"		"0"
 		"enabled"		"0"
@@ -624,7 +624,7 @@
 		"labelText"		"%spectators%"
 		"textAlignment"	"west"
 		"xpos"			"70"
-		"ypos"			"348"
+		"ypos"			"374"
 		"zpos"			"21"
 		"wide"			"395"
 		"tall"			"12"
@@ -648,7 +648,7 @@
 		"labelText"		"%waitingtoplay%"
 		"textAlignment"	"west"
 		"xpos"			"70"
-		"ypos"			"399"
+		"ypos"			"425"
 		"zpos"			"4"
 		"wide"			"424"
 		"tall"			"12"
@@ -669,7 +669,7 @@
 		"ControlName"	"CTFImagePanel"
 		"fieldName"		"TeamStripe"
 		"xpos"			"0"
-		"ypos"			"360"
+		"ypos"			"386"
 		"zpos"			"18"	
 		"wide"			"600"
 		"tall"			"40"
@@ -701,7 +701,7 @@
 		"ControlName"	"ImagePanel"
 		"fieldName"		"ClassImage"
 		"xpos"			"2"
-		"ypos"			"345"
+		"ypos"			"371"
 		"zpos"			"19"
 		"wide"			"66"
 		"tall"			"66"
@@ -722,7 +722,7 @@
 		"ControlName"	"CTFPlayerModelPanel"
 		"fieldName"		"classmodelpanel"
 		"xpos"			"0"
-		"ypos"			"231"
+		"ypos"			"257"
 		"zpos"			"19"
 		"wide"			"90"
 		"tall"			"180"
@@ -885,7 +885,7 @@
 		"labelText"		"%mapname%"
 		"textAlignment"	"center"
 		"xpos"			"513"
-		"ypos"			"360"
+		"ypos"			"386"
 		"zpos"			"30"
 		"wide"			"87"
 		"tall"			"40"
@@ -943,7 +943,7 @@
 		"ControlName"	"EditablePanel"
 		"fieldName"		"LocalPlayerDuelStatsPanel"
 		"xpos"			"1"
-		"ypos"			"356"
+		"ypos"			"382"
 		"zpos"			"50"		
 		"wide"			"598"
 		"tall"			"50"
@@ -1163,7 +1163,7 @@
 		"ControlName"	"EditablePanel"
 		"fieldName"		"LocalPlayerStatsPanel"
 		"xpos"			"0"
-		"ypos"			"343"
+		"ypos"			"369"
 		"zpos"			"21"
 		"wide"			"600"
 		"tall"			"448"
@@ -1422,11 +1422,11 @@
 		
 		"DominationLabel"
 		{
-			"ControlName"	"CExLabel"
+			"ControlName"		"CExLabel"
 			"fieldName"		"DominationLabel"
 			"font"			"ScoreboardVerySmall"
 			"labelText"		"#TF_ScoreBoard_DominationLabel"
-			"textAlignment"	"east"
+			"textAlignment"		"east"
 			"xpos"			"293"
 			"ypos"			"27"
 			"zpos"			"3"
@@ -1526,7 +1526,7 @@
 						
 		"HeadshotsLabel"
 		{
-			"ControlName"	"CExLabel"
+			"ControlName"		"CExLabel"
 			"fieldName"		"HeadshotsLabel"
 			"font"			"ScoreboardVerySmall"
 			"labelText"		"#TF_ScoreBoard_HeadshotsLabel"
diff --git a/hud_toonhud/scripts/hudlayout.res b/hud_toonhud/scripts/hudlayout.res
index e8dc60a..f333e60 100644
--- a/hud_toonhud/scripts/hudlayout.res
+++ b/hud_toonhud/scripts/hudlayout.res
@@ -197,10 +197,10 @@
 		"fieldName"				"CHudAccountPanel"
 		"wide"					"200"
 		"tall"					"60"
-		"xpos"					"c-20" // 1 CM
-		"xpos_minmode"			"c-20" // 2 CM
-		"ypos"					"c10" // 3 CM
-		"ypos_minmode"			"c10" // 4 CM
+		"xpos"					"c+140" // 1 CM
+		"xpos_minmode"			"c+120" // 2 CM
+		"ypos"					"r32" // 3 CM
+		"ypos_minmode"			"c+108" // 4 CM
 		"visible" 				"1"
 		"enabled" 				"1"
 		"paintbackground"		"1"
@@ -1524,7 +1524,3 @@
 
 
 
-
-
-
-