diff --git a/Assets/AddOns/vive b/Assets/AddOns/vive
index 88ddffeb7dd4fae45afc00134d9aa2543beb3596..04aa7b585878cf309f78da0d5cbaa987efc7a121 160000
--- a/Assets/AddOns/vive
+++ b/Assets/AddOns/vive
@@ -1 +1 @@
-Subproject commit 88ddffeb7dd4fae45afc00134d9aa2543beb3596
+Subproject commit 04aa7b585878cf309f78da0d5cbaa987efc7a121
diff --git a/ProjectSettings/InputManager.asset b/ProjectSettings/InputManager.asset
index 8ce2e7477786c598eceae3677846c4caf2006717..434941750b8ecccf3b029e17356c1ac3038c99b7 100644
--- a/ProjectSettings/InputManager.asset
+++ b/ProjectSettings/InputManager.asset
@@ -357,3 +357,35 @@ InputManager:
     type: 0
     axis: 0
     joyNum: 0
+  - serializedVersion: 3
+    m_Name: Submit
+    descriptiveName: 
+    descriptiveNegativeName: 
+    negativeButton: 
+    positiveButton: joystick button 10
+    altNegativeButton: 
+    altPositiveButton: 
+    gravity: 1000
+    dead: 0.001
+    sensitivity: 1000
+    snap: 0
+    invert: 0
+    type: 0
+    axis: 0
+    joyNum: 0
+  - serializedVersion: 3
+    m_Name: Cancel
+    descriptiveName: 
+    descriptiveNegativeName: 
+    negativeButton: 
+    positiveButton: joystick button 10
+    altNegativeButton: 
+    altPositiveButton: 
+    gravity: 1000
+    dead: 0.001
+    sensitivity: 1000
+    snap: 0
+    invert: 0
+    type: 0
+    axis: 0
+    joyNum: 0
diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset
index 4863fe76f406a743027d7203d37e53821006628e..a07ef1e8e435faeec6651dcf2cf4d7f7105d5723 100644
--- a/ProjectSettings/ProjectSettings.asset
+++ b/ProjectSettings/ProjectSettings.asset
@@ -258,7 +258,12 @@ PlayerSettings:
   m_BuildTargetIcons: []
   m_BuildTargetBatching: []
   m_BuildTargetGraphicsAPIs: []
-  m_BuildTargetVRSettings: []
+  m_BuildTargetVRSettings:
+  - m_BuildTarget: Standalone
+    m_Enabled: 1
+    m_Devices:
+    - OpenVR
+    - Oculus
   m_BuildTargetEnableVuforiaSettings: []
   openGLRequireES31: 0
   openGLRequireES31AEP: 0
diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset
index c5737e049e43e99a09fda345a5176c031219b5a1..1142689534ac438576ee975e2bde43c254011ed0 100644
--- a/ProjectSettings/TagManager.asset
+++ b/ProjectSettings/TagManager.asset
@@ -13,6 +13,10 @@ TagManager:
   - SelectionControl
   - Stage
   - Pillar
+  - Robot
+  - Sensor
+  - Sensors
+  - VirtualRobotActive
   layers:
   - Default
   - TransparentFX