diff --git a/config_personal/cfg/binds.cfg b/config_personal/cfg/binds.cfg
index a7587cf..accaad3 100644
--- a/config_personal/cfg/binds.cfg
+++ b/config_personal/cfg/binds.cfg
@@ -7,6 +7,10 @@ unbindall
 alias +tabgraph "+showscores; net_graph 1"
 alias -tabgraph "-showscores; net_graph 0"
 
+// 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"
+
 // 1 tick ctap script
 //alias "+ctap" "+duck 1; -duck 1; +jump 1"
 //alias "-ctap" "-jump 1"
@@ -15,16 +19,18 @@ alias -tabgraph "-showscores; net_graph 0"
 // +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"
+alias +radar "hud_medicautocallersthreshold 500"
+alias -radar "hud_medicautocallersthreshold 59"
+
+// zoom
+alias +zoom "fov_desired 75; r_drawviewmodel 0"
+alias -zoom "fov_desired 90; r_drawviewmodel 1"
 
 // crouch jump script
 alias +rj "spec_mode;-duck;+cr;alias checkrj +cr"
@@ -40,12 +46,7 @@ alias none ""
 // quick build/destroy sentry
 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"
-
-
-// default binds
+// binds
 // slots
 bind 1 "slot1"
 bind 2 "slot2"
@@ -63,10 +64,9 @@ 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"
-
+bind f1 "voice_menu_1"
+bind f2 "voice_menu_2"
+bind f3 "voice_menu_3"
 
 // class/team binds
 bind n "+quickswitch"
@@ -80,19 +80,21 @@ bind b "lastdisguise"
 bind g "+taunt"
 bind h "+context_action"
 bind \ "dropitem"
-bind ralt "+showinfo"
+bind alt "+radar"
+bind b "sentry"
+bind ctrl "+zoom"
 bind ` "toggleconsole"
 bind enter "show_quest_log"
 bind escape "cancelselect"
 bind pause "pause"
 //call medic
 bind e "voicemenu 0 0"
-bind tab "+tabgraph"
+bind tab "+showscores"
 //cancel taunt
-bind q "lastinv"
+bind x "lastinv"
 bind f "+inspect"
 //call spy
-bind h "voicemenu 1 1"
+bind z "voicemenu 1 1"
 bind mouse5 "+use_action_slot_item"
 bind mouse3 "+attack3"
 
@@ -101,12 +103,12 @@ bind mwheelup "invprev"
 bind mwheeldown "invnext"
 
 // chat binds
-bind t "say"
-bind y "say_team"
-bind u "say_party"
+bind y "say"
+bind u "say_team"
+bind i "say_party"
 bind v +voicerecord
 //spray
-bind p "impulse 201"
+bind t "impulse 201"
 //show logs.tf logs
 bind l "cl_disablehtmlmotd 0; say !log"
 
@@ -115,16 +117,16 @@ bind - "kill"
 bind = "explode"
 
 //bind for map vote when it breaks
-bind f1 "next_map_vote 0"
-bind f2 "next_map_vote 1"
-bind f3 "next_map_vote 2"
+bind f9 "next_map_vote 0"
+bind f10 "next_map_vote 1"
+bind f11 "next_map_vote 2"
 
 // loadouts
 bind f5 "loadouts.A"
 bind f6 "loadouts.B"
 bind f7 "loadouts.C"
 bind f8 "loadouts.D"
-bind alt "loadouts.resup"
+bind q "loadouts.resup"
 
 // ready toggle
 bind f4 "player_ready_toggle"
@@ -138,13 +140,13 @@ bind d "+mr"
 // movement
 bind space "+jump"
 bind shift "+duck"
-bind ctrl "+rj"
+bind c "+rj"
 
-//use hud buttons instead
-//bind <key> "snd_restart;hud_reloadscheme"
+// other
+bind p "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 <key> "incrementvar tf_use_min_viewmodel 0 1 1"
 
 //disabled as banned in rgl now for some reason
 //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 8f8202b..d73a1ab 100644
--- a/config_personal/cfg/overrides/autoexec.cfg
+++ b/config_personal/cfg/overrides/autoexec.cfg
@@ -52,7 +52,7 @@ tf_scoreboard_ping_as_text 1
 tf_use_min_viewmodels 1
 cl_hud_minmode 1
 cl_spraydisable 0
-tf_scoreboard_mouse_mode 2
+tf_scoreboard_mouse_mode 1
 hud_saytext_time 5
 glow_outline_effect_enable 1
 
diff --git a/config_personal/cfg/overrides/engineer.cfg b/config_personal/cfg/overrides/engineer.cfg
index 05a1873..2d8b81c 100644
--- a/config_personal/cfg/overrides/engineer.cfg
+++ b/config_personal/cfg/overrides/engineer.cfg
@@ -1,2 +1 @@
-bind n sentry
 loadouts.engineer
\ No newline at end of file
diff --git a/config_personal/cfg/overrides/medic.cfg b/config_personal/cfg/overrides/medic.cfg
index 82415fa..0d5af58 100644
--- a/config_personal/cfg/overrides/medic.cfg
+++ b/config_personal/cfg/overrides/medic.cfg
@@ -1,2 +1 @@
-bind n +radar
 loadouts.medic
\ No newline at end of file
diff --git a/hud_toonhud/materials/vgui/replay/thumbnails/gradient.vmt b/hud_toonhud/materials/vgui/replay/thumbnails/gradient.vmt
index 589fd7e..25ff39f 100644
--- a/hud_toonhud/materials/vgui/replay/thumbnails/gradient.vmt
+++ b/hud_toonhud/materials/vgui/replay/thumbnails/gradient.vmt
@@ -2,5 +2,5 @@
 {
 	"$basetexture"	"vgui\replay\thumbnails\gradient"
 	"$vertexalpha" 	"1"
-	"$alpha" 		"0" // Gradient alpha
-}
+	"$alpha" 		"1" // Gradient alpha
+}
\ No newline at end of file
diff --git a/hud_toonhud/materials/vgui/replay/thumbnails/mainmenu/mmbutton.vtf b/hud_toonhud/materials/vgui/replay/thumbnails/mainmenu/mmbutton.vtf
index 7376657..b08f862 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 1775f69..bfb7deb 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" 		"60 60 60 120" // Custom building status bg color
+		"G_CustomBuildingStatusBg" 		"0 0 0 100" // 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"	 "60 60 60 120" // Centered ubercharge meter background color
+		"G_CenteredUberchargeBg"	 "0 0 0 100" // 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/ui/craftingpanel.res b/hud_toonhud/resource/ui/craftingpanel.res
index 8ad580b..71f466d 100644
--- a/hud_toonhud/resource/ui/craftingpanel.res
+++ b/hud_toonhud/resource/ui/craftingpanel.res
@@ -74,7 +74,7 @@
 					"zpos"			"0"
 					"wide"			"54"
 					"tall"			"48"
-					"visible"		"0" // RBSS
+					"visible"		"1" // RBSS
 					"enabled"		"1"
 					"scaleImage"			"1"
 					"image"					"replay/thumbnails/backpackslot"
@@ -518,4 +518,3 @@
 		"bgcolor_override"	"G_MenuShader"
 	}
 }
-
diff --git a/hud_toonhud/resource/ui/econ/backpackpanel.res b/hud_toonhud/resource/ui/econ/backpackpanel.res
index 39c746a..3201e83 100644
--- a/hud_toonhud/resource/ui/econ/backpackpanel.res
+++ b/hud_toonhud/resource/ui/econ/backpackpanel.res
@@ -151,7 +151,7 @@
 				"zpos"			"-1"
 				"wide"			"54"
 				"tall"			"48"
-				"visible"		"0" // RBSS
+				"visible"		"1" // RBSS
 				"enabled"		"1"
 				"scaleImage"			"1"
 				"image"					"replay/thumbnails/backpackslot"
@@ -1704,4 +1704,3 @@
 	}
 }
 
-
diff --git a/hud_toonhud/resource/ui/hudmediccharge.res b/hud_toonhud/resource/ui/hudmediccharge.res
index 723b776..945bbaa 100644
--- a/hud_toonhud/resource/ui/hudmediccharge.res
+++ b/hud_toonhud/resource/ui/hudmediccharge.res
@@ -18,42 +18,17 @@
 		"teambg_3"		"../hud/medic_charge_blue_bg"				
 	}
 	
-	"ChargeLabelBg"
-	{
-		"ControlName"			"CTFImagePanel"
-		"fieldName"				"ChargeLabelBg"
-		"xpos"			"115"
-		"ypos"			"95"
-		"zpos"					"-1"
-		"wide"					"110"
-		"tall"	 				"50"
-		"autoResize"			"0"
-		"pinCorner"				"0"
-		"visible"		"0"
-		"enabled"				"1"
-		"image"					"../hud/color_panel_brown"
-		"scaleImage"			"1"
-		"teambg_1"				"../hud/color_panel_brown"
-		"teambg_2"				"../hud/color_panel_red"
-		"teambg_3"				"../hud/color_panel_blu"
-		"paintborder"			"1"
-		"border"				"G_TargetBorder"
-		"src_corner_height"		"23"
-		"src_corner_width"		"23"
-		"draw_corner_width"		"0"
-		"draw_corner_height" 	"0"
-	}
-	
 	"ChargeLabel"
 	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"ChargeLabel"
-		"xpos"	"0"
-		"ypos"	"0"
+		"xpos"			"150"
+		"xpos_minmode"	"140"
+		"ypos"			"148"
+		"ypos_minmode"	"48"
 		"zpos"			"2"
-		"textinsety"	"1"
-		"wide"	"40"
-		"tall"	"17"
+		"wide"			"130"
+		"tall"			"50"
 		"autoResize"	"1"
 		"pinCorner"		"2"
 		"visible"		"1"
@@ -63,8 +38,9 @@
 		"textAlignment"	"center"
 		"dulltext"		"0"
 		"brighttext"	"0"
-		"font"	"G_FontSmall"
-		"fgcolor"		"G_White"
+		"textinsety"	"1"
+		"font"			"G_FontAmmo"
+		"fgcolor"		"G_AmmoClipValue"
 	}
 
 	
@@ -73,11 +49,13 @@
 		"ControlName"	"CExLabel"
 		"fieldName"		"IndividualChargesLabel"
 		"labelText"		"#TF_IndividualUberchargesMinHUD"
-		"xpos"	"20"
-		"ypos"	"0"
+		"xpos"			"150"
+		"xpos_minmode"	"140"
+		"ypos"			"148"
+		"ypos_minmode"	"48"
 		"zpos"			"2"
-		"wide"	"20"
-		"tall"	"17"
+		"wide"			"100"
+		"tall"			"50"
 		"autoResize"	"1"
 		"pinCorner"		"2"
 		"visible"		"1"
@@ -86,25 +64,9 @@
 		"textAlignment"	"center"
 		"dulltext"		"0"
 		"brighttext"	"0"
-		"font"	"G_FontSmall"
+		"font"			"G_FontAmmo"
 		"textinsety"	"1"
-		"fgcolor"		"G_White"
-	}
-	
-	"UberchargeBg"
-	{
-		"ControlName"	"EditablePanel"
-		"fieldName"		"UberchargeBg"
-		"xpos"	"0"
-		"ypos"	"0"
-		"zpos"			"-1"
-		"wide"			"40"
-		"tall"			"20"
-		"visible"	"1"
-		"enabled"		"1"
-		"paintbackground"	"1"
-		"bgcolor_override"	"G_CenteredUberchargeBg"
-		"PaintBackgroundType"	"2"
+		"fgcolor"		"G_AmmoClipValue"
 	}
 	
 	"UberchargeReady"
@@ -114,16 +76,15 @@
 		"labelText"		"U"
 		"xpos"			"0"
 		"ypos"			"0"
-		"wide"			"30"
+		"wide"			"120"
+		"wide_minmode"	"120"
 		"tall"			"30"
-		"visible"	"0"
-		"enable"	"0"
+		"visible"		"1"
+		"enabled"		"1"
 		"Alpha"				"0"
 		"textAlignment"		"center"
 		"fgcolor_override"	"G_White"
 		"font"				"G_HeadsIcon"
-		"paintbackground"	"1"
-		"bgcolor_override"	"0 200 0 0"
 	}
 	
 	"ChargeMeter"
@@ -131,11 +92,13 @@
 		"ControlName"			"ContinuousProgressBar"
 		"fieldName"				"ChargeMeter"
 		"font"					"Default"
-		"ypos"			"16"
-		"xpos"			"2"
+		"xpos"					"0"
+		"xpos_minmode"			"0"
+		"ypos"					"137"
+		"ypos_minmode"			"77"
 		"zpos"					"2"
-		"wide"			"36"
-		"tall"			"3"
+		"wide"					"120"
+		"tall"					"6"	
 		"autoResize"			"0"
 		"pinCorner"				"0"
 		"visible"				"1"
@@ -143,7 +106,9 @@
 		"textAlignment"			"Left"
 		"dulltext"				"0"
 		"brighttext"			"0"
-		"bgcolor_override"		"G_LightShadow"
+		"bgcolor_override"		"G_ItemMeterBg"
+		"paintborder"			"1"
+		"border"				"G_MeterBorder"
 	}
 
 	"ChargeMeter1"
@@ -151,11 +116,12 @@
 		"ControlName"	"ContinuousProgressBar"
 		"fieldName"		"ChargeMeter1"
 		"font"			"Default"
-		"xpos"	"21"
-		"ypos"	"16"
+		"xpos"			"1"
+		"ypos"			"137"
+		"ypos_minmode"	"77"
 		"zpos"			"2"
-		"wide"	"8"
-		"tall"	"1"				
+		"wide"			"29"
+		"tall"			"6"
 		"autoResize"	"0"
 		"pinCorner"		"0"
 		"visible"		"1"
@@ -165,7 +131,9 @@
 		"brighttext"	"0"
 		"FgColor_override"		"G_White"
 		"paintbackground"		"1"
-		"bgcolor_override"		"G_LightShadow"
+		"bgcolor_override"		"G_ItemMeterBg"
+		"paintborder"			"1"
+		"border"				"G_MeterBorder"
 	}
 
 	"ChargeMeter2"
@@ -173,11 +141,12 @@
 		"ControlName"	"ContinuousProgressBar"
 		"fieldName"		"ChargeMeter2"
 		"font"			"Default"
-		"xpos"	"30"
-		"ypos"	"16"
+		"xpos"			"31"
+		"ypos"					"137"
+		"ypos_minmode"			"77"
 		"zpos"			"2"
-		"wide"	"8"
-		"tall"	"1"				
+		"wide"			"29"
+		"tall"			"6"
 		"autoResize"	"0"
 		"pinCorner"		"0"
 		"visible"		"1"
@@ -187,7 +156,9 @@
 		"brighttext"	"0"
 		"FgColor_override"		"G_White"
 		"paintbackground"		"1"
-		"bgcolor_override"		"G_LightShadow"
+		"bgcolor_override"		"G_ItemMeterBg"
+		"paintborder"			"1"
+		"border"				"G_MeterBorder"
 	}
 
 	"ChargeMeter3"
@@ -195,11 +166,12 @@
 		"ControlName"	"ContinuousProgressBar"
 		"fieldName"		"ChargeMeter3"
 		"font"			"Default"
-		"xpos"	"21"
-		"ypos"	"18"
+		"xpos"			"61"
+		"ypos"					"137"
+		"ypos_minmode"			"77"
 		"zpos"			"2"
-		"wide"	"8"
-		"tall"	"1"				
+		"wide"			"29"
+		"tall"			"6"
 		"autoResize"	"0"
 		"pinCorner"		"0"
 		"visible"		"1"
@@ -209,7 +181,9 @@
 		"brighttext"	"0"
 		"FgColor_override"		"G_White"
 		"paintbackground"		"1"
-		"bgcolor_override"		"G_LightShadow"
+		"bgcolor_override"		"G_ItemMeterBg"
+		"paintborder"			"1"
+		"border"				"G_MeterBorder"
 	}
 
 	"ChargeMeter4"
@@ -217,11 +191,12 @@
 		"ControlName"	"ContinuousProgressBar"
 		"fieldName"		"ChargeMeter4"
 		"font"			"Default"
-		"xpos"	"30"
-		"ypos"	"18"
+		"xpos"			"91"
+		"ypos"			"137"
+		"ypos_minmode"	"77"
 		"zpos"			"2"
-		"wide"	"8"
-		"tall"	"1"				
+		"wide"			"29"
+		"tall"			"6"
 		"autoResize"	"0"
 		"pinCorner"		"0"
 		"visible"		"1"
@@ -231,7 +206,9 @@
 		"brighttext"	"0"
 		"FgColor_override"		"G_White"	
 		"paintbackground"		"1"
-		"bgcolor_override"		"G_LightShadow"
+		"bgcolor_override"		"G_ItemMeterBg"
+		"paintborder"			"1"
+		"border"				"G_MeterBorder"
 	}
 	
 	"HealthClusterIcon"
@@ -242,7 +219,8 @@
 		"ypos"			"r40"
 		"wide"			"30"
 		"tall"			"30"
-		"visible"	"0"
+		"visible"		"0"
+		"visible_minmode"	"0"
 		"enabled"		"0"
 		"image"			"pipboy_overlay"
 		"scaleImage"	"1"	
@@ -256,13 +234,13 @@
 		"xpos"				"0"
 		"ypos"				"0"
 		"zpos"				"200"
-		"wide"		"20"
-		"tall"		"20"
+		"wide"				"30"
+		"tall"				"30"
 		"visible"			"1"
 		"enabled"			"1"
 		"image"				"../HUD/defense_buff_bullet_blue"
 		"scaleImage"		"1"
-		"Alpha"		"240"
+		"Alpha"				"150"
 	}
 	
-}
+}
\ No newline at end of file
diff --git a/hud_toonhud/resource/ui/mainmenuoverride.res b/hud_toonhud/resource/ui/mainmenuoverride.res
index 36a4f88..5f96dff 100644
--- a/hud_toonhud/resource/ui/mainmenuoverride.res
+++ b/hud_toonhud/resource/ui/mainmenuoverride.res
@@ -260,8 +260,8 @@
 	{
 		// "ControlName"	"ImagePanel"
 		"fieldName"		"TFCharacterImage"
-		"xpos"			"-9999" // 1 RMMC
-		"ypos"			"-9999" // 1 RMMC
+		"xpos"			"c-250" // 1 RMMC
+		"ypos"			"-80" // 1 RMMC
 		"zpos"			"-99"
 		"wide"			"600" // 2 RMMC
 		"tall"			"600" // 2 RMMC
@@ -459,9 +459,9 @@
 		"ControlName"	"EditablePanel"
 		"fieldname"		"G_BookmarkPanel"
 		"xpos"			"0"
-		"ypos"			"10" // BMPY (10)
+		"ypos"			"0" // BMPY (10)
 		"wide"			"160"
-		"tall"			"55" // BMPH (0, 30, 55, 80)
+		"tall"			"0" // BMPH (0, 30, 55, 80)
 		"zpos"			"5"
 		"visible"		"1"
 		"bgcolor_override"	"G_MainMenuPanel"
@@ -1695,7 +1695,7 @@
 		"xpos"			"0"
 		"ypos"			"10"
 		"wide"			"160"
-		"tall"			"130" // FLPH (195, 155, 130, 105)
+		"tall"			"195" // 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"			"130" // FLPH (195, 155, 130, 105)
+		"tall"			"195" // FLPH (195, 155, 130, 105)
 		"visible"		"1"	// HFLFMM
 		"enabled"		"1"	// HFLFMM
 		"border"		"NoBorder"
@@ -1766,7 +1766,7 @@
 			"ypos"			"0"
 			"zpos"			"500"
 			"wide"			"160"
-			"tall"			"130" // FLPH (195, 155, 130, 105)
+			"tall"			"195" // FLPH (195, 155, 130, 105)
 			"visible"		"1"
 			"proportionaltoparent"	"1"
 
@@ -2038,8 +2038,8 @@
 		"wide"			"150"
 		"tall"			"20"
 		"zpos"			"11"
-		"visible"		"1" // 1 BM1
-		"Command"		"engine snd_restart; hud_reloadscheme" // 3 BM1
+		"visible"		"0" // 1 BM1
+		"Command"		"" // 3 BM1
 		"PaintBackgroundType"	"2"
 		"paintborder"	"1"
 		"border"		"NoBorder"
@@ -2047,7 +2047,7 @@
 		"navDown"		"Bookmark_2"
 		"navRight"		"Notifications_ShowButtonPanel"
 		"navToRelay"	"SubButton"
-		"labelText"		"Reload" // 2 BM1
+		"labelText"		"Bookmark 1" // 2 BM1
 		"textinsetx"	"10"
 		"pin_to_sibling"			"G_BookmarkPanel"
 		"pin_corner_to_sibling"		"0"
@@ -2076,8 +2076,8 @@
 		"wide"			"150"
 		"tall"			"20"
 		"zpos"			"11"
-		"visible"		"1" // 1 BM2
-		"Command"		"engine incrementvar r_drawviewmodel 0 1 1" // 3 BM2
+		"visible"		"0" // 1 BM2
+		"Command"		"" // 3 BM2
 		"PaintBackgroundType"	"2"
 		"paintborder"	"1"
 		"border"		"NoBorder"
@@ -2085,7 +2085,7 @@
 		"navDown"		"Bookmark_3"
 		"navRight"		"Notifications_ShowButtonPanel"
 		"navToRelay"	"SubButton"
-		"labelText"		"Viewmodel" // 2 BM2
+		"labelText"		"Bookmark 2" // 2 BM2
 		"textinsetx"	"10"
 		"pin_to_sibling"			"G_BookmarkPanel"
 		"pin_corner_to_sibling"		"0"
@@ -2114,15 +2114,15 @@
 		"wide"			"150"
 		"tall"			"20"
 		"zpos"			"11"
-		"visible"		"1" // 1 BM3
-		"Command"		"engine incrementvar cl_first_person_uses_world_model 0 1 1" // 3 BM3
+		"visible"		"0" // 1 BM3
+		"Command"		"" // 3 BM3
 		"PaintBackgroundType"	"2"
 		"paintborder"	"1"
 		"border"		"NoBorder"
 		"navUp"			"Bookmark_2"
 		"navRight"		"Notifications_ShowButtonPanel"
 		"navToRelay"	"SubButton"
-		"labelText"		"VR" // 2 BM3
+		"labelText"		"Bookmark 3" // 2 BM3
 		"textinsetx"	"10"
 		"pin_to_sibling"			"G_BookmarkPanel"
 		"pin_corner_to_sibling"		"0"
@@ -2144,120 +2144,120 @@
 	
 	// Small bookmark buttons
 	
- 	"Bookmark_1"
- 	{
- 		"ControlName"	"CExButton"
- 		"fieldname"		"Bookmark_1"
- 		"xpos"			"-5"
- 		"ypos"			"-5"
- 		"wide"			"72.5"
- 		"tall"			"20"
- 		"zpos"			"11"
- 		"visible"		"1" // 1 BM1
- 		"Command"		"engine snd_restart; hud_reloadscheme" // 3 BM1
- 		"PaintBackgroundType"	"2"
- 		"paintborder"	"1"
- 		"border"		"NoBorder"
-		"navUp"			"TF2SettingsButton"
-		"navDown"		"Bookmark_3"
-		"navRight"		"Bookmark_2"
-		"navToRelay"	"SubButton"
- 		"labelText"		"Reload" // 2 BM1
- 		"textinsetx"	"10"
-		"pin_to_sibling"			"G_BookmarkPanel"
-		"pin_corner_to_sibling"		"0"
-		"pin_to_sibling_corner"		"0"
- 		"font"			"G_FontMainMenuItemSmall"
- 		"textAlignment"	"center"
- 		"use_proportional_insets" "1"
- 		"defaultFgColor_override" 	"G_MainMenuButtonFg"
- 		"armedFgColor_override" 	"G_MainMenuButtonHoverFg"
- 		"depressedFgColor_override" "G_MainMenuButtonHoverFg"
- 		"defaultBgColor_override" 	"0 0 0 0"
- 		"armedBgColor_override" 	"0 0 0 0"
- 		"depressedBgColor_override" "0 0 0 0"
- 		"border_default"	"SharpMainMenuButton"
- 		"border_armed"		"SharpMainMenuButtonArmed"
- 		"sound_depressed"	"UI/buttonclick.wav"
- 		"sound_released"	"UI/buttonclickrelease.wav"			
- 	}
+//#SBB 	"Bookmark_1"
+//#SBB 	{
+//#SBB 		"ControlName"	"CExButton"
+//#SBB 		"fieldname"		"Bookmark_1"
+//#SBB 		"xpos"			"-5"
+//#SBB 		"ypos"			"-5"
+//#SBB 		"wide"			"72.5"
+//#SBB 		"tall"			"20"
+//#SBB 		"zpos"			"11"
+//#SBB 		"visible"		"0" // 1 BM1
+//#SBB 		"Command"		"" // 3 BM1
+//#SBB 		"PaintBackgroundType"	"2"
+//#SBB 		"paintborder"	"1"
+//#SBB 		"border"		"NoBorder"
+//#SBB		"navUp"			"TF2SettingsButton"
+//#SBB		"navDown"		"Bookmark_3"
+//#SBB		"navRight"		"Bookmark_2"
+//#SBB		"navToRelay"	"SubButton"
+//#SBB 		"labelText"		"Bookmark 1" // 2 BM1
+//#SBB 		"textinsetx"	"10"
+//#SBB		"pin_to_sibling"			"G_BookmarkPanel"
+//#SBB		"pin_corner_to_sibling"		"0"
+//#SBB		"pin_to_sibling_corner"		"0"
+//#SBB 		"font"			"G_FontMainMenuItemSmall"
+//#SBB 		"textAlignment"	"center"
+//#SBB 		"use_proportional_insets" "1"
+//#SBB 		"defaultFgColor_override" 	"G_MainMenuButtonFg"
+//#SBB 		"armedFgColor_override" 	"G_MainMenuButtonHoverFg"
+//#SBB 		"depressedFgColor_override" "G_MainMenuButtonHoverFg"
+//#SBB 		"defaultBgColor_override" 	"0 0 0 0"
+//#SBB 		"armedBgColor_override" 	"0 0 0 0"
+//#SBB 		"depressedBgColor_override" "0 0 0 0"
+//#SBB 		"border_default"	"SharpMainMenuButton"
+//#SBB 		"border_armed"		"SharpMainMenuButtonArmed"
+//#SBB 		"sound_depressed"	"UI/buttonclick.wav"
+//#SBB 		"sound_released"	"UI/buttonclickrelease.wav"			
+//#SBB 	}
 	
- 	"Bookmark_2"
- 	{
- 		"ControlName"	"CExButton"
- 		"fieldname"		"Bookmark_2"
- 		"xpos"			"-82.5"
- 		"ypos"			"-5"
- 		"wide"			"72.5"
- 		"tall"			"20"
- 		"zpos"			"11"
- 		"visible"		"1" // 1 BM2
- 		"Command"		"engine incrementvar r_drawviewmodel 0 1 1" // 3 BM2
- 		"PaintBackgroundType"	"2"
- 		"paintborder"	"1"
- 		"border"		"NoBorder"
-		"navUp"			"TF2SettingsButton"
-		"navDown"		"Bookmark_4"
-		"navLeft"		"Bookmark_1"
-		"navRight"		"Notifications_ShowButtonPanel"
-		"navToRelay"	"SubButton"
- 		"labelText"		"Viewmodel" // 2 BM2
- 		"textinsetx"	"10"
-		"pin_to_sibling"			"G_BookmarkPanel"
-		"pin_corner_to_sibling"		"0"
-		"pin_to_sibling_corner"		"0"
- 		"font"			"G_FontMainMenuItemSmall"
- 		"textAlignment"	"center"
- 		"use_proportional_insets" "1"
- 		"defaultFgColor_override" 	"G_MainMenuButtonFg"
- 		"armedFgColor_override" 	"G_MainMenuButtonHoverFg"
- 		"depressedFgColor_override" "G_MainMenuButtonHoverFg"
- 		"defaultBgColor_override" 	"0 0 0 0"
- 		"armedBgColor_override" 	"0 0 0 0"
- 		"depressedBgColor_override" "0 0 0 0"
- 		"border_default"	"SharpMainMenuButton"
- 		"border_armed"		"SharpMainMenuButtonArmed"
- 		"sound_depressed"	"UI/buttonclick.wav"
- 		"sound_released"	"UI/buttonclickrelease.wav"			
- 	}
+//#SBB 	"Bookmark_2"
+//#SBB 	{
+//#SBB 		"ControlName"	"CExButton"
+//#SBB 		"fieldname"		"Bookmark_2"
+//#SBB 		"xpos"			"-82.5"
+//#SBB 		"ypos"			"-5"
+//#SBB 		"wide"			"72.5"
+//#SBB 		"tall"			"20"
+//#SBB 		"zpos"			"11"
+//#SBB 		"visible"		"0" // 1 BM2
+//#SBB 		"Command"		"" // 3 BM2
+//#SBB 		"PaintBackgroundType"	"2"
+//#SBB 		"paintborder"	"1"
+//#SBB 		"border"		"NoBorder"
+//#SBB		"navUp"			"TF2SettingsButton"
+//#SBB		"navDown"		"Bookmark_4"
+//#SBB		"navLeft"		"Bookmark_1"
+//#SBB		"navRight"		"Notifications_ShowButtonPanel"
+//#SBB		"navToRelay"	"SubButton"
+//#SBB 		"labelText"		"Bookmark 2" // 2 BM2
+//#SBB 		"textinsetx"	"10"
+//#SBB		"pin_to_sibling"			"G_BookmarkPanel"
+//#SBB		"pin_corner_to_sibling"		"0"
+//#SBB		"pin_to_sibling_corner"		"0"
+//#SBB 		"font"			"G_FontMainMenuItemSmall"
+//#SBB 		"textAlignment"	"center"
+//#SBB 		"use_proportional_insets" "1"
+//#SBB 		"defaultFgColor_override" 	"G_MainMenuButtonFg"
+//#SBB 		"armedFgColor_override" 	"G_MainMenuButtonHoverFg"
+//#SBB 		"depressedFgColor_override" "G_MainMenuButtonHoverFg"
+//#SBB 		"defaultBgColor_override" 	"0 0 0 0"
+//#SBB 		"armedBgColor_override" 	"0 0 0 0"
+//#SBB 		"depressedBgColor_override" "0 0 0 0"
+//#SBB 		"border_default"	"SharpMainMenuButton"
+//#SBB 		"border_armed"		"SharpMainMenuButtonArmed"
+//#SBB 		"sound_depressed"	"UI/buttonclick.wav"
+//#SBB 		"sound_released"	"UI/buttonclickrelease.wav"			
+//#SBB 	}
 	
- 	"Bookmark_3"
- 	{
- 		"ControlName"	"CExButton"
- 		"fieldname"		"Bookmark_3"
- 		"xpos"			"-5"
- 		"ypos"			"-30"
- 		"wide"			"72.5"
- 		"tall"			"20"
- 		"zpos"			"11"
- 		"visible"		"1" // 1 BM3
- 		"Command"		"engine incrementvar cl_first_person_uses_world_model 0 1 1" // 3 BM3
- 		"PaintBackgroundType"	"2"
- 		"paintborder"	"1"
- 		"border"		"NoBorder"
-		"navUp"			"Bookmark_1"
-		"navDown"		"Bookmark_5"
-		"navRight"		"Bookmark_4"
-		"navToRelay"	"SubButton"
- 		"labelText"		"VR" // 2 BM3
- 		"textinsetx"	"10"
-		"pin_to_sibling"			"G_BookmarkPanel"
-		"pin_corner_to_sibling"		"0"
-		"pin_to_sibling_corner"		"0"
- 		"font"			"G_FontMainMenuItemSmall"
- 		"textAlignment"	"center"
- 		"use_proportional_insets" "1"
- 		"defaultFgColor_override" 	"G_MainMenuButtonFg"
- 		"armedFgColor_override" 	"G_MainMenuButtonHoverFg"
- 		"depressedFgColor_override" "G_MainMenuButtonHoverFg"
- 		"defaultBgColor_override" 	"0 0 0 0"
- 		"armedBgColor_override" 	"0 0 0 0"
- 		"depressedBgColor_override" "0 0 0 0"
- 		"border_default"	"SharpMainMenuButton"
- 		"border_armed"		"SharpMainMenuButtonArmed"
- 		"sound_depressed"	"UI/buttonclick.wav"
- 		"sound_released"	"UI/buttonclickrelease.wav"			
- 	}
+//#SBB 	"Bookmark_3"
+//#SBB 	{
+//#SBB 		"ControlName"	"CExButton"
+//#SBB 		"fieldname"		"Bookmark_3"
+//#SBB 		"xpos"			"-5"
+//#SBB 		"ypos"			"-30"
+//#SBB 		"wide"			"72.5"
+//#SBB 		"tall"			"20"
+//#SBB 		"zpos"			"11"
+//#SBB 		"visible"		"0" // 1 BM3
+//#SBB 		"Command"		"" // 3 BM3
+//#SBB 		"PaintBackgroundType"	"2"
+//#SBB 		"paintborder"	"1"
+//#SBB 		"border"		"NoBorder"
+//#SBB		"navUp"			"Bookmark_1"
+//#SBB		"navDown"		"Bookmark_5"
+//#SBB		"navRight"		"Bookmark_4"
+//#SBB		"navToRelay"	"SubButton"
+//#SBB 		"labelText"		"Bookmark 3" // 2 BM3
+//#SBB 		"textinsetx"	"10"
+//#SBB		"pin_to_sibling"			"G_BookmarkPanel"
+//#SBB		"pin_corner_to_sibling"		"0"
+//#SBB		"pin_to_sibling_corner"		"0"
+//#SBB 		"font"			"G_FontMainMenuItemSmall"
+//#SBB 		"textAlignment"	"center"
+//#SBB 		"use_proportional_insets" "1"
+//#SBB 		"defaultFgColor_override" 	"G_MainMenuButtonFg"
+//#SBB 		"armedFgColor_override" 	"G_MainMenuButtonHoverFg"
+//#SBB 		"depressedFgColor_override" "G_MainMenuButtonHoverFg"
+//#SBB 		"defaultBgColor_override" 	"0 0 0 0"
+//#SBB 		"armedBgColor_override" 	"0 0 0 0"
+//#SBB 		"depressedBgColor_override" "0 0 0 0"
+//#SBB 		"border_default"	"SharpMainMenuButton"
+//#SBB 		"border_armed"		"SharpMainMenuButtonArmed"
+//#SBB 		"sound_depressed"	"UI/buttonclick.wav"
+//#SBB 		"sound_released"	"UI/buttonclickrelease.wav"			
+//#SBB 	}
 	
 	"Bookmark_4"
 	{
@@ -2268,8 +2268,8 @@
 		"wide"			"72.5"
 		"tall"			"20"
 		"zpos"			"11"
-		"visible"		"1" // 1 BM4
-		"Command"		"engine incrementvartf_use_min_viewmodel 0 1 1" // 3 BM4
+		"visible"		"0" // 1 BM4
+		"Command"		"" // 3 BM4
 		"PaintBackgroundType"	"2"
 		"paintborder"	"1"
 		"border"		"NoBorder"
@@ -2278,7 +2278,7 @@
 		"navLeft"		"Bookmark_3"
 		"navRight"		"Notifications_ShowButtonPanel"
 		"navToRelay"	"SubButton"
-		"labelText"		"Minmode" // 2 BM4
+		"labelText"		"Bookmark 4" // 2 BM4
 		"textinsetx"	"10"
 		"pin_to_sibling"			"G_BookmarkPanel"
 		"pin_corner_to_sibling"		"0"
@@ -4566,34 +4566,3 @@
 		}
 	}
 }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/hud_toonhud/scripts/hudlayout.res b/hud_toonhud/scripts/hudlayout.res
index f333e60..3f31d73 100644
--- a/hud_toonhud/scripts/hudlayout.res
+++ b/hud_toonhud/scripts/hudlayout.res
@@ -89,7 +89,7 @@
 		"fieldName" "HudMedicCharge"
 		"visible" "1"
 		"enabled" "1"
-		"xpos" "c-20" // CUM
+		"xpos" "c-60" // CUM
 		"ypos" "c10"
 		"wide" "f0"
 		"tall" "480"
@@ -1523,4 +1523,3 @@
 
 
 
-