diff --git a/src/client/game/dvars.cpp b/src/client/game/dvars.cpp
index 56050781..5ab8232b 100644
--- a/src/client/game/dvars.cpp
+++ b/src/client/game/dvars.cpp
@@ -175,8 +175,45 @@ namespace dvars
 		"aim_alternate_lockon_strength",
 		"aim_assist_min_target_distance",
 		"aim_assist_script_disable",
+		"bot_AllowGrenades",
+		"bot_autoconnectdefault",
+		"bot_CloseDistance",
+		"bot_CrouchDistance",
+		"bot_difficulty",
+		"bot_difficultydefault",
+		"bot_enemies",
+		"bot_Fov",
+		"bot_friends",
+		"bot_GoalRadius",
+		"bot_MaxAdsTime",
+		"bot_MaxCrouchTime",
+		"bot_MaxDeathTime",
+		"bot_MaxFireTime",
+		"bot_MaxGrenadeTime",
+		"bot_MaxPitchTime",
+		"bot_MaxReactionTime",
+		"bot_MaxStrafeTime",
+		"bot_MeleeDist",
+		"bot_MinAdsTime",
+		"bot_MinCrouchTime",
+		"bot_MinDeathTime",
+		"bot_MinFireTime",
+		"bot_MinGrenadeTime",
+		"bot_MinPitchTime",
+		"bot_MinReactionTime",
+		"bot_MinStrafeTime",
+		"bot_PitchDown",
+		"bot_PitchSpeed",
+		"bot_PitchSpeedAds",
+		"bot_PitchUp",
+		"bot_SprintDistance",
+		"bot_StrafeChance",
+		"bot_TargetLeadBias",
+		"bot_tips",
+		"bot_UseFriendNames",
+		"bot_YawSpeed",
+		"bot_YawSpeedAds",
 		"cg_draw2D",
-		"cg_drawPing",
 		"cg_drawBigFPS",
 		"cg_drawBreathHint",
 		"cg_drawBuildName",
@@ -184,11 +221,12 @@ namespace dvars
 		"cg_drawFPSLabels",
 		"cg_drawFPSOnly",
 		"cg_drawFPSScale",
+		"cg_drawgun",
+		"cg_drawPing",
 		"cg_drawVersion",
 		"cg_drawVersionX",
 		"cg_drawVersionY",
 		"cg_drawViewpos",
-		"cg_drawgun",
 		"cg_fov",
 		"cg_fov_default",
 		"cg_fov_default_thirdperson",
@@ -197,14 +235,73 @@ namespace dvars
 		"cg_fovMin",
 		"cg_fovScale",
 		"cg_legacyCrashHandling",
+		"cl_connectTimeout",
 		"cl_maxpackets",
 		"cl_maxPing",
-		"cl_connectTimeout",
+		"cl_timeout",
+		"codPointStore_enabled",
 		"com_introPlayed",
 		"com_isNotice",
 		"com_maxclients",
 		"com_maxfps",
 		"com_maxFrameTime",
+		"custom_roundlimit",
+		"custom_scorelimit",
+		"custom_scr_allowannouncer",
+		"custom_scr_allowbattlechatter",
+		"custom_scr_bot_difficulty",
+		"custom_scr_ctf_enemycarriervisible",
+		"custom_scr_ctf_idleflagreturntime",
+		"custom_scr_ctf_roundswitch",
+		"custom_scr_ctf_touchreturn",
+		"custom_scr_custom_score_assist",
+		"custom_scr_dem_bombtimer",
+		"custom_scr_dem_defusetime",
+		"custom_scr_dem_extratime",
+		"custom_scr_dem_planttime",
+		"custom_scr_dem_roundswitch",
+		"custom_scr_dm_bonus_leader",
+		"custom_scr_dm_score_assist",
+		"custom_scr_dm_score_death",
+		"custom_scr_dm_score_headshot",
+		"custom_scr_dm_score_kill",
+		"custom_scr_dm_score_suicide",
+		"custom_scr_dom_flagcapturetime",
+		"custom_scr_game_allowkillcam",
+		"custom_scr_game_forceradar",
+		"custom_scr_game_hardpoints",
+		"custom_scr_game_onlyheadshots",
+		"custom_scr_game_perks",
+		"custom_scr_game_spectatetype",
+		"custom_scr_hardcore",
+		"custom_scr_num_bots",
+		"custom_scr_num_bots_enemy",
+		"custom_scr_num_bots_friendly",
+		"custom_scr_player_forcerespawn",
+		"custom_scr_player_healthregentime",
+		"custom_scr_player_maxhealth",
+		"custom_scr_player_sprintTime",
+		"custom_scr_rcbomb_notimeout",
+		"custom_scr_sab_bombtimer",
+		"custom_scr_sab_defusetime",
+		"custom_scr_sab_hotpotato",
+		"custom_scr_sab_planttime",
+		"custom_scr_sab_roundswitch",
+		"custom_scr_sd_bombtimer",
+		"custom_scr_sd_defusetime",
+		"custom_scr_sd_multibomb",
+		"custom_scr_sd_planttime",
+		"custom_scr_sd_roundswitch",
+		"custom_scr_tdm_bonus_leader",
+		"custom_scr_tdm_score_death",
+		"custom_scr_tdm_score_headshot",
+		"custom_scr_tdm_score_kill",
+		"custom_scr_tdm_score_suicide",
+		"custom_scr_team_fftype",
+		"custom_scr_team_teamkillspawndelay",
+		"custom_scr_vehicles_enabled",
+		"custom_timelimit",
+		"elite_clan_active",
 		"fs_basegame",
 		"fs_basepath",
 		"fs_basepath_output",
@@ -220,14 +317,12 @@ namespace dvars
 		"fs_userDocuments",
 		"fs_usermapdir",
 		"g_gametype",
-		"gametype",
 		"g_hardcore",
 		"g_listEntity",
 		"g_loadScripts",
 		"g_log",
 		"g_logSync",
 		"g_logTimeStampInSeconds",
-		"timescale",  // Scale time of each frame		  ---> "5401"
 		"g_motd",
 		"g_scriptMainMenu",
 		"g_smoothClients",
@@ -237,6 +332,7 @@ namespace dvars
 		"gamedvr_active",
 		"gameMode",
 		"gamename",
+		"gametype",
 		"log_party_state",
 		"logfile",
 		"m_filter",
@@ -244,6 +340,8 @@ namespace dvars
 		"m_pitch",
 		"m_side",
 		"m_yaw",
+		"map",
+		"mapname",
 		"r_drawLightmapDrawlists",
 		"r_drawLitDrawlists",
 		"r_drawSun",
@@ -277,6 +375,12 @@ namespace dvars
 		"r_glossMap",
 		"r_glow",
 		"r_glow_allowed",
+		"safeArea_adjusted_horizontal",
+		"safeArea_adjusted_vertical",
+		"safeArea_horizontal",
+		"safeArea_vertical",
+		"scr_game_spectatetype",
+		"sensitivity",
 		"stat_version",
 		"stats_version_check",
 		"statsLocationFatal",
@@ -291,6 +395,7 @@ namespace dvars
 		"sv_archiveClientsPositions",
 		"sv_assistWorkers",
 		"sv_authenticating",
+		"sv_autoPriority",
 		"sv_bitfieldTracking",
 		"sv_botsPressAttackBtn",
 		"sv_cheats",
@@ -329,11 +434,8 @@ namespace dvars
 		"sv_lastSaveCommitedToDevice",
 		"sv_local_client_snapshot_msec",
 		"sv_mapname",
-		"mapname",
 		"sv_mapRotation",
 		"sv_mapRotationCurrent",
-		"cl_maxpackets",
-		"cl_timeout",
 		"sv_maxclients",
 		"sv_maxPhysExplosionSpheres",
 		"sv_maxPing",
@@ -387,11 +489,6 @@ namespace dvars
 		"sv_wwwDownload",
 		"sv_zlib_threshold",
 		"sv_zombietime",
-		"sv_mapRotation",
-		"sv_mapRotationCurrent",
-		"sv_autoPriority",
-		//"xpartygo",
-		"ui_mousePitch",
 		"svwp",
 		"syncTimeTimeout",
 		"sys_configSum",
@@ -406,109 +503,9 @@ namespace dvars
 		"sys_sysMB",
 		"systemlink",
 		"systemlink_host",
-		"bot_AllowGrenades",
-		"bot_autoconnectdefault",
-		"bot_CloseDistance",
-		"bot_CrouchDistance",
-		"bot_difficulty",
-		"bot_difficultydefault",
-		"bot_enemies",
-		"bot_Fov",
-		"bot_friends",
-		"bot_GoalRadius",
-		"bot_MaxAdsTime",
-		"bot_MaxCrouchTime",
-		"bot_MaxDeathTime",
-		"bot_MaxFireTime",
-		"bot_MaxGrenadeTime",
-		"bot_MaxPitchTime",
-		"bot_MaxReactionTime",
-		"bot_MaxStrafeTime",
-		"bot_MeleeDist",
-		"bot_MinAdsTime",
-		"bot_MinCrouchTime",
-		"bot_MinDeathTime",
-		"bot_MinFireTime",
-		"bot_MinGrenadeTime",
-		"bot_MinPitchTime",
-		"bot_MinReactionTime",
-		"bot_MinStrafeTime",
-		"bot_PitchDown",
-		"bot_PitchSpeed",
-		"bot_PitchSpeedAds",
-		"bot_PitchUp",
-		"bot_SprintDistance",
-		"bot_StrafeChance",
-		"bot_TargetLeadBias",
-		"bot_tips",
-		"bot_UseFriendNames",
-		"bot_YawSpeed",
-		"bot_YawSpeedAds",
-		"custom_roundlimit",
-		"custom_scorelimit",
-		"custom_scr_allowannouncer",
-		"custom_scr_allowbattlechatter",
-		"custom_scr_bot_difficulty",
-		"custom_scr_ctf_enemycarriervisible",
-		"custom_scr_ctf_idleflagreturntime",
-		"custom_scr_ctf_roundswitch",
-		"custom_scr_ctf_touchreturn",
-		"custom_scr_custom_score_assist",
-		"custom_scr_dem_bombtimer",
-		"custom_scr_dem_defusetime",
-		"custom_scr_dem_extratime",
-		"custom_scr_dem_planttime",
-		"custom_scr_dem_roundswitch",
-		"custom_scr_dm_bonus_leader",
-		"custom_scr_dm_score_assist",
-		"custom_scr_dm_score_death",
-		"custom_scr_dm_score_headshot",
-		"custom_scr_dm_score_kill",
-		"custom_scr_dm_score_suicide",
-		"custom_scr_dom_flagcapturetime",
-		"custom_scr_game_allowkillcam",
-		"custom_scr_game_forceradar",
-		"custom_scr_game_hardpoints",
-		"custom_scr_game_onlyheadshots",
-		"custom_scr_game_perks",
-		"custom_scr_game_spectatetype",
-		"scr_game_spectatetype",
-		"custom_scr_hardcore",
-		"custom_scr_num_bots",
-		"custom_scr_num_bots_enemy",
-		"custom_scr_num_bots_friendly",
-		"custom_scr_player_forcerespawn",
-		"custom_scr_player_healthregentime",
-		"custom_scr_player_maxhealth",
-		"custom_scr_player_sprintTime",
-		"custom_scr_rcbomb_notimeout",
-		"custom_scr_sab_bombtimer",
-		"custom_scr_sab_defusetime",
-		"custom_scr_sab_hotpotato",
-		"custom_scr_sab_planttime",
-		"custom_scr_sab_roundswitch",
-		"custom_scr_sd_bombtimer",
-		"custom_scr_sd_defusetime",
-		"custom_scr_sd_multibomb",
-		"custom_scr_sd_planttime",
-		"custom_scr_sd_roundswitch",
-		"custom_scr_tdm_bonus_leader",
-		"custom_scr_tdm_score_death",
-		"custom_scr_tdm_score_headshot",
-		"custom_scr_tdm_score_kill",
-		"custom_scr_tdm_score_suicide",
-		"custom_scr_team_fftype",
-		"custom_scr_team_teamkillspawndelay",
-		"custom_scr_vehicles_enabled",
-		"custom_timelimit",
-		"safeArea_adjusted_horizontal",
-		"safeArea_adjusted_vertical",
-		"safeArea_horizontal",
-		"safeArea_vertical",
-		"elite_clan_active",
-		"codPointStore_enabled",
-		"sensitivity",
-		"map"
+		"timescale", // Scale time of each frame		  ---> "5401"
+		"ui_mousePitch",
+		//"xpartygo"
 	};
 
 	bool can_add_dvar_to_list(std::string name)