diff --git a/z_vr_assets/ui/controls.menu b/z_vr_assets/ui/controls.menu
index bfc162b..a68cecd 100644
--- a/z_vr_assets/ui/controls.menu
+++ b/z_vr_assets/ui/controls.menu
@@ -21,11 +21,11 @@
 		{
 				uiScript 		loadControls
 				hide			forcecontrols
-				hide			movecontrols
+				show			commoncontrols
 				hide			invcontrols
 				hide			comfortcontrols
 				show			setup_background
-				show 			weaponcontrols
+				hide 			weaponcontrols
 		}
 
 		onClose 
@@ -445,6 +445,61 @@
   	    		decoration 
 		}
 
+		// Common  button
+		itemDef 
+		{
+			name				commoncontrolbutton_glow
+			group				mods
+			style				WINDOW_STYLE_SHADER
+			rect				120 173 170 30
+			background			"gfx/menus/menu_blendbox2"			// Frame around button
+			forecolor			1 1 1 1
+			visible				0
+			decoration
+		}
+
+		itemDef 
+		{
+			name				commoncontrolbutton
+			group				none
+			text				"Common"
+			type				ITEM_TYPE_BUTTON
+			style				WINDOW_STYLE_EMPTY
+			rect				120 173 170 30
+			font				3
+			textscale			0.9
+			textalignx			170
+			textaligny			5
+			textalign			ITEM_ALIGN_RIGHT
+			textstyle			3
+			forecolor			0.65 0.65 1 1
+			visible			1
+			descText			"Common controls configuration."
+
+			mouseEnter 
+			{ 
+				show			commoncontrolbutton_glow
+			}
+			mouseExit 
+			{ 
+				hide			commoncontrolbutton_glow
+			}	  	  
+			action 
+			{ 
+				play			sound/interface/button1 
+				show			setup_background 
+				hide 			weaponcontrols 
+				hide			forcecontrols 
+				show			commoncontrols 
+				hide			invcontrols 
+				hide			comfortcontrols 
+				setitemcolor		weaponscontrolbutton 		forecolor 0.64 0.65 1 1 
+				setitemcolor		forcecontrolbutton 		forecolor 0.64 0.65 1 1 
+				setitemcolor		commoncontrolbutton 		forecolor 1 1 1 1 
+				setitemcolor		inventorycontrolbutton 		forecolor 0.64 0.65 1 1 
+				setitemcolor		comfortcontrolbutton 		forecolor 0.64 0.65 1 1 
+			}
+		}
 
 		// Weapons button
 		itemDef 
@@ -452,7 +507,7 @@
 			name				weaponscontrolbutton_glow
 			group				mods
 			style				WINDOW_STYLE_SHADER
-			rect				120 173 170 30
+			rect				120 203 170 30
 			background			"gfx/menus/menu_blendbox2"			// Frame around button
 			forecolor			1 1 1 1
 			visible			0
@@ -466,7 +521,7 @@
 			text				@MENUS0_WEAPONS
 			type				ITEM_TYPE_BUTTON
 			style				WINDOW_STYLE_EMPTY
-			rect				120 173 170 30
+			rect				120 203 170 30
 			font				3
 			textscale			0.9
 			textalignx			170
@@ -475,7 +530,7 @@
 			textstyle			3
 			forecolor			0.65 0.65 1 1
 			visible			1
-			descText			@MENUS0_CONFIGURE_WEAPON_CONTROLS
+			descText			"Weapon specific control configuration."
 
 			mouseEnter 
 			{ 
@@ -491,12 +546,12 @@
 				show			setup_background 
 				show 			weaponcontrols 
 				hide			forcecontrols 
-				hide			movecontrols 
+				hide			commoncontrols 
 				hide			invcontrols 
 				hide			comfortcontrols 
 				setitemcolor		weaponscontrolbutton 		forecolor 1 1 1 1 
 				setitemcolor		forcecontrolbutton 		forecolor 0.64 0.65 1 1 
-				setitemcolor		movementcontrolbutton 		forecolor 0.64 0.65 1 1 
+				setitemcolor		commoncontrolbutton 		forecolor 0.64 0.65 1 1 
 				setitemcolor		inventorycontrolbutton 		forecolor 0.64 0.65 1 1 
 				setitemcolor		comfortcontrolbutton 		forecolor 0.64 0.65 1 1 
 			}
@@ -508,7 +563,7 @@
 			name				forcecontrolbutton_glow
 			group				mods
 			style				WINDOW_STYLE_SHADER
-			rect				120 203 170 30
+			rect				120 233 170 30
 			background			"gfx/menus/menu_blendbox2"			// Frame around button
 			forecolor			1 1 1 1
 			visible			0
@@ -522,7 +577,7 @@
 			text				@MENUS1_FORCE_POWERS
 			type				ITEM_TYPE_BUTTON
 			style				WINDOW_STYLE_EMPTY
-			rect				120 203 170 30
+			rect				120 233 170 30
 			font				3
 			textscale			0.9
 			textalignx			170
@@ -531,7 +586,7 @@
 			textstyle			3
 			forecolor			0.65 0.65 1 1
 			visible			1
-			descText			"Configure Force Power controls."
+			descText			"Force Power specific control configuration."
 
 			mouseEnter 
 			{ 
@@ -547,68 +602,12 @@
 				show			setup_background 
 				hide 			weaponcontrols 
 				show			forcecontrols 
-				hide			movecontrols 
+				hide			commoncontrols 
 				hide			invcontrols  
 				hide			comfortcontrols 
 				setitemcolor		weaponscontrolbutton 		forecolor 0.64 0.65 1 1 
 				setitemcolor		forcecontrolbutton 		forecolor 1 1 1 1 
-				setitemcolor		movementcontrolbutton 		forecolor 0.64 0.65 1 1 
-				setitemcolor		inventorycontrolbutton 		forecolor 0.64 0.65 1 1 
-				setitemcolor		comfortcontrolbutton 		forecolor 0.64 0.65 1 1 
-			}
-		}
-
-		// movement  button
-		itemDef 
-		{
-			name				movementcontrolbutton_glow
-			group				mods
-			style				WINDOW_STYLE_SHADER
-			rect				120 233 170 30
-			background			"gfx/menus/menu_blendbox2"			// Frame around button
-			forecolor			1 1 1 1
-			visible				0
-			decoration
-		}
-
-		itemDef 
-		{
-			name				movementcontrolbutton
-			group				none
-			text				@MENUS0_MOVEMENT
-			type				ITEM_TYPE_BUTTON
-			style				WINDOW_STYLE_EMPTY
-			rect				120 233 170 30
-			font				3
-			textscale			0.9
-			textalignx			170
-			textaligny			5
-			textalign			ITEM_ALIGN_RIGHT
-			textstyle			3
-			forecolor			0.65 0.65 1 1
-			visible			1
-			descText			"Configure Movement controls"
-
-			mouseEnter 
-			{ 
-				show			movementcontrolbutton_glow
-			}
-			mouseExit 
-			{ 
-				hide			movementcontrolbutton_glow
-			}	  	  
-			action 
-			{ 
-				play			sound/interface/button1 
-				show			setup_background 
-				hide 			weaponcontrols 
-				hide			forcecontrols 
-				show			movecontrols 
-				hide			invcontrols 
-				hide			comfortcontrols 
-				setitemcolor		weaponscontrolbutton 		forecolor 0.64 0.65 1 1 
-				setitemcolor		forcecontrolbutton 		forecolor 0.64 0.65 1 1 
-				setitemcolor		movementcontrolbutton 		forecolor 1 1 1 1 
+				setitemcolor		commoncontrolbutton 		forecolor 0.64 0.65 1 1 
 				setitemcolor		inventorycontrolbutton 		forecolor 0.64 0.65 1 1 
 				setitemcolor		comfortcontrolbutton 		forecolor 0.64 0.65 1 1 
 			}
@@ -643,7 +642,7 @@
 			textstyle			3
 			forecolor			0.65 0.65 1 1
 			visible			1
-			descText			"Configure Inventory controls."
+			descText			"Inventory specific control configuration."
 
 			mouseEnter 
 			{ 
@@ -659,12 +658,12 @@
 				show			setup_background 
 				hide 			weaponcontrols 
 				hide			forcecontrols
-				hide			movecontrols 
+				hide			commoncontrols 
 				show			invcontrols 
 				hide			comfortcontrols 
 				setitemcolor		weaponscontrolbutton 		forecolor 0.64 0.65 1 1 
 				setitemcolor		forcecontrolbutton 		forecolor 0.64 0.65 1 1 
-				setitemcolor		movementcontrolbutton 		forecolor 0.64 0.65 1 1 
+				setitemcolor		commoncontrolbutton 		forecolor 0.64 0.65 1 1 
 				setitemcolor		inventorycontrolbutton 		forecolor 1 1 1 1 
 				setitemcolor		comfortcontrolbutton 		forecolor 0.64 0.65 1 1 
 			}
@@ -715,12 +714,12 @@
 				show			setup_background
 				hide 			weaponcontrols
 				hide			forcecontrols
-				hide			movecontrols
+				hide			commoncontrols
 				hide			invcontrols
 				show			comfortcontrols
 				setitemcolor		weaponscontrolbutton 		forecolor 0.64 0.65 1 1
 				setitemcolor		forcecontrolbutton 		forecolor 0.64 0.65 1 1
-				setitemcolor		movementcontrolbutton 		forecolor 0.64 0.65 1 1
+				setitemcolor		commoncontrolbutton 		forecolor 0.64 0.65 1 1
 				setitemcolor		inventorycontrolbutton 		forecolor 0.64 0.65 1 1
 				setitemcolor		comfortcontrolbutton 		forecolor 1 1 1 1
 			}
@@ -889,6 +888,187 @@
 
 
 
+		//----------------------------------------------------------------------------------------------
+		//
+		//	COMMON MENU
+		//
+		//----------------------------------------------------------------------------------------------
+		itemDef 
+		{
+			name				none
+			group				commoncontrols
+			type				ITEM_TYPE_SLIDER
+			text				"Movement Speed:"
+			cvarfloat		"vr_movement_multiplier" 0.1 0.4 1.2
+			rect				305 191 300 20
+			textalign			ITEM_ALIGN_RIGHT
+			textalignx			151
+			textaligny			-2
+			font				2
+			textscale			0.8
+			forecolor			1 1 1 1
+			visible			0
+			// appearance_slot		1
+			descText			"Sets player movement speed."
+			action 
+			{ 
+				play			sound/interface/button1
+			}
+		
+			mouseenter 
+			{ 
+				show			highlight2
+			}
+
+			mouseexit 
+			{ 
+				hide			highlight2
+			}			
+		}
+
+		itemDef 
+		{
+			name				none
+			group				commoncontrols
+			type				ITEM_TYPE_MULTI
+			text				"Direction Mode:"
+			cvar				"vr_walkdirection"
+			cvarFloatList		
+			{ 
+				"Off-hand Controller" 0  
+				"HMD" 1 
+			}
+			rect				305 211 300 20
+			textalign			ITEM_ALIGN_RIGHT
+			textalignx			151
+			textaligny			-2
+			font				2
+			textscale			0.8
+			forecolor			1 1 1 1
+			visible			0
+			// appearance_slot		1
+			descText			"Choose movement direction mode."
+			action 
+			{ 
+				play			sound/interface/button1
+			}
+
+			mouseenter 
+			{ 
+				show			highlight3
+			}
+
+			mouseexit 
+			{ 
+				hide			highlight3
+			}			
+
+		}
+
+		itemDef 
+		{
+			name				none
+			group				commoncontrols
+			type				ITEM_TYPE_YESNO
+			text				"Smooth turn:"
+			cvar				"vr_turn_mode"
+			rect				305 231 300 20
+			textalign			ITEM_ALIGN_RIGHT
+			textalignx			151 
+			textaligny			-2
+			font				2
+			textscale			0.8
+			forecolor			1 1 1 1
+			visible			0
+			// appearance_slot		3
+			descText			"Enables or disables smooth turning."
+			action 
+			{ 
+				play			sound/interface/button1
+			}
+
+			mouseenter 
+			{
+				show			highlight4
+			}
+			mouseexit 
+			{ 
+				hide			highlight4
+			}
+		}
+
+		itemDef 
+		{
+			name				none
+			group				commoncontrols
+			type				ITEM_TYPE_MULTI
+			text				"Turn Angle:"
+			cvar				"vr_turn_angle"
+			cvarFloatList		
+			{ 
+				"30 Degrees" 30  
+				"45 Degrees" 45
+				"90 Degrees" 90
+			}
+			rect				305 251 300 20
+			textalign			ITEM_ALIGN_RIGHT
+			textalignx			151 
+			textaligny			-2
+			font				2
+			textscale			0.8
+			forecolor			1 1 1 1
+			visible			0 
+			// appearance_slot		4
+			descText			"Degrees to turn when using snap turn / Speed of smooth turn"
+			action 
+			{ 
+				play			sound/interface/button1
+			}
+
+			mouseenter 
+			{
+				show			highlight5
+			}
+			mouseexit 
+			{ 
+				hide			highlight5
+			}
+		}
+
+		itemDef 
+		{
+			name				none
+			group				commoncontrols
+			type				ITEM_TYPE_YESNO
+			text				"Switch Sticks:"
+			cvar				"vr_switch_sticks"
+			rect				305 271 300 20
+			textalign			ITEM_ALIGN_RIGHT
+			textalignx			151 
+			textaligny			-2
+			font				2
+			textscale			0.8
+			forecolor			1 1 1 1
+			visible			0 
+			// appearance_slot		5
+			descText			"Switches left/gight controller thubmsticks."
+			action 
+			{ 
+				play			sound/interface/button1
+			}
+
+			mouseenter 
+			{
+				show			highlight6
+			}
+			mouseexit 
+			{ 
+				hide			highlight6
+			}
+		}
+
+
+
 		//----------------------------------------------------------------------------------------------
 		//
 		//	WEAPON MENU
@@ -974,7 +1154,7 @@
 			group				weaponcontrols
 			type				ITEM_TYPE_YESNO
 			text				"Virtual Gun Stock:"
-			cvar				"vr_virtual_stock"
+			cvar			"vr_virtual_stock"
 			rect				305 231 300 20
 			textalign			ITEM_ALIGN_RIGHT
 			textalignx			151
@@ -1007,8 +1187,8 @@
 			name				none
 			group				weaponcontrols
 			type				ITEM_TYPE_YESNO
-			text				"Show Force Power Direction:"
-			cvar				"cg_showForcePowerDirection"
+			text				"Saber Auto Blocking:"
+			cvar			"g_saberAutoblocking"
 			rect				305 251 300 20
 			textalign			ITEM_ALIGN_RIGHT
 			textalignx			151
@@ -1018,6 +1198,49 @@
 			forecolor			1 1 1 1
 			visible			0 
 			// appearance_slot		2
+			descText			"Enables or disables auto blocking with saber."
+			action 
+			{ 
+				play			sound/interface/button1
+			}
+
+			mouseenter 
+			{ 
+				show			highlight5
+			}
+
+			mouseexit 
+			{ 
+				hide			highlight5
+			}			
+
+		}
+
+
+
+		//----------------------------------------------------------------------------------------------
+		//
+		//	FORCE MENU
+		//
+		//----------------------------------------------------------------------------------------------
+		
+
+		itemDef 
+		{
+			name				none
+			group				forcecontrols
+			type				ITEM_TYPE_YESNO
+			text				"Force Power Direction Hint:"
+			cvar				"cg_showForcePowerDirection"
+			rect				310 191 300 20
+			textalign			ITEM_ALIGN_RIGHT
+			textalignx			151
+			textaligny			-2
+			font				2
+			textscale			0.8
+			forecolor			1 1 1 1
+			visible			0 
+			// appearance_slot		2
 			descText			"Hint as to which direction a force power was fired."
 			action 
 			{ 
@@ -1026,12 +1249,12 @@
 
 			mouseenter 
 			{ 
-				show			highlight4
+				show			highlight2
 			}
 
 			mouseexit 
 			{ 
-				hide			highlight4
+				hide			highlight2
 			}			
 
 		}
@@ -1039,11 +1262,11 @@
 		itemDef 
 		{
 			name				none
-			group				weaponcontrols
+			group				forcecontrols
 			type				ITEM_TYPE_YESNO
-			text				"Show Force Speed FOV Change:"
+			text				"Force Speed FOV Change:"
 			cvar				"cg_forceSpeedFOVAdjust"
-			rect				305 271 300 20
+			rect				310 211 300 20
 			textalign			ITEM_ALIGN_RIGHT
 			textalignx			151
 			textaligny			-2
@@ -1058,157 +1281,6 @@
 				play			sound/interface/button1
 			}
 
-			mouseenter 
-			{ 
-				show			highlight4
-			}
-
-			mouseexit 
-			{ 
-				hide			highlight4
-			}			
-
-		}
-
-
-
-		//----------------------------------------------------------------------------------------------
-		//
-		//	FORCE MENU
-		//
-		//----------------------------------------------------------------------------------------------
-		itemDef 
-		{
-			name				none
-			group				forcecontrols
-			type				ITEM_TYPE_YESNO
-			text				"Placeholder:"
-			cvar				"place_holder"
-			rect				305 191 300 20
-			textalign			ITEM_ALIGN_RIGHT
-			textalignx			151
-			textaligny			-2
-			font				2
-			textscale			0.8
-			forecolor			1 1 1 1
-			visible			0
-			// appearance_slot		1
-			descText			"Item placeholder."
-			action 
-			{ 
-				play			sound/interface/button1
-			}
-		
-			mouseenter 
-			{ 
-				show			highlight2
-			}
-			mouseexit 
-			{ 
-				hide			highlight2
-			}
-		}
-
-
-
-		//----------------------------------------------------------------------------------------------
-		//
-		//	MOVEMENT MENU
-		//
-		//----------------------------------------------------------------------------------------------
-		//itemDef 
-		//{
-		//	name				none
-		//	group				movecontrols
-		//	type				ITEM_TYPE_YESNO
-		//	text				@MENUS0_ALWAYS_RUN
-		//	cvar				"cl_run"
-		//	rect				305 191 300 20
-		//	textalign			ITEM_ALIGN_RIGHT
-		//	textalignx			151
-		//	textaligny			-2
-		//	font				2
-		//	textscale			0.8
-		//	forecolor			1 1 1 1
-		//	visible			0
-		//	// appearance_slot		1
-		//	descText			@MENUS1_WHEN_ON_PLAYER_ALWAYS
-		//	action 
-		//	{ 
-		//		play			sound/interface/button1
-		//	}
-		//
-		//	mouseenter 
-		//	{ 
-		//		show			highlight2
-		//	}
-		//
-		//	mouseexit 
-		//	{ 
-		//		hide			highlight2
-		//	}			
-		//}
-
-		itemDef 
-		{
-			name				none
-			group				movecontrols
-			type				ITEM_TYPE_SLIDER
-			text				"Movement Speed:"
-			cvarfloat		"vr_movement_multiplier" 0.1 0.4 1.2
-			rect				305 191 300 20
-			textalign			ITEM_ALIGN_RIGHT
-			textalignx			151
-			textaligny			-2
-			font				2
-			textscale			0.8
-			forecolor			1 1 1 1
-			visible			0
-			// appearance_slot		1
-			descText			"Sets player movement speed."
-			action 
-			{ 
-				play			sound/interface/button1
-			}
-		
-			mouseenter 
-			{ 
-				show			highlight2
-			}
-
-			mouseexit 
-			{ 
-				hide			highlight2
-			}			
-		}
-
-		itemDef 
-		{
-			name				none
-			group				movecontrols
-			type				ITEM_TYPE_MULTI
-			text				"Direction Mode:"
-			cvar				"vr_walkdirection"
-			cvarFloatList		
-			{ 
-				"Off-hand Controller" 0  
-				"HMD" 1 
-			}
-			rect				305 211 300 20
-			textalign			ITEM_ALIGN_RIGHT
-			textalignx			151
-			textaligny			-2
-			font				2
-			textscale			0.8
-			forecolor			1 1 1 1
-			visible			0
-			// appearance_slot		1
-			descText			"Choose movement direction mode."
-			action 
-			{ 
-				play			sound/interface/button1
-			}
-
 			mouseenter 
 			{ 
 				show			highlight3
@@ -1221,108 +1293,6 @@
 
 		}
 
-		itemDef 
-		{
-			name				none
-			group				movecontrols
-			type				ITEM_TYPE_YESNO
-			text				"Smooth turn:"
-			cvar				"vr_turn_mode"
-			rect				305 231 300 20
-			textalign			ITEM_ALIGN_RIGHT
-			textalignx			151 
-			textaligny			-2
-			font				2
-			textscale			0.8
-			forecolor			1 1 1 1
-			visible			0
-			// appearance_slot		3
-			descText			"Enables or disables smooth turning."
-			action 
-			{ 
-				play			sound/interface/button1
-			}
-
-			mouseenter 
-			{
-				show			highlight4
-			}
-			mouseexit 
-			{ 
-				hide			highlight4
-			}
-		}
-
-		itemDef 
-		{
-			name				none
-			group				movecontrols
-			type				ITEM_TYPE_MULTI
-			text				"Turn Angle:"
-			cvar				"vr_turn_angle"
-			cvarFloatList		
-			{ 
-				"30 Degrees" 30  
-				"45 Degrees" 45
-				"90 Degrees" 90
-			}
-			rect				305 251 300 20
-			textalign			ITEM_ALIGN_RIGHT
-			textalignx			151 
-			textaligny			-2
-			font				2
-			textscale			0.8
-			forecolor			1 1 1 1
-			visible			0 
-			// appearance_slot		4
-			descText			"Degrees to turn when using snap turn / Speed of smooth turn"
-			action 
-			{ 
-				play			sound/interface/button1
-			}
-
-			mouseenter 
-			{
-				show			highlight5
-			}
-			mouseexit 
-			{ 
-				hide			highlight5
-			}
-		}
-
-		itemDef 
-		{
-			name				movement
-			group				movecontrols
-			type				ITEM_TYPE_YESNO
-			text				"Switch Sticks:"
-			cvar				"vr_switch_sticks"
-			rect				305 271 300 20
-			textalign			ITEM_ALIGN_RIGHT
-			textalignx			151 
-			textaligny			-2
-			font				2
-			textscale			0.8
-			forecolor			1 1 1 1
-			visible			0 
-			// appearance_slot		5
-			descText			"Switches left/gight controller thubmsticks."
-			action 
-			{ 
-				play			sound/interface/button1
-			}
-
-			mouseenter 
-			{
-				show			highlight6
-			}
-			mouseexit 
-			{ 
-				hide			highlight6
-			}
-		}
-
 
 
 		//----------------------------------------------------------------------------------------------
diff --git a/z_vr_assets/ui/ingamecontrols.menu b/z_vr_assets/ui/ingamecontrols.menu
index e5e2fb5..59e61c6 100644
--- a/z_vr_assets/ui/ingamecontrols.menu
+++ b/z_vr_assets/ui/ingamecontrols.menu
@@ -21,11 +21,11 @@
 		{
 				uiScript 		loadControls
 				hide			forcecontrols
-				hide			movecontrols
+				show			commoncontrols
 				hide			invcontrols
 				hide			comfortcontrols
 				show			setup_background
-				show 			weaponcontrols
+				hide 			weaponcontrols
 		}
 
 		onClose 
@@ -455,6 +455,61 @@
   	    		decoration 
 		}
 
+		// Common  button
+		itemDef 
+		{
+			name				commoncontrolbutton_glow
+			group				mods
+			style				WINDOW_STYLE_SHADER
+			rect				120 173 170 30
+			background			"gfx/menus/menu_blendbox2"			// Frame around button
+			forecolor			1 1 1 1
+			visible				0
+			decoration
+		}
+
+		itemDef 
+		{
+			name				commoncontrolbutton
+			group				none
+			text				"Common"
+			type				ITEM_TYPE_BUTTON
+			style				WINDOW_STYLE_EMPTY
+			rect				120 173 170 30
+			font				3
+			textscale			0.9
+			textalignx			170
+			textaligny			5
+			textalign			ITEM_ALIGN_RIGHT
+			textstyle			3
+			forecolor			0.65 0.65 1 1
+			visible			1
+			descText			"Common controls configuration."
+
+			mouseEnter 
+			{ 
+				show			commoncontrolbutton_glow
+			}
+			mouseExit 
+			{ 
+				hide			commoncontrolbutton_glow
+			}	  	  
+			action 
+			{ 
+				play			sound/interface/button1 
+				show			setup_background 
+				hide 			weaponcontrols 
+				hide			forcecontrols 
+				show			commoncontrols 
+				hide			invcontrols 
+				hide			comfortcontrols 
+				setitemcolor		weaponscontrolbutton 		forecolor 0.64 0.65 1 1 
+				setitemcolor		forcecontrolbutton 		forecolor 0.64 0.65 1 1 
+				setitemcolor		commoncontrolbutton 		forecolor 1 1 1 1 
+				setitemcolor		inventorycontrolbutton 		forecolor 0.64 0.65 1 1 
+				setitemcolor		comfortcontrolbutton 		forecolor 0.64 0.65 1 1 
+			}
+		}
 
 		// Weapons button
 		itemDef 
@@ -462,7 +517,7 @@
 			name				weaponscontrolbutton_glow
 			group				mods
 			style				WINDOW_STYLE_SHADER
-			rect				120 173 170 30
+			rect				120 203 170 30
 			background			"gfx/menus/menu_blendbox2"			// Frame around button
 			forecolor			1 1 1 1
 			visible			0
@@ -476,7 +531,7 @@
 			text				@MENUS0_WEAPONS
 			type				ITEM_TYPE_BUTTON
 			style				WINDOW_STYLE_EMPTY
-			rect				120 173 170 30
+			rect				120 203 170 30
 			font				3
 			textscale			0.9
 			textalignx			170
@@ -485,7 +540,7 @@
 			textstyle			3
 			forecolor			0.65 0.65 1 1
 			visible			1
-			descText			@MENUS0_CONFIGURE_WEAPON_CONTROLS
+			descText			"Weapon specific control configuration."
 
 			mouseEnter 
 			{ 
@@ -501,12 +556,12 @@
 				show			setup_background 
 				show 			weaponcontrols 
 				hide			forcecontrols 
-				hide			movecontrols 
+				hide			commoncontrols 
 				hide			invcontrols 
 				hide			comfortcontrols 
 				setitemcolor		weaponscontrolbutton 		forecolor 1 1 1 1 
 				setitemcolor		forcecontrolbutton 		forecolor 0.64 0.65 1 1 
-				setitemcolor		movementcontrolbutton 		forecolor 0.64 0.65 1 1 
+				setitemcolor		commoncontrolbutton 		forecolor 0.64 0.65 1 1 
 				setitemcolor		inventorycontrolbutton 		forecolor 0.64 0.65 1 1 
 				setitemcolor		comfortcontrolbutton 		forecolor 0.64 0.65 1 1 
 			}
@@ -518,7 +573,7 @@
 			name				forcecontrolbutton_glow
 			group				mods
 			style				WINDOW_STYLE_SHADER
-			rect				120 203 170 30
+			rect				120 233 170 30
 			background			"gfx/menus/menu_blendbox2"			// Frame around button
 			forecolor			1 1 1 1
 			visible			0
@@ -532,7 +587,7 @@
 			text				@MENUS1_FORCE_POWERS
 			type				ITEM_TYPE_BUTTON
 			style				WINDOW_STYLE_EMPTY
-			rect				120 203 170 30
+			rect				120 233 170 30
 			font				3
 			textscale			0.9
 			textalignx			170
@@ -541,7 +596,7 @@
 			textstyle			3
 			forecolor			0.65 0.65 1 1
 			visible			1
-			descText			"Configure Force Power controls."
+			descText			"Force Power specific control configuration."
 
 			mouseEnter 
 			{ 
@@ -557,68 +612,12 @@
 				show			setup_background 
 				hide 			weaponcontrols 
 				show			forcecontrols 
-				hide			movecontrols 
+				hide			commoncontrols 
 				hide			invcontrols  
 				hide			comfortcontrols 
 				setitemcolor		weaponscontrolbutton 		forecolor 0.64 0.65 1 1 
 				setitemcolor		forcecontrolbutton 		forecolor 1 1 1 1 
-				setitemcolor		movementcontrolbutton 		forecolor 0.64 0.65 1 1 
-				setitemcolor		inventorycontrolbutton 		forecolor 0.64 0.65 1 1 
-				setitemcolor		comfortcontrolbutton 		forecolor 0.64 0.65 1 1 
-			}
-		}
-
-		// movement  button
-		itemDef 
-		{
-			name				movementcontrolbutton_glow
-			group				mods
-			style				WINDOW_STYLE_SHADER
-			rect				120 233 170 30
-			background			"gfx/menus/menu_blendbox2"			// Frame around button
-			forecolor			1 1 1 1
-			visible				0
-			decoration
-		}
-
-		itemDef 
-		{
-			name				movementcontrolbutton
-			group				none
-			text				@MENUS0_MOVEMENT
-			type				ITEM_TYPE_BUTTON
-			style				WINDOW_STYLE_EMPTY
-			rect				120 233 170 30
-			font				3
-			textscale			0.9
-			textalignx			170
-			textaligny			5
-			textalign			ITEM_ALIGN_RIGHT
-			textstyle			3
-			forecolor			0.65 0.65 1 1
-			visible			1
-			descText			"Configure Movement controls"
-
-			mouseEnter 
-			{ 
-				show			movementcontrolbutton_glow
-			}
-			mouseExit 
-			{ 
-				hide			movementcontrolbutton_glow
-			}	  	  
-			action 
-			{ 
-				play			sound/interface/button1 
-				show			setup_background 
-				hide 			weaponcontrols 
-				hide			forcecontrols 
-				show			movecontrols 
-				hide			invcontrols 
-				hide			comfortcontrols 
-				setitemcolor		weaponscontrolbutton 		forecolor 0.64 0.65 1 1 
-				setitemcolor		forcecontrolbutton 		forecolor 0.64 0.65 1 1 
-				setitemcolor		movementcontrolbutton 		forecolor 1 1 1 1 
+				setitemcolor		commoncontrolbutton 		forecolor 0.64 0.65 1 1 
 				setitemcolor		inventorycontrolbutton 		forecolor 0.64 0.65 1 1 
 				setitemcolor		comfortcontrolbutton 		forecolor 0.64 0.65 1 1 
 			}
@@ -653,7 +652,7 @@
 			textstyle			3
 			forecolor			0.65 0.65 1 1
 			visible			1
-			descText			"Configure Inventory controls."
+			descText			"Inventory specific control configuration."
 
 			mouseEnter 
 			{ 
@@ -669,12 +668,12 @@
 				show			setup_background 
 				hide 			weaponcontrols 
 				hide			forcecontrols
-				hide			movecontrols 
+				hide			commoncontrols 
 				show			invcontrols 
 				hide			comfortcontrols 
 				setitemcolor		weaponscontrolbutton 		forecolor 0.64 0.65 1 1 
 				setitemcolor		forcecontrolbutton 		forecolor 0.64 0.65 1 1 
-				setitemcolor		movementcontrolbutton 		forecolor 0.64 0.65 1 1 
+				setitemcolor		commoncontrolbutton 		forecolor 0.64 0.65 1 1 
 				setitemcolor		inventorycontrolbutton 		forecolor 1 1 1 1 
 				setitemcolor		comfortcontrolbutton 		forecolor 0.64 0.65 1 1 
 			}
@@ -725,12 +724,12 @@
 				show			setup_background
 				hide 			weaponcontrols
 				hide			forcecontrols
-				hide			movecontrols
+				hide			commoncontrols
 				hide			invcontrols
 				show			comfortcontrols
 				setitemcolor		weaponscontrolbutton 		forecolor 0.64 0.65 1 1
 				setitemcolor		forcecontrolbutton 		forecolor 0.64 0.65 1 1
-				setitemcolor		movementcontrolbutton 		forecolor 0.64 0.65 1 1
+				setitemcolor		commoncontrolbutton 		forecolor 0.64 0.65 1 1
 				setitemcolor		inventorycontrolbutton 		forecolor 0.64 0.65 1 1
 				setitemcolor		comfortcontrolbutton 		forecolor 1 1 1 1
 			}
@@ -899,6 +898,255 @@
 
 
 
+		//----------------------------------------------------------------------------------------------
+		//
+		//	COMMON MENU
+		//
+		//----------------------------------------------------------------------------------------------
+		itemDef 
+		{
+			name				none
+			group				commoncontrols
+			type				ITEM_TYPE_SLIDER
+			text				"Movement Speed:"
+			cvarfloat		"vr_movement_multiplier" 0.1 0.4 1.2
+			rect				305 191 300 20
+			textalign			ITEM_ALIGN_RIGHT
+			textalignx			151
+			textaligny			-2
+			font				2
+			textscale			0.8
+			forecolor			1 1 1 1
+			visible			0
+			// appearance_slot		1
+			descText			"Sets player movement speed."
+			action 
+			{ 
+				play			sound/interface/button1
+			}
+		
+			mouseenter 
+			{ 
+				show			highlight2
+			}
+
+			mouseexit 
+			{ 
+				hide			highlight2
+			}			
+		}
+
+		itemDef 
+		{
+			name				none
+			group				commoncontrols
+			type				ITEM_TYPE_MULTI
+			text				"Direction Mode:"
+			cvar				"vr_walkdirection"
+			cvarFloatList		
+			{ 
+				"Off-hand Controller" 0  
+				"HMD" 1 
+			}
+			rect				305 211 300 20
+			textalign			ITEM_ALIGN_RIGHT
+			textalignx			151
+			textaligny			-2
+			font				2
+			textscale			0.8
+			forecolor			1 1 1 1
+			visible			0
+			// appearance_slot		1
+			descText			"Choose movement direction mode."
+			action 
+			{ 
+				play			sound/interface/button1
+			}
+
+			mouseenter 
+			{ 
+				show			highlight3
+			}
+
+			mouseexit 
+			{ 
+				hide			highlight3
+			}			
+
+		}
+
+		itemDef 
+		{
+			name				none
+			group				commoncontrols
+			type				ITEM_TYPE_YESNO
+			text				"Smooth turn:"
+			cvar				"vr_turn_mode"
+			rect				305 231 300 20
+			textalign			ITEM_ALIGN_RIGHT
+			textalignx			151 
+			textaligny			-2
+			font				2
+			textscale			0.8
+			forecolor			1 1 1 1
+			visible			0
+			// appearance_slot		3
+			descText			"Enables or disables smooth turning."
+			action 
+			{ 
+				play			sound/interface/button1
+			}
+
+			mouseenter 
+			{
+				show			highlight4
+			}
+			mouseexit 
+			{ 
+				hide			highlight4
+			}
+		}
+
+		itemDef 
+		{
+			name				none
+			group				commoncontrols
+			type				ITEM_TYPE_MULTI
+			text				"Turn Angle:"
+			cvar				"vr_turn_angle"
+			cvarFloatList		
+			{ 
+				"30 Degrees" 30  
+				"45 Degrees" 45
+				"90 Degrees" 90
+			}
+			rect				305 251 300 20
+			textalign			ITEM_ALIGN_RIGHT
+			textalignx			151 
+			textaligny			-2
+			font				2
+			textscale			0.8
+			forecolor			1 1 1 1
+			visible			0 
+			// appearance_slot		4
+			descText			"Degrees to turn when using snap turn / Speed of smooth turn"
+			action 
+			{ 
+				play			sound/interface/button1
+			}
+
+			mouseenter 
+			{
+				show			highlight5
+			}
+			mouseexit 
+			{ 
+				hide			highlight5
+			}
+		}
+
+		itemDef 
+		{
+			name				none
+			group				commoncontrols
+			type				ITEM_TYPE_YESNO
+			text				"Switch Sticks:"
+			cvar				"vr_switch_sticks"
+			rect				305 271 300 20
+			textalign			ITEM_ALIGN_RIGHT
+			textalignx			151 
+			textaligny			-2
+			font				2
+			textscale			0.8
+			forecolor			1 1 1 1
+			visible			0 
+			// appearance_slot		5
+			descText			"Switches left/gight controller thubmsticks."
+			action 
+			{ 
+				play			sound/interface/button1
+			}
+
+			mouseenter 
+			{
+				show			highlight6
+			}
+			mouseexit 
+			{ 
+				hide			highlight6
+			}
+		}				
+
+		itemDef 
+		{
+			name				none
+			group				weaponcontrols
+			type				ITEM_TYPE_YESNO
+			text				"Force Power Direction:"
+			cvar				"cg_showForcePowerDirection"
+			rect				305 291 300 20
+			textalign			ITEM_ALIGN_RIGHT
+			textalignx			151
+			textaligny			-2
+			font				2
+			textscale			0.8
+			forecolor			1 1 1 1
+			visible			0 
+			// appearance_slot		2
+			descText			"Hint as to which direction a force power was fired."
+			action 
+			{ 
+				play			sound/interface/button1
+			}
+
+			mouseenter 
+			{ 
+				show			highlight4
+			}
+
+			mouseexit 
+			{ 
+				hide			highlight4
+			}			
+
+		}
+
+		itemDef 
+		{
+			name				none
+			group				weaponcontrols
+			type				ITEM_TYPE_YESNO
+			text				"Force Speed FOV Change:"
+			cvar				"cg_forceSpeedFOVAdjust"
+			rect				305 311 300 20
+			textalign			ITEM_ALIGN_RIGHT
+			textalignx			151
+			textaligny			-2
+			font				2
+			textscale			0.8
+			forecolor			1 1 1 1
+			visible				0 
+			// appearance_slot		2
+			descText			"Whether the FOV will be adjusted briefly when engaging Force Speed."
+			action 
+			{ 
+				play			sound/interface/button1
+			}
+
+			mouseenter 
+			{ 
+				show			highlight4
+			}
+
+			mouseexit 
+			{ 
+				hide			highlight4
+			}			
+
+		}
+
+
+
 		//----------------------------------------------------------------------------------------------
 		//
 		//	WEAPON MENU
@@ -1017,8 +1265,8 @@
 			name				none
 			group				weaponcontrols
 			type				ITEM_TYPE_YESNO
-			text				"Show Force Power Direction:"
-			cvar				"cg_showForcePowerDirection"
+			text				"Saber Auto Blocking:"
+			cvar			"g_saberAutoblocking"
 			rect				305 251 300 20
 			textalign			ITEM_ALIGN_RIGHT
 			textalignx			151
@@ -1028,7 +1276,7 @@
 			forecolor			1 1 1 1
 			visible			0 
 			// appearance_slot		2
-			descText			"Hint as to which direction a force power was fired."
+			descText			"Enables or disables auto blocking with saber."
 			action 
 			{ 
 				play			sound/interface/button1
@@ -1036,46 +1284,12 @@
 
 			mouseenter 
 			{ 
-				show			highlight4
+				show			highlight5
 			}
 
 			mouseexit 
 			{ 
-				hide			highlight4
-			}			
-
-		}
-
-		itemDef 
-		{
-			name				none
-			group				weaponcontrols
-			type				ITEM_TYPE_YESNO
-			text				"Show Force Speed FOV Change:"
-			cvar				"cg_forceSpeedFOVAdjust"
-			rect				305 271 300 20
-			textalign			ITEM_ALIGN_RIGHT
-			textalignx			151
-			textaligny			-2
-			font				2
-			textscale			0.8
-			forecolor			1 1 1 1
-			visible				0 
-			// appearance_slot		2
-			descText			"Whether the FOV will be adjusted briefly when engaging Force Speed."
-			action 
-			{ 
-				play			sound/interface/button1
-			}
-
-			mouseenter 
-			{ 
-				show			highlight4
-			}
-
-			mouseexit 
-			{ 
-				hide			highlight4
+				hide			highlight5
 			}			
 
 		}
@@ -1092,8 +1306,8 @@
 			name				none
 			group				forcecontrols
 			type				ITEM_TYPE_YESNO
-			text				"Placeholder:"
-			cvar				"place_holder"
+			text				"Force Power Direction Hint:"
+			cvar				"cg_showForcePowerDirection"
 			rect				305 191 300 20
 			textalign			ITEM_ALIGN_RIGHT
 			textalignx			151
@@ -1101,86 +1315,14 @@
 			font				2
 			textscale			0.8
 			forecolor			1 1 1 1
-			visible			0
-			// appearance_slot		1
-			descText			"Item placeholder."
+			visible			0 
+			// appearance_slot		2
+			descText			"Hint as to which direction a force power was fired."
 			action 
 			{ 
 				play			sound/interface/button1
 			}
-		
-			mouseenter 
-			{ 
-				show			highlight2
-			}
-			mouseexit 
-			{ 
-				hide			highlight2
-			}
-		}
 
-
-
-		//----------------------------------------------------------------------------------------------
-		//
-		//	MOVEMENT MENU
-		//
-		//----------------------------------------------------------------------------------------------
-		//itemDef 
-		//{
-		//	name				none
-		//	group				movecontrols
-		//	type				ITEM_TYPE_YESNO
-		//	text				@MENUS0_ALWAYS_RUN
-		//	cvar				"cl_run"
-		//	rect				305 191 300 20
-		//	textalign			ITEM_ALIGN_RIGHT
-		//	textalignx			151
-		//	textaligny			-2
-		//	font				2
-		//	textscale			0.8
-		//	forecolor			1 1 1 1
-		//	visible			0
-		//	// appearance_slot		1
-		//	descText			@MENUS1_WHEN_ON_PLAYER_ALWAYS
-		//	action 
-		//	{ 
-		//		play			sound/interface/button1
-		//	}
-		//
-		//	mouseenter 
-		//	{ 
-		//		show			highlight2
-		//	}
-		//
-		//	mouseexit 
-		//	{ 
-		//		hide			highlight2
-		//	}			
-		//}
-
-		itemDef 
-		{
-			name				none
-			group				movecontrols
-			type				ITEM_TYPE_SLIDER
-			text				"Movement Speed:"
-			cvarfloat		"vr_movement_multiplier" 0.1 0.4 1.2
-			rect				305 191 300 20
-			textalign			ITEM_ALIGN_RIGHT
-			textalignx			151
-			textaligny			-2
-			font				2
-			textscale			0.8
-			forecolor			1 1 1 1
-			visible			0
-			// appearance_slot		1
-			descText			"Sets player movement speed."
-			action 
-			{ 
-				play			sound/interface/button1
-			}
-		
 			mouseenter 
 			{ 
 				show			highlight2
@@ -1190,20 +1332,16 @@
 			{ 
 				hide			highlight2
 			}			
+
 		}
 
 		itemDef 
 		{
 			name				none
-			group				movecontrols
-			type				ITEM_TYPE_MULTI
-			text				"Direction Mode:"
-			cvar				"vr_walkdirection"
-			cvarFloatList		
-			{ 
-				"Off-hand Controller" 0  
-				"HMD" 1 
-			}
+			group				forcecontrols
+			type				ITEM_TYPE_YESNO
+			text				"Force Speed FOV Change:"
+			cvar				"cg_forceSpeedFOVAdjust"
 			rect				305 211 300 20
 			textalign			ITEM_ALIGN_RIGHT
 			textalignx			151
@@ -1211,9 +1349,9 @@
 			font				2
 			textscale			0.8
 			forecolor			1 1 1 1
-			visible			0
-			// appearance_slot		1
-			descText			"Choose movement direction mode."
+			visible				0 
+			// appearance_slot		2
+			descText			"Whether the FOV will be adjusted briefly when engaging Force Speed."
 			action 
 			{ 
 				play			sound/interface/button1
@@ -1231,108 +1369,6 @@
 
 		}
 
-		itemDef 
-		{
-			name				none
-			group				movecontrols
-			type				ITEM_TYPE_YESNO
-			text				"Smooth turn:"
-			cvar				"vr_turn_mode"
-			rect				305 231 300 20
-			textalign			ITEM_ALIGN_RIGHT
-			textalignx			151 
-			textaligny			-2
-			font				2
-			textscale			0.8
-			forecolor			1 1 1 1
-			visible			0
-			// appearance_slot		3
-			descText			"Enables or disables smooth turning."
-			action 
-			{ 
-				play			sound/interface/button1
-			}
-
-			mouseenter 
-			{
-				show			highlight4
-			}
-			mouseexit 
-			{ 
-				hide			highlight4
-			}
-		}
-
-		itemDef 
-		{
-			name				none
-			group				movecontrols
-			type				ITEM_TYPE_MULTI
-			text				"Turn Angle:"
-			cvar				"vr_turn_angle"
-			cvarFloatList		
-			{ 
-				"30 Degrees" 30  
-				"45 Degrees" 45
-				"90 Degrees" 90
-			}
-			rect				305 251 300 20
-			textalign			ITEM_ALIGN_RIGHT
-			textalignx			151 
-			textaligny			-2
-			font				2
-			textscale			0.8
-			forecolor			1 1 1 1
-			visible			0 
-			// appearance_slot		4
-			descText			"Degrees to turn when using snap turn / Speed of smooth turn"
-			action 
-			{ 
-				play			sound/interface/button1
-			}
-
-			mouseenter 
-			{
-				show			highlight5
-			}
-			mouseexit 
-			{ 
-				hide			highlight5
-			}
-		}
-
-		itemDef 
-		{
-			name				movement
-			group				movecontrols
-			type				ITEM_TYPE_YESNO
-			text				"Switch Sticks:"
-			cvar				"vr_switch_sticks"
-			rect				305 271 300 20
-			textalign			ITEM_ALIGN_RIGHT
-			textalignx			151 
-			textaligny			-2
-			font				2
-			textscale			0.8
-			forecolor			1 1 1 1
-			visible			0 
-			// appearance_slot		5
-			descText			"Switches left/gight controller thubmsticks."
-			action 
-			{ 
-				play			sound/interface/button1
-			}
-
-			mouseenter 
-			{
-				show			highlight6
-			}
-			mouseexit 
-			{ 
-				hide			highlight6
-			}
-		}
-
 
 
 		//----------------------------------------------------------------------------------------------
diff --git a/z_vr_assets/ui/ingamesetup.menu b/z_vr_assets/ui/ingamesetup.menu
index 567b2b5..440c239 100644
--- a/z_vr_assets/ui/ingamesetup.menu
+++ b/z_vr_assets/ui/ingamesetup.menu
@@ -525,11 +525,13 @@
 				hide			vidrestart	;
 				hide			sound	;
 				hide			options ;
+				hide			difficulty ;
 				hide			defaults ;
 				setitemcolor	video1menubutton forecolor 1 1 1 1 ;
 				setitemcolor	video2menubutton forecolor 0.65 0.65 1 1 ;
 				setitemcolor	soundmenubutton forecolor 0.65 0.65 1 1;
 				setitemcolor	gameoptionmenubutton forecolor 0.65 0.65 1 1;
+				setitemcolor	difficultymenubutton forecolor 0.65 0.65 1 1;
 				setitemcolor	gamedefaultsmenubutton forecolor 0.65 0.65 1 1;
 			}
 		}
@@ -587,11 +589,13 @@
 				hide			vidrestart	;
 				hide			sound	;
 				hide			options ;
+				hide			difficulty ;
 				hide			defaults ;
 				setitemcolor	video1menubutton forecolor 0.65 0.65 1 1 ;
 				setitemcolor	video2menubutton forecolor 1 1 1 1 ;
 				setitemcolor	soundmenubutton forecolor 0.65 0.65 1 1 ;
 				setitemcolor	gameoptionmenubutton forecolor 0.65 0.65 1 1 ;
+				setitemcolor	difficultymenubutton forecolor 0.65 0.65 1 1;
 				setitemcolor	gamedefaultsmenubutton forecolor 0.65 0.65 1 1;
 			}
 		}
@@ -649,11 +653,13 @@
 				hide			vidrestart	;
 				show			sound	;
 				hide			options ;
+				hide			difficulty ;
 				hide			defaults ;
 				setitemcolor	video1menubutton forecolor 0.65 0.65 1 1;
 				setitemcolor	video2menubutton forecolor 0.65 0.65 1 1;
 				setitemcolor	soundmenubutton forecolor 1 1 1 1 ;
 				setitemcolor	gameoptionmenubutton forecolor 0.65 0.65 1 1;
+				setitemcolor	difficultymenubutton forecolor 0.65 0.65 1 1;
 				setitemcolor	gamedefaultsmenubutton forecolor 0.65 0.65 1 1;
 			}
 		}
@@ -701,7 +707,66 @@
 			action 
 			{ 
 				play			"sound/interface/button1.wav" ;
+				show			setup_background ;
+				hide 			video ;
+				hide			applyChanges ;
+				hide			video2 ;
+				hide			vidrestart	;
+				hide			sound	;
+				show			options ;
+				hide			difficulty ;
+				hide			defaults ;
+				setitemcolor	video1menubutton forecolor 0.65 0.65 1 1;
+				setitemcolor	video2menubutton forecolor 0.65 0.65 1 1;
+				setitemcolor	soundmenubutton forecolor 0.65 0.65 1 1;
+				setitemcolor	gameoptionmenubutton forecolor 1 1 1 1 ;
+				setitemcolor	difficultymenubutton forecolor 0.65 0.65 1 1;
+				setitemcolor	gamedefaultsmenubutton forecolor 0.65 0.65 1 1;
+			}
+		}
 
+		// difficulty  button
+		itemDef 
+		{
+			name				difficultybutton_glow
+			group				highlights
+			style				WINDOW_STYLE_SHADER
+			rect				120 293 170 30
+			background			"gfx/menus/menu_blendbox2"			// Frame around button
+			forecolor			1 1 1 1
+			visible			0
+			// appearance_slot		1
+			decoration
+		}
+
+		itemDef 
+		{
+			name				difficultymenubutton
+			group				none
+			text				"Difficulty"
+			type				ITEM_TYPE_BUTTON
+			style				WINDOW_STYLE_EMPTY
+			rect				120 293 170 30
+			font				3
+			textscale			0.9
+			textalignx			170
+			textaligny			5
+			textalign			ITEM_ALIGN_RIGHT
+			textstyle			3
+			forecolor			0.65 0.65 1 1
+			visible			1
+			descText			"Various gameplay difficulty tweaks."
+
+			mouseEnter 
+			{ 
+				show			difficultybutton_glow
+			}
+			mouseExit 
+			{ 
+				hide			difficultybutton_glow
+			}	  	  
+			action 
+			{ 
 				defer			VideoSetup	videowarningMenu ;
 
 				show			setup_background ;
@@ -710,12 +775,14 @@
 				hide			video2 ;
 				hide			vidrestart	;
 				hide			sound	;
-				show			options ;
+				hide			options ;
+				show			difficulty ;
 				hide			defaults ;
 				setitemcolor	video1menubutton forecolor 0.65 0.65 1 1;
 				setitemcolor	video2menubutton forecolor 0.65 0.65 1 1;
 				setitemcolor	soundmenubutton forecolor 0.65 0.65 1 1;
-				setitemcolor	gameoptionmenubutton forecolor 1 1 1 1 ;
+				setitemcolor	gameoptionmenubutton forecolor 0.65 0.65 1 1;
+				setitemcolor	difficultymenubutton forecolor 1 1 1 1 ;
 				setitemcolor	gamedefaultsmenubutton forecolor 0.65 0.65 1 1;
 			}
 		}
@@ -774,11 +841,13 @@
 				hide			vidrestart	;
 				hide			sound	;
 				hide			options ;
+				hide			difficulty ;
 				show			defaults ;
 				setitemcolor	video1menubutton forecolor 0.65 0.65 1 1;
 				setitemcolor	video2menubutton forecolor 0.65 0.65 1 1;
 				setitemcolor	soundmenubutton forecolor 0.65 0.65 1 1;
 				setitemcolor	gameoptionmenubutton forecolor 0.65 0.65 1 1;
+				setitemcolor	difficultymenubutton forecolor 0.65 0.65 1 1;
 				setitemcolor	gamedefaultsmenubutton forecolor 1 1 1 1 ;
 			}
 		}
@@ -2210,11 +2279,7 @@
       		type				ITEM_TYPE_MULTI
 			text				@MENUS1_SYNC_EVERY_FRAME
 			cvar				"r_finish"
-			cvarFloatList		
-			{ 
-				@MENUS0_OFF 0  
-				@MENUS0_ON 1 
-			}
+			cvarFloatList		{  @MENUS0_OFF 0 @MENUS0_ON 1 }
 			rect				305 211 300 20
 	   		textalign			ITEM_ALIGN_RIGHT
 			textalignx			165
@@ -2225,11 +2290,11 @@
 			visible			0
 			// appearance_slot		1
 			descText			@MENUS3_TOGGLE_TO_PREVENT_VIDEO
+
 			action
 			{
-				play			"sound/interface/button1.wav" ;
+				play			"sound/interface/button1.wav"
 			}
-
 			mouseenter 
 			{ 
 				show			highlight3
@@ -2240,6 +2305,82 @@
 			} 
 		}
 
+		//----------------------------------------------------------------------------------------------
+		//
+		//	DIFFICULTY FIELDS
+		//
+		//----------------------------------------------------------------------------------------------
+		itemDef 
+		{
+			name				none
+			group				difficulty
+			type				ITEM_TYPE_YESNO
+			text				"Realistic Saber Combat:"
+			cvar				"g_saberRealisticCombat"
+			rect				305 191 300 20
+			textalign			ITEM_ALIGN_RIGHT
+			textalignx			151
+			textaligny			-2
+			font				2
+			textscale			0.8
+			forecolor			1 1 1 1
+			visible			0
+			// appearance_slot		1
+			descText			"When enabled, sabers deal more damage."
+			action 
+			{ 
+				play			sound/interface/button1
+			}
+		
+			mouseenter 
+			{ 
+				show			highlight2
+			}
+
+			mouseexit 
+			{ 
+				hide			highlight2
+			}			
+		}
+
+		//itemDef 
+		//{
+		//	name				none
+		//	group				difficulty
+		//	type				ITEM_TYPE_MULTI
+		//	text				"Saber Combat Speed:"
+		//	cvar				"g_saberAnimSpeed"
+		//	cvarFloatList		
+		//	{ 
+		//		"Slow" 0 
+		//		"Medium" 1
+		//		"Fast" 2
+		//	}
+		//	rect				305 211 300 20
+		//	textalign			ITEM_ALIGN_RIGHT
+		//	textalignx			151
+		//	textaligny			-2
+		//	font				2
+		//	textscale			0.8
+		//	forecolor			1 1 1 1
+		//	visible			0
+		//	// appearance_slot		1
+		//	descText			"Choose speed of saber combat."
+		//	action 
+		//	{ 
+		//		play			"sound/interface/button1.wav" ;
+		//	}
+		//
+		//	mouseenter 
+		//	{ 
+		//		show			highlight3
+		//	}
+		//	mouseexit 
+		//	{ 
+		//		hide			highlight3
+		//	}			
+		//}
+
 
 		//----------------------------------------------------------------------------------------------
 		//
diff --git a/z_vr_assets/ui/setup.menu b/z_vr_assets/ui/setup.menu
index 45927ba..a5d782b 100644
--- a/z_vr_assets/ui/setup.menu
+++ b/z_vr_assets/ui/setup.menu
@@ -526,6 +526,7 @@
 				hide			vidrestart	;
 				hide			sound	;
 				hide			options ;
+				hide			difficulty ;
 				hide			mods	;
 				hide			defaults ;
 				setfocus		graphics ;
@@ -533,6 +534,7 @@
 				setitemcolor	video2menubutton forecolor 0.65 0.65 1 1 ;
 				setitemcolor	soundmenubutton forecolor 0.65 0.65 1 1;
 				setitemcolor	gameoptionmenubutton forecolor 0.65 0.65 1 1;
+				setitemcolor	difficultymenubutton forecolor 0.65 0.65 1 1;
 				setitemcolor	modsmenubutton forecolor 0.65 0.65 1 1;
 				setitemcolor	gamedefaultsmenubutton forecolor 0.65 0.65 1 1;
 			}
@@ -591,12 +593,14 @@
 				hide			vidrestart	;
 				hide			sound	;
 				hide			options ;
+				hide			difficulty ;
 				hide			mods	;
 				hide			defaults ;
 				setitemcolor	video1menubutton forecolor 0.65 0.65 1 1 ;
 				setitemcolor	video2menubutton forecolor 1 1 1 1 ;
 				setitemcolor	soundmenubutton forecolor 0.65 0.65 1 1 ;
 				setitemcolor	gameoptionmenubutton forecolor 0.65 0.65 1 1 ;
+				setitemcolor	difficultymenubutton forecolor 0.65 0.65 1 1;
 				setitemcolor	modsmenubutton forecolor 0.65 0.65 1 1;
 				setitemcolor	gamedefaultsmenubutton forecolor 0.65 0.65 1 1;
 			}
@@ -655,12 +659,14 @@
 				hide			vidrestart	;
 				show			sound	;
 				hide			options ;
+				hide			difficulty ;
 				hide			mods	;
 				hide			defaults ;
 				setitemcolor	video1menubutton forecolor 0.65 0.65 1 1;
 				setitemcolor	video2menubutton forecolor 0.65 0.65 1 1;
 				setitemcolor	soundmenubutton forecolor 1 1 1 1 ;
 				setitemcolor	gameoptionmenubutton forecolor 0.65 0.65 1 1;
+				setitemcolor	difficultymenubutton forecolor 0.65 0.65 1 1;
 				setitemcolor	modsmenubutton forecolor 0.65 0.65 1 1;
 				setitemcolor	gamedefaultsmenubutton forecolor 0.65 0.65 1 1;
 			}
@@ -718,12 +724,79 @@
 				hide			vidrestart	;
 				hide			sound	;
 				show			options ;
+				hide			difficulty ;
 				hide			mods	;
 				hide			defaults ;
 				setitemcolor	video1menubutton forecolor 0.65 0.65 1 1;
 				setitemcolor	video2menubutton forecolor 0.65 0.65 1 1;
 				setitemcolor	soundmenubutton forecolor 0.65 0.65 1 1;
 				setitemcolor	gameoptionmenubutton forecolor 1 1 1 1 ;
+				setitemcolor	difficultymenubutton forecolor 0.65 0.65 1 1;
+				setitemcolor	modsmenubutton forecolor 0.65 0.65 1 1;
+				setitemcolor	gamedefaultsmenubutton forecolor 0.65 0.65 1 1;
+			}
+		}
+
+		// difficulty  button
+		itemDef 
+		{
+			name				difficultybutton_glow
+			group				highlights
+			style				WINDOW_STYLE_SHADER
+			rect				120 293 170 30
+			background			"gfx/menus/menu_blendbox2"			// Frame around button
+			forecolor			1 1 1 1
+			visible			0
+			// appearance_slot		1
+			decoration
+		}
+
+		itemDef 
+		{
+			name				difficultymenubutton
+			group				none
+			text				"Difficulty"
+			type				ITEM_TYPE_BUTTON
+			style				WINDOW_STYLE_EMPTY
+			rect				120 293 170 30
+			font				3
+			textscale			0.9
+			textalignx			170
+			textaligny			5
+			textalign			ITEM_ALIGN_RIGHT
+			textstyle			3
+			forecolor			0.65 0.65 1 1
+			visible			1
+			descText			"Various gameplay difficulty tweaks."
+
+			mouseEnter 
+			{ 
+				show			difficultybutton_glow
+			}
+			mouseExit 
+			{ 
+				hide			difficultybutton_glow
+			}	  	  
+			action 
+			{ 
+				defer			VideoSetup	videowarningMenu ;
+
+				play			"sound/interface/button1.wav" ;
+				show			setup_background ;
+				hide 			video ;
+				hide			applyChanges ;
+				hide			video2 ;
+				hide			vidrestart	;
+				hide			sound	;
+				hide			options ;
+				show			difficulty ;
+				hide			mods	;
+				hide			defaults ;
+				setitemcolor	video1menubutton forecolor 0.65 0.65 1 1;
+				setitemcolor	video2menubutton forecolor 0.65 0.65 1 1;
+				setitemcolor	soundmenubutton forecolor 0.65 0.65 1 1;
+				setitemcolor	gameoptionmenubutton forecolor 0.65 0.65 1 1;
+				setitemcolor	difficultymenubutton forecolor 1 1 1 1 ;
 				setitemcolor	modsmenubutton forecolor 0.65 0.65 1 1;
 				setitemcolor	gamedefaultsmenubutton forecolor 0.65 0.65 1 1;
 			}
@@ -735,7 +808,7 @@
 			name				modsbutton_glow
 			group				highlights
 			style				WINDOW_STYLE_SHADER
-			rect				120 293 170 30
+			rect				120 323 170 30
 			background			"gfx/menus/menu_blendbox2"			// Frame around button
 			forecolor			1 1 1 1
 			visible			0
@@ -750,7 +823,7 @@
 			text				@MENUS1_MODS
 			type				ITEM_TYPE_BUTTON
 			style				WINDOW_STYLE_EMPTY
-			rect				120 293 170 30
+			rect				120 323 170 30
 			font				3
 			textscale			0.9
 			textalignx			170
@@ -782,12 +855,14 @@
 				hide			vidrestart	;
 				hide			sound	;
 				hide			options ;
+				hide			difficulty ;
 				show			mods	;
 				hide			defaults ;
 				setitemcolor	video1menubutton forecolor 0.65 0.65 1 1;
 				setitemcolor	video2menubutton forecolor 0.65 0.65 1 1;
 				setitemcolor	soundmenubutton forecolor 0.65 0.65 1 1;
 				setitemcolor	gameoptionmenubutton forecolor 0.65 0.65 1 1;
+				setitemcolor	difficultymenubutton forecolor 0.65 0.65 1 1;
 				setitemcolor	modsmenubutton forecolor 1 1 1 1 ;
 				setitemcolor	gamedefaultsmenubutton forecolor 0.65 0.65 1 1;
 			}
@@ -799,7 +874,7 @@
 			name				gamedefaultsbutton_glow
 			group				highlights
 			style				WINDOW_STYLE_SHADER
-			rect				120 323 170 30
+			rect				120 353 170 30
 			background			"gfx/menus/menu_blendbox2"			// Frame around button
 			forecolor			1 1 1 1
 			visible			0
@@ -814,7 +889,7 @@
 			text				@MENUS1_DEFAULTS
 			type				ITEM_TYPE_BUTTON
 			style				WINDOW_STYLE_EMPTY
-			rect				120 323 170 30
+			rect				120 353 170 30
 			font				3
 			textscale			0.9
 			textalignx			170
@@ -846,12 +921,14 @@
 				hide			vidrestart	;
 				hide			sound	;
 				hide			options ;
+				hide			difficulty ;
 				hide			mods	;
 				show			defaults ;
 				setitemcolor	video1menubutton forecolor 0.65 0.65 1 1;
 				setitemcolor	video2menubutton forecolor 0.65 0.65 1 1;
 				setitemcolor	soundmenubutton forecolor 0.65 0.65 1 1;
 				setitemcolor	gameoptionmenubutton forecolor 0.65 0.65 1 1;
+				setitemcolor	difficultymenubutton forecolor 0.65 0.65 1 1;
 				setitemcolor	modsmenubutton forecolor 0.65 0.65 1 1;
 				setitemcolor	gamedefaultsmenubutton forecolor 1 1 1 1 ;
 			}
@@ -2294,6 +2371,83 @@
 			} 
 		}
 
+		//----------------------------------------------------------------------------------------------
+		//
+		//	DIFFICULTY FIELDS
+		//
+		//----------------------------------------------------------------------------------------------
+		itemDef 
+		{
+			name				none
+			group				difficulty
+			type				ITEM_TYPE_YESNO
+			text				"Realistic Saber Combat:"
+			cvar				"g_saberRealisticCombat"
+			rect				305 191 300 20
+			textalign			ITEM_ALIGN_RIGHT
+			textalignx			151
+			textaligny			-2
+			font				2
+			textscale			0.8
+			forecolor			1 1 1 1
+			visible			0
+			// appearance_slot		1
+			descText			"When enabled, sabers deal more damage."
+			action 
+			{ 
+				play			sound/interface/button1
+			}
+		
+			mouseenter 
+			{ 
+				show			highlight2
+			}
+
+			mouseexit 
+			{ 
+				hide			highlight2
+			}			
+		}
+
+		//itemDef 
+		//{
+		//	name				none
+		//	group				difficulty
+		//	type				ITEM_TYPE_MULTI
+		//	text				"Saber Combat Speed:"
+		//	cvar				"g_saberAnimSpeed"
+		//	cvarFloatList		
+		//	{ 
+		//		"Slow" 0 
+		//		"Medium" 1
+		//		"Fast" 2
+		//	}
+		//	rect				305 211 300 20
+		//	textalign			ITEM_ALIGN_RIGHT
+		//	textalignx			151
+		//	textaligny			-2
+		//	font				2
+		//	textscale			0.8
+		//	forecolor			1 1 1 1
+		//	visible			0
+		//	// appearance_slot		1
+		//	descText			"Choose speed of saber combat."
+		//	action 
+		//	{ 
+		//		play			sound/interface/button1
+		//	}
+		//
+		//	mouseenter 
+		//	{ 
+		//		show			highlight3
+		//	}
+		//
+		//	mouseexit 
+		//	{ 
+		//		hide			highlight3
+		//	}			
+		//}
+
 		//----------------------------------------------------------------------------------------------
 		//
 		//   MOD GAME MENU specific stuff