diff --git a/cms/static/images/fav/android-chrome-144x144.png b/cms/static/images/fav/android-chrome-144x144.png
new file mode 100644
index 0000000..6dbda88
Binary files /dev/null and b/cms/static/images/fav/android-chrome-144x144.png differ
diff --git a/cms/static/images/fav/android-chrome-192x192.png b/cms/static/images/fav/android-chrome-192x192.png
new file mode 100644
index 0000000..9216fb3
Binary files /dev/null and b/cms/static/images/fav/android-chrome-192x192.png differ
diff --git a/cms/static/images/fav/android-chrome-36x36.png b/cms/static/images/fav/android-chrome-36x36.png
new file mode 100644
index 0000000..1b21583
Binary files /dev/null and b/cms/static/images/fav/android-chrome-36x36.png differ
diff --git a/cms/static/images/fav/android-chrome-48x48.png b/cms/static/images/fav/android-chrome-48x48.png
new file mode 100644
index 0000000..c860bd4
Binary files /dev/null and b/cms/static/images/fav/android-chrome-48x48.png differ
diff --git a/cms/static/images/fav/android-chrome-72x72.png b/cms/static/images/fav/android-chrome-72x72.png
new file mode 100644
index 0000000..fa98ca1
Binary files /dev/null and b/cms/static/images/fav/android-chrome-72x72.png differ
diff --git a/cms/static/images/fav/android-chrome-96x96.png b/cms/static/images/fav/android-chrome-96x96.png
new file mode 100644
index 0000000..114d66a
Binary files /dev/null and b/cms/static/images/fav/android-chrome-96x96.png differ
diff --git a/cms/static/images/fav/apple-touch-icon-114x114.png b/cms/static/images/fav/apple-touch-icon-114x114.png
new file mode 100644
index 0000000..4450f01
Binary files /dev/null and b/cms/static/images/fav/apple-touch-icon-114x114.png differ
diff --git a/cms/static/images/fav/apple-touch-icon-120x120.png b/cms/static/images/fav/apple-touch-icon-120x120.png
new file mode 100644
index 0000000..2c2783a
Binary files /dev/null and b/cms/static/images/fav/apple-touch-icon-120x120.png differ
diff --git a/cms/static/images/fav/apple-touch-icon-144x144.png b/cms/static/images/fav/apple-touch-icon-144x144.png
new file mode 100644
index 0000000..6dbda88
Binary files /dev/null and b/cms/static/images/fav/apple-touch-icon-144x144.png differ
diff --git a/cms/static/images/fav/apple-touch-icon-152x152.png b/cms/static/images/fav/apple-touch-icon-152x152.png
new file mode 100644
index 0000000..3d15e65
Binary files /dev/null and b/cms/static/images/fav/apple-touch-icon-152x152.png differ
diff --git a/cms/static/images/fav/apple-touch-icon-180x180.png b/cms/static/images/fav/apple-touch-icon-180x180.png
new file mode 100644
index 0000000..a3788be
Binary files /dev/null and b/cms/static/images/fav/apple-touch-icon-180x180.png differ
diff --git a/cms/static/images/fav/apple-touch-icon-57x57.png b/cms/static/images/fav/apple-touch-icon-57x57.png
new file mode 100644
index 0000000..90a3deb
Binary files /dev/null and b/cms/static/images/fav/apple-touch-icon-57x57.png differ
diff --git a/cms/static/images/fav/apple-touch-icon-60x60.png b/cms/static/images/fav/apple-touch-icon-60x60.png
new file mode 100644
index 0000000..0152ed7
Binary files /dev/null and b/cms/static/images/fav/apple-touch-icon-60x60.png differ
diff --git a/cms/static/images/fav/apple-touch-icon-72x72.png b/cms/static/images/fav/apple-touch-icon-72x72.png
new file mode 100644
index 0000000..fa98ca1
Binary files /dev/null and b/cms/static/images/fav/apple-touch-icon-72x72.png differ
diff --git a/cms/static/images/fav/apple-touch-icon-76x76.png b/cms/static/images/fav/apple-touch-icon-76x76.png
new file mode 100644
index 0000000..72a068a
Binary files /dev/null and b/cms/static/images/fav/apple-touch-icon-76x76.png differ
diff --git a/cms/static/images/fav/apple-touch-icon-precomposed.png b/cms/static/images/fav/apple-touch-icon-precomposed.png
new file mode 100644
index 0000000..bdd388f
Binary files /dev/null and b/cms/static/images/fav/apple-touch-icon-precomposed.png differ
diff --git a/cms/static/images/fav/apple-touch-icon.png b/cms/static/images/fav/apple-touch-icon.png
new file mode 100644
index 0000000..a3788be
Binary files /dev/null and b/cms/static/images/fav/apple-touch-icon.png differ
diff --git a/cms/static/images/fav/browserconfig.xml b/cms/static/images/fav/browserconfig.xml
new file mode 100644
index 0000000..65380f3
--- /dev/null
+++ b/cms/static/images/fav/browserconfig.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<browserconfig>
+  <msapplication>
+    <tile>
+      <square70x70logo src="/mstile-70x70.png"/>
+      <square150x150logo src="/mstile-150x150.png"/>
+      <square310x310logo src="/mstile-310x310.png"/>
+      <wide310x150logo src="/mstile-310x150.png"/>
+      <TileColor>#da532c</TileColor>
+    </tile>
+  </msapplication>
+</browserconfig>
diff --git a/cms/static/images/fav/favicon-16x16.png b/cms/static/images/fav/favicon-16x16.png
new file mode 100644
index 0000000..0eed991
Binary files /dev/null and b/cms/static/images/fav/favicon-16x16.png differ
diff --git a/cms/static/images/fav/favicon-32x32.png b/cms/static/images/fav/favicon-32x32.png
new file mode 100644
index 0000000..16be34c
Binary files /dev/null and b/cms/static/images/fav/favicon-32x32.png differ
diff --git a/cms/static/images/fav/favicon-96x96.png b/cms/static/images/fav/favicon-96x96.png
new file mode 100644
index 0000000..114d66a
Binary files /dev/null and b/cms/static/images/fav/favicon-96x96.png differ
diff --git a/cms/static/images/fav/favicon.ico b/cms/static/images/fav/favicon.ico
new file mode 100644
index 0000000..45f0674
Binary files /dev/null and b/cms/static/images/fav/favicon.ico differ
diff --git a/cms/static/images/fav/manifest.json b/cms/static/images/fav/manifest.json
new file mode 100644
index 0000000..b8c71c0
--- /dev/null
+++ b/cms/static/images/fav/manifest.json
@@ -0,0 +1,41 @@
+{
+	"name": "AVA",
+	"icons": [
+		{
+			"src": "\/android-chrome-36x36.png",
+			"sizes": "36x36",
+			"type": "image\/png",
+			"density": "0.75"
+		},
+		{
+			"src": "\/android-chrome-48x48.png",
+			"sizes": "48x48",
+			"type": "image\/png",
+			"density": "1.0"
+		},
+		{
+			"src": "\/android-chrome-72x72.png",
+			"sizes": "72x72",
+			"type": "image\/png",
+			"density": "1.5"
+		},
+		{
+			"src": "\/android-chrome-96x96.png",
+			"sizes": "96x96",
+			"type": "image\/png",
+			"density": "2.0"
+		},
+		{
+			"src": "\/android-chrome-144x144.png",
+			"sizes": "144x144",
+			"type": "image\/png",
+			"density": "3.0"
+		},
+		{
+			"src": "\/android-chrome-192x192.png",
+			"sizes": "192x192",
+			"type": "image\/png",
+			"density": "4.0"
+		}
+	]
+}
diff --git a/cms/static/images/fav/mstile-144x144.png b/cms/static/images/fav/mstile-144x144.png
new file mode 100644
index 0000000..6b2564e
Binary files /dev/null and b/cms/static/images/fav/mstile-144x144.png differ
diff --git a/cms/static/images/fav/mstile-150x150.png b/cms/static/images/fav/mstile-150x150.png
new file mode 100644
index 0000000..32a7dd9
Binary files /dev/null and b/cms/static/images/fav/mstile-150x150.png differ
diff --git a/cms/static/images/fav/mstile-310x150.png b/cms/static/images/fav/mstile-310x150.png
new file mode 100644
index 0000000..8fc18a4
Binary files /dev/null and b/cms/static/images/fav/mstile-310x150.png differ
diff --git a/cms/static/images/fav/mstile-310x310.png b/cms/static/images/fav/mstile-310x310.png
new file mode 100644
index 0000000..2a1fd8f
Binary files /dev/null and b/cms/static/images/fav/mstile-310x310.png differ
diff --git a/cms/static/images/fav/mstile-70x70.png b/cms/static/images/fav/mstile-70x70.png
new file mode 100644
index 0000000..34ea51c
Binary files /dev/null and b/cms/static/images/fav/mstile-70x70.png differ
diff --git a/cms/static/images/fav/safari-pinned-tab.svg b/cms/static/images/fav/safari-pinned-tab.svg
new file mode 100644
index 0000000..39028ee
--- /dev/null
+++ b/cms/static/images/fav/safari-pinned-tab.svg
@@ -0,0 +1,20 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
+ "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
+<svg version="1.0" xmlns="http://www.w3.org/2000/svg"
+ width="235.000000pt" height="235.000000pt" viewBox="0 0 235.000000 235.000000"
+ preserveAspectRatio="xMidYMid meet">
+<metadata>
+Created by potrace 1.11, written by Peter Selinger 2001-2013
+</metadata>
+<g transform="translate(0.000000,235.000000) scale(0.100000,-0.100000)"
+fill="#000000" stroke="none">
+<path d="M989 2346 c-2 -2 -41 -7 -87 -10 -46 -4 -89 -9 -95 -11 -7 -3 -30 -7
+-52 -9 -85 -11 -115 -16 -211 -37 -54 -11 -108 -23 -119 -25 -11 -3 -24 -6
+-30 -7 -5 -2 -58 -16 -118 -31 l-107 -29 0 -649 c0 -740 -5 -692 91 -834 55
+-82 209 -244 319 -335 36 -30 67 -56 70 -59 3 -3 46 -35 95 -72 168 -123 345
+-224 409 -232 24 -3 53 4 97 25 74 35 183 99 187 111 2 4 8 8 13 8 6 0 54 32
+107 72 294 217 520 453 582 608 22 55 23 58 23 703 0 356 -2 649 -4 652 -20
+19 -503 125 -643 141 -28 3 -62 8 -76 11 -28 5 -446 14 -451 9z"/>
+</g>
+</svg>
diff --git a/lms/templates/main-ava.html b/lms/templates/main-ava.html
index 3fb16d3..5e11992 100644
--- a/lms/templates/main-ava.html
+++ b/lms/templates/main-ava.html
@@ -76,10 +76,9 @@
     <link rel="icon" type="image/png" href="${static.url('images/fav/favicon-16x16.png')}" sizes="16x16">
     <link rel="manifest" href="${static.url('images/fav/manifest.json')}">
     <link rel="mask-icon" href="${static.url('images/fav/safari-pinned-tab.svg')}" color="#5bbad5">
-    <link href="https://fonts.googleapis.com/css?family=Open+Sans:400,300" rel="stylesheet" type="text/css">
-    <meta name="msapplication-TileColor" content="#da532c">
     <meta name="msapplication-TileImage" content="${static.url('images/fav/mstile-144x144.png')}">
-    <meta name="theme-color" content="#ffffff">
+    <meta name="msapplication-TileColor" content="#da532c">
+    <link href="https://fonts.googleapis.com/css?family=Open+Sans:400,300" rel="stylesheet" type="text/css">
     <!--[if lt IE 9]>
         <script src="//html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <script>window.html5 || document.write('<script src="${static.url('js/html5shiv.js')}"><\/script>')</script>
diff --git a/lms/templates/main.html b/lms/templates/main.html
new file mode 100644
index 0000000..b12c354
--- /dev/null
+++ b/lms/templates/main.html
@@ -0,0 +1,199 @@
+## coding=utf-8
+
+## This is the main Mako template that all page templates should include.
+## Note: there are a handful of pages that use Django Templates and which
+## instead include main_django.html. It is important that these two files
+## remain in sync, so changes made in one should be applied to the other.
+
+## Pages currently use v1 styling by default. Once the Pattern Library
+## rollout has been completed, this default can be switched to v2.
+<%! main_css = "style-main-v1" %>
+
+
+<%namespace name='static' file='static_content.html'/>
+<%!
+from django.core.urlresolvers import reverse
+from django.utils.http import urlquote_plus
+from django.utils.translation import ugettext as _
+from django.utils.translation import get_language_bidi
+from branding import api as branding_api
+from pipeline_mako import render_require_js_path_overrides
+%>
+<!DOCTYPE html>
+<!--[if lte IE 9]><html class="ie ie9 lte9" lang="${LANGUAGE_CODE}"><![endif]-->
+<!--[if !IE]><!--><html lang="${LANGUAGE_CODE}"><!--<![endif]-->
+<head dir="${static.dir_rtl()}">
+    <meta charset="UTF-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+
+## Define a couple of helper functions to make life easier when
+## embedding theme conditionals into templates. All inheriting
+## templates have access to these functions, and we can import these
+## into non-inheriting templates via the %namespace tag.
+
+## this needs to be here to prevent the title from mysteriously appearing in the body, in one case
+<%def name="pagetitle()" />
+  <%block name="title">
+      <title>
+       ${static.get_page_title_breadcrumbs(self.pagetitle())}
+      </title>
+  </%block>
+
+  % if not allow_iframing:
+      <script type="text/javascript">
+        /* immediately break out of an iframe if coming from the marketing website */
+        (function(window) {
+          if (window.location !== window.top.location) {
+            window.top.location = window.location;
+          }
+        })(this);
+      </script>
+  % endif
+
+  <%
+    jsi18n_path = "js/i18n/{language}/djangojs.js".format(language=LANGUAGE_CODE)
+  %>
+
+  <script type="text/javascript" src="${static.url(jsi18n_path)}"></script>
+
+  <!-- FAV & Touch Icons -->
+  <link rel="apple-touch-icon" sizes="57x57" href="${static.url('images/fav/apple-touch-icon-57x57.png')}">
+  <link rel="apple-touch-icon" sizes="60x60" href="${static.url('images/fav/apple-touch-icon-60x60.png')}">
+  <link rel="apple-touch-icon" sizes="72x72" href="${static.url('images/fav/apple-touch-icon-72x72.png')}">
+  <link rel="apple-touch-icon" sizes="76x76" href="${static.url('images/fav/apple-touch-icon-76x76.png')}">
+  <link rel="apple-touch-icon" sizes="114x114" href="${static.url('images/fav/apple-touch-icon-114x114.png')}">
+  <link rel="apple-touch-icon" sizes="120x120" href="${static.url('images/fav/apple-touch-icon-120x120.png')}">
+  <link rel="apple-touch-icon" sizes="144x144" href="${static.url('images/fav/apple-touch-icon-144x144.png')}">
+  <link rel="apple-touch-icon" sizes="152x152" href="${static.url('images/fav/apple-touch-icon-152x152.png')}">
+  <link rel="apple-touch-icon" sizes="180x180" href="${static.url('images/fav/apple-touch-icon-180x180.png')}">
+  <link rel="icon" type="image/png" href="${static.url('images/fav/favicon-32x32.png')}" sizes="32x32">
+  <link rel="icon" type="image/png" href="${static.url('images/fav/android-chrome-192x192.png')}" sizes="192x192">
+  <link rel="icon" type="image/png" href="${static.url('images/fav/favicon-96x96.png')}" sizes="96x96">
+  <link rel="icon" type="image/png" href="${static.url('images/fav/favicon-16x16.png')}" sizes="16x16">
+  <link rel="manifest" href="${static.url('images/fav/manifest.json')}">
+  <link rel="mask-icon" href="${static.url('images/fav/safari-pinned-tab.svg')}" color="#5bbad5">
+  <meta name="msapplication-TileImage" content="${static.url('images/fav/mstile-144x144.png')}">
+  <meta name="msapplication-TileColor" content="#da532c">
+
+  <%static:css group='style-vendor'/>
+  <%static:css group='${self.attr.main_css}'/>
+
+  % if disable_courseware_js:
+    <%static:js group='base_vendor'/>
+    <%static:js group='base_application'/>
+  % else:
+    <%static:js group='main_vendor'/>
+    <%static:js group='application'/>
+  % endif
+
+  <script>
+    window.baseUrl = "${settings.STATIC_URL}";
+    (function (require) {
+      require.config({
+          baseUrl: window.baseUrl
+      });
+    }).call(this, require || RequireJS.require);
+  </script>
+  <script type="text/javascript" src="${static.url("lms/js/require-config.js")}"></script>
+  <%block name="js_overrides">
+    ${render_require_js_path_overrides(settings.REQUIRE_JS_PATH_OVERRIDES)}
+  </%block>
+
+  % if not disable_courseware_js:
+    <%static:js group='module-js'/>
+  % endif
+
+  <%block name="headextra"/>
+
+  <%static:optional_include_mako file="head-extra.html" is_theming_enabled="True" />
+
+  <%include file="widgets/optimizely.html" />
+  <%include file="widgets/segment-io.html" />
+
+  <meta name="path_prefix" content="${EDX_ROOT_URL}">
+  <meta name="google-site-verification" content="_mipQ4AtZQDNmbtOkwehQDOgCxUUV2fb_C0b6wbiRHY" />
+
+<% ga_acct = static.get_value("GOOGLE_ANALYTICS_ACCOUNT", settings.GOOGLE_ANALYTICS_ACCOUNT) %>
+% if ga_acct:
+    <script type="text/javascript">
+    var _gaq = _gaq || [];
+    _gaq.push(['_setAccount', '${ga_acct}']);
+    _gaq.push(['_trackPageview']);
+
+    (function() {
+      var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+      ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+      var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+    })();
+    </script>
+% endif
+
+</head>
+
+<body class="${static.dir_rtl()} <%block name='bodyclass'/> lang_${LANGUAGE_CODE}">
+<%static:optional_include_mako file="body-initial.html" is_theming_enabled="True" />
+<div id="page-prompt"></div>
+% if not disable_window_wrap:
+  <div class="window-wrap" dir="${static.dir_rtl()}">
+% endif
+    <a class="nav-skip" href="<%block name="nav_skip">#content</%block>">${_("Skip to main content")}</a>
+
+    % if not disable_header:
+        <%include file="${static.get_template_path('header.html')}" />
+    % endif
+
+    <div role="main" class="content-wrapper" id="content" tabindex="-1">
+      ${self.body()}
+      <%block name="bodyextra"/>
+    </div>
+
+    % if not disable_footer:
+        <%include file="themable-footer.html" />
+    % endif
+
+% if not disable_window_wrap:
+  </div>
+% endif
+
+  <%block name="js_extra"/>
+  <%include file="widgets/segment-io-footer.html" />
+  <script type="text/javascript" src="${static.url('js/vendor/noreferrer.js')}" charset="utf-8"></script>
+  <script type="text/javascript" src="${static.url('js/utils/navigation.js')}" charset="utf-8"></script>
+  <%static:optional_include_mako file="body-extra.html" is_theming_enabled="True" />
+</body>
+</html>
+
+<%def name="login_query()">${
+  u"?next={0}".format(urlquote_plus(login_redirect_url)) if login_redirect_url else ""
+}</%def>
+
+<!-- Performance beacon for onload times -->
+% if settings.FEATURES.get('ENABLE_ONLOAD_BEACON', False):
+<script>
+  (function () {
+    var sample_rate = ${settings.ONLOAD_BEACON_SAMPLE_RATE};
+    var roll = Math.floor(Math.random() * 100)/100;
+    var onloadBeaconSent = false;
+
+    if(roll < sample_rate){
+      $(window).load(function() {
+        setTimeout(function(){
+          var t = window.performance.timing;
+
+          var data = {
+            event: "onload",
+            value: t.loadEventEnd - t.navigationStart,
+            page: window.location.href,
+          };
+
+          if (!onloadBeaconSent) {
+            $.ajax({method: "POST", url: "/performance", data: data});
+          }
+          onloadBeaconSent = true;
+        }, 0);
+      });
+    }
+  }());
+</script>
+% endif