diff --git guis/mainmenu_settings_controls.gui guis/mainmenu_settings_controls.gui
index f6ad6f6..3edcfbf 100644
--- guis/mainmenu_settings_controls.gui
+++ guis/mainmenu_settings_controls.gui
@@ -1209,14 +1209,14 @@ windowDef SettingsControlsCanvas
 		windowDef SCGeneralText1
 		{
 			rect		TEXT_X_OFFSET, 0, 230, MM_LINE_H
-			text		"#str_02382"	// Toggle Crouch
+			text		"#str_02383"	// Always Run
 			SETTINGS_TEXT
 		}
 
 		windowDef SCGeneralText2
 		{
 			rect		TEXT_X_OFFSET, 17, 230, MM_LINE_H
-			text		"#str_02383"	// Always Run
+			text		"#str_02382"	// Toggle Crouch
 			SETTINGS_TEXT
 		}
 
@@ -1230,86 +1230,79 @@ windowDef SettingsControlsCanvas
 		windowDef SCGeneralText4
 		{
 			rect		TEXT_X_OFFSET, 51, 230, MM_LINE_H
-			text		"#str_02385"	// Free Look
+			text		"#str_menu_ToggleSheathe"	// Toggle Sheathe
 			SETTINGS_TEXT
 		}
 
-		windowDef SCGeneralText41
+		windowDef SCGeneralText5
 		{
 			rect		TEXT_X_OFFSET, 68, 230, MM_LINE_H
-			text		"#str_menu_ToggleSheathe"	// Toggle Sheathe
+			text		"#str_02385"	// Free Look
 			SETTINGS_TEXT
 		}
 
-		windowDef SCGeneralText5
+		windowDef SCGeneralText6
 		{
 			rect		TEXT_X_OFFSET, 85, 230, MM_LINE_H
 			text		"#str_02441"		// Invert Mouse
 			SETTINGS_TEXT
 		}
 
-		windowDef SCGeneralText6
+		windowDef SCGeneralText7
 		{
 			rect		TEXT_X_OFFSET, 102, 230, MM_LINE_H
 			text		"#str_02442"		// Smooth Mouse
 			SETTINGS_TEXT
 		}
 
-		windowDef SCGeneralText7
+		windowDef SCGeneralText8
 		{
 			rect		TEXT_X_OFFSET, 119, 230, MM_LINE_H
 			text		"#str_02443"		// Mouse Sensitivity
 			SETTINGS_TEXT
 		}
 
-		/*windowDef SCGeneralText8
+		/*windowDef SCGeneralText9
 		{
-			rect		TEXT_X_OFFSET, 119, 230, MM_LINE_H
+			rect		TEXT_X_OFFSET, 136, 230, MM_LINE_H
 			text		"Empty"
 			SETTINGS_TEXT
 		}*/
 
-		windowDef SCGeneralText9
-		{
-			rect		TEXT_X_OFFSET, 136, 230, MM_LINE_H
-			text		"#str_07312"		// Objectives
-			SETTINGS_TEXT
-		}
-
 		windowDef SCGeneralText10
 		{
 			rect		TEXT_X_OFFSET, 153, 230, MM_LINE_H
-			text		"#str_07178"	// Quicksave
+			text		"#str_07312"		// Objectives
 			SETTINGS_TEXT
 		}
 
 		windowDef SCGeneralText11
 		{
 			rect		TEXT_X_OFFSET, 170, 230, MM_LINE_H
-			text		"#str_07177"	// Quickload
+			text		"#str_07178"	// Quicksave
 			SETTINGS_TEXT
 		}
 
 		windowDef SCGeneralText12
 		{
 			rect		TEXT_X_OFFSET, 187, 230, MM_LINE_H
- 			text		"#str_02917"	// Save Screenshot
+			text		"#str_07177"	// Quickload
 			SETTINGS_TEXT
 		}
 
-		/*windowDef SCGeneralText13
+		windowDef SCGeneralText13
 		{
-			rect		TEXT_X_OFFSET, 203, 230, MM_LINE_H
-			text		"Empty"
+			rect		TEXT_X_OFFSET, 204, 230, MM_LINE_H
+ 			text		"#str_02917"	// Save Screenshot
 			SETTINGS_TEXT
-		}*/
+		}
 
 		choiceDef SCGeneralBind1
 		{
 			rect		SETTINGS_X_OFFSET, 0, 80, MM_LINE_H
 			choices		"#str_07300"		// Disabled;Enabled
 			values		"0;1"
-			cvar		"tdm_toggle_crouch"
+			cvar		"in_alwaysRun"
 			CHOICE_DEF
 		}
 
@@ -1318,7 +1311,7 @@ windowDef SettingsControlsCanvas
 			rect		SETTINGS_X_OFFSET, 17, 80, MM_LINE_H
 			choices		"#str_07300"		// Disabled;Enabled
 			values		"0;1"
-			cvar		"in_alwaysRun"
+			cvar		"tdm_toggle_crouch"
 			CHOICE_DEF
 		}
 
@@ -1336,20 +1329,20 @@ windowDef SettingsControlsCanvas
 			rect		SETTINGS_X_OFFSET, 51, 80, MM_LINE_H
 			choices		"#str_07300"		// Disabled;Enabled
 			values		"0;1"
-			cvar		"in_freeLook"
+			cvar		"tdm_toggle_sheathe"
 			CHOICE_DEF
 		}
 
-		choiceDef SCGeneralBind41
+		choiceDef SCGeneralBind5
 		{
 			rect		SETTINGS_X_OFFSET, 68, 80, MM_LINE_H
 			choices		"#str_07300"		// Disabled;Enabled
 			values		"0;1"
-			cvar		"tdm_toggle_sheathe"
+			cvar		"in_freeLook"
 			CHOICE_DEF
 		}
 
-		choiceDef SCGeneralBind5
+		choiceDef SCGeneralBind6
 		{
 			rect		SETTINGS_X_OFFSET, 85, 80, MM_LINE_H
 			choices		"#str_04221"		// No;Yes
@@ -1398,46 +1391,39 @@ windowDef SettingsControlsCanvas
 			cvar		"sensitivity"
 		}
 
-		/*bindDef SCGeneralBind8
+		/*bindDef SCGeneralBind9
 		{
-			rect		SETTINGS_X_OFFSET_CONTROLS_GENERAL, 119, 110, MM_LINE_H
-			bind		"_impulse51"
+			rect		SETTINGS_X_OFFSET_CONTROLS_GENERAL, 136, 110, MM_LINE_H
+			bind		"none"
 			BINDINGS_TEXT
 		}*/
 
-		bindDef SCGeneralBind9
-		{
-			rect		SETTINGS_X_OFFSET_CONTROLS, 136, 110, MM_LINE_H
-			bind		"_impulse19"
-			BINDINGS_TEXT
-		}
-
 		bindDef SCGeneralBind10
 		{
 			rect		SETTINGS_X_OFFSET_CONTROLS, 153, 110, MM_LINE_H
-			bind		"savegame quick"
+			bind		"_impulse19"
 			BINDINGS_TEXT
 		}
 
 		bindDef SCGeneralBind11
 		{
 			rect		SETTINGS_X_OFFSET_CONTROLS, 170, 110, MM_LINE_H
-			bind		"loadgame quick"
+			bind		"savegame quick"
 			BINDINGS_TEXT
 		}
 
 		bindDef SCGeneralBind12
 		{
 			rect		SETTINGS_X_OFFSET_CONTROLS, 187, 110, MM_LINE_H
-			bind		"screenshot"
+			bind		"loadgame quick"
 			BINDINGS_TEXT
 		}
 
-		/*bindDef SCGeneralBind13
+		bindDef SCGeneralBind13
 		{
-			rect		SETTINGS_X_OFFSET_CONTROLS, 203, 110, MM_LINE_H
-			bind		"none"
+			rect		SETTINGS_X_OFFSET_CONTROLS, 204, 110, MM_LINE_H
+			bind		"screenshot"
 			BINDINGS_TEXT
-		}*/
+		}
 	}
 }

diff --git game/Player.cpp game/Player.cpp
index c6f71dd..8dcbccc 100644
--- game/Player.cpp
+++ game/Player.cpp
@@ -3916,7 +3916,7 @@ bool idPlayer::SelectWeapon( int num, bool force )
 
 	CInventoryWeaponItemPtr item = GetCurrentWeaponItem();
 
-	// #6232 - if 'tdm_holster_weapon_behavior' is 1 and
+	// #6232 - if 'tdm_toggle_sheathe' is 1 and
 	// grayman #3747 - if the current and desired indices are zero,
 	// bring back the previous weapon if it's non-zero
 	if ( cv_tdm_toggle_sheathe.GetBool() && (num == 0) && (item->GetWeaponIndex() == 0) )