diff --git a/src/routes.json b/src/routes.json
index 0520c20cd..478b94c9e 100644
--- a/src/routes.json
+++ b/src/routes.json
@@ -4,8 +4,7 @@
         "pattern": "^/?$",
         "routeAlias": "/?$",
         "view": "splash/splash",
-        "title": "Imagine, Program, Share",
-        "viewportWidth": "device-width"
+        "title": "Imagine, Program, Share"
     },
     {
         "name": "about",
@@ -48,32 +47,28 @@
         "pattern": "^/conference/plan/?$",
         "routeAlias": "/conference(?!/201[4-5])",
         "view": "conference/plan/plan",
-        "title": "Plan Your Visit",
-        "viewportWidth": "device-width"
+        "title": "Plan Your Visit"
     },
     {
         "name": "conference-expectations",
         "pattern": "^/conference/expect/?$",
         "routeAlias": "/conference(?!/201[4-5])",
         "view": "conference/expect/expect",
-        "title": "What to Expect",
-        "viewportWidth": "device-width"
+        "title": "What to Expect"
     },
     {
         "name": "conference-schedule",
         "pattern": "^/conference/schedule/?$",
         "routeAlias": "/conference(?!/201[4-5])",
         "view": "conference/schedule/schedule",
-        "title": "Conference Schedule",
-        "viewportWidth": "device-width"
+        "title": "Conference Schedule"
     },
     {
         "name": "conference-details",
         "pattern": "^/conference/:id/details/?$",
         "routeAlias": "/conference(?!/201[4-5])",
         "view": "conference/details/details",
-        "title": "Event Details",
-        "viewportWidth": "device-width"
+        "title": "Event Details"
     },
     {
         "name": "developers",
@@ -108,8 +103,7 @@
         "pattern": "^/educators/register/?$",
         "routeAlias": "/educators(?:/(faq|register|waiting))?/?$",
         "view": "teacherregistration/teacherregistration",
-        "title": "Teacher Registration",
-        "viewportWidth": "device-width"
+        "title": "Teacher Registration"
     },
     {
         "name": "teacherwaitingroom",
diff --git a/src/template-config.js b/src/template-config.js
index 297328d74..33cd26ca7 100644
--- a/src/template-config.js
+++ b/src/template-config.js
@@ -7,7 +7,7 @@ module.exports = {
         'and animations.',
 
     // override if mobile-friendly
-    viewportWidth: 942,
+    viewportWidth: 'device-width',
 
     // Open graph
     og_image: 'https://scratch.mit.edu/images/scratch-og.png',