diff --git a/assets/z_vr_assets.pk3 b/assets/z_vr_assets.pk3
index 4722de9..a027fdb 100644
Binary files a/assets/z_vr_assets.pk3 and b/assets/z_vr_assets.pk3 differ
diff --git a/z_vr_assets/ui/controls.menu b/z_vr_assets/ui/controls.menu
index a68cecd..9f746c6 100644
--- a/z_vr_assets/ui/controls.menu
+++ b/z_vr_assets/ui/controls.menu
@@ -1067,6 +1067,43 @@
 			}
 		}
 
+		itemDef 
+		{
+			name				none
+			group				commoncontrols
+			type				ITEM_TYPE_MULTI
+			text				"Left-Handed Mode:"
+			cvar				"vr_control_scheme"
+			cvarFloatList		
+			{ 
+				"No" 0
+				"Yes" 10
+			}
+			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		5
+			descText			"Enables left-handed mode."
+			action 
+			{ 
+				play			sound/interface/button1
+			}
+
+			mouseenter 
+			{
+				show			highlight7
+			}
+			mouseexit 
+			{ 
+				hide			highlight7
+			}
+		}
+
 
 
 		//----------------------------------------------------------------------------------------------
@@ -1153,8 +1190,8 @@
 			name				none
 			group				weaponcontrols
 			type				ITEM_TYPE_YESNO
-			text				"Virtual Gun Stock:"
-			cvar			"vr_virtual_stock"
+			text				"Two-Handed Mode:"
+			cvar			"vr_two_handed_weapons"
 			rect				305 231 300 20
 			textalign			ITEM_ALIGN_RIGHT
 			textalignx			151
@@ -1164,7 +1201,7 @@
 			forecolor			1 1 1 1
 			visible			0 
 			// appearance_slot		2
-			descText			"Enables or disables virtual gun stock."
+			descText			"Enables two-handed weapon handling."
 			action 
 			{ 
 				play			sound/interface/button1
@@ -1182,6 +1219,40 @@
 
 		}
 
+		itemDef 
+		{
+			name				none
+			group				weaponcontrols
+			type				ITEM_TYPE_YESNO
+			text				"Virtual Gun Stock:"
+			cvar			"vr_virtual_stock"
+			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		2
+			descText			"Enables or disables virtual gun stock. Requires two-handed mode to be enabled."
+			action 
+			{ 
+				play			sound/interface/button1
+			}
+
+			mouseenter 
+			{ 
+				show			highlight5
+			}
+
+			mouseexit 
+			{ 
+				hide			highlight5
+			}			
+
+		}
+
 		itemDef 
 		{
 			name				none
@@ -1189,7 +1260,7 @@
 			type				ITEM_TYPE_YESNO
 			text				"Saber Auto Blocking:"
 			cvar			"g_saberAutoblocking"
-			rect				305 251 300 20
+			rect				305 271 300 20
 			textalign			ITEM_ALIGN_RIGHT
 			textalignx			151
 			textaligny			-2
@@ -1206,12 +1277,12 @@
 
 			mouseenter 
 			{ 
-				show			highlight5
+				show			highlight6
 			}
 
 			mouseexit 
 			{ 
-				hide			highlight5
+				hide			highlight6
 			}			
 
 		}
@@ -1232,7 +1303,7 @@
 			type				ITEM_TYPE_YESNO
 			text				"Force Power Direction Hint:"
 			cvar				"cg_showForcePowerDirection"
-			rect				310 191 300 20
+			rect				340 191 300 20
 			textalign			ITEM_ALIGN_RIGHT
 			textalignx			151
 			textaligny			-2
@@ -1266,7 +1337,7 @@
 			type				ITEM_TYPE_YESNO
 			text				"Force Speed FOV Change:"
 			cvar				"cg_forceSpeedFOVAdjust"
-			rect				310 211 300 20
+			rect				340 211 300 20
 			textalign			ITEM_ALIGN_RIGHT
 			textalignx			151
 			textaligny			-2
diff --git a/z_vr_assets/ui/datapadcheats.menu b/z_vr_assets/ui/datapadcheats.menu
new file mode 100644
index 0000000..b6ef779
--- /dev/null
+++ b/z_vr_assets/ui/datapadcheats.menu
@@ -0,0 +1,582 @@
+// DATAPAD/CHEATS menu
+// 
+// defines from ui_shared.h
+{
+	menuDef 
+	{
+		name					"datapadCheatsMenu"
+		fullScreen				1								// MENU_TRUE				
+		rect					0 0 640 480						// Size and position of the menu
+		visible					1								// Visible on open
+		focusColor				1 1 1 1							// Focus color for text and items
+		appearanceIncrement		75								// In miliseconds
+		descX					320
+		descY					350
+		descScale				.8
+		descColor				.96 .933 .40 1					// Focus color for text and items
+		descAlignment			ITEM_ALIGN_CENTER		
+
+		onESC 
+		{ 
+				uiScript		closedatapad					// Close menu				
+		}
+
+		onOpen
+		{ 
+				exec				"helpUsObi 1"
+				setfocus		none
+		}
+
+		//----------------------------------------------------------------------------------------------
+		//
+		//	MENU BACKGROUND
+		//
+		//----------------------------------------------------------------------------------------------
+		itemDef
+		{
+			name				frame_pic
+			group				none
+			style				WINDOW_STYLE_SHADER
+			rect				0 0 640 480
+			background			"*white"
+			forecolor			0 0 0 1
+			visible				1
+			decoration
+		}
+
+		//----------------------------------------------------------------------------------------------
+		//
+		//	DATAPAD SCREEN
+		//
+		//----------------------------------------------------------------------------------------------
+
+		// we use mission overdraw to fill in player status
+		itemDef
+		{
+			name				player_status
+			group				none
+			style				WINDOW_STYLE_EMPTY
+			type				ITEM_TYPE_OWNERDRAW
+			rect				50 40 95 40 
+			textscale			.4
+			forecolor			.509 .609 .847 1
+			appearance_slot		1		
+			visible				1
+			ownerdraw			203
+		}
+
+		// cover mssion overdraw with datapad background to hide mission data
+		itemDef
+		{
+			name				mission_cover
+			group				none
+			style				WINDOW_STYLE_SHADER
+			rect				0 0 640 480
+			forecolor			1 1 1 1
+			visible				1
+			decoration		1
+			background		"gfx/hud/datapad2"
+		}
+
+		//----------------------------------------------------------------------------------------------
+		//
+		//	CHEAT MENU ITEMS
+		//
+		//----------------------------------------------------------------------------------------------
+
+		itemDef 
+		{
+			name				cheats_title
+			group				none
+			style				WINDOW_STYLE_EMPTY
+			rect				0 30 640 25
+			text				"May the force be with you..."
+			font				2
+			textscale			1
+			textalignx			320
+			textalign			ITEM_ALIGN_CENTER
+			forecolor			.509 .609 .847 1
+			appearance_slot		1		
+			visible				1
+			decoration 		1
+		}
+
+		itemDef 
+		{
+			name				none
+			group				none
+			style				WINDOW_STYLE_EMPTY
+			type				ITEM_TYPE_BUTTON
+			rect				100 80 200 20
+			text				"Replenish Health"
+			descText		"Replenishes health."
+			font				2
+			textscale			1
+			textalignx			100
+			textalign			ITEM_ALIGN_CENTER
+			forecolor			.509 .609 .847 1
+			appearance_slot		1		
+			visible				1
+
+			action 
+			{ 
+				play			"sound/interface/button1.wav" ;
+				exec			"give health;"
+			}
+		}
+
+		itemDef 
+		{
+			name				none
+			group				none
+			style				WINDOW_STYLE_EMPTY
+			type				ITEM_TYPE_BUTTON
+			rect				100 105 200 20
+			text				"Replenish Armor"
+			descText		"Replenishes armor."
+			font				2
+			textscale			1
+			textalignx			100
+			textalign			ITEM_ALIGN_CENTER
+			forecolor			.509 .609 .847 1
+			appearance_slot		1		
+			visible				1
+
+			action 
+			{ 
+				play			"sound/interface/button1.wav" ;
+				exec			"give armor;"
+			}
+		}
+
+		itemDef 
+		{
+			name				none
+			group				none
+			style				WINDOW_STYLE_EMPTY
+			type				ITEM_TYPE_BUTTON
+			rect				100 130 200 20
+			text				"Replenish Ammo"
+			descText		"Replenishes ammunition."
+			font				2
+			textscale			1
+			textalignx			100
+			textalign			ITEM_ALIGN_CENTER
+			forecolor			.509 .609 .847 1
+			appearance_slot		1		
+			visible				1
+
+			action 
+			{ 
+				play			"sound/interface/button1.wav" ;
+				exec			"give ammo;"
+			}
+		}
+
+		itemDef 
+		{
+			name				none
+			group				none
+			style				WINDOW_STYLE_EMPTY
+			type				ITEM_TYPE_BUTTON
+			rect				100 155 200 20
+			text				"Replenish Batteries"
+			descText		"Replenishes batteries."
+			font				2
+			textscale			1
+			textalignx			100
+			textalign			ITEM_ALIGN_CENTER
+			forecolor			.509 .609 .847 1
+			appearance_slot		1		
+			visible				1
+
+			action 
+			{ 
+				play			"sound/interface/button1.wav" ;
+				exec			"give batteries;"
+			}
+		}
+
+		itemDef 
+		{
+			name				none
+			group				none
+			style				WINDOW_STYLE_EMPTY
+			type				ITEM_TYPE_BUTTON
+			rect				340 80 200 20
+			text				"Give Lightsaber"
+			descText		"Gives only lighsaber."
+			font				2
+			textscale			1
+			textalignx			100
+			textalign			ITEM_ALIGN_CENTER
+			forecolor			.509 .609 .847 1
+			appearance_slot		1		
+			visible				1
+
+			action 
+			{ 
+				play			"sound/interface/button1.wav" ;
+				exec			"give weapon_saber;"
+			}
+		}
+
+		itemDef 
+		{
+			name				none
+			group				none
+			style				WINDOW_STYLE_EMPTY
+			type				ITEM_TYPE_BUTTON
+			rect				340 105 200 20
+			text				"Give All Weapons"
+			descText		"Gives all weapons."
+			font				2
+			textscale			1
+			textalignx			100
+			textalign			ITEM_ALIGN_CENTER
+			forecolor			.509 .609 .847 1
+			appearance_slot		1		
+			visible				1
+
+			action 
+			{ 
+				play			"sound/interface/button1.wav" ;
+				exec			"give weapons;"
+			}
+		}
+
+		itemDef 
+		{
+			name				none
+			group				none
+			style				WINDOW_STYLE_EMPTY
+			type				ITEM_TYPE_BUTTON
+			rect				340 130 200 20
+			text				"Give All Items"
+			descText		"Gives all inventory items."
+			font				2
+			textscale			1
+			textalignx			100
+			textalign			ITEM_ALIGN_CENTER
+			forecolor			.509 .609 .847 1
+			appearance_slot		1		
+			visible				1
+
+			action 
+			{ 
+				play			"sound/interface/button1.wav" ;
+				exec			"give inventory;"
+			}
+		}
+
+		itemDef 
+		{
+			name				none
+			group				none
+			style				WINDOW_STYLE_EMPTY
+			type				ITEM_TYPE_BUTTON
+			rect				340 155 200 20
+			text				"Unlock All Powers"
+			descText		"Unlocks all force powers."
+			font				2
+			textscale			1
+			textalignx			100
+			textalign			ITEM_ALIGN_CENTER
+			forecolor			.509 .609 .847 1
+			appearance_slot		1		
+			visible				1
+
+			action 
+			{ 
+				play			"sound/interface/button1.wav" ;
+				exec			"setforceall 2"
+			}
+		}
+
+		itemDef 
+		{
+			name				none
+			group				none
+			style				WINDOW_STYLE_EMPTY
+			rect				220 210 200 20
+			text				"Lightsaber Color:"
+			font				2
+			textscale			1
+			textalignx			100
+			textalign			ITEM_ALIGN_CENTER
+			forecolor			.509 .609 .847 1
+			appearance_slot		1		
+			visible				1
+			decoration		1
+		}
+
+		itemDef 
+		{
+			name				none
+			group				none
+			style				WINDOW_STYLE_EMPTY
+			type				ITEM_TYPE_BUTTON
+			rect				190 235 50 20
+			text				"Blue"
+			descText		"Use blue lightsaber."
+			font				2
+			textscale			1
+			textalignx			25
+			textalign			ITEM_ALIGN_CENTER
+			forecolor			.509 .609 .847 1
+			appearance_slot		1		
+			visible				1
+
+			action 
+			{ 
+				play			"sound/interface/button1.wav" ;
+				exec			"saberColor blue;"
+			}
+		}
+
+		itemDef 
+		{
+			name				none
+			group				none
+			style				WINDOW_STYLE_EMPTY
+			type				ITEM_TYPE_BUTTON
+			rect				240 235 48 20
+			text				"Green"
+			descText		"Use green lightsaber."
+			font				2
+			textscale			1
+			textalignx			25
+			textalign			ITEM_ALIGN_CENTER
+			forecolor			.509 .609 .847 1
+			appearance_slot		1		
+			visible				1
+
+			action 
+			{ 
+				play			"sound/interface/button1.wav" ;
+				exec			"saberColor green;"
+			}
+		}
+
+		itemDef 
+		{
+			name				none
+			group				none
+			style				WINDOW_STYLE_EMPTY
+			type				ITEM_TYPE_BUTTON
+			rect				288 235 50 20
+			text				"Red"
+			descText		"Use red lightsaber."
+			font				2
+			textscale			1
+			textalignx			25
+			textalign			ITEM_ALIGN_CENTER
+			forecolor			.509 .609 .847 1
+			appearance_slot		1		
+			visible				1
+
+			action 
+			{ 
+				play			"sound/interface/button1.wav" ;
+				exec			"saberColor red;"
+			}
+		}
+
+		itemDef 
+		{
+			name				none
+			group				none
+			style				WINDOW_STYLE_EMPTY
+			type				ITEM_TYPE_BUTTON
+			rect				340 235 50 20
+			text				"Orange"
+			descText		"Use orange lightsaber."
+			font				2
+			textscale			1
+			textalignx			25
+			textalign			ITEM_ALIGN_CENTER
+			forecolor			.509 .609 .847 1
+			appearance_slot		1		
+			visible				1
+
+			action 
+			{ 
+				play			"sound/interface/button1.wav" ;
+				exec			"saberColor orange;"
+			}
+		}
+
+		itemDef 
+		{
+			name				none
+			group				none
+			style				WINDOW_STYLE_EMPTY
+			type				ITEM_TYPE_BUTTON
+			rect				400 235 50 20
+			text				"Purple"
+			descText		"Use purple lightsaber."
+			font				2
+			textscale			1
+			textalignx			25
+			textalign			ITEM_ALIGN_CENTER
+			forecolor			.509 .609 .847 1
+			appearance_slot		1		
+			visible				1
+
+			action 
+			{ 
+				play			"sound/interface/button1.wav" ;
+				exec			"saberColor purple;"
+			}
+		}
+
+		//----------------------------------------------------------------------------------------------
+		//
+		//	LOWER MENU BUTTONS
+		//
+		//----------------------------------------------------------------------------------------------
+	
+		itemDef 
+		{
+			name				mission
+			group				none
+			style				WINDOW_STYLE_EMPTY
+			type				ITEM_TYPE_BUTTON
+			rect				130 382 95 25 
+			text				@MENUS1_DP_MISSION
+			descText			@MENUS1_AN_OVERVIEW_OF_MISSION
+			font				2
+			textscale			1
+			textalignx			48
+			textalign			ITEM_ALIGN_CENTER
+			forecolor			.509 .609 .847 1
+			appearance_slot		1		
+			visible				1
+
+			action 
+			{ 
+				play			"sound/interface/button1.wav" ; 
+				close			all ; 
+				open			datapadMissionMenu 
+			}
+		}
+
+		itemDef 
+		{
+			name				exit
+			group				none
+			style				WINDOW_STYLE_EMPTY
+			type				ITEM_TYPE_BUTTON
+			rect				417 382 95 25 
+			text				@MENUS1_RESUME
+			descText			@MENUS1_RETURN_TO_GAME
+			font				2
+			textscale			1
+			textalignx			48
+			textalign			ITEM_ALIGN_CENTER
+			forecolor			.509 .609 .847 1
+			appearance_slot		1		
+			visible				1
+
+			action 
+			{ 
+				play			"sound/interface/button1.wav" ; 
+				uiScript		closedatapad			// Close menu				
+			}
+		}
+
+		itemDef 
+		{
+			name				weapons
+			group				none
+			style				WINDOW_STYLE_EMPTY
+			type				ITEM_TYPE_BUTTON
+			rect				130 420 95 25 
+			text				@MENUS0_WEAPONS
+			descText			@MENUS1_VIEW_CURRENTLY_OWNED
+			font				2
+			textscale			1
+			textalignx			48
+			textalign			ITEM_ALIGN_CENTER
+			forecolor			.509 .609 .847 1
+			appearance_slot		1		
+			visible				1
+
+			action 
+			{ 
+				play			"sound/interface/button1.wav" ; 
+				close			all ; 
+				open			datapadWeaponsMenu 
+			}
+		}
+
+		itemDef 
+		{
+			name				inventory
+			group				none
+			style				WINDOW_STYLE_EMPTY
+			type				ITEM_TYPE_BUTTON
+			rect				274 420 95 25 
+			text				@MENUS1_INVENTORY
+			descText			@MENUS1_VIEW_CURRENT_INVENTORY
+			font				2
+			textscale			1
+			textalignx			48
+			textalign			ITEM_ALIGN_CENTER
+			forecolor			.509 .609 .847 1
+			appearance_slot		1		
+			visible				1
+
+			action 
+			{ 
+				play			"sound/interface/button1.wav" ; 
+				close			all ; 
+				open			datapadInventoryMenu 
+			}
+		}
+
+		itemDef 
+		{
+			name				force
+			group				none
+			style				WINDOW_STYLE_EMPTY
+			type				ITEM_TYPE_BUTTON
+			rect				417 420 95 25
+			text				@MENUS1_DP_FORCE
+			descText			@MENUS1_VIEW_CURRENT_FORCE_POWERS
+			font				2
+			textscale			1
+			textalignx			48
+			textalign			ITEM_ALIGN_CENTER
+			forecolor			.509 .609 .847 1
+			appearance_slot		1		
+			visible				1
+
+			action 
+			{ 
+				play			"sound/interface/button1.wav" ; 
+				close			all ; 
+				open			datapadForcePowersMenu 
+			}
+		}
+
+		itemDef 
+		{
+			name				cheats
+			group				none
+			style				WINDOW_STYLE_EMPTY
+			type				ITEM_TYPE_BUTTON
+			rect				274 382 95 25
+			text				"CHEATS"
+			font				2
+			textscale			1
+			textalignx			48
+			textalign			ITEM_ALIGN_CENTER
+			forecolor			.509 .609 .847 1
+			appearance_slot		1		
+			visible				1
+			decoration	1
+		}
+
+	}
+}
diff --git a/z_vr_assets/ui/datapadmission.menu b/z_vr_assets/ui/datapadmission.menu
new file mode 100644
index 0000000..c3eb96f
--- /dev/null
+++ b/z_vr_assets/ui/datapadmission.menu
@@ -0,0 +1,222 @@
+// HUD menu
+// 
+// defines from ui_shared.h
+{
+	menuDef 
+	{
+		name					"datapadMissionMenu"
+		fullScreen				1								// MENU_TRUE				
+		rect					0 0 640 480						// Size and position of the menu
+		visible					1								// Visible on open
+		focusColor				1 1 1 1							// Focus color for text and items
+		appearanceIncrement		75								// In miliseconds
+		descX					320
+		descY					350
+		descScale				.8
+		descColor				.96 .933 .40 1					// Focus color for text and items
+		descAlignment			ITEM_ALIGN_CENTER		
+		onESC 
+		{ 
+				uiScript		closedatapad					// Close menu				
+		}
+
+		//----------------------------------------------------------------------------------------------
+		//
+		//	MENU BACKGROUND
+		//
+		//----------------------------------------------------------------------------------------------
+		itemDef										
+		{
+			name				frame_pic
+			group				none
+			style				WINDOW_STYLE_SHADER
+			rect				0 0 640 480
+			background			"*white"
+			forecolor			0 0 0 1
+			visible				1
+			decoration
+		}
+
+		//----------------------------------------------------------------------------------------------
+		//
+		//	MISSION TEXT
+		//
+		//----------------------------------------------------------------------------------------------
+		itemDef 
+		{
+			name				mission2
+			group				none
+			style				WINDOW_STYLE_EMPTY
+			type				ITEM_TYPE_OWNERDRAW
+			rect				50 40 95 40 
+			textscale			.4
+			forecolor			.509 .609 .847 1
+			appearance_slot		1		
+			visible				1
+			ownerdraw			203					// UI_DATAPAD_MISSION
+		}
+
+		//----------------------------------------------------------------------------------------------
+		//
+		//	LOWER MENU BUTTONS
+		//
+		//----------------------------------------------------------------------------------------------
+
+		itemDef 
+		{
+			name				mission
+			group				none
+			style				WINDOW_STYLE_EMPTY
+			type				ITEM_TYPE_BUTTON
+			rect				130 382 0 0 
+			text				@MENUS1_DP_MISSION
+			descText			@MENUS1_AN_OVERVIEW_OF_MISSION
+			font				2
+			textscale			1
+			textalignx			48
+			textalign			ITEM_ALIGN_CENTER
+			forecolor			.509 .609 .847 1
+			appearance_slot		1		
+			visible				1
+
+			action 
+			{ 
+				play			"sound/interface/button1.wav" ; 
+			}
+		}
+
+		itemDef 
+		{
+			name				exit
+			group				none
+			style				WINDOW_STYLE_EMPTY
+			type				ITEM_TYPE_BUTTON
+			rect				417 382 95 25 
+			text				@MENUS1_RESUME
+			descText			@MENUS1_RETURN_TO_GAME
+			font				2
+			textscale			1
+			textalignx			48
+			textalign			ITEM_ALIGN_CENTER
+			forecolor			.509 .609 .847 1
+			appearance_slot		1		
+			visible				1
+
+			action 
+			{ 
+				play			"sound/interface/button1.wav" ; 
+				uiScript		closedatapad			// Close menu				
+			}
+		}
+
+		itemDef 
+		{
+			name				weapons
+			group				none
+			style				WINDOW_STYLE_EMPTY
+			type				ITEM_TYPE_BUTTON
+			rect				130 420 95 25 
+			text				@MENUS0_WEAPONS
+			descText			@MENUS1_VIEW_CURRENTLY_OWNED
+			font				2
+			textscale			1
+			textalignx			48
+			textalign			ITEM_ALIGN_CENTER
+			forecolor			.509 .609 .847 1
+			appearance_slot		1		
+			visible				1
+
+			action 
+			{ 
+				play			"sound/interface/button1.wav" ; 
+				close			all ; 
+				open			datapadWeaponsMenu 
+			}
+		}
+
+
+		itemDef 
+		{
+			name				inventory
+			group				none
+			style				WINDOW_STYLE_EMPTY
+			type				ITEM_TYPE_BUTTON
+			rect				274 420 95 25 
+			text				@MENUS1_INVENTORY
+			descText			@MENUS1_VIEW_CURRENT_INVENTORY
+			font				2
+			textscale			1
+			textalignx			48
+			textalign			ITEM_ALIGN_CENTER
+			forecolor			.509 .609 .847 1
+			appearance_slot		1		
+			visible				1
+
+			action 
+			{ 
+				play			"sound/interface/button1.wav" ; 
+				close			all ; 
+				open			datapadInventoryMenu 
+			}
+		}
+
+		itemDef 
+		{
+			name				force
+			group				none
+			style				WINDOW_STYLE_EMPTY
+			type				ITEM_TYPE_BUTTON
+			rect				417 420 95 25
+			text				@MENUS1_DP_FORCE
+			descText			@MENUS1_VIEW_CURRENT_FORCE_POWERS
+			font				2
+			textscale			1
+			textalignx			48
+			textalign			ITEM_ALIGN_CENTER
+			forecolor			.509 .609 .847 1
+			appearance_slot		1		
+			visible				1
+
+			action 
+			{ 
+				play			"sound/interface/button1.wav" ; 
+				close			all ; 
+				open			datapadForcePowersMenu 
+			}
+		}
+
+		itemDef 
+		{
+			name				cheats
+			group				none
+			style				WINDOW_STYLE_EMPTY
+			type				ITEM_TYPE_BUTTON
+			rect				274 382 95 25
+			//text				"CHEATS"
+			//descText			"Bla Bla"
+			font				2
+			textscale			1
+			textalignx			48
+			textalign			ITEM_ALIGN_CENTER
+			forecolor			.509 .609 .847 1
+			appearance_slot		1		
+			visible				1
+
+			action
+			{
+				close			all
+				open			datapadCheatsMenu
+			}
+		}
+
+	}
+}
+
+
+
+
+
+
+
+
+
diff --git a/z_vr_assets/ui/ingamecontrols.menu b/z_vr_assets/ui/ingamecontrols.menu
index 59e61c6..fb0df8e 100644
--- a/z_vr_assets/ui/ingamecontrols.menu
+++ b/z_vr_assets/ui/ingamecontrols.menu
@@ -1075,78 +1075,46 @@
 			{ 
 				hide			highlight6
 			}
-		}				
+		}
 
 		itemDef 
 		{
 			name				none
-			group				weaponcontrols
-			type				ITEM_TYPE_YESNO
-			text				"Force Power Direction:"
-			cvar				"cg_showForcePowerDirection"
+			group				commoncontrols
+			type				ITEM_TYPE_MULTI
+			text				"Left-Handed Mode:"
+			cvar				"vr_control_scheme"
+			cvarFloatList		
+			{ 
+				"No" 0
+				"Yes" 10
+			}
 			rect				305 291 300 20
 			textalign			ITEM_ALIGN_RIGHT
-			textalignx			151
+			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."
+			// appearance_slot		5
+			descText			"Enables left-handed mode."
 			action 
 			{ 
 				play			sound/interface/button1
 			}
 
 			mouseenter 
-			{ 
-				show			highlight4
+			{
+				show			highlight7
 			}
-
 			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
+				hide			highlight7
 			}
-
-			mouseenter 
-			{ 
-				show			highlight4
-			}
-
-			mouseexit 
-			{ 
-				hide			highlight4
-			}			
-
 		}
 
 
-
 		//----------------------------------------------------------------------------------------------
 		//
 		//	WEAPON MENU
@@ -1231,8 +1199,8 @@
 			name				none
 			group				weaponcontrols
 			type				ITEM_TYPE_YESNO
-			text				"Virtual Gun Stock:"
-			cvar			"vr_virtual_stock"
+			text				"Two-Handed Mode:"
+			cvar			"vr_two_handed_weapons"
 			rect				305 231 300 20
 			textalign			ITEM_ALIGN_RIGHT
 			textalignx			151
@@ -1242,7 +1210,7 @@
 			forecolor			1 1 1 1
 			visible			0 
 			// appearance_slot		2
-			descText			"Enables or disables virtual gun stock."
+			descText			"Enables two-handed weapon handling."
 			action 
 			{ 
 				play			sound/interface/button1
@@ -1260,6 +1228,40 @@
 
 		}
 
+		itemDef 
+		{
+			name				none
+			group				weaponcontrols
+			type				ITEM_TYPE_YESNO
+			text				"Virtual Gun Stock:"
+			cvar			"vr_virtual_stock"
+			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		2
+			descText			"Enables or disables virtual gun stock."
+			action 
+			{ 
+				play			sound/interface/button1
+			}
+
+			mouseenter 
+			{ 
+				show			highlight5
+			}
+
+			mouseexit 
+			{ 
+				hide			highlight5
+			}			
+
+		}
+
 		itemDef 
 		{
 			name				none
@@ -1267,7 +1269,7 @@
 			type				ITEM_TYPE_YESNO
 			text				"Saber Auto Blocking:"
 			cvar			"g_saberAutoblocking"
-			rect				305 251 300 20
+			rect				305 271 300 20
 			textalign			ITEM_ALIGN_RIGHT
 			textalignx			151
 			textaligny			-2
@@ -1284,12 +1286,12 @@
 
 			mouseenter 
 			{ 
-				show			highlight5
+				show			highlight6
 			}
 
 			mouseexit 
 			{ 
-				hide			highlight5
+				hide			highlight6
 			}			
 
 		}
@@ -1308,7 +1310,7 @@
 			type				ITEM_TYPE_YESNO
 			text				"Force Power Direction Hint:"
 			cvar				"cg_showForcePowerDirection"
-			rect				305 191 300 20
+			rect				340 191 300 20
 			textalign			ITEM_ALIGN_RIGHT
 			textalignx			151
 			textaligny			-2
@@ -1342,7 +1344,7 @@
 			type				ITEM_TYPE_YESNO
 			text				"Force Speed FOV Change:"
 			cvar				"cg_forceSpeedFOVAdjust"
-			rect				305 211 300 20
+			rect				340 211 300 20
 			textalign			ITEM_ALIGN_RIGHT
 			textalignx			151
 			textaligny			-2
diff --git a/z_vr_assets/ui/ingamesetup.menu b/z_vr_assets/ui/ingamesetup.menu
index 28c9e4f..18a82bd 100644
--- a/z_vr_assets/ui/ingamesetup.menu
+++ b/z_vr_assets/ui/ingamesetup.menu
@@ -22,6 +22,7 @@
 			hide				vidrestart	;
 			hide				sound	;
 			hide				options ;
+			hide				difficulty ;
 			hide				defaults
 			show				setup_background ;
 			show 				video ;
@@ -1485,10 +1486,9 @@
 			cvar				"cg_shadows"
 			cvarFloatList		
 			{  
-				@MENUS3_NONE				0 
-				@MENUS3_SHADOWS_SIMPLE		1 
-				@MENUS3_SHADOWS_VOLUMETRIC	2
-//				"Projected"		3
+				"None"		0 
+				"Low"		1 
+				"High"	3
 			}
 			rect				305 271 300 20
 	   		textalign			ITEM_ALIGN_RIGHT
@@ -1804,7 +1804,7 @@
 				@MENUS0_OFF 0  
 				@MENUS0_ON 1 
 			}
-			rect				305 171 300 20
+			rect				305 191 300 20
 	   		textalign			ITEM_ALIGN_RIGHT
 			textalignx			165
 			textaligny			-2
@@ -1830,6 +1830,44 @@
 		}
 
 
+		itemDef 
+		{	
+			name				identifytarget
+			group				options
+      		type				ITEM_TYPE_MULTI
+			text				@MENUS0_IDENTIFY_TARGET
+			cvar				"cg_crosshairIdentifyTarget"
+			cvarFloatList		
+			{ 
+				@MENUS0_OFF 0  
+				@MENUS0_ON 1 
+			}
+			rect				305 211 300 20
+	   		textalign			ITEM_ALIGN_RIGHT
+			textalignx			165
+			textaligny			-2
+			font 				2
+			textscale 			0.8
+			forecolor			1 1 1 1
+			visible			0
+			// appearance_slot		1
+			descText			@MENUS2_TOGGLE_TO_HAVE_THE_CROSSHAIR
+			action
+			{
+				play			"sound/interface/button1.wav" ;
+			}
+
+			mouseenter 
+			{ 
+				show			highlight2
+			}
+			mouseexit 
+			{ 
+				hide			highlight2
+			} 
+		}
+
+
 		itemDef 
 		{	
 			name				slowmo
@@ -1847,7 +1885,7 @@
 				@MENUS2_FREQUENTLY		5
 				@MENUS2_EXCESSIVELY		6
 			}
-			rect				305 211 300 20
+			rect				305 231 300 20
 	   		textalign			ITEM_ALIGN_RIGHT
 			textalignx			165
 			textaligny			-2
@@ -1872,6 +1910,129 @@
 			} 
 		}
 
+
+		itemDef 
+		{	
+			name				dismemberment
+			group				options
+      		type				ITEM_TYPE_MULTI
+			text				@MENUS2_DISMEMBERMENT
+			cvar				"g_dismemberment"
+			cvarFloatList		
+			{ 
+				"Disabled"	0
+				"Mild"			1
+				"Bearable"	2
+				"Unsettling"	3
+			}
+			cvarTest			ui_iscensored
+			hideCvar			{ 1 }
+			rect				325 271 300 20
+	   		textalign			ITEM_ALIGN_RIGHT
+			textalignx			165
+			textaligny			-2
+			font 				2
+			textscale 			0.8
+			forecolor			1 1 1 1
+			visible			0
+			// appearance_slot		1
+			descText			@MENUS2_SELECT_WHAT_LIGHTSABER
+			action
+			{
+				play			"sound/interface/button1.wav" ;
+			}
+			mouseenter 
+			{ 
+				show			highlight6
+			}
+			mouseexit 
+			{ 
+				hide			highlight6
+			} 
+		}
+
+
+		itemDef 
+		{	
+			name				dismemberment_probability
+			group				options
+      		type				ITEM_TYPE_MULTI
+			text				"Dismemberment Probability:"
+			cvar				"g_dismemberprobabilities"
+			cvarFloatList		
+			{ 
+				"Rarely"	30
+				"Often"			50
+				"Always"	100
+			}
+			cvarTest			ui_iscensored
+			hideCvar			{ 1 }
+			rect				325 291 300 20
+	   		textalign			ITEM_ALIGN_RIGHT
+			textalignx			165
+			textaligny			-2
+			font 				2
+			textscale 			0.8
+			forecolor			1 1 1 1
+			visible			0
+			// appearance_slot		1
+			descText			"How often do model dismemberments happen."
+			action
+			{
+				play			"sound/interface/button1.wav" ;
+			}
+			mouseenter 
+			{ 
+				show			highlight7
+			}
+			mouseexit 
+			{ 
+				hide			highlight7
+			} 
+		}
+
+
+
+/*
+		itemDef 
+		{	
+			name				dismembermentprob
+			group				options_obsolete
+      		type				ITEM_TYPE_MULTI
+			text				@MENUS2_DISMEMBER_PROBABILITY
+			cvar				"g_dismemberProbabilities"
+			cvarFloatList		
+			{ 
+				@MENUS2_RARE 		2
+				@MENUS1_NORMAL 		1
+				@MENUS2_EXCESSIVE		0
+			}
+			rect				305 311 300 20
+	   		textalign			ITEM_ALIGN_RIGHT
+			textalignx			165
+			textaligny			-2
+			font 				2
+			textscale 			0.8
+			forecolor			1 1 1 1
+			visible			0
+			// appearance_slot		1
+			descText			@MENUS2_SELECT_FREQUENCY_OF_DISMEMBERMENT
+			action
+			{
+				play			"sound/interface/button1.wav" ;
+			}
+
+			mouseenter 
+			{ 
+				show			highlight8
+			}
+			mouseexit 
+			{ 
+				hide			highlight8
+			} 
+		}
+*/
+
 		itemDef 
 		{	
 			name				text
@@ -1885,7 +2046,7 @@
 				"Francais" 	1
 				"Deutsch" 	2
 			}
-			rect				305 251 300 20
+			rect				305 351 300 20
 	   		textalign			ITEM_ALIGN_RIGHT
 			textalignx			165
 			textaligny			-2
@@ -1895,18 +2056,18 @@
 			visible			0
 			// appearance_slot		1
 			descText			@MENUS2_CHOOSE_THE_LANGUAGE_FOR
-
 			action
 			{
-				play			"sound/interface/button1.wav"
+				play			"sound/interface/button1.wav" ;
 			}
+
 			mouseenter 
 			{ 
-				show			highlight4
+				show			highlight10
 			}
 			mouseexit 
 			{ 
-				hide			highlight4
+				hide			highlight10
 			} 
 		}
 
@@ -1923,7 +2084,7 @@
 				"Francais" 	"francais"
 				"Deutsch"	"deutsch"
 			}
-			rect				305 271 300 20
+			rect				305 371 300 20
 	   		textalign			ITEM_ALIGN_RIGHT
 			textalignx			165
 			textaligny			-2
@@ -1933,18 +2094,18 @@
 			visible			0
 			// appearance_slot		1
 			descText			@MENUS3_CHOOSE_THE_LANGUAGE_TO
-
 			action
 			{
-				play			"sound/interface/button1.wav"
+				play			"sound/interface/button1.wav" ;
 			}
+
 			mouseenter 
 			{ 
-				show			highlight5
+				show			highlight11
 			}
 			mouseexit 
 			{ 
-				hide			highlight5
+				hide			highlight11
 			} 
 		}
 
@@ -1961,7 +2122,7 @@
 				@MENUS3_IN_CINEMATICS	2 
 //				@MENUS3_ALL_VOICEOVERS	1 
 			}
-			rect				305 291 300 20
+			rect				305 391 300 20
 	   		textalign			ITEM_ALIGN_RIGHT
 			textalignx			165
 			textaligny			-2
@@ -1971,6 +2132,42 @@
 			visible			0
 			// appearance_slot		1
 			descText			@MENUS3_TOGGLE_WHETHER_SUBTITLES
+			action
+			{
+				play			"sound/interface/button1.wav" ;
+			}
+
+			mouseenter 
+			{ 
+				show			highlight12
+			}
+			mouseexit 
+			{ 
+				hide			highlight12
+			} 
+		}
+
+
+
+// This menu option is no longer used.
+		itemDef 
+		{	
+			name				sync_frame
+			group				options_obsolete
+      		type				ITEM_TYPE_MULTI
+			text				@MENUS1_SYNC_EVERY_FRAME
+			cvar				"r_finish"
+			cvarFloatList		{  @MENUS0_OFF 0 @MENUS0_ON 1 }
+			rect				305 211 300 20
+	   		textalign			ITEM_ALIGN_RIGHT
+			textalignx			165
+			textaligny			-2
+			font 				2
+			textscale 			0.8
+			forecolor			1 1 1 1
+			visible			0
+			// appearance_slot		1
+			descText			@MENUS3_TOGGLE_TO_PREVENT_VIDEO
 
 			action
 			{
@@ -1978,16 +2175,14 @@
 			}
 			mouseenter 
 			{ 
-				show			highlight6
+				show			highlight3
 			}
 			mouseexit 
 			{ 
-				hide			highlight6
+				hide			highlight3
 			} 
 		}
 
-
-
 		//----------------------------------------------------------------------------------------------
 		//
 		//	DIFFICULTY FIELDS
@@ -1997,9 +2192,16 @@
 		{
 			name				none
 			group				difficulty
-			type				ITEM_TYPE_YESNO
-			text				"Realistic Saber Combat:"
+			type				ITEM_TYPE_MULTI
+			text				"Lightsaber Realism:"
 			cvar				"g_saberRealisticCombat"
+			cvarFloatList		
+			{ 
+				"Default" 0 
+				"Increased Damage" 1
+				"Fatal Critical Hit" 2
+				"Instant Kill" 3
+			}
 			rect				305 191 300 20
 			textalign			ITEM_ALIGN_RIGHT
 			textalignx			151
@@ -2009,7 +2211,7 @@
 			forecolor			1 1 1 1
 			visible			0
 			// appearance_slot		1
-			descText			"When enabled, sabers deal more damage."
+			descText			"Choose effectivity of lightsaber, affects lightsaber duels difficulty mostly."
 			action 
 			{ 
 				play			sound/interface/button1
@@ -2026,43 +2228,82 @@
 			}			
 		}
 
-		//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
-		//	}			
-		//}
+		itemDef 
+		{
+			name				none
+			group				difficulty
+			type				ITEM_TYPE_MULTI
+			text				"Enemy Fencing Speed:"
+			cvar				"g_saberAnimSpeed"
+			cvarFloatList		
+			{ 
+				"Slower" 1.0 
+				"Default" 1.2
+				"Faster" 1.3
+			}
+			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 fencing swiftness of enemies, affects lightsaber duels difficulty."
+			action 
+			{ 
+				play			"sound/interface/button1.wav" ;
+			}
+		
+			mouseenter 
+			{ 
+				show			highlight3
+			}
+			mouseexit 
+			{ 
+				hide			highlight3
+			}			
+		}
+
+		itemDef 
+		{
+			name				none
+			group				difficulty
+			type				ITEM_TYPE_MULTI
+			text				"Game Difficulty:"
+			cvar				"g_spskill"
+			cvarFloatList		
+		{
+				"Padawan" 0 
+				"Jedi" 1
+				"Jedi Knight" 2
+				"Jedi Master" 3
+		}
+			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		1
+			descText			"Change game difficulty."
+			action 
+			{ 
+				play			"sound/interface/button1.wav" ;
+			}
+
+			mouseenter 
+			{ 
+				show			highlight4
+			}
+			mouseexit 
+			{ 
+				hide			highlight4
+			}
+		}
 
 
 		//----------------------------------------------------------------------------------------------
diff --git a/z_vr_assets/ui/menus.txt b/z_vr_assets/ui/menus.txt
new file mode 100644
index 0000000..6133404
--- /dev/null
+++ b/z_vr_assets/ui/menus.txt
@@ -0,0 +1,30 @@
+// menu defs
+// 
+{
+	loadMenu { "ui/main.menu"							}
+	loadMenu { "ui/newgame.menu"						}
+	loadMenu { "ui/loadgame.menu"						}
+	loadMenu { "ui/controls.menu"						}
+	loadMenu { "ui/setup.menu"						}
+	loadMenu { "ui/credits.menu"						}
+	loadMenu { "ui/quit.menu"							}
+
+	loadMenu { "ui/ingame.menu"						}
+	loadMenu { "ui/ingamesave.menu"						}
+	loadMenu { "ui/ingameload.menu"						}
+	loadMenu { "ui/ingamecontrols.menu"					}
+	loadMenu { "ui/ingamesetup.menu"					}
+	loadMenu { "ui/ingamequit.menu"					}
+
+	loadMenu { "ui/datapadforcepowers.menu"				}
+	loadMenu { "ui/datapadinventory.menu"				}
+	loadMenu { "ui/datapadmission.menu"					}
+	loadMenu { "ui/datapadweapons.menu"					}
+	loadMenu { "ui/datapadcheats.menu"					}
+
+	loadMenu { "ui/error.menu" }
+	loadMenu { "ui/vid_warning.menu"					}
+	loadMenu { "ui/ingamevid_warning.menu"				}
+	loadMenu { "ui/videodriver.menu"					}
+
+}
diff --git a/z_vr_assets/ui/setup.menu b/z_vr_assets/ui/setup.menu
index bb34533..26dded1 100644
--- a/z_vr_assets/ui/setup.menu
+++ b/z_vr_assets/ui/setup.menu
@@ -1,4 +1,4 @@
-//--------------------------------------------------------------
+// //--------------------------------------------------------------
 //
 // SETUP MENU
 //
@@ -27,6 +27,7 @@
 			hide				vidrestart	;
 			hide				sound	;
 			hide				options ;
+			hide				difficulty ;
 			hide				mods	;
 			hide				defaults ;
 			show				video ;
@@ -847,6 +848,7 @@
 				play			"sound/interface/button1.wav" ;
 
 				defer			VideoSetup	videowarningMenu ;
+				uiScript		loadMods ;
 
 				show			setup_background ;
 				hide 			video ;
@@ -1101,7 +1103,7 @@
 		//
 		//----------------------------------------------------------------------------------------------
 		itemDef 
-		{	
+		{
 			name				geometric_detail
 			group				video
 			type				ITEM_TYPE_MULTI
@@ -1569,10 +1571,9 @@
 			cvar				"cg_shadows"
 			cvarFloatList		
 			{  
-				@MENUS3_NONE				0 
-				@MENUS3_SHADOWS_SIMPLE		1 
-				@MENUS3_SHADOWS_VOLUMETRIC	2
-//				"Projected"		3
+				"None"		0 
+				"Low"		1 
+				"High"	3
 			}
 			rect				305 271 300 20
 	   		textalign			ITEM_ALIGN_RIGHT
@@ -1884,7 +1885,7 @@
 			text				@MENUS2_DRAW_CROSSHAIR
 			cvar				"cg_drawcrosshair"
 			cvarFloatList		{  @MENUS0_OFF 0 @MENUS0_ON 1 }
-			rect				305 171 300 20
+			rect				305 191 300 20
 	   		textalign			ITEM_ALIGN_RIGHT
 			textalignx			165
 			textaligny			-2
@@ -1899,31 +1900,23 @@
 			}
 			mouseenter 
 			{ 
-				show			highlight1
+				show			highlight2
 			}
 			mouseexit 
 			{ 
-				hide			highlight1
+				hide			highlight2
 			} 
 		}
 
+
 		itemDef 
 		{	
-			name				slowmo
+			name				identifytarget
 			group				options
       		type				ITEM_TYPE_MULTI
-			text				@MENUS2_SLOW_MOTION_DEATH
-			cvar				"d_slowmodeath"
-			cvarFloatList		
-			{ 
-				@MENUS2_NEVER 			0  
-				@MENUS2_ON_DEATH	 		1 
-				@MENUS2_RARELY		 	2
-				@MENUS1_NORMAL		 	3
-				@MENUS2_OFTEN 			4
-				@MENUS2_FREQUENTLY		5
-				@MENUS2_EXCESSIVELY		6
-			}
+			text				@MENUS0_IDENTIFY_TARGET
+			cvar				"cg_crosshairIdentifyTarget"
+			cvarFloatList		{  @MENUS0_OFF 0 @MENUS0_ON 1 }
 			rect				305 211 300 20
 	   		textalign			ITEM_ALIGN_RIGHT
 			textalignx			165
@@ -1932,8 +1925,7 @@
 			textscale 			0.8
 			forecolor			1 1 1 1
 			visible			0
-			// appearance_slot		1
-			descText			@MENUS2_SELECT_THE_FREQUENCY
+			descText			@MENUS2_TOGGLE_TO_HAVE_THE_CROSSHAIR
 
 			action
 			{
@@ -1952,18 +1944,21 @@
 
 		itemDef 
 		{	
-			name				dismemberment
+			name				slowmo
 			group				options
       		type				ITEM_TYPE_MULTI
-			text				@MENUS2_DISMEMBERMENT
-			cvar				"g_dismemberment"
+			text				@MENUS2_SLOW_MOTION_DEATH
+			cvar				"d_slowmodeath"
 			cvarFloatList		
 			{ 
-				@MENUS0_OFF 	0
-				@MENUS0_ON 		3
+				@MENUS2_NEVER 			0  
+				@MENUS2_ON_DEATH	 		1 
+				@MENUS2_RARELY		 	2
+				@MENUS1_NORMAL		 	3
+				@MENUS2_OFTEN 			4
+				@MENUS2_FREQUENTLY		5
+				@MENUS2_EXCESSIVELY		6
 			}
-			cvarTest			ui_iscensored
-			hideCvar			{ 1 }
 			rect				305 231 300 20
 	   		textalign			ITEM_ALIGN_RIGHT
 			textalignx			165
@@ -1973,11 +1968,11 @@
 			forecolor			1 1 1 1
 			visible			0
 			// appearance_slot		1
-			descText			@MENUS2_SELECT_WHAT_LIGHTSABER
+			descText			@MENUS2_SELECT_THE_FREQUENCY
 
 			action
 			{
-				play			"sound/interface/button1.wav"
+				play			"sound/interface/button1.wav" 
 			}
 			mouseenter 
 			{ 
@@ -1989,20 +1984,24 @@
 			} 
 		}
 
+
 		itemDef 
 		{	
-			name				text
+			name				dismemberment
 			group				options
       		type				ITEM_TYPE_MULTI
-			text				@MENUS0_TEXT
-			cvar				"sp_language"
+			text				@MENUS2_DISMEMBERMENT
+			cvar				"g_dismemberment"
 			cvarFloatList		
 			{ 
-				"English"	0  
-				"Francais" 	1
-				"Deutsch" 	2
+				"Disabled"	0
+				"Mild"			1
+				"Bearable"	2
+				"Unsettling"	3
 			}
-			rect				305 251 300 20
+			cvarTest			ui_iscensored
+			hideCvar			{ 1 }
+			rect				325 271 300 20
 	   		textalign			ITEM_ALIGN_RIGHT
 			textalignx			165
 			textaligny			-2
@@ -2011,45 +2010,7 @@
 			forecolor			1 1 1 1
 			visible			0
 			// appearance_slot		1
-			descText			@MENUS2_CHOOSE_THE_LANGUAGE_FOR
-
-			action
-			{
-				play			"sound/interface/button1.wav"
-			}
-			mouseenter 
-			{ 
-				show			highlight5
-			}
-			mouseexit 
-			{ 
-				hide			highlight5
-			} 
-		}
-
-		itemDef 
-		{	
-			name				voice
-			group				options
-      		type				ITEM_TYPE_MULTI
-			text				@MENUS1_VOICE
-			cvar				"s_language"
-			cvarStrList		
-			{ 
-				"English",	"english"
-				"Francais" 	"francais"
-				"Deutsch"	"deutsch"
-			}
-			rect				305 271 300 20
-	   		textalign			ITEM_ALIGN_RIGHT
-			textalignx			165
-			textaligny			-2
-			font 				2
-			textscale 			0.8
-			forecolor			1 1 1 1
-			visible			0
-			// appearance_slot		1
-			descText			@MENUS3_CHOOSE_THE_LANGUAGE_TO
+			descText			@MENUS2_SELECT_WHAT_LIGHTSABER
 
 			action
 			{
@@ -2067,18 +2028,20 @@
 
 		itemDef 
 		{	
-			name				voice
+			name				dismemberment_probability
 			group				options
       		type				ITEM_TYPE_MULTI
-			text				@MENUS1_SUBTITLES
-			cvar				"g_subtitles"
+			text				"Dismemberment Probability:"
+			cvar				"g_dismemberprobabilities"
 			cvarFloatList		
 			{ 
-				@MENUS3_NONE		0  
-				@MENUS3_IN_CINEMATICS	2 
-//				@MENUS3_ALL_VOICEOVERS	1 
+				"Rarely"	30
+				"Often"			50
+				"Always"	100
 			}
-			rect				305 291 300 20
+			cvarTest			ui_iscensored
+			hideCvar			{ 1 }
+			rect				325 291 300 20
 	   		textalign			ITEM_ALIGN_RIGHT
 			textalignx			165
 			textaligny			-2
@@ -2087,7 +2050,7 @@
 			forecolor			1 1 1 1
 			visible			0
 			// appearance_slot		1
-			descText			@MENUS3_TOGGLE_WHETHER_SUBTITLES
+			descText			"How often do model dismemberments happen."
 
 			action
 			{
@@ -2105,6 +2068,195 @@
 
 
 
+/*
+		itemDef 
+		{	
+			name				dismembermentprob
+			group				options_obsolete
+      		type				ITEM_TYPE_MULTI
+			text				@MENUS2_DISMEMBER_PROBABILITY
+			cvar				"g_dismemberProbabilities"
+			cvarFloatList		
+			{ 
+				@MENUS2_RARE 		2
+				@MENUS1_NORMAL 		1
+				@MENUS2_EXCESSIVE		0
+			}
+			rect				305 311 300 20
+	   		textalign			ITEM_ALIGN_RIGHT
+			textalignx			165
+			textaligny			-2
+			font 				2
+			textscale 			0.8
+			forecolor			1 1 1 1
+			visible			0
+			// appearance_slot		1
+			descText			@MENUS2_SELECT_FREQUENCY_OF_DISMEMBERMENT
+			action
+			{
+				play			"sound/interface/button1.wav"
+			}
+			mouseenter 
+			{ 
+				show			highlight8
+			}
+			mouseexit 
+			{ 
+				hide			highlight8
+			} 
+		}
+*/
+
+		itemDef 
+		{	
+			name				text
+			group				options
+      		type				ITEM_TYPE_MULTI
+			text				@MENUS0_TEXT
+			cvar				"sp_language"
+			cvarFloatList		
+			{ 
+				"English"	0  
+				"Francais" 	1
+				"Deutsch" 	2
+			}
+			rect				305 351 300 20
+	   		textalign			ITEM_ALIGN_RIGHT
+			textalignx			165
+			textaligny			-2
+			font 				2
+			textscale 			0.8
+			forecolor			1 1 1 1
+			visible			0
+			// appearance_slot		1
+			descText			@MENUS2_CHOOSE_THE_LANGUAGE_FOR
+
+			action
+			{
+				play			"sound/interface/button1.wav"
+			}
+			mouseenter 
+			{ 
+				show			highlight10
+			}
+			mouseexit 
+			{ 
+				hide			highlight10
+			} 
+		}
+
+		itemDef 
+		{	
+			name				voice
+			group				options
+      		type				ITEM_TYPE_MULTI
+			text				@MENUS1_VOICE
+			cvar				"s_language"
+			cvarStrList		
+			{ 
+				"English",	"english"
+				"Francais" 	"francais"
+				"Deutsch"	"deutsch"
+			}
+			rect				305 371 300 20
+	   		textalign			ITEM_ALIGN_RIGHT
+			textalignx			165
+			textaligny			-2
+			font 				2
+			textscale 			0.8
+			forecolor			1 1 1 1
+			visible			0
+			// appearance_slot		1
+			descText			@MENUS3_CHOOSE_THE_LANGUAGE_TO
+
+			action
+			{
+				play			"sound/interface/button1.wav"
+			}
+			mouseenter 
+			{ 
+				show			highlight11
+			}
+			mouseexit 
+			{ 
+				hide			highlight11
+			} 
+		}
+
+		itemDef 
+		{	
+			name				voice
+			group				options
+      		type				ITEM_TYPE_MULTI
+			text				@MENUS1_SUBTITLES
+			cvar				"g_subtitles"
+			cvarFloatList		
+			{ 
+				@MENUS3_NONE		0  
+				@MENUS3_IN_CINEMATICS	2 
+//				@MENUS3_ALL_VOICEOVERS	1 
+			}
+			rect				305 391 300 20
+	   		textalign			ITEM_ALIGN_RIGHT
+			textalignx			165
+			textaligny			-2
+			font 				2
+			textscale 			0.8
+			forecolor			1 1 1 1
+			visible			0
+			// appearance_slot		1
+			descText			@MENUS3_TOGGLE_WHETHER_SUBTITLES
+
+			action
+			{
+				play			"sound/interface/button1.wav"
+			}
+			mouseenter 
+			{ 
+				show			highlight12
+			}
+			mouseexit 
+			{ 
+				hide			highlight12
+			} 
+		}
+
+
+
+// This menu option is no longer used.
+		itemDef 
+		{	
+			name				sync_frame
+			group				options_obsolete
+      		type				ITEM_TYPE_MULTI
+			text				@MENUS1_SYNC_EVERY_FRAME
+			cvar				"r_finish"
+			cvarFloatList		{  @MENUS0_OFF 0 @MENUS0_ON 1 }
+			rect				305 211 300 20
+	   		textalign			ITEM_ALIGN_RIGHT
+			textalignx			165
+			textaligny			-2
+			font 				2
+			textscale 			0.8
+			forecolor			1 1 1 1
+			visible			0
+			// appearance_slot		1
+			descText			@MENUS3_TOGGLE_TO_PREVENT_VIDEO
+
+			action
+			{
+				play			"sound/interface/button1.wav"
+			}
+			mouseenter 
+			{ 
+				show			highlight3
+			}
+			mouseexit 
+			{ 
+				hide			highlight3
+			} 
+		}
+
 		//----------------------------------------------------------------------------------------------
 		//
 		//	DIFFICULTY FIELDS
@@ -2114,9 +2266,16 @@
 		{
 			name				none
 			group				difficulty
-			type				ITEM_TYPE_YESNO
-			text				"Realistic Saber Combat:"
+			type				ITEM_TYPE_MULTI
+			text				"Lightsaber Realism:"
 			cvar				"g_saberRealisticCombat"
+			cvarFloatList		
+			{ 
+				"Default" 0 
+				"Increased Damage" 1
+				"Fatal Critical Hit" 2
+				"Instant Kill" 3
+			}
 			rect				305 191 300 20
 			textalign			ITEM_ALIGN_RIGHT
 			textalignx			151
@@ -2126,7 +2285,7 @@
 			forecolor			1 1 1 1
 			visible			0
 			// appearance_slot		1
-			descText			"When enabled, sabers deal more damage."
+			descText			"Choose effectivity of lightsaber, affects lightsaber duels difficulty mostly."
 			action 
 			{ 
 				play			sound/interface/button1
@@ -2143,44 +2302,44 @@
 			}			
 		}
 
-		//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
-		//	}			
-		//}
+		itemDef 
+		{
+			name				none
+			group				difficulty
+			type				ITEM_TYPE_MULTI
+			text				"Enemy Fencing Speed:"
+			cvar				"g_saberAnimSpeed"
+			cvarFloatList		
+			{ 
+				"Slower" 1.0 
+				"Default" 1.2
+				"Faster" 1.3
+			}
+			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 fencing swiftness of enemies, affects lightsaber duels difficulty."
+			action 
+			{ 
+				play			sound/interface/button1
+			}
+		
+			mouseenter 
+			{ 
+				show			highlight3
+			}
+		
+			mouseexit 
+			{ 
+				hide			highlight3
+			}			
+		}
 
 		//----------------------------------------------------------------------------------------------
 		//
@@ -2208,7 +2367,7 @@
 			feeder			9
 			notselectable
 			visible			0
-			columns 2	2 40 20   200 80 30
+			columns 1	2 40 280
 		}
 
 		itemDef 
@@ -2243,7 +2402,7 @@
 			action 
 			{ 
 				play			"sound/interface/button1.wav"
-//				uiScript		loadgame
+				uiScript		RunMod ;
 			}
 
 			mouseEnter