diff --git a/src/components/hand-controls2.js b/src/components/hand-controls2.js
index e2b5771f2164923b7ef942f58d65fb634cbf31f1..a466ad7ba80b9591dd45eb18442e41466e3fb411 100644
--- a/src/components/hand-controls2.js
+++ b/src/components/hand-controls2.js
@@ -20,7 +20,8 @@ const CONTROLLER_OFFSETS = {
     new THREE.Quaternion().setFromEuler(new THREE.Euler(-40 * THREE.Math.DEG2RAD, 0, 0)),
     new THREE.Vector3(1, 1, 1)
   ),
-  "daydream-controls": new THREE.Matrix4().makeTranslation(0, 0, -0.04)
+  "daydream-controls": new THREE.Matrix4().makeTranslation(0, 0, -0.04),
+  "gearvr-controls": new THREE.Matrix4()
 };
 
 AFRAME.registerComponent("hand-controls2", {
@@ -114,6 +115,7 @@ AFRAME.registerComponent("hand-controls2", {
       el.setAttribute("oculus-touch-controls", controlConfiguration);
       el.setAttribute("windows-motion-controls", controlConfiguration);
       el.setAttribute("daydream-controls", controlConfiguration);
+      el.setAttribute("gearvr-controls", controlConfiguration);
     }
   },
 
diff --git a/src/input-mappings.js b/src/input-mappings.js
index 272e3889ada96d6638d27544d3ea27ec379e5395..e9a80d53bf3dc8b52f4b2bee26adce3f14b73bad 100644
--- a/src/input-mappings.js
+++ b/src/input-mappings.js
@@ -58,7 +58,10 @@ const config = {
         abuttonup: "action_teleport_up"
       },
       "daydream-controls": {
-        menudown: "action_mute",
+        trackpaddown: "action_teleport_down",
+        trackpadup: "action_teleport_up"
+      },
+      "gearvr-controls": {
         trackpaddown: "action_teleport_down",
         trackpadup: "action_teleport_up"
       },
diff --git a/src/room.html b/src/room.html
index 3893f86761fff5837f73a2b2ad409f10ae3e031b..703874897968615d777c03353392ae90a8fff6a4 100644
--- a/src/room.html
+++ b/src/room.html
@@ -7,9 +7,9 @@
 
     <meta http-equiv="origin-trial" data-feature="WebVR (For Chrome M62+)" data-expires="<%= ORIGIN_TRIAL_EXPIRES %>" content="<%= ORIGIN_TRIAL_TOKEN %>">
     <% if(NODE_ENV === "production") { %>
-        <script src="https://cdn.rawgit.com/brianpeiris/aframe/r90-tracked-controls-fix/dist/aframe-master.min.js"></script>
+        <script src="https://cdn.rawgit.com/brianpeiris/aframe/bba200440e3279753df85a1f52ba4c77a3b16e47/dist/aframe-master.min.js"></script>
     <% } else { %>
-        <script src="https://rawgit.com/brianpeiris/aframe/r90-tracked-controls-fix/dist/aframe-master.js"></script>
+        <script src="https://cdn.rawgit.com/brianpeiris/aframe/bba200440e3279753df85a1f52ba4c77a3b16e47/dist/aframe-master.js"></script>
     <% } %>
 </head>